Return-Path: 
 <commits-return-8560-apmail-roller-commits-archive=roller.apache.org@roller.apache.org>
X-Original-To: apmail-roller-commits-archive@www.apache.org
Delivered-To: apmail-roller-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 911E511A39
	for <apmail-roller-commits-archive@www.apache.org>;
 Thu, 19 Jun 2014 07:30:25 +0000 (UTC)
Received: (qmail 46035 invoked by uid 500); 19 Jun 2014 07:30:25 -0000
Delivered-To: apmail-roller-commits-archive@roller.apache.org
Received: (qmail 46002 invoked by uid 500); 19 Jun 2014 07:30:25 -0000
Mailing-List: contact commits-help@roller.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@roller.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@roller.apache.org>
List-Post: <mailto:commits@roller.apache.org>
List-Id: <commits.roller.apache.org>
Reply-To: dev@roller.apache.org
Delivered-To: mailing list commits@roller.apache.org
Received: (qmail 45991 invoked by uid 99); 19 Jun 2014 07:30:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 07:30:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 07:30:25 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2C4DF238889B;
	Thu, 19 Jun 2014 07:30:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1603738 -
 /roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
Date: Thu, 19 Jun 2014 07:30:00 -0000
To: commits@roller.apache.org
From: ghuber@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140619073000.2C4DF238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ghuber
Date: Thu Jun 19 07:29:59 2014
New Revision: 1603738

URL: http://svn.apache.org/r1603738
Log:
Overview update...  See ROL-1789 

Modified:
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm

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=1603738&r1=1603737&r2=1603738&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 Jun 19 07:29:59 2014
@@ -735,14 +735,12 @@ Show search form for a weblog.
           <input type="text" id="q" name="q" size="10" class="text small" maxlength="255" value="#if($model.term)$model.term#end" />
           #if( $showCatChooser )
             #set( $cats = $model.weblog.getWeblogCategories())
-            #if(!$site)
-              <select name="cat">
-                <option value="">- $text.get("mainPage.category") -</option>
-                #foreach( $cat in $cats )
-                  <option #if($cat.name == $model.term)selected="selected"#end>$cat.name</option>
-                #end
-              </select>
-            #end
+            <select name="cat">
+              <option value="">- $text.get("mainPage.category") -</option>
+              #foreach( $cat in $cats )
+                <option #if($cat.name == $model.term)selected="selected"#end>$cat.name</option>
+              #end
+            </select>
           #end
           <input type="submit" class="button" value="$text.get( "macro.weblog.searchbutton" )" id="searchbutton" />
         </p>
@@ -765,14 +763,12 @@ Show search form for a weblog.
           <input type="search" id="q" name="q" placeholder="Search..." maxlength="255" value="#if($model.term)$model.term#end" />
           #if( $showCatChooser )
             #set( $cats = $model.weblog.getWeblogCategories())
-            #if(!$site)
-              <select name="cat">
-                <option value="">- $text.get("mainPage.category") -</option>
-                #foreach( $cat in $cats )
-                  <option #if($cat.name == $model.term)selected="selected"#end>$cat.name</option>
-                #end
-              </select>
-            #end
+            <select name="cat">
+              <option value="">- $text.get("mainPage.category") -</option>
+              #foreach( $cat in $cats )
+                <option #if($cat.name == $model.term)selected="selected"#end>$cat.name</option>
+              #end
+            </select>
           #end
           <input type="submit" id="searchbutton" data-role="button" data-theme="a" value="$text.get( "macro.weblog.searchbutton" )" />
         </p>
@@ -803,8 +799,8 @@ Show search again form for a weblog.
         $text.get( "macro.weblog.searchhits", [$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 />
-          #set( $cats = $model.weblog.getWeblogCategories())
           #if(!$site && $model.hits > 0)
+            #set( $cats = $model.weblog.getWeblogCategories())
             <select name="cat" class="select">
               <option value="">$text.get( "macro.searchresults.incategory" )</option>
               #foreach( $cat in $cats )
@@ -812,7 +808,6 @@ Show search again form for a weblog.
               #end
             </select>
           #end
-
           <input type="submit" value="$text.get( "macro.weblog.searchagain" )" class="button" />
         </form>
 
@@ -826,8 +821,8 @@ Show search again form for a weblog.
         $text.get( "macro.weblog.searchhits", [$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" />
-          #set( $cats = $model.weblog.getWeblogCategories())
           #if(!$site && $model.hits > 0)
+            #set( $cats = $model.weblog.getWeblogCategories())
             <select name="cat" class="select">
               <option value="">$text.get( "macro.searchresults.incategory" )</option>
               #foreach( $cat in $cats )
@@ -835,7 +830,6 @@ 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" )" />
         </form>