v9.0

hubzilla 8
upper notifications in hq
2024-03-26 14:56:38 +03:00 · 2024-02-17 17:00:05 +01:00 · 2022-07-25 19:03:52 +03:00 · 2022-06-09 09:18:28 +03:00 · 2022-06-08 13:35:49 +03:00 · 2022-06-05 16:46:26 +03:00
292 changed files with 6794 additions and 15940 deletions
--- a/README.md
+++ b/README.md
@ -2,23 +2,17 @@

 - ussrbasic
 - ussrbasicpub
- ussrbasicleft
- ussrbasicright

 This themes has Focus (wgite background) and GreenGrey (dark background) schemes. Also this themes has Nolikes scheme (hide "Likes" feature) and Nominus scheme (hide "Minus" icon under one-side connections).

- ussrbasic - default 3 column theme with greengrey scheme
+Adapted for Hubzilla version 8.
+
+- ussrbasic - default theme with custom GreenGrey schemes

 ![ussrbasic](https://dev.ussr.win/ussr/ussr-hubzilla-themes/raw/branch/master/ussrbasic/img/screenshot.png)

- ussrbasicpub - public 2 column theme with public informative navbar
+- ussrbasicpub - public GreenGrey theme with informative navbar

 ![ussrbasicpub](https://dev.ussr.win/ussr/ussr-hubzilla-themes/raw/branch/master/ussrbasicpub/img/screenshot.png)

- ussrbasicleft - 2 column, left navigation panel
-
-![ussrbasicleft](https://dev.ussr.win/ussr/ussr-hubzilla-themes/raw/branch/master/ussrbasicleft/img/screenshot.png)
-
- ussrbasicright - 2 column, right navigation panel [BETA - some features could not work]
-
-![ussrbasicright](https://dev.ussr.win/ussr/ussr-hubzilla-themes/raw/branch/master/ussrbasicright/img/screenshot.png)
+You can use PDL Editor to create a two-column page layout.
--- a/ussrbasic/css/narrow_navbar.css
+++ b/ussrbasic/css/narrow_navbar.css
@ -1,25 +1,7 @@
@media screen and (min-width: 767px) {

-	nav.navbar {
-		padding-top: 1px;
-		padding-bottom: 1px
-	}
-
-	nav .badge {
-		top: 0px;
-		left: -0.25rem;
-	}
-
-	.contextual-help-content-open {
-		top: 2.5rem;
-	}
-
-	aside {
-		padding-top: 3.5rem;
-	}
-
-	section {
-		padding-top: 3.5rem;
+	.navbar {
+		--bs-navbar-padding-y: 1px;
 	}

 	#jGrowl.top-right {
--- a/ussrbasic/css/style.css
+++ b/ussrbasic/css/style.css
--- a/ussrbasic/js/ussrbasic.js
+++ b/ussrbasic/js/ussrbasic.js
@ -2,7 +2,45 @@
 * ussrbasic theme specific JavaScript
 */

+let ussrbasic_dark_mode = localStorage.getItem('ussrbasic_dark_mode');
+let ussrbasic_theme_color = localStorage.getItem('ussrbasic_theme_color');
+
+if (ussrbasic_dark_mode == 1) {
+	$('html').attr('data-bs-theme', 'dark');
+}
+
+if (ussrbasic_dark_mode == 0) {
+	$('html').attr('data-bs-theme', 'light');
+}
+
+if (ussrbasic_theme_color) {
+	$('meta[name=theme-color]').attr('content', ussrbasic_theme_color);
+}
+
 $(document).ready(function() {
+	// provide a fake progress bar for pwa standalone mode
+	if (window.matchMedia('(display-mode: standalone)').matches) {
+		$(window).on('beforeunload', function(){
+			if ($('.page-loader').length) {
+				return;
+			}
+			$('<div class="bg-primary page-loader"></div>').prependTo('body');
+		});
+	}
+
+	if (ussrbasic_dark_mode == 1) {
+		$('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o');
+		$('[data-bs-theme="light"]').attr('data-bs-theme', 'dark');
+	}
+	if (ussrbasic_dark_mode == 0) {
+		$('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o');
+		$('[data-bs-theme="dark"]:not(nav)').attr('data-bs-theme', 'light');
+	}
+
+	if (ussrbasic_theme_color != $('nav').css('background-color')) {
+		$('meta[name=theme-color]').attr('content', $('nav').css('background-color'));
+		localStorage.setItem('ussrbasic_theme_color', $('nav').css('background-color'));
+	}

 	// CSS3 calc() fallback (for unsupported browsers)
 	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
@ -11,46 +49,25 @@ $(document).ready(function() {
 			if($(window).width() < 992) {
 				$('main').css('width', $(window).width() + $('aside').outerWidth() );
 			} else {
-				$('main').css('width', '100%' );
+				$('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'
-		});
+	if($(window).width() < 1200) {
+		$("#right_aside_wrapper").children().detach().appendTo('#left_aside_wrapper');
+		$('#notifications_wrapper').addClass('d-none');
 	}

-	$('#expand-aside').on('click', toggleAside);

-	$('section').on('click', function() {
-		if($('main').hasClass('region_1-on')){
-			toggleAside();
-		}
-	});
+	if (document.querySelector('#region_1')) {
+		stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', 'section', parseFloat(document.querySelector('main').getBoundingClientRect().top), 20);
+	}

-	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();
-		}
-	});
+	if (document.querySelector('#region_3')) {
+		stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', 'section', parseFloat(document.querySelector('main').getBoundingClientRect().top), 20);
+	}

 	$('.usermenu').click(function() {
 		if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
@ -58,6 +75,27 @@ $(document).ready(function() {
 		}
 	});

+	$('#theme-switch').click(function() {
+		if ($('html').attr('data-bs-theme') === 'dark') {
+			if ($('nav').data('bs-theme') === 'dark') {
+				$('[data-bs-theme="dark"]:not(nav)').attr('data-bs-theme', 'light');
+			}
+			else {
+				$('[data-bs-theme="dark"]').attr('data-bs-theme', 'light');
+			}
+			localStorage.setItem('ussrbasic_dark_mode', 0);
+			$('#theme-switch-icon').removeClass('fa-sun-o').addClass('fa-moon-o');
+		}
+		else {
+			$('[data-bs-theme="light"]').attr('data-bs-theme', 'dark');
+			localStorage.setItem('ussrbasic_dark_mode', 1);
+			$('#theme-switch-icon').removeClass('fa-moon-o').addClass('fa-sun-o');
+		}
+		$('meta[name=theme-color]').attr('content', $('nav').css('background-color'));
+		localStorage.setItem('ussrbasic_theme_color', $('nav').css('background-color'));
+	});
+
+
 	$('#menu-btn').click(function() {
 		if($('#navbar-collapse-1').hasClass('show')){
 			$('#navbar-collapse-1').removeClass('show');
@ -73,7 +111,7 @@ $(document).ready(function() {
 	});

 	$("input[data-role=cat-tagsinput]").tagsinput({
-		tagClass: 'badge badge-pill badge-warning text-dark'
+		tagClass: 'badge rounded-pill bg-warning text-dark'
 	});

 	$('a.disabled').click(function(e) {
@ -84,7 +122,7 @@ $(document).ready(function() {
 	var doctitle = document.title;
 	function checkNotify() {
 		var notifyUpdateElem = document.getElementById('notify-update');
-		if(notifyUpdateElem !== null) { 
+		if(notifyUpdateElem !== null) {
 			if(notifyUpdateElem.innerHTML !== "")
 				document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
 			else
@ -92,8 +130,104 @@ $(document).ready(function() {
 		}
 	}
 	setInterval(function () {checkNotify();}, 10 * 1000);
+
+	var touch_start = null;
+	var touch_max = window.innerWidth / 10;
+
+	window.addEventListener('touchstart', function(e) {
+		if (e.touches.length === 1){
+			//just one finger touched
+			touch_start = e.touches.item(0).clientX;
+			if (touch_start < touch_max) {
+				$('body').css('overflow-y', 'hidden');
+			}
+		}
+		else {
+			//a second finger hit the screen, abort the touch
+			touch_start = null;
+		}
+	});
+
+	window.addEventListener('touchend', function(e) {
+		$('body').css('overflow-y', '');
+
+		let touch_offset = 30; //at least 30px are a swipe
+		if (touch_start) {
+			//the only finger that hit the screen left it
+			let touch_end = e.changedTouches.item(0).clientX;
+
+			if (touch_end > (touch_start + touch_offset)) {
+				//a left -> right swipe
+				if (touch_start < touch_max) {
+					toggleAside();
+				}
+			}
+			if (touch_end < (touch_start - touch_offset)) {
+				//a right -> left swipe
+			}
+		}
+	});
+
 });

+function setStyle(element, cssProperty) {
+	for (var property in cssProperty){
+		element.style[property] = cssProperty[property];
+	}
+}
+
+function stickyScroll(sticky, stickyTop, container, topOffset, bottomOffset) {
+
+	var lastScrollTop = 0;
+	var sticky = document.querySelector(sticky);
+
+	if (!sticky) {
+		return;
+	}
+
+	var stickyHeight = sticky.getBoundingClientRect().height;
+	var stickyTop = document.querySelector(stickyTop);
+	var content = document.querySelector(container);
+	var diff = window.innerHeight - stickyHeight;
+	var h = 0;
+	var lasth = 0;
+	var st = window.pageYOffset || document.documentElement.scrollTop;
+
+	var resizeObserver = new ResizeObserver(function(entries) {
+		stickyHeight = sticky.getBoundingClientRect().height;
+		st = window.pageYOffset || document.documentElement.scrollTop;
+		diff = window.innerHeight - stickyHeight;
+	});
+
+	resizeObserver.observe(sticky);
+	resizeObserver.observe(content);
+
+	window.addEventListener('scroll', function() {
+		if(window.innerHeight > stickyHeight + topOffset) {
+			setStyle(stickyTop, { height: 0 + 'px' });
+			setStyle(sticky, { position: 'sticky', top: topOffset + 'px'});
+		}
+		else {
+			st = window.pageYOffset || document.documentElement.scrollTop; // Credits: "https://github.com/qeremy/so/blob/master/so.dom.js#L426"
+			if (st > lastScrollTop){
+				// downscroll code
+				setStyle(stickyTop, { height: lasth + 'px' });
+				setStyle(sticky, { position: 'sticky', top: Math.round(diff) - bottomOffset + 'px', bottom: '' });
+			} else {
+				// upscroll code
+				h = sticky.getBoundingClientRect().top - content.getBoundingClientRect().top;
+				if(Math.round(stickyTop.getBoundingClientRect().height) === lasth) {
+					setStyle(stickyTop, { height: Math.round(h) + 'px' });
+				}
+				lasth = Math.round(h);
+				setStyle(sticky, { position: 'sticky', top: '', bottom: Math.round(diff) - topOffset + 'px' });
+			}
+			lastScrollTop = st <= 0 ? 0 : st; // For Mobile or negative scrolling
+		}
+	}, false);
+
+}
+
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
 		$('main').addClass('fullscreen');
@ -104,26 +238,7 @@ function makeFullScreen(full) {
 		$('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')
-		$('<div id="overlay"></div>').appendTo('section');
-		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true) + 10,
-			parent: '#region_1',
-			spacer: '#left_aside_spacer'
-		});
-	}
-}
+
--- a/ussrbasic/pdl/mod_channel.pdl
+++ b/ussrbasic/pdl/mod_channel.pdl
@ -1,14 +0,0 @@
-[region=banner]
-[widget=cover_photo][/widget]
-[/region]
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=common_friends][/widget]
-[widget=categories][/widget]
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=tagcloud_wall][var=limit]50[/var][/widget]
-[widget=archive][var=wall]1[/var][/widget]
-[widget=newmember][/widget]
-[/region]
--- a/ussrbasic/pdl/mod_pubstream.pdl
+++ b/ussrbasic/pdl/mod_pubstream.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget]
-[/region]
-[region=right_aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
--- a/ussrbasic/php/config.php
+++ b/ussrbasic/php/config.php
@ -32,25 +32,26 @@ class UssrbasicConfig {
 	}

 	function get() {
-		if(! local_channel()) { 
+		if(! local_channel()) {
 			return;
 		}

 		$arr = array();
+		$arr['dark_mode'] = get_pconfig(local_channel(),'ussrbasic', 'dark_mode');
+		$arr['navbar_dark_mode'] = get_pconfig(local_channel(),'ussrbasic', 'navbar_dark_mode');
 		$arr['narrow_navbar'] = get_pconfig(local_channel(),'ussrbasic', 'narrow_navbar' );
 		$arr['nav_bg'] = get_pconfig(local_channel(),'ussrbasic', 'nav_bg' );
-		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'ussrbasic', 'nav_icon_colour' );
-		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'ussrbasic', 'nav_active_icon_colour' );
-		$arr['link_colour'] = get_pconfig(local_channel(),'ussrbasic', 'link_colour' );
-		$arr['banner_colour'] = get_pconfig(local_channel(),'ussrbasic', 'banner_colour' );
-		$arr['bgcolour'] = get_pconfig(local_channel(),'ussrbasic', 'background_colour' );
+		$arr['nav_bg_dark'] = get_pconfig(local_channel(),'ussrbasic', 'nav_bg_dark' );
+		$arr['link_color'] = get_pconfig(local_channel(),'ussrbasic', 'link_color' );
+		$arr['link_color_dark'] = get_pconfig(local_channel(),'ussrbasic', 'link_color_dark' );
+		$arr['link_hover_color'] = get_pconfig(local_channel(),'ussrbasic', 'link_hover_color' );
+		$arr['link_hover_color_dark'] = get_pconfig(local_channel(),'ussrbasic', 'link_hover_color_dark' );
+		$arr['bgcolor'] = get_pconfig(local_channel(),'ussrbasic', 'background_color' );
+		$arr['bgcolor_dark'] = get_pconfig(local_channel(),'ussrbasic', 'background_color_dark' );
 		$arr['background_image'] = get_pconfig(local_channel(),'ussrbasic', 'background_image' );
-		$arr['item_colour'] = get_pconfig(local_channel(),'ussrbasic', 'item_colour' );
-		$arr['comment_item_colour'] = get_pconfig(local_channel(),'ussrbasic', 'comment_item_colour' );
+		$arr['background_image_dark'] = get_pconfig(local_channel(),'ussrbasic', 'background_image_dark' );
 		$arr['font_size'] = get_pconfig(local_channel(),'ussrbasic', 'font_size' );
-		$arr['font_colour'] = get_pconfig(local_channel(),'ussrbasic', 'font_colour' );
 		$arr['radius'] = get_pconfig(local_channel(),'ussrbasic', 'radius' );
-		$arr['shadow'] = get_pconfig(local_channel(),'ussrbasic', 'photo_shadow' );
 		$arr['converse_width']=get_pconfig(local_channel(),"ussrbasic","converse_width");
 		$arr['top_photo']=get_pconfig(local_channel(),"ussrbasic","top_photo");
 		$arr['reply_photo']=get_pconfig(local_channel(),"ussrbasic","reply_photo");
@ -59,25 +60,26 @@ class UssrbasicConfig {
 	}

 	function post() {
-		if(!local_channel()) { 
+		if(!local_channel()) {
 			return;
 		}

 		if (isset($_POST['ussrbasic-settings-submit'])) {
 			set_pconfig(local_channel(), 'ussrbasic', 'narrow_navbar', $_POST['ussrbasic_narrow_navbar']);
+			set_pconfig(local_channel(), 'ussrbasic', 'navbar_dark_mode', $_POST['ussrbasic_navbar_dark_mode']);
+			set_pconfig(local_channel(), 'ussrbasic', 'dark_mode', $_POST['ussrbasic_dark_mode']);
 			set_pconfig(local_channel(), 'ussrbasic', 'nav_bg', $_POST['ussrbasic_nav_bg']);
-			set_pconfig(local_channel(), 'ussrbasic', 'nav_icon_colour', $_POST['ussrbasic_nav_icon_colour']);
-			set_pconfig(local_channel(), 'ussrbasic', 'nav_active_icon_colour', $_POST['ussrbasic_nav_active_icon_colour']);
-			set_pconfig(local_channel(), 'ussrbasic', 'link_colour', $_POST['ussrbasic_link_colour']);
-			set_pconfig(local_channel(), 'ussrbasic', 'background_colour', $_POST['ussrbasic_background_colour']);
-			set_pconfig(local_channel(), 'ussrbasic', 'banner_colour', $_POST['ussrbasic_banner_colour']);
+			set_pconfig(local_channel(), 'ussrbasic', 'nav_bg_dark', $_POST['ussrbasic_nav_bg_dark']);
+			set_pconfig(local_channel(), 'ussrbasic', 'link_color', $_POST['ussrbasic_link_color']);
+			set_pconfig(local_channel(), 'ussrbasic', 'link_color_dark', $_POST['ussrbasic_link_color_dark']);
+			set_pconfig(local_channel(), 'ussrbasic', 'link_hover_color', $_POST['ussrbasic_link_hover_color']);
+			set_pconfig(local_channel(), 'ussrbasic', 'link_hover_color_dark', $_POST['ussrbasic_link_hover_color_dark']);
+			set_pconfig(local_channel(), 'ussrbasic', 'background_color', $_POST['ussrbasic_background_color']);
+			set_pconfig(local_channel(), 'ussrbasic', 'background_color_dark', $_POST['ussrbasic_background_color_dark']);
 			set_pconfig(local_channel(), 'ussrbasic', 'background_image', $_POST['ussrbasic_background_image']);
-			set_pconfig(local_channel(), 'ussrbasic', 'item_colour', $_POST['ussrbasic_item_colour']);
-			set_pconfig(local_channel(), 'ussrbasic', 'comment_item_colour', $_POST['ussrbasic_comment_item_colour']);
+			set_pconfig(local_channel(), 'ussrbasic', 'background_image_dark', $_POST['ussrbasic_background_image_dark']);
 			set_pconfig(local_channel(), 'ussrbasic', 'font_size', $_POST['ussrbasic_font_size']);
-			set_pconfig(local_channel(), 'ussrbasic', 'font_colour', $_POST['ussrbasic_font_colour']);
 			set_pconfig(local_channel(), 'ussrbasic', 'radius', $_POST['ussrbasic_radius']);
-			set_pconfig(local_channel(), 'ussrbasic', 'photo_shadow', $_POST['ussrbasic_shadow']);
 			set_pconfig(local_channel(), 'ussrbasic', 'converse_width', $_POST['ussrbasic_converse_width']);
 			set_pconfig(local_channel(), 'ussrbasic', 'top_photo', $_POST['ussrbasic_top_photo']);
 			set_pconfig(local_channel(), 'ussrbasic', 'reply_photo', $_POST['ussrbasic_reply_photo']);
@ -87,30 +89,36 @@ class UssrbasicConfig {

 	function form($arr) {

-		if(get_pconfig(local_channel(), 'ussrbasic', 'advanced_theming'))
-			$expert = 1;
-					
-	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
+		$expert = false;
+		if(get_pconfig(local_channel(), 'ussrbasic', 'advanced_theming')) {
+			$expert = true;
+		}
+
+	  	$o = replace_macros(get_markup_template('theme_settings.tpl'), array(
 			'$submit' => t('Submit'),
 			'$baseurl' => z_root(),
 			'$theme' => \App::$channel['channel_theme'],
 			'$expert' => $expert,
 			'$title' => t("Theme settings"),
+			'$dark' => t('Dark style'),
+			'$light' => t('Light style'),
+			'$common' => t('Common settings'),
+			'$dark_mode' => array('ussrbasic_dark_mode',t('Default to dark mode'),$arr['dark_mode'], '', array(t('No'),t('Yes'))),
+			'$navbar_dark_mode' => array('ussrbasic_navbar_dark_mode',t('Always use light icons for navbar'),$arr['navbar_dark_mode'], t('Enable this option if you use a dark navbar color in light mode'), array(t('No'),t('Yes'))),
 			'$narrow_navbar' => array('ussrbasic_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
 			'$nav_bg' => array('ussrbasic_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
-			'$nav_icon_colour' => array('ussrbasic_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
-			'$nav_active_icon_colour' => array('ussrbasic_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
-			'$link_colour' => array('ussrbasic_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
-			'$banner_colour' => array('ussrbasic_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
-			'$bgcolour' => array('ussrbasic_background_colour', t('Set the background color'), $arr['bgcolour']),
-			'$background_image' => array('ussrbasic_background_image', t('Set the background image'), $arr['background_image']),	
-			'$item_colour' => array('ussrbasic_item_colour', t('Set the background color of items'), $arr['item_colour']),
-			'$comment_item_colour' => array('ussrbasic_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
+			'$nav_bg_dark' => array('ussrbasic_nav_bg_dark', t('Dark navigation bar background color'), $arr['nav_bg_dark']),
+			'$link_color' => array('ussrbasic_link_color', t('Link color'), $arr['link_color']),
+			'$link_color_dark' => array('ussrbasic_link_color_dark', t('Dark link color'), $arr['link_color_dark']),
+			'$link_hover_color' => array('ussrbasic_link_hover_color', t('Link hover color'), $arr['link_hover_color']),
+			'$link_hover_color_dark' => array('ussrbasic_link_hover_color_dark', t('Dark link hover color'), $arr['link_hover_color_dark']),
+			'$bgcolor' => array('ussrbasic_background_color', t('Set the background color'), $arr['bgcolor']),
+			'$bgcolor_dark' => array('ussrbasic_background_color_dark', t('Set the dark background color'), $arr['bgcolor_dark']),
+			'$background_image' => array('ussrbasic_background_image', t('Set the background image'), $arr['background_image']),
+			'$background_image_dark' => array('ussrbasic_background_image_dark', t('Set the dark background image'), $arr['background_image_dark']),
 			'$font_size' => array('ussrbasic_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
-			'$font_colour' => array('ussrbasic_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
 			'$radius' => array('ussrbasic_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
-			'$shadow' => array('ussrbasic_shadow', t('Set shadow depth of photos'), $arr['shadow']),
-			'$converse_width' => array('ussrbasic_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
+			'$converse_width' => array('ussrbasic_converse_width',t('Set maximum width of content region in rem'),$arr['converse_width'], t('Leave empty for default width')),
 			'$top_photo' => array('ussrbasic_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
 			'$reply_photo' => array('ussrbasic_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
 			'$advanced_theming' => ['ussrbasic_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
@ -121,7 +129,15 @@ class UssrbasicConfig {

 }

-
+function ussrbasic_theme_admin_enable() {
+	// This function is called once when the theme is being enabled by the admin
+	// It can be used to register hooks etc.
+}
+
+function ussrbasic_theme_admin_disable() {
+	// This function is called once when the theme is being disabled by the admin
+	// It can be used to unregister hooks etc.
+}



--- a/ussrbasic/php/style.php
+++ b/ussrbasic/php/style.php
@ -11,20 +11,19 @@ if(! App::$install) {

 	// Load the owners pconfig
 	$nav_bg = get_pconfig($uid, 'ussrbasic', 'nav_bg');
-	$nav_icon_colour = get_pconfig($uid, 'ussrbasic', 'nav_icon_colour');
-	$nav_active_icon_colour = get_pconfig($uid, 'ussrbasic', 'nav_active_icon_colour');
-	$banner_colour = get_pconfig($uid,'ussrbasic','banner_colour');
+	$nav_bg_dark = get_pconfig($uid, 'ussrbasic', 'nav_bg_dark');
 	$narrow_navbar = get_pconfig($uid,'ussrbasic','narrow_navbar');
-	$link_colour = get_pconfig($uid, 'ussrbasic', 'link_colour');
+	$link_color = get_pconfig($uid, 'ussrbasic', 'link_color');
+	$link_color_dark = get_pconfig($uid, 'ussrbasic', 'link_color_dark');
+	$link_hover_color = get_pconfig($uid, 'ussrbasic', 'link_hover_color');
+	$link_hover_color_dark = get_pconfig($uid, 'ussrbasic', 'link_hover_color_dark');
+	$bgcolor = get_pconfig($uid, 'ussrbasic', 'background_color');
+	$bgcolor_dark = get_pconfig($uid, 'ussrbasic', 'background_color_dark');
 	$schema = get_pconfig($uid,'ussrbasic','schema');
-	$bgcolour = get_pconfig($uid, 'ussrbasic', 'background_colour');
 	$background_image = get_pconfig($uid, 'ussrbasic', 'background_image');
-	$item_colour = get_pconfig($uid, 'ussrbasic', 'item_colour');
-	$comment_item_colour = get_pconfig($uid, 'ussrbasic', 'comment_item_colour');
+	$background_image_dark = get_pconfig($uid, 'ussrbasic', 'background_image_dark');
 	$font_size = get_pconfig($uid, 'ussrbasic', 'font_size');
-	$font_colour = get_pconfig($uid, 'ussrbasic', 'font_colour');
 	$radius = get_pconfig($uid, 'ussrbasic', 'radius');
-	$shadow = get_pconfig($uid,'ussrbasic','photo_shadow');
 	$converse_width=get_pconfig($uid,'ussrbasic','converse_width');
 	$top_photo=get_pconfig($uid,'ussrbasic','top_photo');
 	$reply_photo=get_pconfig($uid,'ussrbasic','reply_photo');
@ -36,9 +35,8 @@ if(! App::$install) {
 // not --- like the mobile theme does instead.

 // Allow layouts to over-ride the schema
-
-if($_REQUEST['schema']) {
-	$schema = $_REQUEST['schema'];
+if (isset($_REQUEST['schema']) && preg_match('/^[\w_-]+$/i', $_REQUEST['schema'])) {
+  $schema = $_REQUEST['schema'];
 }

 if (($schema) && ($schema != '---')) {
@ -64,46 +62,57 @@ if ((!$schema) || ($schema == '---')) {
 		require_once ($schemefile);
 	}

+	$schemecss = '';
 	if(file_exists('view/theme/ussrbasic/schema/default.css')) {
 		$schemecss = file_get_contents('view/theme/ussrbasic/schema/default.css');
 	}

 }
-		
+
 //Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
 //individually.  If we don't, we'll have problems if a user has set one, but not all options.
 if (! $nav_bg)
-	$nav_bg = '#343a40';
-if (! $nav_icon_colour)
-	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
-if (! $nav_active_icon_colour)
-	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
-if (! $link_colour)
-	$link_colour = '#007bff';
-if (! $banner_colour)
-	$banner_colour = '#fff';
-if (! $bgcolour)
-	$bgcolour = 'rgb(254,254,254)';
+	$nav_bg = 'rgba(248, 249, 250, 1)';
+
+if (! $nav_bg_dark)
+	$nav_bg_dark = 'rgba(43, 48, 53, 1)';
+
+if (! $link_color)
+	$link_color = '#0d6efd';
+
+if (! $link_color_dark)
+	$link_color_dark = '#6ea8fe';
+
+if (! $link_hover_color)
+	$link_hover_color = '#0a58ca';
+
+if (! $link_hover_color_dark)
+	$link_hover_color_dark = '#9ec5fe';
+
+if (! $bgcolor)
+	$bgcolor = '#fff';
+
+if (! $bgcolor_dark)
+	$bgcolor_dark = '#212529';
+
 if (! $background_image)
-	$background_image ='';
-if (! $item_colour)
-	$item_colour = 'rgb(238,238,238)';
-if (! $comment_item_colour)
-	$comment_item_colour = 'rgb(255,255,255)';
-if (! $item_opacity)
-	$item_opacity = '1';
+	$background_image = '';
+
+if (! $background_image_dark)
+	$background_image_dark = '';
+
 if (! $font_size)
 	$font_size = '0.875rem';
-if (! $font_colour)
-	$font_colour = '#4d4d4d';
+
 if (! $radius)
-	$radius = '0.25rem';
-if (! $shadow)
-	$shadow = '0';
+	$radius = '0.375rem';
+
 if (! $converse_width)
-	$converse_width = '790';
+	$converse_width = '52'; //unit: rem
+
 if(! $top_photo)
 	$top_photo = '2.3rem';
+
 if(! $reply_photo)
 	$reply_photo = '2.3rem';

@ -120,44 +129,40 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
 		$x .= $schemecss;
 	}

-	$aside_width = 288;
+	$left_aside_width = 21; //unit: rem
+	$right_aside_width = 21; //unit: rem

-	// left aside and right aside are 285px + converse width
-	$main_width = (($aside_width * 2) + intval($converse_width));
+	$main_width = $left_aside_width + $right_aside_width + intval($converse_width);

 	// prevent main_width smaller than 768px
-	$main_width = (($main_width < 768) ? 768 : $main_width);
+	$main_width = (($main_width < 30) ? 30 : $main_width);

 	$options = array (
 		'$nav_bg' => $nav_bg,
-		'$nav_icon_colour' => $nav_icon_colour,
-		'$nav_active_icon_colour' => $nav_active_icon_colour,
-		'$link_colour' => $link_colour,
-		'$banner_colour' => $banner_colour,
-		'$bgcolour' => $bgcolour,
+		'$nav_bg_dark' => $nav_bg_dark,
+		'$link_color' => $link_color,
+		'$link_color_dark' => $link_color_dark,
+		'$link_hover_color' => $link_hover_color,
+		'$link_hover_color_dark' => $link_hover_color_dark,
+		'$bgcolor' => $bgcolor,
+		'$bgcolor_dark' => $bgcolor_dark,
 		'$background_image' => $background_image,
-		'$item_colour' => $item_colour,
-		'$comment_item_colour' => $comment_item_colour,
+		'$background_image_dark' => $background_image_dark,
 		'$font_size' => $font_size,
-		'$font_colour' => $font_colour,
 		'$radius' => $radius,
-		'$shadow' => $shadow,
 		'$converse_width' => $converse_width,
-		'$nav_float_min_opacity' => $nav_float_min_opacity,
-		'$nav_percent_min_opacity' => $nav_percent_min_opacity,
 		'$top_photo' => $top_photo,
 		'$reply_photo' => $reply_photo,
-		'$pmenu_top' => $pmenu_top,
-		'$pmenu_reply' => $pmenu_reply,
 		'$main_width' => $main_width,
-		'$aside_width' => $aside_width
+		'$left_aside_width' => $left_aside_width,
+		'$right_aside_width' => $right_aside_width
 	);

-	echo str_replace(array_keys($options), array_values($options), $x);
+	echo strtr($x, $options);

 }

-// Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
+// 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', '---');
--- a/ussrbasic/php/theme.php
+++ b/ussrbasic/php/theme.php
@ -2,15 +2,17 @@

 /**
 *   * Name: Ussrbasic
- *   * Description: ussr.win default 3 column theme
- *   * Version: 4.4.2
- *   * MinVersion: 3.8
- *   * MaxVersion: 6.0
+ *   * Description: ussr.win theme based on Hubzilla standard theme
+ *   * Version: 2.2
+ *   * MinVersion: 8.9
+ *   * MaxVersion: 10.0
 *   * Author: Fabrixxm
+ *   * Maintainer: ivan zlax
+ *   * Theme_Color: rgb(248, 249, 250)
+ *   * Background_Color: rgb(254,254,254)
 */

-function ussrbasic_init(&$a) {

-App::$theme_info['extends'] = 'redbasic';
+function ussrbasic_init() {

 }
--- a/ussrbasic/php/theme_init.php
+++ b/ussrbasic/php/theme_init.php
@ -1,17 +1,34 @@
 <?php
+require_once('view/php/theme_init.php');

 head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
 head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
 head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
-head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
-require_once('view/php/theme_init.php');

 head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
 head_add_js('/library/bootbox/bootbox.min.js');
 head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
 head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');

+$ussrbasic_mode = '';
+$ussrbasic_navbar_mode = '';

+if (local_channel()) {
+	$ussrbasic_mode = ((get_pconfig(local_channel(), 'ussrbasic', 'dark_mode')) ? 'dark' : 'light');
+	$ussrbasic_navbar_mode = ((get_pconfig(local_channel(), 'ussrbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+}
+
+if (App::$profile_uid) {
+	$ussrbasic_mode = ((get_pconfig(App::$profile_uid, 'ussrbasic', 'dark_mode')) ? 'dark' : 'light');
+	$ussrbasic_navbar_mode = ((get_pconfig(App::$profile_uid, 'ussrbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+}
+
+if (!$ussrbasic_mode) {
+	$ussrbasic_mode = ((get_config('ussrbasic', 'dark_mode')) ? 'dark' : 'light');
+	$ussrbasic_navbar_mode = ((get_config('ussrbasic', 'navbar_dark_mode')) ? 'dark' : 'light');
+}
+
+App::$page['color_mode'] = 'data-bs-theme="' . $ussrbasic_mode . '"';
+App::$page['navbar_color_mode'] = (($ussrbasic_navbar_mode === 'dark') ? 'data-bs-theme="' . $ussrbasic_navbar_mode . '"' : '');
--- a/ussrbasic/schema/Focus-Boxy.css
+++ b/ussrbasic/schema/Focus-Boxy.css
@ -1,15 +1,39 @@
 .comment .wall-item-body {
-	padding-left: 42px;
+	padding-left: 2.8rem;
 }

 .wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #dee2e6;
+	border-bottom: 1px solid var(--bs-border-color);
+}
+
+.hide-comments-outer,
+.hide-comments-outer:hover {
+	border: 0;
 }

 .widget {
-	border: 1px solid #dee2e6;
+	border: 1px solid var(--bs-border-color);
 }

 #note-text {
 	border: 1px solid transparent;
 }
+
+.vcard-card {
+	border: 1px solid var(--bs-border-color);
+	border-bottom: 0;
+}
+
+.vcard-card .card {
+	border: 1px solid var(--bs-border-color);
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}
+
+.vcard-card .vcard {
+	border: 1px solid var(--bs-border-color);
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}
--- a/ussrbasic/schema/Focus-Light.css
+++ b/ussrbasic/schema/Focus-Light.css
@ -1,5 +0,0 @@
-.dropdown-header.text-white-50,
-.navbar-dark .navbar-toggler,
-.navbar-dark .nav-link.active {
-	color: rgba(0,0,0,0.7) !important;
-}
--- a/ussrbasic/schema/Focus-Light.php
+++ b/ussrbasic/schema/Focus-Light.php
@ -1,12 +0,0 @@
-<?php
-	
-	if (! $nav_bg)
-		$nav_bg = "#f8f9fa";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "rgba(0, 0, 0, 0.5);";
-	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
-	if (! $radius)
-		$radius = "4px";
-	if (! $banner_colour)
-		$banner_colour = "rgba(0, 0, 0, 0.7)";
--- a/ussrbasic/schema/Focus-Nominus-Nolikes.css
+++ b/ussrbasic/schema/Focus-Nominus-Nolikes.css
@ -1,5 +1,5 @@
 /* disable minus icon */
-.fa-minus-circle {
+.oneway-overlay, .fa-minus-circle {
    visibility: hidden;
 }

--- a/ussrbasic/schema/Focus-Nominus.css
+++ b/ussrbasic/schema/Focus-Nominus.css
@ -1,5 +1,5 @@
 /* disable minus icon */
-.fa-minus-circle {
+.oneway-overlay, .fa-minus-circle {
    visibility: hidden;
 }

--- a/ussrbasic/schema/GreenGrey-Nolikes.css
+++ b/ussrbasic/schema/GreenGrey-Nolikes.css
@ -3,6 +3,11 @@
    width: auto;
 }

+/* hide theme switch */
+#theme-switch {
+    visibility: hidden;
+}
+
 /* disable likes */
 .wall-item-like {
    visibility: hidden;
@ -54,6 +59,9 @@ body {
 a:link {
    color: #63bd65;
 }
+.zinlcxmi {
+    color: #63bd65;
+}

 a:visited {
    color: #87ab63;
@ -106,7 +114,7 @@ div.profile-match-wrapper > div > a {
    border: 1px solid #383c4a;
 }

-.list-group-item:hover, .list-group-item:active {
+.list-group-item:active {
    color: #f4f4f4 !important;
 }

@ -324,4 +332,72 @@ blockquote {

 .table {
    color: #dddccc;
-}
+}
+
+#upgrade_info_aside {
+    border-color: #383c4a !important;
+}
+
+.text-muted {
+    color: #a6a6b9 !important;
+}
+
+.card {
+    background-color: #434753 !important;
+}
+
+.border {
+    border: 1px solid #415240 !important;
+}
+
+.item-category, .item-category > .text-dark {
+    color: #222222 !important;
+}
+
+.nav-link:focus, .nav-link:hover {
+    color: #eeeeee;
+}
+
+.nav-link.active > .fa-fw {
+    color: #eeeeee;
+}
+
+.nav-tabs {
+    border-bottom: 1px solid #415240 !important;
+}
+
+.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
+    border-top-color: #444444;
+    border-right-color: #444444;
+    border-bottom-color: #444444;
+    border-left-color: #444444;
+}
+
+.generic-content-wrapper {
+    border: 1px solid #444444;
+}
+
+#notifications {
+    background-color: #383c4a;
+}
+
+[data-bs-theme="light"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+[data-bs-theme="dark"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+.navbar {
+    --bs-navbar-color: #dddddd;
+}
+
+.navbar-banner {
+    color: #dddddd;
+}
+
+.bg-body-secondary {   
+    --bs-bg-opacity: 0;
+}
+
--- a/ussrbasic/schema/GreenGrey-Nominus-Nolikes.css
+++ b/ussrbasic/schema/GreenGrey-Nominus-Nolikes.css
@ -3,6 +3,11 @@
    width: auto;
 }

+/* hide theme switch */
+#theme-switch {
+    visibility: hidden;
+}
+
 /* disable likes */
 .wall-item-like {
    visibility: hidden;
@ -12,7 +17,7 @@
 }

 /* disable minus icon */
-.fa-minus-circle {
+.oneway-overlay, .fa-minus-circle {
    visibility: hidden;
 }

@ -59,6 +64,9 @@ body {
 a:link {
    color: #63bd65;
 }
+.zinlcxmi {
+    color: #63bd65;
+}

 a:visited {
    color: #87ab63;
@ -111,7 +119,7 @@ div.profile-match-wrapper > div > a {
    border: 1px solid #383c4a;
 }

-.list-group-item:hover, .list-group-item:active {
+.list-group-item:active {
    color: #f4f4f4 !important;
 }

@ -333,4 +341,71 @@ blockquote {

 .table {
    color: #dddccc;
-}
+}
+
+#upgrade_info_aside {
+    border-color: #383c4a !important;
+}
+
+.text-muted {
+    color: #a6a6b9 !important;
+}
+
+.card {
+    background-color: #434753 !important;
+}
+
+.border {
+    border: 1px solid #415240 !important;
+}
+
+.item-category, .item-category > .text-dark {
+    color: #222222 !important;
+}
+
+.nav-link:focus, .nav-link:hover {
+    color: #eeeeee;
+}
+
+.nav-link.active > .fa-fw {
+    color: #eeeeee;
+}
+
+.nav-tabs {
+    border-bottom: 1px solid #415240 !important;
+}
+
+.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
+    border-top-color: #444444;
+    border-right-color: #444444;
+    border-bottom-color: #444444;
+    border-left-color: #444444;
+}
+
+.generic-content-wrapper {
+    border: 1px solid #444444;
+}
+
+#notifications {
+    background-color: #383c4a;
+}
+
+[data-bs-theme="light"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+[data-bs-theme="dark"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+.navbar {
+    --bs-navbar-color: #dddddd;
+}
+
+.navbar-banner {
+    color: #dddddd;
+}
+
+.bg-body-secondary {
+    --bs-bg-opacity: 0;
+}
--- a/ussrbasic/schema/GreenGrey-Nominus.css
+++ b/ussrbasic/schema/GreenGrey-Nominus.css
@ -3,8 +3,13 @@
    width: auto;
 }

+/* hide theme switch */
+#theme-switch {
+    visibility: hidden;
+}
+
 /* disable minus icon */
-.fa-minus-circle {
+.oneway-overlay, .fa-minus-circle {
    visibility: hidden;
 }

@ -51,6 +56,9 @@ body {
 a:link {
    color: #63bd65;
 }
+.zinlcxmi {
+    color: #63bd65;
+}

 a:visited {
    color: #87ab63;
@ -103,7 +111,7 @@ div.profile-match-wrapper > div > a {
    border: 1px solid #383c4a;
 }

-.list-group-item:hover, .list-group-item:active {
+.list-group-item:active {
    color: #f4f4f4 !important;
 }

@ -325,4 +333,71 @@ blockquote {

 .table {
    color: #dddccc;
-}
+}
+
+#upgrade_info_aside {
+    border-color: #383c4a !important;
+}
+
+.text-muted {
+    color: #a6a6b9 !important;
+}
+
+.card {
+    background-color: #434753 !important;
+}
+
+.border {
+    border: 1px solid #415240 !important;
+}
+
+.item-category, .item-category > .text-dark {
+    color: #222222 !important;
+}
+
+.nav-link:focus, .nav-link:hover {
+    color: #eeeeee;
+}
+
+.nav-link.active > .fa-fw {
+    color: #eeeeee;
+}
+
+.nav-tabs {
+    border-bottom: 1px solid #415240 !important;
+}
+
+.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
+    border-top-color: #444444;
+    border-right-color: #444444;
+    border-bottom-color: #444444;
+    border-left-color: #444444;
+}
+
+.generic-content-wrapper {
+    border: 1px solid #444444;
+}
+
+#notifications {
+    background-color: #383c4a;
+}
+
+[data-bs-theme="light"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+[data-bs-theme="dark"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+.navbar {
+    --bs-navbar-color: #dddddd;
+}
+
+.navbar-banner {
+    color: #dddddd;
+}
+
+.bg-body-secondary {   
+    --bs-bg-opacity: 0;
+}
--- a/ussrbasic/schema/GreenGrey.css
+++ b/ussrbasic/schema/GreenGrey.css
@ -3,6 +3,11 @@
    width: auto;
 }

+/* hide theme switch */
+#theme-switch {
+    visibility: hidden;
+}
+
 /* greengrey colors */
 body {
    background-color: #383c4a;
@ -46,6 +51,9 @@ body {
 a:link {
    color: #63bd65;
 }
+.zinlcxmi {
+    color: #63bd65;
+}

 a:visited {
    color: #87ab63;
@ -98,7 +106,7 @@ div.profile-match-wrapper > div > a {
    border: 1px solid #383c4a;
 }

-.list-group-item:hover, .list-group-item:active {
+.list-group-item:active {
    color: #f4f4f4 !important;
 }

@ -319,4 +327,71 @@ blockquote {

 .table {
    color: #dddccc;
-}
+}
+
+#upgrade_info_aside {
+    border-color: #383c4a !important;
+}
+
+.text-muted {
+    color: #a6a6b9 !important;
+}
+
+.card {
+    background-color: #434753 !important;
+}
+
+.border {
+    border: 1px solid #415240 !important;
+}
+
+.item-category, .item-category > .text-dark {
+    color: #222222 !important;
+}
+
+.nav-link:focus, .nav-link:hover {
+    color: #eeeeee;
+}
+
+.nav-link.active > .fa-fw {
+    color: #eeeeee;
+}
+
+.nav-tabs {
+    border-bottom: 1px solid #415240 !important;
+}
+
+.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
+    border-top-color: #444444;
+    border-right-color: #444444;
+    border-bottom-color: #444444;
+    border-left-color: #444444;
+}
+
+.generic-content-wrapper {
+    border: 1px solid #444444;
+}
+
+#notifications {
+    background-color: #383c4a;
+}
+
+[data-bs-theme="light"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+[data-bs-theme="dark"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+.navbar {
+    --bs-navbar-color: #dddddd;
+}
+
+.navbar-banner {
+    color: #dddddd;
+}
+
+.bg-body-secondary {   
+    --bs-bg-opacity: 0;
+}
--- a/ussrbasic/schema/bootstrap-nightfall.css
+++ b/ussrbasic/schema/bootstrap-nightfall.css
--- a/ussrbasic/schema/dark.css
+++ b/ussrbasic/schema/dark.css
@ -1,482 +0,0 @@
-.generic-content-wrapper {
-	background-color: transparent;
-}
-
-textarea, input, select
-{
-  color: #BBB !important;
-  background: #333 !important;
-  border-color: #2B2B2B !important;
- }
-
-#profile-jot-submit-wrapper {
-	border-top: none;
-	padding: 10px 0;
-}
-
-#jot-title {
-	border-radius: 3px;
-}
-
-#jot-title-wrap {
-	border-bottom: none;
-	margin-bottom: 5px;
-}
-
-#jot-category-wrap {
-	border-bottom: none;
-	margin-bottom: 5px;
-}
-
-.bootstrap-tagsinput {
-	background: #333;
-}
-
-optgroup {
-	color: #CCC !important;
-}
-
-option {
-	color: $link_colour !important;
-}
-
-.vcard, #contact-block, .widget {
-	background-color: transparent;
-	border: none;
-	border-bottom: 1px solid #333;
-	border-radius: 0px
-}
-
-#profile-photo-wrapper {
-	border: none;
-}
-
-#profile-edit-default-desc {
-	background-color: #665029;
-	color: #FFF;
-	padding: 20px;
-}
-
-.photo {
-	box-shadow: none;
-}
-
-.abook-pending-contact, .abook-permschange {
-	background: #402900;
-}
-
-.contact-entry-wrapper {
-	border: 1px solid #333;
-}
-
-#cboxContent a {
-	color: #000;
-}
-
-#cboxContent {
-	color: #111;
-}
-
-#adminpage table tr:hover {
-    background-color: #222;
-}
-
-#colorbox {
-	border: 0px solid #1E1E1E;
-	background-color: #1E1E1E;
-}
-
-.chat-item-text {
-	background-color: #222;
-}
-
-.fc-state-highlight {
-    background: none repeat scroll 0% 0% #333 !important;
-}
-
-.well {
-	background-color: #1E1E1E;
-	border: 1px solid #222;
-	background-image: linear-gradient(to bottom, #1E1E1E 0px, #1E1E1E 100%);
-}
-
-.alert-info, .section-content-info-wrapper {
-	color: #CCC;
-	background-color:#333;
-	border-color: #444;
-	background-image: linear-gradient(to bottom, #333 0px, #333 100%);
-}
-
-.abook-self {
-	background-color: #251111;
-}
-
-.acl-button-show,
-.acl-button-hide {
-	color: #fff;
-}
-
-#acl-select {
-	background-color:#333;
-	border: 1px solid #444;
-	color: #FFF;
-}
-
-#acl-showall {
-	color: #FFF;
-}
-
-
-#acl-list {
-	border: 1px solid #444;
-}
-
-#acl-search-wrapper {
-	border-bottom: 1px solid #444;
-}
-
-.acl-list-item {
-	border: 1px solid #222;
-	color: #CCC;
-	background-color:#333;
-}
-
-.abook-self {
-	border: 1px solid #222;
-	color: #555;
-	background-color:#111;
-}
-
-.modal-content,
-#notifications_wrapper {
-    background-color: #111;
-}
-
-.dropdown-header.text-black-50,
-.nav-link.active {
-	color:#fff !important;
-}
-
-a.btn, aside a {
-	font-weight: 400 !important;
-}
-
-.btn {
-	background-color: #1e1e1e;
-	border-color: #222;
-	color: #ccc;
-	text-shadow: none;
-	box-shadow: none;
-}
-
-.btn:hover, .btn:focus, .btn:active {
-	background-color: #222;
-	border-color: #222;
-	color: #fff;
-	text-decoration: underline;
-}
-
-.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
-	text-decoration: none;
-}
-
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
-    background-color: #337AB7;
-    color: #FFF;
-}
-
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus {
-    border-color: #204D74;
-    background-color: #286090;
-    color: #FFF;
-}
-
-.btn-success {
-    color: #FFF !important;
-    background-color: #5CB85C !important;
-    border-color: #4CAE4C !important;
-}
-
-.btn-success:hover, .btn-success:focus {
-    color: #FFF !important;
-    background-color: #449D44 !important;
-    border-color: #398439 !important;
-}
-
-.btn-warning {
-    color: #FFF !important;
-    background-color: #F0AD4E !important;
-    border-color: #EEA236 !important;
-}
-
-.btn-warning:hover, .btn-warning:focus {
-	color: #FFF !important;
-	background-color: #EC971F !important;
-	border-color: #D58512 !important;
-}
-
-.btn-danger, form#chat-destroy > input {
-    background-color: #D9534F !important;
-    border-color: #D43F3A !important;
-	color: #FFF !important;
-}
-.btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus {
-	color: #FFF !important;
-    background-color: #C9302C !important;
-    border-color: #AC2925 !important;
-}
-
-.pager_first,
-.pager_last,
-.pager_prev,
-.pager_next,
-.pager-prev,
-.pager-next,
-.pager_n {
-	border: 1px solid #222;
-	background: #1e1e1e;
-}
-
-input {
-	border: 1px solid #222;
-}
-
-input[type="submit"] {
-	background-color: #333;
-	color: #fff;
-}
-
-.notify-seen a {
-	background: #111;
-	color: #222 !important;
-}
-
-.notify-seen a:hover {
-	background: #222;
-	color: #ccc !important;
-}
-
-nav .dropdown-menu>li>a{
-	color: #fff;
-}
-
-nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
-	color: #fff;
-	background-color: #222;
-	background-image: none;
-}
-
-nav .dropdown-menu .divider{
-	background-color: #222;
-}
-
-nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
-	color: #fff;
-	background-color: #222;
-	background-image: none;
-}
-
-nav .dropdown-menu {
-	background-color: #000;
-}
-
-#nav-search-text {
-	background-color: #999;
-}
-
-.autocomplete .selected {
-	background: #999;
-}
-
-.nav-tabs {
-	border-bottom:1px solid #333;
-}
-
-.nav-tabs .nav-link.active {
-	color: #fff;
-	background-color: #111;
-	border-color: #333;
-}
-
-.nav-tabs .nav-link:hover,
-.nav-tabs .nav-link:focus {
-	text-decoration: underline;
-	background-color: #222;
-	color: #ccc;
-	border-color: #333;
-}
-
-aside .nav > li > a:hover, aside .nav > li > a:focus {
-	text-decoration: underline;
-	background-color: #222;
-}
-
-a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
-	font-weight: bold;
-}
-
-.list-group-item {
-	background-color: #222;
-}
-
-.text-dark {
-	color: #aaa !important;
-}
-a.text-dark:focus, a.text-dark:hover {
-	color: #ddd !important;
-}
-
-.group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
-	color: #fff !important;
-	text-decoration: underline !important;
-}
-
-.generic-content-wrapper-styled {
-	background-color: rgba(28,28,28,0.8);
-}
-
-.autocomplete {
-	background: #222;
-}
-
-blockquote {
-	background-color: #1e1e1e;
-	border-left: 3px solid #666;
-	color: #ccc;
-}
-
-code {
-	border: 1px solid #090909;
-	background: #000;
-	color: #fff;
-}
-
-pre {
-	background: #000;
-	color: #fff;
-	border:1px solid #090909;
-}
-
-#wiki-content-container code {
-	background: #000;
-}
-
-.notif-item a {
-	color: #ccc;
-}
-
-.notif-item a:hover {
-	color: #fff;
-}
-
-.dropdown-menu {
-	background-color: #222;
-}
-
-.dropdown-menu >li > a {
-	color: #ccc !important;
-}
-
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-    	color: #ddd;
-    	background-color: #333;
-	background-image: none;
-}
-
-.open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus {
-    color: #ccc;
-    background-color: #222;
-    border-color: #222;
-}
-
-.pmenu-item:hover a {
-	background-color: #333 !important;
-	color: #ddd;
-}
-
-.preview {
-	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
-}
-
-.xdsoft_datepicker.active {
-	color: #222 !important;
-	text-decoration: none !important;
-}
-
-.xdsoft_datepicker.active:hover, .xdsoft_datepicker.active:focus {
-	color: #222 !important;
-	text-decoration: underline;
-}
-
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #333;
-  }
-}
-
-#profile-jot-wrapper {
-	background-color: inherit;
-	border: none;
-}
-
-.nav-tabs.nav-justified {
-	background-color: inherit;
-	border: none;
-}
-
-.table-striped > tbody > tr:nth-of-type(2n+1), .table-hover > tbody > tr:hover {
-	background-color: #191919;
-}
-
-.table > tbody > tr > td {
-	border-color: #888;
-}
-
-.help-content {
-	border-bottom: #222 thin solid;
-}
-
-.help-content-open {
-  	-moz-box-shadow: 0px 3px 3px #222;
-  	-webkit-box-shadow: 0px 3px 3px #222;
-  	box-shadow: 0px 3px 3px #222;
-}
-
-.contextual-help-content-open {
-	background: $nav_bg;
-	border-bottom: #555 1px solid;
-	box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
-}
-
-.contextual-help-tool {
-	opacity: 0.5;
-}
-
-.contextual-help-tool:hover {
-	opacity: 1;
-}
-
-.contextual-help-tool i {
-	color: $link_colour;
-}
-
-
-.profile-match-wrapper {
-	width: 150px;
-	height: 120px;
-	border: none;
-}
-
-.profile-match-name {
-    	width: 144px;
-    	white-space: nowrap;
-    	text-overflow: ellipsis;
-}
-
-.widget-nav-pills-icons:hover + a {
-	background-color: #222;
-}
-
-.widget-nav-pills-checkbox:hover + a {
-	background-color: #222;
-}
--- a/ussrbasic/schema/dark.php
+++ b/ussrbasic/schema/dark.php
@ -1,41 +0,0 @@
-<?php
-	
-	if (! $nav_bg)
-		$nav_bg = "#000";
-	if (! $nav_gradient_top)
-		$nav_gradient_top = "#000";
-	if (! $nav_gradient_bottom)
-		$nav_gradient_bottom = "#000";
-	if (! $nav_active_gradient_top)
-		$nav_active_gradient_top = "#333";
-	if (! $nav_active_gradient_bottom)
-		$nav_active_gradient_bottom = "#111";
-	if (! $nav_bd)
-		$nav_bd = "#111";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "#999";
-	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "#fff";
-	if (! $link_colour)
-		$link_colour = "#fff";
-	if (! $banner_colour)
-		$banner_colour = "#999";
-	if (! $bgcolour)
-		$bgcolour = "#111";
-	if (! $item_colour)
-		$item_colour = "rgba(28,28,28,0.8)";
-	if (! $comment_item_colour)
-		$comment_item_colour = "rgba(18,18,18,0.4)";
-	if (! $comment_border_colour)
-		$comment_border_colour = "rgba(28,28,28,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#999';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#fff';
-	if (! $font_colour)
-		$font_colour = "#ccc";
-	if (! $converse_width)
-		$converse_width = "1024";
-		
-
-
--- a/ussrbasic/schema/zlax.css
+++ b/ussrbasic/schema/zlax.css
@ -3,6 +3,11 @@
    width: auto;
 }

+/* hide theme switch */
+#theme-switch {
+    visibility: hidden;
+}
+
 /* disable allcontact link in profile */
 .allcontact-link {
    display: none;
@ -17,12 +22,12 @@
 }

 /* disable minus icon */
-.fa-minus-circle {
+.oneway-overlay, .fa-minus-circle {
    visibility: hidden;
 }

 /* personal zlax file insted tags title */
-div.tagblock > h3 {
+div.tagblock:nth-child(3) > h3:nth-child(1) {
    position: relative;
    left: 33%;
    content: url(https://ussr.win/photo/73e2201da875ccae6fecadfcf8ccba55c6c8ac093634d2e4af8e0f3cec1f2de3.gif);
@ -71,6 +76,9 @@ body {
 a:link {
    color: #63bd65;
 }
+.zinlcxmi {
+    color: #63bd65;
+}

 a:visited {
    color: #87ab63;
@ -123,7 +131,7 @@ div.profile-match-wrapper > div > a {
    border: 1px solid #383c4a;
 }

-.list-group-item:hover, .list-group-item:active {
+.list-group-item:active {
    color: #f4f4f4 !important;
 }

@ -345,4 +353,71 @@ blockquote {

 .table {
    color: #dddccc;
-}
+}
+
+#upgrade_info_aside {
+    border-color: #383c4a !important;
+}
+
+.text-muted {
+    color: #a6a6b9 !important;
+}
+
+.card {
+    background-color: #434753 !important;
+}
+
+.border {
+    border: 1px solid #415240 !important;
+}
+
+.item-category, .item-category > .text-dark {
+    color: #222222 !important;
+}
+
+.nav-link:focus, .nav-link:hover {
+    color: #eeeeee;
+}
+
+.nav-link.active > .fa-fw {
+    color: #eeeeee;
+}
+
+.nav-tabs {
+    border-bottom: 1px solid #415240 !important;
+}
+
+.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active {
+    border-top-color: #444444;
+    border-right-color: #444444;
+    border-bottom-color: #444444;
+    border-left-color: #444444;
+}
+
+.generic-content-wrapper {
+    border: 1px solid #444444;
+}
+
+#notifications {
+    background-color: #383c4a;
+}
+
+[data-bs-theme="light"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+[data-bs-theme="dark"] .navbar.bg-body-tertiary {
+    background-color: #2e323e !important;
+}
+
+.navbar {
+    --bs-navbar-color: #dddddd;
+}
+
+.navbar-banner {
+    color: #dddddd;
+}
+
+.bg-body-secondary {   
+    --bs-bg-opacity: 0;
+}
--- a/ussrbasic/tpl/suggest_widget.tpl
+++ b/ussrbasic/tpl/suggest_widget.tpl
@ -1,10 +0,0 @@
-<div class="widget suggestions-widget">
-<h3>{{$title}}</h3>
-{{if $entries}}
-{{foreach $entries as $child}}
-{{include file="suggest_friends.tpl" entry=$child}}
-{{/foreach}}
-{{/if}}
-<div class="clear"></div>
-<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
-</div>
--- a/ussrbasic/tpl/theme_settings.tpl
+++ b/ussrbasic/tpl/theme_settings.tpl
@ -1,31 +1,33 @@
+{{include file="field_checkbox.tpl" field=$dark_mode}}
 {{include file="field_checkbox.tpl" field=$narrow_navbar}}
 {{include file="field_input.tpl" field=$converse_width}}
 {{include file="field_input.tpl" field=$font_size}}
 {{include file="field_checkbox.tpl" field=$advanced_theming}}
+
 {{if $expert}}
+	<h3>{{$light}}</h3>
+	{{include file="field_checkbox.tpl" field=$navbar_dark_mode}}
 	{{include file="field_colorinput.tpl" field=$nav_bg}}
-	{{include file="field_colorinput.tpl" field=$nav_icon_colour}}
-	{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
-	{{include file="field_colorinput.tpl" field=$banner_colour}}
-	{{include file="field_colorinput.tpl" field=$bgcolour}}
+	{{include file="field_colorinput.tpl" field=$bgcolor}}
 	{{include file="field_colorinput.tpl" field=$background_image}}
-	{{include file="field_colorinput.tpl" field=$item_colour}}
-	{{include file="field_colorinput.tpl" field=$comment_item_colour}}
-	{{*include file="field_colorinput.tpl" field=$comment_border_colour*}}
-	{{*include file="field_input.tpl" field=$comment_indent*}}
-	{{include file="field_colorinput.tpl" field=$font_colour}}
-	{{include file="field_colorinput.tpl" field=$link_colour}}
+	{{include file="field_colorinput.tpl" field=$link_color}}
+	{{include file="field_colorinput.tpl" field=$link_hover_color}}
+
+	<h3>{{$dark}}</h3>
+	{{include file="field_colorinput.tpl" field=$nav_bg_dark}}
+	{{include file="field_colorinput.tpl" field=$bgcolor_dark}}
+	{{include file="field_colorinput.tpl" field=$background_image_dark}}
+	{{include file="field_colorinput.tpl" field=$link_color_dark}}
+	{{include file="field_colorinput.tpl" field=$link_hover_color_dark}}
+
+	<h3>{{$common}}</h3>
 	{{include file="field_input.tpl" field=$radius}}
-	{{include file="field_input.tpl" field=$shadow}}
 	{{include file="field_input.tpl" field=$top_photo}}
 	{{include file="field_input.tpl" field=$reply_photo}}

 <script>
 	$(function(){
-		$('#id_ussrbasic_nav_bg, #id_ussrbasic_nav_icon_colour, #id_ussrbasic_nav_active_icon_colour, #id_ussrbasic_banner_colour').colorpicker({format: 'rgba'});
-		$('#id_ussrbasic_link_colour,#id_ussrbasic_background_colour').colorpicker();
-		$('#id_ussrbasic_toolicon_colour,#id_ussrbasic_toolicon_activecolour,#id_ussrbasic_font_colour').colorpicker();
-		$('#id_ussrbasic_item_colour,#id_ussrbasic_comment_item_colour,#id_ussrbasic_comment_border_colour').colorpicker({format: 'rgba'});
+		$('#id_ussrbasic_link_color, #id_ussrbasic_link_color_dark, #id_ussrbasic_link_hover_color, #id_ussrbasic_link_hover_color_dark, #id_ussrbasic_background_color, #id_ussrbasic_background_color_dark, #id_ussrbasic_nav_bg, #id_ussrbasic_nav_bg_dark').colorpicker({format: 'rgba'});
 	});
 </script>
 {{/if}}
--- a/ussrbasicleft/css/blockmode.css
+++ b/ussrbasicleft/css/blockmode.css
@ -1,15 +0,0 @@
-
-.wall-item-content.conv-list-mode {
-	max-width: 280px;
-	height:200px;
-	min-height: 200px;
-	overflow: hidden;
-}
-
-.thread-wrapper.toplevel_item.conv-list-mode {
-	width: 300px;
-	height: 300px; 
-	float: left;
-	margin-left: 5px;
-	margin-bottom: 35px;
-}
--- a/ussrbasicleft/css/mod_page.css
+++ b/ussrbasicleft/css/mod_page.css
@ -1,24 +0,0 @@
-/*
-section {
-left: 0px;
-width: 800px;
-margin-left: auto;
-margin-right: auto;
-}
-body {background-color: #d00 !important;}
-
-.page-content-wrapper {background: #fff;
-		color: #000;
-		border-radius: 20px;
-		box-shadow: 5px 5px 5px #111;
-}
-
-h3.page-title {
-padding-top: 30px;
-		color: #033}
-.page-body {padding: 40px;}
-
-.page-body strong {color: #033;}
-
-.nav-links {margin-top: 5px;}
-*/
--- a/ussrbasicleft/css/narrow_navbar.css
+++ b/ussrbasicleft/css/narrow_navbar.css
@ -1,30 +0,0 @@
-@media screen and (min-width: 767px) {
-
-	nav.navbar {
-		padding-top: 1px;
-		padding-bottom: 1px
-	}
-
-	nav .badge {
-		top: 0px;
-		left: -0.25rem;
-	}
-
-	.contextual-help-content-open {
-		top: 2.5rem;
-	}
-
-	aside {
-		padding-top: 3.5rem;
-	}
-
-	section {
-		padding-top: 3.5rem;
-	}
-
-	#jGrowl.top-right {
-		top: 3.5rem;
-		right: 15px;
-	}
-
-}
--- a/ussrbasicleft/css/sloppy_photos.css
+++ b/ussrbasicleft/css/sloppy_photos.css
@ -1,58 +0,0 @@
-
-.rotleft1 {
-webkit-transform: rotate(-1deg);
-moz-transform: rotate(-1deg);
-ms-transform: rotate(-1deg);
-o-transform: rotate(-1deg);
-}
-
-.rotleft2 {
-webkit-transform: rotate(-2deg);
-moz-transform: rotate(-2deg);
-ms-transform: rotate(-2deg);
-o-transform: rotate(-2deg);
-}
-
-.rotleft3 {
-webkit-transform: rotate(-3deg);
-moz-transform: rotate(-3deg);
-ms-transform: rotate(-3deg);
-o-transform: rotate(-3deg);
-}
-
-.rotleft4 {
-webkit-transform: rotate(-4deg);
-moz-transform: rotate(-4deg);
-ms-transform: rotate(-4deg);
-o-transform: rotate(-4deg);
-}
-
-
-.rotright1 {
-webkit-transform: rotate(1deg);
-moz-transform: rotate(1deg);
-ms-transform: rotate(1deg);
-o-transform: rotate(1deg);
-}
-
-.rotright2 {
-webkit-transform: rotate(2deg);
-moz-transform: rotate(2deg);
-ms-transform: rotate(2deg);
-o-transform: rotate(2deg);
-}
-
-.rotright3 {
-webkit-transform: rotate(3deg);
-moz-transform: rotate(3deg);
-ms-transform: rotate(3deg);
-o-transform: rotate(3deg);
-}
-
-.rotright4 {
-webkit-transform: rotate(4deg);
-moz-transform: rotate(4deg);
-ms-transform: rotate(4deg);
-o-transform: rotate(4deg);
-}
-
--- a/ussrbasicleft/css/style.css
+++ b/ussrbasicleft/css/style.css
--- a/ussrbasicleft/img/gray_and_black_diagonal_stripes_background_seamless.gif
+++ b/ussrbasicleft/img/gray_and_black_diagonal_stripes_background_seamless.gif
--- a/ussrbasicleft/img/gray_and_white_diagonal_stripes_background_seamless.gif
+++ b/ussrbasicleft/img/gray_and_white_diagonal_stripes_background_seamless.gif
--- a/ussrbasicleft/img/screenshot.png
+++ b/ussrbasicleft/img/screenshot.png
--- a/ussrbasicleft/js/ussrbasicleft.js
+++ b/ussrbasicleft/js/ussrbasicleft.js
@ -1,129 +0,0 @@
-/**
- * ussrbasicleft theme specific JavaScript
- */
-
-$(document).ready(function() {
-
-	// CSS3 calc() fallback (for unsupported browsers)
-	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
-	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')
-		$('<div id="overlay"></div>').appendTo('section');
-		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true) + 10,
-			parent: '#region_1',
-			spacer: '#left_aside_spacer'
-		});
-	}
-}
--- a/ussrbasicleft/pdl/mod_admin.pdl
+++ b/ussrbasicleft/pdl/mod_admin.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=admin][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_appman.pdl
+++ b/ussrbasicleft/pdl/mod_appman.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=appcategories][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_apps.pdl
+++ b/ussrbasicleft/pdl/mod_apps.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=appstore][/widget]
-[widget=appcategories][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_articles.pdl
+++ b/ussrbasicleft/pdl/mod_articles.pdl
@ -1,10 +0,0 @@
-[region=aside]
-[widget=archive][var=articles]1[/var][/widget]
-[widget=categories][var=articles]1[/var][/widget]
-[widget=tasklist][/widget]
-[widget=notes][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_blocks.pdl
+++ b/ussrbasicleft/pdl/mod_blocks.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_cal.pdl
+++ b/ussrbasicleft/pdl/mod_cal.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_cards.pdl
+++ b/ussrbasicleft/pdl/mod_cards.pdl
@ -1,9 +0,0 @@
-[region=aside]
-[widget=categories][var=cards]1[/var][/widget]
-[widget=tasklist][/widget]
-[widget=notes][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_cdav.pdl
+++ b/ussrbasicleft/pdl/mod_cdav.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=cdav][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_channel.pdl
+++ b/ussrbasicleft/pdl/mod_channel.pdl
@ -1,14 +0,0 @@
-[region=banner]
-[widget=cover_photo][/widget]
-[/region]
-[region=aside]
-[widget=notifications][/widget]
-[widget=fullprofile][/widget]
-[widget=tagcloud_wall][var=limit]50[/var][/widget]
-[widget=categories][/widget]
-[widget=archive][var=wall]1[/var][/widget]
-[widget=common_friends][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_chanview.pdl
+++ b/ussrbasicleft/pdl/mod_chanview.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=notifications][/widget]
-[widget=vcard][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_chat.pdl
+++ b/ussrbasicleft/pdl/mod_chat.pdl
@ -1,11 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=chatroom_list][/widget]
-[widget=bookmarkedchats][/widget]
-[widget=suggestedchats][/widget]
-[widget=chatroom_members][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_cloud.pdl
+++ b/ussrbasicleft/pdl/mod_cloud.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_common.pdl
+++ b/ussrbasicleft/pdl/mod_common.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_connect.pdl
+++ b/ussrbasicleft/pdl/mod_connect.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=profile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_connections.pdl
+++ b/ussrbasicleft/pdl/mod_connections.pdl
@ -1,10 +0,0 @@
-[region=aside]
-[widget=follow][/widget]
-[widget=collections][var=mode][connections[/arg][/widget]
-[widget=suggestions][/widget]
-[widget=findpeople][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_connedit.pdl
+++ b/ussrbasicleft/pdl/mod_connedit.pdl
@ -1,10 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=collections][var=mode]abook[/var][/widget]
-[widget=suggestions][/widget]
-[widget=findpeople][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_defperms.pdl
+++ b/ussrbasicleft/pdl/mod_defperms.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=settings_menu][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_directory.pdl
+++ b/ussrbasicleft/pdl/mod_directory.pdl
@ -1,10 +0,0 @@
-[region=aside]
-[widget=findpeople][/widget]
-[widget=dirsort][/widget]
-[widget=dirtags][/widget]
-[widget=suggestions][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_display.pdl
+++ b/ussrbasicleft/pdl/mod_display.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_editblock.pdl
+++ b/ussrbasicleft/pdl/mod_editblock.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_editlayout.pdl
+++ b/ussrbasicleft/pdl/mod_editlayout.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_editwebpage.pdl
+++ b/ussrbasicleft/pdl/mod_editwebpage.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_go.pdl
+++ b/ussrbasicleft/pdl/mod_go.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_group.pdl
+++ b/ussrbasicleft/pdl/mod_group.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=collections][var=mode]groups[/var][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_help.pdl
+++ b/ussrbasicleft/pdl/mod_help.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=helpindex][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_hq.pdl
+++ b/ussrbasicleft/pdl/mod_hq.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=hq_controls][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_id.pdl
+++ b/ussrbasicleft/pdl/mod_id.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_layouts.pdl
+++ b/ussrbasicleft/pdl/mod_layouts.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_locs.pdl
+++ b/ussrbasicleft/pdl/mod_locs.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=settings_menu][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_mail.pdl
+++ b/ussrbasicleft/pdl/mod_mail.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=mailmenu][/widget]
-[widget=conversations][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_menu.pdl
+++ b/ussrbasicleft/pdl/mod_menu.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_message.pdl
+++ b/ussrbasicleft/pdl/mod_message.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=mailmenu][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_mitem.pdl
+++ b/ussrbasicleft/pdl/mod_mitem.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=menu_preview][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_moderate.pdl
+++ b/ussrbasicleft/pdl/mod_moderate.pdl
@ -1,6 +0,0 @@
-[region=aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_network.pdl
+++ b/ussrbasicleft/pdl/mod_network.pdl
@ -1,17 +0,0 @@
-[region=aside]
-[widget=notifications][/widget]
-[widget=activity_order][/widget]
-[widget=activity_filter][/widget]
-[widget=savedsearch][/widget]
-[widget=suggestions][/widget]
-[widget=notes][/widget]
-[widget=newmember][/widget]
-[/region]
-
-[region=content]
-[widget=affinity][/widget]
-$content
-[/region]
-
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_photos.pdl
+++ b/ussrbasicleft/pdl/mod_photos.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=photo_albums][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_profile.pdl
+++ b/ussrbasicleft/pdl/mod_profile.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_profile_photo.pdl
+++ b/ussrbasicleft/pdl/mod_profile_photo.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_profiles.pdl
+++ b/ussrbasicleft/pdl/mod_profiles.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_profperm.pdl
+++ b/ussrbasicleft/pdl/mod_profperm.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_pubstream.pdl
+++ b/ussrbasicleft/pdl/mod_pubstream.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_rate.pdl
+++ b/ussrbasicleft/pdl/mod_rate.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_ratings.pdl
+++ b/ussrbasicleft/pdl/mod_ratings.pdl
@ -1,11 +0,0 @@
-[region=aside]
-[widget=pubsites][/widget]
-[widget=vcard][/widget]
-[widget=rating][/widget]
-[widget=suggestions][/widget]
-[widget=findpeople][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_search.pdl
+++ b/ussrbasicleft/pdl/mod_search.pdl
@ -1,6 +0,0 @@
-[region=aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_settings.pdl
+++ b/ussrbasicleft/pdl/mod_settings.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=settings_menu][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_sharedwithme.pdl
+++ b/ussrbasicleft/pdl/mod_sharedwithme.pdl
@ -1,6 +0,0 @@
-[region=aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_sources.pdl
+++ b/ussrbasicleft/pdl/mod_sources.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=settings_menu][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_suggest.pdl
+++ b/ussrbasicleft/pdl/mod_suggest.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=follow][/widget]
-[widget=findpeople][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_thing.pdl
+++ b/ussrbasicleft/pdl/mod_thing.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_uexport.pdl
+++ b/ussrbasicleft/pdl/mod_uexport.pdl
@ -1,6 +0,0 @@
-[region=aside]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_viewconnections.pdl
+++ b/ussrbasicleft/pdl/mod_viewconnections.pdl
@ -1,7 +0,0 @@
-[region=aside]
-[widget=fullprofile][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_webpages.pdl
+++ b/ussrbasicleft/pdl/mod_webpages.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=design_tools][/widget]
-[widget=website_portation_tools][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/pdl/mod_wiki.pdl
+++ b/ussrbasicleft/pdl/mod_wiki.pdl
@ -1,8 +0,0 @@
-[region=aside]
-[widget=vcard][/widget]
-[widget=wiki_pages][/widget]
-[widget=notifications][/widget]
-[widget=newmember][/widget]
-[/region]
-[region=right_aside]
-[/region]
--- a/ussrbasicleft/php/config.php
+++ b/ussrbasicleft/php/config.php
@ -1,128 +0,0 @@
-<?php
-
-namespace Zotlabs\Theme;
-
-class UssrbasicleftConfig {
-
-	function get_schemas() {
-		$files = glob('view/theme/ussrbasicleft/schema/*.php');
-
-		$scheme_choices = [];
-
-		if($files) {
-
-			if(in_array('view/theme/ussrbasicleft/schema/default.php', $files)) {
-				$scheme_choices['---'] = t('Default');
-				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
-			}
-			else {
-				$scheme_choices['---'] = t('Focus (Hubzilla default)');
-			}
-
-			foreach($files as $file) {
-				$f = basename($file, ".php");
-				if($f != 'default') {
-					$scheme_name = $f;
-					$scheme_choices[$f] = $scheme_name;
-				}
-			}
-		}
-
-		return $scheme_choices;
-	}
-
-	function get() {
-		if(! local_channel()) { 
-			return;
-		}
-
-		$arr = array();
-		$arr['narrow_navbar'] = get_pconfig(local_channel(),'ussrbasicleft', 'narrow_navbar' );
-		$arr['nav_bg'] = get_pconfig(local_channel(),'ussrbasicleft', 'nav_bg' );
-		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'nav_icon_colour' );
-		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'nav_active_icon_colour' );
-		$arr['link_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'link_colour' );
-		$arr['banner_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'banner_colour' );
-		$arr['bgcolour'] = get_pconfig(local_channel(),'ussrbasicleft', 'background_colour' );
-		$arr['background_image'] = get_pconfig(local_channel(),'ussrbasicleft', 'background_image' );
-		$arr['item_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'item_colour' );
-		$arr['comment_item_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'comment_item_colour' );
-		$arr['font_size'] = get_pconfig(local_channel(),'ussrbasicleft', 'font_size' );
-		$arr['font_colour'] = get_pconfig(local_channel(),'ussrbasicleft', 'font_colour' );
-		$arr['radius'] = get_pconfig(local_channel(),'ussrbasicleft', 'radius' );
-		$arr['shadow'] = get_pconfig(local_channel(),'ussrbasicleft', 'photo_shadow' );
-		$arr['converse_width']=get_pconfig(local_channel(),"ussrbasicleft","converse_width");
-		$arr['top_photo']=get_pconfig(local_channel(),"ussrbasicleft","top_photo");
-		$arr['reply_photo']=get_pconfig(local_channel(),"ussrbasicleft","reply_photo");
-		$arr['advanced_theming'] = get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming');
-		return $this->form($arr);
-	}
-
-	function post() {
-		if(!local_channel()) { 
-			return;
-		}
-
-		if (isset($_POST['ussrbasicleft-settings-submit'])) {
-			set_pconfig(local_channel(), 'ussrbasicleft', 'narrow_navbar', $_POST['ussrbasicleft_narrow_navbar']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'nav_bg', $_POST['ussrbasicleft_nav_bg']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'nav_icon_colour', $_POST['ussrbasicleft_nav_icon_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'nav_active_icon_colour', $_POST['ussrbasicleft_nav_active_icon_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'link_colour', $_POST['ussrbasicleft_link_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'background_colour', $_POST['ussrbasicleft_background_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'banner_colour', $_POST['ussrbasicleft_banner_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'background_image', $_POST['ussrbasicleft_background_image']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'item_colour', $_POST['ussrbasicleft_item_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'comment_item_colour', $_POST['ussrbasicleft_comment_item_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'font_size', $_POST['ussrbasicleft_font_size']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'font_colour', $_POST['ussrbasicleft_font_colour']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'radius', $_POST['ussrbasicleft_radius']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'photo_shadow', $_POST['ussrbasicleft_shadow']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'converse_width', $_POST['ussrbasicleft_converse_width']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'top_photo', $_POST['ussrbasicleft_top_photo']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'reply_photo', $_POST['ussrbasicleft_reply_photo']);
-			set_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming', $_POST['ussrbasicleft_advanced_theming']);
-		}
-	}
-
-	function form($arr) {
-
-		if(get_pconfig(local_channel(), 'ussrbasicleft', 'advanced_theming'))
-			$expert = 1;
-					
-	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
-			'$submit' => t('Submit'),
-			'$baseurl' => z_root(),
-			'$theme' => \App::$channel['channel_theme'],
-			'$expert' => $expert,
-			'$title' => t("Theme settings"),
-			'$narrow_navbar' => array('ussrbasicleft_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
-			'$nav_bg' => array('ussrbasicleft_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
-			'$nav_icon_colour' => array('ussrbasicleft_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
-			'$nav_active_icon_colour' => array('ussrbasicleft_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
-			'$link_colour' => array('ussrbasicleft_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
-			'$banner_colour' => array('ussrbasicleft_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
-			'$bgcolour' => array('ussrbasicleft_background_colour', t('Set the background color'), $arr['bgcolour']),
-			'$background_image' => array('ussrbasicleft_background_image', t('Set the background image'), $arr['background_image']),	
-			'$item_colour' => array('ussrbasicleft_item_colour', t('Set the background color of items'), $arr['item_colour']),
-			'$comment_item_colour' => array('ussrbasicleft_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
-			'$font_size' => array('ussrbasicleft_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
-			'$font_colour' => array('ussrbasicleft_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
-			'$radius' => array('ussrbasicleft_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
-			'$shadow' => array('ussrbasicleft_shadow', t('Set shadow depth of photos'), $arr['shadow']),
-			'$converse_width' => array('ussrbasicleft_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
-			'$top_photo' => array('ussrbasicleft_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
-			'$reply_photo' => array('ussrbasicleft_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
-			'$advanced_theming' => ['ussrbasicleft_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
-			));
-
-		return $o;
-	}
-
-}
-
-
-
-
-
-
--- a/ussrbasicleft/php/style.php
+++ b/ussrbasicleft/php/style.php
@ -1,163 +0,0 @@
-<?php
-
-if(! App::$install) {
-
-	// Get the UID of the channel owner
-	$uid = get_theme_uid();
-
-	if($uid) {
-		load_pconfig($uid,'ussrbasicleft');
-	}
-
-	// Load the owners pconfig
-	$nav_bg = get_pconfig($uid, 'ussrbasicleft', 'nav_bg');
-	$nav_icon_colour = get_pconfig($uid, 'ussrbasicleft', 'nav_icon_colour');
-	$nav_active_icon_colour = get_pconfig($uid, 'ussrbasicleft', 'nav_active_icon_colour');
-	$banner_colour = get_pconfig($uid,'ussrbasicleft','banner_colour');
-	$narrow_navbar = get_pconfig($uid,'ussrbasicleft','narrow_navbar');
-	$link_colour = get_pconfig($uid, 'ussrbasicleft', 'link_colour');
-	$schema = get_pconfig($uid,'ussrbasicleft','schema');
-	$bgcolour = get_pconfig($uid, 'ussrbasicleft', 'background_colour');
-	$background_image = get_pconfig($uid, 'ussrbasicleft', 'background_image');
-	$item_colour = get_pconfig($uid, 'ussrbasicleft', 'item_colour');
-	$comment_item_colour = get_pconfig($uid, 'ussrbasicleft', 'comment_item_colour');
-	$font_size = get_pconfig($uid, 'ussrbasicleft', 'font_size');
-	$font_colour = get_pconfig($uid, 'ussrbasicleft', 'font_colour');
-	$radius = get_pconfig($uid, 'ussrbasicleft', 'radius');
-	$shadow = get_pconfig($uid,'ussrbasicleft','photo_shadow');
-	$converse_width=get_pconfig($uid,'ussrbasicleft','converse_width');
-	$top_photo=get_pconfig($uid,'ussrbasicleft','top_photo');
-	$reply_photo=get_pconfig($uid,'ussrbasicleft','reply_photo');
-}
-
-// Now load the scheme.  If a value is changed above, we'll keep the settings
-// If not, we'll keep those defined by the schema
-// Setting $schema to '' wasn't working for some reason, so we'll check it's
-// not --- like the mobile theme does instead.
-
-// Allow layouts to over-ride the schema
-
-if($_REQUEST['schema']) {
-	$schema = $_REQUEST['schema'];
-}
-
-if (($schema) && ($schema != '---')) {
-
-	// Check it exists, because this setting gets distributed to clones
-	if(file_exists('view/theme/ussrbasicleft/schema/' . $schema . '.php')) {
-		$schemefile = 'view/theme/ussrbasicleft/schema/' . $schema . '.php';
-		require_once ($schemefile);
-	}
-
-	if(file_exists('view/theme/ussrbasicleft/schema/' . $schema . '.css')) {
-		$schemecss = file_get_contents('view/theme/ussrbasicleft/schema/' . $schema . '.css');
-	}
-
-}
-
-// Allow admins to set a default schema for the hub.
-// default.php and default.css MUST be symlinks to existing schema files in view/theme/ussrbasicleft/schema
-if ((!$schema) || ($schema == '---')) {
-
-	if(file_exists('view/theme/ussrbasicleft/schema/default.php')) {
-		$schemefile = 'view/theme/ussrbasicleft/schema/default.php';
-		require_once ($schemefile);
-	}
-
-	if(file_exists('view/theme/ussrbasicleft/schema/default.css')) {
-		$schemecss = file_get_contents('view/theme/ussrbasicleft/schema/default.css');
-	}
-
-}
-		
-//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
-//individually.  If we don't, we'll have problems if a user has set one, but not all options.
-if (! $nav_bg)
-	$nav_bg = '#343a40';
-if (! $nav_icon_colour)
-	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
-if (! $nav_active_icon_colour)
-	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
-if (! $link_colour)
-	$link_colour = '#007bff';
-if (! $banner_colour)
-	$banner_colour = '#fff';
-if (! $bgcolour)
-	$bgcolour = 'rgb(254,254,254)';
-if (! $background_image)
-	$background_image ='';
-if (! $item_colour)
-	$item_colour = 'rgb(238,238,238)';
-if (! $comment_item_colour)
-	$comment_item_colour = 'rgb(255,255,255)';
-if (! $item_opacity)
-	$item_opacity = '1';
-if (! $font_size)
-	$font_size = '0.875rem';
-if (! $font_colour)
-	$font_colour = '#4d4d4d';
-if (! $radius)
-	$radius = '0.25rem';
-if (! $shadow)
-	$shadow = '0';
-if (! $converse_width)
-	$converse_width = '790';
-if(! $top_photo)
-	$top_photo = '2.3rem';
-if(! $reply_photo)
-	$reply_photo = '2.3rem';
-
-// Apply the settings
-if(file_exists('view/theme/ussrbasicleft/css/style.css')) {
-
-	$x = file_get_contents('view/theme/ussrbasicleft/css/style.css');
-
-	if($narrow_navbar && file_exists('view/theme/ussrbasicleft/css/narrow_navbar.css')) {
-		$x .= file_get_contents('view/theme/ussrbasicleft/css/narrow_navbar.css');
-	}
-
-	if($schemecss) {
-		$x .= $schemecss;
-	}
-
-	$aside_width = 288;
-
-	// left aside and right aside are 285px + converse width
-	$main_width = (($aside_width * 2) + intval($converse_width));
-
-	// prevent main_width smaller than 768px
-	$main_width = (($main_width < 768) ? 768 : $main_width);
-
-	$options = array (
-		'$nav_bg' => $nav_bg,
-		'$nav_icon_colour' => $nav_icon_colour,
-		'$nav_active_icon_colour' => $nav_active_icon_colour,
-		'$link_colour' => $link_colour,
-		'$banner_colour' => $banner_colour,
-		'$bgcolour' => $bgcolour,
-		'$background_image' => $background_image,
-		'$item_colour' => $item_colour,
-		'$comment_item_colour' => $comment_item_colour,
-		'$font_size' => $font_size,
-		'$font_colour' => $font_colour,
-		'$radius' => $radius,
-		'$shadow' => $shadow,
-		'$converse_width' => $converse_width,
-		'$nav_float_min_opacity' => $nav_float_min_opacity,
-		'$nav_percent_min_opacity' => $nav_percent_min_opacity,
-		'$top_photo' => $top_photo,
-		'$reply_photo' => $reply_photo,
-		'$pmenu_top' => $pmenu_top,
-		'$pmenu_reply' => $pmenu_reply,
-		'$main_width' => $main_width,
-		'$aside_width' => $aside_width
-	);
-
-	echo str_replace(array_keys($options), array_values($options), $x);
-
-}
-
-// 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'] != 'ussrbasicleft')
-// 	set_pconfig(local_channel(), 'ussrbasicleft', 'schema', '---');
--- a/ussrbasicleft/php/theme.php
+++ b/ussrbasicleft/php/theme.php
@ -1,16 +0,0 @@
-<?php
-
-/**
- *   * Name: Ussrbasicleft
- *   * Description: 2 column, left navigation panel
- *   * Version: 4.4.2
- *   * MinVersion: 3.8
- *   * MaxVersion: 6.0
- *   * Author: Fabrixxm
- */
-
-function ussrbasicleft_init(&$a) {
-
-App::$theme_info['extends'] = 'redbasic';
-
-}
--- a/ussrbasicleft/php/theme_init.php
+++ b/ussrbasicleft/php/theme_init.php
@ -1,17 +0,0 @@
-<?php
-
-head_add_css('/library/fork-awesome/css/fork-awesome.min.css');
-head_add_css('/vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
-head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
-head_add_css('/view/css/bootstrap-red.css');
-head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
-head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
-require_once('view/php/theme_init.php');
-
-head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');
-head_add_js('/library/bootbox/bootbox.min.js');
-head_add_js('/library/bootstrap-tagsinput/bootstrap-tagsinput.js');
-head_add_js('/library/datetimepicker/jquery.datetimepicker.js');
-head_add_js('/library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
-
-
--- a/ussrbasicleft/schema/Focus-Boxy.css
+++ b/ussrbasicleft/schema/Focus-Boxy.css
@ -1,15 +0,0 @@
-.comment .wall-item-body {
-	padding-left: 42px;
-}
-
-.wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #dee2e6;
-}
-
-.widget {
-	border: 1px solid #dee2e6;
-}
-
-#note-text {
-	border: 1px solid transparent;
-}
--- a/ussrbasicleft/schema/Focus-Boxy.php
+++ b/ussrbasicleft/schema/Focus-Boxy.php
@ -1,6 +0,0 @@
-<?php
-
-if (! $radiuspx)
-	$radiuspx = "4";
-if (! $comment_border_colour)
-	$comment_border_colour = "rgb(238,238,238)";
--- a/ussrbasicleft/schema/Focus-Light.css
+++ b/ussrbasicleft/schema/Focus-Light.css
@ -1,5 +0,0 @@
-.dropdown-header.text-white-50,
-.navbar-dark .navbar-toggler,
-.navbar-dark .nav-link.active {
-	color: rgba(0,0,0,0.7) !important;
-}
--- a/ussrbasicleft/schema/Focus-Light.php
+++ b/ussrbasicleft/schema/Focus-Light.php
@ -1,12 +0,0 @@
-<?php
-	
-	if (! $nav_bg)
-		$nav_bg = "#f8f9fa";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "rgba(0, 0, 0, 0.5);";
-	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
-	if (! $radius)
-		$radius = "4px";
-	if (! $banner_colour)
-		$banner_colour = "rgba(0, 0, 0, 0.7)";
--- a/ussrbasicleft/schema/Focus-Nolikes.css
+++ b/ussrbasicleft/schema/Focus-Nolikes.css
@ -1,24 +0,0 @@
-/* disable likes */
-.wall-item-like {
-    visibility: hidden;
-}
-.wall-item-tools-right > .btn-group > .btn:first-child {
-    visibility: hidden;
-}
-
-/* focus base */
-.comment .wall-item-body {
-	padding-left: 42px;
-}
-
-.wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #dee2e6;
-}
-
-.widget {
-	border: 1px solid #dee2e6;
-}
-
-#note-text {
-	border: 1px solid transparent;
-}
--- a/ussrbasicleft/schema/Focus-Nolikes.php
+++ b/ussrbasicleft/schema/Focus-Nolikes.php
@ -1,2 +0,0 @@
-<?php
-
--- a/ussrbasicleft/schema/Focus-Nominus-Nolikes.css
+++ b/ussrbasicleft/schema/Focus-Nominus-Nolikes.css
@ -1,29 +0,0 @@
-/* disable minus icon */
-.fa-minus-circle {
-    visibility: hidden;
-}
-
-/* disable likes */
-.wall-item-like {
-    visibility: hidden;
-}
-.wall-item-tools-right > .btn-group > .btn:first-child {
-    visibility: hidden;
-}
-
-/* focus base */
-.comment .wall-item-body {
-	padding-left: 42px;
-}
-
-.wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #dee2e6;
-}
-
-.widget {
-	border: 1px solid #dee2e6;
-}
-
-#note-text {
-	border: 1px solid transparent;
-}
--- a/ussrbasicleft/schema/Focus-Nominus-Nolikes.php
+++ b/ussrbasicleft/schema/Focus-Nominus-Nolikes.php
@ -1,2 +0,0 @@
-<?php
-
--- a/ussrbasicleft/schema/Focus-Nominus.css
+++ b/ussrbasicleft/schema/Focus-Nominus.css
@ -1,21 +0,0 @@
-/* disable minus icon */
-.fa-minus-circle {
-    visibility: hidden;
-}
-
-/* focus base */
-.comment .wall-item-body {
-	padding-left: 42px;
-}
-
-.wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #dee2e6;
-}
-
-.widget {
-	border: 1px solid #dee2e6;
-}
-
-#note-text {
-	border: 1px solid transparent;
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ivan	f8d24aee90	v9.0	2024-03-26 14:56:38 +03:00
root	35b5787038	hubzilla 8	2024-02-17 17:00:05 +01:00
ivan	945d6161b5	upper notifications in hq	2022-07-25 19:03:52 +03:00
ivan	4c10656bba	minor colour fixes	2022-06-09 09:18:28 +03:00
ivan	43ce3b411d	item-category and nav-link-active colours in GreenGrey schemas	2022-06-08 13:35:49 +03:00
ivan	ba21527e80	h7.4	2022-06-05 16:46:26 +03:00
ivan	d6ffbc416c	6.4	2021-12-14 22:44:24 +03:00
ivan	b001e6763b	6.4	2021-12-14 22:03:06 +03:00
ivan	026b69170d	6.4	2021-12-14 21:48:12 +03:00
ivan	aab71826ae	navbar tpl fix	2021-09-09 13:42:26 +03:00
ivan	18f16a2646	navbar tpl fix	2021-09-09 13:39:58 +03:00
ivan	975fdcdb34	hubzilla 6.2	2021-09-09 13:22:28 +03:00
ivan	a770eead5f	Suggestions width fix	2021-07-19 00:32:39 +03:00
ivan	c8aecb12f4	hubzilla6	2021-07-14 12:26:01 +03:00
ivan	b85a62d01b	hubzila6	2021-07-13 23:13:31 +03:00