Author: jonathan
Date: Mon Jan 21 13:02:30 2008
New Revision: 12656

Log:

MASHUP-532: hide "start a new search" text when no query has yet been performed.
Plus associated formatting improvements.

Modified:
   trunk/mashup/java/modules/www/build.xml
   trunk/mashup/java/modules/www/css/styles.css
   trunk/mashup/java/modules/www/search.jsp

Modified: trunk/mashup/java/modules/www/build.xml
==============================================================================
--- trunk/mashup/java/modules/www/build.xml     (original)
+++ trunk/mashup/java/modules/www/build.xml     Mon Jan 21 13:02:30 2008
@@ -8,9 +8,9 @@
     <target name="deploy" depends="deploy-jsp, deploy-jar"/>
 
     <property name="root"
-              value="..\..\distribution\target\dist\wso2-mashup-SNAPSHOT"/>
+              value="..\distribution\target\dist\wso2-mashup-SNAPSHOT"/>
     <property name="live-webapp"
-              value="${root}\lib\tomcat\webapps\ROOT\org"/>
+              value="${root}\lib\tomcat\webapps\ROOT"/>
 
     <target name="deploy-jsp">
         <copy todir="${live-webapp}">

Modified: trunk/mashup/java/modules/www/css/styles.css
==============================================================================
--- trunk/mashup/java/modules/www/css/styles.css        (original)
+++ trunk/mashup/java/modules/www/css/styles.css        Mon Jan 21 13:02:30 2008
@@ -62,6 +62,10 @@
     color: #1E6DCC;
 }
 
+div.advanced-search-link {
+    padding:.3em 1em;
+}
+
 div.advanced-search-link a {
     text-decoration: underline;
     font-style:italic;
@@ -157,7 +161,7 @@
 }
 
 div.advanced-search-link {
-    margin-right: 26px;
+    text-align:right;
 }
 
 div#content {
@@ -400,7 +404,7 @@
 }
 
 div#searchForms {
-    width:100%;
+    width:95%;
     border: 1px solid #C8DD64;
     padding:1em;
 }

Modified: trunk/mashup/java/modules/www/search.jsp
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp    (original)
+++ trunk/mashup/java/modules/www/search.jsp    Mon Jan 21 13:02:30 2008
@@ -728,7 +728,7 @@
 </table>
 </div>
 <div class="advanced-search-link">
-    <a href="search.jsp">start a new search...</a>
+    <% if (query != null) { %><a href="search.jsp">start a new search...</a><% 
} %>
 </div>
 
 </div>

_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to