[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site edit_site.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
In directory 
james.mmbase.org:/tmp/cvs-serv16674/sitemanagement/src/webapp/editors/config/site

Modified Files:
edit_site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: edit_site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/edit_site.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edit_site.xml   8 Aug 2007 09:26:33 -   1.6
+++ edit_site.xml   27 Sep 2008 06:42:52 -  1.7
@@ -6,7 +6,7 @@
 

+   dtrequired="true" hide="ajax">
Staging domain
Staging domein

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms SelectSiteNameAction.java

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory 
james.mmbase.org:/tmp/cvs-serv16674/sitemanagement/src/java/com/finalist/cmsc/navigation/forms

Added Files:
SelectSiteNameAction.java 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
See also: http://www.mmbase.org/jira/browse/CMSC-798


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript my-validator.js

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
In directory 
james.mmbase.org:/tmp/cvs-serv16674/edit-webapp/src/webapp/editors/editwizards_new/javascript

Added Files:
my-validator.js 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
See also: http://www.mmbase.org/jira/browse/CMSC-798


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
In directory 
james.mmbase.org:/tmp/cvs-serv16674/edit-webapp/src/webapp/editors/editwizards_new/xsl

Modified Files:
wizard.xsl 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: wizard.xsl
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- wizard.xsl  3 Jun 2008 14:18:30 -   1.13
+++ wizard.xsl  27 Sep 2008 06:42:52 -  1.14
@@ -97,7 +97,9 @@
   
 
   
+help IE
 help 
IE
+help 
IE
 
   var isWebmaster = "";
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF struts-site.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
In directory 
james.mmbase.org:/tmp/cvs-serv16674/sitemanagement/src/webapp/WEB-INF

Modified Files:
struts-site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: struts-site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF/struts-site.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- struts-site.xml 28 Jul 2008 14:51:42 -  1.9
+++ struts-site.xml 27 Sep 2008 06:42:52 -  1.10
@@ -18,6 +18,10 @@
 
 
 
+
+   
+   
 
 
 http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site portaledit.css portletediting.js.jsp

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
In directory james.mmbase.org:/tmp/cvs-serv16117

Modified Files:
portaledit.css portletediting.js.jsp 
Log Message:
CMSC-1072,The portal edit pull down stays down in 1.5


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
See also: http://www.mmbase.org/jira/browse/CMSC-1072


Index: portaledit.css
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portaledit.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- portaledit.css  4 Jul 2008 12:37:05 -   1.7
+++ portaledit.css  27 Sep 2008 05:52:50 -  1.8
@@ -101,6 +101,7 @@
 
 .portlet-info {
padding-left:5px;
+   display:none; 
 }
 
 span.handle


Index: portletediting.js.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portletediting.js.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- portletediting.js.jsp   5 Sep 2008 15:03:24 -   1.9
+++ portletediting.js.jsp   27 Sep 2008 05:52:50 -  1.10
@@ -156,9 +156,11 @@
 }
 
 function showInfo(id) {
+   document.getElementById('portlet-info-'+id).style.display = 'block';
document.getElementById('portlet-mode-'+id).style.zIndex = 2001;
 } 
 
 function hideInfo(id) {
+   document.getElementById('portlet-info-'+id).style.display = 'none';
document.getElementById('portlet-mode-'+id).style.zIndex = 2000;
 }
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site portaledit.css portletediting.js.jsp

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
In directory james.mmbase.org:/tmp/cvs-serv16078

Modified Files:
  Tag: b1_5
portaledit.css portletediting.js.jsp 
Log Message:
CMSC-1072,The portal edit pull down stays down in 1.5


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
See also: http://www.mmbase.org/jira/browse/CMSC-1072


Index: portaledit.css
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portaledit.css,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -b -r1.7 -r1.7.2.1
--- portaledit.css  4 Jul 2008 12:37:05 -   1.7
+++ portaledit.css  27 Sep 2008 05:51:25 -  1.7.2.1
@@ -101,6 +101,7 @@
 
 .portlet-info {
padding-left:5px;
+   display:none; 
 }
 
 span.handle


Index: portletediting.js.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/portletediting.js.jsp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- portletediting.js.jsp   5 Sep 2008 15:03:24 -   1.9
+++ portletediting.js.jsp   27 Sep 2008 05:51:25 -  1.9.2.1
@@ -156,9 +156,11 @@
 }
 
 function showInfo(id) {
+   document.getElementById('portlet-info-'+id).style.display = 'block';
document.getElementById('portlet-mode-'+id).style.zIndex = 2001;
 } 
 
 function hideInfo(id) {
+   document.getElementById('portlet-info-'+id).style.display = 'none';
document.getElementById('portlet-mode-'+id).style.zIndex = 2000;
 }
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site edit_site.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
In directory james.mmbase.org:/tmp/cvs-serv14963

Modified Files:
  Tag: b1_5
edit_site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain.remove


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: edit_site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/edit_site.xml,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -b -r1.6.4.1 -r1.6.4.2
--- edit_site.xml   27 Sep 2008 02:50:45 -  1.6.4.1
+++ edit_site.xml   27 Sep 2008 04:22:30 -  1.6.4.2
@@ -6,7 +6,7 @@
 

+   dtrequired="true" >
Staging domain
Staging domein

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF struts-site.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv14064

Modified Files:
  Tag: b1_5
struts-site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain.remove


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: struts-site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF/struts-site.xml,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- struts-site.xml 27 Sep 2008 02:50:45 -  1.9.2.1
+++ struts-site.xml 27 Sep 2008 03:23:56 -  1.9.2.2
@@ -18,10 +18,7 @@
 
 
 
-   
-   
-   
+   
 
 
 http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript my-validator.js

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
In directory james.mmbase.org:/tmp/cvs-serv13994

Removed Files:
  Tag: b1_5
my-validator.js 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain.remove


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
See also: http://www.mmbase.org/jira/browse/CMSC-798


___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
In directory james.mmbase.org:/tmp/cvs-serv13954

Modified Files:
  Tag: b1_5
wizard.xsl 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain.remove


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: wizard.xsl
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- wizard.xsl  27 Sep 2008 02:50:44 -  1.13.2.1
+++ wizard.xsl  27 Sep 2008 03:21:19 -  1.13.2.2
@@ -97,9 +97,7 @@
   
 
   
