styling changes

This commit is contained in:
2012-12-10 08:43:38 +01:00
parent b5ddd448b2
commit 7d0afde69f
22 changed files with 176 additions and 73 deletions
+12 -12
View File
@@ -57,18 +57,18 @@ html lang="en"
QMobile.setAuthToken('#{current_user.authentication_token}');QMobile.setUserId('#{current_user.id}');
body class=action_name
.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
= link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand
.container.nav-collapse
ul.nav#top-navigation-list
li= link_to 'View history', user_list_history_path
- unless ENV['QWAITER_MOBILE_EXPORT'] == 'yes'
.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
= link_to image_tag('icons/logo-small.png', alt: application_title), user_root_path, class: :brand
.container.nav-collapse
ul.nav#top-navigation-list
li= link_to 'View history', user_list_history_path
.container
.content
+10 -8
View File
@@ -1,11 +1,13 @@
.page-header
.table-number
.supplier-name
h4 data-t="active_list.title" = t('user.active_list.title', list: List.model_name.human)
.form-actions
= link_to t('helpers.links.place_order'), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list'
span#list-needs-payment-button.user-top-button
span#list-needs-help-button.user-top-button
= top_bar title: 'active_list.title' do
.pull-right
.table-number
.supplier-name
.action-buttons
= link_to content_tag(:span, t('helpers.links.place_order')), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list'
span#list-needs-payment-button.user-top-button
span
span#list-needs-help-button.user-top-button
span
.well
table#active-list-table.table
thead
+2 -2
View File
@@ -4,8 +4,8 @@
a href="#" onClick="QMobile.scanQr()" = image_tag 'scan-logo.png'
.home-footer
.home-footer-content
= link_to 'P', user_list_products_path, class: [:hide, 'home-link', 'home-menu-link']
= link_to 'L', user_active_list_path, class: [:hide, 'home-link', 'home-list-link']
= link_to content_tag(:span, 'P'), user_list_products_path, class: [:hide, 'home-link', 'home-menu-link']
= link_to content_tag(:span, 'L'), user_active_list_path, class: [:hide, 'home-link', 'home-list-link']
- content_for :footer do
javascript:
$(function(){
+11 -8
View File
@@ -1,11 +1,14 @@
.page-header
.table-number
.supplier-name
h4 data-t="show_products.title" = t('user.show_products.title', products: Product.model_name.human_plural)
.form-actions
= link_to t('helpers.links.show_active_list', list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list'
span#list-needs-payment-button.user-top-button
span#list-needs-help-button.user-top-button
= top_bar title: 'show_products.title' do
.pull-right
.table-number
.supplier-name
.action-buttons
= link_to content_tag(:span, t('helpers.links.show_active_list'), list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list'
span#list-needs-payment-button.user-top-button
span
span#list-needs-help-button.user-top-button
span
.well
table#products-table.table
tbody