h7.4

ussrbasic/css/style.css

@@ -397,7 +397,6 @@ footer {
 .fn {
 	font-weight: bold;
 	font-size: 1rem;
-	color: #444444;
 }
 
 .vcard-card {
@@ -418,11 +417,6 @@ footer {
 	filter:alpha(opacity=100);
 }
 
-#profile-photo-wrapper img {
-	width: 100%;
-	height: 100%;
-}
-
 #hide-friends-yes-label,
 #hide-friends-no-label {
 	margin-left: 125px;
@@ -851,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
 
 .shared_header img {
 	border-radius: $radius;
-	margin-right: 10px;
+	margin-right: .75rem;
 }
 
 .tag1 {
@@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-3 {
-	width: 3.3em;
+	width: 2.7rem;
-	height: 3.3em;
+	height: 2.7rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-2 {
-	height: 2.2em;
+	height: 1.8rem;
-	width: 2.2em;
+	width: 1.8rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-1 {
-	height: 1.28571429em;
+	height: 1.1rem;
-	width: 1.28571429em;
+	width: 1.1rem;
 	border-radius: $radius;
 }
 
@@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
 
 .onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
-    background-color: #0275d8;
+    background-color: $link_colour;
 }
 
 
@@ -1734,7 +1728,7 @@ dl.bb-dl > dd > li {
 	text-align: center;
 }
 
-#login-main, .rmagic-button {
+.login-wrapper {
 	max-width: 400px;
 	margin-top: 20px;
 	margin-left: auto;
@@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
 
 .oneway-overlay {
     position: absolute;
-    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+    text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
 }
 
 .cover-photo-review {

ussrbasic/js/ussrbasic.js

@@ -17,8 +17,13 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-	stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+	if (document.querySelector('#region_1')) {
-	stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+		stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+	}
+
+	if (document.querySelector('#region_3')) {
+		stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+	}
 
 	$('#expand-aside').on('click', function() {
 		if($('main').hasClass('region_1-on')){
@@ -121,8 +126,14 @@ function setStyle(element, cssProperty) {
 }
 
 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);

ussrbasic/pdl/mod_channel.pdl

@@ -4,11 +4,14 @@
 [region=aside]
 [widget=fullprofile][/widget]
 [widget=common_friends][/widget]
+[widget=archive][var=wall]1[/var][/widget]
 [widget=categories][/widget]
+[widget=tagcloud_wall][var=limit]50[/var][/widget]
+[/region]
+[region=content]
+$content
 [/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]

ussrbasic/pdl/mod_pubstream.pdl

@@ -1,6 +1,9 @@
 [region=aside]
 [widget=pubtagcloud][var=trending]8[/var][var=limit]100[/var][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [widget=notifications][/widget]
 [widget=newmember][/widget]

ussrbasic/php/style.php

@@ -36,9 +36,8 @@ if(! App::$install) {
 // not --- like the mobile theme does instead.
 
 // Allow layouts to over-ride the schema
-
+if (isset($_REQUEST['schema']) && preg_match('/^[\w_-]+$/i', $_REQUEST['schema'])) {
-if($_REQUEST['schema']) {
+  $schema = $_REQUEST['schema'];
-	$schema = $_REQUEST['schema'];
 }
 
 if (($schema) && ($schema != '---')) {
@@ -75,7 +74,7 @@ if ((!$schema) || ($schema == '---')) {
 if (! $nav_bg)
 	$nav_bg = '#343a40';
 if (! $nav_icon_colour)
-	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
+	$nav_icon_colour = 'rgba(255, 255, 255, 0.55)';
 if (! $nav_active_icon_colour)
 	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
 if (! $link_colour)
@@ -112,6 +111,10 @@ if(file_exists('view/theme/ussrbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/ussrbasic/css/style.css');
 
+  if($schema === 'dark' && file_exists('view/theme/ussrbasic/schema/bootstrap-nightfall.css')) {
+    $x .= file_get_contents('view/theme/ussrbasic/schema/bootstrap-nightfall.css');
+  }
+
 	if($narrow_navbar && file_exists('view/theme/ussrbasic/css/narrow_navbar.css')) {
 		$x .= file_get_contents('view/theme/ussrbasic/css/narrow_navbar.css');
 	}

ussrbasic/php/theme.php

@@ -4,9 +4,11 @@
  *   * Name: Ussrbasic
  *   * Description: ussr.win 3 column based on Hubzilla standard theme
  *   * Version: 2.2
- *   * MinVersion: 6.4
+ *   * MinVersion: 6.5.13
- *   * MaxVersion: 7.0
+ *   * MaxVersion: 8.0
  *   * Author: Fabrixxm
+ *   * Theme_Color: #343a40
+ *   * Background_Color: rgb(254,254,254)
  */
 
 function ussrbasic_init(&$a) {

ussrbasic/schema/Focus-Boxy.css

@@ -1,15 +1,38 @@
 .comment .wall-item-body {
-	padding-left: 42px;
+	padding-left: 3rem;
 }
 
-.wall-item-content-wrapper.comment {
+.wall-item-content-wrapper {
-	border-bottom: 1px solid #dee2e6;
+	border-bottom: 1px solid rgba(0,0,0,.125);
+}
+
+.hide-comments-outer,
+.hide-comments-outer:hover {
+	border: 0;
 }
 
 .widget {
-	border: 1px solid #dee2e6;
+	border: 1px solid rgba(0,0,0,.125);
 }
 
 #note-text {
 	border: 1px solid transparent;
 }
+
+.vcard-card {
+	border: 1px solid rgba(0,0,0,.125);
+	border-bottom: 0;
+}
+
+.vcard-card .card {
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}
+
+.vcard-card .vcard {
+	border: 1px solid rgba(0,0,0,.125);
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}

ussrbasic/schema/dark.css

@@ -157,6 +157,10 @@ option {
 	color:#fff !important;
 }
 
+.dropdown-item {
+  color: $font_colour;
+}
+
 a.btn, aside a {
 	font-weight: 400 !important;
 }
@@ -164,7 +168,7 @@ a.btn, aside a {
 .btn {
 	background-color: #1e1e1e;
 	border-color: #222;
-	color: #ccc;
+	color: $font_colour;
 	text-shadow: none;
 	box-shadow: none;
 }
@@ -181,7 +185,7 @@ a.btn, aside a {
 }
 
 .btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
-    background-color: #337AB7;
+    background-color: #20537E;
     color: #FFF;
 }
 
@@ -192,8 +196,8 @@ a.btn, aside a {
 }
 
 .btn-success {
-    color: #FFF !important;
+    color: #ccc !important;
-    background-color: #5CB85C !important;
+    background-color: #336A33 !important;
     border-color: #4CAE4C !important;
 }
 
@@ -216,7 +220,7 @@ a.btn, aside a {
 }
 
 .btn-danger, form#chat-destroy > input {
-    background-color: #D9534F !important;
+    background-color: #B22A26 !important;
     border-color: #D43F3A !important;
 	color: #FFF !important;
 }

ussrbasicleft/css/style.css

@@ -397,7 +397,6 @@ footer {
 .fn {
 	font-weight: bold;
 	font-size: 1rem;
-	color: #444444;
 }
 
 .vcard-card {
@@ -418,11 +417,6 @@ footer {
 	filter:alpha(opacity=100);
 }
 
-#profile-photo-wrapper img {
-	width: 100%;
-	height: 100%;
-}
-
 #hide-friends-yes-label,
 #hide-friends-no-label {
 	margin-left: 125px;
@@ -851,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
 
 .shared_header img {
 	border-radius: $radius;
-	margin-right: 10px;
+	margin-right: .75rem;
 }
 
 .tag1 {
@@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-3 {
-	width: 3.3em;
+	width: 2.7rem;
-	height: 3.3em;
+	height: 2.7rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-2 {
-	height: 2.2em;
+	height: 1.8rem;
-	width: 2.2em;
+	width: 1.8rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-1 {
-	height: 1.28571429em;
+	height: 1.1rem;
-	width: 1.28571429em;
+	width: 1.1rem;
 	border-radius: $radius;
 }
 
@@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
 
 .onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
-    background-color: #0275d8;
+    background-color: $link_colour;
 }
 
 
@@ -1734,7 +1728,7 @@ dl.bb-dl > dd > li {
 	text-align: center;
 }
 
-#login-main, .rmagic-button {
+.login-wrapper {
 	max-width: 400px;
 	margin-top: 20px;
 	margin-left: auto;
@@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
 
 .oneway-overlay {
     position: absolute;
-    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+    text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
 }
 
 .cover-photo-review {
@@ -1809,5 +1803,5 @@ span.default-highlight {
 }
 
 #region_3 {
-    display: none !important;
+	display: none !important;
 }

ussrbasicleft/js/ussrbasicleft.js

@@ -17,8 +17,13 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-	stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+	if (document.querySelector('#region_1')) {
-	stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+		stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+	}
+
+	if (document.querySelector('#region_3')) {
+		stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+	}
 
 	$('#expand-aside').on('click', function() {
 		if($('main').hasClass('region_1-on')){
@@ -121,8 +126,14 @@ function setStyle(element, cssProperty) {
 }
 
 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);

ussrbasicleft/pdl/mod_admin.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_appman.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=appcategories][/widget]
+[widget=appstore][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_apps.pdl

@@ -4,5 +4,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

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]

ussrbasicleft/pdl/mod_blocks.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_cal.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

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]

ussrbasicleft/pdl/mod_cdav.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_channel.pdl

@@ -2,13 +2,16 @@
 [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=archive][var=wall]1[/var][/widget]
+[widget=categories][/widget]
+[widget=tagcloud_wall][var=limit]50[/var][/widget]
+[widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_chanview.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=notifications][/widget]
 [widget=vcard][/widget]
+[widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_chat.pdl

@@ -1,5 +1,5 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=chatroom_list][/widget]
 [widget=bookmarkedchats][/widget]
 [widget=suggestedchats][/widget]
@@ -7,5 +7,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_cloud.pdl

@@ -1,7 +1,11 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
+[widget=categories][var=files]1[/var][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_common.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_connect.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_connections.pdl

@@ -1,10 +1,10 @@
 [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=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_connedit.pdl

@@ -1,10 +1,10 @@
 [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=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_defperms.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_directory.pdl

@@ -2,9 +2,11 @@
 [widget=findpeople][/widget]
 [widget=dirsort][/widget]
 [widget=dirtags][/widget]
-[widget=suggestions][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_display.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_editblock.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_editlayout.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_editwebpage.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_go.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_group.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=collections][var=mode]groups[/var][/widget]
+[widget=privacygroups][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_help.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_hq.pdl

@@ -1,7 +1,22 @@
 [region=aside]
-[widget=hq_controls][/widget]
+[widget=messages][/widget]
+[widget=hq_controls]
+	[var=wrapper_class]d-none d-lg-block[/var]
+	[var=entry_class]btn-outline-primary[/var]
+[/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+[widget=notes]
+	[var=hidden]1[/var]
+	[var=app]1[/var]
+[/widget]
+$content
+[widget=hq_controls]
+	[var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
+	[var=entry_class]btn-lg btn-primary shadow[/var]
+[/widget]
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_id.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_import_items.pdl

@@ -1,7 +1,8 @@
 [region=aside]
-[widget=vcard][/widget]
 [widget=notifications][/widget]
-[widget=newmember][/widget]
+[/region]
+[region=content]
+$content
 [/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_layouts.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_locs.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_menu.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_mitem.pdl

@@ -4,5 +4,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_moderate.pdl

@@ -2,5 +2,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_network.pdl

@@ -1,10 +1,8 @@
 [region=aside]
-[widget=notifications][/widget]
 [widget=activity_order][/widget]
 [widget=activity_filter][/widget]
 [widget=savedsearch][/widget]
-[widget=suggestions][/widget]
+[widget=notifications][/widget]
-[widget=notes][/widget]
 [widget=newmember][/widget]
 [/region]
 

ussrbasicleft/pdl/mod_permcats.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=mailmenu][/widget]
+[widget=permcats][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_photos.pdl

@@ -1,8 +1,11 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=photo_albums][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_profile.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_profile_photo.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_profiles.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_profperm.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_pubstream.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

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]

ussrbasicleft/pdl/mod_search.pdl

@@ -2,5 +2,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_settings.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_sharedwithme.pdl

@@ -2,5 +2,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_sources.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_suggest.pdl

@@ -4,5 +4,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_thing.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_tokens.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=tokens][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_uexport.pdl

@@ -2,5 +2,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_viewconnections.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/pdl/mod_webpages.pdl

@@ -4,5 +4,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicleft/php/style.php

@@ -36,9 +36,8 @@ if(! App::$install) {
 // not --- like the mobile theme does instead.
 
 // Allow layouts to over-ride the schema
-
+if (isset($_REQUEST['schema']) && preg_match('/^[\w_-]+$/i', $_REQUEST['schema'])) {
-if($_REQUEST['schema']) {
+  $schema = $_REQUEST['schema'];
-	$schema = $_REQUEST['schema'];
 }
 
 if (($schema) && ($schema != '---')) {
@@ -75,7 +74,7 @@ if ((!$schema) || ($schema == '---')) {
 if (! $nav_bg)
 	$nav_bg = '#343a40';
 if (! $nav_icon_colour)
-	$nav_icon_colour = 'rgba(255, 255, 255, 0.5)';
+	$nav_icon_colour = 'rgba(255, 255, 255, 0.55)';
 if (! $nav_active_icon_colour)
 	$nav_active_icon_colour = 'rgba(255, 255, 255, 0.75)';
 if (! $link_colour)
@@ -112,6 +111,10 @@ if(file_exists('view/theme/ussrbasicleft/css/style.css')) {
 
 	$x = file_get_contents('view/theme/ussrbasicleft/css/style.css');
 
+  if($schema === 'dark' && file_exists('view/theme/ussrbasicleft/schema/bootstrap-nightfall.css')) {
+    $x .= file_get_contents('view/theme/ussrbasicleft/schema/bootstrap-nightfall.css');
+  }
+
 	if($narrow_navbar && file_exists('view/theme/ussrbasicleft/css/narrow_navbar.css')) {
 		$x .= file_get_contents('view/theme/ussrbasicleft/css/narrow_navbar.css');
 	}

ussrbasicleft/php/theme.php

@@ -4,9 +4,11 @@
  *   * Name: Ussrbasicleft
  *   * Description: ussr.win 2 column left based on Hubzilla standard theme
  *   * Version: 2.2
- *   * MinVersion: 6.4
+ *   * MinVersion: 6.5.13
- *   * MaxVersion: 7.0
+ *   * MaxVersion: 8.0
  *   * Author: Fabrixxm
+ *   * Theme_Color: #343a40
+ *   * Background_Color: rgb(254,254,254)
  */
 
 function ussrbasicleft_init(&$a) {

ussrbasicleft/schema/Focus-Boxy.css

@@ -1,15 +1,38 @@
 .comment .wall-item-body {
-	padding-left: 42px;
+	padding-left: 3rem;
 }
 
-.wall-item-content-wrapper.comment {
+.wall-item-content-wrapper {
-	border-bottom: 1px solid #dee2e6;
+	border-bottom: 1px solid rgba(0,0,0,.125);
+}
+
+.hide-comments-outer,
+.hide-comments-outer:hover {
+	border: 0;
 }
 
 .widget {
-	border: 1px solid #dee2e6;
+	border: 1px solid rgba(0,0,0,.125);
 }
 
 #note-text {
 	border: 1px solid transparent;
 }
+
+.vcard-card {
+	border: 1px solid rgba(0,0,0,.125);
+	border-bottom: 0;
+}
+
+.vcard-card .card {
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}
+
+.vcard-card .vcard {
+	border: 1px solid rgba(0,0,0,.125);
+	border-top: 0;
+	border-right: 0;
+	border-left: 0;
+}

ussrbasicleft/schema/GreenGrey-Nominus-Nolikes.css

@@ -335,7 +335,6 @@ blockquote {
     color: #dddccc;
 }
 
-
 #upgrade_info_aside {
     border-color: #383c4a !important;
 }

ussrbasicleft/schema/GreenGrey.css

@@ -325,7 +325,6 @@ blockquote {
     border-color: #383c4a !important;
 }
 
-
 .text-muted {
     color: #a6a6b9 !important;
 }

ussrbasicleft/schema/dark.css

@@ -157,6 +157,10 @@ option {
 	color:#fff !important;
 }
 
+.dropdown-item {
+  color: $font_colour;
+}
+
 a.btn, aside a {
 	font-weight: 400 !important;
 }
@@ -164,7 +168,7 @@ a.btn, aside a {
 .btn {
 	background-color: #1e1e1e;
 	border-color: #222;
-	color: #ccc;
+	color: $font_colour;
 	text-shadow: none;
 	box-shadow: none;
 }
@@ -181,7 +185,7 @@ a.btn, aside a {
 }
 
 .btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button {
-    background-color: #337AB7;
+    background-color: #20537E;
     color: #FFF;
 }
 
@@ -192,8 +196,8 @@ a.btn, aside a {
 }
 
 .btn-success {
-    color: #FFF !important;
+    color: #ccc !important;
-    background-color: #5CB85C !important;
+    background-color: #336A33 !important;
     border-color: #4CAE4C !important;
 }
 
@@ -216,7 +220,7 @@ a.btn, aside a {
 }
 
 .btn-danger, form#chat-destroy > input {
-    background-color: #D9534F !important;
+    background-color: #B22A26 !important;
     border-color: #D43F3A !important;
 	color: #FFF !important;
 }

ussrbasicleft/schema/zlax.css

@@ -346,12 +346,7 @@ blockquote {
 .table {
     color: #dddccc;
 }
-/*
+
-#notifications, #nav-notify-sub, #nav-network-sub, #nav-all_events-sub {
-    border: 1px solid #383c4a !important;
-    border-bottom-color: #383c4a !important;
-}
-*/
 #upgrade_info_aside {
     border-color: #383c4a !important;
 }
@@ -366,4 +361,4 @@ blockquote {
 
 .border {
     border: 1px solid #415240 !important;
-}
+}

ussrbasicpub/css/style.css

@@ -397,7 +397,6 @@ footer {
 .fn {
 	font-weight: bold;
 	font-size: 1rem;
-	color: #444444;
 }
 
 .vcard-card {
@@ -418,11 +417,6 @@ footer {
 	filter:alpha(opacity=100);
 }
 
-#profile-photo-wrapper img {
-	width: 100%;
-	height: 100%;
-}
-
 #hide-friends-yes-label,
 #hide-friends-no-label {
 	margin-left: 125px;
@@ -851,7 +845,7 @@ div.jGrowl div.jGrowl-notification {
 
 .shared_header img {
 	border-radius: $radius;
-	margin-right: 10px;
+	margin-right: .75rem;
 }
 
 .tag1 {
@@ -1223,24 +1217,24 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-3 {
-	width: 3.3em;
+	width: 2.7rem;
-	height: 3.3em;
+	height: 2.7rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-2 {
-	height: 2.2em;
+	height: 1.8rem;
-	width: 2.2em;
+	width: 1.8rem;
 	margin-right: 5px;
 	border-radius: $radius;
 	float: left;
 }
 
 .menu-img-1 {
-	height: 1.28571429em;
+	height: 1.1rem;
-	width: 1.28571429em;
+	width: 1.1rem;
 	border-radius: $radius;
 }
 
@@ -1676,7 +1670,7 @@ dl.bb-dl > dd > li {
 
 .onoffswitch.checkbox > div > input:checked + label .onoffswitch-switch {
     right: 0px;
-    background-color: #0275d8;
+    background-color: $link_colour;
 }
 
 
@@ -1734,7 +1728,7 @@ dl.bb-dl > dd > li {
 	text-align: center;
 }
 
-#login-main, .rmagic-button {
+.login-wrapper {
 	max-width: 400px;
 	margin-top: 20px;
 	margin-left: auto;
@@ -1784,7 +1778,7 @@ dl.bb-dl > dd > li {
 
 .oneway-overlay {
     position: absolute;
-    text-shadow: -2px 0 1px #fff, 0 2px 1px#fff, 2px 0 1px #fff, 0 -2px 1px #fff;
+    text-shadow: -1px 0 1px #fff, 0 1px 1px#fff, 1px 0 1px #fff, 0 -1px 1px #fff;
 }
 
 .cover-photo-review {
@@ -1809,5 +1803,5 @@ span.default-highlight {
 }
 
 #region_3 {
-    display: none !important;
+	display: none !important;
 }

ussrbasicpub/js/ussrbasicpub.js

@@ -17,8 +17,13 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-	stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+	if (document.querySelector('#region_1')) {
-	stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+		stickyScroll('.aside_spacer_left', '.aside_spacer_top_left', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_1')).getPropertyValue('padding-top')), 0);
+	}
+
+	if (document.querySelector('#region_3')) {
+		stickyScroll('.aside_spacer_right', '.aside_spacer_top_right', '.content', parseFloat(window.getComputedStyle(document.querySelector('#region_3')).getPropertyValue('padding-top')), 20);
+	}
 
 	$('#expand-aside').on('click', function() {
 		if($('main').hasClass('region_1-on')){
@@ -121,8 +126,14 @@ function setStyle(element, cssProperty) {
 }
 
 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);

ussrbasicpub/pdl/mod_admin.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_appman.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=appcategories][/widget]
+[widget=appstore][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_apps.pdl

@@ -4,5 +4,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/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]

ussrbasicpub/pdl/mod_blocks.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_cal.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=fullprofile][/widget]
+[widget=profile][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/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]

ussrbasicpub/pdl/mod_cdav.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_channel.pdl

@@ -2,13 +2,16 @@
 [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=archive][var=wall]1[/var][/widget]
+[widget=categories][/widget]
+[widget=tagcloud_wall][var=limit]50[/var][/widget]
+[widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_chanview.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=notifications][/widget]
 [widget=vcard][/widget]
+[widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_chat.pdl

@@ -1,5 +1,5 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
 [widget=chatroom_list][/widget]
 [widget=bookmarkedchats][/widget]
 [widget=suggestedchats][/widget]
@@ -7,5 +7,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_cloud.pdl

@@ -1,7 +1,11 @@
 [region=aside]
-[widget=vcard][/widget]
+[widget=profile][/widget]
+[widget=categories][var=files]1[/var][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_common.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_connect.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_connections.pdl

@@ -1,10 +1,10 @@
 [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=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_connedit.pdl

@@ -1,10 +1,10 @@
 [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=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_defperms.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_directory.pdl

@@ -2,9 +2,11 @@
 [widget=findpeople][/widget]
 [widget=dirsort][/widget]
 [widget=dirtags][/widget]
-[widget=suggestions][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_display.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_editblock.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_editlayout.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_editwebpage.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_go.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_group.pdl

@@ -1,7 +1,10 @@
 [region=aside]
-[widget=collections][var=mode]groups[/var][/widget]
+[widget=privacygroups][/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_help.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_hq.pdl

@@ -1,7 +1,22 @@
 [region=aside]
-[widget=hq_controls][/widget]
+[widget=messages][/widget]
+[widget=hq_controls]
+	[var=wrapper_class]d-none d-lg-block[/var]
+	[var=entry_class]btn-outline-primary[/var]
+[/widget]
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+[widget=notes]
+	[var=hidden]1[/var]
+	[var=app]1[/var]
+[/widget]
+$content
+[widget=hq_controls]
+	[var=wrapper_class]hq_controls_fixed_bottom_center d-lg-none[/var]
+	[var=entry_class]btn-lg btn-primary shadow[/var]
+[/widget]
+[/region]
 [region=right_aside]
 [/region]

ussrbasicpub/pdl/mod_id.pdl

@@ -3,5 +3,8 @@
 [widget=notifications][/widget]
 [widget=newmember][/widget]
 [/region]
+[region=content]
+$content
+[/region]
 [region=right_aside]
 [/region]