diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-13 08:45:48 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-13 08:45:48 +0300 |
| commit | 36fd4de8251cb265244320e67d3d5a3420712a85 (patch) | |
| tree | 21df19b4b6783df1fcd00be0a074e7b0db8139c0 /app/views | |
| parent | 8b1d44f789cce12219dbc70890d8a72675b71315 (diff) | |
| download | gitlab-ce-36fd4de8251cb265244320e67d3d5a3420712a85.tar.gz | |
Replace page_title with page-title. Correct margin for some blocks/layouts
Diffstat (limited to 'app/views')
80 files changed, 87 insertions, 98 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index 499738f9a06..2d4ffc10d5f 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Background Jobs +%h3.page-title Background Jobs %br .ui-box %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"} diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index af87503128e..f4d931f480f 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Edit Group +%h3.page-title Edit Group %hr = form_for [:admin, @group] do |f| - if @group.errors.any? diff --git a/app/views/admin/groups/index.html.haml b/app/views/admin/groups/index.html.haml index d880ff61c9b..cff0251cd5a 100644 --- a/app/views/admin/groups/index.html.haml +++ b/app/views/admin/groups/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Groups (#{@groups.total_count}) %small allows you to keep projects organized. diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml index 2da654ec764..483c40b1791 100644 --- a/app/views/admin/groups/new.html.haml +++ b/app/views/admin/groups/new.html.haml @@ -1,4 +1,4 @@ -%h3.page_title New Group +%h3.page-title New Group %hr = form_for [:admin, @group] do |f| - if @group.errors.any? diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 977fac291f3..13159fdb56d 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Group: #{@group.name} = link_to edit_admin_group_path(@group), class: "btn btn-small pull-right" do diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 70ea460a06f..59d8bd7d67a 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Projects = link_to 'New Project', new_project_path, class: "btn btn-small pull-right" diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 8779ec08870..d76af14b77b 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Project: #{@project.name_with_namespace} = link_to edit_project_path(@project), class: "btn pull-right" do %i.icon-edit diff --git a/app/views/admin/users/edit.html.haml b/app/views/admin/users/edit.html.haml index 0e31a0ba332..2a4f8c60546 100644 --- a/app/views/admin/users/edit.html.haml +++ b/app/views/admin/users/edit.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title #{@user.name} → %i.icon-edit Edit user diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 0f74e8f68f4..2cd095cfe9f 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Users = link_to 'New User', new_admin_user_path, class: "btn btn-small pull-right" %br diff --git a/app/views/admin/users/new.html.haml b/app/views/admin/users/new.html.haml index 1e82b249cf1..a1c90c48946 100644 --- a/app/views/admin/users/new.html.haml +++ b/app/views/admin/users/new.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title %i.icon-plus New user %hr diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index eaa7ebc3f49..7b67fb09fca 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title User: = @user.name - if @user.blocked? diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index ad104657fea..7fdc8b37cac 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -1,12 +1,10 @@ -%h3.page_title +%h3.page-title Issues %span.light – Assigned to you %span.pull-right #{@issues.total_count} issues -%br - .row .span3 = render 'filter', entity: 'issue' diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index de1c457c318..de5d8018757 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -1,11 +1,10 @@ -%h3.page_title +%h3.page-title Merge Requests %span.light – Authored by or assigned to you %span.pull-right #{@merge_requests.total_count} merge requests -%br .row .span3 = render 'filter', entity: 'merge_request' diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 5d47cbc3b83..76e164456ec 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -1,5 +1,5 @@ = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| - %h3.page_title Reset password + %h3.page-title Reset password %br = devise_error_messages! = f.email_field :email, placeholder: "Email", class: "text" diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 17a0c8fd79a..d749d7bac09 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -1,5 +1,5 @@ = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f| - %h3.page_title Sign Up + %h3.page-title Sign Up %br = devise_error_messages! %div diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 50452255860..caaa51f1100 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,5 +1,5 @@ .login-box - %h3.page_title Sign in + %h3.page-title Sign in %br - if ldap_enabled? %ul.nav.nav-tabs diff --git a/app/views/errors/access_denied.html.haml b/app/views/errors/access_denied.html.haml index f2d082cb77d..6aa78f0c2a8 100644 --- a/app/views/errors/access_denied.html.haml +++ b/app/views/errors/access_denied.html.haml @@ -1,5 +1,5 @@ %h1.http_status_code 403 -%h3.page_title Access Denied +%h3.page-title Access Denied %hr %p You are not allowed to access this page. %p Read more about project permissions #{link_to "here", help_permissions_path, class: "vlink"} diff --git a/app/views/errors/encoding.html.haml b/app/views/errors/encoding.html.haml index a0aa6306489..7021f06dd7f 100644 --- a/app/views/errors/encoding.html.haml +++ b/app/views/errors/encoding.html.haml @@ -1,4 +1,4 @@ %h1.http_status_code 500 -%h3.page_title Encoding Error +%h3.page-title Encoding Error %hr %p Page can't be loaded because of an encoding error. diff --git a/app/views/errors/git_not_found.html.haml b/app/views/errors/git_not_found.html.haml index 5c9c4953284..d8ed7773207 100644 --- a/app/views/errors/git_not_found.html.haml +++ b/app/views/errors/git_not_found.html.haml @@ -1,5 +1,5 @@ %h1.http_status_code 404 -%h3.page_title Git Resource Not found +%h3.page-title Git Resource Not found %hr %p Application can't get access to some branch or commit in your repository. It diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml index ee23d2197b4..4b97ddefc72 100644 --- a/app/views/errors/not_found.html.haml +++ b/app/views/errors/not_found.html.haml @@ -1,4 +1,4 @@ %h1.http_status_code 404 -%h3.page_title The resource you were looking for doesn't exist. +%h3.page-title The resource you were looking for doesn't exist. %hr %p You may have mistyped the address or the page may have moved. diff --git a/app/views/groups/_filter.html.haml b/app/views/groups/_filter.html.haml index 5c66f977531..9fbc6c190cc 100644 --- a/app/views/groups/_filter.html.haml +++ b/app/views/groups/_filter.html.haml @@ -1,11 +1,5 @@ = form_tag group_filter_path(entity), method: 'get' do - %fieldset.dashboard-search-filter - = search_field_tag "search", params[:search], { placeholder: 'Search', class: 'search-text-input' } - = button_tag type: 'submit', class: 'btn' do - %i.icon-search - %fieldset - %legend Status: %ul.nav.nav-pills.nav-stacked %li{class: ("active" if !params[:status])} = link_to group_filter_path(entity, status: nil) do diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 38dac634bf9..7ecc5f7b630 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Issues %small (assigned to you) %small.pull-right #{@issues.total_count} issues diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index a311729dd4d..eb8497c03f1 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Merge Requests %small (authored by or assigned to you) %small.pull-right #{@merge_requests.total_count} merge requests diff --git a/app/views/help/api.html.haml b/app/views/help/api.html.haml index b6ad5e14fc3..5eb59ab266d 100644 --- a/app/views/help/api.html.haml +++ b/app/views/help/api.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/api_layout' do - %h3.page_title + %h3.page-title %span.light API %span \/ diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 6529da7ddd5..48c8112421f 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title GITLAB .pull-right %span= Gitlab::VERSION diff --git a/app/views/help/markdown.html.haml b/app/views/help/markdown.html.haml index b4ff88c7f93..6ba67bf050b 100644 --- a/app/views/help/markdown.html.haml +++ b/app/views/help/markdown.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title GitLab Flavored Markdown + %h3.page-title GitLab Flavored Markdown %br .help_body diff --git a/app/views/help/permissions.html.haml b/app/views/help/permissions.html.haml index 4748b296960..2c093ba4cd7 100644 --- a/app/views/help/permissions.html.haml +++ b/app/views/help/permissions.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title Permissions + %h3.page-title Permissions %br %fieldset diff --git a/app/views/help/public_access.html.haml b/app/views/help/public_access.html.haml index 66de17a34ed..13bf90bc02f 100644 --- a/app/views/help/public_access.html.haml +++ b/app/views/help/public_access.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title Public Access + %h3.page-title Public Access %br %p diff --git a/app/views/help/raketasks.html.haml b/app/views/help/raketasks.html.haml index bcc874fc390..0f02696a111 100644 --- a/app/views/help/raketasks.html.haml +++ b/app/views/help/raketasks.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title GitLab Rake Tasks + %h3.page-title GitLab Rake Tasks %br %p.slead diff --git a/app/views/help/ssh.html.haml b/app/views/help/ssh.html.haml index 114415977b4..f35d578f144 100644 --- a/app/views/help/ssh.html.haml +++ b/app/views/help/ssh.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title SSH Keys + %h3.page-title SSH Keys %br %p.slead diff --git a/app/views/help/system_hooks.html.haml b/app/views/help/system_hooks.html.haml index c49011a2269..59b714dd839 100644 --- a/app/views/help/system_hooks.html.haml +++ b/app/views/help/system_hooks.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title System hooks + %h3.page-title System hooks %br %p.slead diff --git a/app/views/help/web_hooks.html.haml b/app/views/help/web_hooks.html.haml index 272b4c4302c..d3527697631 100644 --- a/app/views/help/web_hooks.html.haml +++ b/app/views/help/web_hooks.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title Web hooks + %h3.page-title Web hooks %br %p.slead diff --git a/app/views/help/workflow.html.haml b/app/views/help/workflow.html.haml index 495b7c6e6fc..4143d60f889 100644 --- a/app/views/help/workflow.html.haml +++ b/app/views/help/workflow.html.haml @@ -1,5 +1,5 @@ = render layout: 'help/layout' do - %h3.page_title Workflow + %h3.page-title Workflow %br %ol.help diff --git a/app/views/layouts/_page_title.html.haml b/app/views/layouts/_page_title.html.haml index ea72b25add9..54da5074763 100644 --- a/app/views/layouts/_page_title.html.haml +++ b/app/views/layouts/_page_title.html.haml @@ -1,2 +1,2 @@ -- if content_for?(:page_title) - = yield :page_title +- if content_for?(:page-title) + = yield :page-title diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index 05c481ded23..ec814c4abf4 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title SSH Keys = link_to "Add SSH Key", new_profile_key_path, class: "btn pull-right btn-primary" diff --git a/app/views/profiles/keys/new.html.haml b/app/views/profiles/keys/new.html.haml index fff3805890e..f1b8fe08d5c 100644 --- a/app/views/profiles/keys/new.html.haml +++ b/app/views/profiles/keys/new.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Add an SSH Key +%h3.page-title Add an SSH Key %hr = render 'form' diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index 069747097c5..c69955ae309 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Setup your notification level +%h3.page-title Setup your notification level %br diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 0bcf03bae8a..3eaa54a299c 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -1,6 +1,6 @@ .profile_avatar_holder = image_tag gravatar_icon(@user.email, 90), alt: '' -%h3.page_title +%h3.page-title = @user.name %br %small diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 62ef2871096..a592823a070 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -15,7 +15,7 @@ %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff) = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do %span Browse Code » - %h3.commit-title.page_title + %h3.commit-title.page-title = gfm escape_once(@commit.title) - if @commit.description.present? %pre.commit-description diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml index 95cfb60d885..9d491e72a5b 100644 --- a/app/views/projects/compare/index.html.haml +++ b/app/views/projects/compare/index.html.haml @@ -1,6 +1,6 @@ = render "projects/commits/head" -%h3.page_title +%h3.page-title Compare View %hr diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 51e88d1c47d..24be291bde2 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -1,6 +1,6 @@ = render "projects/commits/head" -%h3.page_title +%h3.page-title Compare View %hr diff --git a/app/views/projects/deploy_keys/new.html.haml b/app/views/projects/deploy_keys/new.html.haml index b0e2a8b2949..186d6b58972 100644 --- a/app/views/projects/deploy_keys/new.html.haml +++ b/app/views/projects/deploy_keys/new.html.haml @@ -1,4 +1,4 @@ -%h3.page_title New Deploy key +%h3.page-title New Deploy key %hr = render 'form' diff --git a/app/views/projects/deploy_keys/show.html.haml b/app/views/projects/deploy_keys/show.html.haml index 26fd7428b7e..49566f83d20 100644 --- a/app/views/projects/deploy_keys/show.html.haml +++ b/app/views/projects/deploy_keys/show.html.haml @@ -1,10 +1,10 @@ -%h3.page_title +%h3.page-title Deploy key: = @key.title %small created at = @key.created_at.stamp("Aug 21, 2011") -.back_link +.back-link = link_to project_deploy_keys_path(@project) do ← To keys list %hr diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml index 6593319af27..6f9a161a13c 100644 --- a/app/views/projects/graphs/show.html.haml +++ b/app/views/projects/graphs/show.html.haml @@ -1,7 +1,7 @@ .loading-graph %center .loading - %h3.page_title Building repository graph. Please wait a moment. + %h3.page-title Building repository graph. Please wait a moment. .stat-graph .header.clearfix @@ -10,7 +10,7 @@ %option{:value => "commits"} Commits %option{:value => "additions"} Additions %option{:value => "deletions"} Deletions - %h3#date_header.page_title + %h3#date_header.page-title %input#brush_change{:type => "hidden"} .graphs #contributors-master diff --git a/app/views/projects/issues/_form.html.haml b/app/views/projects/issues/_form.html.haml index 38aea6f06dc..153a477fdc8 100644 --- a/app/views/projects/issues/_form.html.haml +++ b/app/views/projects/issues/_form.html.haml @@ -1,5 +1,5 @@ %div.issue-form-holder - %h3.page_title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" + %h3.page-title= @issue.new_record? ? "New Issue" : "Edit Issue ##{@issue.id}" = form_for [@project, @issue] do |f| -if @issue.errors.any? .alert.alert-error diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index d3fd9886d45..ebe124d8906 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -1,6 +1,6 @@ = render "head" .issues_content - %h3.page_title + %h3.page-title Issues %span (<span class=issue_counter>#{@issues.total_count}</span>) .pull-right @@ -16,8 +16,6 @@ = hidden_field_tag :label_name, params[:label_name], id: 'search_label_name' = search_field_tag :issue_search, nil, { placeholder: 'Search', class: 'issue_search input-xlarge append-right-10 search-text-input' } - .clearfix - .row .span3 = render 'filter', entity: 'issue' diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 2c72d550b3c..fc6faa9c19d 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Issue ##{@issue.id} %small @@ -22,7 +22,7 @@ .pull-right .span3#votes= render 'votes/votes_block', votable: @issue -.back_link +.back-link = link_to project_issues_path(@project) do ← To issues list diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index b6a4b07b9ae..b0aa72783b4 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -1,6 +1,6 @@ = render "projects/issues/head" -%h3.page_title +%h3.page-title Labels %br diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml index eee148994d7..348ebee46e4 100644 --- a/app/views/projects/merge_requests/edit.html.haml +++ b/app/views/projects/merge_requests/edit.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = "Edit merge request #{@merge_request.id}" %hr = render 'form' diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index b9e9096e3ae..7db5a21280e 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -2,7 +2,7 @@ = link_to new_project_merge_request_path(@project), class: "pull-right btn btn-primary", title: "New Merge Request" do %i.icon-plus New Merge Request -%h3.page_title +%h3.page-title Merge Requests %br diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml index 594089995ea..8ee0e1a8d46 100644 --- a/app/views/projects/merge_requests/new.html.haml +++ b/app/views/projects/merge_requests/new.html.haml @@ -1,3 +1,3 @@ -%h3.page_title New Merge Request +%h3.page-title New Merge Request %hr = render 'form' diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 24285c272a8..5a07258f91c 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = "Merge Request ##{@merge_request.id}:" %span.label-branch= @merge_request.source_branch @@ -26,6 +26,6 @@ .pull-right .span3#votes= render 'votes/votes_block', votable: @merge_request -.back_link +.back-link = link_to project_merge_requests_path(@project) do ← To merge requests diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index 50e3e71b2c3..0dc9dab872f 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -1,5 +1,5 @@ -%h3.page_title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}" -.back_link +%h3.page-title= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}" +.back-link = link_to project_milestones_path(@project) do ← To milestones diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index 1bc359398ab..76cd16c4000 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -1,6 +1,6 @@ = render "projects/issues/head" .milestones_content - %h3.page_title + %h3.page-title Milestones - if can? current_user, :admin_milestone, @project = link_to new_project_milestone_path(@project), class: "pull-right btn btn-primary", title: "New Milestone" do diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index d16de0da390..b9e5bd9bcc5 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -1,11 +1,11 @@ = render "projects/issues/head" .row .span6 - %h3.page_title + %h3.page-title Milestone ##{@milestone.id} %small = @milestone.expires_at - .back_link + .back-link = link_to project_milestones_path(@project) do ← To milestones list .span6 diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml index 62ab8b049ac..e75b85c7ade 100644 --- a/app/views/projects/network/_head.html.haml +++ b/app/views/projects/network/_head.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Project Network Graph +%h3.page-title Project Network Graph %hr .clearfix diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml index ff6769531c4..b3cbf17809f 100644 --- a/app/views/projects/services/_form.html.haml +++ b/app/views/projects/services/_form.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title - if @service.activated? %span.cgreen %i.icon-circle @@ -9,7 +9,7 @@ %p= @service.description -.back_link +.back-link = link_to project_services_path(@project) do ← to services diff --git a/app/views/projects/services/index.html.haml b/app/views/projects/services/index.html.haml index 6d254f66f1c..2aa2a069943 100644 --- a/app/views/projects/services/index.html.haml +++ b/app/views/projects/services/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Services +%h3.page-title Services %br %ul.bordered-list diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index b36b56415aa..38cd4c40875 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -7,7 +7,7 @@ .loading.hide .span3 .light-well - %h3.page_title + %h3.page-title = @project.name - if @project.description.present? %p.light= @project.description diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/projects/snippets/_form.html.haml index 99a8761daef..a4f30734789 100644 --- a/app/views/projects/snippets/_form.html.haml +++ b/app/views/projects/snippets/_form.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" %hr .snippet-form-holder diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml index ce36bed1e0d..2e8dddefffc 100644 --- a/app/views/projects/snippets/index.html.haml +++ b/app/views/projects/snippets/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Snippets %small share code pastes with others out of git repository diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml index 36161c5706c..d5b334c9e90 100644 --- a/app/views/projects/snippets/show.html.haml +++ b/app/views/projects/snippets/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title %i.icon-lock.cgreen = @snippet.title diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml index 4e8f67702cf..2c6d9d892d0 100644 --- a/app/views/projects/team_members/_form.html.haml +++ b/app/views/projects/team_members/_form.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = "New Team member(s)" %hr = form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project) do |f| diff --git a/app/views/projects/team_members/import.html.haml b/app/views/projects/team_members/import.html.haml index 2b22c917a16..c293cb4beef 100644 --- a/app/views/projects/team_members/import.html.haml +++ b/app/views/projects/team_members/import.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = "Import team from another project" %hr %p.slead diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml index 8f81390ca13..e8ae84bb8f5 100644 --- a/app/views/projects/team_members/index.html.haml +++ b/app/views/projects/team_members/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Users with access to this project - if can? current_user, :admin_team_member, @project diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 7cf08815f78..464b1508a7e 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -8,7 +8,7 @@ .ui-box.ui-box-show .ui-box-head - %h3.page_title + %h3.page-title .edit-wiki-header = @wiki.title.titleize = f.hidden_field :title, value: @wiki.title diff --git a/app/views/projects/wikis/_new.html.haml b/app/views/projects/wikis/_new.html.haml index ca8e7c1b4b4..66f28b8b804 100644 --- a/app/views/projects/wikis/_new.html.haml +++ b/app/views/projects/wikis/_new.html.haml @@ -1,7 +1,7 @@ %div#modal-new-wiki.modal.hide .modal-header %a.close{href: "#"} × - %h3.page_title New Wiki Page + %h3.page-title New Wiki Page .modal-body = label_tag :new_wiki_path do %span Page slug diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index 4e318c92db3..66be82777c9 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -1,5 +1,5 @@ = render 'nav' -%h3.page_title +%h3.page-title Editing page = render 'main_links' = render 'form' diff --git a/app/views/projects/wikis/empty.html.haml b/app/views/projects/wikis/empty.html.haml index 08b59f0328b..48058124f97 100644 --- a/app/views/projects/wikis/empty.html.haml +++ b/app/views/projects/wikis/empty.html.haml @@ -1,4 +1,4 @@ -%h3.page_title Empty page +%h3.page-title Empty page %hr .error_message You are not allowed to create wiki pages diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml index 71e2b48d370..e783a982ddb 100644 --- a/app/views/projects/wikis/git_access.html.haml +++ b/app/views/projects/wikis/git_access.html.haml @@ -1,5 +1,5 @@ = render 'nav' -%h3.page_title +%h3.page-title Git Access %strong= @gollum_wiki.path_with_namespace = render 'main_links' diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml index 138c384353d..6544102b83f 100644 --- a/app/views/projects/wikis/history.html.haml +++ b/app/views/projects/wikis/history.html.haml @@ -1,5 +1,5 @@ = render 'nav' -%h3.page_title +%h3.page-title %span.light History for = @wiki.title.titleize = render 'main_links' diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml index 07e942ec62f..829617d77cd 100644 --- a/app/views/projects/wikis/pages.html.haml +++ b/app/views/projects/wikis/pages.html.haml @@ -1,5 +1,5 @@ = render 'nav' -%h3.page_title +%h3.page-title All Pages = render 'main_links' %br diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index d9d57e2d8be..2fdaa8d00e4 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -1,5 +1,5 @@ = render 'nav' -%h3.page_title +%h3.page-title = @wiki.title.titleize = render 'main_links' %br diff --git a/app/views/public/projects/index.html.haml b/app/views/public/projects/index.html.haml index e2b19d0d824..69d86e18f3f 100644 --- a/app/views/public/projects/index.html.haml +++ b/app/views/public/projects/index.html.haml @@ -1,6 +1,6 @@ .row .span6 - %h3.page_title + %h3.page-title Projects (#{@projects.total_count}) %small with read-only access .span6 diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml index 95e9e0357bc..e05794e820c 100644 --- a/app/views/snippets/_form.html.haml +++ b/app/views/snippets/_form.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}" %hr .snippet-form-holder diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml index cf5c3084dc4..1d9b60f7331 100644 --- a/app/views/snippets/current_user_index.html.haml +++ b/app/views/snippets/current_user_index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title My Snippets %small share code pastes with others out of git repository .pull-right diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index 4301f90f9d6..1502a6698fe 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title Public snippets %small share code pastes with others out of git repository diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index ac6daed56b6..fd837624dc9 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title - if @snippet.private? %i{:class => "icon-lock cgreen has_bottom_tooltip", "data-original-title" => "Private snippet"} - else diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml index 79e3ddf96fd..a9563b75e79 100644 --- a/app/views/snippets/user_index.html.haml +++ b/app/views/snippets/user_index.html.haml @@ -1,4 +1,4 @@ -%h3.page_title +%h3.page-title = image_tag gravatar_icon(@user.email), class: "avatar s24" = @user.name %span diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index b70f4193209..284098b9b19 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,6 +1,6 @@ .row .span8 - %h3.page_title + %h3.page-title = image_tag gravatar_icon(@user.email, 90), class: "avatar s90", alt: '' = @user.name - if @user == current_user |