cloudrider 0.1.2 → 0.1.3

data/generica/app/assets/javascripts/routes/admin/taxons/new_route.js.em

@@ -0,0 +1,2 @@
+class Apiv1.AdminTaxonsNewRoute extends Ember.Route
+  model: -> @store.createRecord "admin_taxon"

data/generica/app/assets/javascripts/routes/index_route.js.em

@@ -1,4 +1,5 @@
 class Apiv1.IndexRoute extends Ember.Route
   model: -> 
-    products: @store.find("product", per: 3)
-    employees: @store.find("employee", per: 5)
+    products: @store.find("product", per: 3, order: "showcase")
+    employees: @store.find("employee", per: 5)
+    message: @store.createRecord("message")

data/generica/app/assets/javascripts/routes/products/index_route.js.em

@@ -1,3 +1,3 @@
 class Apiv1.ProductsIndexRoute extends Ember.Route
   model: ->
-    taxons: @store.find "taxon"
+    taxons: @store.find "taxon", parent_id: null

data/generica/app/assets/javascripts/templates/admin.emblem

@@ -1,22 +1,34 @@
 .row
   .small-12.columns
     h1.capitalize
-      link-to "admin"
+      link-to "admin.index"
         tr-span en="admin panel"
 
 .row.admin-nav-tabs
-  .small-12.medium-4.large-4.columns
+  .small-6.medium-4.large-2.columns
+    link-to "admin" class="admin-nav-tab"
+      span.capitalize
+        tr-span en="dashboard"
+  .small-6.medium-4.large-2.columns
     link-to "admin.products.index" class="admin-nav-tab"
       span.capitalize
         tr-span en="products"
-  .small-12.medium-4.large-4.columns
+  .small-6.medium-4.large-2.columns
     link-to "admin.employees.index" class="admin-nav-tab"
       span.capitalize
-        tr-span en="employee contacts"
-  .small-12.medium-4.large-4.columns
+        tr-span en="contacts"
+  .small-6.medium-4.large-2.columns
     link-to "admin.translations" class="admin-nav-tab"
       span.capitalize
         tr-span en="translations"
+  .small-6.medium-4.large-2.columns
+    link-to "admin.taxons.index" class="admin-nav-tab"
+      span.capitalize
+        tr-span en="categories"
+  .small-6.medium-4.large-2.columns
+    link-to "admin.messages.index" class="admin-nav-tab"
+      span.capitalize
+        tr-span en="messages"
 
 .row
   .small-12.columns

data/generica/app/assets/javascripts/templates/admin/messages/index.emblem

@@ -0,0 +1,19 @@
+.row.admin-messages-index
+  .small-12.columns
+    each message in messages
+      == render "admin/messages/slice" message
+    else
+      .admin-message-slice
+        i.fa.fa-cog.fa-spin
+        span.prespace
+          tr-span en="now loading"
+
+.row
+  .small-4.medium-3.large-2.columns
+    span.bold.colon
+      tr-span en="messages"
+    span.prespace= messages.length
+
+.row
+  .small-12.columns
+    fancy-paginator per=per page=page metadatum=metadatum

data/generica/app/assets/javascripts/templates/admin/messages/slice.emblem

@@ -0,0 +1,12 @@
+.admin-message-slice
+  .actions
+    .view
+      i.fa.fa-user
+      span.prespace= model.fromCompany
+      span.predash= model.senderEmail
+    .date
+      span.time-created= model.createdAt
+
+  .summary
+    .media-subject.bold= model.subjectText
+    .media-text= model.message

data/generica/app/assets/javascripts/templates/admin/product/edit.emblem

@@ -1,3 +1,10 @@
+.row
+  .small-6.medium-4.large-2.columns.end
+    link-to "admin.products.index" class="button expand secondary"
+      i.fa.fa-chevron-left
+      span.capitalize.bold 
+        tr-span en="back"
+
 .row.admin-products-new
   form-for errors=failureReason submit="formSubmitted"
     .small-12.columns
