projects list on dashboard with commit links
This commit is contained in:
parent
2fa4aadb8f
commit
88974b500f
|
@ -17,6 +17,11 @@ a {
|
||||||
&.lined {
|
&.lined {
|
||||||
text-decoration:underlined;
|
text-decoration:underlined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.gray {
|
||||||
|
color:gray;
|
||||||
|
}
|
||||||
|
|
||||||
&.supp_diff_link {
|
&.supp_diff_link {
|
||||||
text-align:center;
|
text-align:center;
|
||||||
padding:20px 0;
|
padding:20px 0;
|
||||||
|
@ -24,6 +29,10 @@ a {
|
||||||
width:100%;
|
width:100%;
|
||||||
float:left;
|
float:left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.neib {
|
||||||
|
margin-right:15px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn {
|
.btn {
|
||||||
|
@ -46,10 +55,6 @@ a:focus {
|
||||||
color: $link_color !important;
|
color: $link_color !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dlink {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
.pills a:hover {
|
.pills a:hover {
|
||||||
background-color:#ccc;
|
background-color:#ccc;
|
||||||
}
|
}
|
||||||
|
@ -60,10 +65,6 @@ a:focus {
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
background-color: #474D57;
|
background-color: #474D57;
|
||||||
|
|
||||||
&.pushed {
|
|
||||||
background-color: $link_color;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.pretty_label {
|
.pretty_label {
|
||||||
|
@ -873,26 +874,24 @@ p.time {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dashboard page
|
||||||
|
*
|
||||||
|
*/
|
||||||
.dashboard_category {
|
.dashboard_category {
|
||||||
margin-bottom:30px;
|
margin-bottom:30px;
|
||||||
|
|
||||||
h3 a {
|
h3 a {
|
||||||
color:#474D57;
|
color:#474D57;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
text-decoration:underline;
|
text-decoration:underline;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.dashboard_block {
|
.dashboard_block {
|
||||||
width:840px;
|
|
||||||
margin:auto;
|
|
||||||
|
|
||||||
.dash_project_item {
|
.dash_project_item {
|
||||||
margin-bottom:10px;
|
margin-bottom:10px;
|
||||||
border:none;
|
border:none;
|
||||||
padding:0px 5px;
|
padding:0px 5px;
|
||||||
|
|
||||||
.project_link {
|
.project_link {
|
||||||
color:#888;
|
color:#888;
|
||||||
&:hover {
|
&:hover {
|
||||||
|
@ -902,7 +901,6 @@ p.time {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
h4 {
|
h4 {
|
||||||
color:#666;
|
color:#666;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,4 +10,5 @@
|
||||||
|
|
||||||
.right
|
.right
|
||||||
%small
|
%small
|
||||||
%strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "vlink"
|
%strong= link_to "Browse Code »", tree_project_ref_path(project, project.root_ref), :class => "neib gray"
|
||||||
|
%strong= link_to "Commits »", project_commits_path(project), :class => "gray"
|
||||||
|
|
|
@ -17,38 +17,37 @@
|
||||||
= link_to projects_path do
|
= link_to projects_path do
|
||||||
Projects list →
|
Projects list →
|
||||||
%hr
|
%hr
|
||||||
.row
|
.dashboard_block
|
||||||
.dashboard_block
|
.row
|
||||||
.row
|
.span4.right
|
||||||
.span4.right
|
%div.lborder.ipadded
|
||||||
%div.lborder.ipadded
|
%h3
|
||||||
%h3
|
= pluralize current_user.projects.count, "project", "projects"
|
||||||
= pluralize current_user.projects.count, "project", "projects"
|
- if current_user.can_create_project?
|
||||||
- if current_user.can_create_project?
|
%hr
|
||||||
%hr
|
%div
|
||||||
%div
|
You can create up to
|
||||||
You can create up to
|
= current_user.projects_limit
|
||||||
= current_user.projects_limit
|
projects. Click on button below to add a new one
|
||||||
projects. Click on button below to add a new one
|
.link_holder
|
||||||
.link_holder
|
%br
|
||||||
%br
|
= link_to new_project_path, :class => "btn" do
|
||||||
= link_to new_project_path, :class => "btn" do
|
New Project »
|
||||||
New Project »
|
- else
|
||||||
- else
|
%hr
|
||||||
%hr
|
%div
|
||||||
%div
|
You've reached project limit for your account.
|
||||||
You've reached project limit for your account.
|
You cannot create new projects.
|
||||||
You cannot create new projects.
|
.link_holder
|
||||||
.link_holder
|
%br
|
||||||
%br
|
= link_to profile_path, :class => "btn" do
|
||||||
= link_to profile_path, :class => "btn" do
|
Your Profile »
|
||||||
Your Profile »
|
.span12.left= render "dashboard/projects_feed", :projects => @active_projects
|
||||||
.span10.left= render "dashboard/projects_feed", :projects => @active_projects
|
- if @last_push && @last_push.valid_push?
|
||||||
- if @last_push && @last_push.valid_push?
|
.padded.prepend-top-20
|
||||||
.padded.prepend-top-20
|
%h5
|
||||||
%h5
|
%small Latest push was to the #{@last_push.ref_name} #{@last_push.ref_type} of #{@last_push.project.name}:
|
||||||
%small Latest push was to the #{@last_push.ref_name} #{@last_push.ref_type} of #{@last_push.project.name}:
|
%ul.unstyled= render @last_push
|
||||||
%ul.unstyled= render @last_push
|
|
||||||
|
|
||||||
- if @merge_requests.any?
|
- if @merge_requests.any?
|
||||||
%div.dashboard_category
|
%div.dashboard_category
|
||||||
|
@ -60,8 +59,7 @@
|
||||||
= link_to dashboard_merge_requests_path do
|
= link_to dashboard_merge_requests_path do
|
||||||
Visit merge requests page →
|
Visit merge requests page →
|
||||||
%hr
|
%hr
|
||||||
.row
|
.dashboard_block= render "dashboard/merge_requests_feed"
|
||||||
.dashboard_block= render "dashboard/merge_requests_feed"
|
|
||||||
|
|
||||||
- if @issues.any?
|
- if @issues.any?
|
||||||
%div.dashboard_category
|
%div.dashboard_category
|
||||||
|
@ -72,8 +70,7 @@
|
||||||
= link_to dashboard_issues_path do
|
= link_to dashboard_issues_path do
|
||||||
Visit issues page →
|
Visit issues page →
|
||||||
%hr
|
%hr
|
||||||
.row
|
.dashboard_block= render "dashboard/issues_feed"
|
||||||
.dashboard_block= render "dashboard/issues_feed"
|
|
||||||
|
|
||||||
- if @events.any?
|
- if @events.any?
|
||||||
%div.dashboard_category
|
%div.dashboard_category
|
||||||
|
@ -82,5 +79,4 @@
|
||||||
= link_to "Activities" , "#activities", :id => "activities"
|
= link_to "Activities" , "#activities", :id => "activities"
|
||||||
|
|
||||||
%hr
|
%hr
|
||||||
.row
|
.dashboard_block= render @events
|
||||||
.dashboard_block= render @events
|
|
||||||
|
|
Loading…
Reference in a new issue