bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

day work towards ios and qr optimization

Browse Source
This commit is contained in:
Benjamin ter Kuile
2012-12-11 00:48:29 +01:00
parent 7d0afde69f
commit 7f27d043eb
18 changed files with 287 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/images/icons/list.svg
+191 -198
View File
@@ -17,8 +17,8 @@
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-xdpi="21.549999"
inkscape:export-ydpi="21.549999">
inkscape:export-xdpi="21.969999"
inkscape:export-ydpi="21.969999">
<defs
id="defs4">
<inkscape:perspective
@@ -257,15 +257,6 @@
id="linearGradient3982"
xlink:href="#linearGradient3871"
inkscape:collect="always" />
<filter
color-interpolation-filters="sRGB"
id="filter3973"
inkscape:collect="always">
<feGaussianBlur
id="feGaussianBlur3975"
stdDeviation="0.44890625"
inkscape:collect="always" />
</filter>
<linearGradient
gradientUnits="userSpaceOnUse"
y2="59.765625"
@@ -411,9 +402,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.7229687"
inkscape:cx="263.89128"
inkscape:cy="751.15645"
inkscape:zoom="5.4034885"
inkscape:cx="267.28853"
inkscape:cy="743.43684"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -438,188 +429,178 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<rect
style="fill:#ffffff;stroke:#000000;stroke-width:1.04734886000000005;stroke-opacity:1;fill-opacity:1"
id="rect3051"
width="99.144157"
height="127.89697"
x="214.3192"
y="228.78799"
ry="0" />
<g
transform="translate(248.5426,213.07744)"
id="layer1-0"
inkscape:label="Layer 1">
<path
transform="translate(10,20)"
d="m 50,22.362183 c 0,11.045695 -8.954305,20 -20,20 -11.045695,0 -20,-8.954305 -20,-20 0,-11.045695 8.954305,-20.0000004 20,-20.0000004 11.045695,0 20,8.9543054 20,20.0000004 z"
sodipodi:ry="20"
sodipodi:rx="20"
sodipodi:cy="22.362183"
sodipodi:cx="30"
id="path2822"
style="fill:none;stroke:#000000;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc"
id="path3598"
d="m 40,27.362183 0,15"
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
inkscape:transform-center-x="2.8990745"
inkscape:transform-center-y="-6.9170341"
sodipodi:nodetypes="cc"
id="path3598-1"
d="M 34.201851,28.528114 40,42.362183"
style="fill:none;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
inkscape:transform-center-x="-14"
id="path3624"
d="m 55,42.362183 -2,0"
style="fill:none;stroke:#000000;stroke-width:0.63245553px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<use
inkscape:transform-center-y="-7.0000005"
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3666"
inkscape:transform-center-x="-12.124355"
xlink:href="#path3624"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3668"
inkscape:transform-center-y="-12.124356"
inkscape:transform-center-x="-6.9999986"
xlink:href="#use3666"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822107,25.675456)"
id="use3670"
inkscape:transform-center-y="-14"
xlink:href="#use3668"
y="0"
x="0" />
<use
inkscape:transform-center-x="7.0000006"
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3672"
inkscape:transform-center-y="-12.124356"
xlink:href="#use3670"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3674"
inkscape:transform-center-y="-7"
inkscape:transform-center-x="12.124357"
xlink:href="#use3672"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3676"
inkscape:transform-center-x="14.000002"
xlink:href="#use3674"
y="0"
x="0" />
<use
inkscape:transform-center-y="7.0000005"
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3678"
inkscape:transform-center-x="12.124358"
xlink:href="#use3676"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675457)"
id="use3680"
inkscape:transform-center-y="12.124358"
inkscape:transform-center-x="7.000002"
xlink:href="#use3678"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3682"
inkscape:transform-center-y="14.000002"
xlink:href="#use3680"
y="0"
x="0" />
<use
inkscape:transform-center-x="-7.0000008"
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3684"
inkscape:transform-center-y="12.124357"
xlink:href="#use3682"
y="0"
x="0" />
<use
height="1052.3622"
width="744.09448"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-15.822108,25.675456)"
id="use3686"
inkscape:transform-center-y="7.0000005"
inkscape:transform-center-x="-12.124357"
xlink:href="#use3684"
y="0"
x="0" />
<rect
ry="0.30924171"
inkscape:transform-center-y="-28.341734"
y="18.6616"
x="38.124062"
height="2.5765221"
width="3.7518768"
id="rect3688"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.74812317;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
transform="matrix(0.8660254,-0.5,0.5,0.8660254,0,0)"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="use3694"
width="4"
height="2.0000007"
x="11.459925"
y="33.686726"
inkscape:transform-center-y="-22" />
<rect
transform="matrix(0.8660254,0.5,-0.5,0.8660254,0,0)"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="use3696"
width="4"
height="2.0000007"
x="53.822105"
y="-6.3132739"
inkscape:transform-center-y="-22" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:7.69999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc"
style="fill:none;stroke:#7bb459;stroke-width:3.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2822"
sodipodi:cx="30"
sodipodi:cy="22.362183"
sodipodi:rx="20"
sodipodi:ry="20"
d="m 50,22.362183 a 20,20 0 1 1 -40,0 20,20 0 1 1 40,0 z"
transform="translate(258.5426,233.07744)" />
<path
style="fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 288.5426,240.43962 0,15"
id="path3598"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 282.74445,241.60555 5.79815,13.83407"
id="path3598-1"
sodipodi:nodetypes="cc"
inkscape:transform-center-y="-6.9170341"
inkscape:transform-center-x="2.8990745"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:0.63245553px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 303.5426,255.43962 -2,0"
id="path3624"
inkscape:transform-center-x="-14"
inkscape:connector-curvature="0" />
<use
x="0"
y="0"
xlink:href="#path3624"
inkscape:transform-center-x="-12.124355"
id="use3666"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622"
inkscape:transform-center-y="-7.0000005" />
<use
x="0"
y="0"
xlink:href="#use3666"
inkscape:transform-center-x="-6.9999986"
inkscape:transform-center-y="-12.124356"
id="use3668"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622" />
<use
x="0"
y="0"
xlink:href="#use3668"
inkscape:transform-center-y="-14"
id="use3670"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062432,178.49372)"
width="744.09448"
height="1052.3622" />
<use
x="0"
y="0"
xlink:href="#use3670"
inkscape:transform-center-y="-12.124356"
id="use3672"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622"
inkscape:transform-center-x="7.0000006" />
<use
x="0"
y="0"
xlink:href="#use3672"
inkscape:transform-center-x="12.124357"
inkscape:transform-center-y="-7"
id="use3674"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622" />
<use
x="0"
y="0"
xlink:href="#use3674"
inkscape:transform-center-x="14.000002"
id="use3676"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622" />
<use
x="0"
y="0"
xlink:href="#use3676"
inkscape:transform-center-x="12.124358"
id="use3678"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622"
inkscape:transform-center-y="7.0000005" />
<use
x="0"
y="0"
xlink:href="#use3678"
inkscape:transform-center-x="7.000002"
inkscape:transform-center-y="12.124358"
id="use3680"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622" />
<use
x="0"
y="0"
xlink:href="#use3680"
inkscape:transform-center-y="14.000002"
id="use3682"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622" />
<use
x="0"
y="0"
xlink:href="#use3682"
inkscape:transform-center-y="12.124357"
id="use3684"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622"
inkscape:transform-center-x="-7.0000008" />
<use
x="0"
y="0"
xlink:href="#use3684"
inkscape:transform-center-x="-12.124357"
inkscape:transform-center-y="7.0000005"
id="use3686"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-89.062433,178.49372)"
width="744.09448"
height="1052.3622" />
<rect
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.74812317;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="rect3688"
width="3.7518768"
height="2.5765221"
x="286.66666"
y="231.73904"
inkscape:transform-center-y="-28.341734"
ry="0.30924171" />
<rect
inkscape:transform-center-y="-22"
y="342.48849"
x="120.16541"
height="2.0000007"
width="4"
id="use3694"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="matrix(0.8660254,-0.5,0.5,0.8660254,0,0)" />
<rect
inkscape:transform-center-y="-22"
y="53.9459"
x="375.60504"
height="2.0000007"
width="4"
id="use3696"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
transform="matrix(0.8660254,0.5,-0.5,0.8660254,0,0)" />
<path
style="fill:none;stroke:#7bb459;stroke-width:7.69999980999999867;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 230.34414,285.62038 68.07145,0"
id="path3821"
inkscape:connector-curvature="0" />
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
<use
x="0"
y="0"
@@ -627,7 +608,10 @@
id="use3823"
transform="translate(0,53.599567)"
width="744.09448"
height="1052.3622" />
height="1052.3622"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
<use
x="0"
y="0"
@@ -635,7 +619,10 @@
id="use3825"
transform="translate(0,-13.399899)"
width="744.09448"
height="1052.3622" />
height="1052.3622"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
<use
x="0"
y="0"
@@ -643,7 +630,10 @@
id="use3827"
transform="translate(0,-13.399885)"
width="744.09448"
height="1052.3622" />
height="1052.3622"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
<use
x="0"
y="0"
@@ -651,11 +641,14 @@
id="use3829"
transform="translate(0,-13.399837)"
width="744.09448"
height="1052.3622" />
height="1052.3622"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473" />
<g
id="g3883"
transform="matrix(0.55568429,0,0,0.55568429,218.60023,-273.39512)"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/order-check.png"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/list.png"
inkscape:export-xdpi="24.829473"
inkscape:export-ydpi="24.829473">
<path
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

