From 1d2cb189803948d17a897e93f6685a19503d5901 Mon Sep 17 00:00:00 2001 From: Gregor Schmidt Date: Thu, 31 Mar 2011 10:46:11 +0200 Subject: [PATCH 1/3] Improve headers - using breadcrumb view from wikis --- app/views/rb_master_backlogs/show.html.erb | 18 ++--- app/views/rb_taskboards/show.html.erb | 81 +++++++++++----------- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/app/views/rb_master_backlogs/show.html.erb b/app/views/rb_master_backlogs/show.html.erb index eafa7c84b4..71b6465ee0 100644 --- a/app/views/rb_master_backlogs/show.html.erb +++ b/app/views/rb_master_backlogs/show.html.erb @@ -23,17 +23,17 @@ <% end %>
-

<%= link_to l(:label_master_backlog), rb_master_backlog_path(@project) %>

+

+ <%= link_to l(:label_backlogs), rb_master_backlog_path(@project) %> +

-
-
-
- <%= render :partial => 'backlog', :collection => @owner_backlogs %> -
-
- <%= render :partial => 'backlog', :collection => @sprint_backlogs %> -
+
+
+ <%= render :partial => 'backlog', :collection => @owner_backlogs %> +
+
+ <%= render :partial => 'backlog', :collection => @sprint_backlogs %>
diff --git a/app/views/rb_taskboards/show.html.erb b/app/views/rb_taskboards/show.html.erb index 8f3d99fc2c..804d897c34 100644 --- a/app/views/rb_taskboards/show.html.erb +++ b/app/views/rb_taskboards/show.html.erb @@ -33,57 +33,60 @@
+ +

<%= link_to @sprint.name, rb_taskboard_path(@sprint) %>

-
-
- - - - <% @statuses.each do |status| %> - - <% end %> - -
<%= l(:backlogs_story) %><%= status.name %>
+
+ + + + <% @statuses.each do |status| %> + + <% end %> + +
<%= l(:backlogs_story) %><%= status.name %>
+ + + + + + <% @statuses.each do |status| %> + + <% end %> + +
<%= l(:label_sprint_impediments) %>
+ + <%= render :partial => "rb_impediments/impediment", + :collection => @sprint.impediments.select { |impediment| impediment.status_id == status.id } %> +
- +
+ <% @sprint.stories.each do |story| %> - + <% @statuses.each do |status| %> - <% end %> -
<%= l(:label_sprint_impediments) %>
+
+
+ <%= link_to story.id, :controller => 'issues', :action => 'show', :id => story %> +
+
<%= story.subject %>
+
+
+ - <%= render :partial => "rb_impediments/impediment", - :collection => @sprint.impediments.select { |impediment| impediment.status_id == status.id } %> + + <%= render :partial => "rb_tasks/task", + :collection => story.descendants.select { |task| task.status.id == status.id } %>
- - - <% @sprint.stories.each do |story| %> - - - - <% @statuses.each do |status| %> - - <% end %> - - <% end %> -
-
-
- <%= link_to story.id, :controller => 'issues', :action => 'show', :id => story %> -
-
<%= story.subject %>
-
-
+ - <%= render :partial => "rb_tasks/task", - :collection => story.descendants.select { |task| task.status.id == status.id } %> -
-
+ <% end %> +
From 7e52c3a621ab663713a911cc6b5e0c42dc04d3f9 Mon Sep 17 00:00:00 2001 From: Gregor Schmidt Date: Thu, 31 Mar 2011 10:46:31 +0200 Subject: [PATCH 2/3] removing unused/-necessary styles --- assets/stylesheets/rb_default/global.css | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/assets/stylesheets/rb_default/global.css b/assets/stylesheets/rb_default/global.css index 98d3f41937..1abfd245db 100644 --- a/assets/stylesheets/rb_default/global.css +++ b/assets/stylesheets/rb_default/global.css @@ -1,25 +1,3 @@ -/* GLOBAL */ -#rb { - background-color:#FFFFFF; - font-family:Verdana, Arial, sans-serif; - font-size:1em; - height:100%; - margin:0; - width:100%; -} -#rb a { - color:#CC0000; - text-decoration:none; -} -#rb a:hover { - text-decoration:underline; -} -/* MAIN */ -#rb #main { - display:block; - height:100%; - width:100%; -} #rb .meta { display:none; } From b8f7c68161c2e0a0d30447efb12124043b276209 Mon Sep 17 00:00:00 2001 From: Gregor Schmidt Date: Thu, 31 Mar 2011 10:55:29 +0200 Subject: [PATCH 3/3] Minimizing style definitions for stories in backlogs view --- .../stylesheets/rb_default/master_backlog.css | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/assets/stylesheets/rb_default/master_backlog.css b/assets/stylesheets/rb_default/master_backlog.css index a46b6f843d..3ed9c80840 100644 --- a/assets/stylesheets/rb_default/master_backlog.css +++ b/assets/stylesheets/rb_default/master_backlog.css @@ -244,35 +244,23 @@ white-space:nowrap; } #rb #backlogs_container .stories .story .id .t * { - background-color:#cfc; - display:block; - font-size:10px; - height:14px; - left:0px; - line-height:14px; - overflow:hidden; - padding-right:3px; - position:absolute; - text-align:right; - text-decoration:none; - top:5px; - vertical-align:middle; - width:52px; - -moz-border-radius:4px; - -webkit-border-radius:4px; + position: absolute; + text-align: right; + top: 5px; + left: 0; + width: 3em; } #rb #backlogs_container .stories .story .id .v { display:none; } #rb #backlogs_container .stories .story .subject { - display:block; - height:15px; - left:70px; overflow:hidden; - padding:5px 2px 4px 2px; - position:absolute; - top:1px; - width:375px; + display: block; + position: absolute; + top: 1px; + left: 4.5em; + padding: 5px 2px 4px 2px; + width: 375px; white-space:nowrap; } #rb #backlogs_container .stories .story.too_long .subject {