@@ -33,6 +40,12 @@
           label.form-label
             tr-span en="anything else?"
             Ember.TextArea name="others" value=adminProduct.others
+        .input-section attr-name="showcaseOrder"
+          label.form-label
+            tr-span en="showcase display number"
+            span.parantheses
+              tr-span en="the smaller the number, the higher up it appears in the showcase on the front page"
+            Ember.TextField type="number" name="showcaseOrder" value=adminProduct.showcaseOrder
     
     .small-12.columns
       fieldset
@@ -51,19 +64,23 @@
               span.parantheses
                 tr-span en="the first picture will be displayed in the showcase"
             files-field name="pictures" files=adminProduct.pictures class="form-control upload-control"
+
+    .small-12.columns
+      fieldset
+        legend.capitalize.bold
+          tr-span en="categorize"
+        .input-section attr-name="taxons"
+          label.form-label
+            tr-span en="select appropriate category tags for this product"
+          tree-taxon-wrapper taxons=rootTaxons activeTaxons=activeTaxons
     
     .small-12.columns
       fieldset
         legend.capitalize.bold
           tr-span en="actions"
         .actions.row
-          .small-6.columns
+          .small-6.columns.end
             promise-button model=adminProduct class="button expand"
               i.fa.fa-check
               span.capitalize.bold
                 tr-span en="save"
-          .small-6.columns.end
-            link-to "admin.products.index" class="button expand secondary"
-              i.fa.fa-times
-              span.capitalize.bold
-                tr-span en="back"

data/generica/app/assets/javascripts/templates/admin/products/new.emblem

@@ -1,3 +1,9 @@
+.row
+  .small-6.medium-4.large-2.columns.end
+    link-to "admin.products.index" class="button expand secondary"
+      i.fa.fa-chevron-left
+      span.capitalize.bold 
+        tr-span en="back"
 .row.admin-products-new
   .small-12.columns
     form-for errors=failureReason submit="formSubmitted"
@@ -33,6 +39,12 @@
           label.form-label
             tr-span en="anything else?"
             Ember.TextArea name="others" value=model.others
+        .input-section attr-name="showcaseOrder"
+          label.form-label
+            tr-span en="showcase display number"
+            span.parantheses
+              tr-span en="the smaller the number, the higher up it appears in the showcase on the front page"
+            Ember.TextField type="number" name="showcaseOrder" value=model.showcaseOrder
         .input-section attr-name="files"
           label.form-label
             tr-span en="related files"
@@ -46,6 +58,10 @@
               span.parantheses
                 tr-span en="the first picture will be displayed in the showcase"
             files-field name="pictures" files=model.pictures class="form-control upload-control"
+        .input-section attr-name="taxons"
+          label.form-label
+            tr-span en="select appropriate category tags for this product"
+          tree-taxon-wrapper taxons=rootTaxons activeTaxons=activeTaxons
         
         .actions.row
           .small-6.columns.end
@@ -53,4 +69,5 @@
               i.fa.fa-check
               span.capitalize.bold 
                 tr-span en="submit"
+          
             

data/generica/app/assets/javascripts/templates/admin/products/slice.emblem

@@ -4,6 +4,9 @@
       link-to "admin.product.edit" model.id
         i.fa.fa-eye
         span.prespace= model.material
+        if model.hasShowOrder
+          span #
+          span= model.showcaseOrder
     .edit
       link-to "admin.product.edit" model.id
         i.fa.fa-edit
@@ -19,4 +22,6 @@
     .media-object
       img.product-image.th src=model.pictures.firstObject.picUrl
 
-    .media-text= model.roughSummary
+    .media-text
+      .summary-text= model.roughSummary
+      .created-date= model.createdAt

data/generica/app/assets/javascripts/templates/admin/taxon/edit.emblem

