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/projects | |
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/projects')
35 files changed, 42 insertions, 44 deletions
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 |