- help IE
 help 
IE
-help 
IE

   var isWebmaster = "";
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
In directory 
james.mmbase.org:/tmp/cvs-serv12707/edit-webapp/src/webapp/editors/editwizards_new/xsl

Modified Files:
  Tag: b1_5
wizard.xsl 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: wizard.xsl
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -b -r1.13 -r1.13.2.1
--- wizard.xsl  3 Jun 2008 14:18:30 -   1.13
+++ wizard.xsl  27 Sep 2008 02:50:44 -  1.13.2.1
@@ -97,7 +97,9 @@
   
 
   
+ help IE
 help 
IE
+help 
IE
 
   var isWebmaster = "";
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms SelectSiteNameAction.java

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory 
james.mmbase.org:/tmp/cvs-serv12707/sitemanagement/src/java/com/finalist/cmsc/navigation/forms

Added Files:
  Tag: b1_5
SelectSiteNameAction.java 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
See also: http://www.mmbase.org/jira/browse/CMSC-798


SelectSiteNameAction.java is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF struts-site.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
In directory 
james.mmbase.org:/tmp/cvs-serv12707/sitemanagement/src/webapp/WEB-INF

Modified Files:
  Tag: b1_5
struts-site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: struts-site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/WEB-INF/struts-site.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- struts-site.xml 28 Jul 2008 14:51:42 -  1.9
+++ struts-site.xml 27 Sep 2008 02:50:45 -  1.9.2.1
@@ -18,6 +18,10 @@
 
 
 
+   
+   
+   
 
 
 http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript my-validator.js

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
In directory 
james.mmbase.org:/tmp/cvs-serv12707/edit-webapp/src/webapp/editors/editwizards_new/javascript

Added Files:
  Tag: b1_5
my-validator.js 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
See also: http://www.mmbase.org/jira/browse/CMSC-798


my-validator.js is new

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site edit_site.xml

[nikkoyin]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
In directory 
james.mmbase.org:/tmp/cvs-serv12707/sitemanagement/src/webapp/editors/config/site

Modified Files:
  Tag: b1_5
edit_site.xml 
Log Message:
CMSC-798,Possible to create two or more sites with the same Staging domain, 
Live domain. Removal of 1 site will make all other (same) sites result in a 
404. Add my-validate to modify validator


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site
See also: http://www.mmbase.org/jira/browse/CMSC-798


Index: edit_site.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/site/edit_site.xml,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -b -r1.6 -r1.6.4.1
--- edit_site.xml   8 Aug 2007 09:26:33 -   1.6
+++ edit_site.xml   27 Sep 2008 02:50:45 -  1.6.4.1
@@ -6,7 +6,7 @@
 

+   dtrequired="true" hide="ajax">
Staging domain
Staging domein

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/framework ErrorRenderer.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/framework
In directory james.mmbase.org:/tmp/cvs-serv31120

Modified Files:
ErrorRenderer.java 
Log Message:
don't forget to escape values of request headers


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework


Index: ErrorRenderer.java
===
RCS file: /var/cvs/src/org/mmbase/framework/ErrorRenderer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- ErrorRenderer.java  30 Aug 2008 09:18:16 -  1.16
+++ ErrorRenderer.java  26 Sep 2008 15:40:00 -  1.17
@@ -28,7 +28,7 @@
  * share code.
  *
  * @author Michiel Meeuwissen
- * @version $Id: ErrorRenderer.java,v 1.16 2008/08/30 09:18:16 michiel Exp $
+ * @version $Id: ErrorRenderer.java,v 1.17 2008/09/26 15:40:00 michiel Exp $
  * @since MMBase-1.9
  */
 
@@ -158,7 +158,7 @@
 Enumeration en = request.getHeaderNames();
 while (en.hasMoreElements()) {
 String name = (String) en.nextElement();
-msg.append(escape.transform(name + ": 
"+request.getHeader(name)+"\n"));
+msg.append(escape.transform(name + ": "+ 
escape.transform(request.getHeader(name)) + "\n"));
 }
 
 msg.append("\nAttributes\n--\n");
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/dove/src/org/mmbase/applications/dove Dove.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/dove/src/org/mmbase/applications/dove
In directory james.mmbase.org:/tmp/cvs-serv30451

Modified Files:
Dove.java 
Log Message:
  MMB-1720


See also: 
http://cvs.mmbase.org/viewcvs/applications/dove/src/org/mmbase/applications/dove
See also: http://www.mmbase.org/jira/browse/MMB-1720


Index: Dove.java
===
RCS file: 
/var/cvs/applications/dove/src/org/mmbase/applications/dove/Dove.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- Dove.java   7 Aug 2008 20:04:19 -   1.97
+++ Dove.java   26 Sep 2008 14:57:02 -  1.98
@@ -55,7 +55,7 @@
  *
  * @author Pierre van Rooden
  * @since MMBase-1.5
- * @version $Id: Dove.java,v 1.97 2008/08/07 20:04:19 michiel Exp $
+ * @version $Id: Dove.java,v 1.98 2008/09/26 14:57:02 michiel Exp $
  */
 
 public class Dove extends AbstractDove {
@@ -688,6 +688,9 @@
 if (p.matcher("image/someimageformat").matches() &&
 ! 
p.matcher("application/nonimageformat").matches()) {
 specialization = "image";
+} else if 
(p.matcher("application/x-shockwave-flash").matches() ||
+   ! 
p.matcher("application/nonflashformat").matches()) {
+specialization = "flash";
 } else {
 specialization = "file";
 }
@@ -1027,10 +1030,7 @@
 if (CHANGES_WARN.equals(changes)) {
 log.warn(message);
 } else {
-log.debug(message);
-Element err = addContentElement(ERROR, message, 
out);
-err.setAttribute(ELM_TYPE, IS_SERVER);
-return false;
+throw new RuntimeException(message);
 }
 }
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/resources/config/builders/resources flashobjects.xml

[Michiel Meeuwissen]

Update of /var/cvs/applications/resources/config/builders/resources
In directory james.mmbase.org:/tmp/cvs-serv29989

Modified Files:
flashobjects.xml 
Log Message:
like with images, flash's handles can be listed


See also: 
http://cvs.mmbase.org/viewcvs/applications/resources/config/builders/resources


Index: flashobjects.xml
===
RCS file: 
/var/cvs/applications/resources/config/builders/resources/flashobjects.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- flashobjects.xml25 Sep 2008 16:16:26 -  1.2
+++ flashobjects.xml26 Sep 2008 14:28:08 -  1.3
@@ -79,6 +79,11 @@
 Bestand
 Dosiero
   
+  
+
+  4
+
+  
   http://www.mmbase.org/xmlns/datatypes"; >
 
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/didactor2/src/education/templates/editwizards/data/config/flashobjects flashobjects.xml

[Michiel Meeuwissen]

Update of 
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/flashobjects
In directory james.mmbase.org:/tmp/cvs-serv29918

Modified Files:
flashobjects.xml 
Log Message:
showtitle is no field of default flashobjects


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/editwizards/data/config/flashobjects


Index: flashobjects.xml
===
RCS file: 
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/flashobjects/flashobjects.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- flashobjects.xml5 Sep 2008 15:33:26 -   1.1
+++ flashobjects.xml26 Sep 2008 14:25:34 -  1.2
@@ -16,7 +16,6 @@
 Invoeren bestand
 Enter file
 
-
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates List.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv29533/templates

Modified Files:
List.js.jsp 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- List.js.jsp 26 Sep 2008 13:40:42 -  1.26
+++ List.js.jsp 26 Sep 2008 14:08:04 -  1.27
@@ -17,7 +17,7 @@
  * -  mmsrCreated
  *
  * @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.26 2008/09/26 13:40:42 michiel Exp $
+ * @version $Id: List.js.jsp,v 1.27 2008/09/26 14:08:04 michiel Exp $
  */
 
 
@@ -257,10 +257,7 @@
  * @param stale Number of millisecond the content may be aut of date. Defaults 
to 5 s. But on unload it is set to 0.
  */
 List.prototype.commit = function(stale, leavePage) {
-if (leavePage && ! List.prototype.leftPage) {
-List.prototype.leftPage = true;
-$.ajax({ type: "GET", async: false, url: 
"${mm:link('/mmbase/searchrelate/list/leavePage.jspx')}" });
-}
+var result;
 if(this.needsCommit()) {
 if (this.valid) {
 var now = new Date();
@@ -291,17 +288,22 @@
  }
});
 
-return true;
+result = true;
 } else {
 // not stale enough
-return true;
+result = false;
 }
 } else {
-return false;
+result = false;
 }
 } else {
-return true;
+result = true;
 }
