diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store
index 7dd0890c..21735e3d 100644
Binary files a/app/assets/images/.DS_Store and b/app/assets/images/.DS_Store differ
diff --git a/app/assets/images/icons/logo-big.png b/app/assets/images/icons/logo-big.png
new file mode 100644
index 00000000..93f661cf
Binary files /dev/null and b/app/assets/images/icons/logo-big.png differ
diff --git a/app/assets/images/icons/logo-small.png b/app/assets/images/icons/logo-small.png
new file mode 100644
index 00000000..a4730610
Binary files /dev/null and b/app/assets/images/icons/logo-small.png differ
diff --git a/app/assets/images/qr.png b/app/assets/images/qr.png
new file mode 100644
index 00000000..4d44bd35
Binary files /dev/null and b/app/assets/images/qr.png differ
diff --git a/app/assets/javascripts/jquery.cookie.js b/app/assets/javascripts/jquery.cookie.js
deleted file mode 100644
index 6df1faca..00000000
--- a/app/assets/javascripts/jquery.cookie.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-
-/**
- * Create a cookie with the given name and value and other optional parameters.
- *
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Set the value of a cookie.
- * @example $.cookie('the_cookie', 'the_value', { expires: 7, path: '/', domain: 'jquery.com', secure: true });
- * @desc Create a cookie with all available options.
- * @example $.cookie('the_cookie', 'the_value');
- * @desc Create a session cookie.
- * @example $.cookie('the_cookie', null);
- * @desc Delete a cookie by passing null as value. Keep in mind that you have to use the same path and domain
- * used when the cookie was set.
- *
- * @param String name The name of the cookie.
- * @param String value The value of the cookie.
- * @param Object options An object literal containing key/value pairs to provide optional cookie attributes.
- * @option Number|Date expires Either an integer specifying the expiration date from now on in days or a Date object.
- * If a negative value is specified (e.g. a date in the past), the cookie will be deleted.
- * If set to null or omitted, the cookie will be a session cookie and will not be retained
- * when the the browser exits.
- * @option String path The value of the path atribute of the cookie (default: path of page that created the cookie).
- * @option String domain The value of the domain attribute of the cookie (default: domain of page that created the cookie).
- * @option Boolean secure If true, the secure attribute of the cookie will be set and the cookie transmission will
- * require a secure protocol (like HTTPS).
- * @type undefined
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-
-/**
- * Get the value of a cookie with the given name.
- *
- * @example $.cookie('the_cookie');
- * @desc Get the value of a cookie.
- *
- * @param String name The name of the cookie.
- * @return The value of the cookie.
- * @type String
- *
- * @name $.cookie
- * @cat Plugins/Cookie
- * @author Klaus Hartl/klaus.hartl@stilbuero.de
- */
-jQuery.cookie = function(name, value, options) {
- if (typeof value != 'undefined') { // name and value given, set cookie
- options = options || {};
- if (value === null) {
- value = '';
- options.expires = -1;
- }
- var expires = '';
- if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
- var date;
- if (typeof options.expires == 'number') {
- date = new Date();
- date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
- } else {
- date = options.expires;
- }
- expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
- }
- // CAUTION: Needed to parenthesize options.path and options.domain
- // in the following expressions, otherwise they evaluate to undefined
- // in the packed version for some reason...
- var path = options.path ? '; path=' + (options.path) : '';
- var domain = options.domain ? '; domain=' + (options.domain) : '';
- var secure = options.secure ? '; secure' : '';
- document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
- } else { // only name given, get cookie
- var cookieValue = null;
- if (document.cookie && document.cookie != '') {
- var cookies = document.cookie.split(';');
- for (var i = 0; i < cookies.length; i++) {
- var cookie = jQuery.trim(cookies[i]);
- // Does this cookie string begin with the name we want?
- if (cookie.substring(0, name.length + 1) == (name + '=')) {
- cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
- break;
- }
- }
- }
- return cookieValue;
- }
-};
\ No newline at end of file
diff --git a/app/assets/javascripts/qrammer.js.coffee b/app/assets/javascripts/qrammer.js.coffee
index 666e171c..75b66c73 100644
--- a/app/assets/javascripts/qrammer.js.coffee
+++ b/app/assets/javascripts/qrammer.js.coffee
@@ -21,33 +21,6 @@ root.Qrammer =
num = 0.0 if isNaN(num) || num == '' || num == null
'€ ' + parseFloat(num).toFixed(2)
-
- build_product_list_as_modal: ->
- wrapper = $('
')
- callback_wrapper = ->
- wrapper.modal('hide')
- callback()
- header = $('')
- .append('× ')
- .append('Product list ').appendTo(wrapper)
-
- body = $('
')
- table = $('').appendTo(body)
- tbody = $(''+info.product.name+' ')
- row.append(''+info.number+' ')
- row.append(''+Qrammer.currency(info.product.price * info.number)+' ')
-
- body.appendTo(wrapper)
-
- footer = $('')
- .append($('Close ').click(-> wrapper.modal('hide')))
- .append($('Yes ').click(callback_wrapper))
- .appendTo(wrapper)
- wrapper.modal()
-
jQuery.ajaxSetup
'beforeSend': (xhr) ->
xhr.setRequestHeader("Accept", "text/javascript")
diff --git a/app/assets/javascripts/supplier/application.js b/app/assets/javascripts/supplier/application.js
new file mode 100644
index 00000000..de94066b
--- /dev/null
+++ b/app/assets/javascripts/supplier/application.js
@@ -0,0 +1,38 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require twitter/bootstrap
+//= require_directory .
+//= require_self
+var path_mapping = {
+ user_root: '/user',
+ join_occupied_table: '/user/join_occupied_table',
+ list_products_for_table: '/user/list_products_for_table',
+ list_products: '/user/list_products'
+}
+function redirect_to(mapping, variables){
+ variables || (variables = {});
+ var vars = []
+ for(var name in variables){
+ vars.push(name + '=' +variables[name])
+ }
+ window.location = path_mapping[mapping] + '?' + vars.join('&')
+}
+function currency(num) {
+ if (isNaN(num) || num === '' || num === null) {
+ num = 0.0;
+ }
+ return '€ ' + parseFloat(num).toFixed(2);
+}
diff --git a/app/assets/javascripts/qsupplier.js.coffee b/app/assets/javascripts/supplier/qsupplier.js.coffee
similarity index 95%
rename from app/assets/javascripts/qsupplier.js.coffee
rename to app/assets/javascripts/supplier/qsupplier.js.coffee
index 2cb8b084..a1f44df7 100644
--- a/app/assets/javascripts/qsupplier.js.coffee
+++ b/app/assets/javascripts/supplier/qsupplier.js.coffee
@@ -86,12 +86,12 @@ root.Qsupplier=
row.append($(''+Qrammer.currency(res.total_amount)+' '+currency(res.total_amount)+' '+Qrammer.currency(res.total_amount)+' '+currency(res.total_amount)+' '+category+'
')
+ callback_wrapper = ->
+ wrapper.modal('hide')
+ callback()
+ header = $('')
+ .append('× ')
+ .append('Product list ').appendTo(wrapper)
+
+ body = $('
')
+ table = $('').appendTo(body)
+ tbody = $(''+info.product.name+' ')
+ row.append(''+info.number+' ')
+ row.append(''+Qrammer.currency(info.product.price * info.number)+' ')
+
+ body.appendTo(wrapper)
+
+ footer = $('')
+ .append($('Close ').click(-> wrapper.modal('hide')))
+ .append($('Yes ').click(callback_wrapper))
+ .appendTo(wrapper)
+ wrapper.modal()
diff --git a/public/favicon.ico b/public/favicon.ico
index e69de29b..88d5668a 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