diff --git a/README.md b/README.md
index d4cfaac..615f7ed 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
-# ussrwin hubzilla themes
+# ussr.win hubzilla themes
+- ussrbasic
+- ussrbasicpub
diff --git a/ussrbasic/css/style.css b/ussrbasic/css/style.css
index 3c52106..2cdb63a 100644
--- a/ussrbasic/css/style.css
+++ b/ussrbasic/css/style.css
@@ -1801,13 +1801,17 @@ dl.bb-dl > dd > li {
}
.cover-photo-review {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
.hover-fx-hide {
- opacity: 0;
+ opacity: 0;
}
.hover-fx-show:hover .hover-fx-hide {
- opacity: 1;
+ opacity: 1;
}
+
+.fa-minus-circle {
+ visibility: hidden;
+}
\ No newline at end of file
diff --git a/ussrbasic/js/redbasic.js b/ussrbasic/js/redbasic.js
deleted file mode 100644
index 941b259..0000000
--- a/ussrbasic/js/redbasic.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * ussrbasic theme specific JavaScript
- */
-
-$(document).ready(function() {
-
- // CSS3 calc() fallback (for unsupported browsers)
- $('body').append('');
- if( $('#css3-calc').width() == 10) {
- $(window).resize(function() {
- if($(window).width() < 992) {
- $('main').css('width', $(window).width() + $('aside').outerWidth() );
- } else {
- $('main').css('width', '100%' );
- }
- });
- }
- $('#css3-calc').remove(); // Remove the test element
-
- if($(window).width() >= 992) {
- $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
- offset_top: parseInt($('aside').css('padding-top')),
- parent: 'main',
- spacer: '.aside_spacer'
- });
- }
-
- $('#expand-aside').on('click', toggleAside);
-
- $('section').on('click', function() {
- if($('main').hasClass('region_1-on')){
- toggleAside();
- }
- });
-
- var left_aside_height = $('#left_aside_wrapper').height();
-
- $('#left_aside_wrapper').on('click', function() {
- if(left_aside_height != $('#left_aside_wrapper').height()) {
- $(document.body).trigger("sticky_kit:recalc");
- left_aside_height = $('#left_aside_wrapper').height();
- }
- });
-
-
- var right_aside_height = $('#right_aside_wrapper').height();
-
- $('#right_aside_wrapper').on('click', function() {
- if(right_aside_height != $('#right_aside_wrapper').height()) {
- $(document.body).trigger("sticky_kit:recalc");
- right_aside_height = $('#right_aside_wrapper').height();
- }
- });
-
- $('.usermenu').click(function() {
- if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
- $('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
- }
- });
-
- $('#menu-btn').click(function() {
- if($('#navbar-collapse-1').hasClass('show')){
- $('#navbar-collapse-1').removeClass('show');
- }
- });
-
- $('.notifications-btn').click(function(e) {
- e.preventDefault();
- e.stopPropagation();
- if($('#navbar-collapse-2').hasClass('show')){
- $('#navbar-collapse-2').removeClass('show');
- }
- });
-
- $("input[data-role=cat-tagsinput]").tagsinput({
- tagClass: 'badge badge-pill badge-warning text-dark'
- });
-
- $('a.disabled').click(function(e) {
- e.preventDefault();
- e.stopPropagation();
- });
-
- var doctitle = document.title;
- function checkNotify() {
- var notifyUpdateElem = document.getElementById('notify-update');
- if(notifyUpdateElem !== null) {
- if(notifyUpdateElem.innerHTML !== "")
- document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
- else
- document.title = doctitle;
- }
- }
- setInterval(function () {checkNotify();}, 10 * 1000);
-});
-
-function makeFullScreen(full) {
- if(typeof full=='undefined' || full == true) {
- $('main').addClass('fullscreen');
- $('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');
- $('#inline-btn').show();
- }
- else {
- $('main').removeClass('fullscreen');
- $('header, nav, aside, #fullscreen-btn').show();
- $('#inline-btn').hide();
- $(document.body).trigger("sticky_kit:recalc");
- }
-}
-
-function toggleAside() {
- $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
- if($('main').hasClass('region_1-on')){
- $('html, body').css('overflow-x', '');
- $('main').removeClass('region_1-on')
- $('#overlay').remove();
- $('#left_aside_wrapper').trigger("sticky_kit:detach");
- }
- else {
- $('html, body').css('overflow-x', 'hidden');
- $('main').addClass('region_1-on')
- $('').appendTo('section');
- $('#left_aside_wrapper').stick_in_parent({
- offset_top: $('nav').outerHeight(true) + 10,
- parent: '#region_1',
- spacer: '#left_aside_spacer'
- });
- }
-}
diff --git a/ussrbasic/pdl/mod_channel.pdl b/ussrbasic/pdl/mod_channel.pdl
new file mode 100644
index 0000000..d3c08a2
--- /dev/null
+++ b/ussrbasic/pdl/mod_channel.pdl
@@ -0,0 +1,14 @@
+[region=banner]
+[widget=cover_photo][/widget]
+[/region]
+[region=aside]
+[widget=fullprofile][/widget]
+[widget=common_friends][/widget]
+[widget=archive][var=wall]1[/var][/widget]
+[widget=categories][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=tagcloud_wall][var=limit]24[/var][/widget]
+[widget=newmember][/widget]
+[/region]
diff --git a/ussrbasic/php/style.php b/ussrbasic/php/style.php
index d5f8cca..c8ef793 100644
--- a/ussrbasic/php/style.php
+++ b/ussrbasic/php/style.php
@@ -159,5 +159,5 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this.
-if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic')
- set_pconfig(local_channel(), 'ussrbasic', 'schema', '---');
+// if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'ussrbasic')
+// set_pconfig(local_channel(), 'ussrbasic', 'schema', '---');
diff --git a/ussrbasic/php/theme.php b/ussrbasic/php/theme.php
index 3ca7c8b..fef54e1 100644
--- a/ussrbasic/php/theme.php
+++ b/ussrbasic/php/theme.php
@@ -3,8 +3,8 @@
/**
* * Name: Ussrbasic
* * Description: ussr.win hubzilla standard theme
- * * Version: 2.1
- * * MinVersion: 2.3.1
+ * * Version: 2.23
+ * * MinVersion: 3.8
* * MaxVersion: 6.0
* * Author: Fabrixxm
* * Maintainer: Mike Macgirvin
@@ -13,4 +13,6 @@
function ussrbasic_init(&$a) {
+App::$theme_info['extends'] = 'redbasic';
+
}
diff --git a/ussrbasic/tpl/navbar_default.tpl b/ussrbasic/tpl/navbar_default.tpl
index 59d43f8..dee9961 100644
--- a/ussrbasic/tpl/navbar_default.tpl
+++ b/ussrbasic/tpl/navbar_default.tpl
@@ -105,6 +105,9 @@
+
+
+
{{if $nav.loginmenu.1.4}}