Update site pages

app/assets/javascripts/theme1/application.js

@@ -0,0 +1,19 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+// require twitter/bootstrap
+//= require_directory .
+//= require_self
+

app/assets/stylesheets/theme1/application.css

@@ -10,5 +10,5 @@
  *
  *= require_self
  *= require_directory .
- * require 'bootstrap-devise-rails'
+ *      ------------- require 'bootstrap-devise-rails'
  */

app/assets/stylesheets/theme1/theme1.css.sass

@@ -1,3 +1,8 @@
+$green-original: #99CB23
+$green: #7BB459 //Heineken
+$font-family-content: Georgia, serif
+$font-family-navigation: Verdana,serif
+$font-family-headers: Verdana,serif //'Pacifico', serif
 body
   background-color: #333
   margin: 0
@@ -111,7 +116,7 @@ body
               color: white
               display: block
               float: left 
-              font-family: Verdana,serif
+              font-family: $font-family-navigation
               text-decoration: none
               font-size: 18px
               height: 46px
@@ -120,10 +125,10 @@ body
               padding: 0 20px
               text-shadow: 0 2px 2px rgba(0, 0, 0, 0.5)
               &:hover
-                color: #99CB23
+                color: $green
             &.active
               a
-                color: #99CB23
+                color: $green
     #banner-wrap
       z-index: 2
       position: relative
@@ -168,20 +173,20 @@ body
               display: none
     #main-wrap
       font-size: 14px
-      font-family: Georgia, serif
+      font-family: $font-family-content
       line-height: 1.5
       color: #848585
       h1
         font-size: 28px
         padding: 0.5em 0 0.2em 0
         line-height: 1.4
-        font-family: 'Pacifico', serif
+        font-family: $font-family-headers
         color: #AE571F
       h2
         font-size: 24px
         padding: 0.5em 0 0.2em 0
         line-height: 1.2
-        font-family: 'Pacifico', serif
+        font-family: $font-family-headers
         color: #AE571F
 
       background-image: image-url('theme1/wall-bg.jpg')
@@ -203,6 +208,10 @@ body
         .main-inner
           width: 894px
           padding: 0 40px 30px 40px
+          h1.page-title
+            margin: 0
+            padding: 0
+            margin-bottom: 12px
           #wsite-content 
     #footer-wrap
       color: white
@@ -242,4 +251,14 @@ body
           bottom: -35px
           left: -30px
           overflow: visible
-          
+  a
+    color: $green
+    text-decoration: none
+    &:hover
+      color: darken($green, 20%)
+  .right
+    float: right
+  .left
+    float: left
+  .clearing
+    clear: both

app/controllers/application_controller.rb

@@ -13,7 +13,7 @@ class ApplicationController < ActionController::Base
 
   def layout_by_resource
     if devise_controller?
-      "phone"
+      'theme1'
     else
       "application"
     end

app/controllers/dashboard_controller.rb

@@ -4,6 +4,14 @@ class DashboardController < ApplicationController
     render layout: 'theme1-home'
   end
 
+  def contact
+  end
+  def bars_restaurants
+  end
+
+  def clients
+  end
+
 
   def demo_both
     render layout: 'twitter-bootstrap'

app/helpers/application_helper.rb

@@ -1,6 +1,6 @@
 module ApplicationHelper
   def title(*args)
-    content_tag :h1 do
+    res = content_tag :h1, class: 'page-title' do
       if args.first.is_a?(Symbol) && (args[1].respond_to?(:model_name) || args[1].class.respond_to?(:model_name))
         model = args[1].respond_to?(:model_name) ? args[1] : args[1].class
         if args.first == :index
@@ -12,6 +12,8 @@ module ApplicationHelper
         args.first
       end
     end
+    content_for :page_title, res
+    res
   end
 
   # overwrite i18n l, to handle nil values

app/views/application/_footer.html.slim

@@ -0,0 +1,6 @@
+= yield :footer
+= link_to 'disclaimer', '#'
+'
+= link_to 'privacy', '#'
+'
+= link_to 'kernwaarden', '#'

app/views/dashboard/bars_restaurants.html.slim

@@ -0,0 +1,10 @@
+- title t('menu.bars_restaurants')
+.right= image_tag 'site/tablet-screenshot.png'
+p
+  | 
+    Qwaiter is niet alleen handig voor de gebruiker die met zijn of haar smartphone makkelijk kan bestellen.
+    Ook voor de bar of restauranthouder is het een ware toevoeging. Door tevreden klanten en minder en efficientere
+    Handelingen wordt er veel bespaard en gaat alles een stuk sneller. Een tablet of ander apparaat met 
+    internet verbinding is voldoende om Qwaiter in gebruik te nemen.
+h3= link_to 'Log in als bar of restaurant', supplier_root_path
+h3= link_to 'Meld je aan als bar of restaurant', new_supplier_registration_path

app/views/dashboard/clients.html.slim

@@ -0,0 +1,12 @@
+- title t('menu.clients')
+.right= image_tag 'site/phone-screenshot.png'
+p
+  |
+    Qwaiter is een app voor je telefoon die het bestellen van drankjes en hapjes in bars en restaurant snel en eenvoudig maakt.
+    Scan een QR code, kies wat je wilt hebben, en krijg je bestelling. Zo simpel is het! 
+p
+  |
+    Qwaiter is momenteel nog in een opstartfase. Om de gebruikerservaring zo optimaal mogelijk te krijgen vragen we je om de 
+  = link_to t('menu.enquete'), enquete_path
+  |  in te vullen. Dit kost je 2 minuten en wij zijn er erg blij mee.
+.clearing

app/views/dashboard/contact.html.slim

