Skip to content

Commit

Permalink
CS: removing trailing whitespaces
Browse files Browse the repository at this point in the history
patrickallaert committed May 17, 2011
1 parent ab73f8c commit ea90142
Showing 65 changed files with 939 additions and 939 deletions.
2 changes: 1 addition & 1 deletion CREDITS.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eZ Systems would like to thank the following active contributors,
eZ Systems would like to thank the following active contributors,
whose work inspired early versions of eZ Find :

* Kristof Coomans <kristof[dot]coomans[at]telenet[dot]be> on http://projects.ez.no/ezsolr
2 changes: 1 addition & 1 deletion bin/scripts/debian/solr
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ test -x $DAEMON || exit 0
#
d_start() {
start-stop-daemon --start --pidfile $PIDFILE --chdir $SOLR_HOME --background --make-pidfile --exec $DAEMON -- $PARAMETERS
}
}
#
# Function that stops the daemon/service.
#
4 changes: 2 additions & 2 deletions bin/scripts/rhel/solr
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
#
# eZ Find init script for RHEL and CENTOS.
#
#
# Usage:
#
#
# Set the correct SOLR_HOME value, and copy this file to /etc/init.d
# Symlink to /etc/init.d/solr to /etc/rc3.d/S70solr and /etc/rc5.d/S70solr
#
4 changes: 2 additions & 2 deletions design/admin2/templates/page_search.tpl
Original file line number Diff line number Diff line change
@@ -49,9 +49,9 @@ ezAutoHeader.init({ldelim}
if ( document.getElementById('searchbuttonfield') ) {
jQuery('#searchbuttonfield').click(function() {
if ( jQuery('#searchtext').val() === jQuery('#searchtext').attr('title') )
if ( jQuery('#searchtext').val() === jQuery('#searchtext').attr('title') )
return;
jQuery('#searchbutton').click();
});
}
2 changes: 1 addition & 1 deletion design/ezflow/override/templates/block/search.tpl
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
{def $customAttributesString='['}
{foreach $block.custom_attributes as $name => $value}
<input id="search-custom-attribute-{$name}-{$block.id}" type="hidden" name="{$name}" value="{$value}" />
{set $customAttributesString = concat( $customAttributesString, '"#search-custom-attribute-', $name, '-', $block.id, '", ' )}
{set $customAttributesString = concat( $customAttributesString, '"#search-custom-attribute-', $name, '-', $block.id, '", ' )}
{/foreach}
{set $customAttributesString=concat( $customAttributesString|trim( ' ,' ), ']' )}
</div>
70 changes: 35 additions & 35 deletions design/ezwebin/templates/content/search.tpl
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{def $search=false()}
{if $use_template_search}
{set $page_limit=10}

{def $activeFacetParameters = array()}
{if ezhttp_hasvariable( 'activeFacets', 'get' )}
{set $activeFacetParameters = ezhttp( 'activeFacets', 'get' )}
{/if}

{def $dateFilter=0}
{if ezhttp_hasvariable( 'dateFilter', 'get' )}
{set $dateFilter = ezhttp( 'dateFilter', 'get' )}
@@ -19,20 +19,20 @@
{/case}
{case match=3}
{def $dateFilterLabel="Last month"|i18n("design/standard/content/search")}
{/case}
{/case}
{case match=4}
{def $dateFilterLabel="Last three months"|i18n("design/standard/content/search")}
{/case}
{/case}
{case match=5}
{def $dateFilterLabel="Last year"|i18n("design/standard/content/search")}
{/case}
{/switch}
{/if}
{/case}
{/switch}
{/if}

{def $filterParameters = fetch( 'ezfind', 'filterParameters' )
$defaultSearchFacets = fetch( 'ezfind', 'getDefaultSearchFacets' )}
{* def $facetParameters=$defaultSearchFacets|array_merge_recursive( $activeFacetParameters ) *}

{set $search=fetch( ezfind,search,
hash( 'query', $search_text,
'offset', $view_parameters.offset,
@@ -41,7 +41,7 @@
'facet', $defaultSearchFacets,
'filter', $filterParameters,
'publish_date', $dateFilter,
'spell_check', array( true() )
'spell_check', array( true() )
))}
{set $search_result=$search['SearchResult']}
{set $search_count=$search['SearchCount']}
@@ -65,7 +65,7 @@
{if gt( $dateFilter, 0 )}
{set $uriSuffix = concat( $uriSuffix, '&dateFilter=', $dateFilter )}
{/if}

<script language="JavaScript" type="text/javascript">
<!--{literal}
// toggle block
@@ -193,45 +193,45 @@
</div>
</fieldset>
</div>
<div {*class="feedback"*} id="search_controls">
<fieldset>
<legend>{'Refine your search'|i18n( 'design/ezwebin/content/search' )}</legend>
{def $activeFacetsCount=0}
<ul id="active-facets-list">
{foreach $defaultSearchFacets as $key => $defaultFacet}
{if array_keys( $activeFacetParameters )|contains( concat( $defaultFacet['field'], ':', $defaultFacet['name'] ) )}
{def $facetData=$search_extras.facet_fields.$key}
{foreach $facetData.nameList as $key2 => $facetName}
{foreach $facetData.nameList as $key2 => $facetName}
{if eq( $activeFacetParameters[concat( $defaultFacet['field'], ':', $defaultFacet['name'] )], $facetName )}
{def $activeFacetsCount=sum( $key, 1 )}
{def $suffix=$uriSuffix|explode( concat( '&filter[]=', $facetData.queryLimit[$key2]|wash ) )|implode( '' )|explode( concat( '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName ) )|implode( '' )}
<li>
<a href={concat( $baseURI, $suffix )|ezurl}>[x]</a> <strong>{$defaultFacet['name']}</strong>: {$facetName}
</li>
</li>
{/if}
{/foreach}
{/if}
{/if}
{/foreach}
{* handle date filter here, manually for now. Should be a facet later on *}
{if gt( $dateFilter, 0 )}
<li>
{set $activeFacetsCount=$activeFacetsCount|inc}
{def $suffix=$uriSuffix|explode( concat( '&dateFilter=', $dateFilter ) )|implode( '' )}
<a href={concat( $baseURI, $suffix )|ezurl}>[x]</a> <strong>{'Creation time'|i18n( 'extension/ezfind/facets' )}</strong>: {$dateFilterLabel}
</li>
</li>
{/if}
{if ge( $activeFacetsCount, 2 )}
<li>
<a href={$baseURI|ezurl}>[x]</a> <em>{'Clear all'|i18n( 'extension/ezfind/facets' )}</em>
</li>
</li>
{/if}
</ul>
<ul id="facet-list">
{foreach $defaultSearchFacets as $key => $defaultFacet}
{if array_keys( $activeFacetParameters )|contains( concat( $defaultFacet['field'], ':', $defaultFacet['name'] ) )|not}
@@ -242,7 +242,7 @@
{foreach $facetData.nameList as $key2 => $facetName}
{if ne( $key2, '' )}
<li>
<a href={concat( $baseURI, '&filter[]=', $facetData.queryLimit[$key2]|wash, '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName, $uriSuffix )|ezurl}>
<a href={concat( $baseURI, '&filter[]=', $facetData.queryLimit[$key2]|wash, '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName, $uriSuffix )|ezurl}>
{$facetName}</a> ({$facetData.countList[$key2]})
</li>
{/if}
@@ -251,32 +251,32 @@
</li>
{/if}
{/foreach}
{* date filtering here. Using a simple filter for now. Should use the date facets later on *}
{if eq( $dateFilter, 0 )}
<li>
<span {*style="background-color: #F2F1ED"*}><strong>{'Creation time'|i18n( 'extension/ezfind/facets' )}</strong></span>
<ul>
<li>
<a href={concat( $baseURI, '&dateFilter=1', $uriSuffix )|ezurl}>{"Last day"|i18n("design/standard/content/search")}</a>
<a href={concat( $baseURI, '&dateFilter=1', $uriSuffix )|ezurl}>{"Last day"|i18n("design/standard/content/search")}</a>
</li>
<li>
<a href={concat( $baseURI, '&dateFilter=2', $uriSuffix )|ezurl}>{"Last week"|i18n("design/standard/content/search")}</a>
<a href={concat( $baseURI, '&dateFilter=2', $uriSuffix )|ezurl}>{"Last week"|i18n("design/standard/content/search")}</a>
</li>
<li>
<a href={concat( $baseURI, '&dateFilter=3', $uriSuffix )|ezurl}>{"Last month"|i18n("design/standard/content/search")}</a>
</li>
<a href={concat( $baseURI, '&dateFilter=3', $uriSuffix )|ezurl}>{"Last month"|i18n("design/standard/content/search")}</a>
</li>
<li>
<a href={concat( $baseURI, '&dateFilter=4', $uriSuffix )|ezurl}>{"Last three months"|i18n("design/standard/content/search")}</a>
</li>
<a href={concat( $baseURI, '&dateFilter=4', $uriSuffix )|ezurl}>{"Last three months"|i18n("design/standard/content/search")}</a>
</li>
<li>
<a href={concat( $baseURI, '&dateFilter=5', $uriSuffix )|ezurl}>{"Last year"|i18n("design/standard/content/search")}</a>
</li>
<a href={concat( $baseURI, '&dateFilter=5', $uriSuffix )|ezurl}>{"Last year"|i18n("design/standard/content/search")}</a>
</li>
</ul>
</li>
</li>
{/if}
</ul>
</fieldset>
</div>
{/case}
@@ -290,7 +290,7 @@
item_count=$search_count
view_parameters=$view_parameters
item_limit=$page_limit}
{foreach $search_result as $result
sequence array(bglight,bgdark) as $bgColor}
{node_view_gui view=ezfind_line sequence=$bgColor use_url_translation=$use_url_translation content_node=$result}
2 changes: 1 addition & 1 deletion design/ezwebin/templates/page_header_searchbox.tpl
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
{if eq( $ui_context, 'browse' )}
<input name="Mode" type="hidden" value="browse" />
{/if}

{/if}
</form>
</div>
2 changes: 1 addition & 1 deletion design/ezwebin/templates/parts/image/related_content.tpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{def $related_content=fetch( 'ezfind', 'moreLikeThis', hash( 'query_type', 'nid',
'query', $node.node_id,
'limit', 7
'limit', 7
))}
{set $related_content=$related_content['SearchResult']}
{include uri="design:parts/image/display_related_content.tpl"}
10 changes: 5 additions & 5 deletions design/standard/javascript/ezajax_autocomplete.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ var eZAJAXAutoComplete = function() {

/**
* Initializes the widget
*
*
* @private
*/
var initAutosuggest = function() {
@@ -32,11 +32,11 @@ var eZAJAXAutoComplete = function() {
return {
/**
* The initialization of the module
*
*
* @param {Array}
* url,
* inputid,
* containerid,
* url,
* inputid,
* containerid,
* minQueryLength,
* resultlimit
*/
36 changes: 18 additions & 18 deletions design/standard/javascript/ezajaxsearch.js
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ var eZAJAXSearch = function()
resultsTarget.addClass('loading');

var spellCheck = response.content.SearchExtras.spellcheck;
// A spellcheck proposal was made, display it :
// A spellcheck proposal was made, display it :
if ( spellCheck && spellCheck.collation )
{
var scTemplate = ret.cfg.spellchecktemplate;
@@ -30,18 +30,18 @@ var eZAJAXSearch = function()
}

var facets = response.content.SearchExtras.facets;
// Facets were returned, display them :
// Facets were returned, display them :
if ( facets && facets.length != 0 )
{
var facetMainList = ret.cfg.facetsmainlisttemplate;
var facetMainList = ret.cfg.facetsmainlisttemplate;
for( var i = 0; i < facets.length; i++ )
{
var facet = facets[i];
// Name of the facet :
var facetName = facet['name'];
var facetInnerList = ret.cfg.facetsinnerlisttemplate;
facetInnerList = facetInnerList.replace( /\{+facet_name+\}/g, facetName );
var facetInnerList = ret.cfg.facetsinnerlisttemplate;
facetInnerList = facetInnerList.replace( /\{+facet_name+\}/g, facetName );

if ( facet['list'].length > 0 )
{
for( var j = 0; j < facet['list'].length; j++ )
@@ -53,7 +53,7 @@ var eZAJAXSearch = function()
facetElement = facetElement.replace( /\{+link+\}/g, link );
facetElement = facetElement.replace( /\{+value+\}/g, value );
facetElement = facetElement.replace( /\{+count+\}/g, count );
facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, facetElement + "{facet_element}" );
facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, facetElement + "{facet_element}" );
}
facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, '' );
facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, facetInnerList + "{inner_facet_list}" );
@@ -63,29 +63,29 @@ var eZAJAXSearch = function()
// Only display the "Refine with facets" block if actual facets were returned.
if ( facetMainList != ret.cfg.facetsmainlisttemplate )
{
facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, "" );
facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, "" );
var facetsDiv = Y.Node.create( facetMainList );
resultsTarget.appendChild( facetsDiv );

resultsTarget.appendChild( facetsDiv );
var id = facetsDiv.get( 'id' );
//var width = facetsDiv.get( 'clientWidth' ) - 10; // removing horizontal padding in order to have the actual element's width
//var height = facetsDiv.get( 'clientHeight' ) - 10; // idem.

var myAnim = function ( Y )
{
var anim = new Y.Anim({
node: '#' + id,
easing: Y.Easing.backIn,
duration: 0.5,
from:

from:
{
/*height: 0,
width: 0*/
opacity: 0
},
to:

to:
{
/*width: width,
height: height*/
@@ -95,7 +95,7 @@ var eZAJAXSearch = function()
anim.run();
}
YUI().use( 'animation', 'anim', myAnim );

}
}

@@ -205,7 +205,7 @@ var eZAJAXSearch = function()
{
for ( var i = 0, l = ret.cfg.customSearchAttributes.length; i < l; i++ )
{
data += '&' + Y.one( ret.cfg.customSearchAttributes[i] ).get('name') + '=' + Y.one( ret.cfg.customSearchAttributes[i] ).get('value');
data += '&' + Y.one( ret.cfg.customSearchAttributes[i] ).get('name') + '=' + Y.one( ret.cfg.customSearchAttributes[i] ).get('value');
}
}

@@ -249,6 +249,6 @@ var eZAJAXSearch = function()
{
var ins = YUI(YUI3_config).use('node', 'event', 'io-ez', yCallback);
}

return ret;
}();
4 changes: 2 additions & 2 deletions design/standard/stylesheets/ezfind.css
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ div#search_results

ul#facet-list
{
margin-left: 0;
margin-left: 0;
}

ul#active-facets-list
@@ -48,7 +48,7 @@ div.ajax-search-facets
margin-bottom: 5px;
border: 1px solid #F0F0F0;
font-size: 90%;

/* for IE */
filter:'alpha(opacity=0)'; /* Will be faded in by the YUI animation */
/* CSS3 standard */
Loading

0 comments on commit ea90142

Please sign in to comment.