Added dashboard page. Projects page not root from now

This commit is contained in:
Dmitriy Zaporozhets 2012-02-28 22:59:36 +02:00
parent 34e1580184
commit 376bec26de
16 changed files with 141 additions and 39 deletions

View file

@ -1,6 +1,6 @@
%nav.main_menu
= render "layouts/const_menu_links"
-#= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path) || current_page?(root_path)}"
= link_to "Projects", projects_path, :class => "#{"current" if current_page?(projects_path)}"
= link_to "Issues", dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
= link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"

View file

@ -1 +1 @@
= link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
= link_to "Home", root_path, :class => "home #{"current" if current_page?(dashboard_path) || current_page?(root_path)}", :title => "Home"

View file

@ -5,7 +5,11 @@
%div.app_logo
= link_to root_path, :class => "home", :title => "Home" do
= image_tag "logo_tr.png", :width => 50
%h1 GITLAB
%h1
GITLAB
= link_to admin_projects_path, :class => "admin_link", :title => "Admin area" do
= image_tag "admin.PNG", :width => 16
%h1.project_name= title
.search= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"

View file

@ -7,6 +7,4 @@
.container
= render :partial => "layouts/app_menu"
.content
.row
.span12= yield
.sidebar= render "layouts/projects_side"
= yield