cloudrider 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5334f23f91a9c3a7cd5b5efef53c2963ca386364
-  data.tar.gz: 08302967d39ffd580befd2f26a1f83ae29f7e64f
+  metadata.gz: 088ae68a4eca11260a60843b241dce38eb9074a6
+  data.tar.gz: 86a4b4eee6817a359c1f83c3ce4e6a7cadd34dfe
 SHA512:
-  metadata.gz: 6f698234c8a31c9dbd6e77240733d0d985babcefa394a841fd894b4f1055197d9776f49c3e793dce883d12cdb7f41672bb40b50b383e2e8b92b4fead732ae078
-  data.tar.gz: e7ddb9a4cd9e2b6b2558bb9c13e2ba8641801426fd6282331a86bf89da2f1d94a177463928c555d4e27684830358c7913d896dc3ff0248186c5e8c840eed7b18
+  metadata.gz: 5a045aedd738cbb8eccbb4c80d592f87fa581930dc2b208a95cca1fb934551922394fc36c62fab957144b581d18fde6a7435435bca72f0843ea43291ce3df499
+  data.tar.gz: 155c134d30344e4be430e912cee358c0e8dcac421818216c1d4413e9126894a136fb834396ae5763c08f058009ef84585c8e2bf78302e4474a4323d279a8d1bd

data/generica/app/assets/javascripts/components/tree/taxon-li.js.em

@@ -69,6 +69,7 @@ class Apiv1.TreeTaxonLiComponent extends Ember.Component
       @taxon.destroyRecord().then -> Apiv1.Flash.register "success", "taxon destroyed", 2000
 
     interactWithTaxon: ->
+      return if @tempLocked
       if @taxon.hasChildren
         @toggleExpansion()
       else

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

@@ -1,15 +1,13 @@
 .row
-  .small-12.columns.taxons
-    tree-taxon-wrapper activeTaxons=activeTaxons taxons=taxons
-
-  .small-12.columns.query
-    .row.collapse
+  .small-12.medium-4.large-3.column.taxons
+    tree-taxon-wrapper activeTaxons=activeTaxons taxons=taxons tempLocked=tempLocked
+  .small-12.medium-8.large-9.column.query
+    form.row.collapse submit="search"
       .small-10.columns
         Ember.TextField value=searchQuery class="full-width" name="search"
       .small-2.columns
-        button.button.postfix click="search"
+        button.button.postfix.search-button type="submit"
           i.fa.fa-search
-
     .row
       .small-12.columns
         == yield

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

@@ -12,8 +12,13 @@
       span class=isSelected:visible:hidden
         i.fa.fa-check-square-o
     
-    span.taxon-name
-      tr-span en=taxon.taxonName
+    if tempLocked
+      span.temp-locked
+        i.fa.fa-cog.fa-spin
+        tr-span en="please wait"
+    else
+      span.taxon-name
+        tr-span en=taxon.taxonName
 
   if adminModeReasonable
     .edit
@@ -34,4 +39,4 @@ if adminMode
 
 if taxon.hasChildren
   if isExpanded
-    tree-taxon-ul rootTaxon=taxon activeTaxons=activeTaxons adminMode=adminMode
+    tree-taxon-ul rootTaxon=taxon activeTaxons=activeTaxons adminMode=adminMode tempLocked=tempLocked

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

@@ -5,4 +5,4 @@ if rootTaxon.children.isPending
         i.fa.fa-spin.fa-cog
       tr-span en="loading"        
 each taxon in rootTaxon.children
-  tree-taxon-li taxon=taxon activeTaxons=activeTaxons adminMode=adminMode
+  tree-taxon-li taxon=taxon activeTaxons=activeTaxons adminMode=adminMode tempLocked=tempLocked

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

@@ -1,3 +1,3 @@
 h2.wrapper-title
   tr-span en="categories"
-tree-taxon-ul rootTaxon=rootTaxon activeTaxons=activeTaxons adminMode=adminMode
+tree-taxon-ul rootTaxon=rootTaxon activeTaxons=activeTaxons adminMode=adminMode tempLocked=tempLocked

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

@@ -2,14 +2,13 @@
 <% when "top2x" %>
 .row
   .small-12.columns.taxons
-    tree-taxon-wrapper activeTaxons=activeTaxons taxons=taxons
-
+    tree-taxon-wrapper activeTaxons=activeTaxons taxons=taxons tempLocked=tempLocked
   .small-12.columns.query
-    .row.collapse
+    form.row.collapse submit="search"
       .small-10.columns
         Ember.TextField value=searchQuery class="full-width" name="search"
       .small-2.columns
-        button.button.postfix click="search"
+        button.button.postfix.search-button type="submit"
           i.fa.fa-search
 
     .row
@@ -19,13 +18,13 @@
 <% when "lefttop" %>
 .row
   .small-12.medium-4.large-3.column.taxons
-    tree-taxon-wrapper activeTaxons=activeTaxons taxons=taxons
+    tree-taxon-wrapper activeTaxons=activeTaxons taxons=taxons tempLocked=tempLocked
   .small-12.medium-8.large-9.column.query
-    .row.collapse
+    form.row.collapse submit="search"
       .small-10.columns
         Ember.TextField value=searchQuery class="full-width" name="search"
       .small-2.columns
-        button.button.postfix click="search"
+        button.button.postfix.search-button type="submit"
           i.fa.fa-search
     .row
       .small-12.columns

data/generica/app/varissets/javascripts/templates/products/index.emblem.erb

@@ -1,13 +1,24 @@
 <% case theme %>
 <% when :craigslist %>
-search-and-filter taxons=taxons action="search"
+search-and-filter taxons=taxons action="search" tempLocked=products.isPending
+  p.taxoncrumbs
+    each taxon in activeTaxons
+      span.spacebar
+        span +
+        span= taxon.taxonName
   fancy-paginator page=page per=per metadatum=metadatum
 
   products-catalog products=products
 
   fancy-paginator page=page per=per metadatum=metadatum
 <% else %>
-search-and-filter taxons=taxons action="search"
+search-and-filter taxons=taxons action="search" tempLocked=products.isPending
+
+p.taxoncrumbs
+  each taxon in activeTaxons
+    span.spacebar
+      span +
+      span= taxon.taxonName
 
 fancy-paginator page=page per=per metadatum=metadatum
 

data/lib/cloudrider/version.rb

@@ -1,3 +1,3 @@
 module Cloudrider
-  VERSION = "0.3.20"
+  VERSION = "0.3.21"
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudrider
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Thomas Chen