diff options
| -rw-r--r-- | app/views/dashboard/_groups_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 2 | ||||
| -rw-r--r-- | app/views/dashboard/activity.html.haml | 1 | ||||
| -rw-r--r-- | app/views/dashboard/groups/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 5 | ||||
| -rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 6 | ||||
| -rw-r--r-- | app/views/dashboard/milestones/index.html.haml | 5 | ||||
| -rw-r--r-- | app/views/dashboard/projects/starred.html.haml | 1 | ||||
| -rw-r--r-- | app/views/dashboard/show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/explore/groups/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/dashboard.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/explore.html.haml | 3 | ||||
| -rw-r--r-- | app/views/layouts/snippets.html.haml | 2 | ||||
| -rw-r--r-- | app/views/snippets/current_user_index.html.haml | 11 | ||||
| -rw-r--r-- | app/views/snippets/index.html.haml | 10 |
15 files changed, 30 insertions, 24 deletions
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 8a397a84e0e..dcd6c97d44d 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -3,5 +3,5 @@ = link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do Your Groups = nav_link(page: [explore_groups_path]) do - = link_to explore_groups_path, title: 'Explore groups', data: {toggle: 'tooltip', placement: 'bottom'} do + = link_to explore_groups_path, title: 'Explore groups', data: {placement: 'bottom'} do Explore Groups diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index 9ba12036f27..13a5eae3cdc 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -6,5 +6,5 @@ = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do Starred Projects = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path], html_options: { class: 'hidden-xs' }) do - = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do + = link_to explore_root_path, title: 'Explore', data: {placement: 'right'} do Explore Projects diff --git a/app/views/dashboard/activity.html.haml b/app/views/dashboard/activity.html.haml index 72419bf94dd..3e24338af64 100644 --- a/app/views/dashboard/activity.html.haml +++ b/app/views/dashboard/activity.html.haml @@ -2,6 +2,7 @@ - if current_user = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity") +- header_title "Activity", activity_dashboard_path = render 'dashboard/activity_head' %section.activities diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml index 9307812d495..c249f5cacec 100644 --- a/app/views/dashboard/groups/index.html.haml +++ b/app/views/dashboard/groups/index.html.haml @@ -1,4 +1,5 @@ - page_title "Groups" +- header_title "Groups", dashboard_groups_path = render 'dashboard/groups_head' .gray-content-block diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index 94318d1bcf5..14734ae7372 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -1,14 +1,11 @@ - page_title "Issues" +- header_title "Issues", issues_dashboard_path(assignee_id: current_user.id) = content_for :meta_tags do - if current_user = auto_discovery_link_tag(:atom, issues_dashboard_url(format: :atom, private_token: current_user.private_token), title: "#{current_user.name} issues") -%h3.page-title - Issues - %p.light List all issues from all projects you have access to. -%hr .append-bottom-20 .pull-right diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 90611d562b0..3739a7d5dbc 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -1,11 +1,9 @@ - page_title "Merge Requests" -%h3.page-title - Merge Requests - +- header_title "Merge Requests", merge_requests_dashboard_path(assignee_id: current_user.id) %p.light List all merge requests from all projects you have access to. -%hr + .append-bottom-20 = render 'shared/issuable/filter', type: :merge_requests = render 'shared/merge_requests' diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml index 9a9a5e139a4..88ad3cd7297 100644 --- a/app/views/dashboard/milestones/index.html.haml +++ b/app/views/dashboard/milestones/index.html.haml @@ -1,12 +1,9 @@ - page_title "Milestones" -%h3.page-title - Milestones - %span.pull-right #{@dashboard_milestones.count} milestones +- header_title "Milestones", dashboard_milestones_path %p.light List all milestones from all projects you have access to. -%hr = render 'shared/milestones_filter' .milestones diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml index becd989c1f3..2fd7a1cf16c 100644 --- a/app/views/dashboard/projects/starred.html.haml +++ b/app/views/dashboard/projects/starred.html.haml @@ -1,4 +1,5 @@ - page_title "Starred Projects" +- header_title "Projects", (current_user ? root_path : explore_root_path) = render 'dashboard/projects_head' - if @projects.any? diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml index 4cf2feb9aa6..1d5324e0d72 100644 --- a/app/views/dashboard/show.html.haml +++ b/app/views/dashboard/show.html.haml @@ -2,6 +2,7 @@ - if current_user = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity") +- header_title "Projects", (current_user ? root_path : explore_root_path) = render 'dashboard/projects_head' - if @last_push diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml index 86410db2b2d..e8a6752de8c 100644 --- a/app/views/explore/groups/index.html.haml +++ b/app/views/explore/groups/index.html.haml @@ -1,4 +1,5 @@ - page_title "Groups" +- header_title "Groups", (current_user ? dashboard_groups_path : explore_groups_path) - if current_user = render 'dashboard/groups_head' .gray-content-block.clearfix diff --git a/app/views/layouts/dashboard.html.haml b/app/views/layouts/dashboard.html.haml index c72eca10bf4..fad7de69432 100644 --- a/app/views/layouts/dashboard.html.haml +++ b/app/views/layouts/dashboard.html.haml @@ -1,5 +1,6 @@ - page_title "Dashboard" -- header_title "Dashboard", root_path +- unless @header_title + - header_title "Dashboard", root_path - sidebar "dashboard" = render template: "layouts/application" diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml index 17fee9c510d..9098554e6f0 100644 --- a/app/views/layouts/explore.html.haml +++ b/app/views/layouts/explore.html.haml @@ -1,6 +1,7 @@ - page_title "Explore" - if current_user - - header_title "Dashboard", root_path + - unless @header_title + - header_title "Projects", (current_user ? root_path : explore_root_path) - else - header_title "Explore GitLab", explore_root_path - sidebar "dashboard" diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml index b77fe09fc2a..d9c90d4fcef 100644 --- a/app/views/layouts/snippets.html.haml +++ b/app/views/layouts/snippets.html.haml @@ -1,6 +1,6 @@ - page_title 'Snippets' - if current_user - - header_title "Dashboard", root_path + - header_title "Snippets", user_snippets_path(current_user) - else - header_title 'Snippets', snippets_path - sidebar "dashboard" diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml index 62a967a2e06..d704407c4dd 100644 --- a/app/views/snippets/current_user_index.html.haml +++ b/app/views/snippets/current_user_index.html.haml @@ -1,14 +1,15 @@ - page_title "Your Snippets" = render 'head' -.slead - Share code pastes with others out of git repository - +.gray-content-block .pull-right - = link_to new_snippet_path, class: "btn btn-new btn-sm", title: "New Snippet" do + = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do Add new snippet -%ul.nav.nav-tabs + .oneline + Share code pastes with others out of git repository + +%ul.nav.nav-tabs.prepend-top-20 = nav_tab :scope, nil do = link_to user_snippets_path(@user) do All diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index 8608815e0a6..3b62dd2a6e1 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -2,8 +2,14 @@ - if current_user = render 'head' -.slead - Public snippets created by you and other users are listed here +.gray-content-block + - if current_user + .pull-right + = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do + Add new snippet + + .oneline + Public snippets created by you and other users are listed here = render 'snippets' |