From 63cb3593ed53a2681e2aa8d9b0fa2de6ec3e968a Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Tue, 11 Dec 2012 17:04:45 +0100
Subject: [PATCH] layout and language changer

---
 app/assets/images/flags/flag-en.png            | Bin 0 -> 1177 bytes
 app/assets/images/flags/flag-nl.png            | Bin 0 -> 427 bytes
 app/assets/javascripts/user/application.js.erb |   3 +++
 app/assets/stylesheets/user/structure.css.sass |   9 +++++++++
 app/views/layouts/phone.html.slim              |   4 +++-
 make_android => make_mobile                    |   0
 script/build_mobile_app.rb                     |   2 +-
 7 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100755 app/assets/images/flags/flag-en.png
 create mode 100755 app/assets/images/flags/flag-nl.png
 rename make_android => make_mobile (100%)

diff --git a/app/assets/images/flags/flag-en.png b/app/assets/images/flags/flag-en.png
new file mode 100755
index 0000000000000000000000000000000000000000..51a27cf1d6f2434cc3ebb9e2a4cbdfd8889c6504
GIT binary patch
literal 1177
zcmV;K1ZMk*P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ=A4x<(RCwCdmR)R<WfaGMZ(G{+eK)!RgRxXtqNoWVj*SQ?;+UJTkw6%3VHqfj
zgqX}|KpX~4j1om%gn$khZ~>7Z9{~h5fiMAw20u_7WC%<KWXrmhw(I(~Yu}H@ix##k
z@M2telIP|*=Q;oLKlz`WM-oEtFwMe4wucTN0X85B7&O4SHK5l9B>TVF?@ui+;ljl>
zzF1d>&ldpf{o)J`99oXIycB?8yZ2Huw;Hhat4m|>@N||IKg#%@>ybu|WJFbEnhj85
zmzwE0c$A671#I2En7Si>(%RaQAZGvqn^i)YJ{<s?Rbs}Bv55v)0YT>I5#(n=%GJwQ
z7nb78nE+LliUqLMx+W2G$OJallGJ{imrHXQ|5O$pPd6TqACD)95TJK;p?7v71b93_
zIy(G#d|@6RlR=TVh4c4caL#-Yd(H%EYa0P<7J!rW7ua=U5S>pvjk;$);o}X=nmLZe
zOI|?Jtf*=fAwZ}qA{<5tP}L|gi%i*bZt`0iu|^`KRxTlsoW`~-XV|mnY@doW&ER@-
z3!i+~$`7Na&~yF|ywzVbZj{W*sv<(6UO-@~DyFIef>5ZJH^*5SbMAXAIoY@tFW~e~
zH+gUQZkn2IU>H)oodCLS($k~i_jj{n-yP()XY;%qME$J^_w=c(t6qpHzz7BbFa>O1
zm51*2VK00GpTotuhQHag{ulshX)>A?y(iPrcLJeSN0NgF4YjvqPFzI?4&Pt<5=47r
z3{6$CYyh5F1vrNc!RYS(PXhN8<lWbAb-9Qna@hb3T}Nwc!w3WhWWvl)2-D%{14yqs
zfm4<r_^|!S#{kH@a{Ym^k#HE&)8YWn<gP~7C4#{S02?<i<CXGU^iD78nRD1PGtjcL
z5vJMKrY@B+qtoc#cNlwS277N>sa&=hfWd>E*zNR}sf1yeAO^8&O&N>Ia|s<gN#~pe
zTs!+0=`U?fa5v)z$R4|b%U3+Oif3?V%TA`%d`R_Mc_fc;qw5BmX6XYkj3`-IZW<a_
zv+CUfysOuuuKkRr*$XK-MFJdzX~tQI_}#OUKj!F}Tex?A#n4yFD6XrezI+%{^CzKc
zS|31R;Y8{iR+5`8(Oy)BcI_W_<SnIi(<M4uu40-3(T{-uOj8hvbTfbM23A%bB<b}E
zhVQCj=&3q3CST&UiYa{n>o=5PYiOWt-XcQTlUO0=@p(-n)@T$(NkLH@ND^3N8H+3<
zNuVeW6h%Q+6t-<WPEr1sw5DX>{_zOb6q$-&zrCj-t?SbbgioBNWo`u@9Bt=T^QnYO
z0%CxH-{&LH8=p?6&qpj4PSj@raQ^&7rcGYMM{DOZ@BMd>57oojW10lGfJcDT0bV!(
r;P%~(=D0f(186!BmHzj?ihl<HAd0@W{&y@v00000NkvXXu0mjfrMe7W

literal 0
HcmV?d00001

diff --git a/app/assets/images/flags/flag-nl.png b/app/assets/images/flags/flag-nl.png
new file mode 100755
index 0000000000000000000000000000000000000000..362c9f06c308e75cfbc4749ff13b4b626c1a1719
GIT binary patch
literal 427
zcmV;c0aX5pP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-F-b&0RCwCdmOV}bF%X5n*?2?5Mg&?U1SMxcoPeH!qtR1v5yUkjA!>f2EFt#H
zP-LCI+KZIe*cwakdET>Zi@Vb&Dtbom0s;hJ1k{DOBd`d-`2GIjLk5H5yFY(^ItxG}
zRmJG`rYQO1<rSa_KrmHUF0rp~+#L}ipDqyr*s1T=@_Zfa<ODMV2m!!j!sad3wt(Px
z7mwrJxT@3DHdw9i!s{WP5_AD$n(+1qpSMNq@euH&>r-?YW1NOnGsTcnqOR+!3dnvH
zMdqyb11g2g`9B>Tv_%2n`tA{vA+!0i2>G}fQcK(jBvrgJ)V!EI(RE88Dg>}X0;*uT
zC7|Y1IL&dH8{2WT3poHWCPmV$kM|}DFaa)r)57GRz*~ONj<Q`PuOr}B4*pm1HvnaN
Vrl9|m!SnzC002ovPDHLkV1kYAuV4TG

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/user/application.js.erb b/app/assets/javascripts/user/application.js.erb
index 07a1cf18..cfd7246e 100644
--- a/app/assets/javascripts/user/application.js.erb
+++ b/app/assets/javascripts/user/application.js.erb
@@ -187,6 +187,9 @@ function Qupdate(selector){
   setTranslations(selector);
 }
 function setTranslations(selector){
+  var list = $('#top-navigation-list');
+  list.find('.locale').show();
+  list.find('.locale-'+$locale).hide();
   if(selector){
     $(selector).find('[data-t]').each(function(){$(this).text(t($(this).attr('data-t')))})
   }else{
diff --git a/app/assets/stylesheets/user/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass
index bdb1779b..e990f0aa 100644
--- a/app/assets/stylesheets/user/structure.css.sass
+++ b/app/assets/stylesheets/user/structure.css.sass
@@ -67,6 +67,15 @@ body
   .order-count-cell
     white-space: nowrap
   .page-header
+  #top-navigation-list
+    .locale
+      padding-left: 30px
+      background-repeat: no-repeat
+      background-position: 15px center
+      &.locale-en
+        background-image: image-url('flags/flag-en.png')
+      &.locale-nl
+        background-image: image-url('flags/flag-nl.png')
 #list-needs-help-button
   button
     margin-left: 5px
diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim
index c53eafcd..67176979 100644
--- a/app/views/layouts/phone.html.slim
+++ b/app/views/layouts/phone.html.slim
@@ -68,7 +68,9 @@ html lang="en"
           = link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand
           .container.nav-collapse
             ul.nav#top-navigation-list
-              li= link_to 'View history', user_list_history_path
+              li.locale.locale-en= link_to_function 'English', %|setLocale('en')| 
+              li.locale.locale-nl= link_to_function 'Nederlands', %|setLocale('nl')| 
+              li= link_to t('user.list_history.title'), user_list_history_path, data: {t: 'list_history.title'}
     .container
       .content
         .alert.alert-error.hide
diff --git a/make_android b/make_mobile
similarity index 100%
rename from make_android
rename to make_mobile
diff --git a/script/build_mobile_app.rb b/script/build_mobile_app.rb
index f13cc2a2..f39b5fa1 100644
--- a/script/build_mobile_app.rb
+++ b/script/build_mobile_app.rb
@@ -68,7 +68,7 @@ for action in uc.action_methods
     ## 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.sub! /<\/title>/, '</title><script type="text/javascript" src="qmobile.js"></script><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}