Permalink
Browse files

Adding the rest of the results templates

  • Loading branch information...
1 parent f964a86 commit 69d1d19a044a19debf149ab9b2e6191e8e37e49f Mark Hengel committed Mar 5, 2014
@@ -46,7 +46,8 @@
<ul id="results_list">
#{list results.results, as:'result'}
<li class="${result_parity} ${result_isFirst ? 'first ' : '' }${result_isLast ? 'last ' : '' }">
- #{include '/fragments/_results_listing_fragment.html' /}
+ #{set 'listing_fragment'}#{smart_include '/fragments/_results_listing_fragment.html' /}#{/set}
+ #{include listing_fragment /}
</li>
#{/list}
</ul>
@@ -66,15 +67,17 @@
</div>
#{if showResultsFragments == 'true' || showResultsBelowMapFragment == 'true'}
<div class="fragment results_below_map_fragment">
- #{include '/fragments/_results_below_map_fragment.html' /}
+ #{set 'below_map_fragment'}#{smart_include '/fragments/_results_below_map_fragment.html' /}#{/set}
+ #{include below_map_fragment /}
</div>
#{/if}
</div>
</div>
<div class="clear" id="stop_scroll"></div>
#{if showResultsFragments == 'true' || showResultsBottomFragment == 'true'}
<div class="fragment results_bottom_fragment">
- #{include '/fragments/_results_bottom_fragment.html' /}
+ #{set 'results_bottom_fragment'}#{smart_include '/fragments/_results_bottom_fragment.html' /}#{/set}
+ #{include results_bottom_fragment /}
</div>
#{/if}
</div>
@@ -1,17 +1,9 @@
#{extends 'main.html' /}
-#{set 'jsData' }
-
-#{/set}
-#{set 'moreStyles' }
- #{li.resourceset id:"global.css" /}
- #{li.resourceset id:"results_big_map.css" /}
- #{li.resourceset id:"map.css" /}
-#{/set}
+
+#{include 'head/results_big_map_left.html' /}
+
#{set maps:true /}
-#{set 'addScripts' }
- li.scripts.push(#{li.resourceset id:"results.js" /});
- li.scripts.push(#{li.resourceset id:"big_map.js" /});
-#{/set}
+
#{set 'title'}
<title>&{'results.title', location.formattedAddress, results.curPage}</title>
#{/set}
@@ -26,20 +18,8 @@
#{set 'meta' }
<meta name="description" content="&{'results.metaName', location.formattedAddress, results.curPage}" />
#{/set}
-#{set 'showResultsFragments'}&{'fragment.results'}#{/set}
-#{set 'showResultsBelowMapFragment'}&{'fragment.results.below_map'}#{/set}
-#{set 'showResultsBottomFragment'}&{'fragment.results.bottom'}#{/set}
-
-#{set refinementsActive:false /}
-#{list results.facets, as:'facet'}
- #{list facet._2, as:'term'}
- #{if term.active && !isActive}
- #{set refinementsActive:true /}
- #{/if}
- #{/list}
-#{/list}
-${results.results}
+#{include 'head/results_fragments.html' /}
<div class="clearfix container_16">
#{breadcrumb breadcrumb_switch:siteConfig.displayHomeSeoLinks, state_name:breadCrumbState, state_link:breadCrumbStateLink, city_name:location.locality /}
@@ -71,7 +51,7 @@
#{if filter_active==true}
#{include '_active_filters.html' /}
#{/if}
- #{if candidateLocations.length() > 0 }
+ #{if candidateLocations.size() > 0 }
#{candidates location:location.formattedAddress, switch:siteConfig.fullTextSearch, candidateLocations:candidateLocations /}
#{/if}
#{if isFallbackSearch }
@@ -80,7 +60,8 @@
<ul id="results_list">
#{list results.results, as:'result'}
<li>
- #{include '/fragments/_results_listing_fragment.html' /}
+ #{set 'listing_fragment'}#{smart_include '/fragments/_results_listing_fragment.html' /}#{/set}
+ #{include listing_fragment /}
</li>
#{/list}
</ul>
@@ -90,7 +71,8 @@
<div class="clear" id="stop_scroll"></div>
#{if showResultsFragments == 'true' || showResultsBottomFragment == 'true'}
<div class="fragment results_bottom_fragment">
- #{include '/fragments/_results_bottom_fragment.html' /}
+ #{set 'results_bottom_fragment'}#{smart_include '/fragments/_results_bottom_fragment.html' /}#{/set}
+ #{include results_bottom_fragment /}
</div>
#{/if}
</div>
@@ -1,16 +1,9 @@
#{extends 'main.html' /}
-#{set 'jsData' }
-
-#{/set}
-#{set 'moreStyles' }
- #{li.resourceset id:"global.css" /}
- #{li.resourceset id:"results_fluid.css" /}
- #{li.resourceset id:"map.css" /}
-#{/set}
+
+#{include 'head/results_fluid.html' /}
+
#{set maps:true /}
-#{set 'addScripts' }
- li.scripts.push(#{li.resourceset id:"results.js" /});
-#{/set}
+
#{set 'title'}
<title>&{'results.title', location.formattedAddress, results.curPage}</title>
#{/set}
@@ -25,9 +18,8 @@
#{set 'meta' }
<meta name="description" content="&{'results.metaName', location.formattedAddress, results.curPage}" />
#{/set}
-#{set 'showResultsFragments'}&{'fragment.results'}#{/set}
-#{set 'showResultsBelowMapFragment'}&{'fragment.results.below_map'}#{/set}
-#{set 'showResultsBottomFragment'}&{'fragment.results.bottom'}#{/set}
+
+#{include 'head/results_fragments.html' /}
<div class="wrap">
#{breadcrumb breadcrumb_switch:siteConfig.displayHomeSeoLinks, state_name:breadCrumbState, state_link:breadCrumbStateLink, city_name:location.locality /}
@@ -39,34 +31,14 @@
#{include '_missing_page.html' /}
#{/if}
- <div id="filterContainer">
- <div id="filter">
- #{set filter_active:false /}
- #{list results.facets, as:'facet'}
- <ul>
- <li class="title">&{"facet."+facet._1}</li>
- #{list facet._2, as:'term'}
- <li>
- #{if term.active}
- #{unfilter var:"unfilteredString", filterOut:term, filtersString:params.filters /}
- <a class="checked" title="&{'results.removeRefinement'}" href="#{search_url filters:unfilteredString, clear:true /}">&{term.value}</a>
- #{set filter_active:true /}
- #{/if}
- #{else}
- <a title="&{'results.applyRefinement'}" href="#{search_url filters:term.mkString(filters) /}">&{term.value}</a> (${term.count})
- #{/else}
- </li>
- #{/list}
- </ul>
- #{/list}
- </div>
- </div>
+ #{include '_filters_left.html' /}
+
<div id="resultsDiv">
#{if filter_active==true}
#{include '_active_filters.html' /}
#{/if}
- #{if candidateLocations.length() > 0 }
+ #{if candidateLocations.size() > 0 }
#{candidates location:location.formattedAddress, switch:siteConfig.fullTextSearch, candidateLocations:candidateLocations /}
#{/if}
@@ -77,7 +49,8 @@
<ul id="results_list">
#{list results.results, as:'result'}
<li>
- #{include '/fragments/_results_listing_fragment.html' /}
+ #{set 'listing_fragment'}#{smart_include '/fragments/_results_listing_fragment.html' /}#{/set}
+ #{include listing_fragment /}
</li>
#{/list}
</ul>
@@ -96,15 +69,17 @@
</div>
#{if showResultsFragments == 'true' || showResultsBelowMapFragment == 'true'}
<div class="fragment results_below_map_fragment">
- #{include '/fragments/_results_below_map_fragment.html' /}
+ #{set 'below_map_fragment'}#{smart_include '/fragments/_results_below_map_fragment.html' /}#{/set}
+ #{include below_map_fragment /}
</div>
#{/if}
</div>
</div>
<div class="clear" id="stop_scroll"></div>
#{if showResultsFragments == 'true' || showResultsBottomFragment == 'true'}
<div class="fragment results_bottom_fragment">
- #{include '/fragments/_results_bottom_fragment.html' /}
+ #{set 'results_bottom_fragment'}#{smart_include '/fragments/_results_bottom_fragment.html' /}#{/set}
+ #{include results_bottom_fragment /}
</div>
#{/if}
</div>
@@ -1,17 +1,9 @@
#{extends 'main.html' /}
-#{set 'jsData' }
-
-#{/set}
-#{set 'moreStyles' }
- #{li.resourceset id:"global.css" /}
- #{li.resourceset id:"results_big_map.css" /}
- #{li.resourceset id:"map.css" /}
-#{/set}
+
+#{include 'head/results_map_left_fluid.html' /}
+
#{set maps:true /}
-#{set 'addScripts' }
- li.scripts.push(#{li.resourceset id:"results.js" /});
- li.scripts.push(#{li.resourceset id:"big_map.js" /});
-#{/set}
+
#{set 'title'}
<title>&{'results.title', location.formattedAddress, results.curPage}</title>
#{/set}
@@ -25,18 +17,8 @@
#{set 'meta' }
<meta name="description" content="&{'results.metaName', location.formattedAddress, results.curPage}" />
#{/set}
-#{set 'showResultsFragments'}&{'fragment.results'}#{/set}
-#{set 'showResultsBelowMapFragment'}&{'fragment.results.below_map'}#{/set}
-#{set 'showResultsBottomFragment'}&{'fragment.results.bottom'}#{/set}
-#{set refinementsActive:false /}
-#{list results.facets, as:'facet'}
- #{list facet._2, as:'term'}
- #{if term.active && !isActive}
- #{set refinementsActive:true /}
- #{/if}
- #{/list}
-#{/list}
+#{include 'head/results_fragments.html' /}
<div class="clearfix wrap">
#{breadcrumb breadcrumb_switch:siteConfig.displayHomeSeoLinks, state_name:breadCrumbState, state_link:breadCrumbStateLink, city_name:location.locality /}
@@ -68,7 +50,7 @@
#{if filter_active==true}
#{include '_active_filters.html' /}
#{/if}
- #{if candidateLocations.length() > 0 }
+ #{if candidateLocations.size() > 0 }
#{candidates location:location.formattedAddress, switch:siteConfig.fullTextSearch, candidateLocations:candidateLocations /}
#{/if}
#{if isFallbackSearch }
@@ -77,7 +59,8 @@
<ul id="results_list">
#{list results.results, as:'result'}
<li>
- #{include '/fragments/_results_listing_fragment.html' /}
+ #{set 'listing_fragment'}#{smart_include '/fragments/_results_listing_fragment.html' /}#{/set}
+ #{include listing_fragment /}
</li>
#{/list}
</ul>
@@ -87,7 +70,8 @@
<div class="clear" id="stop_scroll"></div>
#{if showResultsFragments == 'true' || showResultsBottomFragment == 'true'}
<div class="fragment results_bottom_fragment">
- #{include '/fragments/_results_bottom_fragment.html' /}
+ #{set 'results_bottom_fragment'}#{smart_include '/fragments/_results_bottom_fragment.html' /}#{/set}
+ #{include results_bottom_fragment /}
</div>
#{/if}
</div>
@@ -0,0 +1,27 @@
+
+#{set 'moreStyles' }
+*{
+ #{li.resourceset id:"global.css" /}
+ #{li.resourceset id:"results_big_map.css" /}
+ #{li.resourceset id:"map.css" /}
+}*
+
+ <link href="/public/stylesheets/third_party/960.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/search_core.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/components.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/refinements.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/results_big_map.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/third_party/bootstrap_dropdown.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/map.css" rel="stylesheet" type="text/css">
+#{/set}
+#{set 'addScripts' }
+ li.scripts.push("/public/scripts/pages/searchResults.js");
+ li.scripts.push("/public/scripts/modules/followPage.js");
+ li.scripts.push("/public/scripts/third_party/bootstrap_dropdown.js");
+ *{
+
+ li.scripts.push(#{li.resourceset id:"results.js" /});
+ li.scripts.push(#{li.resourceset id:"big_map.js" /});
+
+ }*
+#{/set}
@@ -0,0 +1,22 @@
+#{set 'moreStyles' }
+ *{
+ #{li.resourceset id:"global.css" /}
+ #{li.resourceset id:"results_fluid.css" /}
+ #{li.resourceset id:"map.css" /}
+ }*
+ <link href="/public/stylesheets/third_party/960.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/search_core.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/components.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/results.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/results_fluid.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/map.css" rel="stylesheet" type="text/css">
+#{/set}
+#{set 'addScripts' }
+ li.scripts.push("/public/scripts/pages/searchResults.js");
+ li.scripts.push("/public/scripts/modules/followPage.js");
+ *{
+
+ li.scripts.push(#{li.resourceset id:"results.js" /});
+
+ }*
+#{/set}
@@ -0,0 +1,25 @@
+#{set 'moreStyles' }
+ *{
+ #{li.resourceset id:"global.css" /}
+ #{li.resourceset id:"results_big_map.css" /}
+ #{li.resourceset id:"map.css" /}
+ }*
+ <link href="/public/stylesheets/third_party/960.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/search_core.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/components.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/refinements.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/results_big_map.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/third_party/bootstrap_dropdown.css" rel="stylesheet" type="text/css">
+ <link href="/public/stylesheets/map.css" rel="stylesheet" type="text/css">
+#{/set}
+#{set 'addScripts' }
+ li.scripts.push("/public/scripts/pages/searchResults.js");
+ li.scripts.push("/public/scripts/modules/followPage.js");
+ li.scripts.push("/public/scripts/third_party/bootstrap_dropdown.js");
+ *{
+
+ li.scripts.push(#{li.resourceset id:"results.js" /});
+ li.scripts.push(#{li.resourceset id:"big_map.js" /});
+
+ }*
+#{/set}
View
@@ -25,7 +25,7 @@ default: {
displayHomeSeoText: true,
jsonView: true,
mobileView: true,
- resultsTemplate: results.html,
+ resultsTemplate: results_map_left_fluid.html,
resultsFragmentBottom: true,
resultsFragmentBelowMap: true,
templateNoResults: noresults.html,

0 comments on commit 69d1d19

Please sign in to comment.