@@ -0,0 +1,4 @@
+- title t('menu.contact')
+p
+  |Qwaiter is in een alpha fase. Dit houdt in dat hij nog niet officieel is en er nog veel onvolkomenheden in zitten. Heb je echter al vragen of opmerkingen stuur deze dan naar: 
+  = mail_to 'info@qwaiter.com'

app/views/dashboard/enquete.html.slim

@@ -1,2 +1,2 @@
-iframe[ src="https://docs.google.com/spreadsheet/embeddedform?formkey=dEI3NmlWRUFMbnVySWd6SzljYjM3NVE6MQ" width="760" height="1332"
+iframe[ src="https://docs.google.com/spreadsheet/embeddedform?formkey=dEI3NmlWRUFMbnVySWd6SzljYjM3NVE6MQ" width="760" height="2332"
   frameborder="0" marginheight="0" marginwidth="0"] Loading..

app/views/layouts/phone.html.slim

@@ -17,8 +17,8 @@ html lang="en"
     link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
     link href="/favicon.ico" rel="shortcut icon"
     javascript:
-      //var data_host = 'http://data.qwaiter.com';
-      var data_host = 'http://localhost:3000';
+      var data_host = '#{Rails.env == 'development' ? 'http://localhost:3000' : 'http://data.qwaiter.com' }';
+      //var data_host = 'http://localhost:3000';
       //var data_host = 'http://192.168.1.74:3000';
       var $locale = '#{I18n.locale}';
       var $url_vars = null;

app/views/layouts/theme1-home.html.slim

@@ -41,15 +41,16 @@ html lang="en"
         .container
           .content-top
           .main-inner
-            #wsite-content.wsite-not-footer= yield
+            #wsite-content.wsite-not-footer
+              = yield :page_title
+              = yield
       #footer-wrap
         .footer-shadow
         .container
           .footer-top
+          = render 'footer'
           .bottom
-            p © Companytools 2012
-            = yield :footer
-            
+            | © Qwaiter 2012
       
       .content
         - if flash[:alert].present?

app/views/layouts/theme1.html.slim

@@ -10,9 +10,8 @@ html lang="en"
     /! Le HTML5 shim, for IE6-8 support of HTML elements
     /[if lt IE 9]
       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
-    = stylesheet_link_tag "application", :media => "all"
+    = stylesheet_link_tag "theme1/application", :media => "all"
     link href="/favicon.ico" rel="shortcut icon"
-    link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
 
   body
     .header-nav-banner
@@ -41,14 +40,16 @@ html lang="en"
         .container
           .content-top
           .main-inner
-            #wsite-content.wsite-not-footer= yield
+            #wsite-content.wsite-not-footer
+              = yield :page_title
+              = yield
       #footer-wrap
         .footer-shadow
         .container
           .footer-top
+          = render 'footer'
           .bottom
-            p © Companytools 2012
-            = yield :footer
+            | © Qwaiter 2012
             
       
       .content
@@ -60,4 +61,4 @@ html lang="en"
           .alert.alert-success
             a.close data-dismiss="alert" ×
             div= flash[:notice]
-    = javascript_include_tag "application"
+    = javascript_include_tag "theme1/application"

app/views/theme1/_navigation.html.slim

@@ -1,6 +1,7 @@
 ul.nav
-  li[class=(current_page?(controller: 'dashboard', action: 'home') ? :active : nil)]= link_to 'Home', root_path
-  li= link_to User.model_name.human_plural, user_root_path
-  li= link_to Supplier.model_name.human_plural, supplier_root_path
-  li[class=(current_page?(controller: 'dashboard', action: 'enquete') ? :active : nil)]= link_to 'Enquete', enquete_path
-  li[class=(current_page?(controller: 'dashboard', action: 'cartoon') ? :active : nil)]= link_to 'Cartoon', cartoon_path
+  li[class=(current_page?(controller: 'dashboard', action: 'home') ? :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
+  li[class=(current_page?(controller: 'dashboard', action: 'cartoon') ? :active : nil)]= link_to t('menu.cartoon'), cartoon_path
+  li[class=(current_page?(controller: 'dashboard', action: 'contact') ? :active : nil)]= link_to t('menu.contact'), contact_path

config/locales/en.yml

@@ -2,6 +2,13 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 en:
   hello: "Hello world"
+  menu:
+    home: Home
+    bars_restaurants: 'Bars & Restaurants'
+    clients: Gebruikers
+    enquete: Enquete
+    cartoon: Cartoon
+    contact: Contact
   helpers:
     links:
       are_you_sure: 'Are you sure?'

config/locales/nl.yml

@@ -1,6 +1,13 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 nl:
+  menu:
+    home: Home
+    bars_restaurants: 'Bars & Restaurants'
+    clients: Gebruikers
+    enquete: Enquete
+    cartoon: Cartoon
+    contact: Contact
   helpers:
     links:
       are_you_sure: 'Weet je dit zeker?'

config/routes.rb

@@ -64,10 +64,13 @@ Qrammer::Application.routes.draw do
   #match '/show_products' => 'dashboard#show_products', as: :user_products
 
   # DEVELOPMENT ONLY 
-  match '/qr' => 'dashboard#qr'
-  match '/demo_both' => 'dashboard#demo_both'
-  match '/enquete' => 'dashboard#enquete'
-  match '/cartoon' => 'dashboard#cartoon'
+  get '/qr' => 'dashboard#qr'
+  get '/demo_both' => 'dashboard#demo_both'
+  get '/enquete' => 'dashboard#enquete'
+  get '/cartoon' => 'dashboard#cartoon'
+  get '/bars-restaurants' => 'dashboard#bars_restaurants', as: :bars_restaurants
+  get '/clients' => 'dashboard#clients'
+  get '/contact' => 'dashboard#contact'
 
   namespace :suppliers, path: '/supplier' do
     resources :sections do