@@ -0,0 +1,36 @@
+.row
+  .small-6.medium-4.large-3.columns.end
+    link-to "admin.taxons.index" class="button expand secondary"
+      span.spacebar
+        i.fa.fa-chevron-left
+      tr-span en="back"
+
+.row.admin-products-new
+  .small-12.columns
+    form-for errors=failureReason submit="formSubmitted"
+      fieldset
+        legend.capitalize.bold 
+          tr-span en="edit category"
+
+        .input-section attr-name="taxonName"
+          label.form-label
+            span.asterisk
+              tr-span en="the name of this new category"
+            Ember.TextField name="taxonName" value=model.taxonName placeholder="shellfish"
+        .input-section attr-name="explanation"
+          label.form-label
+            tr-span en="describe this category"
+            Ember.TextArea name="explanation" value=model.explanation placeholder="fishes with shell"
+
+        .actions.row
+          .small-6.columns
+            promise-button model=model class="button expand"
+              i.fa.fa-check
+              span.capitalize.bold.prespace
+                tr-span en="submit"
+          .small-6.columns.end
+            link-to "admin.taxons.index" class="button expand secondary"
+              span.spacebar
+                i.fa.fa-chevron-left
+              span.capitalize.bold
+                tr-span en="back"

data/generica/app/assets/javascripts/templates/admin/taxons/index.emblem

@@ -3,7 +3,7 @@
     link-to "admin.taxons.new" class="button expand success"
       span.spacebar
         i.fa.fa-plus
-      tr-span en="new taxon"
+      tr-span en="new category"
 
 .row
   .small-12.columns.taxons

data/generica/app/assets/javascripts/templates/admin/taxons/new.emblem

@@ -0,0 +1,40 @@
+.row
+  .small-6.medium-4.large-3.columns.end
+    link-to "admin.taxons.index" class="button expand secondary"
+      span.spacebar
+        i.fa.fa-chevron-left
+      tr-span en="back"
+
+.row.admin-products-new
+  .small-12.columns
+    form-for errors=failureReason submit="formSubmitted"
+      fieldset
+        legend.capitalize.bold 
+          tr-span en="new category"
+        .input-info
+          label.form-label
+            tr-span en="category parent"
+            .thing.bold= parentTaxon.taxonName
+
+        .input-section attr-name="taxonName"
+          label.form-label
+            span.asterisk
+              tr-span en="the name of this new category"
+            Ember.TextField name="taxonName" value=model.taxonName placeholder="shellfish"
+        .input-section attr-name="explanation"
+          label.form-label
+            tr-span en="describe this category"
+            Ember.TextArea name="explanation" value=model.explanation placeholder="fishes with shell"
+
+        .actions.row
+          .small-6.columns
+            promise-button model=model class="button expand"
+              i.fa.fa-check
+              span.capitalize.bold.prespace
+                tr-span en="submit"
+          .small-6.columns.end
+            link-to "admin.taxons.index" class="button expand secondary"
+              span.spacebar
+                i.fa.fa-chevron-left
+              span.capitalize.bold
+                tr-span en="back"

data/generica/app/assets/javascripts/templates/admin/translations/index.emblem

@@ -13,7 +13,7 @@
   .medium-3.small-12.columns
     label
       tr-span en="locales"
-      Ember.Select "select" content=locales value=locale class="select-control"
+      Ember.Select content=locales value=locale class="select-control"
 
 if missingTranslations
   .row.missing-translations

data/generica/app/assets/javascripts/templates/components/product-display.emblem

@@ -8,6 +8,10 @@ if product
         tr-span en=product.material
         if product.sku
           span.predash= product.sku
+    if product.taxons
+      .taxon-tags
+        each taxon in product.taxons
+          span.tag= taxon.taxonName
     if product.others
       p.product-summary
         tr-span en=product.others

data/generica/app/assets/javascripts/templates/components/product-listing.emblem

@@ -8,6 +8,11 @@ if product
         if product.quality
           span.predash
             tr-span en=product.quality
+        span.right
+          if product.hasShowOrder
+            span #
+            span.spacebar= product.showcaseOrder
+
       .smaller-details
         if product.price
           span= product.price
@@ -15,6 +20,10 @@ if product
           span @
           tr-span en=product.place
   
