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

end of day commit

Browse Source
This commit is contained in:
Benjamin ter Kuile
2012-08-29 17:42:04 +02:00
parent 89700f36e9
commit 8213bae2c6
57 changed files with 1109 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/layouts/administrator.html.slim
+69
View File
@@ -0,0 +1,69 @@
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="images/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, users_path
li= link_to Supplier.model_name.human_plural, suppliers_path
li= link_to Table.model_name.human_plural, tables_path
li= link_to Product.model_name.human_plural, products_path
li= link_to List.model_name.human_plural, lists_path
li= link_to Order.model_name.human_plural, orders_path
li= link_to ProductCategory.model_name.human_plural, product_categories_path
.container
.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/layouts/application.html.slim
+2 -9
View File
@@ -16,8 +16,6 @@ html lang="en"
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"
javascript:
var active_list_id = #{session[:active_list_id] ? "'#{session[:active_list_id]}'" : 'null'};
body
.navbar.navbar-fixed-top
@@ -30,13 +28,8 @@ html lang="en"
a.brand href=root_path = application_title
.container.nav-collapse
ul.nav
li= link_to User.model_name.human_plural, users_path
li= link_to Supplier.model_name.human_plural, suppliers_path
li= link_to Table.model_name.human_plural, tables_path
li= link_to Product.model_name.human_plural, products_path
li= link_to List.model_name.human_plural, lists_path
li= link_to Order.model_name.human_plural, orders_path
li= link_to ProductCategory.model_name.human_plural, product_categories_path
li= link_to User.model_name.human_plural, user_root_path
li= link_to Supplier.model_name.human_plural, supplier_root_path
.container
app/views/layouts/phone.html.slim
+4 -3
View File
@@ -18,7 +18,10 @@ html lang="en"
link href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
link href="images/favicon.ico" rel="shortcut icon"
javascript:
var active_list_id = #{session[:active_list_id] ? "'#{session[:active_list_id]}'" : 'null'};
// Dummy holder when Qmobile object is not supplied by the mobile phone
var QMobile = {
scanQr: function(){window.location = '/select_qrcode'}
}
body
.navbar.navbar-fixed-top
@@ -31,8 +34,6 @@ html lang="en"
a.brand href=user_root_path = application_title
.container.nav-collapse
ul.nav#top-navigation-list
- if list_open?
li= link_to 'Move table', '#'
li= link_to 'View history', user_list_history_path
.container
app/views/layouts/tablet.html.slim
+9 -3
View File
@@ -17,8 +17,6 @@ html lang="en"
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"
javascript:
var active_list_id = #{session[:active_list_id] ? "'#{session[:active_list_id]}'" : 'null'};
body
.navbar.navbar-fixed-top.navbar-inverse
@@ -32,12 +30,20 @@ html lang="en"
ul.nav#top-navigation-list
li= link_to t('supplier.menu.active_orders', orders: Order.model_name.human_plural), supplier_active_orders_path
li= link_to t('supplier.menu.active_lists', lists: List.model_name.human_plural), supplier_active_lists_path
li= link_to ProductCategory.model_name.human_plural, suppliers_product_categories_path
li= link_to Product.model_name.human_plural, suppliers_products_path
li= link_to Section.model_name.human_plural, suppliers_sections_path
li= link_to Table.model_name.human_plural, suppliers_tables_path
ul.nav.pull-right
li.dropdown
a.dropdown-toggle href="#" data-toggle="dropdown"
= current_supplier.email
b.caret
ul.dropdown-menu
li= link_to 'Logout', destroy_supplier_session_path, method: :delete
.container.nav-collapse
.container
.content
- if flash[:alert].present?
.alert.alert-error