diff options
| author | Hannes Rosenögger <123haynes@gmail.com> | 2015-01-19 23:37:20 +0300 |
|---|---|---|
| committer | Hannes Rosenögger <123haynes@gmail.com> | 2015-01-24 20:51:16 +0300 |
| commit | 70c44a0da2bdeead90a99fe79e7c047d38b8ca5c (patch) | |
| tree | d72df8e0b92754d5dd2e629a09d55695808e36d2 /app/views | |
| parent | 42bac7f9f27b0e8fb113e452fc2106882262172d (diff) | |
Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/_projects.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 2c65b3049e3..2716ebf326b 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -12,6 +12,8 @@ - projects.each do |project| %li.project-row = link_to project_path(project), class: dom_class(project) do + .dash-project-avatar + = project_icon(project.to_param, alt: '', class: 'avatar s24') .dash-project-access-icon = visibility_level_icon(project.visibility_level) %span.str-truncated diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fc6499de3e2..28de1a778a7 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -87,7 +87,10 @@ .form-group .col-sm-2 .col-sm-10 - = project_icon(@project.to_param, alt: '', class: 'avatar s160', only_uploaded: true) + - if @project.avatar? + = project_icon(@project.to_param, alt: '', class: 'avatar s160') + - else + = project_icon(@project.to_param, alt: '', class: 'avatar s160', only_uploaded: true) %p.light - if @project.avatar_in_git Project avatar in repository: #{ @project.avatar_in_git } @@ -102,7 +105,7 @@ %span.file_name.js-avatar-filename File name... = f.file_field :avatar, class: "js-project-avatar-input hidden" - .light The maximum file size allowed is 100KB. + .light The maximum file size allowed is 200KB. - if @project.avatar? %hr = link_to 'Remove avatar', project_avatar_path(@project), data: { confirm: "Project avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar" |