From 055a1071db0be21104ff419a5b3964ad10a49f0f Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Wed, 14 May 2014 12:12:26 +0200 Subject: [PATCH] updates --- Gemfile | 2 +- Gemfile.lock | 21 ++++++---------- app/assets/images/icons/order-check.png | Bin 631 -> 346 bytes app/assets/images/icons/order-check.svg | 23 ++++++------------ app/assets/images/icons/order-doublecheck.png | Bin 1037 -> 499 bytes .../lists_index_controller.js.coffee | 9 ++++--- .../app/templates/active_order.emblem | 18 +++++++------- .../supplier/app/templates/lists/index.emblem | 6 ++++- .../supplier/foundation1/_qicons.css.sass | 4 ++- .../supplier/foundation1/_qstructure.css.sass | 5 ++++ app/models/list.rb | 1 + app/views/suppliers/lists/show.html.slim | 5 ++++ 12 files changed, 48 insertions(+), 46 deletions(-) diff --git a/Gemfile b/Gemfile index 871398b9..af8fd368 100644 --- a/Gemfile +++ b/Gemfile @@ -48,7 +48,7 @@ gem 'couch_potato' , github: 'bterkuile/couch_potato' gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored' gem 'orm_adapter', github: 'bterkuile/orm_adapter' gem 'devise' #, '3.1.0' #, '2.0.4' -gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' +#gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' gem "omniauth-facebook" gem 'simple_form' gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator' diff --git a/Gemfile.lock b/Gemfile.lock index 58e9431b..9855102e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,13 +16,6 @@ GIT couchbase-docstore (>= 0.1.2) couchbase-settings (>= 0.1.0) -GIT - remote: git://github.com/bterkuile/devise_simply_stored.git - revision: 8fdaed396a7e9566fe6cb59b64d950953c8506a6 - specs: - devise_simply_stored (0.1.0) - devise - GIT remote: git://github.com/bterkuile/orm_adapter.git revision: e0b5f652c8d1eda8c0f6636f3b3d17d598603450 @@ -37,6 +30,7 @@ PATH email_validator haml-rails jquery-rails + rails (>= 4.1.0) slim-rails tinymce-rails @@ -90,7 +84,7 @@ GEM barber (>= 0.4.1) emblem-source bcrypt (3.1.7) - bourbon (3.2.0) + bourbon (3.2.1) sass (~> 3.2) thor builder (3.2.2) @@ -160,7 +154,7 @@ GEM handlebars-source jquery-rails (>= 1.0.17) railties (>= 3.1) - ember-source (1.5.0) + ember-source (1.5.1.1) handlebars-source (~> 1.0) emblem-rails (0.2.1) barber-emblem (~> 0.1.1) @@ -184,10 +178,10 @@ GEM multi_json (>= 1.0.0) rack (>= 1.0.0) websocket-driver (>= 0.3.0) - faye-websocket (0.7.2) + faye-websocket (0.7.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.3.1) - font-awesome-rails (4.0.3.1) + font-awesome-rails (4.0.3.2) railties (>= 3.2, < 5.0) foundation-rails (5.2.2.0) railties (>= 3.1.0) @@ -237,7 +231,7 @@ GEM subexec (~> 0.2.1) mini_portile (0.5.3) minitest (5.3.3) - multi_json (1.9.2) + multi_json (1.9.3) multi_xml (0.5.5) multipart-post (2.0.0) nokogiri (1.6.1) @@ -368,7 +362,7 @@ GEM json (>= 1.8.0) warden (1.2.3) rack (>= 1.0) - websocket-driver (0.3.2) + websocket-driver (0.3.3) xpath (2.0.0) nokogiri (~> 1.3) yaji (0.3.5) @@ -388,7 +382,6 @@ DEPENDENCIES couchbase-structures! database_cleaner devise - devise_simply_stored! ember-rails ember-source emblem-rails diff --git a/app/assets/images/icons/order-check.png b/app/assets/images/icons/order-check.png index 719338ebeb7de34c07b0735eea3768f638184fb8..a4ff69da371064ee813a89534721669b1cf8e3cb 100644 GIT binary patch delta 245 zcmVH{4Iw5x-DFm7N7yn!PSThQJE&Hqkd zl19MC+I#|H;1CMs^O^t;N7B^;&AfMO!~yVfB$uISWuvSTtH4^w)lCZI`##0VZZ<+x891 zve+cFbaSbu>3`aa&wUv25sdfm@gFpX*|vSxFpRgMQ0QGEkq8JVm&?6Wuc&!} z_}mBXaXkEdSl+4ZtdAXxh>*=@@9DZ;VT?(XQWy*dA6(bHrfJ%)VHme4r9c@K1IJFM zQ{H>Ew{c<|rfFV^L?T^9Q7%wQLDXs{U^<4^YLlW32YJ+P^;DYF9ZNE^+!mj(~jdfKP}7Joa-l - + inkscape:window-maximized="1"> + inkscape:export-ydpi="24.829473" + style="fill:#000000;fill-opacity:1"> + style="fill:#000000;fill-opacity:1;stroke:none" /> A621E?8R%4OIOGpz0FF*^i5E}~% z1EOFNf`#H;*aT8o34w?pScqPL2oeHfdLbkM36fww)a139Jsf9ePR_}|)6Dzq^PioW zcejZMrx{JtoQH_m9pJeX5gWaUh!|Ozz*^Eo#q%8dxY?UKC4cA}BIzr}GtW~Tr}_bI zj10qg3Xe=5&?L{3K2WPYOpXFNht&dT2h+(jhoge$#n5ktvsfvF>|!Q)9#=pM#WTb8 zb~`fAmqN%dTuq)w70_aTUVeLy@djgQ?hHN`LiTVic^=?z!Sk}S@btj5>`<2z=u;si z@Do=sTLHbwL4R#OPvWrfz-9&1YP$kjYImjsOT>Hlb3%B2olAOM1LbFSzp~P{G4JC0 z0MOe(pwex8SO6a4R;pjbdI9wABv7%>{NFFXaXYJD#zr6L{V{2sdX3-}QcM>S7A{sDA`pVa0+K+pgH00{s|MNUMnLSTY1Ft{uL delta 942 zcmV;f15y0*1C0ofZGQubNklRuIw?L(2qB}E znx9Dx$mTNkGx^;=dys_8I;XvG9_~5cdq3x%d$|WV=kPq{AAj^41_uWXyJ?2r9Wocs zb?_WRmgSPRmbQh4wuS{+mP>ZhTo}JF?&? z?Qq{h2q6G~bARug`@nw0{wXCC5siSL6C_uwD}46-vxoN#^Lo8{+bgz+$z*a+jRMgK z5RJgb9~+tEa`HpYIX^vg`n`t6hA$|gD4z_~D8!fI)6-X`lXx#6+X89j5sd)J5uh4{=&#XluYP`Y zIKNlnWWBw;;}(nMa%pMlErihPoO9-OyAOE1-h0LujLlS|kk4Z?yQ#)vvE!j&Xx{Jl z58G_EFMkSN+1!dT1_29zMGTZtc(VLtBe|M%>-G9>tJOLwilTrq2I0V#CZQz0zczL4R51tu z06Cq`!&a;Hu_Q^NAP9gl20;)&Rn@h!va-rzAAe&Eo~}Iw{XsqCa=G92dVQ%Vib6qy z1xTinKi;^0BfvRl+wUH6&Y``%{Y-6b?bo6xVnGm~*zzDsDNm=jYgwysj8Y_j6D;ll!Brtw|4{m>ov~L&wrCh zB!9*TAq5~~46@m5E*_5uW@l%=OQlktOeT{ohA_rpb#?VlI2=B?8>mpm;?ddJIaXa= zJ%KUSA%wJ*m6cO-b93Q*-05__SXWo~&|olBVT@sYef{T|nVIAN2Lb@t@we{i=(spA zFtFLx)g|u~cez}3e!qXMudnYe0O - if @get('date') - @set('model', @store.find('list', date: @get('date'))) - else - @set('model', @store.find('list')) + @set 'loading', true + lists = if @get('date') then @store.find('list', date: @get('date')) else @store.find('list') + lists.then => @set('loading', false) + @set 'model', lists ).observes('date') lists: (-> @get('model')).property('model') diff --git a/app/assets/javascripts/supplier/app/templates/active_order.emblem b/app/assets/javascripts/supplier/app/templates/active_order.emblem index bb0afd75..93fcc2a5 100644 --- a/app/assets/javascripts/supplier/app/templates/active_order.emblem +++ b/app/assets/javascripts/supplier/app/templates/active_order.emblem @@ -2,22 +2,22 @@ td.status-icons span.active-order.fa.fa-check.fa-lg td {{view.content.display}} td.numeric.table_number - view Qsupplier.App.ActiveOrderTableNumberView contextBinding=view.content + view Qsupplier.App.ActiveOrderTableNumberView contextBinding="view.content" td.section_title {{view.content.section.title}} td.currency {{currency view.content.total }} td.actions if view.content.placed - button.mark_order_active{ action markOrderActive view.content.id} + /button.mark_order_active{ action markOrderActive view.content.id} span.fa.fa-check.fa-2x - span.button-text=t 'order.being_processed' - button.hide.mark-order-active{ action markOrderActive view.content.id} + /span.button-text=t 'order.being_processed' + /button.hide.mark-order-active{ action markOrderActive view.content.id} span.button-icon span.button-text=t 'order.being_processed' - button.mark_order_delivered{ action markOrderDelivered view.content.id} + /button.mark_order_delivered{ action markOrderDelivered view.content.id} span.fa-shifted-stack - i.fa.fa-check.fa-2x - i.fa.fa-check.fa-2x - span.button-text= t 'order.being_served' - button.hide.mark-order-delivered{ action markOrderDelivered view.content.id} + i.fa.fa-check.fa-stack-2x + i.fa.fa-check.fa-stack-2x + /span.button-text= t 'order.being_served' + /button.hide.mark-order-delivered{ action markOrderDelivered view.content.id} span.button-icon span.button-text= t 'order.being_served' diff --git a/app/assets/javascripts/supplier/app/templates/lists/index.emblem b/app/assets/javascripts/supplier/app/templates/lists/index.emblem index a5aff500..e1805e72 100644 --- a/app/assets/javascripts/supplier/app/templates/lists/index.emblem +++ b/app/assets/javascripts/supplier/app/templates/lists/index.emblem @@ -25,4 +25,8 @@ if lists td.timestamp=time list.created_at else .row - .panel=t 'list.none_found' + .panel + if loading + span.loading + else + =t 'list.none_found' diff --git a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass index 38704154..76cc4e5f 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qicons.css.sass @@ -24,11 +24,13 @@ span.icon background-image: image-url('icons/order-doublecheck.png') .fa-shifted-stack + @extend .fa-stack +//.fa-shifted-stack position: relative display: inline-block width: 2.5em height: 2em - line-height: 2em + //line-height: 2em vertical-align: middle .fa position: absolute diff --git a/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass b/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass index 51f64c9b..3eed2242 100644 --- a/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_qstructure.css.sass @@ -50,3 +50,8 @@ main.main-section .hide, .hidden display: none +span.loading + @extend .fa + @extend .fa-spinner + @extend .fa-lg + @extend .fa-spin diff --git a/app/models/list.rb b/app/models/list.rb index 3c3f802f..dc6229ab 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -209,6 +209,7 @@ class List #order.section_id = self.section_id #order.save #end + # user performs a client side refresh broadcast_users 'list_changed_table', list_id: id #, from_table_id: from_table, to_table_id: to_table.id broadcast_supplier supplier_id, 'list_changed_table', list: as_json, section_title: to_table.section.try(:title), from_table_id: from_table end diff --git a/app/views/suppliers/lists/show.html.slim b/app/views/suppliers/lists/show.html.slim index e70042d7..a8c6b0a6 100644 --- a/app/views/suppliers/lists/show.html.slim +++ b/app/views/suppliers/lists/show.html.slim @@ -35,3 +35,8 @@ /jQuery(function(){ /Qsupplier.load_list('#{@list.id}'); /}) +.test-div + span.fa.fa-square-o.fa-2x + span.fa-stack + i.fa.fa-square-o.fa-stack-2x + i.fa.fa-twitter.fa-stack-1x