public_icon, private_icon helpers

Dmitriy Zaporozhets
1 parent 4a344c16
Showing 8 changed files with 24 additions and 8 deletions Show diff stats
app/assets/stylesheets/common.scss
app/helpers/application_helper.rb
app/views/admin/projects/index.html.haml
app/views/groups/edit.html.haml
app/views/groups/show.html.haml
app/views/help/permissions.html.haml
app/views/snippets/_snippet.html.haml
app/views/teams/show.html.haml
@@ -422,3 +422,9 @@ img.emoji {
 .search-container {
   margin-top: 30px;
 }
+
+.description-block {
+  @extend .light-well;
+  @extend .light;
+  margin-bottom: 10px;
+}
@@ -202,4 +202,13 @@ module ApplicationHelper
   def extra_config
     Gitlab.config.extra
   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
@@ -47,9 +47,9 @@
         - @projects.each do |project|
           %li
             - if project.public
-              %i.icon-share
+              = public_icon
             - else
-              %i.icon-lock.cgreen
+              = private_icon
             = link_to project.name_with_namespace, [:admin, project]
             .pull-right
               = link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
@@ -19,9 +19,9 @@
             - @group.projects.each do |project|
               %li
                 - if project.public
-                  %i.icon-share
+                  = public_icon
                 - else
-                  %i.icon-lock.cgreen
+                  = private_icon
                 = link_to project.name_with_namespace, project
                 .pull-right
                   = link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
@@ -13,7 +13,7 @@
     .loading.hide
   .side.span4
     - if @group.description.present?
-      .description.well.well-small.light
+      .description-block
         = @group.description
     = render "projects", projects: @projects
     .prepend-top-20
@@ -62,5 +62,6 @@
   %fieldset
     %legend Owner
     %ul
+      %li Switch public mode
       %li Transfer project to another namespace
       %li Remove project
 %li
   .snippet-title
     - if snippet.private?
-      %i.icon-lock.cgreen
+      = private_icon
     - else
-      %i.icon-globe.cblue
+      = public_icon
     = link_to reliable_snippet_path(snippet) do
       %h5.inline
         = truncate(snippet.title, length: 60)
@@ -12,7 +12,7 @@
     .loading.hide
   .side.span4
     - if @team.description.present?
-      .description.well.well-small.light
+      .description-block
         = @team.description
     = render "projects", projects: @projects
     .prepend-top-20
	@@ -422,3 +422,9 @@ img.emoji {		@@ -422,3 +422,9 @@ img.emoji {
422	.search-container {	422	.search-container {
423	margin-top: 30px;	423	margin-top: 30px;
424	}	424	}
		425	+
		426	+.description-block {
		427	+ @extend .light-well;
		428	+ @extend .light;
		429	+ margin-bottom: 10px;
		430	+}
	@@ -202,4 +202,13 @@ module ApplicationHelper		@@ -202,4 +202,13 @@ module ApplicationHelper
202	def extra_config	202	def extra_config
203	Gitlab.config.extra	203	Gitlab.config.extra
204	end	204	end
		205	+
		206	+ def public_icon
		207	+ content_tag :i, nil, class: 'icon-globe cblue'
		208	+ end
		209	+
		210	+ def private_icon
		211	+ content_tag :i, nil, class: 'icon-lock cgreen'
		212	+ end
		213	+
205	end	214	end
	@@ -47,9 +47,9 @@		@@ -47,9 +47,9 @@
47	- @projects.each do \|project\|	47	- @projects.each do \|project\|
48	%li	48	%li
49	- if project.public	49	- if project.public
50	- %i.icon-share	50	+ = public_icon
51	- else	51	- else
52	- %i.icon-lock.cgreen	52	+ = private_icon
53	= link_to project.name_with_namespace, [:admin, project]	53	= link_to project.name_with_namespace, [:admin, project]
54	.pull-right	54	.pull-right
55	= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"	55	= link_to 'Edit', edit_project_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"
	@@ -19,9 +19,9 @@		@@ -19,9 +19,9 @@
19	- @group.projects.each do \|project\|	19	- @group.projects.each do \|project\|
20	%li	20	%li
21	- if project.public	21	- if project.public
22	- %i.icon-share	22	+ = public_icon
23	- else	23	- else
24	- %i.icon-lock.cgreen	24	+ = private_icon
25	= link_to project.name_with_namespace, project	25	= link_to project.name_with_namespace, project
26	.pull-right	26	.pull-right
27	= link_to 'Team', project_team_index_path(project), id: "edit_#{dom_id(project)}", class: "btn btn-small"	27	= 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 @@
13	.loading.hide	13	.loading.hide
14	.side.span4	14	.side.span4
15	- if @group.description.present?	15	- if @group.description.present?
16	- .description.well.well-small.light	16	+ .description-block
17	= @group.description	17	= @group.description
18	= render "projects", projects: @projects	18	= render "projects", projects: @projects
19	.prepend-top-20	19	.prepend-top-20
	@@ -62,5 +62,6 @@		@@ -62,5 +62,6 @@
62	%fieldset	62	%fieldset
63	%legend Owner	63	%legend Owner
64	%ul	64	%ul
		65	+ %li Switch public mode
65	%li Transfer project to another namespace	66	%li Transfer project to another namespace
66	%li Remove project	67	%li Remove project
1	%li	1	%li
2	.snippet-title	2	.snippet-title
3	- if snippet.private?	3	- if snippet.private?
4	- %i.icon-lock.cgreen	4	+ = private_icon
5	- else	5	- else
6	- %i.icon-globe.cblue	6	+ = public_icon
7	= link_to reliable_snippet_path(snippet) do	7	= link_to reliable_snippet_path(snippet) do
8	%h5.inline	8	%h5.inline
9	= truncate(snippet.title, length: 60)	9	= truncate(snippet.title, length: 60)
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	.loading.hide	12	.loading.hide
13	.side.span4	13	.side.span4
14	- if @team.description.present?	14	- if @team.description.present?
15	- .description.well.well-small.light	15	+ .description-block
16	= @team.description	16	= @team.description
17	= render "projects", projects: @projects	17	= render "projects", projects: @projects
18	.prepend-top-20	18	.prepend-top-20