You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/11 18:23:29 UTC
svn commit: r1609737 [18/18] - in /roller/trunk/app/src/main/webapp:
WEB-INF/jsps/editor/ WEB-INF/jsps/tiles/ roller-ui/yui3/arraylist/
roller-ui/yui3/assets/ roller-ui/yui3/assets/skins/
roller-ui/yui3/assets/skins/sam/ roller-ui/yui3/async-queue/ rol...
Modified: roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm?rev=1609737&r1=1609736&r2=1609737&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm Fri Jul 11 16:23:25 2014
@@ -56,14 +56,14 @@
maxlength="255" value="$model.term"
style="padding-left: 1px" />
#set( $cats = $model.weblog.getWeblogCategories() )
- #if($model.hits > 0 && !$cats.empty)
+ #if(!$site && $cats && $cats.size() > 1)
<select name="cat">
<option value="">$text.get( "macro.searchresults.incategory" )</option>
#foreach( $cat in $cats )
<option #if($cat.name == $model.weblogCategory.name)selected="selected"#end>$cat.name</option>
#end
</select>
- #end
+ #end
<input type="submit" value="$text.get( "macro.weblog.searchbutton" )" />
</form>
$text.get( "macro.weblog.searchgoogle", [$model.term, $url.absoluteSite, $url.site, ${model.weblog.handle}] )
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/search.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/search.vm?rev=1609737&r1=1609736&r2=1609737&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/search.vm Fri Jul 11 16:23:25 2014
@@ -78,13 +78,15 @@
<input type="text" id="q" class="form-control" name="q" size="8" maxlength="255" value="$model.term" />
</div>
<div class="form-group" role="form">
- #set( $cats = $model.weblog.getWeblogCategories() )
- <select class="form-control" name="cat">
- <option value="">$text.get( "macro.searchresults.incategory" )</option>
- #foreach( $cat in $cats )
- <option #if($cat.name == $model.weblogCategory.name)selected="selected"#end>$cat.name</option>
- #end
- </select>
+ #set( $cats = $model.weblog.getWeblogCategories() )
+ #if(!$site && $cats && $cats.size() > 1)
+ <select class="form-control" name="cat">
+ <option value="">$text.get( "macro.searchresults.incategory" )</option>
+ #foreach( $cat in $cats )
+ <option #if($cat.name == $model.weblogCategory.name)selected="selected"#end>$cat.name</option>
+ #end
+ </select>
+ #end
</div>
<div class="form-group" role="form">
<button type="submit" class="btn btn-primary">Search</button>