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

Style bootstrap tooltip; show FC share in article price info

Browse source
This commit is contained in:
Julius 2013-07-08 22:10:36 +02:00
parent bba70dc875
commit a6228bdcf2
4 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/bootstrap_and_overrides.css.less vendored
View file

@ -50,6 +50,16 @@ body {
margin: 0; margin: 0;
} }
// Light tooltips without empty space below tables
.tooltip-inner {
color: #000;
background-color: rgb(245,245,245);
border: 1px solid #ccc;
}
.tooltip-inner .table {
margin-bottom: 0;
}
@mainRedColor: #ED0606; @mainRedColor: #ED0606;
.logo { .logo {

4
app/views/shared/_article_price_info.html.haml
View file

@ -8,6 +8,10 @@
%tr %tr
%th= t 'activerecord.attributes.article.tax' %th= t 'activerecord.attributes.article.tax'
%td.numeric= number_to_percentage article.tax %td.numeric= number_to_percentage article.tax
- unless article.fc_price == article.gross_price
%tr
%th= t 'activerecord.attributes.article.fc_share'
%td.numeric= number_to_currency(article.fc_price-article.gross_price)
%tr %tr
%th= t 'activerecord.attributes.article.fc_price' %th= t 'activerecord.attributes.article.fc_price'
%td.numeric= number_to_currency article.fc_price %td.numeric= number_to_currency article.fc_price

1
config/locales/de.yml
View file

@ -40,6 +40,7 @@ de:
availability: Artikel ist verfügbar? availability: Artikel ist verfügbar?
deposit: Pfand deposit: Pfand
fc_price: Endpreis fc_price: Endpreis
fc_share: FC-Aufschlag
gross_price: Bruttopreis gross_price: Bruttopreis
price: Nettopreis price: Nettopreis
tax: MwSt tax: MwSt

1
config/locales/en.yml
View file

@ -40,6 +40,7 @@ en:
availability: Is article available? availability: Is article available?
deposit: deposit deposit: deposit
fc_price: FC price fc_price: FC price
fc_share: FC share
gross_price: gross price gross_price: gross price
price: price price: price
tax: VAT tax: VAT