Merge branch 'release/4.2' into dev

app/assets/stylesheets/backlogs/global.css

@@ -64,16 +64,3 @@ See doc/COPYRIGHT.rdoc for more details.
 th {
   font-weight: bold;
 }
-
-#col_width label {
-  display: inline-block;
-  float: left;
-  line-height: 40px;
-  margin: 0 15px;
-}
-
-#col_width_input {
-  display: inline-block;
-  float: right;
-  margin: 0;
-}

app/assets/stylesheets/backlogs/master_backlog.css.sass

@@ -61,6 +61,7 @@
  *this adds space at the bottom of the main content div to leave enough space
  *for the menu without cutting it even if the bottom backlog does not contain
  *any elements
+ */
 
 .controller-rb_master_backlogs.action-index #content
   padding-bottom: 180px
@@ -195,7 +196,6 @@
     .stories .story
       cursor: move
       display: block
-      height: 2rem
       font-size: 0.9rem
       margin: 0
       overflow: hidden
@@ -265,7 +265,7 @@
     .axislabel
       font-weight: bold
 
-/* In-place Sprint Editor
+/* In-place Sprint Editor */
 
 #rb #backlogs_container
   .sprint.editing
@@ -298,23 +298,24 @@
       display: inline-block
       float: none
       margin: 5px 3px 4px 2px
-      padding: 0.125rem 0.25rem
       font-size: 0.8rem
+      // reset the line-height (foundation sets it to "normal" but that does not work here)
+      line-height: inherit
     .type_id.editor
-      width: expression( document.body.clientWidth > 99 ? "100px" : "auto" )
+      width: 15%
-      /* sets max-width for IE
+      /* sets max-width for IE */
-      max-width: 100px
+      max-width: 140px
-      /* for the cool guys
+      /* for the cool guys */
     .subject.editor
-      min-width: 19em
+      width: 60%
-      width: 53%
     .status_id.editor
-      width: 68px
+      width: 15%
       float: right
     .story_points.editor
       float: right
+      width: 5%
 
-/* In-place Story Editor
+/* In-place Story Editor */
 
 .controller-rb_master_backlogs.action-show
   #main, #content, #rb #backlogs_container .backlog .stories

app/assets/stylesheets/backlogs/taskboard.css.sass

@@ -63,20 +63,15 @@
   line-height: inherit
   white-space: inherit
 
-.action_menu_specific #col_width input
-  text-align: right
-  width: 2em
-  margin-top: -1px
-
 #rb
   #assigned_to_id_options
     display: none
   .swimlane
     min-width: 105px
-    /* width + (2*margin) + (2*padding) + (2*border) of .work_package
+    /* width + (2*margin) + (2*padding) + (2*border) of .work_package */
     padding: 5px 0 0 5px
     width: 105px
-    /* Must be the same as min-width
+    /* Must be the same as min-width */
   #board_header
     background-color: #EBEBEB
     border: 1px solid #CCCCCC
@@ -102,7 +97,7 @@
     border: 1px solid #CCCCCC
     border-top: none
     margin-right: 10px
-    /* IE7 table fix
+    /* IE7 table fix */
     table-layout: fixed
     border-collapse: collapse
     empty-cells: show
@@ -218,13 +213,13 @@
  *  Also use by the Column Width preference to determine the unit width of the
  *  swimlanes. See RB.Taskboard.initialize()
 
-/* status labels
+/* status labels */
 
-/* shared #impediments and #tasks
+/* shared #impediments and #tasks */
 
-/* item styles used by .task and .impediment
+/* item styles used by .task and .impediment */
 
-/* dialog
+/* dialog */
 
 .task_editor_dialog.ui-dialog
   .ui-dialog-titlebar-close
@@ -257,7 +252,7 @@
 .light div
   color: #000000
 
-/* item editor
+/* item editor */
 
 #task_editor
   label
@@ -275,7 +270,7 @@
   .remaining_hours, .blocks
     width: 268px
 
-/* compact view
+/* compact view */
 
 #rb
   .compact
@@ -304,7 +299,7 @@
   #warning
     background-image: image-url("webalys/warning.png")
 
-/* others
+/* others */
 
 .story
   .story-bar
@@ -353,3 +348,13 @@
     @include story-footer
     .t
       @include ellipsis
+
+/* Toolbar modifications (no support for labels form the component) */
+
+#toolbar
+  label[for=col_width_input]
+    padding-top: rem-calc(20px)
+
+  #col_width_input
+    max-width: 60px
+

app/helpers/rb_common_helper.rb

@@ -182,7 +182,7 @@ module RbCommonHelper
 
     ret += link_to(l('backlogs.show_burndown_chart'),
                    {},
-                   :class => 'show_burndown_chart')
+                   class: 'show_burndown_chart button')
 
 
     ret += javascript_tag "

app/models/burndown.rb