app/assets/images/icons/menu.svg
+2 -2
View File
@@ -16,8 +16,8 @@
inkscape:version="0.48.2 r9819"
sodipodi:docname="menu.svg"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/menu.png"
inkscape:export-xdpi="9.2299995"
inkscape:export-ydpi="9.2299995">
inkscape:export-xdpi="8.2399998"
inkscape:export-ydpi="8.2399998">
<defs
id="defs3266" />
<sodipodi:namedview
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

app/assets/images/icons/needs-help.svg
+6 -5
View File
@@ -46,7 +46,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -57,16 +57,17 @@
<flowRoot
xml:space="preserve"
id="flowRoot2985"
style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff8312;fill-opacity:1;stroke:none;font-family:BankGothic Md BT;-inkscape-font-specification:BankGothic Md BT Bold"
style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#7bb459;fill-opacity:1;stroke:none;font-family:BankGothic Md BT;-inkscape-font-specification:BankGothic Md BT Bold"
inkscape:export-xdpi="48.610001"
inkscape:export-ydpi="48.610001"><flowRegion
inkscape:export-ydpi="48.610001"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/needs-help.png"><flowRegion
id="flowRegion2987"><rect
id="rect2989"
width="148.57143"
height="148.57143"
x="174.28572"
y="232.36218"
style="fill:#ff8312;fill-opacity:1" /></flowRegion><flowPara
style="fill:#7bb459;fill-opacity:1" /></flowRegion><flowPara
id="flowPara2991"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff8312;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Clean Bold">?</flowPara></flowRoot> </g>
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#7bb459;fill-opacity:1;font-family:Sans;-inkscape-font-specification:Clean Bold">?</flowPara></flowRoot> </g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

