From 5497adfde6e1df941d42bb8fb6e18b261402716e Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 18 Sep 2021 18:06:32 +0000 Subject: add option to mark all notices of a thread read if a notice of the thread is clicked (default 1) and fix a php error in find_parent() if $act->obj is not an array --- view/tpl/settings.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index a3e68f60a..27e9d5d60 100644 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -154,6 +154,7 @@ {{include file="field_intcheckbox.tpl" field=$vnotify14}} {{include file="field_intcheckbox.tpl" field=$vnotify15}} {{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} + {{include file="field_intcheckbox.tpl" field=$update_notices_per_parent}} {{include file="field_input.tpl" field=$evdays}} -- cgit v1.2.3 From 0707d334938a60c6ded0b0877aada773dd64e825 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 22 Sep 2021 16:14:28 +0000 Subject: bootstrap update fixes --- view/css/bootstrap-red.css | 2 +- view/php/default.php | 2 +- view/theme/redbasic/css/style.css | 3 +- view/tpl/navbar_default.tpl | 326 +++++++++++++++--------------- view/tpl/navbar_tucson.tpl | 410 +++++++++++++++++++------------------- 5 files changed, 373 insertions(+), 370 deletions(-) (limited to 'view') diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 9f03d1b12..8a33f3b2e 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -62,7 +62,7 @@ nav .dropdown-menu { /* offcanvas */ .offcanvas, -.modal-backdrop.fade { +.offcanvas-backdrop.fade { transition: none; } diff --git a/view/php/default.php b/view/php/default.php index 6f0735a11..64d58a0c1 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,7 +8,7 @@ >
- +
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9c3596f1b..346e46c6b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1538,9 +1538,8 @@ blockquote { left: 0px; } - #nav-app-link-wrapper.has_location { + #nav-app-link-wrapper { min-width: 0; - flex-basis: 25%; } #nav-app-link-wrapper { diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index df8e5b69a..eae74daca 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -1,180 +1,182 @@ -
- {{if $nav.login && !$userinfo}} -
- {{if $nav.loginmenu.1.4}} - - {{$nav.loginmenu.1.1}} - - {{else}} - - {{$nav.loginmenu.1.1}} - - {{/if}} - {{if $nav.register}} - - {{$nav.register.1}} - - {{/if}} -
- {{/if}} - {{if $userinfo}} -
-
-
- {{$userinfo.name}} - -
- {{if $is_owner}} -
- {{foreach $nav.usermenu as $usermenu}} - {{$usermenu.1}} - {{/foreach}} - {{if $nav.group}} - {{$nav.group.1}} - {{/if}} - {{if $nav.manage}} - {{$nav.manage.1}} - {{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - {{$chan.channel_name}} - {{/foreach}} - {{/if}} - {{if $nav.profiles}} - {{$nav.profiles.1}} - {{/if}} - {{if $nav.settings}} -
- {{$nav.settings.1}} - {{/if}} - {{if $nav.admin}} -
- {{$nav.admin.1}} - {{/if}} - {{if $nav.logout}} -
- {{$nav.logout.1}} - {{/if}} -
- {{/if}} - {{if ! $is_owner}} - - {{/if}} -
- {{if $sel.name}} - + {{/if}} - -
- {{if $nav.help.6}} -
- {{$nav.help.5}} -
-  {{$fulldocs}} - +
+
+ + + + + +
+ {{if $nav.help.6}} +
+ {{$nav.help.5}} +
+  {{$fulldocs}} + +
+
+ {{/if}}
- {{/if}} -
+
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 6a8b5872d..bb67ff31c 100644 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -1,222 +1,224 @@ -{{if $nav.login && !$userinfo}} -
- {{if $nav.loginmenu.1.4}} - - {{$nav.loginmenu.1.1}} - - {{else}} - - {{$nav.loginmenu.1.1}} - - {{/if}} - {{if $nav.register}} - - {{$nav.register.1}} - - {{/if}} -
-{{/if}} -{{if $userinfo}} -
-
- {{$userinfo.name}} - -
- {{if $is_owner}} -
- {{foreach $nav.usermenu as $usermenu}} - {{$usermenu.1}} - {{/foreach}} - {{if $nav.manage}} - {{$nav.manage.1}} - {{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - {{$chan.channel_name}} - {{/foreach}} - {{/if}} - {{if $nav.profiles}} - {{$nav.profiles.1}} + -- cgit v1.2.3 From 2a2c4d3e9cf09f2ebe0bda68a8c761c23e802e95 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 23 Sep 2021 08:50:44 +0000 Subject: fix bs regression --- view/tpl/abook_edit.tpl | 10 +++++----- view/tpl/admin_settings_features.tpl | 2 +- view/tpl/generic_addon_settings.tpl | 2 +- view/tpl/permcats.tpl | 2 +- view/tpl/profile_edit.tpl | 8 ++++---- view/tpl/settings.tpl | 6 +++--- view/tpl/settings_display.tpl | 6 +++--- view/tpl/settings_features.tpl | 2 +- view/tpl/tokens.tpl | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'view') diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 380d5886c..686b40a54 100644 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -85,7 +85,7 @@