Author: mfang
Date: 2009-06-02 08:20:45 +0200 (Tue, 02 Jun 2009)
New Revision: 35544
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.js
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
Log:
CMSC-1006 Create a 'pages' tag for using inside the Editors and use it by
default for paging
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.js
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.js
2009-06-02 06:20:20 UTC (rev 35543)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/asset.js
2009-06-02 06:20:45 UTC (rev 35544)
@@ -21,24 +21,13 @@
var newDirection=document.forms['initForm'].direction.value;
var type=document.forms['initForm'].order.value;
var offset = document.forms['initForm'].offset.value;
+ var pagerDOToffset = document.forms['initForm']['pager.offset'].value;
document.location = "../Asset.do?action=moveAssetToChannel&parentchannel="
+ moveParentChannel
+ "&newparentchannel=" + channel + "&objectnumber="
+ moveContentNumber + "&orderby=" + type + "&direction="
- + newDirection + '&offset=' + offset;
+ + newDirection + '&offset=' + offset + '&pager.offset=' +
pagerDOToffset;
}
-function permanentDelete(objectnumber, message, offset) {
- if (confirm(message)) {
- var url = "DeleteAction.do";
- url += "?objectnumber=" + objectnumber;
- url += "&returnurl=" + escape(document.location);
- url += "&offset=" + offset;
-
- document.location.href = url;
- }
- }
-
-
function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i < elements.length; i++) {
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2009-06-02 06:20:20 UTC (rev 35543)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.js
2009-06-02 06:20:45 UTC (rev 35544)
@@ -43,6 +43,7 @@
function sortBy(action, orderColumn, channel) {
var offset = document.forms['initForm'].offset.value;
+ var pagerDOToffset = document.forms['initForm']['pager.offset'].value;
var oldOrderColumn = document.forms['initForm'].order.value;
if (oldOrderColumn == orderColumn) {
@@ -62,7 +63,7 @@
}
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;
+ var url = action + '.do?' + 'type=' + action.toLowerCase() +
'&orderby='+type+'&parentchannel=' +
channel+'&direction='+newDirection+'&offset='+offset+'&pager.offset='+pagerDOToffset;
document.location = url;
@@ -81,7 +82,8 @@
var newDirection=document.forms[0].direction.value;
var type=document.forms[0].order.value;
var offset = document.forms[0].offset.value;
- document.location =
"../Content.do?action=moveContentToChannel&parentchannel=" + moveParentChannel
+ "&newparentchannel=" + channel + "&objectnumber=" +
moveContentNumber+"&orderby="+type+"&direction="+newDirection+'&offset='+offset;;
+ var pagerDOToffset = document.forms[0]['pager.offset'].value;
+ document.location =
"../Content.do?action=moveContentToChannel&parentchannel=" + moveParentChannel
+ "&newparentchannel=" + channel + "&objectnumber=" +
moveContentNumber+"&orderby="+type+"&direction="+newDirection+'&offset='+offset+'&pager.offset='+pagerDOToffset;
}
function refreshChannels() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