+      if product.taxons
+        .taxon-tags
+          each taxon in product.taxons
+            span.tag= taxon.taxonName
 else
   .product-header
     .media-object

data/generica/app/assets/javascripts/templates/components/search-and-filter.emblem

@@ -5,7 +5,7 @@
   .small-12.columns.query
     .row.collapse
       .small-10.columns
-        type-ahead data=taxons value=searchQuery name="fullName" class="full-width"
+        Ember.TextField value=searchQuery class="full-width" name="search"
       .small-2.columns
         button.button.postfix click="search"
           i.fa.fa-search

data/generica/app/assets/javascripts/templates/components/site-nav/_top-nav.emblem

@@ -10,7 +10,7 @@
         i.fa.fa-info-circle
       .menu-nav.show-for-medium-up 
         tr-span en="about"
-    link-to "index" (query-params anchor="products") class="menu-tab"
+    link-to "products.index" class="menu-tab"
       .hide-for-medium-up
         i.fa.fa-tags
       .menu-nav.show-for-medium-up 

data/generica/app/assets/javascripts/templates/components/table-booths.emblem

@@ -2,73 +2,11 @@
 
 /# business-cards side-by-side
 .business-cards-side.small-12.large-6.columns
-  .row
-    .small-12.columns
-      h2.capitalize.align-right
-        tr-span en="our team"
-  .row
-    each contact in contacts
-      .small-12.medium-6.columns
-        .business-card.panel.radius
-          .text-right
-            .name.capitalize= contact.personName
-            .job= contact.employeeTitle
-
-          .text-left
-            .info
-              span.bold.capitalize.colon
-                tr-span en="email"
-              span.prespace= contact.email
-            .info
-              span.bold.capitalize.colon
-                tr-span en="phone"
-              span.prespace= contact.phoneNumber
-
-    else
-      .small-12.medium-6.columns
-        .business-card.panel.radius
-          .text-right
-            .name
-              i.fa.fa-cog.fa-spin
-              span.capitalize.prespace 
-                tr-span en="loading employees"
-            .job
-              tr-span en="or perhaps no employees have been listed"
+  == render "employees/index" contacts
+  
 
 .contact-form-side.small-12.large-6.columns
-  .row
-    .small-12.columns
-      h2.capitalize.white.align-left
-        tr-span en="contact us"
-      form
-        label
-          .capitalize.white
-            span.asterisk
-            tr-span en="your company"
-          input type="text" placeholder="ex. Jack Smith"
-
-        label
-          .capitalize.white
-            span.asterisk
-            tr-span en="company email"
-          input type="email" placeholder="ex. jsmith@gmail.com"
-
-        label
-          .capitalize.white
-            span.asterisk
-            tr-span en="subject"
-          input type="text"
-          
-        label
-          .capitalize.white
-            span.asterisk
-            tr-span en="message"
-          textarea
-
-        .button-forms
-          button class="button expand"
-            span.capitalize 
-              tr-span en="submit"
+  == render "messages/new" message
 
 /# personal-blurb top-and-bottom
 

data/generica/app/assets/javascripts/templates/components/tree-taxon-li.emblem

@@ -1,6 +1,6 @@
 .taxon-interactor.pointer click="interactWithTaxon"
   .view
-    if taxon.hasChildren
+    if isExpandable
       span class=isExpanded:hidden:visible
         i.fa.fa-caret-right
       span class=isExpanded:visible:hidden
@@ -24,6 +24,14 @@
       i.fa.fa-times
       tr-span en="delete"
 
+if adminMode
+  .new-child-taxon
+    link-to "admin.taxons.new" (query-params parent=taxon.id) class="taxon-interactor admin-mode"
+      .view
+        span.spacebar
+          i.fa.fa-plus
+        tr-span en="new child category"
+
 if taxon.hasChildren
-  span class=isExpanded:visible:hidden
-    tree-taxon-ul taxons=taxon.children activeTaxons=activeTaxons adminMode=adminMode
+  if isExpanded
+    tree-taxon-ul rootTaxon=taxon activeTaxons=activeTaxons adminMode=adminMode