+if (leavePage && ! List.prototype.leftPage) {
+List.prototype.leftPage = true;
+$.ajax({ type: "GET", async: true, url: 
"${mm:link('/mmbase/searchrelate/list/leavePage.jspx')}" });
+}
+return result;
 }
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates/list leavePage.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates/list
In directory james.mmbase.org:/tmp/cvs-serv29533/templates/list

Modified Files:
leavePage.jspx 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates/list


Index: leavePage.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/leavePage.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- leavePage.jspx  26 Sep 2008 13:55:15 -  1.2
+++ leavePage.jspx  26 Sep 2008 14:08:04 -  1.3
@@ -5,12 +5,12 @@
 xmlns:fn="http://java.sun.com/jsp/jstl/functions";
 xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
 >
-  
+  
 
 
-  ${sessionScope['org.mmbase.searchrelate.relatednodes']}
-  
-  ${sessionScope['org.mmbase.searchrelate.relatednodes']}
+  
${sessionScope['org.mmbase.searchrelate.relatednodes.sequence']}
+  
+  
${sessionScope['org.mmbase.searchrelate.relatednodes.sequence']}
 
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv29487/templates/editors/evenementen

Modified Files:
evenementen.jsp 
Log Message:
NMCMS-586


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-586


Index: evenementen.jsp
===
RCS file: 
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- evenementen.jsp 18 Sep 2008 14:48:34 -  1.20
+++ evenementen.jsp 26 Sep 2008 14:07:15 -  1.21
@@ -637,11 +637,11 @@

-
-
-   
-   
--
--
-   
+   
+   
+-
+-
+   

 

@@ -657,11 +657,11 @@

  

- 
+ 

- 
+ 

- 
+ 

<% if(soortId.equals("activiteiten")) 
out.print("disableExtraSearch();"); %>
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natnh/includes header.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/natnh/includes
In directory james.mmbase.org:/tmp/cvs-serv29311/templates/natnh/includes

Modified Files:
header.jsp 
Log Message:
NMCMS-584


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-584


Index: header.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/header.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- header.jsp  24 Sep 2008 11:36:29 -  1.10
+++ header.jsp  26 Sep 2008 14:00:24 -  1.11
@@ -25,7 +25,7 @@
  
  
  
-
+

 
 http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0";
 width="2000" height="2000" id="overlayerbanner_pop_600x600" align="middle">
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natnh/flash 080923_hart_v1.swf

[jruijter]

Update of /var/cvs/contributions/natmm/templates/natnh/flash
In directory james.mmbase.org:/tmp/cvs-serv29311/templates/natnh/flash

Modified Files:
080923_hart_v1.swf 
Log Message:
NMCMS-584


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/flash
See also: http://www.mmbase.org/jira/browse/NMCMS-584


Index: 080923_hart_v1.swf
===
RCS file: 
/var/cvs/contributions/natmm/templates/natnh/flash/080923_hart_v1.swf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvsGi8VCJ and /tmp/cvsTRMQs0 differ
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natmm index.jsp home.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/natmm
In directory james.mmbase.org:/tmp/cvs-serv29311/templates/natmm

Modified Files:
index.jsp home.jsp 
Log Message:
NMCMS-584


See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-584


Index: index.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/index.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- index.jsp   24 Sep 2008 11:36:28 -  1.9
+++ index.jsp   26 Sep 2008 14:00:23 -  1.10
@@ -14,7 +14,7 @@
 
 
 
-   
+   
   

http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0";
 width="2000" height="2000" id="overlayerbanner_pop_600x600" align="middle">


Index: home.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/home.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- home.jsp24 Sep 2008 11:36:28 -  1.13
+++ home.jsp26 Sep 2008 14:00:23 -  1.14
@@ -25,7 +25,7 @@
 
   
 
-   
+   
   

http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0";
 width="2000" height="2000" id="overlayerbanner_pop_600x600" align="middle">
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/natmm/flash 080923_hart_v1.swf

[jruijter]

