Customized more doorkeeper views, only logged in users can create oauth apps

1 files changed, 6 insertions, 21 deletions

diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml
index 128bf8db9..ea8390bae 100644
--- a/app/views/layouts/dashboard.html.haml
+++ b/app/views/layouts/dashboard.html.haml
@@ -6,38 +6,23 @@
       .dashboard__current-user
         = link_to account_path(current_user.account) do
           = image_tag current_user.account.avatar.url(:medium), class: 'dashboard__current-user__avatar'
-          %strong.dashboard__current-user__display-name= current_user.account.display_name
+          %strong.dashboard__current-user__display-name= current_user.account.display_name.blank? ? current_user.account.username : current_user.account.display_name
           %span.dashboard__current-user__username= "@#{current_user.account.username}"
       %ul
-        %li.active
+        %li{ class: active_nav_class(root_path) }
           = link_to root_path do
             = fa_icon 'home'
             Home
-        %li
-          = link_to mentions_path do
-            = fa_icon 'at'
-            Mentions
-        %li
-          = link_to root_path do
-            = fa_icon 'group'
-            Subscriptions
-        %li
+        %li{ class: active_nav_class(oauth_authorized_applications_path) }
           = link_to oauth_authorized_applications_path do
             = fa_icon 'shield'
             Authorized apps
-        %li
-          = link_to root_path do
-            = fa_icon 'user'
-            Edit profile
-        %li
-          = link_to edit_registration_path(current_user) do
-            = fa_icon 'wrench'
-            Change password
     .dashboard__content
       .dashboard__top-bar
-        Home
+        = content_for?(:page_title) ? yield(:page_title) : 'Mastodon'
         %ul
-          %li= link_to fa_icon('sign-out'), destroy_user_session_path, method: :delete
+          %li= link_to fa_icon('gear'), edit_registration_path(current_user), title: 'Change password'
+          %li= link_to fa_icon('sign-out'), destroy_user_session_path, method: :delete, title: 'Sign out'
       .dashboard__content__content= yield
   .footer
     .domain= Rails.configuration.x.local_domain