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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
fe831dcd
Commit
fe831dcd
authored
Jan 28, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move `spinner` helper into IconsHelper
Also updates it to use the new `icon` method.
parent
8633bbc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+0
-9
app/helpers/icons_helper.rb
app/helpers/icons_helper.rb
+9
-0
No files found.
app/helpers/application_helper.rb
View file @
fe831dcd
...
@@ -247,15 +247,6 @@ module ApplicationHelper
...
@@ -247,15 +247,6 @@ module ApplicationHelper
Gitlab
::
MarkdownHelper
.
gitlab_markdown?
(
filename
)
Gitlab
::
MarkdownHelper
.
gitlab_markdown?
(
filename
)
end
end
def
spinner
(
text
=
nil
,
visible
=
false
)
css_class
=
'loading'
css_class
<<
' hide'
unless
visible
content_tag
:div
,
class:
css_class
do
content_tag
(
:i
,
nil
,
class:
'fa fa-spinner fa-spin'
)
+
text
end
end
def
link_to
(
name
=
nil
,
options
=
nil
,
html_options
=
nil
,
&
block
)
def
link_to
(
name
=
nil
,
options
=
nil
,
html_options
=
nil
,
&
block
)
begin
begin
uri
=
URI
(
options
)
uri
=
URI
(
options
)
...
...
app/helpers/icons_helper.rb
View file @
fe831dcd
...
@@ -8,6 +8,15 @@ module IconsHelper
...
@@ -8,6 +8,15 @@ module IconsHelper
fa_icon
(
names
,
options
)
fa_icon
(
names
,
options
)
end
end
def
spinner
(
text
=
nil
,
visible
=
false
)
css_class
=
'loading'
css_class
<<
' hide'
unless
visible
content_tag
:div
,
class:
css_class
do
icon
(
'spinner spin'
)
+
text
end
end
def
boolean_to_icon
(
value
)
def
boolean_to_icon
(
value
)
if
value
.
to_s
==
"true"
if
value
.
to_s
==
"true"
icon
(
'circle'
,
class:
'cgreen'
)
icon
(
'circle'
,
class:
'cgreen'
)
...
...
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