Skip to content

Commit ea90142

Browse files
patrickallaertpatrickallaert
committed
CS: removing trailing whitespaces
1 parent ab73f8c commit ea90142

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+939
-939
lines changed

‎CREDITS.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
eZ Systems would like to thank the following active contributors,
1+
eZ Systems would like to thank the following active contributors,
22
whose work inspired early versions of eZ Find :
33

44
* Kristof Coomans <kristof[dot]coomans[at]telenet[dot]be> on http://projects.ez.no/ezsolr

‎bin/scripts/debian/solr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test -x $DAEMON || exit 0
3737
#
3838
d_start() {
3939
start-stop-daemon --start --pidfile $PIDFILE --chdir $SOLR_HOME --background --make-pidfile --exec $DAEMON -- $PARAMETERS
40-
}
40+
}
4141
#
4242
# Function that stops the daemon/service.
4343
#

‎bin/scripts/rhel/solr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/bin/bash
22
#
33
# eZ Find init script for RHEL and CENTOS.
4-
#
4+
#
55
# Usage:
6-
#
6+
#
77
# Set the correct SOLR_HOME value, and copy this file to /etc/init.d
88
# Symlink to /etc/init.d/solr to /etc/rc3.d/S70solr and /etc/rc5.d/S70solr
99
#

