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
Boxiang Sun
gitlab-ce
Commits
ba7b4630
Commit
ba7b4630
authored
Jun 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace home icon with tab names
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
3f8e6cf3
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
14 deletions
+10
-14
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+1
-1
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+1
-1
app/views/layouts/nav/_profile.html.haml
app/views/layouts/nav/_profile.html.haml
+1
-1
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+1
-1
features/steps/admin/active_tab.rb
features/steps/admin/active_tab.rb
+1
-1
features/steps/dashboard/active_tab.rb
features/steps/dashboard/active_tab.rb
+1
-1
features/steps/profile/active_tab.rb
features/steps/profile/active_tab.rb
+1
-1
features/steps/project/active_tab.rb
features/steps/project/active_tab.rb
+1
-1
features/steps/shared/active_tab.rb
features/steps/shared/active_tab.rb
+1
-5
No files found.
app/views/layouts/nav/_admin.html.haml
View file @
ba7b4630
%ul
%ul
=
nav_link
(
controller: :dashboard
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
controller: :dashboard
,
html_options:
{
class:
'home'
})
do
=
link_to
admin_root_path
,
title:
"Stats"
do
=
link_to
admin_root_path
,
title:
"Stats"
do
%i
.icon-home
Dashboard
=
nav_link
(
controller: :projects
)
do
=
nav_link
(
controller: :projects
)
do
=
link_to
"Projects"
,
admin_projects_path
=
link_to
"Projects"
,
admin_projects_path
=
nav_link
(
controller: :groups
)
do
=
nav_link
(
controller: :groups
)
do
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
ba7b4630
%ul
%ul
=
nav_link
(
path:
'dashboard#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'dashboard#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
root_path
,
title:
"Home"
do
=
link_to
root_path
,
title:
"Home"
do
%i
.icon-home
Activity
=
nav_link
(
path:
'dashboard#projects'
)
do
=
nav_link
(
path:
'dashboard#projects'
)
do
=
link_to
projects_dashboard_path
do
=
link_to
projects_dashboard_path
do
Projects
Projects
...
...
app/views/layouts/nav/_group.html.haml
View file @
ba7b4630
%ul
%ul
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'groups#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
group_path
(
@group
),
title:
"Home"
do
=
link_to
group_path
(
@group
),
title:
"Home"
do
%i
.icon-home
Activity
=
nav_link
(
path:
'groups#issues'
)
do
=
nav_link
(
path:
'groups#issues'
)
do
=
link_to
issues_group_path
(
@group
)
do
=
link_to
issues_group_path
(
@group
)
do
Issues
Issues
...
...
app/views/layouts/nav/_profile.html.haml
View file @
ba7b4630
%ul
%ul
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
'profiles#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
profile_path
,
title:
"Profile"
do
=
link_to
profile_path
,
title:
"Profile"
do
%i
.icon-hom
e
Profil
e
=
nav_link
(
controller: :accounts
)
do
=
nav_link
(
controller: :accounts
)
do
=
link_to
"Account"
,
profile_account_path
=
link_to
"Account"
,
profile_account_path
=
nav_link
(
controller: :emails
)
do
=
nav_link
(
controller: :emails
)
do
...
...
app/views/layouts/nav/_project.html.haml
View file @
ba7b4630
%ul
%ul
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
})
do
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
})
do
=
link_to
project_path
(
@project
),
title:
"Project"
do
=
link_to
project_path
(
@project
),
title:
"Project"
do
%i
.icon-home
Activity
-
if
project_nav_tab?
:files
-
if
project_nav_tab?
:files
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree)
)
do
=
nav_link
(
controller:
%w(tree blob blame edit_tree new_tree)
)
do
...
...
features/steps/admin/active_tab.rb
View file @
ba7b4630
...
@@ -4,7 +4,7 @@ class AdminActiveTab < Spinach::FeatureSteps
...
@@ -4,7 +4,7 @@ class AdminActiveTab < Spinach::FeatureSteps
include
SharedActiveTab
include
SharedActiveTab
Then
'the active main tab should be Home'
do
Then
'the active main tab should be Home'
do
ensure_active_main_tab
(
'
Home
'
)
ensure_active_main_tab
(
'
Dashboard
'
)
end
end
Then
'the active main tab should be Projects'
do
Then
'the active main tab should be Projects'
do
...
...
features/steps/dashboard/active_tab.rb
View file @
ba7b4630
...
@@ -4,7 +4,7 @@ class DashboardActiveTab < Spinach::FeatureSteps
...
@@ -4,7 +4,7 @@ class DashboardActiveTab < Spinach::FeatureSteps
include
SharedActiveTab
include
SharedActiveTab
Then
'the active main tab should be Home'
do
Then
'the active main tab should be Home'
do
ensure_active_main_tab
(
'
Home
'
)
ensure_active_main_tab
(
'
Activity
'
)
end
end
Then
'the active main tab should be Issues'
do
Then
'the active main tab should be Issues'
do
...
...
features/steps/profile/active_tab.rb
View file @
ba7b4630
...
@@ -4,7 +4,7 @@ class ProfileActiveTab < Spinach::FeatureSteps
...
@@ -4,7 +4,7 @@ class ProfileActiveTab < Spinach::FeatureSteps
include
SharedActiveTab
include
SharedActiveTab
Then
'the active main tab should be Home'
do
Then
'the active main tab should be Home'
do
ensure_active_main_tab
(
'
Hom
e'
)
ensure_active_main_tab
(
'
Profil
e'
)
end
end
Then
'the active main tab should be Account'
do
Then
'the active main tab should be Account'
do
...
...
features/steps/project/active_tab.rb
View file @
ba7b4630
...
@@ -7,7 +7,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
...
@@ -7,7 +7,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
# Main Tabs
# Main Tabs
Then
'the active main tab should be Home'
do
Then
'the active main tab should be Home'
do
ensure_active_main_tab
(
'
Home
'
)
ensure_active_main_tab
(
'
Activity
'
)
end
end
Then
'the active main tab should be Settings'
do
Then
'the active main tab should be Settings'
do
...
...
features/steps/shared/active_tab.rb
View file @
ba7b4630
...
@@ -2,12 +2,8 @@ module SharedActiveTab
...
@@ -2,12 +2,8 @@ module SharedActiveTab
include
Spinach
::
DSL
include
Spinach
::
DSL
def
ensure_active_main_tab
(
content
)
def
ensure_active_main_tab
(
content
)
if
content
==
"Home"
page
.
find
(
'.main-nav li.active'
).
should
have_css
(
'i.icon-home'
)
else
page
.
find
(
'.main-nav li.active'
).
should
have_content
(
content
)
page
.
find
(
'.main-nav li.active'
).
should
have_content
(
content
)
end
end
end
def
ensure_active_sub_tab
(
content
)
def
ensure_active_sub_tab
(
content
)
page
.
find
(
'div.content ul.nav-tabs li.active'
).
should
have_content
(
content
)
page
.
find
(
'div.content ul.nav-tabs li.active'
).
should
have_content
(
content
)
...
...
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