Author: billyxie
Date: 2009-07-13 11:44:55 +0200 (Mon, 13 Jul 2009)
New Revision: 36874
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/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/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-07-13 09:40:51 UTC (rev 36873)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2009-07-13 09:44:55 UTC (rev 36874)
@@ -267,18 +267,20 @@
<c:set var="fieldtypes"/>
<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 --%>
<c:set var="showField" value="true"/>
@@ -293,7 +295,7 @@
</mm:fieldinfo>
<c:if test="${showField}">
<tr>
- <td height="31px">
+ <td height="31px" nowrap>
<mm:fieldinfo type="guiname"
jspvar="guiname"/>:
<mm:fieldinfo type="name"
jspvar="fieldname" write="false">
<c:choose>
@@ -302,8 +304,8 @@
<c:set
var="fieldtypes"><mm:fieldinfo type="typedescription"/></c:set>
</c:when>
<c:otherwise>
- <c:set
var="fields">${fields},${assettypes}.${fieldname}</c:set>
- <c:set
var="fieldtypes">${fieldtypes},<mm:fieldinfo type="typedescription"/></c:set>
+ <c:set
var="fields">${fields},${assettypes}.${fieldname}</c:set>
+ <c:set
var="fieldtypes">${fieldtypes},<mm:fieldinfo type="typedescription"/></c:set>
</c:otherwise>
</c:choose>
</mm:fieldinfo>
@@ -317,15 +319,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>
<c:forTokens items="${fields}" var="field"
delims="," varStatus="status">
<c:forTokens items="${fieldtypes}"
var="fieldtype" delims="," begin="${status.index}" end="${status.index}">
<tr>
- <td height="31px">
+ <td height="31px" nowrap>
<input type="text"
name="${field}" style="width:145px" dttype="${fieldtype}"
value="${param.field}" />
</td>
</tr>
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-07-13 09:40:51 UTC (rev 36873)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-07-13 09:44:55 UTC (rev 36874)
@@ -294,19 +294,21 @@
<c:set var="fields"/>
<c:set var="fieldtypes"/>
<table>
+ <tr>
+ <td colspan="2" style="height:31px;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>
<mm:compare referid="contenttypes"
value="contentelement" inverse="true">
<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:fieldlist nodetype="${contenttypes}">
<%-- check if the field is from
contentelement --%>
<c:set var="showField" value="true"/>
@@ -320,7 +322,7 @@
</mm:fieldlist>
</mm:fieldinfo>
<c:if test="${showField}">
- <tr rowspan="5">
+ <tr>
<td height="31px" nowrap>
<mm:fieldinfo type="guiname"/>:
<mm:fieldinfo type="name"
id="fieldname" write="false">
@@ -345,16 +347,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>
<c:forTokens items="${fields}" var="field"
delims="," varStatus="status">
<c:forTokens items="${fieldtypes}"
var="fieldtype" delims="," begin="${status.index}" end="${status.index}">
<tr>
<td height="31px">
- <input type="text"
name="${field}" dttype="${fieldtype}" value="${param.field}" />
+ <input type="text"
name="${field}" style="width:145px" dttype="${fieldtype}"
value="${param.field}" />
</td>
</tr>
</c:forTokens>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
