From f91c5660a087f982cd61498ca9496cb4e50b26c0 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Sun, 10 Aug 2014 09:12:30 +0200 Subject: [PATCH] more mozo.bar rebranding --- app/assets/images/frames/smartphone.svg | 44 +++++----- app/assets/images/frames/tablet.svg | 24 +++--- app/assets/images/icons/list.svg | 14 +-- app/assets/images/icons/menu.svg | 2 +- app/assets/images/icons/needs-help.svg | 4 +- app/assets/images/icons/needs-payment.svg | 4 +- app/assets/images/icons/order-check.svg | 6 +- app/assets/images/icons/orders-queue.svg | 26 +++--- app/assets/images/icons/section-table.svg | 2 +- app/assets/images/logo.svg | 86 +++++++++---------- app/assets/images/scan-logo.svg | 6 +- .../supplier/settings/location-balloon.svg | 6 +- app/assets/images/textures/wood7.svg | 2 +- app/helpers/application_helper.rb | 4 + app/views/layouts/waiter.html.slim | 2 +- app/views/supplier_mailer/creation.html.slim | 10 +-- app/views/theme1/_social.html.slim | 4 +- app/views/user/ember.html.slim | 13 --- config/locales/devise.en.yml | 6 +- config/locales/devise.nl.yml | 8 +- config/locales/mailer.nl.yml | 4 +- config/locales/nl.yml | 8 +- config/locales/site.en.yml | 6 +- config/locales/site.nl.yml | 4 +- config/locales/user.en.yml | 4 +- config/locales/user.nl.yml | 2 +- faye/config.ru | 2 +- 27 files changed, 147 insertions(+), 156 deletions(-) delete mode 100644 app/views/user/ember.html.slim diff --git a/app/assets/images/frames/smartphone.svg b/app/assets/images/frames/smartphone.svg index 46211083..c502803f 100644 --- a/app/assets/images/frames/smartphone.svg +++ b/app/assets/images/frames/smartphone.svg @@ -19,7 +19,7 @@ style="fill-rule:evenodd" inkscape:version="0.48.2 r9819" sodipodi:docname="smartphone.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/frames/smartphone.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/frames/smartphone.png" inkscape:export-xdpi="82.529999" inkscape:export-ydpi="82.529999"> pm diff --git a/app/assets/images/frames/tablet.svg b/app/assets/images/frames/tablet.svg index e42bcba5..bcce788b 100644 --- a/app/assets/images/frames/tablet.svg +++ b/app/assets/images/frames/tablet.svg @@ -491,7 +491,7 @@ y="-774" rx="61" ry="61" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/frames/tablet.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/frames/tablet.png" inkscape:export-xdpi="72.491959" inkscape:export-ydpi="72.491959" /> diff --git a/app/assets/images/icons/list.svg b/app/assets/images/icons/list.svg index 563063ee..c0892dac 100644 --- a/app/assets/images/icons/list.svg +++ b/app/assets/images/icons/list.svg @@ -16,7 +16,7 @@ version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="list.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/list.png" inkscape:export-xdpi="21.969999" inkscape:export-ydpi="21.969999"> @@ -431,7 +431,7 @@ transform="translate(20.677116,67.573668)" width="128" height="128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/order-doublecheck.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/order-doublecheck.png" inkscape:export-xdpi="24.829473" inkscape:export-ydpi="24.829473" /> diff --git a/app/assets/images/icons/orders-queue.svg b/app/assets/images/icons/orders-queue.svg index f559c1b9..87e06bca 100644 --- a/app/assets/images/icons/orders-queue.svg +++ b/app/assets/images/icons/orders-queue.svg @@ -54,7 +54,7 @@ id="path3275" style="fill:#000000" inkscape:connector-curvature="0" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/orders-queue.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/orders-queue.png" inkscape:export-xdpi="3.6865311" inkscape:export-ydpi="3.6865311" /> diff --git a/app/assets/images/icons/section-table.svg b/app/assets/images/icons/section-table.svg index c6722898..bb3e2f8b 100644 --- a/app/assets/images/icons/section-table.svg +++ b/app/assets/images/icons/section-table.svg @@ -15,7 +15,7 @@ version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="section-table.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/section-table.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/section-table.png" inkscape:export-xdpi="11.09" inkscape:export-ydpi="11.09"> </clipPath> - - - - - - - - + + + + + + + + <clipPath id="SVGID_2_-0"><use id="use27-0" @@ -276,7 +276,7 @@ transform="matrix(0.48420519,0,0,0.48420519,-3.826694,-4.5856657)"><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" @@ -285,7 +285,7 @@ style="fill:#ffffff" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" @@ -294,7 +294,7 @@ style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461" @@ -303,7 +303,7 @@ style="fill:#634227" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535" @@ -312,7 +312,7 @@ style="fill:#634227" /><circle inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" stroke-miterlimit="10" @@ -328,7 +328,7 @@ d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369" @@ -337,7 +337,7 @@ style="fill:#231f20" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354" @@ -347,7 +347,7 @@ transform="matrix(0.28480773,0,0,0.28480773,-1.8388528,48.736267)" inkscape:export-ydpi="413.97891" inkscape:export-xdpi="413.97891" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png" id="g3013"><path style="fill:#ffffff" inkscape:connector-curvature="0" @@ -355,7 +355,7 @@ d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /><path style="fill:none;stroke:#634227;stroke-width:1.63800001" @@ -364,7 +364,7 @@ d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /><path style="fill:#634227" @@ -373,7 +373,7 @@ d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /><path style="fill:#634227" @@ -382,7 +382,7 @@ d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /><circle d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" @@ -398,7 +398,7 @@ stroke-miterlimit="10" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /><path style="fill:#231f20" @@ -407,7 +407,7 @@ d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /><path style="fill:#231f20" @@ -416,13 +416,13 @@ d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354" clip-path="url(#SVGID_2_-0)" transform="translate(-4208.3103,-4204.1921)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" inkscape:export-xdpi="112.82128" inkscape:export-ydpi="112.82128" /></g> <text inkscape:export-ydpi="413.97891" inkscape:export-xdpi="413.97891" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png" style="font-size:16.97958755px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1" y="65.718628" x="20.321514" @@ -461,7 +461,7 @@ inkscape:export-ydpi="449.67291"><text inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" style="font-size:11.99999905px" y="72.998604" x="25.180241" @@ -474,7 +474,7 @@ <text inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" y="72.998604" x="52.053089" style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold" @@ -490,7 +490,7 @@ inkscape:export-ydpi="449.67291"><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" @@ -499,7 +499,7 @@ style="fill:#ffffff" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" @@ -508,7 +508,7 @@ style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461" @@ -517,7 +517,7 @@ style="fill:#634227" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535" @@ -526,7 +526,7 @@ style="fill:#634227" /><circle inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" stroke-miterlimit="10" @@ -542,7 +542,7 @@ d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369" @@ -551,7 +551,7 @@ style="fill:#231f20" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0-7)" d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354" @@ -559,13 +559,13 @@ inkscape:connector-curvature="0" style="fill:#231f20" /></g><g id="g3086" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png" inkscape:export-xdpi="413.97891" inkscape:export-ydpi="413.97891" transform="matrix(0.28480773,0,0,0.28480773,-1.7053156,68.232696)"><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" @@ -574,7 +574,7 @@ style="fill:#ffffff" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4239.495,4221.196 c 0,0 -5.676,0 -5.676,5.676 v 33.539 c 0,0 0,5.676 5.676,5.676 h 33.797 c 0,0 5.676,0 5.676,-5.676 v -33.539 c 0,0 0,-5.676 -5.676,-5.676 h -33.797 z" @@ -583,7 +583,7 @@ style="fill:none;stroke:#634227;stroke-width:1.63800001" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4255.337,4249.788 c 0,0 0.091,12.386 -0.011,12.69 -0.18,0.539 -0.57,0.655 -1.942,0.671 -0.963,0.012 -2.048,0.077 -2.048,-1.073 0,-2.093 -0.01,-7.585 -0.022,-7.922 -0.013,-0.338 -1.305,-0.579 -1.305,0.079 0,1.5 0.077,7.812 -0.138,8.294 -0.24,0.87 -3.642,1.007 -4.057,-0.226 -0.435,-1.29 0,-12.284 0,-12.284 0,0 -0.902,-0.461 -0.902,-1.127 v -5.356 c -0.073,-0.544 -2.882,4.036 -3.287,4.484 -1.137,1.071 -3.071,0.437 -2.235,-1.946 0.121,-0.244 4.805,-7.985 5.635,-9.016 0.371,-0.461 1.658,-0.386 2.742,-0.271 0.714,0.077 1.315,3.538 1.991,5.343 0.677,1.803 0.677,1.803 1.466,0.225 0.789,-1.578 2.113,-4.957 2.254,-5.185 0.232,-0.376 1.69,-0.503 2.239,-0.165 0.989,0.607 3.96,3.434 3.96,3.434 l 2.367,-3.381 h -4.96 c 0,0 -1.467,-1.127 0.451,-1.014 1.916,0.111 15.666,0 15.666,0 0,0 0.9,1.014 0,1.014 h -6.988 l -4.846,6.478 c 0,0 -0.563,1.52 -2.48,0 -1.915,-1.519 -2.607,-2.068 -2.725,-1.97 0.02,0.257 0,6.763 0,6.763 0,0 0.076,1.236 -0.825,1.461" @@ -592,7 +592,7 @@ style="fill:#634227" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4255.833,4230.169 c 0,3.059 -2.479,5.536 -5.536,5.536 -3.057,0 -5.536,-2.478 -5.536,-5.536 0,-3.058 2.479,-5.535 5.536,-5.535 3.057,0 5.536,2.477 5.536,5.535" @@ -601,7 +601,7 @@ style="fill:#634227" /><circle inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" stroke-miterlimit="10" @@ -617,7 +617,7 @@ d="m 4255.8329,4230.1689 c 0,3.0575 -2.4786,5.536 -5.536,5.536 -3.0575,0 -5.536,-2.4785 -5.536,-5.536 0,-3.0574 2.4785,-5.536 5.536,-5.536 3.0574,0 5.536,2.4786 5.536,5.536 z" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4250.515,4236.479 c 0.061,-0.155 2.532,-1.205 2.672,-1.102 0.139,0.104 0.434,2.063 0.228,2.369" @@ -626,7 +626,7 @@ style="fill:#231f20" /><path inkscape:export-ydpi="112.82128" inkscape:export-xdpi="112.82128" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-medium.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-medium.png" transform="translate(-4208.3103,-4204.1921)" clip-path="url(#SVGID_2_-0)" d="m 4251.332,4236.363 c -0.096,-0.136 -2.748,-0.556 -2.858,-0.422 -0.111,0.134 0.076,2.106 0.351,2.354" @@ -638,7 +638,7 @@ x="20.455051" y="85.215057" style="font-size:16.97958755px;line-height:139.99999762%;fill:#7bb459;fill-opacity:1" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/logo-text.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/icons/logo-text.png" inkscape:export-xdpi="413.97891" inkscape:export-ydpi="413.97891"><tspan x="20.455051" @@ -649,4 +649,4 @@ dx="0 0 0 0"><tspan id="tspan3106" style="fill:#ffffff;fill-opacity:1">MOZO</tspan>.BAR</tspan></text> -</svg> \ No newline at end of file +</svg> diff --git a/app/assets/images/scan-logo.svg b/app/assets/images/scan-logo.svg index b1612c9f..45bbce9e 100644 --- a/app/assets/images/scan-logo.svg +++ b/app/assets/images/scan-logo.svg @@ -67,13 +67,13 @@ x="180" y="153.2193" ry="29.722948" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/scan-logo.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/scan-logo.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001" /> <g id="g4471" transform="translate(206,179.2193)" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/qr.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/qr.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001"> <rect @@ -2324,7 +2324,7 @@ y="514.93365" id="text4793" sodipodi:linespacing="125%" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/scan-logo.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/scan-logo.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001"><tspan sodipodi:role="line" diff --git a/app/assets/images/supplier/settings/location-balloon.svg b/app/assets/images/supplier/settings/location-balloon.svg index b635604f..7ce761fc 100644 --- a/app/assets/images/supplier/settings/location-balloon.svg +++ b/app/assets/images/supplier/settings/location-balloon.svg @@ -22,7 +22,7 @@ id="svg2" inkscape:version="0.48.2 r9819" sodipodi:docname="location-balloon.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/supplier/settings/location-balloon.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/supplier/settings/location-balloon.png" inkscape:export-xdpi="68.059998" inkscape:export-ydpi="68.059998"><metadata id="metadata89"><rdf:RDF><cc:Work @@ -173,14 +173,14 @@ id="path61" d="m 8049.1044,11195.532 c -814,0 -1628,415 -1628,831 l 0,622 0,623 0,848 0,623 0,622 c 0,416 814,832 1628,832 0,0 -257.6153,652.507 -500.6945,891.35 -675.1155,663.349 -2499.654,1346.866 -2499.654,1346.866 0,0 1937.451,-380.518 2845.1246,-752.656 922.8078,-378.343 2597.2245,-1485.56 2597.2245,-1485.56 l 1659.999,0 1221,0 1221,0 c 814,0 1629,-416 1629,-832 l 0,-622 0,-623 0,-848 0,-623 0,-622 c 0,-416 -815,-831 -1629,-831 l -1221,0 -1221,0 -1659.999,0 -1221.0005,0 z" sodipodi:nodetypes="ssccccscacacccssccccssccccs" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/supplier/settings/location-balloon.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/supplier/settings/location-balloon.png" inkscape:export-xdpi="68.059998" inkscape:export-ydpi="68.059998" /><text id="text63" class="TextShape" x="321.10446" y="1095.5328" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/supplier/settings/location-balloon.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/supplier/settings/location-balloon.png" inkscape:export-xdpi="68.059998" inkscape:export-ydpi="68.059998"><tspan style="font-size:1128px;font-weight:400;font-family:'Arial, sans-serif'" diff --git a/app/assets/images/textures/wood7.svg b/app/assets/images/textures/wood7.svg index bfecfbe0..39cdccef 100644 --- a/app/assets/images/textures/wood7.svg +++ b/app/assets/images/textures/wood7.svg @@ -21,7 +21,7 @@ id="svg2" inkscape:version="0.48.2 r9819" sodipodi:docname="wood7.svg" - inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/textures/wood7.png" + inkscape:export-filename="/Users/bterkuile/companytools/development/rails/mozo_bar/app/assets/images/textures/wood7.png" inkscape:export-xdpi="44.700001" inkscape:export-ydpi="44.700001"><metadata id="metadata13557"><rdf:RDF><cc:Work diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0015ee26..a2883a27 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -54,6 +54,10 @@ module ApplicationHelper application_title end + def waiter_page_title + application_title + end + # Helper for displaying HTML currency values def currency(amount, opts={}) amount ||= 0.0 diff --git a/app/views/layouts/waiter.html.slim b/app/views/layouts/waiter.html.slim index f47f3f9d..c3aa50d3 100644 --- a/app/views/layouts/waiter.html.slim +++ b/app/views/layouts/waiter.html.slim @@ -4,7 +4,7 @@ html lang="en" meta charset="utf-8" meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" meta name="viewport" content="width=device-width, initial-scale=1.0" - title Qwaiter + title= waiter_page_title /= stylesheet_link_tag "waiter/application", media: "all" = stylesheet_link_tag "waiter/application" = javascript_include_tag "vendor/modernizr" diff --git a/app/views/supplier_mailer/creation.html.slim b/app/views/supplier_mailer/creation.html.slim index 744490f5..64e42ed1 100644 --- a/app/views/supplier_mailer/creation.html.slim +++ b/app/views/supplier_mailer/creation.html.slim @@ -1,19 +1,19 @@ h2= t('mailer.supplier.creation.title', name: @supplier.name) p | - Welkom bij Qwaiter! Leuk dat je gebruik wil maken van bestellen via de smartphone. De eerste stap is gezet! Maak je gebruik van een reeds - bestaand kassasysteem dan is de kans groot dat Qwaiter deze ondersteunt. Selecteer in - dit geval eerst je kassasysteem. De inrichting van Qwaiter zich hierop zal + Welkom bij mozo.bar! Leuk dat je gebruik wil maken van bestellen via de smartphone. De eerste stap is gezet! Maak je gebruik van een reeds + bestaand kassasysteem dan is de kans groot dat mozo.bar deze ondersteunt. Selecteer in + dit geval eerst je kassasysteem. De inrichting van mozo.bar zich hierop zal aanpassen. p | - Wij van Qwaiter hopen dat dit een waardevolle toevoeging op je bedrijf zal zijn en + Wij van mozo.bar hopen dat dit een waardevolle toevoeging op je bedrijf zal zijn en zullen er alles aan doen om de relatie zo aangenaam mogelijk te maken. p br | Met vriendelijke groet, br br - | Qwaiter + | mozo.bar br = link_to 'mozo.bar', root_url, style: "color:#FAA732" diff --git a/app/views/theme1/_social.html.slim b/app/views/theme1/_social.html.slim index f511294c..106ab857 100644 --- a/app/views/theme1/_social.html.slim +++ b/app/views/theme1/_social.html.slim @@ -1,7 +1,7 @@ .social - a.wsite-social-facebook href="https://www.facebook.com/Qwaiter" target=:_blank + a.wsite-social-facebook href="https://www.facebook.com/mozo.bar" target=:_blank span.wsite-social-inner - a.wsite-social-twitter href="https://twitter.com/qwaiter" target=:_blank + a.wsite-social-twitter href="https://twitter.com/mozo.bar" target=:_blank span.wsite-social-inner a.wsite-social-linkedin href="http://www.linkedin.com/company/2801351" target=:_blank span.wsite-social-inner diff --git a/app/views/user/ember.html.slim b/app/views/user/ember.html.slim deleted file mode 100644 index f47f3f9d..00000000 --- a/app/views/user/ember.html.slim +++ /dev/null @@ -1,13 +0,0 @@ -doctype html -html lang="en" - head - meta charset="utf-8" - meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" - meta name="viewport" content="width=device-width, initial-scale=1.0" - title Qwaiter - /= stylesheet_link_tag "waiter/application", media: "all" - = stylesheet_link_tag "waiter/application" - = javascript_include_tag "vendor/modernizr" - = javascript_include_tag "waiter/application" - body - #ember-app-container diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 1cbd6104..c272abf3 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -19,15 +19,15 @@ en: timeout: "Your session expired. Please sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." unconfirmed: "You have to confirm your account before continuing." - not_found_in_database: "You are not yet known in our system. Sign up to use Qwaiter!" + not_found_in_database: "You are not yet known in our system. Sign up to use mozo.bar!" mailer: confirmation_instructions: supplier_subject: "Confirmation instructions2" supplier: - salutation: "Welcome to Qwaiter %{email}!" + salutation: "Welcome to mozo.bar %{email}!" body: | <p> - You requested a Qwaiter account or want to change data that need reconfirmation. + You requested a mozo.bar account or want to change data that need reconfirmation. If this is not wat you requested please ignore this email.<br> To activate your account click the link below:<br> <br> diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml index 1e1386d6..cd59dd37 100644 --- a/config/locales/devise.nl.yml +++ b/config/locales/devise.nl.yml @@ -27,7 +27,7 @@ nl: invalid_token: 'Invalid authentication token.' timeout: 'Uw sessie is verlopen. U moet opnieuw inloggen om verder te gaan.' inactive: 'Your account was not activated yet.' - not_found_in_database: "Je bent nog niet bij ons bekend. Meld je aan om Qwaiter te kunnen gebruiken!" + not_found_in_database: "Je bent nog niet bij ons bekend. Meld je aan om mozo.bar te kunnen gebruiken!" sessions: title: Inloggen voor horeca button: Inloggen @@ -77,14 +77,14 @@ nl: subject: 'Bevestigingsinstructies' #supplier_subject: "Confirmation instructions" supplier: - salutation: "Welkom bij Qwaiter %{email}!" + salutation: "Welkom bij mozo.bar %{email}!" body: | <p> - Je hebt een account aangevraag bij Qwaiter of wil een wijziging doorvoeren waarvoor bevestiging nodig is. + Je hebt een account aangevraag bij mozo.bar of wil een wijziging doorvoeren waarvoor bevestiging nodig is. Als dit niet de bedoeling is kan je deze email negeren.<br> Om je account te activeren of de aangevraagde wijziging door te voeren moet je op de bevestigingslink hieronder klikken:<br> <br> - <a href="%{confirm_url}">Bevestig mijn Qwaiter account of verandering %{unconfirmed_email}</a> + <a href="%{confirm_url}">Bevestig mijn mozo.bar account of verandering %{unconfirmed_email}</a> </p> reset_password_instructions: subject: 'Wachtwoord reset instructies' diff --git a/config/locales/mailer.nl.yml b/config/locales/mailer.nl.yml index aa269f37..cf5596ab 100644 --- a/config/locales/mailer.nl.yml +++ b/config/locales/mailer.nl.yml @@ -2,5 +2,5 @@ nl: mailer: supplier: creation: - subject: 'Weklom bij Qwaiter' - title: 'De aanmelding van %{name} bij Qwaiter is gelukt!' + subject: 'Weklom bij mozo.bar' + title: 'De aanmelding van %{name} bij mozo.bar is gelukt!' diff --git a/config/locales/nl.yml b/config/locales/nl.yml index a7203b86..b868e8e7 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -3,7 +3,7 @@ nl: menu: home: Home - about: Over Qwaiter + about: Over mozo.bar bars_restaurants: 'Horeca' clients: Gebruikers enquete: Enquete @@ -59,11 +59,11 @@ nl: edit: label: Bewerk %{model} create: - successfull: '%{model} is succesvol aangemaakt' + successfull: '%{model} is succesvol aangemaakt' update: - successfull: '%{model} is succesvol aangepast' + successfull: '%{model} is succesvol aangepast' destroy: - successfull: '%{model} is succesvol verwijderd' + successfull: '%{model} is succesvol verwijderd' table: is_occupied: Deze tafel is bezet general: diff --git a/config/locales/site.en.yml b/config/locales/site.en.yml index d67d4a56..209a7aba 100644 --- a/config/locales/site.en.yml +++ b/config/locales/site.en.yml @@ -2,11 +2,11 @@ en: site: home: introduction: > - Welcome on the Qwaiter homepage. Qwaiter is an application that lets you place orders - by simply scanning a code from a table on a terrace or a restaurant. Then directly the + Welcome on the mozo.bar homepage. Mozo.bar is an application that lets you place orders + by simply scanning a code from a table on a terrace or a restaurant. Then directly the menu appears and you can place your order. See the progress while you wait for your drinks! development: > - Momenteel is Qwaiter in de ontwikkelingsfase. Dit houdt in dat er nog veel moet gebeuren en dat we + Momenteel is mozo.bar in de ontwikkelingsfase. Dit houdt in dat er nog veel moet gebeuren en dat we volledig open staan voor alle input die we kunnen krijgen. Onze missie is om zowel klant als kroegeigenaar blij te maken met de mogelijkheden die deze tijd ons biedt. enroll: diff --git a/config/locales/site.nl.yml b/config/locales/site.nl.yml index f4f2c190..9ed6528c 100644 --- a/config/locales/site.nl.yml +++ b/config/locales/site.nl.yml @@ -2,11 +2,11 @@ nl: site: home: introduction: > - Welkom bij de Qwaiter website! Qwaiter is een mobiele app waarmee je gemakkelijk bestellingen + Welkom bij de mozo.bar website! Mozo.bar is een mobiele app waarmee je gemakkelijk bestellingen kan doen op terrassen, in bars of restaurants. Scan een Qr code op de tafel, en krijg meteen het menu te zien. Klik aan wat je wilt hebben en bestel. Dat is alles! development: > - Momenteel is Qwaiter in de ontwikkelingsfase. Dit houdt in dat er nog veel moet gebeuren en dat we + Momenteel is mozo.bar in de ontwikkelingsfase. Dit houdt in dat er nog veel moet gebeuren en dat we volledig open staan voor alle input die we kunnen krijgen. Onze missie is om zowel klant als kroegeigenaar blij te maken met de mogelijkheden die deze tijd ons biedt. enroll: diff --git a/config/locales/user.en.yml b/config/locales/user.en.yml index cb6c024f..f81d5f3b 100644 --- a/config/locales/user.en.yml +++ b/config/locales/user.en.yml @@ -55,13 +55,13 @@ en: home: scan_qr: Scan qr code show_active_list: Show my orders - show_active_list_products: Go to the menu + show_active_list_products: Go to the menu basket: total: Total product_category: other_name: Overig obtain_token: - title: Authenticate Qwaiter + title: Authenticate mozo.bar obtain: Authenticate invalid_combination: The email password combination is incorrect move_table: diff --git a/config/locales/user.nl.yml b/config/locales/user.nl.yml index 2bae57b7..2d0e264c 100644 --- a/config/locales/user.nl.yml +++ b/config/locales/user.nl.yml @@ -59,7 +59,7 @@ nl: product_category: other_name: Overig obtain_token: - title: Aanmelden bij Qwaiter + title: Aanmelden bij mozo.bar obtain: Aanmelden invalid_combination: De inloggegevens zijn onjuist move_table: diff --git a/faye/config.ru b/faye/config.ru index b0eeb680..bb391d50 100644 --- a/faye/config.ru +++ b/faye/config.ru @@ -1,6 +1,6 @@ require 'faye' #require File.expand_path('../config/initializers/faye_token.rb', __FILE__) -setproctitle('qwaiter_faye') if respond_to?(:setproctitle) +setproctitle('mozo_faye') if respond_to?(:setproctitle) class ServerAuth def incoming(message, callback) if message['channel'] !~ %r{^/meta/}