Update of /var/cvs/contributions/natmm/templates/natmm/flash
In directory james.mmbase.org:/tmp/cvs-serv29311/templates/natmm/flash

Modified Files:
080923_hart_v1.swf 
Log Message:
NMCMS-584


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/flash
See also: http://www.mmbase.org/jira/browse/NMCMS-584


Index: 080923_hart_v1.swf
===
RCS file: 
/var/cvs/contributions/natmm/templates/natmm/flash/080923_hart_v1.swf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
Binary files /tmp/cvshGOCDt and /tmp/cvs71ATlK differ
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates/list leavePage.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates/list
In directory james.mmbase.org:/tmp/cvs-serv29192/templates/list

Modified Files:
leavePage.jspx 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates/list


Index: leavePage.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/leavePage.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- leavePage.jspx  26 Sep 2008 13:40:42 -  1.1
+++ leavePage.jspx  26 Sep 2008 13:55:15 -  1.2
@@ -5,10 +5,12 @@
 xmlns:fn="http://java.sun.com/jsp/jstl/functions";
 xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
 >
+  
   
   
-${sessionScope['mm_list_sequence']}
-
-${sessionScope['mm_list_sequence']}
+  ${sessionScope['org.mmbase.searchrelate.relatednodes']}
+  
+  ${sessionScope['org.mmbase.searchrelate.relatednodes']}
   
+  
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/META-INF/tags/mm/searchrelate relatednodes.tagx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate
In directory james.mmbase.org:/tmp/cvs-serv29192/META-INF/tags/mm/searchrelate

Modified Files:
relatednodes.tagx 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/applications/searchrelate/META-INF/tags/mm/searchrelate


Index: relatednodes.tagx
===
RCS file: 
/var/cvs/applications/searchrelate/META-INF/tags/mm/searchrelate/relatednodes.tagx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- relatednodes.tagx   4 Sep 2008 13:07:53 -   1.27
+++ relatednodes.tagx   26 Sep 2008 13:55:15 -  1.28
@@ -9,7 +9,7 @@
   xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
 
   @author Michiel Meeuwissen
-  @version $Id: relatednodes.tagx,v 1.27 2008/09/04 13:07:53 michiel Exp $
+  @version $Id: relatednodes.tagx,v 1.28 2008/09/26 13:55:15 michiel Exp $
   -->
   
 
+  
+
   
 
   
@@ -85,12 +89,16 @@
   ${empty orderby ? r : orderby}${empty orderby ? '.pos' 
: ''}
   ${fields}
 
-  0
-  
-  
+  
+
+  0
+  
+
+  
 <!-- IE sucks 
-->
 
 <!-- Help 
Freakin' IE -->
+
   
   http://java.sun.com/jsp/jstl/fmt";
@@ -126,7 +134,7 @@
   
 
+referids="source,[EMAIL PROTECTED],icondir?,confirm?,[EMAIL 
PROTECTED],seq" />
   
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates/list leavePage.jspx create.jspx save.jspx

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates/list
In directory james.mmbase.org:/tmp/cvs-serv28900/list

Modified Files:
create.jspx save.jspx 
Added Files:
leavePage.jspx 
Log Message:
maintaining the 'sequence' number on the request is very hard to get correct 
when using this tag nested (so in the item of another one). This number is now 
maintained in the session, and reset on page leave.


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates/list


leavePage.jspx is new



Index: create.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/create.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- create.jspx 8 Aug 2008 15:51:00 -   1.8
+++ create.jspx 26 Sep 2008 13:40:42 -  1.9
@@ -15,7 +15,6 @@
   
   
   
-  
 
   
 


Index: save.jspx
===
RCS file: /var/cvs/applications/searchrelate/templates/list/save.jspx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- save.jspx   31 Jul 2008 12:23:47 -  1.7
+++ save.jspx   26 Sep 2008 13:40:42 -  1.8
@@ -26,11 +26,12 @@
   
 
   Form not valid
-  Form not valid
+  Form not valid
 
   
 
   
 
+
   
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates List.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv28900

Modified Files:
List.js.jsp 
Log Message:
maintaining the 'sequence' number on the request is very hard to get correct 
when using this tag nested (so in the item of another one). This number is now 
maintained in the session, and reset on page leave.


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- List.js.jsp 26 Sep 2008 13:04:06 -  1.25
+++ List.js.jsp 26 Sep 2008 13:40:42 -  1.26
@@ -17,7 +17,7 @@
  * -  mmsrCreated
  *
  * @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.25 2008/09/26 13:04:06 michiel Exp $
+ * @version $Id: List.js.jsp,v 1.26 2008/09/26 13:40:42 michiel Exp $
  */
 
 