app/assets/images/icons/needs-payment.svg
+5 -4
View File
@@ -57,16 +57,17 @@
<flowRoot
xml:space="preserve"
id="flowRoot2985"
style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff8312;fill-opacity:1;stroke:none;font-family:BankGothic Md BT;-inkscape-font-specification:BankGothic Md BT Bold"
style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#7bb459;fill-opacity:1;stroke:none;font-family:BankGothic Md BT;-inkscape-font-specification:BankGothic Md BT Bold"
inkscape:export-xdpi="48.610001"
inkscape:export-ydpi="48.610001"><flowRegion
inkscape:export-ydpi="48.610001"
inkscape:export-filename="/Users/bterkuile/companytools/development/rails/qwaiter/app/assets/images/icons/needs-payment.png"><flowRegion
id="flowRegion2987"><rect
id="rect2989"
width="148.57143"
height="148.57143"
x="174.28572"
y="232.36218"
style="fill:#ff8312;fill-opacity:1" /></flowRegion><flowPara
style="fill:#7bb459;fill-opacity:1" /></flowRegion><flowPara
id="flowPara2991"
style="-inkscape-font-specification:Clean Bold;font-family:Sans;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;fill:#ff8312;fill-opacity:1">€</flowPara></flowRoot> </g>
style="-inkscape-font-specification:Clean Bold;font-family:Sans;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal;fill:#7bb459;fill-opacity:1">€</flowPara></flowRoot> </g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

