Commit 20ce3980 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

public_icon, private_icon helpers

parent 4a344c16
...@@ -422,3 +422,9 @@ img.emoji { ...@@ -422,3 +422,9 @@ img.emoji {
.search-container { .search-container {
margin-top: 30px; margin-top: 30px;
} }
.description-block {
@extend .light-well;
@extend .light;
margin-bottom: 10px;
}
...@@ -202,4 +202,13 @@ module ApplicationHelper ...@@ -202,4 +202,13 @@ module ApplicationHelper
def extra_config def extra_config
Gitlab.config.extra Gitlab.config.extra
end end
def public_icon
content_tag :i, nil, class: 'icon-globe cblue'
end
def private_icon
content_tag :i, nil, class: 'icon-lock cgreen'
end
end end
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
- @projects.each do |project| - @projects.each do |project|
%li %li
- if project.public - if project.public
%i.icon-share = public_icon
- else - else
%i.icon-lock.cgreen = private_icon
= link_to project.name_with_namespace, [:admin, project] = link_to project.name_with_namespace, [:admin, project]
.pull-right .pull-right
= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
- @group.projects.each do |project| - @group.projects.each do |project|
%li %li
- if project.public - if project.public
%i.icon-share = public_icon
- else - else
%i.icon-lock.cgreen = private_icon
= link_to project.name_with_namespace, project = link_to project.name_with_namespace, project
.pull-right .pull-right
= link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small" = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.loading.hide .loading.hide
.side.span4 .side.span4
- if @group.description.present? - if @group.description.present?
.description.well.well-small.light .description-block
= @group.description = @group.description
= render "projects", projects: @projects = render "projects", projects: @projects
.prepend-top-20 .prepend-top-20
......
...@@ -62,5 +62,6 @@ ...@@ -62,5 +62,6 @@
%fieldset %fieldset
%legend Owner %legend Owner
%ul %ul
%li Switch public mode
%li Transfer project to another namespace %li Transfer project to another namespace
%li Remove project %li Remove project
%li %li
.snippet-title .snippet-title
- if snippet.private? - if snippet.private?
%i.icon-lock.cgreen = private_icon
- else - else
%i.icon-globe.cblue = public_icon
= link_to reliable_snippet_path(snippet) do = link_to reliable_snippet_path(snippet) do
%h5.inline %h5.inline
= truncate(snippet.title, length: 60) = truncate(snippet.title, length: 60)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
.loading.hide .loading.hide
.side.span4 .side.span4
- if @team.description.present? - if @team.description.present?
.description.well.well-small.light .description-block
= @team.description = @team.description
= render "projects", projects: @projects = render "projects", projects: @projects
.prepend-top-20 .prepend-top-20
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment