From 5e9ffa7cb1c6ac0d5b8039ae84ddf4e5a2a02bb4 Mon Sep 17 00:00:00 2001
From: Benjamin Meichsner <benni@bennimobile.(none)>
Date: Sun, 8 Nov 2009 19:26:28 +0100
Subject: [PATCH] Orderfooter design improvements.

---
 app/views/ordering/order.rhtml    | 38 +++++++++++++++----------------
 public/stylesheets/main.css       |  8 ++++++-
 public/stylesheets/print.css      |  8 ++++++-
 public/stylesheets/sass/main.sass |  8 ++++++-
 4 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/app/views/ordering/order.rhtml b/app/views/ordering/order.rhtml
index 839e4296..af5e332a 100644
--- a/app/views/ordering/order.rhtml
+++ b/app/views/ordering/order.rhtml
@@ -45,11 +45,11 @@
                 <td><%=h order_article.article.origin %></td>
                 <td><%= number_to_currency(@price[i]) %></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>
+                      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>
                 <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> +
@@ -58,30 +58,28 @@
                   <%= button_to_function('-', "decreaseQuantity(#{i})") %>
                 </td>
                 <% if not @order.stockit? -%>
-                <td class="tolerance">
-                  <input type="hidden" id="t_<%= i %>" name="<%= "ordered[#{order_article.id}][tolerance]" %>" value="<%= @tolerance[i] %>" size="2" />
-                  <% if (@unit[i] > 1) -%>
-                    <span id="t_used_<%= i %>" class="used"><%= @used_tolerance[i] %></span> +
-                    <span id="t_unused_<%= i %>" class="unused"><%= @tolerance[i] - @used_tolerance[i] %></span>
-                    <%= button_to_function('+', "increaseTolerance(#{i})") %>
-                    <%= button_to_function('-', "decreaseTolerance(#{i})") %>
-                  <% end -%>
-                </td>
+                  <td class="tolerance">
+                    <input type="hidden" id="t_<%= i %>" name="<%= "ordered[#{order_article.id}][tolerance]" %>" value="<%= @tolerance[i] %>" size="2" />
+                    <% if (@unit[i] > 1) -%>
+                      <span id="t_used_<%= i %>" class="used"><%= @used_tolerance[i] %></span> +
+                      <span id="t_unused_<%= i %>" class="unused"><%= @tolerance[i] - @used_tolerance[i] %></span>
+                      <%= button_to_function('+', "increaseTolerance(#{i})") %>
+                      <%= button_to_function('-', "decreaseTolerance(#{i})") %>
+                    <% end -%>
+                  </td>
                 <% end %>
                 <td id="td_price_<%= i %>" style="text-align:right; padding-right:10px; width:4em"><span id="price_<%= i %>_display"><%= number_to_currency(article_total, :unit => "") %></span> €
                   <div class="article-info" id="article-info_<%= order_article.id %>" style="display:none">
+                    <h3><%= order_article.article.name -%></h3>
                     <div class="right">
                       Volle Gebinde: <span id="units_<%= i %>"><%= order_article.units_to_order %></span><br/>
                       Gesamt-Einheiten: <span id="q_total_<%= i %>"><%= @quantity[i] + @others_quantity[i] %></span><br/>
                       Gesamt-Toleranz: <span id="t_total_<%= i %>"><%= @tolerance[i] + @others_tolerance[i] %></span><br/>
                     </div>
                     <div class="left">
-                      <b><%= order_article.article.name -%></b>
-                      <p>
-                        Hersteller: <%= order_article.article.manufacturer -%><br />
-                        Gebinde: <%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %><br/>
-                        Notiz: <%= order_article.article.note -%><br />
-                      </p>
+                      Hersteller: <%= order_article.article.manufacturer -%><br />
+                      Gebinde: <%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %><br/>
+                      Notiz: <%= order_article.article.note -%><br />
                     </div>
                   </div>
                 </td>
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 907ddbc0..fad7e99a 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -440,15 +440,21 @@ table#order {
         background-color: red; }
 
 #order-footer {
+  min-width: 975px;
   right: 15px;
   left: 15px; }
 
 .article-info {
   z-index: 2;
-  width: 50em;
+  width: 45em;
   height: 8em;
   border: none;
   left: 30px; }
+  .article-info h3 {
+    text-align: center;
+    margin: 0;
+    margin-bottom: 5px;
+    width: 100%; }
 
 #newComment {
   margin: 1em; }
diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css
index bab3639f..977a2a35 100644
--- a/public/stylesheets/print.css
+++ b/public/stylesheets/print.css
@@ -440,15 +440,21 @@ table#order {
         background-color: red; }
 
 #order-footer {
+  min-width: 975px;
   right: 15px;
   left: 15px; }
 
 .article-info {
   z-index: 2;
-  width: 50em;
+  width: 45em;
   height: 8em;
   border: none;
   left: 30px; }
+  .article-info h3 {
+    text-align: center;
+    margin: 0;
+    margin-bottom: 5px;
+    width: 100%; }
 
 #newComment {
   margin: 1em; }
diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass
index c03ece96..52252cc0 100644
--- a/public/stylesheets/sass/main.sass
+++ b/public/stylesheets/sass/main.sass
@@ -477,14 +477,20 @@ table#order
       input:disabled
         background-color: red
 #order-footer
+  min-width: 975px
   right: 15px
   left: 15px
 .article-info
   z-index: 2
-  width: 50em
+  width: 45em
   height: 8em
   border: none
   left: 30px
+  h3
+    text-align: center
+    margin: 0
+    margin-bottom: 5px
+    width: 100%
 // ********* Comments
 #newComment
   :margin 1em