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/10 17:28:53 UTC
svn commit: r1609483 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/business/search/
java/org/apache/roller/weblogger/business/search/operations/
java/org/apache/roller/weblogger/ui/rendering/servlets/ resources/
webapp/WEB-INF/veloc...
Author: gmazza
Date: Thu Jul 10 15:28:53 2014
New Revision: 1609483
URL: http://svn.apache.org/r1609483
Log:
Patch on ROL-1789 (don't show category dropdown if only one category present), and fix for ROL-1988 (searches for categories with a space in them weren't working. Also, I removed the name of the category and locale from consideration when doing basic text searches, as well as the seldom needed dictionary.com definition search for search terms.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/ApplicationResources_de.properties
roller/trunk/app/src/main/resources/ApplicationResources_es.properties
roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm
roller/trunk/app/src/main/webapp/themes/gaurav/search.vm
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java Thu Jul 10 15:28:53 2014
@@ -46,34 +46,23 @@ public final class IndexUtil {
* @return Lucene search term
*/
public static Term getTerm(String field, String input) {
-
if (input == null || field == null) {
return null;
}
-
Analyzer analyzer = IndexManagerImpl.getAnalyzer();
-
Term term = null;
-
try {
-
- TokenStream tokens = analyzer
- .tokenStream(field, new StringReader(input));
-
- CharTermAttribute termAtt = (CharTermAttribute) tokens
- .addAttribute(CharTermAttribute.class);
-
+ TokenStream tokens = analyzer.tokenStream(field, new StringReader(input));
+ CharTermAttribute termAtt = tokens.addAttribute(CharTermAttribute.class);
tokens.reset();
if (tokens.incrementToken()) {
String termt = termAtt.toString();
term = new Term(field, termt);
}
-
} catch (IOException e) {
// ignored
}
-
return term;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java Thu Jul 10 15:28:53 2014
@@ -137,7 +137,7 @@ public abstract class IndexOperation imp
doc.add(new StringField(FieldConstants.PUBLISHED, data.getPubTime()
.toString(), Field.Store.YES));
- // index Category, needs to be in lower case as we are used in a term
+ // index Category, needs to be in lower case as it is used in a term
WeblogCategory categorydata = data.getCategory();
if (categorydata != null) {
doc.add(new StringField(FieldConstants.CATEGORY, categorydata
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java Thu Jul 10 15:28:53 2014
@@ -54,12 +54,7 @@ public class SearchOperation extends Rea
private static String[] SEARCH_FIELDS = new String[] {
FieldConstants.CONTENT, FieldConstants.TITLE,
- FieldConstants.C_CONTENT, FieldConstants.CATEGORY, FieldConstants.LOCALE };
-
- // private static BooleanClause.Occur[] SEARCH_FLAGS = new
- // BooleanClause.Occur[] {
- // BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD,
- // BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD };
+ FieldConstants.C_CONTENT };
private static Sort SORTER = new Sort(new SortField(
FieldConstants.PUBLISHED, SortField.Type.STRING, true));
@@ -109,10 +104,6 @@ public class SearchOperation extends Rea
IndexReader reader = manager.getSharedIndexReader();
searcher = new IndexSearcher(reader);
- // Query query = MultiFieldQueryParser.parse(
- // FieldConstants.LUCENE_VERSION, term, SEARCH_FIELDS,
- // SEARCH_FLAGS, IndexManagerImpl.getAnalyzer());
-
MultiFieldQueryParser multiParser = new MultiFieldQueryParser(
FieldConstants.LUCENE_VERSION, SEARCH_FIELDS,
IndexManagerImpl.getAnalyzer());
@@ -133,10 +124,8 @@ public class SearchOperation extends Rea
query = bQuery;
}
- Term tCategory = IndexUtil.getTerm(FieldConstants.CATEGORY,
- category);
-
- if (tCategory != null) {
+ if (category != null) {
+ Term tCategory = new Term(FieldConstants.CATEGORY, category.toLowerCase());
BooleanQuery bQuery = new BooleanQuery();
bQuery.add(query, BooleanClause.Occur.MUST);
bQuery.add(new TermQuery(tCategory), BooleanClause.Occur.MUST);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java Thu Jul 10 15:28:53 2014
@@ -222,12 +222,6 @@ public class SearchServlet extends HttpS
// Load weblog custom models
ModelLoader.loadCustomModels(weblog, model, initData);
- // TODO This causes another search, remove.
- // manually add search model again to support pre-3.0 weblogs
- Model searchModel = new SearchResultsModel();
- searchModel.init(initData);
- model.put("searchResults", searchModel);
-
} catch (WebloggerException ex) {
log.error("Error loading model objects for page", ex);
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Thu Jul 10 15:28:53 2014
@@ -646,7 +646,7 @@ macro.bookmark.urlFeed=URL of site''s RS
macro.searchresults.hits_1=<strong>{0}</strong> entries found.<br /><em>You can also
macro.searchresults.hits_2=try this same search</a> on \
<a href="http://google.com">Google</a>.</em>
-macro.searchresults.incategory=- In Category -
+macro.searchresults.incategory=- All Categories -
error.searchProblem=There was a problem with your search.
@@ -679,11 +679,7 @@ macro.weblog.post=Post
macro.weblog.postpreview=Preview
macro.weblog.searchalert=Please enter a search term to continue.
macro.weblog.searchbutton=Search
-macro.weblog.searchdictionary=You searched this site for \
-"<a href="http://dictionary.com/search?q={0}" title="Define ''{1}'' \
-on Dictionary.com" class="dictionary">{2}</a>".
-macro.weblog.searchhits=<strong>{0}</strong> entries found.
-macro.weblog.searchagain=Search Again
+macro.weblog.searchhits=Entries found for "{0}": <strong>{1}</strong>
macro.weblog.searchgoogle=<em>You can also \
<a href="http://google.com/search?q={0}%20site:{1}/{3}" \
class="google">try this same search</a> on \
Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Thu Jul 10 15:28:53 2014
@@ -448,7 +448,7 @@ macro.bookmark.urlFeed=URL des Bliki.inf
# ------------------------------------------------------------- RSS Macro
macro.searchresults.hits_1=<strong>{0}</strong> Eintr\u00E4ge gefunden.<br /><em>Sie k\u00F6nnen
macro.searchresults.hits_2=die gleiche Suche</a> auf <a href="http://google.com">Google</a> durchf\u00FChren.</em>
-macro.searchresults.incategory=- In der Kategorie -
+macro.searchresults.incategory=- Alle Kategorien -
# ------------------------------------------------------------- Search Results Day Macro
macro.weblog.comment=Kommentar
macro.weblog.comment.unknown=Unbekannt
@@ -474,12 +474,10 @@ macro.weblog.preview=Vorschau
macro.weblog.readMore=Weiterlesen
macro.weblog.readMoreLink=<span class="readmore">[<a class="readmore" href="{0}">Weiterlesen</a>]</span>
macro.weblog.rememberinfo=Eingaben merken?
-macro.weblog.searchagain=erneut suchen
macro.weblog.searchalert=Bitte geben Sie einen Suchbegriff ein um fortzufahren.
macro.weblog.searchbutton=Suche
-macro.weblog.searchdictionary=Sie durchsuchten diese Site nach der "<a href="http://dictionary.com/search?q={0}" title="Definition '{1}' auf Dictionary.com" class="dictionary">{2}</a>".
-macro.weblog.searchgoogle=<em>Sie k\u00F6nnen <a href="http://google.com/search?q={0}%20site:{1}/page/{3}" class="google">die gleiche Suche</a> auch auf <a href="http://google.com">Google</a> ausf\u00FChren.</em>
-macro.weblog.searchhits=<strong>{0}</strong> Eintr\u00E4ge gefunden.
+macro.weblog.searchgoogle=<em>Sie k\u00F6nnen <a href="http://google.com/search?q={0}%20site:{1}/page/{3}" class="google">die gleiche Suche</a> auch auf Google ausf\u00FChren.</em>
+macro.weblog.searchhits=<strong>{1}</strong> Eintr\u00E4ge f\u00FCr "{0}" gefunden.
macro.weblog.url=URL:
macro.weblog.yourcomment=Ihr Kommentar:
mainPage.actions=Aktionen
Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Thu Jul 10 15:28:53 2014
@@ -254,9 +254,7 @@ macro.weblog.postcomment=Enviar comentar
macro.weblog.post=Enviar
macro.weblog.searchalert=Por favor, introduzca un t\u00E9rmino que buscar para continuar.
macro.weblog.searchbutton=Buscar
-macro.weblog.searchdictionary=Has buscado este sitio "<a href\="http\://dictionary.com/search?q\={0}" title\="Definici\u00F3n de '{1}' en Dictionary.com" class\="dictionary">{2}</a>".
-macro.weblog.searchhits=<strong>{0}</strong> entradas encontradas.
-macro.weblog.searchagain=Buscar otra vez
+macro.weblog.searchhits="{0}": <strong>{1}</strong> entradas encontradas.
macro.weblog.searchgoogle=<em>Tambi\u00E9n puede <a href\="http\://google.com/search?q\={0}%20site\:{1}/page/{3}" class\="google">probar la misma b\u00FAsqueda</a> en <a href\="http\://google.com">Google</a>.</em>
macro.weblog.notifyMeOfComments=Avisarme de nuevos comentarios por correo electr\u00F3nico
mainPage.category=Categor\u00EDa
Modified: roller/trunk/app/src/main/resources/ApplicationResources_fr.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_fr.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_fr.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_fr.properties Thu Jul 10 15:28:53 2014
@@ -519,11 +519,7 @@ macro.weblog.postpreview=Aperçu
macro.weblog.searchalert=Veuillez entrer un terme de recherche pour continuer.
macro.weblog.searchbutton=Rechercher
#FIXME
-macro.weblog.searchdictionary=You searched this site for \
-"<a href="http://dictionary.com/search?q={0}" title="Define '{1}' \
-on Dictionary.com" class="dictionary">{2}</a>".
-macro.weblog.searchhits=<strong>{0}</strong> entrées trouvées.
-macro.weblog.searchagain=Relancer la recherche
+macro.weblog.searchhits="{0}": <strong>{1}</strong> entrées trouvées.
macro.weblog.searchgoogle=<em>Vous pouvez aussi \
<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
class="google">essayer cette recherche</a> sur \
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Thu Jul 10 15:28:53 2014
@@ -422,8 +422,7 @@ macro.weblog.commentwarning=\u30B3\u30E1
macro.weblog.postcommentHeader=\u30B3\u30E1\u30F3\u30C8
macro.weblog.post=\u6295\u7A3F
macro.weblog.searchbutton=\u691C\u7D22
-macro.weblog.searchhits=<strong>{0}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-macro.weblog.searchagain=\u518D\u5EA6\u691C\u7D22\u3059\u308B
+macro.weblog.searchhits="{0}": <strong>{1}</strong>\u30A8\u30F3\u30C8\u30EA\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
macro.weblog.searchgoogle=<em><a href="http://www.google.co.jp/">Google</a>\u3067<a href="http://www.google.co.jp/search?q={0}%20site:{1}/page/{3}" class="google">\u540C\u3058\u30AF\u30A8\u30EA\u30EF\u30FC\u30C9\u3067\u691C\u7D22</a>\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002</em>
macro.weblog.notifyMeOfComments=\u65B0\u3057\u3044\u30B3\u30E1\u30F3\u30C8\u3092\u30E1\u30FC\u30EB\u3067\u901A\u77E5\u3059\u308B
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ko.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ko.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ko.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ko.properties Thu Jul 10 15:28:53 2014
@@ -593,10 +593,7 @@ macro.weblog.post=\ub4f1\ub85d
macro.weblog.postpreview=\ubbf8\ub9ac\ubcf4\uae30
macro.weblog.searchalert=\uac80\uc0c9\uc5b4\ub97c \uc785\ub825\ud558\uc2ed\uc2dc\uc624.
macro.weblog.searchbutton=\uac80\uc0c9
-macro.weblog.searchdictionary=\uc0ac\uc774\ud2b8\uac00 \uac80\uc0c9\ub418\uc5c8\uc2b5\ub2c8\ub2e4: \
-"<a href="http://dictionary.com/search?q={0}" title="Dictionary.com\uc5d0 ''{1}'' \uc815\uc758 \" class="dictionary">{2}</a>".
-macro.weblog.searchhits=<strong>{0}</strong> \uae30\uc0ac\uac00 \ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-macro.weblog.searchagain=\ub2e4\uc2dc \uac80\uc0c9
+macro.weblog.searchhits="{0}": <strong>{1}</strong> \uae30\uc0ac\uac00 \ubc1c\uacac\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
macro.weblog.searchgoogle=<em> \
<a href="http://google.com">Google</a>\uc744 \ud1b5\ud574 \
<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Thu Jul 10 15:28:53 2014
@@ -335,11 +335,7 @@ macro.weblog.postcomment=\u041e\u043f\u0
macro.weblog.post=\u041e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u0442\u044c
macro.weblog.searchalert=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u0440\u0438\u0442\u0435\u0440\u0438\u0438 \u043f\u043e\u0438\u0441\u043a\u0430 \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438.
macro.weblog.searchbutton=\u041f\u043e\u0438\u0441\u043a
-macro.weblog.searchdictionary=\u0412\u044b \u043d\u0430\u0448\u043b\u0438 \u044d\u0442\u043e\u0442 \u0441\u0430\u0439\u0442 \u0434\u043b\u044f \
-"<a href="http://dictionary.com/search?q={0}" title="Define '{1}' \
-on Dictionary.com" class="dictionary">{2}</a>".
-macro.weblog.searchhits=<strong>{0}</strong> \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.
-macro.weblog.searchagain=\u041f\u043e\u0432\u0442\u043e\u0440\u043d\u044b\u0439 \u043f\u043e\u0438\u0441\u043a
+macro.weblog.searchhits="{0}": <strong>{1}</strong> \u0437\u0430\u043f\u0438\u0441\u0435\u0439 \u043d\u0430\u0439\u0434\u0435\u043d\u043e.
macro.weblog.searchgoogle=<em>\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0442\u0430\u043a\u0436\u0435 \
<a href="http://google.com/search?q={0}%20site:{1}/page/{3}" \
class="google">\u043f\u043e\u043f\u044b\u0442\u0430\u0442\u044c\u0441\u044f \u043f\u043e\u0438\u0441\u043a\u0430\u0442\u044c </a> \u043d\u0430 \
Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Thu Jul 10 15:28:53 2014
@@ -260,12 +260,10 @@ macro.weblog.postcommentHeader=\u53d1\u8
macro.weblog.postedby=\u53d1\u8868\u4e8e
macro.weblog.preview=\u9884\u89c8
macro.weblog.rememberinfo=\u8bb0\u4e0b\u60a8\u7684\u4fe1\u606f\uff1f
-macro.weblog.searchagain=\u91cd\u65b0\u641c\u7d22
macro.weblog.searchalert=\u8bf7\u8f93\u5165\u641c\u7d22\u6761\u76ee.
macro.weblog.searchbutton=\u641c\u7d22
-macro.weblog.searchdictionary=\u5728"<a href="http://dictionary.com/search?q={0}" title="Define '{1}' on Dictionary.com" class="dictionary">{2}</a>"\u4e2d\u641c\u7d22\u3002
macro.weblog.searchgoogle=<em>\u60a8\u4e5f\u53ef\u4ee5\u4f7f\u7528<a href="http://google.com">Google</a>\u6765\u641c\u7d22<a href="http://google.com/search?q={0}%20site:{1}/{2}/{3}" class="google">\u8fd9\u4e2a\u94fe\u63a5</a>\u3002</em>
-macro.weblog.searchhits=\u627e\u5230<strong>{0}</strong>\u6761\u65e5\u5fd7\u3002
+macro.weblog.searchhits="{0}": \u627e\u5230<strong>{1}</strong>\u6761\u65e5\u5fd7\u3002
macro.weblog.url=URL\uff1a
macro.weblog.yourcomment=\u60a8\u7684\u8bc4\u8bba\uff1a
mainPage.actions=\u52a8\u4f5c
Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Thu Jul 10 15:28:53 2014
@@ -795,12 +795,11 @@ Show search again form for a weblog.
*#
#macro(showWeblogSearchAgainForm $weblog)
<div id="searchAgain">
- $text.get( "macro.weblog.searchdictionary", [$model.term, $model.term, $model.term] )
- $text.get( "macro.weblog.searchhits", [$model.hits])
+ $text.get( "macro.weblog.searchhits", [$model.term, $model.hits])
<form method="get" action="$url.search" style="margin: 5px">
<input type="text" id="q" name="q" class="text medium" maxlength="255" value="$model.term" style="padding-left: 1px" /><br />
- #if(!$site && $model.hits > 0)
- #set( $cats = $model.weblog.getWeblogCategories())
+ #set( $cats = $model.weblog.getWeblogCategories())
+ #if(!$site && $cats && $cats.size() > 1)
<select name="cat" class="select">
<option value="">$text.get( "macro.searchresults.incategory" )</option>
#foreach( $cat in $cats )
@@ -808,7 +807,7 @@ Show search again form for a weblog.
#end
</select>
#end
- <input type="submit" value="$text.get( "macro.weblog.searchagain" )" class="button" />
+ <input type="submit" value="$text.get( "macro.weblog.searchbutton" )" class="button" />
</form>
$text.get( "macro.weblog.searchgoogle", [$model.term, $url.absoluteSite, $url.site, ${weblog.handle}] )
@@ -817,12 +816,11 @@ Show search again form for a weblog.
## Mobile Version
#macro(showMobileSearchAgainForm $weblog)
<div id="searchAgain">
- $text.get( "macro.weblog.searchdictionary", [$model.term, $model.term, $model.term] )
- $text.get( "macro.weblog.searchhits", [$model.hits])
+ $text.get( "macro.weblog.searchhits", [$model.term, $model.hits])
<form method="get" action="$url.search" style="margin: 5px">
<input type="search" id="q" name="q" placeholder="Search..." maxlength="255" value="$model.term" />
- #if(!$site && $model.hits > 0)
- #set( $cats = $model.weblog.getWeblogCategories())
+ #set($cats = $model.weblog.getWeblogCategories())
+ #if(!$site && $cats && $cats.size() > 1)
<select name="cat" class="select">
<option value="">$text.get( "macro.searchresults.incategory" )</option>
#foreach( $cat in $cats )
@@ -830,7 +828,7 @@ Show search again form for a weblog.
#end
</select>
#end
- <input type="submit" data-role="button" data-theme="a" value="$text.get( "macro.weblog.searchagain" )" />
+ <input type="submit" data-role="button" data-theme="a" value="$text.get( "macro.weblog.searchbutton" )" />
</form>
</div>
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=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/fauxcoly/search.vm Thu Jul 10 15:28:53 2014
@@ -47,8 +47,7 @@
<div id="main_content">
<h2>Search Results for '$model.term'</h2>
- $text.get( "macro.weblog.searchdictionary", [$model.term, $model.term, $model.term] )
- $text.get( "macro.weblog.searchhits", [$model.hits])
+ $text.get( "macro.weblog.searchhits", [$model.term, $model.hits])
<br />
<br />
<p>You can refine your search and/or search within one weblog category</p>
@@ -65,7 +64,7 @@
#end
</select>
#end
- <input type="submit" value="$text.get( "macro.weblog.searchagain" )" />
+ <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=1609483&r1=1609482&r2=1609483&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/search.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/search.vm Thu Jul 10 15:28:53 2014
@@ -46,8 +46,7 @@
<div id="main_content" class="col-lg-8">
<div class="alert alert-info">
<p>Search Results for '$model.term'</p>
- $text.get( "macro.weblog.searchdictionary", [$model.term, $model.term, $model.term] )
- $text.get( "macro.weblog.searchhits", [$model.hits])
+ $text.get( "macro.weblog.searchhits", [$model.term, $model.hits])
</div>
#if ($model.hits > 0)
<div id="search_results">