diff --git a/app/assets/javascripts/shared-ember-helpers/boolean.js.coffee b/app/assets/javascripts/shared-ember-helpers/boolean.js.coffee index 3ce3a413..2c19d7df 100644 --- a/app/assets/javascripts/shared-ember-helpers/boolean.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/boolean.js.coffee @@ -1,3 +1,3 @@ -Ember.Handlebars.registerBoundHelper 'boolean', (truefalse, options={})-> - classname = if truefalse then 'boolean-true' else 'boolean-false' - new Handlebars.SafeString("") +App.BooleanHelper = Ember.Helper.helper (params, options)-> + classname = if params[0] then 'boolean-true' else 'boolean-false' + "".htmlSafe() diff --git a/app/assets/javascripts/shared-ember-helpers/currency_helper.js.coffee b/app/assets/javascripts/shared-ember-helpers/currency.js.coffee similarity index 63% rename from app/assets/javascripts/shared-ember-helpers/currency_helper.js.coffee rename to app/assets/javascripts/shared-ember-helpers/currency.js.coffee index 41691d27..cb9ba2a2 100644 --- a/app/assets/javascripts/shared-ember-helpers/currency_helper.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/currency.js.coffee @@ -1,3 +1,4 @@ -Ember.Handlebars.registerBoundHelper 'currency', (amount, params..., options)-> +App.CurrencyHelper = Ember.Helper.helper (params, options)-> + amount = params[0] amount = 0.0 if isNaN(amount) || amount== '' || amount == null new Handlebars.SafeString('€ ' + parseFloat(amount).toFixed(2)) diff --git a/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee b/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee index 67091552..210ee729 100644 --- a/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee @@ -1,7 +1,8 @@ -Ember.Handlebars.helper 'image_tag', (path, options={})-> - alt = options.hash.alt || '' +App.ImageTagHelper = Ember.Helper.helper (params, options)-> + path = params[0] + alt = options.alt || '' image_path = if path.substring(0,4) == 'http' then path else "#{$assets_path}#{path}" extra_attributes = '' - extra_attributes += " width=\"#{options.hash.width}\"" if options.hash.width - extra_attributes += " height=\"#{options.hash.height}\"" if options.hash.height + extra_attributes += " width=\"#{options.width}\"" if options.width + extra_attributes += " height=\"#{options.height}\"" if options.height new Handlebars.SafeString "\"#{alt}\"" diff --git a/app/assets/javascripts/shared-ember-helpers/state.js.coffee b/app/assets/javascripts/shared-ember-helpers/state.js.coffee index 95f35e83..ed47d83a 100644 --- a/app/assets/javascripts/shared-ember-helpers/state.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/state.js.coffee @@ -1,3 +1,4 @@ -Ember.Handlebars.registerBoundHelper 'state', (subject, state, options={})-> +App.StateHelper = Ember.Helper.helper (params, options)-> + [subject, state] = params path = "state.#{subject}.#{state}" new Handlebars.SafeString("#{t(path)}") diff --git a/app/assets/javascripts/shared-ember-helpers/time.js.coffee b/app/assets/javascripts/shared-ember-helpers/time.js.coffee index ac034715..48bef8c6 100644 --- a/app/assets/javascripts/shared-ember-helpers/time.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/time.js.coffee @@ -1,10 +1,10 @@ -Ember.Handlebars.helper 'time', (time, params..., options = {})-> - return '' unless time +App.TimeHelper = Ember.Helper.helper (params, options)-> + return '' unless time = params[0] time = new Date(time) if typeof(time) is "string" iso = time.toISOString() - if options.hash.format - format_string = "data-time-format=\"#{options.hash.format}\"" + if options.format + format_string = "data-time-format=\"#{options.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 + tag = if options.bare then iso else $("").text(moment(iso).format(options.format || 'dd D MMM hh:mm')).get(0).outerHTML new Handlebars.SafeString tag diff --git a/app/assets/javascripts/shared-ember-helpers/translation.js.coffee b/app/assets/javascripts/shared-ember-helpers/translation.js.coffee index 6c53e898..920d378a 100644 --- a/app/assets/javascripts/shared-ember-helpers/translation.js.coffee +++ b/app/assets/javascripts/shared-ember-helpers/translation.js.coffee @@ -1,7 +1,8 @@ -Ember.Handlebars.helper 't', (path, params..., options)-> - toptions = options.hash - if params.length and typeof(params[0].serialize) is 'function' - $.extend toptions, params[0].serialize() +App.THelper = Ember.Helper.helper (params, options)-> + path = params[0] + toptions = options + if params.length > 1 and typeof(params[1].serialize) is 'function' + $.extend toptions, params[1].serialize() text = t(path, toptions) - tag = if options.hash.bare then text else "#{text}" + tag = if options.bare then text else "#{text}" tag.htmlSafe() diff --git a/app/assets/javascripts/shared-ember-helpers/version.coffee b/app/assets/javascripts/shared-ember-helpers/version.coffee index 120e1ba0..6a966f4f 100644 --- a/app/assets/javascripts/shared-ember-helpers/version.coffee +++ b/app/assets/javascripts/shared-ember-helpers/version.coffee @@ -1,2 +1,2 @@ -Ember.Handlebars.helper 'version', -> +App.VersionHelper = Ember.Helper.helper (params, options)-> new Handlebars.SafeString $app_version diff --git a/app/assets/javascripts/supplier/app/application.js.coffee b/app/assets/javascripts/supplier/app/application.js.coffee index c9bdd393..85fec239 100644 --- a/app/assets/javascripts/supplier/app/application.js.coffee +++ b/app/assets/javascripts/supplier/app/application.js.coffee @@ -3,10 +3,11 @@ #= require handlebars #= require ember #= require ember-data - #= require ember-validations +#= require ember-validations +#= require ember-template-compiler #= require_directory ./modifications -#= require shared-ember-helpers/all #= require ./app +#= require shared-ember-helpers/all #= require_directory ./mixins #= require_directory ./services #= require ./controllers/modals/base_controller @@ -14,5 +15,5 @@ #= require_tree . @$assets_path = '/assets/' -@EmberENV = {FEATURES: {'query-params-new': true}} +#@EmberENV = {FEATURES: {'query-params-new': true}} @$days = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'] diff --git a/app/assets/javascripts/supplier/app/components/button/close_list.js.coffee b/app/assets/javascripts/supplier/app/components/button/close_list.js.coffee index a7cabbf1..5f4aa8f1 100644 --- a/app/assets/javascripts/supplier/app/components/button/close_list.js.coffee +++ b/app/assets/javascripts/supplier/app/components/button/close_list.js.coffee @@ -1,5 +1,5 @@ App.ButtonCloseListComponent = Ember.Component.extend - templateName: 'close_list_button' + layoutName: 'close_list_button' classNames: ['close-list-button'] classNameBindings: ['content.active:show:hide'] tagName: 'button' diff --git a/app/assets/javascripts/supplier/app/components/button/mark-list-helped.js.coffee b/app/assets/javascripts/supplier/app/components/button/mark-list-helped.js.coffee index 6eee2a98..a0ef0119 100644 --- a/app/assets/javascripts/supplier/app/components/button/mark-list-helped.js.coffee +++ b/app/assets/javascripts/supplier/app/components/button/mark-list-helped.js.coffee @@ -1,5 +1,5 @@ App.ButtonMarkListHelpedComponent = Ember.View.extend - templateName: 'components/button/mark-list-helped' + layoutName: 'components/button/mark-list-helped' classNames: ['mark-list-as-helped-button'] classNameBindings: ['content.needs_help:show:hide'] tagName: 'button' diff --git a/app/assets/javascripts/supplier/app/components/button/mark-order-active.js.coffee b/app/assets/javascripts/supplier/app/components/button/mark-order-active.js.coffee index 16fac170..e2296ba2 100644 --- a/app/assets/javascripts/supplier/app/components/button/mark-order-active.js.coffee +++ b/app/assets/javascripts/supplier/app/components/button/mark-order-active.js.coffee @@ -1,6 +1,6 @@ App.ButtonMarkOrderActiveComponent = Ember.Component.extend tagName: 'button' - templateName: 'components/button/mark-order-active' + layoutName: 'components/button/mark-order-active' classNames: ['mark-order-active-button'] classNameBindings: ['order.placed:active:hide'] click: -> @get('order').mark_active() diff --git a/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee b/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee index a05e51b5..e2404cfd 100644 --- a/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee +++ b/app/assets/javascripts/supplier/app/components/button/mark-order-cancelled.js.coffee @@ -1,6 +1,6 @@ App.ButtonMarkOrderCancelledComponent = Ember.Component.extend tagName: 'button' - templateName: 'components/button/mark-order-cancelled' + layoutName: 'components/button/mark-order-cancelled' classNames: ['mark-order-cancelled-button'] classNameBindings: ['showButton:active:hide'] showButton: Ember.computed 'order.state', -> diff --git a/app/assets/javascripts/supplier/app/components/button/mark-order-delivered.js.coffee b/app/assets/javascripts/supplier/app/components/button/mark-order-delivered.js.coffee index fc8cae8e..e380b02e 100644 --- a/app/assets/javascripts/supplier/app/components/button/mark-order-delivered.js.coffee +++ b/app/assets/javascripts/supplier/app/components/button/mark-order-delivered.js.coffee @@ -1,6 +1,6 @@ App.ButtonMarkOrderDeliveredComponent = Ember.Component.extend tagName: 'button' - templateName: 'components/button/mark-order-delivered' + layoutName: 'components/button/mark-order-delivered' classNames: ['mark-order-delivered-button'] classNameBindings: ['showButton:active:hide'] showButton: Ember.computed 'order.state', -> diff --git a/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee b/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee index d14a470c..0220615f 100644 --- a/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee +++ b/app/assets/javascripts/supplier/app/components/form/boolean-button.js.coffee @@ -2,7 +2,7 @@ App.BooleanButtonComponent = Ember.Component.extend tagName: 'a' href: '#' classNames: "button" - templateName: "form/boolean-button" + layoutName: "form/boolean-button" #template: Ember.Handlebars.compile "{{view.text}}" classNameBindings: ['rounded:round', 'active:active:disabled'] diff --git a/app/assets/javascripts/supplier/app/components/form/select_minute_of_day_view.js.coffee b/app/assets/javascripts/supplier/app/components/form/select_minute_of_day_view.js.coffee new file mode 100644 index 00000000..44c181e0 --- /dev/null +++ b/app/assets/javascripts/supplier/app/components/form/select_minute_of_day_view.js.coffee @@ -0,0 +1,21 @@ +App.SelectMinuteOfDayComponent = Ember.Component.extend + layoutName: "form/select_minute_of_day" + classNameBindings: ['rounded:round'] + hours_list: [0..24].map (n) -> "0#{n}".substr(-2,2) + minutes_list: [0..60].map (n) -> "0#{n}".substr(-2,2) + hour: Ember.computed 'value', + set: (key, value)-> + minute = if @get('minute') then parseInt(@get('minute')) else 0 + @set 'value', 60*parseInt(value) + minute + value + get: -> + number = Math.floor (@get('value') || 0)/60 + "0#{number}".substr(-2,2) + minute: Ember.computed 'value', + set: (key, value)-> + hour = if @get('hour') then parseInt(@get('hour')) else 0 + @set 'value', 60*hour + parseInt(value) + value + get: -> + number = Math.floor @get('value')%60 + "0#{number}".substr(-2,2) diff --git a/app/assets/javascripts/supplier/app/components/section/element.js.coffee b/app/assets/javascripts/supplier/app/components/section/element.js.coffee index 3a03f9e6..864f01d6 100644 --- a/app/assets/javascripts/supplier/app/components/section/element.js.coffee +++ b/app/assets/javascripts/supplier/app/components/section/element.js.coffee @@ -1,5 +1,5 @@ App.SectionElementComponent = Ember.Component.extend DragNDrop.Draggable, - templateName: 'section/element' + layoutName: 'section/element' classNames: ['section-element-container'] attributeBindings: ['style'] show_handles: false diff --git a/app/assets/javascripts/supplier/app/controllers/modals/section_add_tables_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modals/section_add_tables_controller.js.coffee index b6f39eaf..2c6c4912 100644 --- a/app/assets/javascripts/supplier/app/controllers/modals/section_add_tables_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modals/section_add_tables_controller.js.coffee @@ -25,10 +25,3 @@ App.modals.SectionAddTablesController = App.modals.BaseController.extend @store.createRecord 'table', number: number, section: @get('model') @send 'close' - #Ember.$.post Routes.add_tables_suppliers_section_path(@get('model.id')), - #number_start: s - #number_end: e - #, (result,state,xhr)=> - ## @store.pushPayload 'table', result - #@store.pushPayload result - #@send 'close' diff --git a/app/assets/javascripts/supplier/app/controllers/modals/section_arrange_tables_controller.js.coffee b/app/assets/javascripts/supplier/app/controllers/modals/section_arrange_tables_controller.js.coffee index 9d53cee1..0a5700c6 100644 --- a/app/assets/javascripts/supplier/app/controllers/modals/section_arrange_tables_controller.js.coffee +++ b/app/assets/javascripts/supplier/app/controllers/modals/section_arrange_tables_controller.js.coffee @@ -20,14 +20,6 @@ App.modals.SectionArrangeTablesController = App.modals.BaseController.extend actions: arrangeTables: -> return unless @isValid() - #Ember.$.post Routes.arrange_tables_suppliers_section_path(@get('model.id')), - #option: @get('arrange_type') - #row_count: @get('row_count') - #column_count: @get('column_count') - #, (result,state,xhr)=> - #@store.pushPayload result - #@send 'close' - #return switch @get('arrange_type') when 'by_row' @get('model').invoke 'arrange_tables_in_rows_of', parseInt(@get('row_count')) diff --git a/app/assets/javascripts/supplier/app/helpers/can.js.coffee b/app/assets/javascripts/supplier/app/helpers/can.js.coffee index 04b07fe2..2e596d2e 100644 --- a/app/assets/javascripts/supplier/app/helpers/can.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/can.js.coffee @@ -1,10 +1,7 @@ -Ember.Handlebars.registerHelper 'can', (permission, resource, options)-> - if options.types[1] is "ID" and options.data.view - resource = options.data.view.get(resource) - if employee = App.__container__.lookup('global:variables').get('current_employee') - if permission is "read" or (permission is "manage" and employee.isManager()) - options.fn @ +App.CanHelper = Ember.Helper.extend + compute: (params, options)-> + [permission, resource] = params + if employee = App.__container__.lookup('global:variables').get('current_employee') + permission is "read" or (permission is "manage" and employee.isManager()) else - options.inverse @ if options.inverse - else - options.inverse @ if options.inverse + false diff --git a/app/assets/javascripts/supplier/app/helpers/colorbox.js.coffee b/app/assets/javascripts/supplier/app/helpers/colorbox.js.coffee index 4b830d95..2b4e8086 100644 --- a/app/assets/javascripts/supplier/app/helpers/colorbox.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/colorbox.js.coffee @@ -1,2 +1,3 @@ -Ember.Handlebars.helper 'colorbox', (color, options)-> +App.ColorboxHelper = Ember.Helper.helper (params, options)-> + color = params[0] "".htmlSafe() diff --git a/app/assets/javascripts/supplier/app/helpers/dimension.js.coffee b/app/assets/javascripts/supplier/app/helpers/dimension.js.coffee index 56d4cadf..0b8b48e0 100644 --- a/app/assets/javascripts/supplier/app/helpers/dimension.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/dimension.js.coffee @@ -1,2 +1,3 @@ -Ember.Handlebars.helper 'dimension', (value, options)-> +App.DimensionHelper = Ember.Helper.helper (params, options)-> + value = params[0] "#{value}m".htmlSafe() diff --git a/app/assets/javascripts/supplier/app/helpers/errors.js.coffee b/app/assets/javascripts/supplier/app/helpers/errors.js.coffee index 44afebc8..9808a5c3 100644 --- a/app/assets/javascripts/supplier/app/helpers/errors.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/errors.js.coffee @@ -1,7 +1,8 @@ -Ember.Handlebars.helper 'errors', (errors, params..., options)-> +App.ErrorsHelper = Ember.Helper.helper (params, options)-> + errors = params[0] return "" unless errors and errors.length result = "" - model_name = options.hash.includeAttribute + model_name = options.includeAttribute for error in errors if typeof error is "string" message = error diff --git a/app/assets/javascripts/supplier/app/helpers/flag.js.coffee b/app/assets/javascripts/supplier/app/helpers/flag.js.coffee index ed6d4e4d..71937bb1 100644 --- a/app/assets/javascripts/supplier/app/helpers/flag.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/flag.js.coffee @@ -1,2 +1,3 @@ -Ember.Handlebars.helper 'flag', (locale, options)-> +App.FlagHelper = Ember.Helper.helper (params, options)-> + locale = params[0] "".htmlSafe() diff --git a/app/assets/javascripts/supplier/app/helpers/gravatar-image.js.coffee b/app/assets/javascripts/supplier/app/helpers/gravatar-image.js.coffee index de02ec6a..8d31ae9c 100644 --- a/app/assets/javascripts/supplier/app/helpers/gravatar-image.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/gravatar-image.js.coffee @@ -1,5 +1,6 @@ -Ember.Handlebars.helper 'gravatar-image', (email, options={})-> - size = options.hash.size || 48 +App.GravatarImageHelper = Ember.Helper.helper (params, options)-> + email = params[0] + size = options.size || 48 gravatar_hash = md5(String(email).trim().toLowerCase()) "".htmlSafe() diff --git a/app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee b/app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee deleted file mode 100644 index 956b9fca..00000000 --- a/app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee +++ /dev/null @@ -1,5 +0,0 @@ -Ember.Handlebars.helper 'isCurrentLocale', (locale, options)-> - if locale is 'nl' - options.fn @ - else - options.inverse @ diff --git a/app/assets/javascripts/supplier/app/helpers/momentTransform.js.coffee b/app/assets/javascripts/supplier/app/helpers/momentTransform.js.coffee index 7d6196bf..898e17ed 100644 --- a/app/assets/javascripts/supplier/app/helpers/momentTransform.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/momentTransform.js.coffee @@ -1,3 +1,4 @@ +## Used to be able to use DS.attr('moment') App.MomentTransform = DS.Transform.extend deserialize: (serialized)-> return serialized unless serialized diff --git a/app/assets/javascripts/supplier/app/helpers/page-body.js.coffee b/app/assets/javascripts/supplier/app/helpers/page-body.js.coffee index cd77863d..b43fd090 100644 --- a/app/assets/javascripts/supplier/app/helpers/page-body.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/page-body.js.coffee @@ -1,4 +1,4 @@ -Ember.Handlebars.registerHelper 'page-body-helper', (resource, params..., options)-> - body = @get resource - template = Ember.Handlebars.compile('body') - body.htmlSafe() +#Ember.Handlebars.registerHelper 'page-body-helper', (resource, params..., options)-> +# body = @get resource +# template = Ember.Handlebars.compile('body') +# body.htmlSafe() diff --git a/app/assets/javascripts/supplier/app/helpers/route_helper.js.coffee b/app/assets/javascripts/supplier/app/helpers/route_helper.js.coffee index 73fc8c18..7099a08f 100644 --- a/app/assets/javascripts/supplier/app/helpers/route_helper.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/route_helper.js.coffee @@ -1,8 +1,8 @@ -Ember.Handlebars.registerHelper 'route', (route_name, params..., options)-> - opts = options.hash - if scope = @get('content') - params = params.map (a) -> scope.get(a) - for k,v of opts - opts[k] = scope.get(v) if typeof(v) == 'string' && scope.get(v) - route = if params.length then Routes[route_name].call(this, params, opts) else Routes[route_name].call(this, opts) - new Handlebars.SafeString route +#Ember.Handlebars.registerHelper 'route', (route_name, params..., options)-> +# opts = options.hash +# if scope = @get('content') +# params = params.map (a) -> scope.get(a) +# for k,v of opts +# opts[k] = scope.get(v) if typeof(v) == 'string' && scope.get(v) +# route = if params.length then Routes[route_name].call(this, params, opts) else Routes[route_name].call(this, opts) +# new Handlebars.SafeString route diff --git a/app/assets/javascripts/supplier/app/helpers/route_link_helper.js.coffee b/app/assets/javascripts/supplier/app/helpers/route_link_helper.js.coffee index 3417ac13..f8bc5eec 100644 --- a/app/assets/javascripts/supplier/app/helpers/route_link_helper.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/route_link_helper.js.coffee @@ -1,12 +1,12 @@ -Ember.Handlebars.registerHelper 'path', (route, params..., options)-> - route_method = Routes["#{route}_path"] - throw "Route #{route} cannout be found" unless route_method - - mapped_options = {} - - for k, v of options.hash - mapped_options[k] = Ember.Handlebars.get(this, v, options) || v - params.push mapped_options - - path = route_method.apply(this, params) - new Handlebars.SafeString("href='#{path}'") +#Ember.Handlebars.registerHelper 'path', (route, params..., options)-> +# route_method = Routes["#{route}_path"] +# throw "Route #{route} cannout be found" unless route_method +# +# mapped_options = {} +# +# for k, v of options.hash +# mapped_options[k] = Ember.Handlebars.get(this, v, options) || v +# params.push mapped_options +# +# path = route_method.apply(this, params) +# new Handlebars.SafeString("href='#{path}'") diff --git a/app/assets/javascripts/supplier/app/helpers/select-hour.js.coffee b/app/assets/javascripts/supplier/app/helpers/select-hour.js.coffee index fb7c398b..805db014 100644 --- a/app/assets/javascripts/supplier/app/helpers/select-hour.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/select-hour.js.coffee @@ -1,5 +1,5 @@ -Ember.Handlebars.helper 'select-hour', (params..., options)-> - result = "" - new Handlebars.SafeString result +#Ember.Handlebars.helper 'select-hour', (params..., options)-> +# result = "" +# new Handlebars.SafeString result diff --git a/app/assets/javascripts/supplier/app/helpers/select-minute.js.coffee b/app/assets/javascripts/supplier/app/helpers/select-minute.js.coffee index be1d8214..15e04910 100644 --- a/app/assets/javascripts/supplier/app/helpers/select-minute.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/select-minute.js.coffee @@ -1,5 +1,5 @@ -Ember.Handlebars.helper 'select-minute', (params..., options)-> - result = "" - new Handlebars.SafeString result +#Ember.Handlebars.helper 'select-minute', (params..., options)-> +# result = "" +# new Handlebars.SafeString result diff --git a/app/assets/javascripts/supplier/app/helpers/svg.js.coffee b/app/assets/javascripts/supplier/app/helpers/svg.js.coffee index 231e1ae1..0896e991 100644 --- a/app/assets/javascripts/supplier/app/helpers/svg.js.coffee +++ b/app/assets/javascripts/supplier/app/helpers/svg.js.coffee @@ -1,7 +1,8 @@ -Ember.Handlebars.helper 'svg', (content, options)-> - width = options.hash.width - height = options.hash.height - angle = options.hash.rotation || 0 +App.SvgHelper = Ember.Helper.helper (params, options)-> + content = params[0] + width = options.width + height = options.height + angle = options.rotation || 0 box_size = Math.sqrt((width * width) + (height * height)) svg_head = "" group_head = "" diff --git a/app/assets/javascripts/supplier/app/templates/components/menu-time-preview.emblem b/app/assets/javascripts/supplier/app/templates/components/menu-time-preview.emblem index 1939459e..6e0bc0d0 100644 --- a/app/assets/javascripts/supplier/app/templates/components/menu-time-preview.emblem +++ b/app/assets/javascripts/supplier/app/templates/components/menu-time-preview.emblem @@ -13,7 +13,7 @@ else br = boolean-button value=preview_full_day reverse=true text_path="product_category.time_preview.active_at" unless preview_full_day - = view "select-minute-of-day" value=preview_minute_of_day + = select-minute-of-day value=preview_minute_of_day hr if active a.deactivate-time-preview-button{action "deactivateTimePreview"}= t 'product_category.time_preview.deactivate_button' diff --git a/app/assets/javascripts/supplier/app/templates/employees/index.emblem b/app/assets/javascripts/supplier/app/templates/employees/index.emblem index 8ee63a6b..0ca02bd4 100644 --- a/app/assets/javascripts/supplier/app/templates/employees/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/employees/index.emblem @@ -21,9 +21,9 @@ td.boolean= boolean employee.active td.colorbox= colorbox employee.color td.actions - can "manage" "sections" + if (can "manage" "sections") a.table-edit{ action 'editEmployee' employee }: span a.table-destroy{ action 'destroyEmployee' employee }: span .form-actions - can "manage" "employees" + if (can "manage" "employees") a.form-action-new.new-employee-button{action "newEmployee"}= t 'employee.new_button' diff --git a/app/assets/javascripts/supplier/app/templates/form_elements/select_minute_of_day.emblem b/app/assets/javascripts/supplier/app/templates/form/select_minute_of_day.emblem similarity index 100% rename from app/assets/javascripts/supplier/app/templates/form_elements/select_minute_of_day.emblem rename to app/assets/javascripts/supplier/app/templates/form/select_minute_of_day.emblem diff --git a/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem b/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem index 8a8edc95..cc5ed58c 100644 --- a/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem +++ b/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem @@ -21,7 +21,7 @@ = link-to 'lists' span.icon.lists = t 'models.plural.list' - can "manage" "employees" + if (can "manage" "employees") li = link-to 'employees' span.icon.employees @@ -30,7 +30,7 @@ = link-to 'schedule' span.icon.schedule = t 'top_menu.schedule' - can "manage" globals.current_supplier + if (can "manage" globals.current_supplier) li =link-to 'settings' class="supplier-settings-link" span.icon.settings diff --git a/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem b/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem index b2e6fe88..c1bb7f61 100644 --- a/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem +++ b/app/assets/javascripts/supplier/app/templates/global/_top_menu.emblem @@ -4,7 +4,7 @@ header.top-menu .menu-content section.main-buttons = link-to 'index' class="top-menu-root" - = image_tag "icons/logo-small.png" + = image-tag "icons/logo-small.png" = link-to "menu" class="top-menu-menu" span.icon.menu = t 'top_menu.menu' @@ -17,7 +17,7 @@ header.top-menu = link-to "lists" class="top-menu-lists" span.icon.lists = t 'models.plural.list' - can "manage" "employees" + if (can "manage" "employees") = link-to "employees" class="top-menu-employees" span.icon.employees = t 'models.plural.employee' diff --git a/app/assets/javascripts/supplier/app/templates/index.emblem b/app/assets/javascripts/supplier/app/templates/index.emblem index bfa167ae..7ddfcc86 100644 --- a/app/assets/javascripts/supplier/app/templates/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/index.emblem @@ -1,6 +1,6 @@ .row: .small-12.columns = sections-header section=globals.active_section - can "manage" globals.current_supplier + if (can "manage" globals.current_supplier) unless globals.current_supplier.open .alert-box.alert.radius data-alert=true = t 'supplier.you_are_currently_closed_alert' diff --git a/app/assets/javascripts/supplier/app/templates/menu.emblem b/app/assets/javascripts/supplier/app/templates/menu.emblem index 38702237..b102968b 100644 --- a/app/assets/javascripts/supplier/app/templates/menu.emblem +++ b/app/assets/javascripts/supplier/app/templates/menu.emblem @@ -6,16 +6,16 @@ each sorted_product_categories as |product_category| .row.product_category-container: .small-12.columns .product_category-header - can "manage" "menu" + if (can "manage" "menu") a.move{action "moveProductCategory" product_category} href="#" span.title= product_category.name span.availability= product_category.availability_text - can "manage" "menu" + if (can "manage" "menu") a.edit-product-category-button{action "editProductCategory" product_category} href="#": span a.add-product-product_category-button{action "addProduct" product_category} href="#": span each product_category.sorted_products as |product| = menu-product product=product code_filter=product_code_filter -can "manage" "menu" +if (can "manage" "menu") .row .small-12.columns a.new-product_category-button{action "newProductCategory"} href="#" = t 'product_category.new_button' diff --git a/app/assets/javascripts/supplier/app/templates/modals/product_category_form.emblem b/app/assets/javascripts/supplier/app/templates/modals/product_category_form.emblem index 6ab6a2d1..f45ced09 100644 --- a/app/assets/javascripts/supplier/app/templates/modals/product_category_form.emblem +++ b/app/assets/javascripts/supplier/app/templates/modals/product_category_form.emblem @@ -34,8 +34,8 @@ .small-12.columns.text-center= boolean-button value=model.full_day reverse=true text_path="product_category.modal.active_between.top" unless model.full_day .row - .small-12.columns= view "select-minute-of-day" value=model.start_from + .small-12.columns= select-minute-of-day value=model.start_from .row .small-12.columns.text-center= t 'product_category.modal.active_between.middle' .row - .small-12.columns= view "select-minute-of-day" value=model.end_on + .small-12.columns= select-minute-of-day value=model.end_on diff --git a/app/assets/javascripts/supplier/app/templates/section.emblem b/app/assets/javascripts/supplier/app/templates/section.emblem index 21ffd636..1eb7f29e 100644 --- a/app/assets/javascripts/supplier/app/templates/section.emblem +++ b/app/assets/javascripts/supplier/app/templates/section.emblem @@ -2,12 +2,12 @@ = link-to 'sections' class="goto-sections-index-tab-header": span each sections as |section| = section-tab-header section=section - can "manage" "sections" + if (can "manage" "sections") a.add-section{action "addSection"}: span .section-manage-tables.pull-right unless model.editmode a.go-to-orders-list{ action "showDashboardOrders" model }: span - can "manage" "sections" + if (can "manage" "sections") if model.editmode a.section-rollback-button{ action "rollbackEditable" }: span = input type="text" value=model.title class="section-edit-title-field" diff --git a/app/assets/javascripts/supplier/app/templates/sections/index.emblem b/app/assets/javascripts/supplier/app/templates/sections/index.emblem index e4bf34aa..b1e267f0 100644 --- a/app/assets/javascripts/supplier/app/templates/sections/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/sections/index.emblem @@ -36,6 +36,6 @@ else .row: .small-12.columns .panel=t 'section.none_found' - can "manage" "sections" + if (can "manage" "sections") .form-actions a.form-action-new{action "addSection"}=t 'helpers.links.new' diff --git a/app/assets/javascripts/supplier/app/templates/settings.emblem b/app/assets/javascripts/supplier/app/templates/settings.emblem index a4938e22..7f16d024 100644 --- a/app/assets/javascripts/supplier/app/templates/settings.emblem +++ b/app/assets/javascripts/supplier/app/templates/settings.emblem @@ -8,7 +8,7 @@ /input.location_picker name="location" type="text" valueBinding="location" /.form-row .location_picker_map - = image_tag 'supplier/settings/location-balloon.png' + = image-tag 'supplier/settings/location-balloon.png' /.form-row .form-label: label=t 'attributes.supplier.time_zone' .form-field: Ember.Select content=time_zones optionValuePath="content.name" optionLabelPath="content.formatted" valueBinding="supplier.time_zone" @@ -34,7 +34,7 @@ if editIensProfile .form-label: label=t 'attributes.supplier.iens_profile' .form-field = number-field numericValue=supplier.iens_profile - = image_tag 'supplier/settings/iens-example.png' + = image-tag 'supplier/settings/iens-example.png' span=t "settings.reviews.explanation" .row: .small-12.columns= language-switcher .form-row.form-actions diff --git a/app/assets/javascripts/supplier/app/templates/tables/index.emblem b/app/assets/javascripts/supplier/app/templates/tables/index.emblem index d720ccd9..b59dbf7b 100644 --- a/app/assets/javascripts/supplier/app/templates/tables/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/tables/index.emblem @@ -18,10 +18,10 @@ = table.section.title /td.timestamp=time table.created_at td.actions - can "manage" "tables" + if (can "manage" "tables") a.table-edit{ action 'editTable' table }: span a.table-destroy{ action 'destroyTable' table }: span .form-actions - can "manage" "tables" + if (can "manage" "tables") a.form-action-new.new-table-button{action "newTable"}= t 'table.new_button' = qr-codes-link diff --git a/app/assets/javascripts/supplier/app/views/form_elements/select_minute_of_day_view.js.coffee b/app/assets/javascripts/supplier/app/views/form_elements/select_minute_of_day_view.js.coffee deleted file mode 100644 index d66fd3be..00000000 --- a/app/assets/javascripts/supplier/app/views/form_elements/select_minute_of_day_view.js.coffee +++ /dev/null @@ -1,17 +0,0 @@ -App.SelectMinuteOfDayView = Ember.View.extend - templateName: "form_elements/select_minute_of_day" - classNameBindings: ['rounded:round'] - hours_list: [0..24].map (n) -> "0#{n}".substr(-2,2) - minutes_list: [0..60].map (n) -> "0#{n}".substr(-2,2) - hour: Ember.computed 'value', (attribute, setValue)-> - if arguments.length > 1 - minute = if @get('minute') then parseInt(@get('minute')) else 0 - @set 'value', 60*parseInt(setValue) + minute - number = Math.floor (@get('value') || 0)/60 - "0#{number}".substr(-2,2) - minute: Ember.computed 'value', (attribute, setValue)-> - if arguments.length > 1 - hour = if @get('hour') then parseInt(@get('hour')) else 0 - @set 'value', 60*hour + parseInt(setValue) - number = Math.floor @get('value')%60 - "0#{number}".substr(-2,2) diff --git a/app/assets/javascripts/user/app/templates/global/_top_menu.emblem b/app/assets/javascripts/user/app/templates/global/_top_menu.emblem index a5208ec4..9e5cca4f 100644 --- a/app/assets/javascripts/user/app/templates/global/_top_menu.emblem +++ b/app/assets/javascripts/user/app/templates/global/_top_menu.emblem @@ -4,14 +4,14 @@ section.main-buttons if globals.list.id link-to 'index' class="top-menu-logo with-list" - = image_tag 'user/logo-small.png' + = image-tag 'user/logo-small.png' = menu-item route="active_list" reference_controller=controller = menu-item route="table" route_param=globals.list.table.id reference_controller=controller = menu-item-list-needs-help reference_controller=controller = menu-item-list-needs-payment reference_controller=controller else link-to 'index' class="top-menu-logo without-list" - = image_tag 'user/logo-small.png' + = image-tag 'user/logo-small.png' = menu-item-scan-qr reference_controller=controller = menu-item-product-orders reference_controller=controller if globals.list diff --git a/app/assets/javascripts/user/app/templates/index.emblem b/app/assets/javascripts/user/app/templates/index.emblem index 6856cebe..cdb63c78 100644 --- a/app/assets/javascripts/user/app/templates/index.emblem +++ b/app/assets/javascripts/user/app/templates/index.emblem @@ -1,8 +1,8 @@ .home-panel .home-header = link-to 'about' - = image_tag 'user/logo.png' width=100 height=115 alt="Logo" + = image-tag 'user/logo.png' width=100 height=115 alt="Logo" .home-center - a{ action "scanQr" } href="#"= image_tag 'user/scan-logo.png' width=148 height=177 alt="Scan" + a{ action "scanQr" } href="#"= image-tag 'user/scan-logo.png' width=148 height=177 alt="Scan" .home-footer .home-footer-content diff --git a/wip.md b/wip.md index 7f0fa824..2d675f14 100644 --- a/wip.md +++ b/wip.md @@ -39,7 +39,7 @@ Bugs General ------- - +- Add sign in link to collapsed mobile version of the site - Loading pages - Food/allergy information/labels - Timed delivering