restyled main menu. move from left to top orientation
This commit is contained in:
Dmitriy Zaporozhets
parent
9511ec846d
commit
c844723a24
11 changed files with 98 additions and 71 deletions
6
app/views/layouts/_app_menu.html.haml
Normal file
6
app/views/layouts/_app_menu.html.haml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
%nav.main_menu
|
||||
-#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
|
||||
= link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
|
||||
= link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
|
||||
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
|
||||
= link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
.fixed
|
||||
%aside
|
||||
-#= link_to "Activities", dashboard_path, :class => "#{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
|
||||
= link_to "Projects", projects_path, :class => "#{"active" if current_page?(projects_path)}"
|
||||
= link_to "Issues", dashboard_issues_path, :class => "#{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
|
||||
= link_to "Requests", dashboard_merge_requests_path, :class => "#{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
|
||||
= link_to "Help", help_path, :class => "#{"active" if controller.controller_name == "help"}"
|
||||
22
app/views/layouts/_project_menu.html.haml
Normal file
22
app/views/layouts/_project_menu.html.haml
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
%nav.main_menu
|
||||
= link_to project_path(@project), :class => project_tab_class do
|
||||
Project
|
||||
|
||||
- if @project.repo_exists?
|
||||
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
|
||||
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
|
||||
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
|
||||
|
||||
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
|
||||
- if @project.issues_enabled
|
||||
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
|
||||
Issues
|
||||
- if @project.merge_requests_enabled
|
||||
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
|
||||
Merge Requests
|
||||
|
||||
- if @project.wall_enabled
|
||||
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
|
||||
@Wall
|
||||
- if @project.common_notes.today.count > 0
|
||||
%span.label= @project.common_notes.today.count
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
.project-sidebar
|
||||
.fixed
|
||||
%aside
|
||||
= link_to project_path(@project), :class => project_tab_class do
|
||||
Project
|
||||
|
||||
- if @project.repo_exists?
|
||||
= link_to "Repository", project_repository_path(@project), :class => repository_tab_class
|
||||
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
|
||||
= link_to "Commits", project_commits_path(@project), :class => (controller.controller_name == "commits") ? "current" : nil
|
||||
|
||||
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
|
||||
- if @project.issues_enabled
|
||||
= link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
|
||||
Issues
|
||||
- if @project.merge_requests_enabled
|
||||
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
|
||||
Merge Requests
|
||||
|
||||
- if @project.wall_enabled
|
||||
= link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
|
||||
@Wall
|
||||
- if @project.common_notes.today.count > 0
|
||||
%span.label= @project.common_notes.today.count
|
||||
|
|
@ -5,12 +5,10 @@
|
|||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => "Admin area"
|
||||
.container-fluid
|
||||
.sidebar
|
||||
.fixed
|
||||
%aside
|
||||
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
|
||||
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
|
||||
= link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
|
||||
= link_to "Resque", "/info/resque"
|
||||
%nav.main_menu
|
||||
= link_to "Users", admin_users_path, :class => controller.controller_name == "users" ? "current" : nil
|
||||
= link_to "Projects", admin_projects_path, :class => controller.controller_name == "projects" ? "current" : nil
|
||||
= link_to "Emails", admin_emails_path, :class => controller.controller_name == "mailer" ? "current" : nil
|
||||
= link_to "Resque", "/info/resque"
|
||||
|
||||
.content= yield
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@
|
|||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => "Dashboard"
|
||||
.container-fluid
|
||||
.sidebar
|
||||
= render :partial => "layouts/app_side"
|
||||
= render :partial => "layouts/app_menu"
|
||||
.content
|
||||
.row
|
||||
.span10= yield
|
||||
.span4= render "layouts/projects_side"
|
||||
.span12= yield
|
||||
.sidebar= render "layouts/projects_side"
|
||||
|
|
|
|||
|
|
@ -5,16 +5,15 @@
|
|||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => "Profile"
|
||||
.container-fluid
|
||||
.sidebar
|
||||
%aside
|
||||
= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
|
||||
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
|
||||
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
|
||||
= link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
|
||||
Keys
|
||||
- unless current_user.keys.empty?
|
||||
%span.label= current_user.keys.count
|
||||
%nav.main_menu
|
||||
= link_to "Profile", profile_path, :class => current_page?(:controller => "profile", :action => :show) ? "current" : nil
|
||||
= link_to "Password & token", profile_password_path, :class => current_page?(:controller => "profile", :action => :password) ? "current" : nil
|
||||
= link_to "Design", profile_design_path, :class => current_page?(:controller => "profile", :action => :design) ? "current" : nil
|
||||
= link_to keys_path, :class => controller.controller_name == "keys" ? "current" : nil do
|
||||
Keys
|
||||
- unless current_user.keys.empty?
|
||||
%span.label= current_user.keys.count
|
||||
.content
|
||||
.row
|
||||
.span10= yield
|
||||
.span4= render "layouts/projects_side"
|
||||
.span12= yield
|
||||
.sidebar= render "layouts/projects_side"
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
= render "layouts/flash"
|
||||
= render "layouts/head_panel", :title => @project.name
|
||||
.container-fluid
|
||||
.sidebar= render :partial => "layouts/project_side"
|
||||
= render :partial => "layouts/project_menu"
|
||||
.content
|
||||
- if @full_content
|
||||
= yield
|
||||
- else
|
||||
.row
|
||||
.span10= yield
|
||||
.span4= render "layouts/project_side_right"
|
||||
.span12= yield
|
||||
.sidebar= render "layouts/project_side_right"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
- @projects.in_groups_of(2, false) do |projects|
|
||||
.row
|
||||
- projects.each_with_index do |project, i|
|
||||
.span4.well
|
||||
.span5.well
|
||||
= link_to project_path(project) do
|
||||
%h3= truncate(project.name, :length => 20)
|
||||
%p.title.repository.git_url_wrapper
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
= render :partial => "refs/tree_file", :locals => { :name => tree.name, :content => tree.data, :file => tree }
|
||||
- else
|
||||
- contents = tree.contents
|
||||
%table#tree-slider
|
||||
%table#tree-slider.bordered-table.zebra-striped
|
||||
%thead
|
||||
%th Name
|
||||
%th Last Update
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue