diff --git a/app/assets/javascripts/shared-ember-helpers/time.js.coffee b/app/assets/javascripts/shared-ember-helpers/time.js.coffee index aa9b988e..ac034715 100644 --- a/app/assets/javascripts/shared-ember-helpers/time.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/time.js.coffee @@ -2,5 +2,9 @@ Ember.Handlebars.helper 'time', (time, params..., options = {})-> return '' unless time time = new Date(time) if typeof(time) is "string" iso = time.toISOString() - tag = if options.bare then iso else $("").text(moment(iso).format(options.format || 'dd D MMM HH:mm')).get(0).outerHTML + if options.hash.format + format_string = "data-time-format=\"#{options.hash.format}\"" + else + format_string = '' + tag = if options.bare then iso else $("").text(moment(iso).format(options.hash.format || 'dd D MMM hh:mm')).get(0).outerHTML new Handlebars.SafeString tag diff --git a/app/assets/javascripts/user/app/templates/list_order_row.emblem b/app/assets/javascripts/user/app/templates/list_order_row.emblem index 8914e50c..4b0ec577 100644 --- a/app/assets/javascripts/user/app/templates/list_order_row.emblem +++ b/app/assets/javascripts/user/app/templates/list_order_row.emblem @@ -1,3 +1,3 @@ = order.display span.currency= currency order.total -span.created_at= time order.created_at +span.created_at= time order.created_at format="H:mm" diff --git a/app/assets/javascripts/user/flat/application.js.coffee.erb b/app/assets/javascripts/user/flat/application.js.coffee.erb index 8d7da812..330a703e 100644 --- a/app/assets/javascripts/user/flat/application.js.coffee.erb +++ b/app/assets/javascripts/user/flat/application.js.coffee.erb @@ -20,4 +20,5 @@ @Qstorage = localStorage $.extend($translations.en, <%= I18n.t('user', locale: :en).to_json %>); $.extend($translations.nl, <%= I18n.t('user', locale: :nl).to_json %>); + setLocale() diff --git a/app/assets/stylesheets/user/foundation/_structure.css.sass b/app/assets/stylesheets/user/foundation/_structure.css.sass index e52a98b4..58ba9c4a 100644 --- a/app/assets/stylesheets/user/foundation/_structure.css.sass +++ b/app/assets/stylesheets/user/foundation/_structure.css.sass @@ -4,7 +4,7 @@ html, body padding: 0 body @media #{$small-only} - font-size: 13px + font-size: 14px #ember-app-container background-image: image-url('theme1/wall-bg.jpg') background-repeat: repeat