Ver código fonte

[search] Update template of magic layout

Romain Rigaux 11 anos atrás
pai
commit
1e9b35f

+ 0 - 5
apps/search/src/search/api.py

@@ -215,14 +215,9 @@ class SolrApi(object):
               ('f.%s.facet.limit' % facet['field'], int(facet['properties'].get('limit', 10)) + 1))
 
     for fq in query['fqs']:
-      #model_facet = [facet for facet in collection['facets'] if facet['id'] == fq['id']][0]
       if fq['type'] == 'field':        
         params += (('fq', ' '.join([urllib.unquote(utf_quoter('{!tag=%s}{!field f=%s}%s' % (fq['field'], fq['field'], _filter))) for _filter in fq['filter']])),)
       elif fq['type'] == 'range':
-        # Set end range if last range
-#        if fq['filter'].get('to'):
-#          model_facet = [facet for facet in collection['facets'] if facet['id'] == fq['id']][0]           
-#          fq['filter']['to'] = model_facet['properties']['end'] if model_facet else '*'
         params += (('fq', '{!tag=%s}' % fq['field'] + ' '.join([urllib.unquote(utf_quoter('%s:[%s TO %s}' % (fq['field'], f['from'], f['to']))) for f in fq['properties']])),)
 
     if collection['template']['fieldsSelected'] and collection['template']['isGridLayout']:

+ 0 - 10
apps/search/src/search/templates/search2.mako

@@ -86,12 +86,6 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
         <div class="layout-box" style="width: 72px; margin-left: 4px"></div>
       </div>
     </a>
-    <!-- <a href="javascript: oneThirdRightLayout()" onmouseover="viewModel.previewColumns('oneThirdRight')" onmouseout="viewModel.previewColumns('')">
-      <div class="layout-container">
-        <div class="layout-box" style="width: 72px"></div>
-        <div class="layout-box" style="width: 24px; margin-left: 4px"></div>
-      </div>
-    </a> -->
     <a href="javascript: fullLayout()" onmouseover="viewModel.previewColumns('full')" onmouseout="viewModel.previewColumns('')">
       <div class="layout-container">
         <div class="layout-box" style="width: 100px;"></div>
@@ -205,10 +199,6 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
       <div class="span3 preview-row"></div>
       <div class="span9 preview-row"></div>
     </div>
-    <div class="row-fluid" data-bind="visible: previewColumns() == 'oneThirdRight'">
-      <div class="span9 preview-row"></div>
-      <div class="span3 preview-row"></div>
-    </div>
     <div class="row-fluid" data-bind="visible: previewColumns() == 'full'">
       <div class="span12 preview-row">
       </div>

+ 9 - 5
apps/search/src/search/views.py

@@ -86,11 +86,12 @@ def new_search(request):
     'initial': json.dumps({
          'collections': collections,
          'layout': [
-              {"size":2,"rows":[
-                  {"widgets":[]}],"klass":"card card-home card-column span3"},
-              {"size":10,"rows":[
-                  {"widgets":[{"size":12,"name":"Results","id":"8897bfbd-053f-ab56-dbfb-432f7b28aceb","widgetType":"resultset-widget","properties":{},"offset":0,"isLoading":False,"klass":"card card-widget span12"}]}],"klass":"card card-home card-column span9"}
-          ]         
+              {"size":2,"rows":[{"widgets":[]}],"drops":["temp"],"klass":"card card-home card-column span2"},
+              {"size":10,"rows":[{"widgets":[
+                  {"size":12,"name":"Grid Results","id":"52f07188-f30f-1296-2450-f77e02e1a5c0","widgetType":"resultset-widget",
+                   "properties":{},"offset":0,"isLoading":True,"klass":"card card-widget span12"}]}],
+              "drops":["temp"],"klass":"card card-home card-column span10"}
+         ] 
      }),
   })
 
@@ -566,6 +567,9 @@ def new_facet(request):
     else:
       facet_type = 'field'        
         
+    if facet_type == 'map-widget':
+      properties['scope'] = 'world'        
+        
     result['message'] = ''
     result['facet'] = {
       'id': facet_id,

+ 0 - 4
apps/search/static/js/search.ko.js

@@ -129,10 +129,6 @@ function oneThirdLeftLayout() {
   setLayout([2, 10]);
 }
 
-function oneThirdRightLayout() {
-  setLayout([9, 3]);
-}
-
 function magicLayout(vm) {
   loadLayout(vm, vm.initial.layout);
 }