@@ -107,8 +107,8 @@ class Burndown
 
   def determine_max
     @max = {
-      :points => @available_series.values.select{|s| s.unit == :points}.flatten.compact.max || 0.0,
+      :points => @available_series.values.select{|s| s.unit == :points}.flatten.compact.reject(&:nan?).max || 0.0,
-      :hours => @available_series.values.select{|s| s.unit == :hours}.flatten.compact.max || 0.0
+      :hours => @available_series.values.select{|s| s.unit == :hours}.flatten.compact.reject(&:nan?).max || 0.0
     }
   end
 

app/views/projects/settings/_backlogs_settings.html.erb

@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-
+<%= toolbar title:l('backlogs.definition_of_done')  %>
-<h2><%=l('backlogs.definition_of_done')%></h2>
 
 <% statuses_done_for_project = @project.done_statuses.select(:id).map(&:id) %>
 
@@ -59,7 +58,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <p><%= submit_tag l(:button_save), class: 'button -highlight' %></p>
 <% end %>
 
-<h2><%=l('backlogs.rebuild_positions')%></h2>
+<h3><%=l('backlogs.rebuild_positions')%></h3>
 
 <%= styled_form_tag(:controller => '/projects', :action => "rebuild_positions", :id => @project) do %>
   <p><%= submit_tag l('backlogs.rebuild'), class: 'button' %></p>

app/views/rb_burndown_charts/show.html.erb

@@ -43,7 +43,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
   <div class="burndown_chart" id="burndown_<%= @burndown.sprint_id %>" style="width:600px;height:300px;"><div class="loading"><%=l('backlogs.generating_chart')%></div></div>
 
-  <fieldset class="form--fieldset">
+  <fieldset class="burndown_control form--fieldset">
       <legend class="form--fieldset-legend"><%= l('backlogs.chart_options') %></legend>
       <%= burndown_series_checkboxes(@burndown) %>
   </fieldset>

app/views/rb_export_card_configurations/index.html.erb

@@ -36,9 +36,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 
 <div class='contextual'></div>
-<h2>
+<%= toolbar title: l(:label_backlogs_export_card_config_select) %>
-  <%= l(:label_backlogs_export_card_config_select) %>
-</h2>
 
 <ul>
 <% @configs.each do |config| %>

app/views/rb_master_backlogs/index.html.erb

@@ -43,9 +43,7 @@ See doc/COPYRIGHT.rdoc for more details.
 <% end %>
 
 <div class='contextual'></div>
-<h2>
+<%= toolbar title: l(:label_backlogs) %>
-  <%= l(:label_backlogs) %>
-</h2>
 
 <div id="rb">
   <div id="backlogs_container" class="clearfix">

app/views/rb_taskboards/show.html.erb

@@ -43,25 +43,22 @@ See doc/COPYRIGHT.rdoc for more details.
                                      :sprint_id => @sprint) %>
 <% end %>
 
-<% content_for :action_menu_specific do %>
+<%= toolbar title: h(@sprint.name) do %>
   <% if @sprint.has_burndown? %>
+    <li class="toolbar-item">
+      <label for="col_width_input"><%= l('backlogs.column_width') %></label>
+    </li>
+    <li class="toolbar-item" id="col_width">
+      <input type="text" id="col_width_input">
+    </li>
+    <li class="toolbar-item">
       <%= show_burndown_link(@sprint) %>
+    </li>
   <% end %>
-
-  <span id="col_width">
-    <label for="col_width_input"><%= l('backlogs.column_with') %></label>
-    <input id="col_width_input" name="col_width" type='text' />
-  </span>
 <% end %>
 
 <% breadcrumb_paths(link_to(l(:label_backlogs), backlogs_project_backlogs_path(@project)), link_to(@sprint.name, backlogs_project_backlogs_path(@sprint))) %>
 
-<h2>
-  <%= @sprint.name %>
-</h2>
-
-<%= render :partial => 'layouts/action_menu_specific' %>
-
 <div id='rb'>
   <div id="taskboard">
     <table id="board_header" cellspacing="0">

app/views/version_settings/edit.html.erb

@@ -33,8 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
-
+<%= toolbar title: l(:label_version)  %>
-<h2><%=l(:label_version)%></h2>
 
 <% labelled_tabular_form_for :version, @version, :url => project_version_path(@project, @version), :html => {:method => :put} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>

config/locales/de.yml

@@ -66,7 +66,7 @@ de:
     card_paper_size: "Format für Kartendruck"
     chart_options: "Aktive Wertereihen"
     close: "Schließen"
-    column_with: "Spaltenbreite:"
+    column_width: "Spaltenbreite:"
     date: "Tag"
     definition_of_done: "Definition of Done"
     generating_chart: "Generiere Graph..."

config/locales/en.yml

@@ -66,7 +66,7 @@ en:
     card_paper_size: "Paper size for card printing"
     chart_options: "Active series"
     close: "Close"
-    column_with: "Column width:"
+    column_width: "Column width:"
     date: "Day"
     definition_of_done: "Definition of Done"
     generating_chart: "Generating Graph..."