Merge pull request #398 from ccnmtl/collection-tweaks

Collection Style Tweaks
ccnmtl · Nov 2, 2015 · e509fc0 · e509fc0
2 parents ef50921 + 035d0eb
commit e509fc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/media/js/app/assetmgr/collection.js b/media/js/app/assetmgr/collection.js
@@ -663,6 +663,8 @@ CollectionList.prototype.assetPostUpdate = function($elt, the_records) {
         });
     }
 
+    jQuery('.filter-widget').show();
+
     $elt.fadeIn('slow');
 
     if (self.view_callback) {

diff --git a/media/templates/gallery.mustache b/media/templates/gallery.mustache
@@ -55,7 +55,7 @@
             </div>                         
         </div>
 
-        <div class="filter-widget">
+        <div class="filter-widget" style="display: none">
             <div class="collection-col-3">
                 <div class="switcher-tool switcher-search-text input-group">
                     <span class="input-group-addon"><span class="glyphicon glyphicon-search"></span></span>
@@ -129,7 +129,7 @@
         </div>  {{! end filter widget }}
         <div class="clearfix"></div>
 
-        <div class="collection-assets scroll annotation-embedding">
+        <div class="collection-assets annotation-embedding">
             <div id="asset_table" class="asset-table"></div>
         </div>
     <div id="loaded"></div>
-Original file line number
+Diff line change
@@ Expand Up @@
             });
         }
+        jQuery('.filter-widget').show();
         $elt.fadeIn('slow');
         if (self.view_callback) {
@@ Expand Down @@