ember2 progress deprication smashing

app/assets/javascripts/shared-ember-helpers/boolean.js.coffee

@@ -1,3 +1,3 @@
-Ember.Handlebars.registerBoundHelper 'boolean', (truefalse, options={})->
+App.BooleanHelper = Ember.Helper.helper (params, options)->
-  classname = if truefalse then 'boolean-true' else 'boolean-false'
+  classname = if params[0] then 'boolean-true' else 'boolean-false'
-  new Handlebars.SafeString("<span class=\"#{classname}\"></span>")
+  "<span class=\"#{classname}\"></span>".htmlSafe()

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))

app/assets/javascripts/shared-ember-helpers/image_tag.js.coffee

@@ -1,7 +1,8 @@
-Ember.Handlebars.helper 'image_tag', (path, options={})->
+App.ImageTagHelper = Ember.Helper.helper (params, options)->
-  alt = options.hash.alt || ''
+  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 += " width=\"#{options.width}\"" if options.width
-  extra_attributes += " height=\"#{options.hash.height}\"" if options.hash.height
+  extra_attributes += " height=\"#{options.height}\"" if options.height
   new Handlebars.SafeString "<img src=\"#{image_path}\" alt=\"#{alt}\" title=\"#{alt}\" #{extra_attributes}>"

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("<span data-t=\"#{path}\">#{t(path)}</span>")

app/assets/javascripts/shared-ember-helpers/time.js.coffee

@@ -1,10 +1,10 @@
-Ember.Handlebars.helper 'time', (time, params..., options = {})->
+App.TimeHelper = Ember.Helper.helper (params, options)->
-  return '' unless time
+  return '' unless time = params[0]
   time = new Date(time) if typeof(time) is "string"
   iso = time.toISOString()
-  if options.hash.format
+  if options.format
-    format_string = "data-time-format=\"#{options.hash.format}\""
+    format_string = "data-time-format=\"#{options.format}\""
   else
     format_string = ''
-  tag = if options.bare then iso else $("<span data-time=\"#{iso}\" #{format_string}></span>").text(moment(iso).format(options.hash.format || 'dd D MMM hh:mm')).get(0).outerHTML
+  tag = if options.bare then iso else $("<span data-time=\"#{iso}\" #{format_string}></span>").text(moment(iso).format(options.format || 'dd D MMM hh:mm')).get(0).outerHTML
   new Handlebars.SafeString tag

app/assets/javascripts/shared-ember-helpers/translation.js.coffee

@@ -1,7 +1,8 @@
-Ember.Handlebars.helper 't', (path, params..., options)->
+App.THelper = Ember.Helper.helper (params, options)->
-  toptions = options.hash
+  path = params[0]
-  if params.length and typeof(params[0].serialize) is 'function'
+  toptions = options
-    $.extend toptions, params[0].serialize()
+  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 "<span data-t='#{path}' class='translation' data-t-attributes='#{JSON.stringify(toptions)}'>#{text}</span>"
+  tag = if options.bare then text else "<span data-t='#{path}' class='translation' data-t-attributes='#{JSON.stringify(toptions)}'>#{text}</span>"
   tag.htmlSafe()

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

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']

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'

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'

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()

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', ->

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', ->

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 "<span>{{view.text}}</span>"
   classNameBindings: ['rounded:round', 'active:active:disabled']
 

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)

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

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'

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'))

app/assets/javascripts/supplier/app/helpers/can.js.coffee

@@ -1,10 +1,7 @@
-Ember.Handlebars.registerHelper 'can', (permission, resource, options)->
+App.CanHelper = Ember.Helper.extend
-  if options.types[1] is "ID" and options.data.view
+  compute: (params, options)->
-    resource = options.data.view.get(resource)
+    [permission, resource] = params
     if employee = App.__container__.lookup('global:variables').get('current_employee')
-    if permission is "read" or (permission is "manage" and employee.isManager())
+      permission is "read" or (permission is "manage" and employee.isManager())
-      options.fn @
     else
-      options.inverse @ if options.inverse
+      false
-  else
-    options.inverse @ if options.inverse

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]
   "<span class='colorbox-container'><span style='background-color:#{color}'></span></span>".htmlSafe()

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}<span class='dimension'>m</span>".htmlSafe()

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

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]
   "<img src=\"#{$assets_path}supplier/flags/flag-#{locale}.png\">".htmlSafe()

app/assets/javascripts/supplier/app/helpers/gravatar-image.js.coffee

@@ -1,5 +1,6 @@
-Ember.Handlebars.helper 'gravatar-image', (email, options={})->
+App.GravatarImageHelper = Ember.Helper.helper (params, options)->
-  size = options.hash.size || 48
+  email = params[0]
+  size = options.size || 48
   gravatar_hash = md5(String(email).trim().toLowerCase())
   "<img src='http://www.gravatar.com/avatar/#{gravatar_hash}?s=#{size}' />".htmlSafe()
 

