Progress and cleanup code
This commit is contained in:
@@ -14,7 +14,7 @@ if list.closed_at
|
||||
.display-field: App.CloseListButtonView content=list
|
||||
.row
|
||||
each user in list.users
|
||||
img.facebook-image src="http://graph.facebook.com/#{unbound user.facebook_id}/picture?type=square" alt="f"
|
||||
=user.facebook_image_tag
|
||||
if list.sorted_orders
|
||||
.list-orders-container
|
||||
each order in list.sorted_orders
|
||||
|
||||
@@ -55,14 +55,3 @@ App.SectionTableView = Ember.View.extend DragNDrop.Draggable,
|
||||
@$el.on 'click', =>
|
||||
# duplication of .table-actions because variable gets unshadowed
|
||||
@$('.table-actions').toggle() if @$el.hasClass('occupied') and not @get('controller.editmode')
|
||||
#@$el.qtip
|
||||
#content:
|
||||
#text: content
|
||||
#title: title.html()
|
||||
#style:
|
||||
#classes: 'qtip-wiki qtip-light qtip-shadow'
|
||||
#show: 'click'
|
||||
#hide:
|
||||
#fixed: true
|
||||
#delay: 500
|
||||
#prerender: true
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
//= require modernizr
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery-ui/sortable
|
||||
//= require modernizr
|
||||
// require foundation FOUNDATION 5 JAVASCRIPT IMPLEMENTATIONS AND EMBER ARE NOT COMPATIBLE, FOUNDATION IS TOO SIMPLISTIC AT THE MOMENT AND DESTROYS DOM EVENTS
|
||||
//= require js-routes
|
||||
//= require moment
|
||||
//= require translations
|
||||
//= require qwaiter
|
||||
// require qwaiter
|
||||
//= require ./qsupplier
|
||||
//= require handlebars
|
||||
//= require faye
|
||||
//= require ./base
|
||||
//= require qtip
|
||||
// require qtip # was used for table actions in section view, now done by EMBER
|
||||
//= require pickdate
|
||||
//= require_directory .
|
||||
//= require_self
|
||||
//= require moment
|
||||
|
||||
var Qstorage = localStorage;
|
||||
|
||||
$.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
|
||||
$.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
|
||||
|
||||
String.prototype.capitalize = function() {
|
||||
return this.charAt(0).toUpperCase() + this.slice(1);
|
||||
}
|
||||
String.prototype.capitalize = function() { return this.charAt(0).toUpperCase() + this.slice(1); }
|
||||
|
||||
window.time_zones = <%= ActiveSupport::TimeZone.all.map{|tz| {name: tz.name, formatted: "GMT#{tz.formatted_offset} #{tz.name}"}}.to_json.html_safe %>;
|
||||
window.countries = <%= IsoCountryCodes.all.map{|cc| {name: cc.name}}.to_json.html_safe %>;
|
||||
|
||||
@@ -41,7 +41,12 @@ function redirect_to(mapping, variables){
|
||||
window.location = path_mapping[mapping] + '?' + vars.join('&')
|
||||
}
|
||||
function currency(num) {
|
||||
return Qwaiter.currency(num);
|
||||
// num = 0.0 if isNaN(num) || num == '' || num == null
|
||||
// '€ ' + parseFloat(num).toFixed(2)
|
||||
if (isNaN(num) || num === '' || num === null) {
|
||||
num = 0.0;
|
||||
}
|
||||
return '€ ' + parseFloat(num).toFixed(2);
|
||||
}
|
||||
|
||||
Handlebars.registerHelper('t', function(tlocation) {
|
||||
|
||||
@@ -14,3 +14,4 @@ aside.side-menu
|
||||
.supplier-close-shop
|
||||
+alert($bg: $alert-color, $radius: true)
|
||||
padding: 3px
|
||||
margin-right: 20px
|
||||
|
||||
@@ -3,7 +3,7 @@ $side-spacing: 0px
|
||||
+alert($bg: $secondary-color)
|
||||
.close
|
||||
+alert-close
|
||||
.open-supplier-button
|
||||
.supplier-open-shop
|
||||
+button($padding: $button-tny)
|
||||
margin: 0
|
||||
margin-left: 20px
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
float: left
|
||||
margin-left: 10px
|
||||
select
|
||||
width: 50px
|
||||
width: 70px
|
||||
&:after
|
||||
content: " :"
|
||||
.products_preview-minute
|
||||
float: left
|
||||
margin-left: 10px
|
||||
select
|
||||
width: 50px
|
||||
width: 70px
|
||||
#products-table
|
||||
width: 100%
|
||||
|
||||
@@ -32,9 +32,11 @@ html lang="en"
|
||||
a.close data-dismiss="alert" ×
|
||||
- if current_supplier.closed?
|
||||
.supplier-is-closed
|
||||
= t('supplier.you_are_currently_closed_alert')
|
||||
span data-t="supplier.you_are_currently_closed_alert"
|
||||
= form_tag supplier_mark_as_open_path do
|
||||
= submit_tag t('supplier.mark_as_open_button'), class: ['open-supplier-button']
|
||||
/ = submit_tag t('supplier.mark_as_open_button'), class: ['open-supplier-button']
|
||||
a.supplier-open-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()"
|
||||
span data-t="supplier.open_for_orders"
|
||||
a.close{data-dismiss="alert"} ×
|
||||
.row
|
||||
.span12
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
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"
|
||||
meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, height=device-height, target-densitydpi=device-dpi"
|
||||
meta name="msapplication-tap-highlight" content="no"
|
||||
|
||||
title= application_title
|
||||
= javascript_include_tag "vendor/modernizr"
|
||||
= stylesheet_link_tag "user/foundation/application"
|
||||
|
||||
@@ -29,7 +29,8 @@ aside.side-menu
|
||||
- if current_supplier.open?
|
||||
li
|
||||
= form_tag supplier_mark_as_closed_path do
|
||||
= submit_tag t('supplier.close'), class: 'supplier-close-shop', onClick: %|$(this).parents('form').submit()|
|
||||
a.supplier-close-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()"
|
||||
span data-t="supplier.close_for_orders"
|
||||
li= link_to 'Settings', supplier_settings_path, class: 'supplier-settings-link'
|
||||
li= link_to 'Logout', destroy_supplier_session_path, method: :delete, class: 'supplier-sign-out-link'
|
||||
/.navbar.navbar-fixed-top.navbar-inverse
|
||||
|
||||
Reference in New Issue
Block a user