Author: billyxie
Date: 2009-07-13 11:40:51 +0200 (Mon, 13 Jul 2009)
New Revision: 36873
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1454 - Spacing of field names and input boxes in Advanced Search is ugly
formatted
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-07-13 09:21:55 UTC (rev 36872)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-07-13 09:40:51 UTC (rev 36873)
@@ -251,18 +251,20 @@
<% ArrayList fields = new ArrayList(); %>
<table>
<tr>
+ <td colspan="2" nowrap>
+ <mm:compare referid="assettypes"
value="assetelement" inverse="true">
+ <div style="padding-right:5px;">
+ <fmt:message key="searchform.searchfor">
+ <fmt:param><mm:nodeinfo
nodetype="${assettypes}" type="guitype"/></fmt:param>
+ </fmt:message>
+ </div>
+ </mm:compare>
+ </td>
+ </tr>
+ <tr>
<td>
<mm:compare referid="assettypes"
value="assetelement" inverse="true">
<table>
- <tr>
- <td nowrap>
- <mm:compare referid="assettypes"
value="assetelement" inverse="true">
- <fmt:message
key="searchform.searchfor">
- <fmt:param><mm:nodeinfo
nodetype="${assettypes}" type="guitype"/></fmt:param>
- </fmt:message>
- </mm:compare>
- </td>
- </tr>
<mm:fieldlist nodetype="${assettypes}">
<%-- check if the field is from
assetelement --%>
<% boolean showField = true; %>
@@ -277,7 +279,7 @@
</mm:fieldinfo>
<% if (showField) { %>
<tr>
- <td height="31">
+ <td height="31" nowrap>
<mm:fieldinfo type="guiname"
jspvar="guiname"/>:
<mm:fieldinfo type="name"
jspvar="name" write="false">
<% fields.add(assettypes +
"." + name); %>
@@ -291,15 +293,10 @@
<td>
<mm:compare referid="assettypes"
value="assetelement" inverse="true">
<table>
- <tr>
- <td style="height:31px;width:200px"
width="200px" height="31px" nowrap>
-
- </td>
- </tr>
<% for (int i = 0; i < fields.size(); i++)
{
String field = (String) fields.get(i);
%>
<tr>
- <td height="31">
+ <td height="31" nowrap>
<input type="text"
style="width:145px" name="<%= field %>" value="<%= (request.getParameter(field)
== null)? "" :request.getParameter(field) %>" />
</td>
</tr>
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-07-13 09:21:55 UTC (rev 36872)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-07-13 09:40:51 UTC (rev 36873)
@@ -274,19 +274,21 @@
<div id="rightform">
<mm:compare referid="mode" value= "advanced">
<table>
+ <tr>
+ <td colspan="2" style="width:200px" width="200px"
height="31px" nowrap>
+ <mm:compare referid="contenttypes"
value="contentelement" inverse="true">
+ <div style="padding-right:5px;">
+ <fmt:message key="searchform.searchfor">
+ <fmt:param><mm:nodeinfo
nodetype="${contenttypes}" type="guitype"/></fmt:param>
+ </fmt:message>
+ </div>
+ </mm:compare>
+ </td>
+ </tr>
<tr>
<td>
<% ArrayList fields = new ArrayList(); %>
<table>
- <tr>
- <td style="height:31px;width:200px"
width="200px" height="31px" nowrap>
- <mm:compare referid="contenttypes"
value="contentelement" inverse="true">
- <fmt:message
key="searchform.searchfor">
- <fmt:param><mm:nodeinfo
nodetype="${contenttypes}" type="guitype"/></fmt:param>
- </fmt:message>
- </mm:compare>
- </td>
- </tr>
<mm:compare referid="contenttypes"
value="contentelement" inverse="true">
<mm:fieldlist nodetype="${contenttypes}">
<%-- check if the field is from
contentelement --%>
@@ -317,16 +319,11 @@
<td>
<mm:compare referid="contenttypes"
value="contentelement" inverse="true">
<table>
- <tr>
- <td style="height:31px;width:200px"
width="200px" height="31px" nowrap>
-
- </td>
- </tr>
<% for (int i = 0; i < fields.size(); i++)
{
String field = (String) fields.get(i);
%>
<tr>
<td height="31px">
- <input type="text" name="<%=
field %>" value="<%= (request.getParameter(field) == null)? ""
:request.getParameter(field) %>" />
+ <input type="text" name="<%=
field %>" style="width:145px" value="<%= (request.getParameter(field) == null)?
"" :request.getParameter(field) %>" />
</td>
</tr>
<% } %>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