@@ -81,7 +81,7 @@
 
 $(window).bind("beforeunload",
function(ev) {
-   var result = self.commit(0, false);
+   var result = self.commit(0, true);
if (!result) {
ev.returnValue = '';
}
@@ -99,7 +99,7 @@
 $(this.div).trigger("mmsrRelatedNodesReady", [self]);
 }
 
-
+List.prototype.leftPage = false;
 
 /**
  * Finds all elements with given node name and class, but ignores everything 
in a child div.list.
@@ -151,7 +151,6 @@
 if (this.item != undefined) {
 params.item   = this.item;
 }
-params.mm_list_sequence  = List.seq++;
 if (this.source != undefined) {
 params.source = this.source;
 }
@@ -257,9 +256,12 @@
 /**
  * @param stale Number of millisecond the content may be aut of date. Defaults 
to 5 s. But on unload it is set to 0.
  */
-List.prototype.commit = function(stale, async) {
+List.prototype.commit = function(stale, leavePage) {
+if (leavePage && ! List.prototype.leftPage) {
+List.prototype.leftPage = true;
+$.ajax({ type: "GET", async: false, url: 
"${mm:link('/mmbase/searchrelate/list/leavePage.jspx')}" });
+}
 if(this.needsCommit()) {
-
 if (this.valid) {
 var now = new Date();
 if (stale == null) stale = this.defaultStale; //
@@ -271,6 +273,7 @@
 params.source = this.source;
 params.icondir = this.icondir;
 params.createpos = this.createpos;
+params.leavePage = leavePage ? true : false;
 
 this.find(this.div, "input[checked], input[type='text'], 
input[type='hidden'], input[type='password'], option[selected], textarea")
 .each(function() {
@@ -280,7 +283,7 @@
 var self = this;
 this.status("");
 $.ajax({ type: "POST",
- async: async == null ? true : async,
+ async: leavePage == null ? true : !leavePage,
  url: 
"${mm:link('/mmbase/searchrelate/list/save.jspx')}",
  data: params,
  complete: function(req, textStatus) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/searchrelate/templates List.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/applications/searchrelate/templates
In directory james.mmbase.org:/tmp/cvs-serv28212

Modified Files:
List.js.jsp 
Log Message:
removed tabs


See also: http://cvs.mmbase.org/viewcvs/applications/searchrelate/templates


Index: List.js.jsp
===
RCS file: /var/cvs/applications/searchrelate/templates/List.js.jsp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- List.js.jsp 4 Sep 2008 15:26:12 -   1.24
+++ List.js.jsp 26 Sep 2008 13:04:06 -  1.25
@@ -17,7 +17,7 @@
  * -  mmsrCreated
  *
  * @author Michiel Meeuwissen
- * @version $Id: List.js.jsp,v 1.24 2008/09/04 15:26:12 michiel Exp $
+ * @version $Id: List.js.jsp,v 1.25 2008/09/26 13:04:06 michiel Exp $
  */
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/richtext/config/xslt mmxf2kupu.xslt

[Michiel Meeuwissen]

Update of /var/cvs/applications/richtext/config/xslt
In directory james.mmbase.org:/tmp/cvs-serv27402

Modified Files:
mmxf2kupu.xslt 
Log Message:
made image's distinguishable from flash place holders


See also: http://cvs.mmbase.org/viewcvs/applications/richtext/config/xslt


Index: mmxf2kupu.xslt
===
RCS file: /var/cvs/applications/richtext/config/xslt/mmxf2kupu.xslt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- mmxf2kupu.xslt  25 Sep 2008 10:18:05 -  1.16
+++ mmxf2kupu.xslt  26 Sep 2008 12:15:48 -  1.17
@@ -3,7 +3,7 @@
   org.mmbase.bridge.util.Generator, and the XSL is invoked by FormatterTag.
 
   @author:  Michiel Meeuwissen
-  @version: $Id: mmxf2kupu.xslt,v 1.16 2008/09/25 10:18:05 michiel Exp $
+  @version: $Id: mmxf2kupu.xslt,v 1.17 2008/09/26 12:15:48 michiel Exp $
   @since:   MMBase-1.6
 -->
 
   
   
-  
+  image 
   
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] applications/resources/src/org/mmbase/servlet HandleServlet.java

[Michiel Meeuwissen]

Update of /var/cvs/applications/resources/src/org/mmbase/servlet
In directory james.mmbase.org:/tmp/cvs-serv25560

Modified Files:
HandleServlet.java 
Log Message:
  MMB-1415. Making sure length is always served


See also: 
http://cvs.mmbase.org/viewcvs/applications/resources/src/org/mmbase/servlet
See also: http://www.mmbase.org/jira/browse/MMB-1415


Index: HandleServlet.java
===
RCS file: 
/var/cvs/applications/resources/src/org/mmbase/servlet/HandleServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HandleServlet.java  3 Sep 2008 17:18:05 -   1.2
+++ HandleServlet.java  26 Sep 2008 10:12:26 -  1.3
@@ -17,6 +17,7 @@
 import javax.servlet.http.*;
 
 import org.mmbase.bridge.*;
+import org.mmbase.cache.Cache;
 
 import org.mmbase.util.*;
 import org.mmbase.util.logging.*;
@@ -27,7 +28,7 @@
  * specialized servlets. The mime-type is always application/x-binary, forcing 
the browser to
  * download.
  *
- * @version $Id: HandleServlet.java,v 1.2 2008/09/03 17:18:05 michiel Exp $
+ * @version $Id: HandleServlet.java,v 1.3 2008/09/26 10:12:26 michiel Exp $
  * @author Michiel Meeuwissen
  * @since  MMBase-1.6
  * @see ImageServlet
@@ -40,6 +41,8 @@
 
 private boolean isIECompatibleJpeg = true;
 
+private static Cache jpegSizes = null;
+
 protected Map getAssociations() {
 Map a = super.getAssociations();
 // Can do the following:
@@ -69,6 +72,18 @@
 if (ieCompat != null) {
 isIECompatibleJpeg = Boolean.valueOf(ieCompat).booleanValue();
 }
+if (isIECompatibleJpeg && jpegSizes == null) {
+jpegSizes = new Cache(5000) {
+public String getName() {
+return "JPEGSizes";
+}
+public String getDescription() {
+return "HandleServlet may ditch some bytes from 
Jpeg-steams to please IE";
+}
+
+};
+jpegSizes.putCache();
+}
 }
 
 // just to get HandleServlet in the stacktrace.
@@ -228,8 +243,6 @@
 if (node.isNull("handle")) {
 return;
 }
-InputStream bytes = node.getInputStreamValue("handle");
-
 
 //remove additional information left by PhotoShop 7 in jpegs
 //this information may crash Internet Exploder. that's why you need to 
remove it.
@@ -239,14 +252,23 @@
 //However they break many applications, including Quark and, 
significantly,
 //various versions of Internet Explorer on various platforms.
 
-boolean canSendLength = true;
+int jpegLength = -1;
 
-if (isIECompatibleJpeg) {
-   if (mimeType.equals("image/jpeg") || 
mimeType.equals("image/jpg")) {
-   bytes = new IECompatibleJpegInputStream(bytes);
-   canSendLength = false;
-   //res.setHeader("X-MMBase-IECompatibleJpeg", "This image was 
filtered, because Microsoft Internet Explorer might crash otherwise");
+final InputStream bytes;
+if (isIECompatibleJpeg && (mimeType.equals("image/jpeg") || 
mimeType.equals("image/jpg"))) {
+Integer l = jpegSizes.get(node.getNumber());
+if (l == null) {
+byte[] byteArray = 
IECompatibleJpegInputStream.process(node.getByteValue("handle"));
+l = byteArray.length;
+jpegSizes.put(node.getNumber(), l);
+bytes = new ByteArrayInputStream(byteArray);
+} else {
+bytes = new 
IECompatibleJpegInputStream(node.getInputStreamValue("handle"));
 }
+jpegLength = l;
+res.setHeader("X-MMBase-IECompatibleJpeg", "This image was 
filtered, because Microsoft Internet Explorer might crash otherwise");
+} else {
+bytes = node.getInputStreamValue("handle");
 }
 
 if (!setContent(query, node, mimeType)) {
@@ -255,7 +277,7 @@
 setExpires(res, node);
 setCacheControl(res, node);
 
-if (canSendLength) {
+if (jpegLength == -1) {
 int size = -1;
 if (manager.hasField("size")) {
 size = node.getIntValue("size");
@@ -267,7 +289,8 @@
 }
 log.debug("Serving node " + node.getNumber() + " with bytes " + 
size);
 } else {
-log.debug("Serving node " + node.getNumber() + " with unknown 
size, because IE sucks");
+res.setContentLength(jpegLength);
+log.debug("Serving node " + node.getNumber() + " with bytes " + 
jpegLength);
 }
 sendBytes(res, bytes);
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow WorkflowManager.java

[rschellhorn]

Update of 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
In directory 
james.mmbase.org:/tmp/cvs-serv25054/workflow/src/java/com/finalist/cmsc/workflow

Modified Files:
WorkflowManager.java 
Log Message:
CMSC-1073 Workflow elements should not be modified by 'anonymous'.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1073


Index: WorkflowManager.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- WorkflowManager.java8 Aug 2008 13:44:01 -   1.15
+++ WorkflowManager.java26 Sep 2008 09:33:41 -  1.16
@@ -4,6 +4,9 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.mmbase.bridge.*;
+import org.mmbase.module.core.MMBase;
+import org.mmbase.module.core.MMObjectBuilder;
+import org.mmbase.module.core.MMObjectNode;
 import org.mmbase.storage.search.*;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -366,11 +369,16 @@
}
 
protected void changeWorkflowFailPublished(Node wfItem, String status, 
String stacktrace) {
- wfItem.setStringValue(STATUS_FIELD, status);
+  // We need to bypass the MMBase bridge to change workflow items.
+  // The bridge causes the lastmodifier field to be changed, which is 
visible for the end user.
+  MMObjectBuilder wfBuilder = 
MMBase.getMMBase().getBuilder(WORKFLOW_MANAGER_NAME);
+  MMObjectNode mmNode = wfBuilder.getNode(wfItem.getNumber());
+
+  mmNode.setValue(STATUS_FIELD, status);
  if (StringUtils.isNotEmpty(stacktrace)) {
- wfItem.setStringValue(STACKTRACE_FIELD, stacktrace);
+ wfItem.setValue(STACKTRACE_FIELD, stacktrace);
   }
- wfItem.commit();
+  wfBuilder.commit(mmNode);
   }
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow WorkflowManager.java

[rschellhorn]

Update of 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
In directory 
james.mmbase.org:/tmp/cvs-serv25031/workflow/src/java/com/finalist/cmsc/workflow

Modified Files:
  Tag: b1_5
WorkflowManager.java 
Log Message:
CMSC-1073 Workflow elements should not be modified by 'anonymous'.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1073


Index: WorkflowManager.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- WorkflowManager.java8 Aug 2008 13:44:01 -   1.15
+++ WorkflowManager.java26 Sep 2008 09:33:35 -  1.15.2.1
@@ -4,6 +4,9 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.mmbase.bridge.*;
+import org.mmbase.module.core.MMBase;
+import org.mmbase.module.core.MMObjectBuilder;
+import org.mmbase.module.core.MMObjectNode;
 import org.mmbase.storage.search.*;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -366,11 +369,16 @@
}
 
protected void changeWorkflowFailPublished(Node wfItem, String status, 
String stacktrace) {
- wfItem.setStringValue(STATUS_FIELD, status);
+  // We need to bypass the MMBase bridge to change workflow items.
+  // The bridge causes the lastmodifier field to be changed, which is 
visible for the end user.
+  MMObjectBuilder wfBuilder = 
MMBase.getMMBase().getBuilder(WORKFLOW_MANAGER_NAME);
+  MMObjectNode mmNode = wfBuilder.getNode(wfItem.getNumber());
+
+  mmNode.setValue(STATUS_FIELD, status);
  if (StringUtils.isNotEmpty(stacktrace)) {
- wfItem.setStringValue(STACKTRACE_FIELD, stacktrace);
+ wfItem.setValue(STACKTRACE_FIELD, stacktrace);
   }
- wfItem.commit();
+  wfBuilder.commit(mmNode);
   }
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow WorkflowManager.java

[rschellhorn]

Update of 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
In directory 
james.mmbase.org:/tmp/cvs-serv25014/workflow/src/java/com/finalist/cmsc/workflow

Modified Files:
  Tag: b1_4
WorkflowManager.java 
Log Message:
CMSC-1073 Workflow elements should not be modified by 'anonymous'.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow
See also: http://www.mmbase.org/jira/browse/CMSC-1073


Index: WorkflowManager.java
===
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/workflow/src/java/com/finalist/cmsc/workflow/WorkflowManager.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- WorkflowManager.java28 Dec 2007 09:27:52 -  1.9
+++ WorkflowManager.java26 Sep 2008 09:33:29 -  1.9.2.1
@@ -8,6 +8,9 @@
 import net.sf.mmapps.commons.util.StringUtil;
 
 import org.mmbase.bridge.*;
+import org.mmbase.module.core.MMBase;
+import org.mmbase.module.core.MMObjectBuilder;
+import org.mmbase.module.core.MMObjectNode;
 import org.mmbase.storage.search.*;
 import org.mmbase.util.logging.Logger;
 import org.mmbase.util.logging.Logging;
@@ -348,11 +351,17 @@
}
 
protected void changeWorkflowFailPublished(Node wfItem, String status, 
String stacktrace) {
- wfItem.setStringValue(STATUS_FIELD, status);
+  // We need to bypass the MMBase bridge to change workflow items.
+  // The bridge causes the lastmodifier field to be changed, which is 
visible for the end user.
+  MMObjectBuilder wfBuilder = 
MMBase.getMMBase().getBuilder(WORKFLOW_MANAGER_NAME);
+  MMObjectNode mmNode = wfBuilder.getNode(wfItem.getNumber());
+
+  mmNode.setValue(STATUS_FIELD, status);
+  mmNode.setValue(STATUS_FIELD, status);
  if (!StringUtil.isEmpty(stacktrace)) {
- wfItem.setStringValue(STACKTRACE_FIELD, stacktrace);
+ mmNode.setValue(STACKTRACE_FIELD, stacktrace);
   }
- wfItem.commit();
+  wfBuilder.commit(mmNode);
   }
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/nmintra/includes nav.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/nmintra/includes
In directory james.mmbase.org:/tmp/cvs-serv24944/templates/nmintra/includes

Modified Files:
nav.jsp 
Log Message:
NMCMS-552


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-552


Index: nav.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/nmintra/includes/nav.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- nav.jsp 26 Sep 2008 09:02:15 -  1.15
+++ nav.jsp 26 Sep 2008 09:30:53 -  1.16
@@ -127,7 +127,6 @@
  

   <% 
-  System.out.println("navTitel:" + 
navTitel);
   if 
(navTitel.toLowerCase().equals("home")) { %>
   
   
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/nmintra/includes/event_blueprints searchform.jsp

[jruijter]

Update of 
/var/cvs/contributions/natmm/templates/nmintra/includes/event_blueprints
In directory 
james.mmbase.org:/tmp/cvs-serv24808/templates/nmintra/includes/event_blueprints

Modified Files:
searchform.jsp 
Log Message:
NMCMS-566


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes/event_blueprints
See also: http://www.mmbase.org/jira/browse/NMCMS-566


Index: searchform.jsp
===
RCS file: 
/var/cvs/contributions/natmm/templates/nmintra/includes/event_blueprints/searchform.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- searchform.jsp  22 Sep 2008 16:02:39 -  1.11
+++ searchform.jsp  26 Sep 2008 09:16:46 -  1.12
@@ -56,10 +56,10 @@
   
   <%= getSelect(cloud,log,"Type 
activiteit",iRubriekStyle,eTypeId,eventTypes,"evenement_type","naam",searchUrl,"evt")
 %>
   <%= 
getSelect(cloud,log,"Doelgroep",iRubriekStyle,pCategorieId,participantsCategories,"deelnemers_categorie","naam",searchUrl,"pc")
 %>
-  <%= 
getSelect(cloud,log,"Leeftijd",iRubriekStyle,pAgeId,participantsAges,"deelnemers_age","name",searchUrl,"pa")
 %>
+  <%-- 
getSelect(cloud,log,"Leeftijd",iRubriekStyle,pAgeId,participantsAges,"deelnemers_age","name",searchUrl,"pa")
 --%>
   <%= getSelect(cloud,log,"Type 
terrein",iRubriekStyle,nReserveId,natureReserveTypes,"natuurgebieden_type","name",searchUrl,"nr")
 %>
-  <%= 
getSelect(cloud,log,"Afstand",iRubriekStyle,eDistanceId,evenementDistances,"evenement_distance","name",searchUrl,"evl")
 %>
-  <%= 
getSelect(cloud,log,"Tijdsduur",iRubriekStyle,eDurationId,evenementDurations,"evenement_duration","name",searchUrl,"evd")
 %>
+  <%-- 
getSelect(cloud,log,"Afstand",iRubriekStyle,eDistanceId,evenementDistances,"evenement_distance","name",searchUrl,"evl")
 --%>
+  <%-- 
getSelect(cloud,log,"Tijdsduur",iRubriekStyle,eDurationId,evenementDurations,"evenement_duration","name",searchUrl,"evd")
 --%>
   <%= 
getSelect(cloud,log,"Bezoekerscentrum",iRubriekStyle,departmentId,departments,"afdelingen","naam",searchUrl,"department")
 %>
   

___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/natmm/templates/nmintra/includes nav.jsp

[jruijter]

Update of /var/cvs/contributions/natmm/templates/nmintra/includes
In directory james.mmbase.org:/tmp/cvs-serv24558/templates/nmintra/includes

Modified Files:
nav.jsp 
Log Message:
NMCMS-552


See also: 
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-552


Index: nav.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/nmintra/includes/nav.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- nav.jsp 12 Oct 2006 21:50:08 -  1.14
+++ nav.jsp 26 Sep 2008 09:02:15 -  1.15
@@ -97,7 +97,7 @@



Active">
+   
>">






@@ -124,6 +124,16 @@

} %>">




+ 
+   
+  <% 
+  System.out.println("navTitel:" + 
navTitel);
+  if 
(navTitel.toLowerCase().equals("home")) { %>
+  
+  
+  <% } %>
+

+ 




___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra wizard.css

[lisachen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra
In directory james.mmbase.org:/tmp/cvs-serv24424

Modified Files:
wizard.css 
Log Message:
CMSC-498 action button gray underline


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra
See also: http://www.mmbase.org/jira/browse/CMSC-498


Index: wizard.css
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/style/extra/wizard.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- wizard.css  6 Aug 2008 12:16:05 -   1.9
+++ wizard.css  26 Sep 2008 08:57:19 -  1.10
@@ -3,6 +3,7 @@
 */
 div.buttonscontent  {
 text-align: right;
+   height:39px;
 } 
 
 /* CMS Container style  */
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util ResourceLoader.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv24255

Modified Files:
ResourceLoader.java 
Log Message:
improved a bit on the toString of ApplicationContextFileUrlStreamReader


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util


Index: ResourceLoader.java
===
RCS file: /var/cvs/src/org/mmbase/util/ResourceLoader.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- ResourceLoader.java 12 Sep 2008 14:39:29 -  1.70
+++ ResourceLoader.java 26 Sep 2008 08:42:40 -  1.71
@@ -97,7 +97,7 @@
  * For property-files, the java-unicode-escaping is undone on loading, and 
applied on saving, so there is no need to think of that.
  * @author Michiel Meeuwissen
  * @since  MMBase-1.8
- * @version $Id: ResourceLoader.java,v 1.70 2008/09/12 14:39:29 michiel Exp $
+ * @version $Id: ResourceLoader.java,v 1.71 2008/09/26 08:42:40 michiel Exp $
  */
 public class ResourceLoader extends ClassLoader {
 
@@ -1374,12 +1374,27 @@
 }
 }
 } catch (MalformedURLException mfue) {
+log.warn(mfue);
 }
 }
 return null;
 }
 public String toString() {
-return "" + FILES;
+StringBuilder bul = new StringBuilder("{");
+for (Map.Entry e : FILES.entrySet()) {
+if (bul.length() > 1) bul.append(", ");
+bul.append(e.getKey()).append('=');
+File f = getFileFromString(e.getValue());
+bul.append(e.getValue());
+if (! f.exists()) {
+bul.append("(" + f + " does not exist)");
+} else if (! f.canRead()) {
+bul.append("(" + f + " cannot be read)");
+
+}
+}
+bul.append("}");
+return bul.toString();
 }
 }
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository content.jsp

[evaguo]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv24044

Modified Files:
content.jsp 
Log Message:
CMSC-144(Format the jsp.)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-144


Index: content.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- content.jsp 26 Sep 2008 07:44:23 -  1.37
+++ content.jsp 26 Sep 2008 08:30:54 -  1.38
@@ -1,8 +1,8 @@
-<%@ page language="java" contentType="text/html;charset=utf-8" %>
-<%@ include file="globals.jsp" %>
-<%@ page import="com.finalist.cmsc.repository.RepositoryUtil" %>
-<%@ page import="com.finalist.cmsc.security.*" %>
-
+<%@ page language="java" contentType="text/html;charset=utf-8" 
+%><%@ include file="globals.jsp" 
+%><%@ page import="com.finalist.cmsc.repository.RepositoryUtil" 
+%><%@ page import="com.finalist.cmsc.security.*" 
+%>
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 
 
@@ -173,26 +173,16 @@
   " 
value="" 
onClick="document.forms['contentForm'].elements.selectall.checked=false;"/>
   
 <% } %>
-')">"
- 
alt=""/>
-" target="_blank">"
- 
title=""/>
 ');"
title="">"
alt=""/>
-<% if (role != null && SecurityUtil.isWriter(role)) { %>
-, 
${parentchannel} )">
-"/>
-
-','');"
-   title="">"
- alt=""/>
-<% } %>
+" target="_blank">"
+ 
title=""/>
+')">"
+ 
alt=""/>
 
 
 
@@ -201,19 +191,31 @@
 src="../gfx/icons/versioning.png" title=""
 alt=""/>
 
+<% if (role != null && SecurityUtil.isWriter(role)) { %>
+','');"
+   title="">"
+ alt=""/>
+, 
${parentchannel} )">
+"/>
+<% } %>
 <% if (role != null && SecurityUtil.isEditor(role)) { %>
-
-','')">"
-alt=""/>
-
 
-
+
 ','')">"
 alt=""/>
 
+
+
+','')">"
+alt=""/>
+
+
 <% } %>
+
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository content.jsp

[evaguo]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv23337/webapp/editors/repository

Modified Files:
content.jsp 
Log Message:
CMSC-144(Refresh the left content channel tree when add two contents in one 
channel.)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-144


Index: content.jsp
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/content.jsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- content.jsp 8 Sep 2008 10:54:25 -   1.36
+++ content.jsp 26 Sep 2008 07:44:23 -  1.37
@@ -1,8 +1,8 @@
-<%@ page language="java" contentType="text/html;charset=utf-8" 
-%><%@ include file="globals.jsp" 
-%><%@ page import="com.finalist.cmsc.repository.RepositoryUtil" 
-%><%@ page import="com.finalist.cmsc.security.*" 
-%>
+<%@ page language="java" contentType="text/html;charset=utf-8" %>
+<%@ include file="globals.jsp" %>
+<%@ page import="com.finalist.cmsc.repository.RepositoryUtil" %>
+<%@ page import="com.finalist.cmsc.security.*" %>
+
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 
 
@@ -16,6 +16,9 @@
 
 addLoadEvent(refreshChannels);
 
+
+addLoadEvent(refreshChannels);
+
 addLoadEvent(alphaImages);
 
 
@@ -170,16 +173,26 @@
   " 
value="" 
onClick="document.forms['contentForm'].elements.selectall.checked=false;"/>
   
 <% } %>
+')">"
+ 
alt=""/>
+" target="_blank">"
+ 
title=""/>
  ');"
title="">"
alt=""/>
-" target="_blank">"
- 
title=""/>
-')">"
- 
alt=""/>
+<% if (role != null && SecurityUtil.isWriter(role)) { %>
+, 
${parentchannel} )">
+"/>
+
+','');"
+   title="">"
+ alt=""/>
+<% } %>
 
 
 
@@ -188,31 +201,19 @@
 src="../gfx/icons/versioning.png" title=""
 alt=""/>
 
-<% if (role != null && SecurityUtil.isWriter(role)) { %>
-','');"
-   title="">"
- alt=""/>
-, 
${parentchannel} )">
-"/>
-<% } %>
 <% if (role != null && SecurityUtil.isEditor(role)) { %>
-  
-
-','')">"
-alt=""/>
-
 
-
 ','')">"
 alt=""/>
 
-
+
+
+','')">"
+alt=""/>
+
 <% } %>
-
 
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java

[evaguo]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv23337/java/com/finalist/cmsc/repository/forms

Modified Files:
ContentAction.java 
Log Message:
CMSC-144(Refresh the left content channel tree when add two contents in one 
channel.)


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-144


Index: ContentAction.java
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ContentAction.java  27 Jun 2008 01:51:56 -  1.11
+++ ContentAction.java  26 Sep 2008 07:44:23 -  1.12
@@ -90,6 +90,10 @@
 createdNumbers.put(String.valueOf(createdElement.getNumber()), 
createdElement);
  }
  addToRequest(request, "createdNumbers", createdNumbers);
+ //cmsc-144 make reorder icon show up
+ if(elementCount==2){
+request.setAttribute("refresh", true);
+ }
   }
   return mapping.findForward(SUCCESS);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF struts-repository.xml

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF
In directory james.mmbase.org:/tmp/cvs-serv22828

Modified Files:
  Tag: b1_5
struts-repository.xml 
Log Message:
CMSC-899,Check and improve all lists according to guideline, add two forwards.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF
See also: http://www.mmbase.org/jira/browse/CMSC-899


Index: struts-repository.xml
===
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- struts-repository.xml   27 Jun 2008 01:51:56 -  1.12
+++ struts-repository.xml   26 Sep 2008 07:05:36 -  1.12.2.1
@@ -170,6 +170,8 @@



+ 
+ 

 
http://lists.mmbase.org/mailman/listinfo/cvs