Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
436e9646
Commit
436e9646
authored
Nov 20, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Nicer icons for enabled/disabled stuff
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
b07c02eb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
15 deletions
+7
-15
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+1
-0
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+2
-2
app/models/hipchat_service.rb
app/models/hipchat_service.rb
+1
-1
app/views/projects/services/_form.html.haml
app/views/projects/services/_form.html.haml
+1
-6
app/views/projects/services/index.html.haml
app/views/projects/services/index.html.haml
+2
-6
No files found.
app/assets/stylesheets/gitlab_bootstrap/common.scss
View file @
436e9646
/** COLORS **/
.cgray
{
color
:
gray
}
.clgray
{
color
:
#BBB
}
.cred
{
color
:
#D12F19
}
.cgreen
{
color
:
#4a2
}
.cblue
{
color
:
#29A
}
...
...
app/helpers/icons_helper.rb
View file @
436e9646
module
IconsHelper
def
boolean_to_icon
(
value
)
if
value
.
to_s
==
"true"
content_tag
:i
,
nil
,
class:
'icon-
circle
cgreen'
content_tag
:i
,
nil
,
class:
'icon-
ok
cgreen'
else
content_tag
:i
,
nil
,
class:
'icon-
circle c
gray'
content_tag
:i
,
nil
,
class:
'icon-
off cl
gray'
end
end
...
...
app/models/hipchat_service.rb
View file @
436e9646
...
...
@@ -25,7 +25,7 @@ class HipchatService < Service
end
def
description
'
Simple web-based real-time group chat
'
'
Private group chat and IM
'
end
def
to_param
...
...
app/views/projects/services/_form.html.haml
View file @
436e9646
%h3
.page-title
-
if
@service
.
activated?
%span
.cgreen
%i
.icon-circle
-
else
%span
.cgray
%i
.icon-circle-blank
=
@service
.
title
=
boolean_to_icon
@service
.
activated?
%p
=
@service
.
description
...
...
app/views/projects/services/index.html.haml
View file @
436e9646
...
...
@@ -6,12 +6,8 @@
-
@services
.
each
do
|
service
|
%li
%h4
-
if
service
.
activated?
%span
.cgreen
%i
.icon-circle
-
else
%span
.cgray
%i
.icon-circle-blank
=
link_to
edit_project_service_path
(
@project
,
service
.
to_param
)
do
=
service
.
title
.pull-right
=
boolean_to_icon
service
.
activated?
%p
=
service
.
description
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment