From 07fd8cf6cdf070911403338f2013fd6e94c87e61 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 15 Feb 2023 08:51:23 +0000 Subject: restructure wall-item-head --- view/css/conversation.css | 18 ------------- view/js/main.js | 4 +-- view/theme/redbasic/css/style.css | 12 --------- view/tpl/conv_item.tpl | 55 ++++++++++++++++++++++++------------- view/tpl/conv_list.tpl | 57 ++++++++++++++++++++++++++++----------- view/tpl/pinned_item.tpl | 44 +++++++++++++++++++++++++++++- view/tpl/search_item.tpl | 52 +++++++++++++++++++++++++---------- 7 files changed, 160 insertions(+), 82 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index bd6401f45..03713e6eb 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -100,12 +100,6 @@ border-top: 0.2rem solid var(--bs-blue); } -.wall-item-info { - display: block; - float: left; - margin-right: .75rem; -} - .wall-item-wrapper { margin-left: .75rem; } @@ -147,18 +141,6 @@ a.wall-item-name-link { font-weight: bold !important; } -.wall-item-author { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.wall-item-ago, -.wall-item-ago i { - font-size: 0.75rem; - line-height: 1.1; -} - .wall-item-ago .fa-check { cursor: pointer; } diff --git a/view/js/main.js b/view/js/main.js index fdebb5faa..7250b6d2e 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1234,7 +1234,7 @@ function doscroll(parent, hidden) { }); $('html, body').animate({scrollTop:(id.offset().top) - 50}, 'slow'); - $('   ').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,'')); + $('').insertAfter('#wall-item-ago-' + id.attr('id').replace(/\D/g,'')); } function doscrollback(pos) { @@ -1259,7 +1259,7 @@ function dopin(id) { $('.dropdown-item-pinnable').html($('.dropdown-item-pinnable').html().replace(aStr['unpin_item'],aStr['pin_item'])); $('.wall-item-pinned').remove() if(i.length == 0) { - $(' ').insertBefore('#wall-item-info-' + id); + $(' ').insertBefore('#wall-item-info-' + id); me.html(me.html().replace(aStr['pin_item'],aStr['unpin_item'])); }; }) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5d27071a5..b63d7092a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1017,12 +1017,6 @@ img.mail-conv-sender-photo { /* conversation */ - -.top-radius { - border-top-right-radius: var(--bs-border-radius); - border-top-left-radius: var(--bs-border-radius); -} - .wall-event-item { padding: 10px; color: #fff; @@ -1094,11 +1088,6 @@ img.mail-conv-sender-photo { height: $reply_photo; } -.wall-item-ago, -.dropdown-sub-text { - color: var(--bs-tertiary-color); -} - .wall-item-content, .mail-conv-body, .page-body, @@ -1107,7 +1096,6 @@ img.mail-conv-sender-photo { font-size: 1rem; } - .comment-edit-text { border: 1px solid var(--bs-border-color); border-radius: var(--bs-border-radius); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 47261d070..aa10e53ff 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,14 +26,8 @@
{{/if}} {{/if}} -
- {{if $item.thr_parent}} -     - {{/if}} - {{if $item.pinned}} -   - {{/if}} -
+
+
{{if $item.contact_id}} @@ -52,18 +46,41 @@ {{/if}}
- {{if $item.lock}} -
-   - -
- {{/if}} -
- {{if $item.previewing}} {{/if}} - {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} +
+ {{if $item.previewing}}{{/if}} + {{if $item.lock}} +
+   + +
+ {{/if}} + {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
+ {{$item.linktitle}}
-
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} {{if $item.delayed}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} +
+
+ {{if $item.editedtime}} + + {{/if}} + {{if $item.delayed}} + + {{/if}} + {{if $item.location}} + {{$item.location}} + {{/if}} + {{if $item.verified}} + + {{elseif $item.forged}} + + {{/if}} + {{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} +
+ {{if $item.thr_parent}} + + {{/if}} + {{if $item.pinned}} +
+ {{/if}}
{{if $item.divider}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index fde78e71e..e3d5961ec 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -26,13 +26,13 @@
{{/if}} {{/if}} -
-
+
+
{{if $item.contact_id}} {{/if}} - {{$item.name}} + {{$item.name}} {{if $item.author_is_group_actor}} {{/if}} @@ -40,27 +40,52 @@
{{foreach $item.thread_author_menu as $mitem}} - {{$mitem.title}} + {{$mitem.title}} {{/foreach}} -
{{/if}}
- {{if $item.lock}} -
-   - -
- {{/if}} -
- {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} +
+ {{if $item.previewing}}{{/if}} + {{if $item.lock}} +
+   + +
+ {{/if}} + {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
+ {{$item.linktitle}}
-
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} +
+
+ {{if $item.editedtime}} + + {{/if}} + {{if $item.delayed}} + + {{/if}} + {{if $item.location}} + {{$item.location}} + {{/if}} + {{if $item.verified}} + + {{elseif $item.forged}} + + {{/if}} + {{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} +
+ {{if $item.thr_parent}} + + {{/if}} + {{if $item.pinned}} +
+ {{/if}}
- + {{if $item.divider}} +
+ {{/if}} {{if $item.body}}
diff --git a/view/tpl/pinned_item.tpl b/view/tpl/pinned_item.tpl index 4d059e0a4..09cc770a6 100644 --- a/view/tpl/pinned_item.tpl +++ b/view/tpl/pinned_item.tpl @@ -40,7 +40,7 @@
{{/if}} {{/if}} -
+ + +
+
+
+ {{$name}} + {{if $thread_author_menu}} + +
+ {{foreach $thread_author_menu as $mitem}} + {{$mitem.title}} + {{/foreach}} +
+ {{/if}} +
+
+
+ {{$name}}{{if $owner_url}} {{$via}} {{$owner_name}}{{/if}}
+ {{$linktitle}} +
+
+
+ {{if $editedtime}} + + {{/if}} + {{if $delayed}} + + {{/if}} + {{if $location}} + {{$location}} + {{/if}} + {{if $verified}} + + {{elseif $forged}} + + {{/if}} + {{if $editedtime}} {{$editedtime}}{{/if}}{{if $expiretime}} {{$expiretime}}{{/if}} +
+
+
+ + {{if $divider}}
{{/if}} diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 7b63d83b8..821ecf699 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,13 +20,13 @@
{{/if}} {{/if}} -
-
-
+
+
+
{{if $item.contact_id}} {{/if}} - {{$item.name}} + {{$item.name}} {{if $item.author_is_group_actor}} {{/if}} @@ -40,17 +40,41 @@ {{/if}}
- {{if $item.lock}} -
-   -
- {{/if}} -
- {{if $item.previewing}} {{/if}} - {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}} +
+ {{if $item.previewing}}{{/if}} + {{if $item.lock}} +
+   + +
+ {{/if}} + {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
+ {{$item.linktitle}}
-
- {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} +
+
+ {{if $item.editedtime}} + + {{/if}} + {{if $item.delayed}} + + {{/if}} + {{if $item.location}} + {{$item.location}} + {{/if}} + {{if $item.verified}} + + {{elseif $item.forged}} + + {{/if}} + {{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} +
+ {{if $item.thr_parent}} + + {{/if}} + {{if $item.pinned}} +
+ {{/if}}
{{if $item.divider}} -- cgit v1.2.3