Few design improvements for order pages.

app/views/ordering/order.rhtml

@@ -12,7 +12,8 @@
             <th>Name</th>
             <th style="width:13px;"></th>
             <th style="width:4.5em;">Preis</th>
-            <th style="width:7em;">Fehlende Einheiten</th>
+            <th style="width:4.5em;">Einheit</th>
+            <th style="width:70px;">Fehlende Einheiten</th>
             <th id="col_required">Menge</th>
             <% if not @order.stockit? -%>
               <th id="col_tolerance">Toleranz</th>
@@ -43,12 +44,17 @@
                 <td class="name"><%= order_article.article.name %></td>
                 <td><%=h order_article.article.origin %></td>
                 <td><%= number_to_currency(@price[i]) %></td>
-                <td><span id="missing_units_<%= i %>"><%= if @order.stockit?
+                <td><%= order_article.article.unit %></td>
+                <td>
+                  <span id="missing_units_<%= i %>">
+                    <%= if @order.stockit?
                       order_article.article.quantity_available
                     else
                       missing_units = @unit[i] - (((@quantity[i] + @others_quantity[i]) % @unit[i]) + @tolerance[i] + @others_tolerance[i])
                       missing_units < 0 ? 0 : missing_units
-                    end%></span></td>
+                    end %>
+                  </span>
+                </td>
                 <td class="quantity">
                   <input type="hidden" id="q_<%= i %>" name="<%= "ordered[#{order_article.id}][quantity]" %>" value="<%= @quantity[i] %>" size="2" />
                   <span id="q_used_<%= i %>" class="used"><%= @used_quantity[i] %></span> +

app/views/ordering/stock_order.html.haml

@@ -1,6 +1,6 @@
 = render :partial => 'order_head'
 
-.single_column{:style => 'clear:both'}
+.single_column{:style => 'clear:both;margin-bottom:7em;'}
   - form_tag(:action => 'saveOrder', :id => @order) do
     .box_title
       %h2 Anderer Bestellungen

public/stylesheets/main.css

@@ -401,7 +401,7 @@ table#order {
     -webkit-border-radius: 3px;
     padding: 0; }
   table#order th#col_required, table#order th#col_tolerance {
-    width: 165px; }
+    width: 140px; }
   table#order th#col_packages, table#order th#col_left_units {
     width: 50px; }
   table#order td.quantity, table#order td.tolerance {
@@ -455,6 +455,10 @@ table#order {
     margin: 0;
     margin-bottom: 5px;
     width: 100%; }
+  .article-info .right {
+    width: 35%; }
+  .article-info .left {
+    width: 60%; }
 
 tr.order-article .article-info {
   display: none; }

public/stylesheets/print.css

@@ -401,7 +401,7 @@ table#order {
     -webkit-border-radius: 3px;
     padding: 0; }
   table#order th#col_required, table#order th#col_tolerance {
-    width: 165px; }
+    width: 140px; }
   table#order th#col_packages, table#order th#col_left_units {
     width: 50px; }
   table#order td.quantity, table#order td.tolerance {
@@ -455,6 +455,10 @@ table#order {
     margin: 0;
     margin-bottom: 5px;
     width: 100%; }
+  .article-info .right {
+    width: 35%; }
+  .article-info .left {
+    width: 60%; }
 
 tr.order-article .article-info {
   display: none; }

public/stylesheets/sass/main.sass

@@ -439,7 +439,7 @@ table#order
     -webkit-border-radius: 3px
     padding: 0
   th#col_required, th#col_tolerance
-    :width 165px
+    :width 140px
   th#col_packages,  th#col_left_units
     :width 50px
   td.quantity, td.tolerance
@@ -492,6 +492,10 @@ table#order
     margin: 0
     margin-bottom: 5px
     width: 100%
+  .right
+    width: 35%
+  .left
+    width: 60%
 tr.order-article .article-info
   display: none
 tr.order-article:hover .article-info