deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

layout fixes

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-01-15 12:27:55 +02:00
parent 60af43b981
commit bed882e647
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/application_helper.rb
View file

@ -82,4 +82,11 @@ module ApplicationHelper
[projects, default_nav, project_nav].flatten.to_json
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

4
app/views/layouts/_head_panel.html.haml
View file

@ -8,7 +8,7 @@
= image_tag "Gear-UI.PNG", :width => 20
- if @project && !@project.new_record?
- if project_layout
.project_name
= truncate @project.name, :length => 28
.git_url_wrapper
@ -18,7 +18,7 @@
= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
= 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 "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"