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
Jérome Perrin
gitlab-ce
Commits
bed882e6
Commit
bed882e6
authored
Jan 15, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
layout fixes
parent
60af43b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+7
-0
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+2
-2
No files found.
app/helpers/application_helper.rb
View file @
bed882e6
...
@@ -82,4 +82,11 @@ module ApplicationHelper
...
@@ -82,4 +82,11 @@ module ApplicationHelper
[
projects
,
default_nav
,
project_nav
].
flatten
.
to_json
[
projects
,
default_nav
,
project_nav
].
flatten
.
to_json
end
end
def
project_layout
@project
&&
!
@project
.
new_record?
end
def
profile_layout
controller
.
controller_name
==
"dashboard"
||
current_page?
(
projects_path
)
||
controller
.
controller_name
==
"profile"
||
controller
.
controller_name
==
"keys"
end
end
end
app/views/layouts/_head_panel.html.haml
View file @
bed882e6
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
image_tag
"Gear-UI.PNG"
,
:width
=>
20
=
image_tag
"Gear-UI.PNG"
,
:width
=>
20
-
if
@project
&&
!
@project
.
new_record?
-
if
project_layout
.project_name
.project_name
=
truncate
@project
.
name
,
:length
=>
28
=
truncate
@project
.
name
,
:length
=>
28
.git_url_wrapper
.git_url_wrapper
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
=
render
:partial
=>
"projects/refs"
,
:locals
=>
{
:destination
=>
controller
.
controller_name
==
"commits"
?
"commits"
:
"tree"
}
=
render
:partial
=>
"projects/refs"
,
:locals
=>
{
:destination
=>
controller
.
controller_name
==
"commits"
?
"commits"
:
"tree"
}
=
yield
:rss_icon
=
yield
:rss_icon
-
if
controller
.
controller_name
==
"dashboard"
||
current_page?
(
projects_path
)
-
elsif
profile_layout
=
link_to
"Activities"
,
dashboard_path
,
:class
=>
"dash_top_link
#{
"active"
if
current_page?
(
dashboard_path
)
||
current_page?
(
root_path
)
}
"
=
link_to
"Activities"
,
dashboard_path
,
:class
=>
"dash_top_link
#{
"active"
if
current_page?
(
dashboard_path
)
||
current_page?
(
root_path
)
}
"
=
link_to
"Projects"
,
projects_path
,
:class
=>
"dash_top_link
#{
"active"
if
current_page?
(
projects_path
)
}
"
=
link_to
"Projects"
,
projects_path
,
:class
=>
"dash_top_link
#{
"active"
if
current_page?
(
projects_path
)
}
"
=
link_to
"Issues"
,
dashboard_issues_path
,
:class
=>
"dash_top_link
#{
"active"
if
current_page?
(
dashboard_issues_path
)
}
"
,
:id
=>
"issues_slide"
=
link_to
"Issues"
,
dashboard_issues_path
,
:class
=>
"dash_top_link
#{
"active"
if
current_page?
(
dashboard_issues_path
)
}
"
,
:id
=>
"issues_slide"
...
...
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