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

style changes and refactoring

Browse Source
This commit is contained in:
Benjamin ter Kuile
2012-09-03 12:09:35 +02:00
parent 81a2423f6b
commit 39449f240a
36 changed files with 527 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/dashboard/home.html.slim
+4 -1
View File
@@ -1,2 +1,5 @@
.page-header
h1 Home
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
+14 -14
View File
@@ -15,24 +15,24 @@ html lang="en"
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="images/favicon.ico" rel="shortcut icon"
link href="/favicon.ico" rel="shortcut icon"
body
.navbar.navbar-fixed-top
.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 = 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
.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
app/views/layouts/phone.html.slim
+4 -4
View File
@@ -10,19 +10,19 @@ 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 "phone/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="images/favicon.ico" rel="shortcut icon"
link href="/favicon.ico" rel="shortcut icon"
javascript:
var QMobile;
// Dummy holder when Qmobile object is not supplied by the mobile phone
QMobile || (QMobile = {
scanQr: function(){window.location = '/select_qrcode'},
activateRotation: function(){}
activateRotation: function(){},
mobile: function(){return false}
});
body class=action_name
@@ -33,7 +33,7 @@ html lang="en"
span.icon-bar
span.icon-bar
span.icon-bar
a.brand href=user_root_path = application_title
a.brand href=user_root_path = image_tag 'icons/logo-small.png', alt: application_title
.container.nav-collapse
ul.nav#top-navigation-list
li= link_to 'View history', user_list_history_path
app/views/layouts/qr_sheet.html.slim
+13
View File
@@ -0,0 +1,13 @@
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
= stylesheet_link_tag "qr_sheet/application", :media => "all"
link href="/favicon.ico" rel="shortcut icon"
body
= yield
app/views/layouts/tablet.html.slim
+3 -3
View File
@@ -10,13 +10,13 @@ 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 "supplier/application", :media => "all"
= stylesheet_link_tag "tablet/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="images/favicon.ico" rel="shortcut icon"
link href="/favicon.ico" rel="shortcut icon"
body
.navbar.navbar-fixed-top.navbar-inverse
@@ -26,7 +26,7 @@ html lang="en"
span.icon-bar
span.icon-bar
span.icon-bar
a.brand href=supplier_root_path = application_title
a.brand href=supplier_root_path = image_tag 'icons/logo-small.png', alt: application_title
ul.nav.pull-right
li.dropdown
a.dropdown-toggle href="#" data-toggle="dropdown"
app/views/suppliers/tables/index.html.slim
+2
View File
@@ -24,3 +24,5 @@ div.page-header= title :index, model_class
.form-actions
= link_to t("helpers.links.new"), new_suppliers_table_path, class: 'btn btn-primary'
'
= link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path, class: 'btn btn-info'
app/views/suppliers/tables/qr_codes.html.slim
+3
View File
@@ -0,0 +1,3 @@
ul#qr-list
- for table in @tables
li= image_tag(url_for(table_qr_image_path(table_id: table.id, format: :png)))
app/views/user/list_products.html.slim
+2
View File
@@ -7,6 +7,8 @@
.well
table#products-table.table
tbody
tr
td= slider_image
table#active-order-table.table.hide
thead
tr
app/views/user/list_products_for_table.html.slim
+2
View File
@@ -4,6 +4,8 @@
.well
table#products-table.table.table-hover
tbody
tr
td= slider_image
table#active-order-table.table.hide
thead
tr