Merge branch 'issue_dashboard' into improved_dashboard
This commit is contained in:
commit
8e0126e9ec
20 changed files with 247 additions and 22 deletions
|
@ -25,6 +25,9 @@
|
|||
<%= link_to dashboard_path, :class => current_page?(root_path) ? "current dashboard" : "dashboard" do %>
|
||||
<span></span>Dashboard
|
||||
<% end %>
|
||||
<%= link_to issues_path, :class => current_page?(issues_path) ? "current issues" : "issues" do %>
|
||||
<span></span>Issues
|
||||
<% end %>
|
||||
<%= link_to projects_path, :class => current_page?(projects_path) ? "current project" : "project" do %>
|
||||
<span></span>Projects
|
||||
<% end %>
|
||||
|
|
31
app/views/layouts/user.html.haml
Normal file
31
app/views/layouts/user.html.haml
Normal file
|
@ -0,0 +1,31 @@
|
|||
!!!
|
||||
%html
|
||||
%head
|
||||
%title
|
||||
GitLab #{" - #{current_user.name}"}
|
||||
= stylesheet_link_tag "application"
|
||||
= javascript_include_tag "application"
|
||||
= csrf_meta_tags
|
||||
= javascript_tag do
|
||||
REQ_URI = "#{request.env["REQUEST_URI"]}";
|
||||
REQ_REFFER = "#{request.env["HTTP_REFERER"]}";
|
||||
%body{ :class => body_class('project-page'), :id => yield(:boyd_id)}
|
||||
= render :partial => "layouts/flash"
|
||||
#container
|
||||
= render :partial => "layouts/head_panel"
|
||||
.project-container
|
||||
.project-sidebar
|
||||
.fixed
|
||||
%aside
|
||||
= link_to issues_path, :class => current_page?(issues_path) ? "current" : nil do
|
||||
Issues
|
||||
- unless current_user.assigned_issues.empty?
|
||||
%span{ :class => "number" }= current_user.assigned_issues.count
|
||||
= link_to merge_requests_path, :class => current_page?(merge_requests_path) ? "current" : nil do
|
||||
Merge Requests
|
||||
- unless current_user.assigned_merge_requests.empty?
|
||||
%span{ :class => "number" }= current_user.assigned_merge_requests.count
|
||||
|
||||
.project-content
|
||||
= yield
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue