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

upgrade to different theme for main webpage

Browse Source
This commit is contained in:
Benjamin ter Kuile
2012-11-09 12:25:59 +01:00
parent 6e1710ee2e
commit d41994866b
45 changed files with 479 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/dashboard/home.html.slim
-2
View File
@@ -1,5 +1,3 @@
.page-header
h1 Qwaiter
p
= image_tag 'qr.png', class: 'home-qr'
|Welcome on the Qwaiter homepage. Qwaiter is an application that lets you place orders by simply scanning a code from a table on a terrace or a restaurant. Then directly the menu appears and you can place your order. See the progress while you wait for your drinks!
app/views/layouts/application.html.slim
+38 -37
View File
@@ -11,28 +11,48 @@ html lang="en"
/[if lt IE 9]
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
= stylesheet_link_tag "application", :media => "all"
link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
link href="/favicon.ico" rel="shortcut icon"
link href='http://fonts.googleapis.com/css?family=Pacifico' rel='stylesheet' type='text/css'
body
.container
.navbar
.navbar-inner
.header-nav-banner
#header-wrap
#ceiling
.left
.right
.lights
.light1
.light2
.light3
.container
a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
span.icon-bar
span.icon-bar
span.icon-bar
a.brand href=root_path = image_tag 'icons/logo-small.png', alt: application_title
.container.nav-collapse
ul.nav
li= link_to User.model_name.human_plural, user_root_path
li= link_to Supplier.model_name.human_plural, supplier_root_path
#header
= link_to image_tag('icons/logo-small.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
#banner-wrap
.left
.right
.container
#banner
.wsite-header
.clearing
#main-wrap
.container
.content-top
.main-inner
#wsite-content.wsite-not-footer= yield
#footer-wrap
.footer-shadow
.container
.footer-top
.bottom
p © Companytools 2012
= yield :footer
.content
- if flash[:alert].present?
.alert.alert-error
@@ -42,23 +62,4 @@ html lang="en"
.alert.alert-success
a.close data-dismiss="alert" ×
div= flash[:notice]
.row
.span9
= yield
.span3
.well.sidebar-nav
h3= application_title
ul.nav.nav-list
li.nav-header Links
li= link_to "Home", root_path
li= link_to "Companytools", 'http://www.companytools.nl/'
= yield :sidebar
footer
p © Companytools 2012
/!
Javascripts
\==================================================
/! Placed at the end of the document so the pages load faster
= javascript_include_tag "application"
= yield :footer
app/views/layouts/phone.html.slim
+2 -2
View File
@@ -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 = '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/twitter-bootstrap.html.slim
+64
View File
@@ -0,0 +1,64 @@
doctype html
html lang="en"
head
meta charset="utf-8"
meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
meta name="viewport" content="width=device-width, initial-scale=1.0"
title= content_for?(:title) ? yield(:title) : application_title
= csrf_meta_tags
/! 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"
link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
link href="/favicon.ico" rel="shortcut icon"
body
.container
.navbar
.navbar-inner
.container
a.btn.btn-navbar data-target=".nav-collapse" data-toggle="collapse"
span.icon-bar
span.icon-bar
span.icon-bar
a.brand href=root_path = image_tag 'icons/logo-small.png', alt: application_title
.container.nav-collapse
ul.nav
li= link_to User.model_name.human_plural, user_root_path
li= link_to Supplier.model_name.human_plural, supplier_root_path
.content
- if flash[:alert].present?
.alert.alert-error
a.close data-dismiss="alert" ×
div= flash[:alert]
- if flash[:notice].present?
.alert.alert-success
a.close data-dismiss="alert" ×
div= flash[:notice]
.row
.span9
= yield
.span3
.well.sidebar-nav
h3= application_title
ul.nav.nav-list
li.nav-header Links
li= link_to "Home", root_path
li= link_to "Companytools", 'http://www.companytools.nl/'
= yield :sidebar
footer
p © Companytools 2012
/!
Javascripts
\==================================================
/! Placed at the end of the document so the pages load faster
= javascript_include_tag "application"
= yield :footer
app/views/suppliers/sections/manage_tables.html.slim
+31
View File
@@ -21,6 +21,18 @@
= link_to :i, [:suppliers, table], class: 'btn btn-mini table-link'
.table-number = table.number
.clearfix
.form-actions
= link_to t("helpers.links.back"), suppliers_sections_path, class: 'btn'
'
= link_to t('helpers.links.edit'), [:edit, :suppliers, @section], class: 'btn'
'
= link_to t('supplier.section.tables_view'), [:tables_view, :suppliers, @section], class: [:btn, 'btn-info']
'
a.btn href='#add-tables-modal' role='button' data-toggle='modal'= t('supplier.section.add_tables.button_label')
'
a.btn href='#arrange-tables-modal' role='button' data-toggle='modal'= t('supplier.section.arrange_tables.button_label')
'
= link_to t("helpers.links.destroy"), [:suppliers, @section], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-danger'
- content_for :footer do
javascript:
var current_section_id = '#{@section.id}';
@@ -34,3 +46,22 @@
Qsupplier.position_table_in_active_section(active_section_container, $(this), true);
});
});
#add-tables-modal.modal.hide.fade tabindex=-1 role=:dialog aria-labeledby='add-tables-modal-label' aria-hidden=true
.modal-header
button.close type=:button data-dismiss=:modal aria-hidden=true x
h3#add-tables-modal-label= t('supplier.section.add_tables.modal.title')
.modal-body
p= t('supplier.section.add_tables.modal.body_header')
form.form-horizontal
.control-group
label.control-label for='add-tables-number-start' = t('supplier.section.add_tables.modal.number_start')
.controls
input.input-mini#add-tables-number-start type=:number value=100
.control-group
label.control-label for='add-tables-number-end' = t('supplier.section.add_tables.modal.number_end')
.controls
input.input-mini#add-tables-number-end type=:number value=120
.modal-footer
a.btn href='#' Close
a.btn.btn-primary href='#' onclick=%|Qsupplier.add_tables_to_active_section()| Add
app/views/suppliers/sections/show.html.slim
+9 -1
View File
@@ -1,6 +1,14 @@
- model_class = Section
.page-header= title :show, @section
dl.dl-horizontal.show-list
dt= model_class.human_attribute_name(:title)
dd= @section.title
dl.dl-horizontal.show-list
dt= model_class.human_attribute_name(:width)
dd= @section.width
dl.dl-horizontal.show-list
dt= model_class.human_attribute_name(:height)
dd= @section.height
.form-actions
= link_to t("helpers.links.back"), suppliers_sections_path, class: 'btn'
'
app/views/suppliers/sections/tables_view.html.slim
+2 -1
View File
@@ -1,8 +1,9 @@
- model_class = Section
- content_for :row do
.span12.section-title= @section.title
.span12
.well.section-tables-container.section-tables-active
.section-title.pull-right= @section.title
.section-manage-tables.pull-right= link_to '', manage_tables_suppliers_section_path(@section), class: 'icon-pencil btn'
- for table in @section.tables
.section-table.hide{ id="section-table-#{table.id}" data-position-x=table.position_x data-position-y=table.position_y data-table-id=table.id}
.table-number = link_to table.number, suppliers_table_path(table)