Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv4814/webapp/editors/repository
Modified Files:
content.js content.jsp
Log Message:
CMSC-280,Contentchannel screen does not give as much sort options as in
searching in the library
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-280
Index: content.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- content.js 4 Jun 2008 05:18:09 -0000 1.6
+++ content.js 5 Jun 2008 02:32:19 -0000 1.7
@@ -39,16 +39,36 @@
document.location = url;
}
-function sortByType(channel){
- var url = 'Content.do?orderby=otype&parentchannel=' + channel;
- document.location = url;
+
+
+function sortBy(orderColumn, channel) {
+ var offset = document.forms[0].offset.value;
+ var oldOrderColumn = document.forms[0].order.value;
+
+ if (oldOrderColumn == orderColumn) {
+ // order column is not changed so change direction
+ var oldDirection = document.forms[0].direction.value;
+
+ if (oldDirection == 'down') {
+ document.forms[0].direction.value = 'up';
+ }
+ else {
+ document.forms[0].direction.value = 'down';
}
+ }
+ else {
+ document.forms[0].order.value = orderColumn;
+ document.forms[0].direction.value = 'down';
+ }
+ newDirection=document.forms[0].direction.value;
+ type=document.forms[0].order.value;
+ var url = 'Content.do?orderby='+type+'&parentchannel=' +
channel+'&direction='+newDirection+'&offset='+offset;
-function sortByTitle(channel){
- var url = 'Content.do?orderby=title&parentchannel=' + channel;
document.location = url;
+
}
+
var moveContentNumber;
var moveParentChannel;
function moveContent(objectNumber, parentChannel) {
Index: content.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- content.jsp 4 Jun 2008 05:18:09 -0000 1.24
+++ content.jsp 5 Jun 2008 02:32:19 -0000 1.25
@@ -59,7 +59,9 @@
<input type="hidden" name="action" value="create"/>
<input type="hidden" name="creation" value="<mm:write
referid="parentchannel" />"/>
<input type="hidden" name="returnurl" value="<%= returnurl %>"/>
-
+ <input type="hidden" name="order" value="${orderby}" />
+ <input type="hidden" name="direction" value="${direction}"/>
+ <input type="hidden" name="offset" value="${param.offset}"/>
<select name="contenttype">
<c:forEach var="type" items="${typesList}">
<option value="${type.value}">${type.label}</option>
@@ -115,7 +117,7 @@
<c:set var="listSize" value="${elementCount}"/>
<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" />
<%@ include file="../pages.jsp" %>
@@ -123,9 +125,9 @@
<thead>
<tr>
<th></th>
- <th><a href="javascript:sortByType('<mm:write referid="parentchannel"
/>')" class="headerlink">
+ <th><a href="javascript:sortBy('otype','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.typecolumn"/></a></th>
- <th><a href="javascript:sortByTitle('<mm:write referid="parentchannel"
/>')" class="headerlink">
+ <th><a href="javascript:sortBy('title','<mm:write
referid="parentchannel" />')" class="headerlink">
<fmt:message key="content.titlecolumn"/></a></th>
<th><fmt:message key="content.authorcolumn"/></th>
<th><fmt:message key="content.lastmodifiedcolumn"/></th>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
