summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-11-19 18:50:39 -0500
committerJules Laplace <jules@okfoc.us>2015-11-19 18:50:39 -0500
commit06910c8fd4df3daa47f5cdfcbc687b1072909f52 (patch)
treeec6ef18457536d219f3287e020d744ba3e773071
parent39b395f28ed7eb0d24eef6b2e50a3a235af0b31e (diff)
parent this
-rw-r--r--StoneIsland/www/css/account.css9
-rw-r--r--StoneIsland/www/index.html2
-rw-r--r--StoneIsland/www/js/lib/account/OrdersView.js8
-rw-r--r--StoneIsland/www/js/lib/auth/SignupView.js3
4 files changed, 15 insertions, 7 deletions
diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css
index a06dc8f8..1d3506e5 100644
--- a/StoneIsland/www/css/account.css
+++ b/StoneIsland/www/css/account.css
@@ -39,6 +39,15 @@
display: none;
}
+#orders.list {
+}
+#orders.single {
+}
+
+#order_list {
+}
+#single_order {
+}
.settings #settings { display: block }
#settings {
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 8537b7bd..ab76d595 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -538,7 +538,7 @@
</div>
<div id="cart_thanks">
- <b>GRAZIE</b>
+ <b>THANK YOU</b>
<p>
Please check your inbox for your confirmation email.
</p>
diff --git a/StoneIsland/www/js/lib/account/OrdersView.js b/StoneIsland/www/js/lib/account/OrdersView.js
index 66648b36..78a67e43 100644
--- a/StoneIsland/www/js/lib/account/OrdersView.js
+++ b/StoneIsland/www/js/lib/account/OrdersView.js
@@ -3,13 +3,13 @@ var OrdersView = View.extend({
el: "#orders",
events: {
- "click .back": "back"
- "click .details": "load_single"
+ "click .back": "back",
+ "click .details": "load_single",
},
initialize: function(){
- this.single = new SingleOrder ()
- this.list = new OrderList ()
+ this.single = new SingleOrder ({ parent: this })
+ this.list = new OrderList ({ parent: this })
},
show: function(){
diff --git a/StoneIsland/www/js/lib/auth/SignupView.js b/StoneIsland/www/js/lib/auth/SignupView.js
index 123b47a6..0cfbf8b4 100644
--- a/StoneIsland/www/js/lib/auth/SignupView.js
+++ b/StoneIsland/www/js/lib/auth/SignupView.js
@@ -2,7 +2,7 @@ var SignupView = FormView.extend({
el: "#signup",
- action: sdk.account.login,
+ action: sdk.account.signup,
events: {
"submit form": "save",
@@ -28,7 +28,6 @@ var SignupView = FormView.extend({
"ConfirmEmail": "Please enter a valid email address.",
"Password": "Please enter your password.",
"Password2": "Please enter your password again.",
- "YooxLetter": "You must agree to data profiling.",
"DataProfiling": "You must agree to data profiling.",
},