diff --git a/src/Model/Profile.php b/src/Model/Profile.php index caf0b0869d..28491fb5f0 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 d762420551..8ebc6e265b 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 d387ea683c..0000000000 --- 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 337817553a..12a961108d 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 0fa56352fc..cc661b3d50 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 5ac982fa25..95c89bd07b 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 3e8a2faea7..d5e20ae25c 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}} + +
    {{* 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 7511988cba..9a0394facf 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}}