Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Css fixes.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-10-18 14:19:02 +02:00
parent 65a0a30f5a
commit a4a48dc4fe
4 changed files with 46 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
app/views/ordering/order.rhtml
View file

@ -1,7 +1,7 @@
<%= render :partial => 'order_head' %> <%= render :partial => 'order_head' %>
<div class="single_column" style="clear:both;"> <% form_tag(:action => 'saveOrder', :id => @order) do %>
<% form_tag(:action => 'saveOrder', :id => @order) do %> <div class="single_column" style="clear:both;margin-bottom:7em;">
<div class="box_title"> <div class="box_title">
<h2>Artikel</h2> <h2>Artikel</h2>
</div> </div>
@ -38,8 +38,8 @@
end end
total += article_total total += article_total
-%> -%>
<tr class="<%= cycle('even', 'odd', :name => 'articles') %>" valign="top" <tr class="<%= cycle('even', 'odd', :name => 'articles') %>" valign="top"
onmouseover="$('article-info_<%= order_article.id %>').show();" onmouseout="$('article-info_<%= order_article.id %>').hide();"> onmouseover="$('article-info_<%= order_article.id %>').show();" onmouseout="$('article-info_<%= order_article.id %>').hide();">
<td class="name"><%= order_article.article.name %></td> <td class="name"><%= order_article.article.name %></td>
<td><%=h order_article.article.origin %></td> <td><%=h order_article.article.origin %></td>
<td><%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %></td> <td><%= @order.stockit? ? order_article.article.quantity_available : @unit[i] %> * <%=h order_article.article.unit %></td>
@ -65,46 +65,46 @@
</td> </td>
<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> €</td> <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> €</td>
</tr> </tr>
<div class="article-info" id="article-info_<%= order_article.id %>" style="display:none"> <div class="article-info" id="article-info_<%= order_article.id %>" style="display:none">
<b><%= order_article.article.name -%></b> <b><%= order_article.article.name -%></b>
<p> <p>
Hersteller: <%= order_article.article.manufacturer -%><br /> Hersteller: <%= order_article.article.manufacturer -%><br />
Notiz: <%= order_article.article.note -%><br /> Notiz: <%= order_article.article.note -%><br />
</p> </p>
</div> </div>
<%- i = i + 1 <%- i = i + 1
end end
end -%> end -%>
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div id="order-footer"> <div id="order-footer">
<div id="info-box"> <div id="info-box">
</div> </div>
<div id="total-sum"> <div id="total-sum">
<table> <table>
<tr> <tr>
<td>Gesamtbetrag:</td> <td>Gesamtbetrag:</td>
<td class="currency"><span id="total_price"><%= total %></span> €</td> <td class="currency"><span id="total_price"><%= total %></span> €</td>
</tr> </tr>
<tr> <tr>
<td>Verfügbares Guthaben:</td> <td>Verfügbares Guthaben:</td>
<td class="currency"><%= number_to_currency(@availableFunds) %></td> <td class="currency"><%= number_to_currency(@availableFunds) %></td>
</tr> </tr>
<tr> <tr>
<td>Neuer Kontostand:</td> <td>Neuer Kontostand:</td>
<td class="currency"><strong><span id="new_balance"><%= @ordergroup.account_balance - total %></span> €</strong></td> <td class="currency"><strong><span id="new_balance"><%= @ordergroup.account_balance - total %></span> €</strong></td>
</tr> </tr>
</table> </table>
<div id="order-button"> <div id="order-button">
<%= submit_tag( "Bestellung speichern", :id => 'submit_button' ) %></span> oder <%= link_to "abbrechen", :controller => 'ordering' %> <%= submit_tag( "Bestellung speichern", :id => 'submit_button' ) %></span> oder <%= link_to "abbrechen", :controller => 'ordering' %>
</div>
</div> </div>
</div> </div>
<input type="hidden" id="total_balance" name="total_balance" value="<%= @ordergroup.account_balance - total %>"/> </div>
<input type="hidden" name="version" value="<%= @version %>"/> <input type="hidden" id="total_balance" name="total_balance" value="<%= @ordergroup.account_balance - total %>"/>
<% end %> <input type="hidden" name="version" value="<%= @version %>"/>
</div> <% end %>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
@ -130,8 +130,8 @@ end%>
updateBalance(); updateBalance();
// show article info on row hover // show article info on row hover
<%#*$$('tbody tr').observer('hover', function() {%> <%#*$$('tbody tr').observer('hover', function() {%>
<%#*});%> <%#*});%>
//]]> //]]>
</script> </script>

2
public/stylesheets/main.css
View file

@ -426,6 +426,8 @@ table#order {
#order-footer #total-sum #order-button input, .article-info #total-sum #order-button input { #order-footer #total-sum #order-button input, .article-info #total-sum #order-button input {
background-color: #78B74E; background-color: #78B74E;
color: #fff; } color: #fff; }
#order-footer #total-sum #order-button input:disabled, .article-info #total-sum #order-button input:disabled {
background-color: red; }
.article-info { .article-info {
z-index: 2; z-index: 2;

2
public/stylesheets/print.css
View file

@ -426,6 +426,8 @@ table#order {
#order-footer #total-sum #order-button input, .article-info #total-sum #order-button input { #order-footer #total-sum #order-button input, .article-info #total-sum #order-button input {
background-color: #78B74E; background-color: #78B74E;
color: #fff; } color: #fff; }
#order-footer #total-sum #order-button input:disabled, .article-info #total-sum #order-button input:disabled {
background-color: red; }
.article-info { .article-info {
z-index: 2; z-index: 2;

2
public/stylesheets/sass/main.sass
View file

@ -467,6 +467,8 @@ table#order
input input
background-color: #78B74E background-color: #78B74E
color: #fff color: #fff
input:disabled
background-color: red
.article-info .article-info
z-index: 2 z-index: 2
width: 30em width: 30em