Addresses front & backend comments

- Improves CSS files by reusing existing code
- Changes logic in views to avoid future problems in translations
This commit is contained in:
Mayra Cabrera 2017-11-06 19:37:07 +01:00
parent 70b8f421ae
commit 7ebf033198
4 changed files with 7 additions and 8 deletions

View File

@ -67,10 +67,9 @@
.limit-box {
background: $blue-100;
border-radius: 3px;
border-radius: $border-radius-default;
display: inline-block;
margin-left: 5px;
padding: 1px 1px 0.5px 0;
padding: 1px 1px 0.5px;
text-align: center;
vertical-align: bottom;

View File

@ -1,6 +1,6 @@
.has-tooltip{ class: "limit-box limit-box-#{objects.singularize}", data: { title: "Project has too many #{objects} to search"} }
.has-tooltip{ class: "limit-box limit-box-#{objects.to_s.singularize} prepend-left-5", data: { title: "Project has too many #{label_for_message} to search"} }
.limit-icon
- if objects == "branches"
- if objects == :branches
= icon('code-fork')
- else
= icon('tag')

View File

@ -1,5 +1,5 @@
- if @branches_limit_exceeded
= render 'limit_exceeded_message', objects: 'branches'
= render 'limit_exceeded_message', objects: :branches, label_for_message: _('branches')
- else
- branch = commit_default_branch(@project, @branches)
= commit_branch_link(project_ref_path(@project, branch), branch)
@ -10,6 +10,6 @@
%span.js-details-content.hide
= commit_branches_links(@project, @branches)
- if @tags_limit_exceeded
= render 'limit_exceeded_message', objects: 'tags'
= render 'limit_exceeded_message', objects: :tags, label_for_message: _('tags')
- else
= commit_tags_links(@project, @tags)

View File

@ -59,7 +59,7 @@ describe 'projects/commit/branches.html.haml' do
before do
assign(:branches, ['master'])
assign(:branches_limit_exceeded, true)
assign(:tags, ['tag1', 'tag2'])
assign(:tags, %w(tag1 tag2))
assign(:tags_limit_exceeded, false)
render