Bläddra i källkod

[search] Small improvements

Enrico Berti 12 år sedan
förälder
incheckning
fa89204

+ 4 - 2
apps/search/src/search/templates/admin_core_highlighting.mako

@@ -42,7 +42,7 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
           </div>
           <h4>${_('Highlighting')}</h4>
         </div>
-        <div data-bind="visible: highlightedFields().length > 0" style="padding-left: 10px;margin-bottom: 20px">
+        <div style="padding-left: 10px;margin-bottom: 20px">
           <em>${_('Please select some fields to highlight in the result below.')}</em>
         </div>
 
@@ -90,7 +90,9 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
     var self = this;
     self.fields = ko.observableArray(${ hue_core.fields | n,unicode });
 
-    self.highlightedFields = ko.observableArray(${ hue_core.result.data | n,unicode }.highlighting);
+    var resultData = ${ hue_core.result.data | n,unicode };
+
+    self.highlightedFields = ko.observableArray(resultData!=null?resultData.highlighting:[]);
     self.isEnabled = ko.observable(true);
 
     self.submit = function () {

+ 1 - 2
apps/search/src/search/templates/admin_core_template.mako

@@ -119,8 +119,7 @@ ${ commonheader(_('Search'), "search", user) | n,unicode }
     </div>
 
     <div class="form-actions">
-      <a class="btn" id="save-template">${_('Save')}</a>
-      <a class="btn btn-primary" id="save-template">${_('Save and next')}</a>
+      <a class="btn btn-primary" id="save-template">${_('Save')}</a>
     </div>
 
     <div id="load-template-modal" class="modal hide fade">

+ 3 - 1
apps/search/src/search/templates/index.mako

@@ -153,6 +153,8 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
       <script src="/static/ext/js/mustache.js"></script>
 
       <div id="result-container"></div>
+
+      <textarea id="mustacheTmpl" class="hide">${ hue_core.result.get_template(with_highlighting=True) | n,unicode }</textarea>
       <script>
       <%
         docs = response['response']['docs']
@@ -162,7 +164,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
         %>
         $.each(${ json.dumps([result for result in docs]) | n,unicode }, function (index, item) {
           $("<div>").addClass("result-row").html(
-            Mustache.render('${ hue_core.result.get_template(with_highlighting=True) | n,unicode }', item)
+            Mustache.render($("#mustacheTmpl").text(), item)
           ).appendTo($("#result-container"));
         });
       </script>

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

@@ -95,7 +95,7 @@
       ##</li>
       <li class="nav-header">${_('Search')}</li>
       <li>
-        <a href="${ url('search:index') }"><i class="icon-share-alt"></i> ${ _('Query') }</a>
+        <a href="${ url('search:index') }" target="_blank"><i class="icon-share-alt"></i> ${ _('Query') }</a>
       </li>
 
       ##<li class="nav-header">${_('Solr')}</li>