stub in ordersview

7 files changed, 24 insertions, 3 deletions

diff --git a/StoneIsland/www/css/blogs.css b/StoneIsland/www/css/blogs.css
index e259f3d7..c83ed355 100644
--- a/StoneIsland/www/css/blogs.css
+++ b/StoneIsland/www/css/blogs.css
@@ -44,4 +44,8 @@
 .care #care { display: block }
 .page {
   display: none;
+}
+
+.page .content {
+  padding: 10px;
 }
\ No newline at end of file
diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html
index 41cd7fc5..4714a279 100644
--- a/StoneIsland/www/index.html
+++ b/StoneIsland/www/index.html
@@ -44,7 +44,7 @@
       <span class="payment">PAYMENT</span>
       <span class="shipping">SHIPPING</span>
       <span class="orders">ORDERS</span>
-      <span class="return">RETURN</span>
+      <span class="return_link">RETURN</span>
       <span class="settings">NOTIFICATIONS</span>
     </div>
     <div class="faq_menu">
@@ -660,6 +660,7 @@
 <script src="js/lib/account/PaymentView.js"></script>
 <script src="js/lib/account/ShippingView.js"></script>
 <script src="js/lib/account/SettingsView.js"></script>
+<script src="js/lib/account/OrdersView.js"></script>
 
 <script src="js/lib/products/CollectionView.js"></script>
 <script src="js/lib/products/filters/CategoryFilter.js"></script>
diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js
index 3d8d46bb..72d105cf 100644
--- a/StoneIsland/www/js/index.js
+++ b/StoneIsland/www/js/index.js
@@ -45,6 +45,7 @@ var app = (function(){
     app.payment = new PaymentView ()
     app.shipping = new ShippingView ()
     app.settings = new SettingsView ()
+    app.orders = new OrdersView ()
 
 	  app.intro = new IntroView ()
 	  app.terms = new PageView ({ page: "terms" })
diff --git a/StoneIsland/www/js/lib/_router.js b/StoneIsland/www/js/lib/_router.js
index 20ef2ce1..80ea9c39 100644
--- a/StoneIsland/www/js/lib/_router.js
+++ b/StoneIsland/www/js/lib/_router.js
@@ -19,6 +19,7 @@ var SiteRouter = Router.extend({
     '/account/profile':   'profile',
     '/account/payment':   'payment',
     '/account/shipping':  'shipping',
+    '/account/orders':    'orders',
     '/account/settings':  'settings',
 
     '/page/terms':        'terms',
diff --git a/StoneIsland/www/js/lib/account/OrdersView.js b/StoneIsland/www/js/lib/account/OrdersView.js
new file mode 100644
index 00000000..f269b7cf
--- /dev/null
+++ b/StoneIsland/www/js/lib/account/OrdersView.js
@@ -0,0 +1,4 @@
+var OrdersView = ScrollableView.extend({
+
+
+})
diff --git a/StoneIsland/www/js/lib/nav/NavView.js b/StoneIsland/www/js/lib/nav/NavView.js
index 2145c163..1a519de7 100644
--- a/StoneIsland/www/js/lib/nav/NavView.js
+++ b/StoneIsland/www/js/lib/nav/NavView.js
@@ -19,6 +19,8 @@ var NavView = View.extend({
     "click .payment": "payment",
     "click .shipping": "shipping",
     "click .settings": "settings",
+    "click .orders": "orders",
+    "click .return_link": "return_link",
     
     "click .faq_back": "back",
     "click .privacy": "privacy",
@@ -96,10 +98,18 @@ var NavView = View.extend({
     this.hide()
     app.router.go("account/shipping")
   },
+  orders: function(){
+    this.hide()
+    app.router.go("account/orders")
+  },
   settings: function(){
     this.hide()
     app.router.go("account/settings")
   },
+  return_link: function(){
+    window.open("http://www.stoneisland.com/", '_system')
+  },
+
 
   faq: function(){
     this.el.className = "faq"
diff --git a/StoneIsland/www/js/sdk/auth.js b/StoneIsland/www/js/sdk/auth.js
index 95a1dc56..572823c3 100644
--- a/StoneIsland/www/js/sdk/auth.js
+++ b/StoneIsland/www/js/sdk/auth.js
@@ -60,11 +60,11 @@ var auth = sdk.auth = (function(){
 
   auth.view_logged_in = function(){
     $("#nav .login").hide()
-    $("#nav .account").show()
+    $("#nav .account, #nav .logout").show()
   }
   auth.view_logged_out = function(){
     $("#nav .login").show()
-    $("#nav .account").hide()
+    $("#nav .account, #nav .logout").hide()
   }
   
   auth.log_out = function(){