Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv9725/src/webapp/editors/repository
Modified Files:
assetsearch.jsp contentsearch.jsp
Log Message:
CMSC-681 Asset Maintenance
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-681
Index: assetsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- assetsearch.jsp 12 Jan 2009 10:46:06 -0000 1.17
+++ assetsearch.jsp 13 Jan 2009 03:10:29 -0000 1.18
@@ -103,6 +103,20 @@
<tr>
<td style="width:105px"><fmt:message key="searchform.title"
/></td>
<td colspan="5"><html:text property="title"
style="width:200px"/></td>
+ <mm:compare referid="mode" value= "basic">
+ <td style="width:105px"><fmt:message
key="searchform.assettype" /></td>
+ <td>
+ <c:if test="${not empty strict}">
+ ${strict}
+ </c:if>
+ <c:if test="${empty strict}">
+ <html:select property="assettypes"
onchange="selectAssettype('${searchinit}');" >
+ <html:option value="assetelement"><<fmt:message
key="searchform.assettypes.all" />></html:option>
+ <html:optionsCollection name="typesList" value="value"
label="label"/>
+ </html:select>
+ </c:if>
+ </td>
+ </mm:compare>
</tr>
<mm:compare referid="mode" value= "advanced">
<tr>
@@ -171,7 +185,7 @@
</mm:fieldinfo>
<% if (showField) { %>
<tr rowspan="5">
- <td height="31">
+ <td height="32">
<mm:fieldinfo type="guiname"
jspvar="guiname"/>:
<mm:fieldinfo type="name"
jspvar="name" write="false">
<% fields.add(assettypes + "." +
name); %>
@@ -188,7 +202,7 @@
<% for (int i = 0; i < fields.size(); i++) {
String field = (String) fields.get(i); %>
<tr>
- <td>
+ <td height="32">
<input type="text" name="<%= field %>"
value="<%= (request.getParameter(field) == null)? ""
:request.getParameter(field) %>" />
</td>
</tr>
Index: contentsearch.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- contentsearch.jsp 12 Jan 2009 10:46:06 -0000 1.10
+++ contentsearch.jsp 13 Jan 2009 03:10:29 -0000 1.11
@@ -102,6 +102,15 @@
<tr>
<td style="width:105px"><fmt:message key="searchform.title"
/></td>
<td colspan="5"><html:text property="title"
style="width:200px"/></td>
+ <mm:compare referid="mode" value= "basic">
+ <td style="width:105px"><fmt:message
key="searchform.contenttype" /></td>
+ <td>
+ <html:select property="contenttypes"
onchange="selectContenttype('${searchinit}');" >
+ <html:option value="contentelement"><<fmt:message
key="searchform.contenttypes.all" />></html:option>
+ <html:optionsCollection name="typesList" value="value"
label="label"/>
+ </html:select>
+ </td>
+ </mm:compare>
</tr>
<mm:compare referid="mode" value= "advanced">
<tr>
@@ -167,7 +176,7 @@
</mm:fieldinfo>
<% if (showField) { %>
<tr rowspan="5">
- <td height="31">
+ <td height="32">
<mm:fieldinfo type="guiname"
jspvar="guiname"/>:
<mm:fieldinfo type="name"
jspvar="name" write="false">
<% fields.add(contenttypes + "."
+ name); %>
@@ -184,7 +193,7 @@
<% for (int i = 0; i < fields.size(); i++) {
String field = (String) fields.get(i); %>
<tr>
- <td>
+ <td height="32">
<input type="text" name="<%= field %>"
value="<%= (request.getParameter(field) == null)? ""
:request.getParameter(field) %>" />
</td>
</tr>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
