update front image, update theme and add cartoon

This commit is contained in:
2012-11-11 13:26:50 +01:00
parent 0d5a3995bc
commit 5804d91e8e
20 changed files with 138 additions and 95 deletions
+15
View File
@@ -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
+2 -6
View File
@@ -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
+8 -5
View File
@@ -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
+6
View File
@@ -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