From db85e45add571453e6f5f1c3826b3bebc4baf613 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 2 Sep 2014 21:24:01 +0000 Subject: [PATCH] Show settings-cog and back button closes #3925 - Make user-settings-cog reappear - Show [< Users] back button --- .../{user-actions-menu.hbs => -user-actions-menu.hbs} | 4 ++-- ghost/admin/templates/settings/users/user.hbs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename ghost/admin/templates/{user-actions-menu.hbs => -user-actions-menu.hbs} (68%) diff --git a/ghost/admin/templates/user-actions-menu.hbs b/ghost/admin/templates/-user-actions-menu.hbs similarity index 68% rename from ghost/admin/templates/user-actions-menu.hbs rename to ghost/admin/templates/-user-actions-menu.hbs index 1b6afd1d97..45b4a12a4a 100644 --- a/ghost/admin/templates/user-actions-menu.hbs +++ b/ghost/admin/templates/-user-actions-menu.hbs @@ -1,6 +1,6 @@ -{{#if view.parentView.canMakeOwner}} +{{#if view.canMakeOwner}}
  • {{/if}} -{{#if view.parentView.deleteUserActionIsVisible}} +{{#if view.deleteUserActionIsVisible}}
  • {{/if}} \ No newline at end of file diff --git a/ghost/admin/templates/settings/users/user.hbs b/ghost/admin/templates/settings/users/user.hbs index 7e17f51eab..723e8e91b9 100644 --- a/ghost/admin/templates/settings/users/user.hbs +++ b/ghost/admin/templates/settings/users/user.hbs @@ -1,17 +1,17 @@
    {{#unless session.user.isAuthor}} - {{#link-to "settings.users" class="button has-icon users-back" tagName="button"}}Users{{/link-to}} + {{#link-to "settings.users" class="btn btn-default btn-back" tagName="button"}}Users{{/link-to}} {{/unless}}

    {{user.name}}

    {{#if view.userActionsAreVisible}} - {{#gh-popover-button popoverName="user-actions-menu" classNames="button only-has-icon user-actions-cog" title="User Actions"}} + {{#gh-popover-button popoverName="user-actions-menu" classNames="btn btn-default only-has-icon user-actions-cog" title="User Actions"}} {{/gh-popover-button}} {{#gh-popover name="user-actions-menu" tagName="ul" classNames="user-actions-menu dropdown-menu dropdown-triangle-top-right"}} - {{render "user-actions-menu" model}} + {{partial "user-actions-menu"}} {{/gh-popover}} {{/if}} @@ -115,4 +115,4 @@ - \ No newline at end of file +