[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory
james.mmbase.org:/tmp/cvs-serv20047/cmsc/contentrepository/src/webapp/editors/recyclebin
Modified Files:
Tag: b1_5
index.jsp
Log Message:
CMSC-1291 index.jsp is needed in path for linking after delete or restore
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-1291
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/Attic/index.jsp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- index.jsp 19 Sep 2008 02:25:02 - 1.13
+++ index.jsp 11 Feb 2009 13:32:47 - 1.13.2.1
@@ -71,11 +71,11 @@
thead
tr
th style=width: 56px;/th
- th style=width: 68px;a
href=?sortBy=otypedirection=${direction} class=headerlinkfmt:message
key=locate.typecolumn //a/th
- tha
href=?sortBy=titledirection=${direction} class=headerlinkfmt:message
key=locate.titlecolumn //a/th
- th style=width: 50px;a
href=?sortBy=creatordirection=${direction} class=headerlinkfmt:message
key=locate.authorcolumn //a/th
- th style=width: 120px;a
href=?sortBy=lastmodifieddatedirection=${direction}
class=headerlinkfmt:message key=locate.lastmodifiedcolumn //a/th
- th style=width: 60px;a
href=?sortBy=numberdirection=${direction} class=headerlinkfmt:message
key=locate.numbercolumn //a/th
+ th style=width: 68px;a
href=index.jsp?sortBy=otypedirection=${direction}
class=headerlinkfmt:message key=locate.typecolumn //a/th
+ tha
href=index.jsp?sortBy=titledirection=${direction}
class=headerlinkfmt:message key=locate.titlecolumn //a/th
+ th style=width: 50px;a
href=index.jsp?sortBy=creatordirection=${direction}
class=headerlinkfmt:message key=locate.authorcolumn //a/th
+ th style=width: 120px;a
href=index.jsp?sortBy=lastmodifieddatedirection=${direction}
class=headerlinkfmt:message key=locate.lastmodifiedcolumn //a/th
+ th style=width: 60px;a
href=index.jsp?sortBy=numberdirection=${direction}
class=headerlinkfmt:message key=locate.numbercolumn //a/th
/tr
/thead
tbody class=hover
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin In directory james.mmbase.org:/tmp/cvs-serv10420/recyclebin Removed Files: index.jsp Log Message: CMSC-681 Asset Maintenance See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin See also: http://www.mmbase.org/jira/browse/CMSC-681 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory james.mmbase.org:/tmp/cvs-serv2017/webapp/editors/recyclebin
Modified Files:
index.jsp
Log Message:
CMSC-1126 using Assets in contentElements
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-1126
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- index.jsp 13 Nov 2008 04:24:08 - 1.15
+++ index.jsp 2 Dec 2008 02:40:21 - 1.16
@@ -90,8 +90,16 @@
td
mm:nodeinfo type=guitype/
/td
-td
- mm:field name=title/
+td style=white-space: nowrap; onMouseDown=objClick(this);
+ c:set var=assettype mm:nodeinfo type=guitype//c:set
+ mm:field id=title write=false name=title/
+ c:if test=${assettype == 'URL'}
+ c:set var=title mm:field name=name//c:set
+ /c:if
+ c:if test=${fn:length(title) 50}
+ c:set var=title${fn:substring(title,0,49)}.../c:set
+ /c:if
+ ${title}
/td
td
mm:field name=lastmodifier /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp recyclebin.js
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory james.mmbase.org:/tmp/cvs-serv1363/webapp/editors/recyclebin
Modified Files:
index.jsp recyclebin.js
Log Message:
CMSC-1088 Restore/Delete the Assets from trash
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-1088
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- index.jsp 26 Sep 2008 06:58:32 - 1.14
+++ index.jsp 13 Nov 2008 04:24:08 - 1.15
@@ -57,8 +57,8 @@
div class=body
mm:node number=$parentchannel
- mm:relatednodescontainer
path=contentrel,contentelement searchdirs=destination
element=contentelement
- mm:sortorder field=contentelement.${sortBy}
direction=${direction} /
+ mm:relatednodescontainer
path=creationrel,assetelement searchdirs=source element=assetelement
+
c:set var=listSizemm:size//c:set
c:set var=resultsPerPage value=50/
@@ -83,17 +83,82 @@
tr mm:even
inverse=trueclass=swap/mm:even
td nowrap
-a href=javascript:info('mm:field
name=number /')img src=../gfx/icons/info.png width=16 height=16
alt=fmt:message key=recyclebin.info / title=fmt:message
key=recyclebin.info ///a
+ a href=javascript:info('mm:field
name=number /', 'mm:nodeinfo type=guitype/')img
src=../gfx/icons/info.png width=16 height=16 alt=fmt:message
key=recyclebin.info / title=fmt:message key=recyclebin.info ///a
a
href=javascript:permanentDelete('mm:field name=number /', 'fmt:message
key=recyclebin.removeconfirm /', '${offset}');img
src=../gfx/icons/delete.png width=16 height=16 alt=fmt:message
key=recyclebin.remove / title=fmt:message key=recyclebin.remove
///a
-a href=javascript:restore('mm:field
name=number /', '${offset}');img src=../gfx/icons/restore.png
width=16 height=16 alt=fmt:message key=recyclebin.restore /
title=fmt:message key=recyclebin.restore ///a
+ a href=javascript:restore('mm:field
name=number /', '${offset}','mm:nodeinfo type=guitype/');img
src=../gfx/icons/restore.png width=16 height=16 alt=fmt:message
key=recyclebin.restore / title=fmt:message key=recyclebin.restore
///a
/td
td
mm:nodeinfo type=guitype/
/td
- tdmm:field name=title//td
- tdmm:field name=lastmodifier
//td
-td nowrapmm:field
name=lastmodifieddatecmsc:dateformat displaytime=true //mm:field/td
-tdmm:field name=number//td
+td
+ mm:field name=title/
+/td
+td
+ mm:field name=lastmodifier /
+/td
+td nowrap
+ mm:field
name=lastmodifieddatecmsc:dateformat displaytime=true //mm:field
+/td
+td
+ mm:field name=number/
+/td
+ /tr
+
+ mm:last
+/tbody
+ /table
+
+ /mm:last
+ /mm:listnodes
+/mm:relatednodescontainer
+ /mm:node
+
+ mm:node number=$parentchannel
+ mm:relatednodescontainer
path=contentrel,contentelement searchdirs=destination
element=contentelement
+
+
+ c:set var=listSizemm:size//c:set
+ c:set var=resultsPerPage value=50/
+ c:set var=offset value=${not empty
param.offset ? param.offset : '0'}/
+
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory james.mmbase.org:/tmp/cvs-serv22603/webapp/editors/recyclebin
Modified Files:
index.jsp
Log Message:
CMSC-141,Create a restore option in the recycle bin for elements without a
deletionrel
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-141
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- index.jsp 19 Sep 2008 02:25:02 - 1.13
+++ index.jsp 26 Sep 2008 06:58:32 - 1.14
@@ -85,9 +85,7 @@
td nowrap
a href=javascript:info('mm:field
name=number /')img src=../gfx/icons/info.png width=16 height=16
alt=fmt:message key=recyclebin.info / title=fmt:message
key=recyclebin.info ///a
a
href=javascript:permanentDelete('mm:field name=number /', 'fmt:message
key=recyclebin.removeconfirm /', '${offset}');img
src=../gfx/icons/delete.png width=16 height=16 alt=fmt:message
key=recyclebin.remove / title=fmt:message key=recyclebin.remove
///a
- % if
(RepositoryUtil.hasDeletionChannels(node)) { %
a href=javascript:restore('mm:field
name=number /', '${offset}');img src=../gfx/icons/restore.png
width=16 height=16 alt=fmt:message key=recyclebin.restore /
title=fmt:message key=recyclebin.restore ///a
- % } %
/td
td
mm:nodeinfo type=guitype/
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory james.mmbase.org:/tmp/cvs-serv2936/recyclebin
Modified Files:
index.jsp
Log Message:
CMSC-899,Check and improve all lists according to guideline
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-899
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- index.jsp 3 Mar 2008 10:37:35 - 1.11
+++ index.jsp 17 Sep 2008 06:04:33 - 1.12
@@ -7,6 +7,11 @@
cmscedit:head title=recyclebin.title
script src=recyclebin.js type=text/javascript/script
/cmscedit:head
+mm:import externid=direction jspvar=directionup/mm:import
+mm:import externid=sortBy jspvar=sortBytitle/mm:import
+c:set var=direction
+ c:out value=${direction =='up'?'down':'up' }/
+/c:set
body onload=refreshChannels();
div class=tabs
div class=tab_active
@@ -53,7 +58,7 @@
div class=body
mm:node number=$parentchannel
mm:relatednodescontainer
path=contentrel,contentelement searchdirs=destination
element=contentelement
- mm:sortorder field=contentelement.title
direction=up /
+ mm:sortorder field=contentelement.${sortBy}
direction=${direction} /
c:set var=listSizemm:size//c:set
c:set var=resultsPerPage value=50/
@@ -66,11 +71,11 @@
thead
tr
th style=width: 56px;/th
- th style=width:
68px;fmt:message key=locate.typecolumn //th
- thfmt:message
key=locate.titlecolumn //th
- th style=width:
50px;fmt:message key=locate.authorcolumn //th
- th style=width:
120px;fmt:message key=locate.lastmodifiedcolumn //th
- th style=width:
60px;fmt:message key=locate.numbercolumn //th
+ th style=width: 68px;a
href=?sortBy=otypedirection=${direction} class=headerlinkfmt:message
key=locate.typecolumn //a/th
+ tha
href=?sortBy=titledirection=${direction} class=headerlinkfmt:message
key=locate.titlecolumn //a/th
+ th style=width: 50px;a
href=?sortBy=creatordirection=${direction} class=headerlinkfmt:message
key=locate.authorcolumn //a/th
+ th style=width: 120px;a
href=?sortBy=lastmodifieddatedirection=${direction}
class=headerlinkfmt:message key=locate.lastmodifiedcolumn //a/th
+ th style=width: 60px;a
href=?sortBy=numberdirection=${direction} class=headerlinkfmt:message
key=locate.numbercolumn //a/th
/tr
/thead
tbody class=hover
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp restore.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory
james.mmbase.org:/tmp/cvs-serv23712/cmsc/contentrepository/src/webapp/editors/recyclebin
Modified Files:
Tag: b1_4
index.jsp restore.jsp
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -b -r1.10 -r1.10.2.1
--- index.jsp 30 Jan 2008 15:33:16 - 1.10
+++ index.jsp 3 Mar 2008 10:22:17 - 1.10.2.1
@@ -19,10 +19,19 @@
/div
div class=editor
- div class=body
- mm:cloud jspvar=cloud rank=administrator method='http'
+ mm:cloud jspvar=cloud rank=basic user method='http'
+
+ mm:node number=%= RepositoryUtil.ALIAS_TRASH %
+mm:field name=number jspvar=trashNumber vartype=Integer
+
+ cmsc:rights nodeNumber=%=trashNumber.intValue()%
var=rolename/
+ c:choose
+ c:when test=${rolename eq 'webmaster'}
+
mm:import id=parentchannel
jspvar=parentchannel%= RepositoryUtil.ALIAS_TRASH %/mm:import
mm:import jspvar=returnurl
id=returnurl/editors/recyclebin/index.jsp/mm:import
+
+ div class=body
p
fmt:message key=recyclebin.channel /
/p
@@ -36,7 +45,10 @@
/form
div style=clear:both; height:10px;/div
/div
-div class=ruler_greendivfmt:message
key=recyclebin.content //div/div
+
+ div class=ruler_green
+ divfmt:message key=recyclebin.content //div
+ /div
div class=body
mm:node number=$parentchannel
@@ -90,9 +102,21 @@
/mm:relatednodescontainer
/mm:node
- /mm:cloud
+ /div
+ /c:when
+ c:otherwise
+ div class=body
+fmt:message key=recyclebin.no.access /
/div
+
+ /c:otherwise
+ /c:choose
+
+/mm:field
+ /mm:node
+
+ /mm:cloud
div class=side_block_end/div
/div
Index: restore.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/restore.jsp,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -b -r1.3 -r1.3.4.1
--- restore.jsp 21 May 2007 18:06:15 - 1.3
+++ restore.jsp 3 Mar 2008 10:22:17 - 1.3.4.1
@@ -1,5 +1,6 @@
[EMAIL PROTECTED] language=java contentType=text/html;charset=utf-8%
[EMAIL PROTECTED] file=globals.jsp %
+[EMAIL PROTECTED] import=com.finalist.cmsc.repository.* %
mm:content type=text/html encoding=UTF-8 expires=0
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Strict//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;
html:html xhtml=true
@@ -7,12 +8,6 @@
body
mm:cloud jspvar=cloud rank=basic user method='http'
-mm:import externid=content vartype=Node/
-mm:import externid=contentchannels vartype=List/
-
-mm:node referid=content
- mm:import id=contentnumbermm:field name=number//mm:import
-/mm:node
div class=tabs
div class=tab_active
@@ -27,6 +22,20 @@
div class=editor
div class=body
+ mm:node number=%= RepositoryUtil.ALIAS_TRASH %
+mm:field name=number jspvar=trashNumber vartype=Integer
+
+ cmsc:rights nodeNumber=%=trashNumber.intValue()%
var=rolename/
+ c:choose
+ c:when test=${rolename eq 'webmaster'}
+
+ mm:import externid=content vartype=Node/
+ mm:import externid=contentchannels vartype=List/
+
+ mm:node referid=content
+mm:import id=contentnumbermm:field
name=number//mm:import
+ /mm:node
+
pfmt:message key=recyclebin.restore.selectchannel
//p
ul
mm:list referid=contentchannels
@@ -50,6 +59,15 @@
/li
/ul
+ /c:when
+ c:otherwise
+
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin index.jsp restore.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
In directory
james.mmbase.org:/tmp/cvs-serv24461/cmsc/contentrepository/src/webapp/editors/recyclebin
Modified Files:
Tag: v1_3
index.jsp restore.jsp
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: index.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/recyclebin/index.jsp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- index.jsp 21 May 2007 18:06:15 - 1.7
+++ index.jsp 3 Mar 2008 10:37:30 - 1.7.2.1
@@ -19,10 +19,19 @@
/div
div class=editor
- div class=body
- mm:cloud jspvar=cloud rank=administrator method='http'
+ mm:cloud jspvar=cloud rank=basic user method='http'
+
+ mm:node number=%= RepositoryUtil.ALIAS_TRASH %
+mm:field name=number jspvar=trashNumber vartype=Integer
+
+ cmsc:rights nodeNumber=%=trashNumber.intValue()%
var=rolename/
+ c:choose
+ c:when test=${rolename eq 'webmaster'}
+
mm:import id=parentchannel
jspvar=parentchannel%= RepositoryUtil.ALIAS_TRASH %/mm:import
mm:import jspvar=returnurl
id=returnurl/editors/recyclebin/index.jsp/mm:import
+
+ div class=body
p
fmt:message key=recyclebin.channel /
/p
@@ -36,7 +45,10 @@
/form
div style=clear:both; height:10px;/div
/div
-div class=ruler_greendivfmt:message
key=recyclebin.content //div/div
+
+ div class=ruler_green
+ divfmt:message key=recyclebin.content //div
+ /div
div class=body
mm:node number=$parentchannel
@@ -45,7 +57,7 @@
c:set
var=listSizemm:size//c:set
c:set var=resultsPerPage
value=50/
- c:set var=offset
value=${param.offset}/
+ c:set var=offset value=${not empty
param.offset ? param.offset : '0'}/
mm:listnodes jspvar=node
max=${resultsPerPage} offset=${offset*resultsPerPage}
mm:first
@@ -53,20 +65,19 @@
table
thead
tr
- th
- /th
- thfmt:message
key=locate.typecolumn //th
+ th style=width: 56px;/th
+ th style=width:
68px;fmt:message key=locate.typecolumn //th
thfmt:message
key=locate.titlecolumn //th
- thfmt:message
key=locate.authorcolumn //th
- thfmt:message
key=locate.lastmodifiedcolumn //th
- thfmt:message
key=locate.numbercolumn //th
+ th style=width:
50px;fmt:message key=locate.authorcolumn //th
+ th style=width:
120px;fmt:message key=locate.lastmodifiedcolumn //th
+ th style=width:
60px;fmt:message key=locate.numbercolumn //th
/tr
/thead
tbody class=hover
/mm:first
tr mm:even
inverse=trueclass=swap/mm:even
-td nowrap width=80
+td nowrap
a
href=javascript:info('mm:field name=number /')img
src=../gfx/icons/info.png width=16 height=16 alt=fmt:message
key=recyclebin.info / title=fmt:message key=recyclebin.info ///a
