TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'finn-master' of https://dev.finn.de/git/redmine-backlogs into finn-master

Browse Source
pull/6827/head
Stephan Eckardt 14 years ago
parent 034fdcbe82 b8f7c68161
commit b4c81bd30c
4 changed files with 62 additions and 93 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      app/views/rb_master_backlogs/show.html.erb
  2. 81
      app/views/rb_taskboards/show.html.erb
  3. 22
      assets/stylesheets/rb_default/global.css
  4. 34
      assets/stylesheets/rb_default/master_backlog.css

18
app/views/rb_master_backlogs/show.html.erb
Unescape View File

@ -23,17 +23,17 @@
<% end %>
<div class='contextual'></div>
<h2><%= link_to l(:label_master_backlog), rb_master_backlog_path(@project) %></h2>
<h2>
<%= link_to l(:label_backlogs), rb_master_backlog_path(@project) %>
</h2>
<div id="rb">
<div id="main">
<div id="backlogs_container">
<div id="owner_backlogs_container">
<%= render :partial => 'backlog', :collection => @owner_backlogs %>
</div>
<div id="sprint_backlogs_container">
<%= render :partial => 'backlog', :collection => @sprint_backlogs %>
</div>
<div id="backlogs_container">
<div id="owner_backlogs_container">
<%= render :partial => 'backlog', :collection => @owner_backlogs %>
</div>
<div id="sprint_backlogs_container">
<%= render :partial => 'backlog', :collection => @sprint_backlogs %>
</div>
</div>

81
app/views/rb_taskboards/show.html.erb
Unescape View File

@ -33,57 +33,60 @@
</span>
</div>
<div class="breadcrumb">
<%= link_to l(:label_backlogs), rb_master_backlog_path(@project) %>
»
</div>
<h2>
<%= link_to @sprint.name, rb_taskboard_path(@sprint) %>
</h2>
<div id='rb'>
<div id="main">
<div id="taskboard">
<table id="board_header" cellspacing="0">
<tr>
<td><%= l(:backlogs_story) %></td>
<% @statuses.each do |status| %>
<td class="swimlane"><%= status.name %></td>
<% end %>
</tr>
</table>
<div id="taskboard">
<table id="board_header" cellspacing="0">
<tr>
<td><%= l(:backlogs_story) %></td>
<% @statuses.each do |status| %>
<td class="swimlane"><%= status.name %></td>
<% end %>
</tr>
</table>
<table id="impediments" class="board" cellspacing="0">
<tr>
<td><div class="label_sprint_impediments"><%= l(:label_sprint_impediments) %></div></td>
<td class="add_new">+</td>
<% @statuses.each do |status| %>
<td class="swimlane list <%= status.is_closed? ? 'closed' : '' %>" id="impcell_<%= status.id %>">
<%= render :partial => "rb_impediments/impediment",
:collection => @sprint.impediments.select { |impediment| impediment.status_id == status.id } %>
</td>
<% end %>
</tr>
</table>
<table id="impediments" class="board" cellspacing="0">
<table id="tasks" class="board" cellspacing="0">
<% @sprint.stories.each do |story| %>
<tr>
<td><div class="label_sprint_impediments"><%= l(:label_sprint_impediments) %></div></td>
<td>
<div class="story <%= mark_if_closed(story) %>">
<div class="id">
<%= link_to story.id, :controller => 'issues', :action => 'show', :id => story %>
</div>
<div class="subject"><%= story.subject %></div>
</div>
</td>
<td class="add_new">+</td>
<% @statuses.each do |status| %>
<td class="swimlane list <%= status.is_closed? ? 'closed' : '' %>" id="impcell_<%= status.id %>">
<%= render :partial => "rb_impediments/impediment",
:collection => @sprint.impediments.select { |impediment| impediment.status_id == status.id } %>
<td class="swimlane list <%= status.is_closed? ? 'closed' : '' %>" id="<%= story.id %>_<%= status.id %>">
<%= render :partial => "rb_tasks/task",
:collection => story.descendants.select { |task| task.status.id == status.id } %>
</td>
<% end %>
</tr>
</table>
<table id="tasks" class="board" cellspacing="0">
<% @sprint.stories.each do |story| %>
<tr>
<td>
<div class="story <%= mark_if_closed(story) %>">
<div class="id">
<%= link_to story.id, :controller => 'issues', :action => 'show', :id => story %>
</div>
<div class="subject"><%= story.subject %></div>
</div>
</td>
<td class="add_new">+</td>
<% @statuses.each do |status| %>
<td class="swimlane list <%= status.is_closed? ? 'closed' : '' %>" id="<%= story.id %>_<%= status.id %>">
<%= render :partial => "rb_tasks/task",
:collection => story.descendants.select { |task| task.status.id == status.id } %>
</td>
<% end %>
</tr>
<% end %>
</table>
</div>
<% end %>
</table>
</div>
<div id="helpers">

22
assets/stylesheets/rb_default/global.css
Unescape View File

@ -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;
}

34
assets/stylesheets/rb_default/master_backlog.css
Unescape View File

@ -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 {

Write Preview
Loading…
Cancel
Save