app/assets/images/icons/order-check.svg
+2 -2
View File
@@ -371,7 +371,7 @@
inkscape:pageshadow="2"
inkscape:zoom="4.6911765"
inkscape:cx="50.233542"
inkscape:cy="13.840125"
inkscape:cy="82.053291"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -379,7 +379,7 @@
inkscape:window-height="856"
inkscape:window-x="4"
inkscape:window-y="0"
inkscape:window-maximized="1">
inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid2994"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

app/assets/javascripts/user/application.js.erb
+8 -8
View File
@@ -33,14 +33,14 @@
//= require_directory .
//= require_self
var path_mapping = {
user_root: '/user/home',
join_occupied_table: '/user/join_occupied_table',
list_products_for_table: '/user/list_products_for_table',
list_products: '/user/list_products',
active_list: '/user/active_list',
history_list: '/user/history_list',
obtain_user_token: '/user/obtain_token',
lists_history: '/user/list_history'
user_root: '/index',
join_occupied_table: '/join_occupied_table',
list_products_for_table: '/list_products_for_table',
list_products: '/list_products',
active_list: '/active_list',
history_list: '/history_list',
obtain_user_token: '/obtain_token',
lists_history: '/list_history'
}
var $translations = {
en: {
app/assets/javascripts/user/quser.js.coffee
-2
View File
@@ -1,5 +1,3 @@
data_host = window.data_host
root_url = QMobile.root_url()
authentication_string = QMobile.authentication_string()
authentication_object = $.parseJSON(QMobile.authentication_object())
class Quser
app/assets/stylesheets/user/_constants.css.sass
+5 -3
View File
@@ -9,7 +9,7 @@ $side-spacing: 5px
background-color: transparent
background-repeat: no-repeat, no-repeat, repeat-x
background-position: left center, right center, center center
background-image: url(/assets/theme1/button-wood-left.png), url(/assets/theme1/button-wood-right.png), url(/assets/theme1/button-wood-middle.png)
background-image: image-url('theme1/button-wood-left.png'), image-url('theme1/button-wood-right.png'), image-url('theme1/button-wood-middle.png')
color: $green
border-width: 0
border-radius: 0
@@ -20,7 +20,7 @@ $side-spacing: 5px
background-color: transparent
background-repeat: no-repeat, no-repeat, repeat-x
background-position: left center, right center, center center
background-image: url(/assets/theme1/button-wood-left.png), url(/assets/theme1/button-wood-right.png), url(/assets/theme1/button-wood-middle.png)
background-image: image-url('theme1/button-wood-left.png'), image-url('theme1/button-wood-right.png'), image-url('theme1/button-wood-middle.png')
color: blue
=button-bar
background-color: transparent
@@ -45,10 +45,12 @@ $side-spacing: 5px
.button-bar-content
padding: 8px
.title
margin-top: -10px
margin-top: 4px
margin-right: 5px
margin-left: 5px
margin-bottom: 3px
font-size: 1.1em
line-height: 1.1em
color: black
float: left
.action-buttons
app/controllers/dashboard_controller.rb
+4 -3
View File
@@ -30,7 +30,8 @@ class DashboardController < ApplicationController
def table_qr_image
@table = Table.find(params[:table_id])
#code = [get_the_app_url, {table_id: @table.id}.to_json].join('?')
code = "#{scan_url}?json=#{{table_id: @table.id}.to_json}"
code = "q.qwaiter.nl/s?t=#{@table.id}"
size = RQRCode.minimum_qr_size_from_string(code)
respond_to do |format|
format.html
format.svg { render :qrcode => code, :level => :l, :unit => 10, table_number: @table.number, qcontainer: true }
@@ -42,8 +43,8 @@ class DashboardController < ApplicationController
code = 'qwaiter.com'
respond_to do |format|
format.html
format.png { render qrcode: code, level: :h, unit: 10, size: 12}
format.svg { render qrcode: code, level: :h, unit: 10, size: 12}
format.png { render qrcode: code, level: :h, unit: 10, size: 7}
format.svg { render qrcode: code, level: :h, unit: 10, size: 7}
end
end
app/controllers/user_controller.rb
+1 -1
View File
@@ -35,7 +35,7 @@ class UserController < ApplicationController
headers['Access-Control-Allow-Headers'] = '*'
end
def home
def index
handle_message_params
end
app/views/layouts/phone.html.slim
+3 -3
View File
@@ -22,7 +22,7 @@ html lang="en"
var data_host = 'http://data.qwaiter.com';
var event_host = '#{event_host}';
var $locale = 'en';
var $asset_path = 'file:///android_asset/assets/';
var $asset_path = '##assets_path##';
- else
javascript:
var QMobile, Qwaiter, Quser;
@@ -43,8 +43,8 @@ html lang="en"
this.authentication_string_storage = 'auth_token='+token;
this.authentication_object_storage = '{"auth_token": "'+token+'"}'
},
root_url: function(){return 'file:///Users/bterkuile/Documents/workspace/Qwaiter/assets'},
root_url: function(){return ''},
root_url: function(){return 'file:///Users/bterkuile/Documents/workspace/Qwaiter/assets/user'},
root_url: function(){return '/user'},
goHome: function(){ redirect_to('user_root')},
connection_problem: function(){alert('There is a problem connecting to the server')},
locale: function(){ return $locale || ($locale = 'en')},
app/views/theme1/_navigation.html.slim
+1 -1
View File
@@ -1,5 +1,5 @@
ul.nav
li[class=(current_page?(controller: '/dashboard', action: 'home') ? :active : nil)]= link_to t('menu.home'), root_path
li[class=(current_page?(controller: '/dashboard', action: 'index') ? :active : nil)]= link_to t('menu.home'), root_path
li[class=(current_page?(controller: '/dashboard', action: 'clients') ? :active : nil)]= link_to t('menu.clients'), clients_path
li[class=(current_page?(controller: '/dashboard', action: 'bars_restaurants') ? :active : nil)]= link_to t('menu.bars_restaurants'), bars_restaurants_path
li[class=(current_page?(controller: '/dashboard', action: 'enquete') ? :active : nil)]= link_to t('menu.enquete'), enquete_path
app/views/user/active_list.html.slim
+3 -3
View File
@@ -1,13 +1,13 @@
= top_bar title: 'active_list.title' do
.pull-right
.table-number
.supplier-name
.action-buttons
= link_to content_tag(:span, t('helpers.links.place_order')), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list'
span#list-needs-payment-button.user-top-button
span
span#list-needs-help-button.user-top-button
span
.pull-right
.table-number
.supplier-name
.well
table#active-list-table.table
thead
app/views/user/home.html.slim → app/views/user/index.html.slim
View File
app/views/user/list_products.html.slim
+3 -3
View File
@@ -1,13 +1,13 @@
= top_bar title: 'show_products.title' do
.pull-right
.table-number
.supplier-name
.action-buttons
= link_to content_tag(:span, t('helpers.links.show_active_list'), list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list'
span#list-needs-payment-button.user-top-button
span
span#list-needs-help-button.user-top-button
span
.pull-right
.table-number
.supplier-name
.well
table#products-table.table
config/routes.rb
+3 -3
View File
@@ -35,8 +35,8 @@ Qwaiter::Application.routes.draw do
# USER
#default_url_options format: 'html'
get '/user/home' => 'user#home', as: :user_root
get '/user' => 'user#home'
get '/user/home' => 'index#home', as: :user_root
get '/user' => 'user#index'
get '/user/active_list(.:format)' => 'user#active_list', as: :user_active_list
get '/user/list_info' => 'user#list_info', as: :user_list_info, via: [:get, :options]
post '/user/needs_help' => 'user#needs_help', as: :user_needs_help
@@ -65,7 +65,7 @@ Qwaiter::Application.routes.draw do
get '/bars-restaurants' => 'dashboard#bars_restaurants', as: :bars_restaurants
get '/clients' => 'dashboard#clients'
get '/contact' => 'dashboard#contact'
get '/scan' => 'dashboard#scan', as: :scan
get '/s' => 'dashboard#scan', as: :scan
# DEVELOPMENT ONLY
get '/qr' => 'dashboard#qr'
lib/rqrcode-rails3/qr_container.svg
+1 -1
View File
@@ -208,7 +208,7 @@
transform="translate(0,141.73227)">
<g
id="g3838"
transform="matrix(0.39937678,0,0,0.39937678,48.985567,-91.969866)">#qrcode
transform="translate(48.985567,-91.969866) scale(0.51) ">#qrcode
</g>
<text
x="277.10553"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

script/build_mobile_app.rb
+49 -11
View File
@@ -1,19 +1,45 @@
require 'fileutils'
include FileUtils
#rm_rf Rails.root.join('public', 'assets')
#`rake assets:precompile`
Rails.application.routes.default_url_options = {format: 'html'}
#rm_rf Rails.root.join('public', 'assets') # now done in ./make_...
#`rake assets:precompile` now done in ./make_...
Rails.application.routes.default_url_options = {format: 'html'} # append .html extension to asset paths
rails_assets_path = Rails.root.join('public', 'assets')
android_root = '/Users/bterkuile/Documents/workspace/Qwaiter/assets'
root_url = "file:///Users/bterkuile/Documents/workspace/Qwaiter/assets"
root_url = 'file:///android_asset'
mkdir_p File.join(android_root, 'user')
ios_root = '/Users/bterkuile/Documents/iOS/Qwaiter/www'
android_root_url = "file:///Users/bterkuile/Documents/workspace/Qwaiter/assets"
android_root_url = 'file:///android_asset'
# Cleanup and setup android structure
#mkdir_p File.join(android_root, 'user')
rm_rf File.join(android_root, 'assets')
Dir.glob(File.join('public', 'assets', '**', '*.gz')).each{|f| rm_f f}
move Rails.root.join('public', 'assets'), File.join(android_root, 'assets') if File.directory?(Rails.root.join('public', 'assets'))
# Cleanup and setup ios structure
rm_rf Dir.glob(File.join(ios_root, '**', '*'))
#mkdir_p File.join(ios_root, 'user')
# COPY iOS resources
copy File.join(ios_root, '..', 'www-original', 'cordova-2.2.0.js'), ios_root
ln_s File.join(ios_root, '..', 'www-original', 'qmobile.js'), ios_root
copy '/Users/bterkuile/Documents/iOS/phonegap-plugins/iOS/BarcodeScanner/barcodescanner.js', ios_root
# DO iOS ASSETS
cp_r rails_assets_path, File.join(ios_root, 'assets')
for css in Dir.glob(File.join(ios_root, "**", "*.css"))
contents = File.read(css)
contents.gsub!(/url\("\/assets\//, %|url("../|)
contents.gsub!(/url\(\/assets\//, %|url(../|)
File.open(css, 'w'){|f| f.puts contents}
end
move rails_assets_path, File.join(android_root, 'assets')
for css in Dir.glob(File.join(android_root, "**", "*.css"))
contents = File.read(css)
contents.gsub!(/url\("/, %|url("#{root_url}|)
contents.gsub!(/url\(\//, %|url(#{root_url}/|)
contents.gsub!(/url\("/, %|url("#{android_root_url}|)
contents.gsub!(/url\(\//, %|url(#{android_root_url}/|)
File.open(css, 'w'){|f| f.puts contents}
end
@@ -38,9 +64,21 @@ for action in uc.action_methods
if File.exist?(Rails.root.join('app', 'views', 'user', "#{action}.html.slim"))
puts "action #{action} found"
result = uc.render_to_string(action: action.dup)
## WRITE TO IOS PATH
ios_view = result.gsub /(href|src)="\/user\/([^"]+)/, %|\\1="./\\2| # replace absolute path names to relative ones
ios_view = ios_view.gsub /(href|src)="\/assets\/([^"]+)/, %|\\1="./assets/\\2| # make assets calls relative
ios_view.sub! /<\/title>/, '</title><script type="text/javascript" src="qmobile.js"><script type="text/javascript" src="cordova-2.2.0.js"></script><script type="text/javascript" src="barcodescanner.js"></script>'
ios_view.gsub! '##assets_path##', './assets/'
File.open(File.join(ios_root, "#{action}.html"), 'w'){|f| f.puts ios_view}
## MODIFY FOR ANDROID
#result.sub! /<head>/, '<head><base href="file:///Users/bterkuile/Documents/workspace/Qwaiter/assets/" target="_self" />'
result.gsub! /(href|src)="([^#])/, %|\\1="#{root_url}\\2|
File.open(File.join(android_root, 'user', "#{action}.html"), 'w'){|f| f.puts result}
android_view = result.gsub /(href|src)="\/user\/([^"]+)/, %|\\1="/\\2| # replace absolute path names to relative ones
android_view.gsub! /(href|src)="([^#])/, %|\\1="#{android_root_url}\\2| # replace relative uri's with android specific one
android_view.gsub! '##assets_path##', 'file:///android_asset/assets/'
# write to android path
File.open(File.join(android_root, "#{action}.html"), 'w'){|f| f.puts android_view}
end
end
view = view = ActionView::Base.new(uc.view_paths)