فهرست منبع

[search] New properties tab in HTML result

Fix bug when switching between HTML and gridlayout
Align pagination
Romain Rigaux 11 سال پیش
والد
کامیت
d421347
1فایلهای تغییر یافته به همراه13 افزوده شده و 6 حذف شده
  1. 13 6
      apps/search/src/search/templates/search2.mako

+ 13 - 6
apps/search/src/search/templates/search2.mako

@@ -462,10 +462,10 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
           </tr>
           </tr>
         </thead>
         </thead>
         <tbody data-bind="foreach: { data: $root.results, as: 'documents' }" class="result-tbody">
         <tbody data-bind="foreach: { data: $root.results, as: 'documents' }" class="result-tbody">
-          <tr class="result-row" data-bind="attr: {'id': 'doc_' + $data[$root.collection.idField()]}">
+          <tr class="result-row" data-bind="attr: {'id': 'doc_' + $data['id']}">
             <td><a href="javascript:void(0)" data-bind="click: toggleDocDetails"><i class="fa fa-caret-right"></i></a></td>
             <td><a href="javascript:void(0)" data-bind="click: toggleDocDetails"><i class="fa fa-caret-right"></i></a></td>
-            <!-- ko foreach: row -->
-            <td data-bind="html: $data"></td>
+            <!-- ko foreach: $data['row'] -->
+              <td data-bind="html: $data"></td>
             <!-- /ko -->
             <!-- /ko -->
           </tr>
           </tr>
         </tbody>
         </tbody>
@@ -486,7 +486,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
         <li class="active"><a href="javascript: void(0)" class="widget-editor-pill">${_('Editor')}</a></li>
         <li class="active"><a href="javascript: void(0)" class="widget-editor-pill">${_('Editor')}</a></li>
         <li><a href="javascript: void(0)" class="widget-html-pill">${_('HTML')}</a></li>
         <li><a href="javascript: void(0)" class="widget-html-pill">${_('HTML')}</a></li>
         <li><a href="javascript: void(0)" class="widget-css-pill">${_('CSS & JS')}</a></li>
         <li><a href="javascript: void(0)" class="widget-css-pill">${_('CSS & JS')}</a></li>
-        <li><a href="javascript: void(0)" class="widget-settings-pill">${_('Sorting')}</a></li>
+        <li><a href="javascript: void(0)" class="widget-settings-pill">${_('Properties')}</a></li>
       </ul>
       </ul>
     </div>
     </div>
 
 
@@ -562,8 +562,13 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
       <div class="widget-section widget-css-section" style="display: none">
       <div class="widget-section widget-css-section" style="display: none">
         <textarea data-bind="codemirror: {data: $root.collection.template.extracode, lineNumbers: true, htmlMode: true, mode: 'text/html' }"></textarea>
         <textarea data-bind="codemirror: {data: $root.collection.template.extracode, lineNumbers: true, htmlMode: true, mode: 'text/html' }"></textarea>
       </div>
       </div>
-      <div class="widget-section widget-settings-section" style="display: none">
-         Sorting
+      <div class="widget-section widget-settings-section" style="display: none, min-height:200px">
+        ${ _('Sorting') }
+        
+        <div data-bind="foreach: $root.collection.template.fieldsSelected">
+          <span data-bind="text: $data"></span>
+        </div>
+        <br/>  
       </div>
       </div>
     <!-- /ko -->
     <!-- /ko -->
 
 
@@ -589,6 +594,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
 </script>
 </script>
 
 
 <script type="text/html" id="resultset-pagination">
 <script type="text/html" id="resultset-pagination">
+<div style="text-align: center;">
   <a href="javascript: void(0)" title="${ _('Previous') }">
   <a href="javascript: void(0)" title="${ _('Previous') }">
     <span data-bind="text: name, click: $root.collection.toggleSortColumnGridLayout"></span>
     <span data-bind="text: name, click: $root.collection.toggleSortColumnGridLayout"></span>
     <i class="fa fa-arrow-left" data-bind="
     <i class="fa fa-arrow-left" data-bind="
@@ -628,6 +634,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
     </form>
     </form>
   </span>
   </span>
   <!-- /ko -->
   <!-- /ko -->
+</div>
 </script>
 </script>
 
 
 <script type="text/html" id="histogram-widget">
 <script type="text/html" id="histogram-widget">