diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store index 9b9b1f14..b741394f 100644 Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/cartoon/qwaiter-cartoon-1.png b/app/assets/images/cartoon/qwaiter-cartoon-1.png new file mode 100644 index 00000000..5a37b535 Binary files /dev/null and b/app/assets/images/cartoon/qwaiter-cartoon-1.png differ diff --git a/app/assets/images/cartoon/qwaiter-cartoon-2.png b/app/assets/images/cartoon/qwaiter-cartoon-2.png new file mode 100644 index 00000000..5c734309 Binary files /dev/null and b/app/assets/images/cartoon/qwaiter-cartoon-2.png differ diff --git a/app/assets/images/cartoon/qwaiter-cartoon-3.png b/app/assets/images/cartoon/qwaiter-cartoon-3.png new file mode 100644 index 00000000..9c4c9406 Binary files /dev/null and b/app/assets/images/cartoon/qwaiter-cartoon-3.png differ diff --git a/app/assets/images/cartoon/qwaiter-cartoon-4.png b/app/assets/images/cartoon/qwaiter-cartoon-4.png new file mode 100644 index 00000000..ce862bcb Binary files /dev/null and b/app/assets/images/cartoon/qwaiter-cartoon-4.png differ diff --git a/app/assets/images/cartoon/qwaiter-cartoon-5.png b/app/assets/images/cartoon/qwaiter-cartoon-5.png new file mode 100644 index 00000000..02e3badd Binary files /dev/null and b/app/assets/images/cartoon/qwaiter-cartoon-5.png differ diff --git a/app/assets/images/cartoon/qwaiter-cartoon-6.png b/app/assets/images/cartoon/qwaiter-cartoon-6.png new file mode 100644 index 00000000..e9b668e6 Binary files /dev/null and b/app/assets/images/cartoon/qwaiter-cartoon-6.png differ diff --git a/app/assets/images/icons/logo-medium.png b/app/assets/images/icons/logo-medium.png new file mode 100644 index 00000000..8eefbe7a Binary files /dev/null and b/app/assets/images/icons/logo-medium.png differ diff --git a/app/assets/images/logo-big.png b/app/assets/images/logo-big.png new file mode 100644 index 00000000..bee59fa9 Binary files /dev/null and b/app/assets/images/logo-big.png differ diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg index de8ffed2..28a31436 100644 --- a/app/assets/images/logo.svg +++ b/app/assets/images/logo.svg @@ -130,7 +130,7 @@ inkscape:window-height="852" id="namedview43" showgrid="false" - inkscape:zoom="2.8284271" + inkscape:zoom="1" inkscape:cx="70.721631" inkscape:cy="87.591402" inkscape:window-x="0" @@ -148,105 +148,109 @@ style="font-size:9.42450047px;fill:#634227;font-family:HelveticaRounded-Bold" x="25.508852" y="72.998604" - inkscape:export-filename="/Users/bterkuile/Documents/workspace/Qwaiter/res/drawable-xhdpi/q_launcher.png" - inkscape:export-xdpi="144.16052" - inkscape:export-ydpi="144.16052">Q + WAITE + R - \ No newline at end of file + + \ No newline at end of file diff --git a/app/assets/images/theme1/home_qwaiter_den_haag.png b/app/assets/images/theme1/home_qwaiter_den_haag.png new file mode 100644 index 00000000..3a471513 Binary files /dev/null and b/app/assets/images/theme1/home_qwaiter_den_haag.png differ diff --git a/app/assets/images/theme1/no-banner-bg.png b/app/assets/images/theme1/no-banner-bg.png new file mode 100644 index 00000000..1f4ce4f8 Binary files /dev/null and b/app/assets/images/theme1/no-banner-bg.png differ diff --git a/app/assets/stylesheets/cartoon.css.sass b/app/assets/stylesheets/cartoon.css.sass new file mode 100644 index 00000000..fd6f87a5 --- /dev/null +++ b/app/assets/stylesheets/cartoon.css.sass @@ -0,0 +1,7 @@ +ul#cartoon + list-style: none + li + float: left + div + width: 280px + .cartoon-image diff --git a/app/assets/stylesheets/structure.css.sass b/app/assets/stylesheets/structure.css.sass index f6fe72af..6c0a3c49 100644 --- a/app/assets/stylesheets/structure.css.sass +++ b/app/assets/stylesheets/structure.css.sass @@ -44,3 +44,5 @@ body img.home-qr float: left margin: 0 20px 20px 0 +.clearing + clear: both diff --git a/app/assets/stylesheets/theme1/theme1.css.sass b/app/assets/stylesheets/theme1/theme1.css.sass index c4bfa3a2..c176289d 100644 --- a/app/assets/stylesheets/theme1/theme1.css.sass +++ b/app/assets/stylesheets/theme1/theme1.css.sass @@ -111,13 +111,19 @@ body color: white display: block float: left - font-family: 'Pacifico',serif + font-family: Verdana,serif + text-decoration: none font-size: 18px height: 46px line-height: 46px margin: 0 10px padding: 0 20px text-shadow: 0 2px 2px rgba(0, 0, 0, 0.5) + &:hover + color: #99CB23 + &.active + a + color: #99CB23 #banner-wrap z-index: 2 position: relative @@ -155,7 +161,11 @@ body margin-left: 61px width: 840px height: 260px - background-image: image-url('theme1/banner-tall.png') + background-image: image-url("theme1/home_qwaiter_den_haag.png") + &.standard + background-image: image-url("theme1/no-banner-bg.png") + .wsite-header + display: none #main-wrap font-size: 14px font-family: Georgia, serif @@ -174,9 +184,8 @@ body font-family: 'Pacifico', serif color: #AE571F - background-image: image-url('theme1/wall-bg.jpg') - background-position: center + background-position: center top overflow: visible z-index: 2 position: relative diff --git a/app/views/dashboard/cartoon.html.slim b/app/views/dashboard/cartoon.html.slim new file mode 100644 index 00000000..1cdd4fec --- /dev/null +++ b/app/views/dashboard/cartoon.html.slim @@ -0,0 +1,15 @@ +- cartoon_text = {\ + 1 => "I feel like a beer!!", \ + 2 => "Where is the waiter?", \ + 3 => "Lets order a beer with my phone!", \ + 4 => "Now I can do things I like in stead of waitingat the bar", \ + 5 => "Relaxt, I get my beer as ordered", \ + 6 => "Qwaiter rocks!!!!" \ + } +ul#cartoon + - for i in 1..6 + li + .cartoon-image= image_tag "cartoon/qwaiter-cartoon-#{i}.png" + .cartoon-text= cartoon_text[i] +.clearing + diff --git a/app/views/layouts/theme1-home.html.slim b/app/views/layouts/theme1-home.html.slim index 494bd300..f1c8c5c9 100644 --- a/app/views/layouts/theme1-home.html.slim +++ b/app/views/layouts/theme1-home.html.slim @@ -36,13 +36,9 @@ html lang="en" span.wsite-social-inner a.wsite-social-rss span.wsite-social-inner - #logo= link_to image_tag('icons/logo-small.png', alt: application_title), root_path + #logo= link_to image_tag('icons/logo-medium.png', alt: application_title), root_path #nav-wrap - .container - ul.nav - li= link_to User.model_name.human_plural, user_root_path - li= link_to Supplier.model_name.human_plural, supplier_root_path - li= link_to 'Enquete', enquete_path + .container= render 'theme1/navigation' #banner-wrap .left .right diff --git a/app/views/layouts/theme1.html.slim b/app/views/layouts/theme1.html.slim index 809360a3..4a17252a 100644 --- a/app/views/layouts/theme1.html.slim +++ b/app/views/layouts/theme1.html.slim @@ -36,13 +36,16 @@ html lang="en" span.wsite-social-inner a.wsite-social-rss span.wsite-social-inner - #logo= link_to image_tag('icons/logo-small.png', alt: application_title), root_path + #logo= link_to image_tag('icons/logo-medium.png', alt: application_title), root_path #nav-wrap + .container= render 'theme1/navigation' + #banner-wrap + .left + .right .container - ul.nav - li= link_to User.model_name.human_plural, user_root_path - li= link_to Supplier.model_name.human_plural, supplier_root_path - li= link_to 'Enquete', enquete_path + #banner.standard + .wsite-header + .clearing #main-wrap .container .content-top diff --git a/app/views/theme1/_navigation.html.slim b/app/views/theme1/_navigation.html.slim new file mode 100644 index 00000000..d9b74a62 --- /dev/null +++ b/app/views/theme1/_navigation.html.slim @@ -0,0 +1,6 @@ +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 diff --git a/config/routes.rb b/config/routes.rb index 4ce1f8d8..7cd79932 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -67,6 +67,7 @@ Qrammer::Application.routes.draw do match '/qr' => 'dashboard#qr' match '/demo_both' => 'dashboard#demo_both' match '/enquete' => 'dashboard#enquete' + match '/cartoon' => 'dashboard#cartoon' namespace :suppliers, path: '/supplier' do resources :sections do