diff options
| -rw-r--r-- | include/nav.php | 2 | ||||
| -rw-r--r-- | view/css/default.css | 2 | ||||
| -rw-r--r-- | view/php/theme_init.php | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme_init.php | 2 | ||||
| -rw-r--r-- | view/tpl/messages_widget.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/navbar_default.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/settings_display.tpl | 6 |
8 files changed, 20 insertions, 16 deletions
diff --git a/include/nav.php b/include/nav.php index 31a447a84..18fa65edc 100644 --- a/include/nav.php +++ b/include/nav.php @@ -85,7 +85,7 @@ function nav($template = 'default') { if ($observer) { $userinfo = [ - 'icon' => $observer['xchan_photo_m'] . '?rev=' . strtotime($observer['xchan_photo_date']), + 'icon' => $observer['xchan_photo_s'] . '?rev=' . strtotime($observer['xchan_photo_date']), 'addr' => $observer['xchan_addr'], 'name' => $observer['xchan_name'], ]; diff --git a/view/css/default.css b/view/css/default.css index bd0f14ba2..bb6498193 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -20,6 +20,7 @@ main { position: relative; order: 1; padding: 4.5rem 7px 0px 7px; + width: 350px; } #region_2 { @@ -34,4 +35,5 @@ main { position: relative; order: 3; padding: 4.5rem 7px 0px 7px; + width: 350px; } diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 4aa695aeb..b08651689 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -10,8 +10,11 @@ head_add_css('/view/css/conversation.css'); head_add_css('/view/css/widgets.css'); head_add_css('/view/css/colorbox.css'); head_add_css('/library/justifiedGallery/justifiedGallery.min.css'); +head_add_css('/library/datetimepicker/jquery.datetimepicker.css'); head_add_js('jquery.js'); +head_add_js('/library/datetimepicker/jquery.datetimepicker.js'); + head_add_js('/library/justifiedGallery/jquery.justifiedGallery.min.js'); head_add_js('/library/sprintf.js/dist/sprintf.min.js'); diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php index 0ac580f0e..39fc28f1f 100644 --- a/view/theme/redbasic/php/theme_init.php +++ b/view/theme/redbasic/php/theme_init.php @@ -4,12 +4,10 @@ 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'); diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl index 5770abffc..9b6c6d03b 100644 --- a/view/tpl/messages_widget.tpl +++ b/view/tpl/messages_widget.tpl @@ -25,11 +25,11 @@ <div id="messages-widget" class="border-start border-end border-bottom overflow-auto mb-3 clearfix" style="height: 70vh;"> <div id="messages-template" rel="template" class="d-none"> <a href="{6}" class="list-group-item list-group-item-action message" data-b64mid="{0}"> - <div class="mb-2"> - <img src="{9}" loading="lazy" class="rounded menu-img-2"> + <div class="mb-2 align-middle"> + <img src="{9}" loading="lazy" class="rounded float-start me-2 menu-img-2"> <div class="text-nowrap"> <div class="d-flex justify-content-between align-items-center lh-sm"> - <div class="text-truncate pe-1"> + <div class="text-truncate"> {7} <strong title="{4}">{4}</strong> </div> @@ -55,8 +55,8 @@ </div> {{foreach $entries as $e}} <a href="{{$e.href}}" class="list-group-item list-group-item-action message" data-b64mid="{{$e.b64mid}}"> - <div class="mb-2"> - <img src="{{$e.author_img}}" loading="lazy" class="rounded menu-img-2"> + <div class="mb-2 align-middle"> + <img src="{{$e.author_img}}" loading="lazy" class="rounded float-start me-2 menu-img-2"> <div class="text-nowrap"> <div class="d-flex justify-content-between align-items-center lh-sm"> <div class="text-truncate pe-1"> diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index ea8723e8b..c6f350b09 100644 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -4,7 +4,7 @@ <div class="d-flex" style="max-width: 50%"> <div class="dropdown"> <div class="cursor-pointer usermenu" data-bs-toggle="dropdown"> - <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> + <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}" class="rounded"> <i class="navbar-text fa fa-caret-down"></i> </div> {{if $is_owner}} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index bae1c1469..b4b0c02ef 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -416,9 +416,10 @@ function sse_updateNotifications(type, mid) { + /* if(type === 'pubs') return true; - + */ if(type === 'notify' && (mid !== bParam_mid || sse_type !== 'notify')) return true; /* @@ -533,9 +534,9 @@ <div id="no_notifications" class="d-xl-none"> {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> - <div id="nav-notifications-template" rel="template"> + <div id="nav-notifications-template" rel="template" class="d-none"> <a class="list-group-item list-group-item-action notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}"> - <img data-src="{1}" loading="lazy" class="rounded menu-img-2"> + <img data-src="{1}" loading="lazy" class="rounded float-start me-2 menu-img-2"> <div class="text-nowrap"> <div class="d-flex justify-content-between align-items-center lh-sm"> <div class="text-truncate pe-1"> @@ -547,7 +548,7 @@ </div> </a> </div> - <div id="nav-notifications-forums-template" rel="template"> + <div id="nav-notifications-forums-template" rel="template" class="d-none"> <a class="list-group-item list-group-item-action justify-content-between align-items-center d-flex notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'> <div> <img class="menu-img-1" data-src="{1}" loading="lazy"> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 70b9bac80..d745d14b5 100644 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -30,6 +30,7 @@ </div> </div> {{/if}} + {{if $theme_config}} <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="custom-settings-title"> <h3> @@ -40,12 +41,11 @@ </div> <div id="custom-settings-content" class="collapse{{if !$theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings" data-bs-parent="#settings" > <div class="section-content-tools-wrapper"> - {{if $theme_config}} - {{$theme_config}} - {{/if}} + {{$theme_config}} </div> </div> </div> + {{/if}} <div class="panel"> <div class="section-subtitle-wrapper" role="tab" id="content-settings-title"> <h3> |