Make user app better and more simple :happy:

2014-04-01 21:37:03 +01:00
parent 14217efad3
commit 5bf9c5be59
22 changed files with 77 additions and 119 deletions
@@ -0,0 +1,18 @@
+each user in list.users
+  img.facebook-image src="http://graph.facebook.com/#{unbound user.facebook_id}/picture?type=square" alt="f"
+if list.orders
+  .list-orders-container
+    each order in orders
+      .list-order-container class=order.state
+        = order.display
+        span.currency= currency order.total
+    if displayTotal
+      .list-orders-total.total
+        = t 'total'
+        span.currency= currency model.total
+else
+  p
+    span=t 'active_list.no_orders_explanation'
+    br
+    link-to 'list_products' class="button"
+      span=t 'list_products.title'
@@ -1,25 +1,7 @@
 .row
  h2=t 'active_list.title'
  if list
-    each user in list.users
-      img.facebook-image src="http://graph.facebook.com/#{unbound user.facebook_id}/picture?type=square"
-    if list.orders
-      .list-orders-container
-        each order in orders
-          .list-order-container class=order.state
-            = order.display
-            span.currency= currency order.total
-        if displayTotal
-          .list-orders-total.total
-            = t 'total'
-            span.currency= currency model.total
-    else
-      p
-        span=t 'active_list.no_orders_explanation'
-        br
-        link-to 'list_products' class="button"
-          span=t 'list_products.title'
-
+    partial "list_content"
  else
    p
      span=t 'active_list.not_active.message'
@@ -1,10 +1,5 @@
 .row
  h2=t 'models.list'
-  p Hoi
-  = controller
-  if model.is_extended_version
-    h3 Extended
-  else
-    h3 Not extended
+  partial "list_content"
  link-to 'lists'
    span Go to lists
@@ -1,13 +0,0 @@
-.row
-  .large-6.columns
-    each product_category in controller
-      if product_category.products
-        hr
-        h4= product_category.name
-        hr
-        ul.product_category-products
-          each product in product_category.products
-            li
-              a{action addProduct product}= product.name
-              span.right.currency=currency product.price
-  .large-6.columns= render 'product_orders'
@@ -1,9 +0,0 @@
-h2= List products for table
-/.row
-  .large-6.columns
-    each product_category in controller
-      hr
-      h4= product_category.name
-      hr
-      each product in product_category.products
-        a{action addProduct product}= product.name
@@ -1,16 +1,16 @@
 hr.hide-for-medium-up
-if model
+if modelDisabled
  a.tiny.button.right{action clearProductOrders} href="#" &times;
 .clearfix
 .panel
  ul.product-orders
    each product_order in controller
-      li
+      li.product_order
        = product_order.quantity
        |  x 
        = product_order.product.name
-        a.product_order-remove.right{action removeProductOrder product_order}
-          span.fa.fa-close.fa-lg x
+        button.product_order-remove.right{action removeProductOrder product_order}
+          span.icon
        span.currency=currency product_order.total
    else
      li= t 'product_orders.no_orders'
@@ -15,13 +15,19 @@
      each product_category in supplier.product_categories
        if product_category.products
          hr
-          h4= product_category.name
+          h4.product_category-title{action toggleProductCategory product_category}
+            if product_category.collapsed
+              span.icon.collapsed
+            else
+              span.icon
+            = product_category.name
          hr
-          ul.product_category-products
-            each product in product_category.products
-              li
-                a{action addProduct product}= product.name
-                span.right.currency=currency product.price
+          unless product_category.collapsed
+            ul.product_category-products
+              each product in product_category.products
+                li
+                  a{action addProduct product}= product.name
+                  span.right.currency=currency product.price
    .large-6.columns= render 'product_orders'
  else
    .large12