From 6e02105d88781a9ce82dcbdf4bea3c97e070a566 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 6 Feb 2020 22:06:24 +0000 Subject: [PATCH 1/2] Useless links removed / Item menu is moved to the item actions bar --- src/Model/Profile.php | 10 -- src/Object/Post.php | 1 + view/templates/settings/profile/link.tpl | 2 - view/theme/frio/css/style.css | 2 +- view/theme/frio/templates/nav.tpl | 2 +- view/theme/frio/templates/profile/vcard.tpl | 4 - view/theme/frio/templates/wall_thread.tpl | 171 ++++++++++---------- view/theme/vier/templates/profile/vcard.tpl | 4 - 8 files changed, 88 insertions(+), 108 deletions(-) delete mode 100644 view/templates/settings/profile/link.tpl diff --git a/src/Model/Profile.php b/src/Model/Profile.php index caf0b0869..28491fb5f 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -184,16 +184,6 @@ class Profile require_once $theme_info_file; } - if (local_user() && local_user() == $a->profile['uid'] && $profiledata) { - DI::page()['aside'] .= Renderer::replaceMacros( - Renderer::getMarkupTemplate('settings/profile/link.tpl'), - [ - '$editprofile' => DI::l10n()->t('Edit profile'), - '$profid' => $a->profile['id'] - ] - ); - } - $block = ((DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) ? true : false); /** diff --git a/src/Object/Post.php b/src/Object/Post.php index d76242055..8ebc6e265 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -440,6 +440,7 @@ class Post 'switchcomment' => DI::l10n()->t('Comment'), 'reply_label' => DI::l10n()->t('Reply to %s', $name_e), 'comment' => $comment, + 'menu' => DI::l10n()->t('More'), 'previewing' => $conv->isPreview() ? ' preview ' : '', 'wait' => DI::l10n()->t('Please wait'), 'thread_level' => $thread_level, diff --git a/view/templates/settings/profile/link.tpl b/view/templates/settings/profile/link.tpl deleted file mode 100644 index d387ea683..000000000 --- a/view/templates/settings/profile/link.tpl +++ /dev/null @@ -1,2 +0,0 @@ -
-
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 337817553..12a961108 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1950,7 +1950,7 @@ code > .hl-main { .wall-item-container:hover .wall-item-links, .wall-item-container:hover .wall-item-actions, .wall-item-container:hover .body-attach > a { - opacity: 0.6; + opacity: 1; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; -o-transition: all 0.25s ease-in-out; diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 0fa56352f..cc661b3d5 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -152,7 +152,7 @@ {{/if}} {{if $nav.contacts}} -
  • {{$nav.contacts.1}}
    • +
  • {{$nav.contacts.1}}
    • {{/if}} {{if $nav.delegation}}
  • {{$nav.delegation.1}}
    • diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl index 5ac982fa2..95c89bd07 100644 --- a/view/theme/frio/templates/profile/vcard.tpl +++ b/view/theme/frio/templates/profile/vcard.tpl @@ -12,10 +12,6 @@
    - {{else}} - {{if $profile.menu}} -
    - {{/if}} {{/if}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 3e8a2faea..d5e20ae25 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -81,87 +81,6 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
    - {{* Put addional actions in a top-right dropdown menu *}} - - - - {{* The avatar picture and the photo-menu *}}
    {{if $item.thread_level==1}} @@ -289,6 +208,14 @@ as the value of $top_child_total (this is done at the end of this file)
    {{/if}} + +
    {{* Insert Line to seperate item header and item content visually *}} @@ -333,7 +260,7 @@ as the value of $top_child_total (this is done at the end of this file) -

    +

    {{* Action buttons to interact with the item (like: like, dislike, share and so on *}} +
    diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl index 7511988cb..9a0394fac 100644 --- a/view/theme/vier/templates/profile/vcard.tpl +++ b/view/theme/vier/templates/profile/vcard.tpl @@ -6,10 +6,6 @@
    {{$profile.edit.1}}
    - {{else}} - {{if $profile.menu}} -
    - {{/if}} {{/if}}
    From d37fd694772eba2734ee99b06f4e1b44e3d7fb2c Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 7 Feb 2020 05:57:41 +0000 Subject: [PATCH 2/2] Replaced spaces with tabs --- view/theme/frio/templates/wall_thread.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index d5e20ae25..d6c7f43a3 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -210,7 +210,7 @@ as the value of $top_child_total (this is done at the end of this file)