Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv7234/webapp/editors/repository
Modified Files:
asset.jsp content.js content.jsp
Log Message:
CMSC-681,Asset Maintenance model change Normal listing
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: asset.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- asset.jsp 23 Oct 2008 11:44:00 -0000 1.1
+++ asset.jsp 27 Oct 2008 05:42:18 -0000 1.2
@@ -30,7 +30,7 @@
<% if (role != null && SecurityUtil.isWriter(role)) { %>
<ul class="shortcuts">
<li class="new" style="text-decoration: none;"><fmt:message
key="asset.new"/>
- <form action="../AssetInitAction.do" method="post"
style="display:inline;text-decoration:none">
+ <form name="initForm" action="../AssetInitAction.do" method="post"
style="display:inline;text-decoration:none">
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="creation" value="<mm:write
referid="parentchannel" />"/>
<input type="hidden" name="returnurl" value="<%= returnurl %>"/>
@@ -60,6 +60,7 @@
<c:set var="offset" value="${param.offset}"/>
<c:set var="extraparams"
value="&direction=${param.direction}&parentchannel=${param.parentchannel}"/>
<c:set var="orderby" value="${param.orderby}" scope="page" />
+<c:set var="type" value="asset" scope="page" />
<%@ include file="../pages.jsp" %>
<form action="assetMassDelete.do" name="assetForm">
@@ -77,19 +78,19 @@
<tr>
<th><% if (role != null && SecurityUtil.isWriter(role)) { %>
<c:if test="${fn:length(elements) >1}">
- <input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'contentForm', 'chk_');" value="on"/>
+ <input type="checkbox" name="selectall"
onclick="selectAll(this.checked, 'assetForm', 'chk_');" value="on"/>
</c:if>
<% } %>
</th>
- <th><a href="javascript:sortBy('asset', 'otype','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Asset', 'otype','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="asset.typecolumn"/></a></th>
- <th><a href="javascript:sortBy('asset', 'title','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Asset', 'title','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="asset.titlecolumn"/></a></th>
- <th><a href="javascript:sortBy('asset', 'creator','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Asset', 'creator','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="asset.authorcolumn"/></a></th>
- <th><a href="javascript:sortBy('asset', 'lastmodifieddate','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Asset', 'lastmodifieddate','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="asset.lastmodifiedcolumn"/></a></th>
- <th><a href="javascript:sortBy('asset', 'number','<mm:write
referid="parentchannel" />')" class="headerlink">
+ <th><a href="javascript:sortBy('Asset', 'number','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="asset.numbercolumn"/></a></th>
<th></th>
</tr>
Index: content.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- content.js 23 Oct 2008 11:44:00 -0000 1.13
+++ content.js 27 Oct 2008 05:42:18 -0000 1.14
@@ -42,27 +42,27 @@
function sortBy(action, orderColumn, channel) {
- var offset = document.forms[0].offset.value;
- var oldOrderColumn = document.forms[0].order.value;
+ var offset = document.forms['initForm'].offset.value;
+ var oldOrderColumn = document.forms['initForm'].order.value;
if (oldOrderColumn == orderColumn) {
// order column is not changed so change direction
- var oldDirection = document.forms[0].direction.value;
+ var oldDirection = document.forms['initForm'].direction.value;
if (oldDirection == 'down') {
- document.forms[0].direction.value = 'up';
+ document.forms['initForm'].direction.value = 'up';
}
else {
- document.forms[0].direction.value = 'down';
+ document.forms['initForm'].direction.value = 'down';
}
}
else {
- document.forms[0].order.value = orderColumn;
- document.forms[0].direction.value = 'down';
+ document.forms['initForm'].order.value = orderColumn;
+ document.forms['initForm'].direction.value = 'down';
}
- newDirection=document.forms[0].direction.value;
- type=document.forms[0].order.value;
- var url = action + '.do?orderby='+type+'&parentchannel=' +
channel+'&direction='+newDirection+'&offset='+offset;
+ newDirection=document.forms['initForm'].direction.value;
+ type=document.forms['initForm'].order.value;
+ var url = action + '.do?' + 'type=' + action.toLowerCase() +
'&orderby='+type+'&parentchannel=' +
channel+'&direction='+newDirection+'&offset='+offset;
document.location = url;
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- content.jsp 23 Oct 2008 11:44:00 -0000 1.39
+++ content.jsp 27 Oct 2008 05:42:18 -0000 1.40
@@ -28,7 +28,7 @@
<% if (role != null && SecurityUtil.isWriter(role)) { %>
<ul class="shortcuts">
<li class="new" style="text-decoration: none;"><fmt:message
key="content.new"/>
- <form action="../WizardInitAction.do" method="post"
style="display:inline;text-decoration:none">
+ <form name="initForm" action="../WizardInitAction.do" method="post"
style="display:inline;text-decoration:none">
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="creation" value="<mm:write
referid="parentchannel" />"/>
<input type="hidden" name="returnurl" value="<%= returnurl %>"/>
@@ -91,6 +91,7 @@
<c:set var="offset" value="${param.offset}"/>
<c:set var="extraparams"
value="&direction=${param.direction}&parentchannel=${param.parentchannel}"/>
<c:set var="orderby" value="${param.orderby}" scope="page" />
+<c:set var="type" value="content" scope="page" />
<%@ include file="../pages.jsp" %>
<form action="contentMassDelete.do" name="contentForm">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
