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

use more beautiful close mark

This commit is contained in:
wvengen 2013-04-10 17:34:24 +02:00
parent a501fac76f
commit 6c65799025
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -152,7 +152,7 @@ module ApplicationHelper
type = :success if type == :notice
type = :error if type == :alert
text = content_tag(:div,
content_tag(:button, I18n.t('ui.marks.close'), :class => "close", "data-dismiss" => "alert") +
content_tag(:button, I18n.t('ui.marks.close').html_safe, :class => "close", "data-dismiss" => "alert") +
message, :class => "alert fade in alert-#{type}")
flash_messages << text if message
end

2
app/views/articles/_form.html.haml
View File

@ -2,7 +2,7 @@
= f.hidden_field :shared_updated_on
= f.hidden_field :supplier_id
.modal-header
= button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
= button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
.modal-body
= f.input :availability

2
app/views/finance/balancing/_edit_note.html.haml
View File

@ -1,6 +1,6 @@
= simple_form_for @order, url: update_note_finance_order_path(@order), remote: true, method: :put do |f|
.modal-header
= button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
= button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
%h3 Notiz bearbeiten
.modal-body
= f.input :note, input_html: {class: 'input-xlarge'}

2
app/views/finance/order_articles/_edit.html.haml
View File

@ -1,6 +1,6 @@
= simple_form_for [:finance, @order, @order_article], remote: true do |form|
.modal-header
= button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
= button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
.modal-body
= form.input :units_to_order

2
app/views/finance/order_articles/_new.html.haml
View File

@ -1,6 +1,6 @@
= simple_form_for [:finance, @order, @order_article], remote: true do |form|
.modal-header
= button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
= button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
.modal-body
= form.input :article_id, as: :select, collection: new_order_articles_collection

2
app/views/invites/_modal_form.html.haml
View File

@ -1,6 +1,6 @@
= simple_form_for @invite, remote: true do |form|
.modal-header
= button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'}
= button_tag t('ui.marks.close').html_safe, class: 'close', data: {dismiss: 'modal'}
%h3= t '.title'
.modal-body
= t('.body', group: @invite.group.name).html_safe

2
app/views/stockit/_destroy_fail.js.haml
View File

@ -1,5 +1,5 @@
-# please polish the following line if you know how, same in view destroy
var errorDiv = $('<div class="alert fade in alert-error"><a class="close" data-dismiss="alert" href="#">#{t('ui.marks.close')}</a></div>');
var errorDiv = $('<div class="alert fade in alert-error"><a class="close" data-dismiss="alert" href="#">#{t('ui.marks.close').html_safe}</a></div>');
errorDiv.append(document.createTextNode('#{j(fail_msg)}'));
$('div.container-fluid').prepend(errorDiv);

2
app/views/stockit/destroy.js.haml
View File

@ -1,5 +1,5 @@
-# please polish the following line if you know how, same in partial _destroy_fail
var successDiv = $('<div class="alert fade in alert-success"><a class="close" data-dismiss="alert" href="#">#{escape_javascript(t('ui.marks.close'))}</a></div>');
var successDiv = $('<div class="alert fade in alert-success"><a class="close" data-dismiss="alert" href="#">#{escape_javascript(t('ui.marks.close').html_safe)}</a></div>');
successDiv.append(document.createTextNode('#{escape_javascript(t('.notice', name: @article.name))}'));
$('div.container-fluid').prepend(successDiv);

2
config/locales/de/de.defaults.yml
View File

@ -312,5 +312,5 @@ de:
save: 'Speichern'
or_cancel: 'oder abbrechen'
marks:
close: 'x'
close: '&times;'