app/assets/javascripts/supplier/app/helpers/isCurrentLocale.js.coffee

@@ -1,5 +0,0 @@
-Ember.Handlebars.helper 'isCurrentLocale', (locale, options)->
-  if locale is 'nl'
-    options.fn @
-  else
-    options.inverse @

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

app/assets/javascripts/supplier/app/helpers/page-body.js.coffee

@@ -1,4 +1,4 @@
-Ember.Handlebars.registerHelper 'page-body-helper', (resource, params..., options)->
+#Ember.Handlebars.registerHelper 'page-body-helper', (resource, params..., options)->
-  body = @get resource
+#  body = @get resource
-  template = Ember.Handlebars.compile('body')
+#  template = Ember.Handlebars.compile('body')
-  body.htmlSafe()
+#  body.htmlSafe()

app/assets/javascripts/supplier/app/helpers/route_helper.js.coffee

@@ -1,8 +1,8 @@
-Ember.Handlebars.registerHelper 'route', (route_name, params..., options)->
+#Ember.Handlebars.registerHelper 'route', (route_name, params..., options)->
-  opts = options.hash
+#  opts = options.hash
-  if scope = @get('content')
+#  if scope = @get('content')
-    params = params.map (a) -> scope.get(a)
+#    params = params.map (a) -> scope.get(a)
-    for k,v of opts
+#    for k,v of opts
-      opts[k] = scope.get(v) if typeof(v) == 'string' && scope.get(v)
+#      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)
+#  route = if params.length then Routes[route_name].call(this, params, opts) else Routes[route_name].call(this, opts)
-  new Handlebars.SafeString route
+#  new Handlebars.SafeString route

app/assets/javascripts/supplier/app/helpers/route_link_helper.js.coffee

@@ -1,12 +1,12 @@
-Ember.Handlebars.registerHelper 'path', (route, params..., options)->
+#Ember.Handlebars.registerHelper 'path', (route, params..., options)->
-  route_method = Routes["#{route}_path"]
+#  route_method = Routes["#{route}_path"]
-  throw "Route #{route} cannout be found" unless route_method
+#  throw "Route #{route} cannout be found" unless route_method
-
+#
-  mapped_options = {}
+#  mapped_options = {}
-
+#
-  for k, v of options.hash
+#  for k, v of options.hash
-    mapped_options[k] = Ember.Handlebars.get(this, v, options) || v
+#    mapped_options[k] = Ember.Handlebars.get(this, v, options) || v
-  params.push mapped_options
+#  params.push mapped_options
-
+#
-  path = route_method.apply(this, params)
+#  path = route_method.apply(this, params)
-  new Handlebars.SafeString("href='#{path}'")
+#  new Handlebars.SafeString("href='#{path}'")

app/assets/javascripts/supplier/app/helpers/select-hour.js.coffee

@@ -1,5 +1,5 @@
-Ember.Handlebars.helper 'select-hour', (params..., options)->
+#Ember.Handlebars.helper 'select-hour', (params..., options)->
-  result = "<select class=\"select-hour\">"
+#  result = "<select class=\"select-hour\">"
-  result += "<option>#{hour}</option>" for hour in [0..24]
+#  result += "<option>#{hour}</option>" for hour in [0..24]
-  result += "</select>"
+#  result += "</select>"
-  new Handlebars.SafeString result
+#  new Handlebars.SafeString result

app/assets/javascripts/supplier/app/helpers/select-minute.js.coffee

@@ -1,5 +1,5 @@
-Ember.Handlebars.helper 'select-minute', (params..., options)->
+#Ember.Handlebars.helper 'select-minute', (params..., options)->
-  result = "<select class=\"select-minute\">"
+#  result = "<select class=\"select-minute\">"
-  result += "<option>#{minute}</option>" for minute in [0..24]
+#  result += "<option>#{minute}</option>" for minute in [0..24]
-  result += "</select>"
+#  result += "</select>"
-  new Handlebars.SafeString result
+#  new Handlebars.SafeString result

app/assets/javascripts/supplier/app/helpers/svg.js.coffee

@@ -1,7 +1,8 @@
-Ember.Handlebars.helper 'svg', (content, options)->
+App.SvgHelper = Ember.Helper.helper (params, options)->
-  width = options.hash.width
+  content = params[0]
-  height = options.hash.height
+  width = options.width
-  angle = options.hash.rotation || 0
+  height = options.height
+  angle = options.rotation || 0
   box_size = Math.sqrt((width * width) + (height * height))
   svg_head = "<svg width=\"100%\" height=\"100%\" viewBox=\"0 0 #{box_size} #{box_size}\">"
   group_head = "<g transform=\"translate(#{(box_size - width)/2}, #{(box_size - height)/2}) rotate(#{angle} #{width/2} #{height/2})\">"

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'

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'

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

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'

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'

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'

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

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"

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'

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

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

app/assets/javascripts/supplier/app/views/form_elements/select_minute_of_day_view.js.coffee

@@ -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)

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

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

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