‎design/admin2/templates/page_search.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ ezAutoHeader.init({ldelim}
4949
if ( document.getElementById('searchbuttonfield') ) {
5050
5151
jQuery('#searchbuttonfield').click(function() {
52-
if ( jQuery('#searchtext').val() === jQuery('#searchtext').attr('title') )
52+
if ( jQuery('#searchtext').val() === jQuery('#searchtext').attr('title') )
5353
return;
54-
54+
5555
jQuery('#searchbutton').click();
5656
});
5757
}

‎design/ezflow/override/templates/block/search.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{def $customAttributesString='['}
88
{foreach $block.custom_attributes as $name => $value}
99
<input id="search-custom-attribute-{$name}-{$block.id}" type="hidden" name="{$name}" value="{$value}" />
10-
{set $customAttributesString = concat( $customAttributesString, '"#search-custom-attribute-', $name, '-', $block.id, '", ' )}
10+
{set $customAttributesString = concat( $customAttributesString, '"#search-custom-attribute-', $name, '-', $block.id, '", ' )}
1111
{/foreach}
1212
{set $customAttributesString=concat( $customAttributesString|trim( ' ,' ), ']' )}
1313
</div>

‎design/ezwebin/templates/content/search.tpl

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{def $search=false()}
22
{if $use_template_search}
33
{set $page_limit=10}
4-
4+
55
{def $activeFacetParameters = array()}
66
{if ezhttp_hasvariable( 'activeFacets', 'get' )}
77
{set $activeFacetParameters = ezhttp( 'activeFacets', 'get' )}
88
{/if}
9-
9+
1010
{def $dateFilter=0}
1111
{if ezhttp_hasvariable( 'dateFilter', 'get' )}
1212
{set $dateFilter = ezhttp( 'dateFilter', 'get' )}
@@ -19,20 +19,20 @@
1919
{/case}
2020
{case match=3}
2121
{def $dateFilterLabel="Last month"|i18n("design/standard/content/search")}
22-
{/case}
22+
{/case}
2323
{case match=4}
2424
{def $dateFilterLabel="Last three months"|i18n("design/standard/content/search")}
25-
{/case}
25+
{/case}
2626
{case match=5}
2727
{def $dateFilterLabel="Last year"|i18n("design/standard/content/search")}
28-
{/case}
29-
{/switch}
30-
{/if}
31-
28+
{/case}
29+
{/switch}
30+
{/if}
31+
3232
{def $filterParameters = fetch( 'ezfind', 'filterParameters' )
3333
$defaultSearchFacets = fetch( 'ezfind', 'getDefaultSearchFacets' )}
3434
{* def $facetParameters=$defaultSearchFacets|array_merge_recursive( $activeFacetParameters ) *}
35-
35+
3636
{set $search=fetch( ezfind,search,
3737
hash( 'query', $search_text,
3838
'offset', $view_parameters.offset,
@@ -41,7 +41,7 @@
4141
'facet', $defaultSearchFacets,
4242
'filter', $filterParameters,
4343
'publish_date', $dateFilter,
44-
'spell_check', array( true() )
44+
'spell_check', array( true() )
4545
))}
4646
{set $search_result=$search['SearchResult']}
4747
{set $search_count=$search['SearchCount']}
@@ -65,7 +65,7 @@
6565
{if gt( $dateFilter, 0 )}
6666
{set $uriSuffix = concat( $uriSuffix, '&dateFilter=', $dateFilter )}
6767
{/if}
68-
68+
6969
<script language="JavaScript" type="text/javascript">
7070
<!--{literal}
7171
// toggle block
@@ -193,45 +193,45 @@
193193
</div>
194194
</fieldset>
195195
</div>
196-
196+
197197
<div {*class="feedback"*} id="search_controls">
198198
<fieldset>
199199
<legend>{'Refine your search'|i18n( 'design/ezwebin/content/search' )}</legend>
200-
200+
201201
{def $activeFacetsCount=0}
202202
<ul id="active-facets-list">
203203
{foreach $defaultSearchFacets as $key => $defaultFacet}
204204
{if array_keys( $activeFacetParameters )|contains( concat( $defaultFacet['field'], ':', $defaultFacet['name'] ) )}
205205
{def $facetData=$search_extras.facet_fields.$key}
206-
207-
{foreach $facetData.nameList as $key2 => $facetName}
206+
207+
{foreach $facetData.nameList as $key2 => $facetName}
208208
{if eq( $activeFacetParameters[concat( $defaultFacet['field'], ':', $defaultFacet['name'] )], $facetName )}
209209
{def $activeFacetsCount=sum( $key, 1 )}
210210
{def $suffix=$uriSuffix|explode( concat( '&filter[]=', $facetData.queryLimit[$key2]|wash ) )|implode( '' )|explode( concat( '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName ) )|implode( '' )}
211211
<li>
212212
<a href={concat( $baseURI, $suffix )|ezurl}>[x]</a> <strong>{$defaultFacet['name']}</strong>: {$facetName}
213-
</li>
213+
</li>
214214
{/if}
215215
{/foreach}
216-
{/if}
216+
{/if}
217217
{/foreach}
218-
218+
219219
{* handle date filter here, manually for now. Should be a facet later on *}
220220
{if gt( $dateFilter, 0 )}
221221
<li>
222222
{set $activeFacetsCount=$activeFacetsCount|inc}
223223
{def $suffix=$uriSuffix|explode( concat( '&dateFilter=', $dateFilter ) )|implode( '' )}
224224
<a href={concat( $baseURI, $suffix )|ezurl}>[x]</a> <strong>{'Creation time'|i18n( 'extension/ezfind/facets' )}</strong>: {$dateFilterLabel}
225-
</li>
225+
</li>
226226
{/if}
227-
227+
228228
{if ge( $activeFacetsCount, 2 )}
229229
<li>
230230
<a href={$baseURI|ezurl}>[x]</a> <em>{'Clear all'|i18n( 'extension/ezfind/facets' )}</em>
231-
</li>
231+
</li>
232232
{/if}
233233
</ul>
234-
234+
235235
<ul id="facet-list">
236236
{foreach $defaultSearchFacets as $key => $defaultFacet}
237237
{if array_keys( $activeFacetParameters )|contains( concat( $defaultFacet['field'], ':', $defaultFacet['name'] ) )|not}
@@ -242,7 +242,7 @@
242242
{foreach $facetData.nameList as $key2 => $facetName}
243243
{if ne( $key2, '' )}
244244
<li>
245-
<a href={concat( $baseURI, '&filter[]=', $facetData.queryLimit[$key2]|wash, '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName, $uriSuffix )|ezurl}>
245+
<a href={concat( $baseURI, '&filter[]=', $facetData.queryLimit[$key2]|wash, '&activeFacets[', $defaultFacet['field'], ':', $defaultFacet['name'], ']=', $facetName, $uriSuffix )|ezurl}>
246246
{$facetName}</a> ({$facetData.countList[$key2]})
247247
</li>
248248
{/if}
@@ -251,32 +251,32 @@
251251
</li>
252252
{/if}
253253
{/foreach}
254-
254+
255255
{* date filtering here. Using a simple filter for now. Should use the date facets later on *}
256256
{if eq( $dateFilter, 0 )}
257257
<li>
258258
<span {*style="background-color: #F2F1ED"*}><strong>{'Creation time'|i18n( 'extension/ezfind/facets' )}</strong></span>
259259
<ul>
260260
<li>
261-
<a href={concat( $baseURI, '&dateFilter=1', $uriSuffix )|ezurl}>{"Last day"|i18n("design/standard/content/search")}</a>
261+
<a href={concat( $baseURI, '&dateFilter=1', $uriSuffix )|ezurl}>{"Last day"|i18n("design/standard/content/search")}</a>
262262
</li>
263263
<li>
264-
<a href={concat( $baseURI, '&dateFilter=2', $uriSuffix )|ezurl}>{"Last week"|i18n("design/standard/content/search")}</a>
264+
<a href={concat( $baseURI, '&dateFilter=2', $uriSuffix )|ezurl}>{"Last week"|i18n("design/standard/content/search")}</a>
265265
</li>
266266
<li>
267-
<a href={concat( $baseURI, '&dateFilter=3', $uriSuffix )|ezurl}>{"Last month"|i18n("design/standard/content/search")}</a>
268-
</li>
267+
<a href={concat( $baseURI, '&dateFilter=3', $uriSuffix )|ezurl}>{"Last month"|i18n("design/standard/content/search")}</a>
268+
</li>
269269
<li>
270-
<a href={concat( $baseURI, '&dateFilter=4', $uriSuffix )|ezurl}>{"Last three months"|i18n("design/standard/content/search")}</a>
271-
</li>
270+
<a href={concat( $baseURI, '&dateFilter=4', $uriSuffix )|ezurl}>{"Last three months"|i18n("design/standard/content/search")}</a>
271+
</li>
272272
<li>
273-
<a href={concat( $baseURI, '&dateFilter=5', $uriSuffix )|ezurl}>{"Last year"|i18n("design/standard/content/search")}</a>
274-
</li>
273+
<a href={concat( $baseURI, '&dateFilter=5', $uriSuffix )|ezurl}>{"Last year"|i18n("design/standard/content/search")}</a>
274+
</li>
275275
</ul>
276-
</li>
276+
</li>
277277
{/if}
278278
</ul>
279-
279+
280280
</fieldset>
281281
</div>
282282
{/case}
@@ -290,7 +290,7 @@
290290
item_count=$search_count
291291
view_parameters=$view_parameters
292292
item_limit=$page_limit}
293-
293+
294294
{foreach $search_result as $result
295295
sequence array(bglight,bgdark) as $bgColor}
296296
{node_view_gui view=ezfind_line sequence=$bgColor use_url_translation=$use_url_translation content_node=$result}

‎design/ezwebin/templates/page_header_searchbox.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{if eq( $ui_context, 'browse' )}
1414
<input name="Mode" type="hidden" value="browse" />
1515
{/if}
16-
16+
1717
{/if}
1818
</form>
1919
</div>

‎design/ezwebin/templates/parts/image/related_content.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{def $related_content=fetch( 'ezfind', 'moreLikeThis', hash( 'query_type', 'nid',
22
'query', $node.node_id,
3-
'limit', 7
3+
'limit', 7
44
))}
55
{set $related_content=$related_content['SearchResult']}
66
{include uri="design:parts/image/display_related_content.tpl"}

‎design/standard/javascript/ezajax_autocomplete.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var eZAJAXAutoComplete = function() {
77

88
/**
99
* Initializes the widget
10-
*
10+
*
1111
* @private
1212
*/
1313
var initAutosuggest = function() {
@@ -32,11 +32,11 @@ var eZAJAXAutoComplete = function() {
3232
return {
3333
/**
3434
* The initialization of the module
35-
*
35+
*
3636
* @param {Array}
37-
* url,
38-
* inputid,
39-
* containerid,
37+
* url,
38+
* inputid,
39+
* containerid,
4040
* minQueryLength,
4141
* resultlimit
4242
*/

‎design/standard/javascript/ezajaxsearch.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var eZAJAXSearch = function()
1919
resultsTarget.addClass('loading');
2020

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

3232
var facets = response.content.SearchExtras.facets;
33-
// Facets were returned, display them :
33+
// Facets were returned, display them :
3434
if ( facets && facets.length != 0 )
3535
{
36-
var facetMainList = ret.cfg.facetsmainlisttemplate;
36+
var facetMainList = ret.cfg.facetsmainlisttemplate;
3737
for( var i = 0; i < facets.length; i++ )
3838
{
3939
var facet = facets[i];
4040
// Name of the facet :
4141
var facetName = facet['name'];
42-
var facetInnerList = ret.cfg.facetsinnerlisttemplate;
43-
facetInnerList = facetInnerList.replace( /\{+facet_name+\}/g, facetName );
44-
42+
var facetInnerList = ret.cfg.facetsinnerlisttemplate;
43+
facetInnerList = facetInnerList.replace( /\{+facet_name+\}/g, facetName );
44+
4545
if ( facet['list'].length > 0 )
4646
{
4747
for( var j = 0; j < facet['list'].length; j++ )
@@ -53,7 +53,7 @@ var eZAJAXSearch = function()
5353
facetElement = facetElement.replace( /\{+link+\}/g, link );
5454
facetElement = facetElement.replace( /\{+value+\}/g, value );
5555
facetElement = facetElement.replace( /\{+count+\}/g, count );
56-
facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, facetElement + "{facet_element}" );
56+
facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, facetElement + "{facet_element}" );
5757
}
5858
facetInnerList = facetInnerList.replace( /\{+facet_element+\}/g, '' );
5959
facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, facetInnerList + "{inner_facet_list}" );
@@ -63,29 +63,29 @@ var eZAJAXSearch = function()
6363
// Only display the "Refine with facets" block if actual facets were returned.
6464
if ( facetMainList != ret.cfg.facetsmainlisttemplate )
6565
{
66-
facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, "" );
66+
facetMainList = facetMainList.replace( /\{+inner_facet_list+\}/g, "" );
6767
var facetsDiv = Y.Node.create( facetMainList );
68-
69-
resultsTarget.appendChild( facetsDiv );
68+
69+
resultsTarget.appendChild( facetsDiv );
7070
var id = facetsDiv.get( 'id' );
7171
//var width = facetsDiv.get( 'clientWidth' ) - 10; // removing horizontal padding in order to have the actual element's width
7272
//var height = facetsDiv.get( 'clientHeight' ) - 10; // idem.
73-
73+
7474
var myAnim = function ( Y )
7575
{
7676
var anim = new Y.Anim({
7777
node: '#' + id,
7878
easing: Y.Easing.backIn,
7979
duration: 0.5,
80-
81-
from:
80+
81+
from:
8282
{
8383
/*height: 0,
8484
width: 0*/
8585
opacity: 0
8686
},
87-
88-
to:
87+
88+
to:
8989
{
9090
/*width: width,
9191
height: height*/
@@ -95,7 +95,7 @@ var eZAJAXSearch = function()
9595
anim.run();
9696
}
9797
YUI().use( 'animation', 'anim', myAnim );
98-
98+
9999
}
100100
}
101101

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

@@ -249,6 +249,6 @@ var eZAJAXSearch = function()
249249
{
250250
var ins = YUI(YUI3_config).use('node', 'event', 'io-ez', yCallback);
251251
}
252-
252+
253253
return ret;
254254
}();

0 commit comments

Comments
 (0)