dashboard restyled. colors improved
This commit is contained in:
parent
0ba081947d
commit
693ff1c644
9 changed files with 44 additions and 31 deletions
|
@ -6,13 +6,11 @@
|
|||
= image_tag "rss_icon_gray.png", :width => 16, :title => "feed"
|
||||
|
||||
- if params[:path]
|
||||
%h2.icon
|
||||
%span
|
||||
%d
|
||||
= link_to project_commits_path(@project) do
|
||||
= @project.code
|
||||
\/
|
||||
%a{:href => "#"}= params[:path].split("/").join(" / ")
|
||||
%h2
|
||||
= link_to project_commits_path(@project) do
|
||||
= @project.code
|
||||
\/
|
||||
%a{:href => "#"}= params[:path].split("/").join(" / ")
|
||||
|
||||
%div{:id => dom_id(@project)}
|
||||
#commits_list= render "commits"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%h4.dash-tabs
|
||||
-#%h4.dash-tabs
|
||||
= link_to "Activities", dashboard_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_path) || current_page?(root_path) }", :id => "activities_slide"
|
||||
= link_to "Issues", dashboard_issues_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
|
||||
= link_to "Merge Requests", dashboard_merge_requests_path, :remote => true, :class => "dash-button #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
- if @project && !@project.new_record?
|
||||
.project_name
|
||||
= truncate @project.name, :length => 20
|
||||
= truncate @project.name, :length => 28
|
||||
.git_url_wrapper
|
||||
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
|
||||
- if @project.repo_exists?
|
||||
|
@ -18,6 +18,11 @@
|
|||
= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
|
||||
= yield :rss_icon
|
||||
|
||||
- if controller.controller_name == "dashboard"
|
||||
= link_to "Activities", dashboard_path, :class => "dash_top_link #{"active" if current_page?(dashboard_path) || current_page?(root_path) }"
|
||||
= link_to "Issues", dashboard_issues_path, :class => "dash_top_link #{"active" if current_page?(dashboard_issues_path)}", :id => "issues_slide"
|
||||
= link_to "Merge Requests", dashboard_merge_requests_path, :class => "dash_top_link #{"active" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide"
|
||||
|
||||
.account-box
|
||||
= link_to profile_path, :class => "pic" do
|
||||
= image_tag gravatar_icon(current_user.email)
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
%h4.middle-panel
|
||||
.project_name
|
||||
= truncate @project.name, :length => 20
|
||||
.git_url_wrapper
|
||||
%input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo, :class => "one_click_select"}
|
||||
= yield :rss_icon
|
||||
|
||||
- if @project.repo_exists?
|
||||
.right= render :partial => "projects/refs", :locals => { :destination => controller.controller_name == "commits" ? "commits" : "tree" }
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
- if @project.common_notes.today.count > 0
|
||||
%span{ :class => "number" }= @project.common_notes.today.count
|
||||
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
|
||||
Merge
|
||||
Requests
|
||||
-#- if @project.merge_requests.opened.count > 0
|
||||
%span{ :class => "number" }= @project.merge_requests.opened.count
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
= render "project_head"
|
||||
#news-feed.news-feed
|
||||
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
|
||||
.project-box.project-updates
|
||||
- @activities.each do |update|
|
||||
= render "projects/feed", :update => update, :project => @project
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
= render "head"
|
||||
|
||||
#news-feed.news-feed
|
||||
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
|
||||
.project-box.project-updates
|
||||
- @activities.each do |update|
|
||||
= render "repositories/feed", :update => update, :project => @project
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue