Jelajahi Sumber

[search] Fixed collections filter and changed title layout

Enrico Berti 12 tahun lalu
induk
melakukan
821ff73a8b

+ 1 - 1
apps/search/src/search/templates/admin_collection_facets.mako

@@ -26,7 +26,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 <%layout:skeleton>
   <%def name="title()">
-    <h1>${_('Search Admin - ')}${hue_collection.label}</h1>
+    <h4>${_('Search Admin - ')}${hue_collection.label}</h4>
   </%def>
   <%def name="navigation()">
     ${ layout.sidebar(hue_collection.name, 'facets') }

+ 1 - 1
apps/search/src/search/templates/admin_collection_highlighting.mako

@@ -26,7 +26,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 <%layout:skeleton>
   <%def name="title()">
-    <h1>${_('Search Admin - ')}${hue_collection.label}</h1>
+    <h4>${_('Search Admin - ')}${hue_collection.label}</h4>
   </%def>
 
   <%def name="navigation()">

+ 1 - 1
apps/search/src/search/templates/admin_collection_properties.mako

@@ -40,7 +40,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 <%layout:skeleton>
   <%def name="title()">
-    <h1>${_('Customize ')} ${ hue_collection.label }</h1>
+    <h4>${_('Customize ')} ${ hue_collection.label }</h4>
   </%def>
 
   <%def name="navigation()">

+ 1 - 1
apps/search/src/search/templates/admin_collection_sorting.mako

@@ -26,7 +26,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 <%layout:skeleton>
   <%def name="title()">
-    <h1>${_('Search Admin - ')}${hue_collection.label}</h1>
+    <h4>${_('Search Admin - ')}${hue_collection.label}</h4>
   </%def>
 
   <%def name="navigation()">

+ 1 - 1
apps/search/src/search/templates/admin_collection_template.mako

@@ -124,7 +124,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 <%layout:skeleton>
   <%def name="title()">
-    <h1>${ _('Template Editor ') } : ${ hue_collection.name }</h1>
+    <h4>${ _('Template Editor ') } : ${ hue_collection.name }</h4>
   </%def>
 
   <%def name="navigation()">

+ 4 - 10
apps/search/src/search/templates/admin_collections.mako

@@ -30,16 +30,15 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
     <div class="pull-right" style="margin-top: 4px; margin-right: 20px">
       <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Query UI') }</a>
     </div>
-  &nbsp;
+  <h4>${_('Collection Manager')}</h4>
 </div>
 
 
 <div class="container-fluid">
-  <h1>${_('Indexes')}</h1>
 
   <%actionbar:render>
     <%def name="search()">
-      <input type="text" placeholder="${_('Filter collections by name...')}" class="input-xxlarge search-query" id="filterInput">
+      <input type="text" placeholder="${_('Filter collections by name...')}" class="input-xlarge search-query" id="filterInput">
     </%def>
 
     <%def name="creation()">
@@ -49,7 +48,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
   <div class="row-fluid">
     <div class="span12">
-      <ul id="collections" data-bind="template: {name: 'collectionTemplate', foreach: collections}">
+      <ul id="collections" data-bind="template: {name: 'collectionTemplate', foreach: filteredCollections}">
 ##      % for collection in existing_hue_collections:
 ##        <li style="cursor: move" data-collection="${ collection.name }">
 ##          <a href="${ collection.get_absolute_url() }" class="pull-right" style="margin-top: 10px;margin-right: 10px"><i class="icon-edit"></i> ${_('Edit')}</a>
@@ -166,12 +165,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
     $("#filterInput").on("keyup", function () {
       clearTimeout(filter);
       filter = window.setTimeout(function () {
-        $("#collections li").removeClass("hide");
-        $("#collections li").each(function () {
-          if ($(this).data("collection").toLowerCase().indexOf($("#filterInput").val().toLowerCase()) == -1) {
-            $(this).addClass("hide");
-          }
-        });
+        viewModel.filterCollections($("#filterInput").val());
       }, 300);
     });
 

+ 5 - 5
apps/search/src/search/templates/layout.mako

@@ -32,15 +32,15 @@
         <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Query UI') }</a> &nbsp; &nbsp;
         <a href="${ url('search:admin_collections') }"><i class="icon-edit"></i> ${ _('Collection manager') }</a>
       </div>
-    &nbsp;
-  </div>
-
-  <div class="container-fluid">
     %if hasattr(caller, "title"):
       ${caller.title()}
     %else:
-        <h1>${_('Search Admin')}</h1>
+        <h4>${_('Search Admin')}</h4>
     %endif
+  </div>
+
+  <div class="container-fluid">
+
     <div class="row-fluid">
       %if hasattr(caller, "navigation"):
           <div class="span2">

+ 4 - 0
apps/search/static/css/admin.css

@@ -73,3 +73,7 @@ h3 {
   padding-right: 20px;
   text-align: left;
 }
+
+.search-bar h4 {
+  margin-top: 4px;
+}