[MMBASE CVS] contributions/natmm/templates/natmm/flash - New directory
Update of /var/cvs/contributions/natmm/templates/natmm/flash In directory james.mmbase.org:/tmp/cvs-serv22302/templates/natmm/flash Log Message: Directory /var/cvs/contributions/natmm/templates/natmm/flash added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/flash ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/includes header.jsp
Update of /var/cvs/contributions/natmm/templates/natnh/includes In directory james.mmbase.org:/tmp/cvs-serv22333/templates/natnh/includes Modified Files: header.jsp Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/includes See also: http://www.mmbase.org/jira/browse/NMCMS-462 Index: header.jsp === RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/header.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- header.jsp 4 May 2007 15:15:23 - 1.5 +++ header.jsp 8 Feb 2008 17:08:43 - 1.6 @@ -13,8 +13,37 @@ meta name=author content=MMatch - MMBase consultancy and implementation / www.mmatch.nl meta http-equiv=imagetoolbar content=no script language=JavaScript src=scripts/launchcenter.js/script +script type=text/javascript language=javaScript src=scripts/skyscraper_cookie.js/script /head -body background=media/bg_top.gifa name=top/a +body onLoad=loadSkyscraper() background=media/bg_top.gif + + table width=100% border=0 cellspacing=0 cellpadding=0 align=center valign=top + tr + td style=width:50%/td + td style=width:744px; + + div id=bigdiv style=position:relative; + + div id=skyscraper style=visibility: hidden; position:absolute; left:-1000px; top:-600px; width:2000; height:2000; color:#00; z-index:101; +div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; + img src=flash/cross.gif onclick=closeSkyscraper();/ +/div +object classid=clsid:d27cdb6e-ae6d-11cf-96b8-44455354 codebase=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 + param name=allowScriptAccess value=sameDomain / + param name=movie value=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; / + param name=menu value=false / + param name=quality value=high / + param name=scale value=noscale / + param name=wmode value=transparent / + param name=bgcolor value=#ff / + embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / +/object + /div + /td + /tr + /table + +a name=top/a table width=100% border=0 cellspacing=0 cellpadding=0 valign=top tr height=1pxtd colspan=2 valign=top table width=100% border=0 cellspacing=0 cellpadding=0 valign=top @@ -40,6 +69,7 @@ /table /td td width=159 rowspan=2 valign=top class=topgradient style=padding-top:29px; + img src=media/natmm_logo_rgb1.gif width=159 height=216 /td td width=73 rowspan=2 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/flash overlayerbanner_pop_600x600.swf
Update of /var/cvs/contributions/natmm/templates/natmm/flash In directory james.mmbase.org:/tmp/cvs-serv22814/templates/natmm/flash Modified Files: overlayerbanner_pop_600x600.swf Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/flash See also: http://www.mmbase.org/jira/browse/NMCMS-462 Index: overlayerbanner_pop_600x600.swf === RCS file: /var/cvs/contributions/natmm/templates/natmm/flash/overlayerbanner_pop_600x600.swf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 Binary files /tmp/cvsgwlwwY and /tmp/cvsD8wnCx differ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natnh/scripts
In directory james.mmbase.org:/tmp/cvs-serv27826/templates/natnh/scripts
Modified Files:
skyscraper_cookie.js
Log Message:
NMCMS-462
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-462
Index: skyscraper_cookie.js
===
RCS file:
/var/cvs/contributions/natmm/templates/natnh/scripts/skyscraper_cookie.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- skyscraper_cookie.js8 Feb 2008 17:08:43 - 1.1
+++ skyscraper_cookie.js15 Feb 2008 11:12:30 - 1.2
@@ -16,20 +16,21 @@
}
function loadSkyscraper() {
- document.body.style.overflow = 'hidden';
- document.getElementById('skyscraper').style.visibility = 'hidden';
+ document.getElementById('skyscraper').style.display = 'none';
var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
//alert(skyscraperIsViewed: + skyscraperIsViewed);
if ( skyscraperIsViewed == null || skyscraperIsViewed == ) {
//alert(showing skyscraper and setting cookie);
+ document.body.style.overflow = 'hidden';
+ document.getElementById('skyscraper').style.display = 'block';
document.getElementById('skyscraper').style.visibility =
'visible';
SetCookie(skyscraper_is_viewed,yes,365);
}
}
function closeSkyscraper() {
- document.body.style.overflow = 'auto';
+ document.body.style.overflow = 'scroll';
document.getElementById('skyscraper').style.display = 'none';
return false;
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/WEB-INF web.xml
Update of /var/cvs/contributions/natmm/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv27826/WEB-INF Modified Files: web.xml Log Message: NMCMS-462 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/WEB-INF See also: http://www.mmbase.org/jira/browse/NMCMS-462 Index: web.xml === RCS file: /var/cvs/contributions/natmm/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- web.xml 21 Apr 2006 15:49:22 - 1.2 +++ web.xml 15 Feb 2008 11:12:30 - 1.3 @@ -130,7 +130,7 @@ /welcome-file-list error-page error-code404/error-code - location/404/index.html/location + location/natmm/404/index.html/location /error-page taglib taglib-uri/WEB-INF/tld/struts-bean.tld/taglib-uri ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natmm/scripts
In directory james.mmbase.org:/tmp/cvs-serv27826/templates/natmm/scripts
Modified Files:
skyscraper_cookie.js
Log Message:
NMCMS-462
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-462
Index: skyscraper_cookie.js
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/scripts/skyscraper_cookie.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- skyscraper_cookie.js8 Feb 2008 17:08:43 - 1.1
+++ skyscraper_cookie.js15 Feb 2008 11:12:30 - 1.2
@@ -16,20 +16,21 @@
}
function loadSkyscraper() {
- document.body.style.overflow = 'hidden';
- document.getElementById('skyscraper').style.visibility = 'hidden';
+ document.getElementById('skyscraper').style.display = 'none';
var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
//alert(skyscraperIsViewed: + skyscraperIsViewed);
if ( skyscraperIsViewed == null || skyscraperIsViewed == ) {
//alert(showing skyscraper and setting cookie);
+ document.body.style.overflow = 'hidden';
+ document.getElementById('skyscraper').style.display = 'block';
document.getElementById('skyscraper').style.visibility =
'visible';
SetCookie(skyscraper_is_viewed,yes,365);
}
}
function closeSkyscraper() {
- document.body.style.overflow = 'auto';
+ document.body.style.overflow = 'scroll';
document.getElementById('skyscraper').style.display = 'none';
return false;
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natmm/scripts
In directory james.mmbase.org:/tmp/cvs-serv5732/templates/natmm/scripts
Modified Files:
skyscraper_cookie.js
Log Message:
NMCMS-467
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-467
Index: skyscraper_cookie.js
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/scripts/skyscraper_cookie.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- skyscraper_cookie.js15 Feb 2008 11:12:30 - 1.2
+++ skyscraper_cookie.js21 Feb 2008 10:54:33 - 1.3
@@ -16,7 +16,9 @@
}
function loadSkyscraper() {
- document.getElementById('skyscraper').style.display = 'none';
+ var skyscraperElement = document.getElementById('skyscraper');
+ if (skyscraperElement != null)
document.getElementById('skyscraper').style.display = 'none';
+
var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
//alert(skyscraperIsViewed: + skyscraperIsViewed);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/resources cmsc-repository_zh.properties cmsc-repository.properties cmsc-repository_nl.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources In directory james.mmbase.org:/tmp/cvs-serv23712/cmsc/contentrepository/resources Modified Files: Tag: b1_4 cmsc-repository_zh.properties cmsc-repository.properties cmsc-repository_nl.properties Log Message: CMSC-427 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/resources See also: http://www.mmbase.org/jira/browse/CMSC-427 Index: cmsc-repository_zh.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -u -b -r1.4.2.1 -r1.4.2.2 --- cmsc-repository_zh.properties 25 Feb 2008 16:25:45 - 1.4.2.1 +++ cmsc-repository_zh.properties 3 Mar 2008 10:22:17 - 1.4.2.2 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=éæ©å°æ¤å 容æ¢å¤å°åªä¸ªé¢é: recyclebin.restore.back=è¿ååæ¶ç« +recyclebin.no.access=You do not have enough rights + channeldelete.title=é¢éå é¤ channeldelete.subtitle=æ é¢: channeldelete.confirm=ä½ ç¡®å®å é¤è¿ä¸ªé¢éä¹? Index: cmsc-repository.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties,v retrieving revision 1.21.2.1 retrieving revision 1.21.2.2 diff -u -b -r1.21.2.1 -r1.21.2.2 --- cmsc-repository.properties 25 Feb 2008 16:25:45 - 1.21.2.1 +++ cmsc-repository.properties 3 Mar 2008 10:22:17 - 1.21.2.2 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=Select a channel to restore the content to: recyclebin.restore.back=Back to Recycle Bin +recyclebin.no.access=You do not have enough rights + channeldelete.title=Channel delete channeldelete.subtitle=Title: channeldelete.confirm=Are you sure that you want to delete this channel? Index: cmsc-repository_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties,v retrieving revision 1.20.2.1 retrieving revision 1.20.2.2 diff -u -b -r1.20.2.1 -r1.20.2.2 --- cmsc-repository_nl.properties 25 Feb 2008 16:25:45 - 1.20.2.1 +++ cmsc-repository_nl.properties 3 Mar 2008 10:22:17 - 1.20.2.2 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=Selecteer een rubriek om naar terug te zetten: recyclebin.restore.back=Terug naar prullenbak +recyclebin.no.access=U heeft niet genoeg rechten + channeldelete.title=Rubriek verwijderen channeldelete.subtitle=Titel: channeldelete.confirm=Weet u zeker dat u deze rubriek wilt verwijderen? ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts MMBaseAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv23712/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
Tag: b1_4
MMBaseAction.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: MMBaseAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseAction.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- MMBaseAction.java 11 Feb 2008 09:30:13 - 1.6.2.1
+++ MMBaseAction.java 3 Mar 2008 10:22:17 - 1.6.2.2
@@ -114,7 +114,7 @@
}
- private ActionForward redirectLogin(HttpServletRequest req) {
+ protected ActionForward redirectLogin(HttpServletRequest req) {
// could not create a cloud on the session
String loginForward = /editors/login.jsp;
String referrer = req.getRequestURL().toString()
___
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/java/com/finalist/cmsc/repository RepositoryUtil.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory
james.mmbase.org:/tmp/cvs-serv23712/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
Modified Files:
Tag: b1_4
RepositoryUtil.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: RepositoryUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -b -r1.15 -r1.15.2.1
--- RepositoryUtil.java 14 Jan 2008 15:53:56 - 1.15
+++ RepositoryUtil.java 3 Mar 2008 10:22:17 - 1.15.2.1
@@ -966,4 +966,24 @@
return SecurityUtil.getRole(channel, true, pagesWithRole);
}
+/**
+ * Check if the role has rights on the Recyclebin
+ * @param cloud Cloud
+ * @param roleName specified roleName
+ * @return boolean
+ */
+public static boolean hasRecyclebinRights(Cloud cloud, String roleName) {
+Node node = getTrashNode(cloud);
+roleName = roleName.toLowerCase();
+
+UserRole role = RepositoryUtil.getRole(cloud, node, true);
+
+if (role != null roleName.equals(role.getRole().getName())) {
+return true;
+}
+else {
+return false;
+}
+}
+
}
___
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 RepositoryUtil.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory
james.mmbase.org:/tmp/cvs-serv23910/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
Modified Files:
Tag: v1_3
RepositoryUtil.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: RepositoryUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- RepositoryUtil.java 20 Sep 2007 18:45:47 - 1.9.2.1
+++ RepositoryUtil.java 3 Mar 2008 10:25:58 - 1.9.2.2
@@ -917,4 +917,24 @@
return SecurityUtil.getRole(channel, true, pagesWithRole);
}
+/**
+ * Check if the role has rights on the Recyclebin
+ * @param cloud Cloud
+ * @param roleName specified roleName
+ * @return boolean
+ */
+public static boolean hasRecyclebinRights(Cloud cloud, String roleName) {
+Node node = getTrashNode(cloud);
+roleName = roleName.toLowerCase();
+
+UserRole role = RepositoryUtil.getRole(cloud, node, true);
+
+if (role != null roleName.equals(role.getRole().getName())) {
+return true;
+}
+else {
+return false;
+}
+}
+
}
___
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 RepositoryUtil.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory
james.mmbase.org:/tmp/cvs-serv23924/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
Modified Files:
RepositoryUtil.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: RepositoryUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- RepositoryUtil.java 14 Jan 2008 15:53:56 - 1.15
+++ RepositoryUtil.java 3 Mar 2008 10:26:04 - 1.16
@@ -966,4 +966,24 @@
return SecurityUtil.getRole(channel, true, pagesWithRole);
}
+/**
+ * Check if the role has rights on the Recyclebin
+ * @param cloud Cloud
+ * @param roleName specified roleName
+ * @return boolean
+ */
+public static boolean hasRecyclebinRights(Cloud cloud, String roleName) {
+Node node = getTrashNode(cloud);
+roleName = roleName.toLowerCase();
+
+UserRole role = RepositoryUtil.getRole(cloud, node, true);
+
+if (role != null roleName.equals(role.getRole().getName())) {
+return true;
+}
+else {
+return false;
+}
+}
+
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts MMBaseAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv24117/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
Tag: v1_3
MMBaseAction.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: MMBaseAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseAction.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- MMBaseAction.java 11 Feb 2008 09:22:17 - 1.5.2.1
+++ MMBaseAction.java 3 Mar 2008 10:29:38 - 1.5.2.2
@@ -108,7 +108,7 @@
return BASIC_USER;
}
-private ActionForward redirectLogin(HttpServletRequest req) {
+protected ActionForward redirectLogin(HttpServletRequest req) {
//could not create a cloud on the session
String loginForward = /editors/login.jsp;
String referrer = req.getRequestURL().toString() +
(req.getQueryString() != null ? ? + req.getQueryString() : );
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts MMBaseAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv24132/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
MMBaseAction.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: MMBaseAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- MMBaseAction.java 25 Feb 2008 14:45:21 - 1.7
+++ MMBaseAction.java 3 Mar 2008 10:29:44 - 1.8
@@ -114,7 +114,7 @@
}
- private ActionForward redirectLogin(HttpServletRequest req) {
+ protected ActionForward redirectLogin(HttpServletRequest req) {
// could not create a cloud on the session
String loginForward = /editors/login.jsp;
String referrer = req.getRequestURL().toString()
___
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/recyclebin/forms DeleteAction.java RestoreAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
In directory
james.mmbase.org:/tmp/cvs-serv24208/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
Modified Files:
DeleteAction.java RestoreAction.java
Log Message:
CMSC-427
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms
See also: http://www.mmbase.org/jira/browse/CMSC-427
Index: DeleteAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/DeleteAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DeleteAction.java 26 Nov 2007 11:43:45 - 1.7
+++ DeleteAction.java 3 Mar 2008 10:32:18 - 1.8
@@ -31,6 +31,10 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ if (!RepositoryUtil.hasRecyclebinRights(cloud, webmaster)) {
+ return redirectLogin(request);
+ }
+
String action = getParameter(request, action);
if (deleteall.equals(action)) {
@@ -62,11 +66,4 @@
}
return mapping.findForward(SUCCESS);
}
-
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
Index: RestoreAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/recyclebin/forms/RestoreAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RestoreAction.java 26 Nov 2007 11:43:45 - 1.4
+++ RestoreAction.java 3 Mar 2008 10:32:18 - 1.5
@@ -26,6 +26,10 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
+ if (!RepositoryUtil.hasRecyclebinRights(cloud, webmaster)) {
+ return redirectLogin(request);
+ }
+
String objectnumber = getParameter(request, objectnumber);
Node objectNode = cloud.getNode(objectnumber);
@@ -52,11 +56,4 @@
}
return mapping.findForward(SUCCESS);
}
-
-
- @Override
- public String getRequiredRankStr() {
- return ADMINISTRATOR;
- }
-
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/resources cmsc-repository.properties cmsc-repository_nl.properties cmsc-repository_zh.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources In directory james.mmbase.org:/tmp/cvs-serv24315/cmsc/contentrepository/resources Modified Files: cmsc-repository.properties cmsc-repository_nl.properties cmsc-repository_zh.properties Log Message: CMSC-427 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/resources See also: http://www.mmbase.org/jira/browse/CMSC-427 Index: cmsc-repository.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties,v retrieving revision 1.22 retrieving revision 1.23 diff -u -b -r1.22 -r1.23 --- cmsc-repository.properties 15 Feb 2008 09:10:51 - 1.22 +++ cmsc-repository.properties 3 Mar 2008 10:34:15 - 1.23 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=Select a channel to restore the content to: recyclebin.restore.back=Back to Recycle Bin +recyclebin.no.access=You do not have enough rights + channeldelete.title=Channel delete channeldelete.subtitle=Title: channeldelete.confirm=Are you sure that you want to delete this channel? Index: cmsc-repository_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- cmsc-repository_nl.properties 15 Feb 2008 09:10:51 - 1.21 +++ cmsc-repository_nl.properties 3 Mar 2008 10:34:15 - 1.22 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=Selecteer een rubriek om naar terug te zetten: recyclebin.restore.back=Terug naar prullenbak +recyclebin.no.access=U heeft niet genoeg rechten + channeldelete.title=Rubriek verwijderen channeldelete.subtitle=Titel: channeldelete.confirm=Weet u zeker dat u deze rubriek wilt verwijderen? Index: cmsc-repository_zh.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- cmsc-repository_zh.properties 15 Feb 2008 09:10:51 - 1.5 +++ cmsc-repository_zh.properties 3 Mar 2008 10:34:15 - 1.6 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=éæ©å°æ¤å 容æ¢å¤å°åªä¸ªé¢é: recyclebin.restore.back=è¿ååæ¶ç« +recyclebin.no.access=You do not have enough rights + channeldelete.title=é¢éå é¤ channeldelete.subtitle=æ é¢: channeldelete.confirm=ä½ ç¡®å®å é¤è¿ä¸ªé¢éä¹? ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/resources cmsc-repository_nl.properties cmsc-repository.properties
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources In directory james.mmbase.org:/tmp/cvs-serv24369/cmsc/contentrepository/resources Modified Files: Tag: v1_3 cmsc-repository_nl.properties cmsc-repository.properties Log Message: CMSC-427 See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/resources See also: http://www.mmbase.org/jira/browse/CMSC-427 Index: cmsc-repository_nl.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties,v retrieving revision 1.12.4.1 retrieving revision 1.12.4.2 diff -u -b -r1.12.4.1 -r1.12.4.2 --- cmsc-repository_nl.properties 30 Nov 2007 13:33:53 - 1.12.4.1 +++ cmsc-repository_nl.properties 3 Mar 2008 10:34:54 - 1.12.4.2 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=Selecteer een rubriek om naar terug te zetten: recyclebin.restore.back=Terug naar prullenbak +recyclebin.no.access=U heeft niet genoeg rechten + channeldelete.title=Rubriek verwijderen channeldelete.subtitle=Titel: channeldelete.confirm=Weet u zeker dat u deze rubriek wilt verwijderen? Index: cmsc-repository.properties === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties,v retrieving revision 1.10.4.2 retrieving revision 1.10.4.3 diff -u -b -r1.10.4.2 -r1.10.4.3 --- cmsc-repository.properties 30 Nov 2007 13:33:53 - 1.10.4.2 +++ cmsc-repository.properties 3 Mar 2008 10:34:54 - 1.10.4.3 @@ -30,6 +30,8 @@ recyclebin.restore.selectchannel=Select a channel to restore the content to: recyclebin.restore.back=Back to recyclebin +recyclebin.no.access=You do not have enough rights + channeldelete.title=Channel delete channeldelete.subtitle=Title: channeldelete.confirm=Are you sure that you want to delete this channel? @@ -329,3 +331,4 @@ secondaryedit.cancel=Cancel uploading.message.wait=Uploading... Please wait. + ___ 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-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
[MMBASE CVS] contributions/natmm/templates/natnh/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natnh/scripts
In directory james.mmbase.org:/tmp/cvs-serv13882/templates/natnh/scripts
Modified Files:
skyscraper_cookie.js
Log Message:
NMCMS-472
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-472
Index: skyscraper_cookie.js
===
RCS file:
/var/cvs/contributions/natmm/templates/natnh/scripts/skyscraper_cookie.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- skyscraper_cookie.js21 Feb 2008 10:54:33 - 1.3
+++ skyscraper_cookie.js5 Mar 2008 10:33:35 - 1.4
@@ -19,7 +19,8 @@
var skyscraperElement = document.getElementById('skyscraper');
if (skyscraperElement != null)
document.getElementById('skyscraper').style.display = 'none';
- var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
+ //var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
+ var skyscraperIsViewed = yes;
//alert(skyscraperIsViewed: + skyscraperIsViewed);
if ( skyscraperIsViewed == null || skyscraperIsViewed == ) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natmm/scripts
In directory james.mmbase.org:/tmp/cvs-serv13882/templates/natmm/scripts
Modified Files:
skyscraper_cookie.js
Log Message:
NMCMS-472
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-472
Index: skyscraper_cookie.js
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/scripts/skyscraper_cookie.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- skyscraper_cookie.js21 Feb 2008 10:54:33 - 1.3
+++ skyscraper_cookie.js5 Mar 2008 10:33:35 - 1.4
@@ -19,7 +19,8 @@
var skyscraperElement = document.getElementById('skyscraper');
if (skyscraperElement != null)
document.getElementById('skyscraper').style.display = 'none';
- var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
+ //var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
+ var skyscraperIsViewed = yes;
//alert(skyscraperIsViewed: + skyscraperIsViewed);
if ( skyscraperIsViewed == null || skyscraperIsViewed == ) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen EventNotifier.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen
In directory james.mmbase.org:/tmp/cvs-serv31643/src/nl/leocms/evenementen
Modified Files:
EventNotifier.java
Log Message:
NMCMS-476
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-476
Index: EventNotifier.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/EventNotifier.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- EventNotifier.java 21 Nov 2007 12:45:10 - 1.18
+++ EventNotifier.java 20 Mar 2008 12:52:35 - 1.19
@@ -301,9 +301,15 @@
}
public String groupEventConfirmationPeriodExpired(Cloud cloud) {
-
String logMessage = ;
+
+ // groupevent confirmationperiod expired notifications are only sent on
monday
+ Calendar rightNow = Calendar.getInstance();
+ int day = rightNow.get(Calendar.DAY_OF_WEEK);
+
+ if (day == Calendar.MONDAY) {
int nEmailSend = 0;
+
try {
// list all the group subscription:
// - not confirmed
@@ -337,6 +343,10 @@
log.info(e);
}
logMessage += \nbrNumber of groupevent confirmationperiod expired
send + nEmailSend;
+ }
+ else {
+ logMessage += \nbrGroupevent confirmationperiod expired
notifications are only send on monday;
+ }
return logMessage;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/deelnemers_categorie zoek_evenement_type_posrel_deelnemers_categorie.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/deelnemers_categorie In directory james.mmbase.org:/tmp/cvs-serv31748/templates/mmbase/edit/wizard/data/config/deelnemers_categorie Modified Files: zoek_evenement_type_posrel_deelnemers_categorie.xml Log Message: NMCMS-480 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/deelnemers_categorie See also: http://www.mmbase.org/jira/browse/NMCMS-480 Index: zoek_evenement_type_posrel_deelnemers_categorie.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/deelnemers_categorie/zoek_evenement_type_posrel_deelnemers_categorie.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- zoek_evenement_type_posrel_deelnemers_categorie.xml 31 May 2007 13:45:30 - 1.2 +++ zoek_evenement_type_posrel_deelnemers_categorie.xml 21 Apr 2008 09:38:18 - 1.3 @@ -2,7 +2,7 @@ !DOCTYPE list PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; list role=posrel destination=deelnemers_categorie minoccurs=1 maxoccurs=* orderby=[EMAIL PROTECTED]'pos'] ordertype=number - titleactiviteitstype en standaard kosten (in centen, zonder punt of komma)/title + titledeelnemers categorie en standaard kosten (in centen, zonder punt of komma)/title item field ftype=data name=naam / field fdatapath=[EMAIL PROTECTED]apos;posapos;] ftype=linepromptstandaard kosten/prompt/field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm index.jsp home.jsp
Update of /var/cvs/contributions/natmm/templates/natmm In directory james.mmbase.org:/tmp/cvs-serv7075/templates/natmm Modified Files: index.jsp home.jsp Log Message: NMCMS-506 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm See also: http://www.mmbase.org/jira/browse/NMCMS-506 Index: index.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/index.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- index.jsp 8 Feb 2008 17:08:43 - 1.4 +++ index.jsp 21 Apr 2008 11:45:42 - 1.5 @@ -12,6 +12,7 @@ div id=bigdiv style=position:relative; +!-- div id=skyscraper style=visibility: hidden; position:absolute; left:-625px; top:-850px; width:2000; height:2000; color:#00; z-index:101; div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; img src=flash/cross.gif onclick=closeSkyscraper();/ @@ -27,6 +28,7 @@ embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / /object /div +-- table width=744 border=0 cellspacing=0 cellpadding=0 align=center valign=top tr Index: home.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/home.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- home.jsp8 Feb 2008 17:08:43 - 1.9 +++ home.jsp21 Apr 2008 11:45:42 - 1.10 @@ -24,6 +24,7 @@ div id=bigdiv style=position:relative; +!-- div id=skyscraper style=visibility: hidden; position:absolute; left:-625px; top:-700px; width:2000; height:2000; color:#00; z-index:101; div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; img src=flash/cross.gif onclick=closeSkyscraper();/ @@ -39,6 +40,7 @@ embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / /object /div +-- table width=744 border=0 cellspacing=0 cellpadding=0 align=center valign=top tr ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/includes header.jsp
Update of /var/cvs/contributions/natmm/templates/natnh/includes In directory james.mmbase.org:/tmp/cvs-serv7075/templates/natnh/includes Modified Files: header.jsp Log Message: NMCMS-506 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/includes See also: http://www.mmbase.org/jira/browse/NMCMS-506 Index: header.jsp === RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/header.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- header.jsp 8 Feb 2008 17:08:43 - 1.6 +++ header.jsp 21 Apr 2008 11:45:42 - 1.7 @@ -13,9 +13,9 @@ meta name=author content=MMatch - MMBase consultancy and implementation / www.mmatch.nl meta http-equiv=imagetoolbar content=no script language=JavaScript src=scripts/launchcenter.js/script -script type=text/javascript language=javaScript src=scripts/skyscraper_cookie.js/script +!-- script type=text/javascript language=javaScript src=scripts/skyscraper_cookie.js/script-- /head -body onLoad=loadSkyscraper() background=media/bg_top.gif +body background=media/bg_top.gif table width=100% border=0 cellspacing=0 cellpadding=0 align=center valign=top tr @@ -24,6 +24,7 @@ div id=bigdiv style=position:relative; + !-- div id=skyscraper style=visibility: hidden; position:absolute; left:-1000px; top:-600px; width:2000; height:2000; color:#00; z-index:101; div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; img src=flash/cross.gif onclick=closeSkyscraper();/ @@ -39,6 +40,7 @@ embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / /object /div + -- /td /tr /table ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes top4_head.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes In directory james.mmbase.org:/tmp/cvs-serv7075/templates/natmm/includes Modified Files: top4_head.jsp Log Message: NMCMS-506 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes See also: http://www.mmbase.org/jira/browse/NMCMS-506 Index: top4_head.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/top4_head.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- top4_head.jsp 8 Feb 2008 17:08:43 - 1.12 +++ top4_head.jsp 21 Apr 2008 11:45:42 - 1.13 @@ -3,7 +3,7 @@ %-- link rel=alternate stylesheet type=text/css href=hoofdsite/themas/fontsize1.2.css title=groot / --% %-- link rel=alternate stylesheet type=text/css href=hoofdsite/themas/fontsize1.4.css title=groter / --% script type=text/javascript language=javaScript src=%= (isSubDir? ../ : ) %scripts/launchcenter.js/script - script type=text/javascript language=javaScript src=%= (isSubDir? ../ : ) %scripts/skyscraper_cookie.js/script + !-- script type=text/javascript language=javaScript src=%= (isSubDir? ../ : ) %scripts/skyscraper_cookie.js/script-- link rel=stylesheet type=text/css href=%= (isSubDir? ../ : ) %%= styleSheet % / titlemm:node number=rootmm:field name=naam//mm:node: mm:node number=%= rubriekID %mm:field name=naam id=rubriek_naam //mm:node mm:node number=%= paginaID % @@ -88,5 +88,5 @@ % } % /head -body style=margin:0; id=nm_body onLoad=loadSkyscraper(); %= (iRubriekLayout==NatMMConfig.DEMO_LAYOUT path.equals(portal.jsp) ? onload='StartClock()' onunload='KillClock()' : ) +body style=margin:0; id=nm_body %= (iRubriekLayout==NatMMConfig.DEMO_LAYOUT path.equals(portal.jsp) ? onload='StartClock()' onunload='KillClock()' : ) % \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/util/tools SearchUtil.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/util/tools
In directory james.mmbase.org:/tmp/cvs-serv7293/src/nl/leocms/util/tools
Modified Files:
SearchUtil.java
Log Message:
NMCMS-328
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/util/tools
See also: http://www.mmbase.org/jira/browse/NMCMS-328
Index: SearchUtil.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/util/tools/SearchUtil.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- SearchUtil.java 2 Jul 2007 14:05:42 - 1.17
+++ SearchUtil.java 21 Apr 2008 11:52:28 - 1.18
@@ -25,7 +25,7 @@
* Utilities functions for the search pages
*
* @author H. Hangyi
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class SearchUtil {
@@ -355,8 +355,9 @@
PaginaHelper ph = new PaginaHelper(cloud);
String sConstraints = (new
nl.leocms.util.tools.SearchUtil()).articleConstraint(nowSec, quarterOfAnHour);
Node foundNode = cloud.getNode(docNumber);
- boolean test =
articleMatchesConstraint(foundNode.getLongValue(embargo),
foundNode.getStringValue(use_verloopdatum),
foundNode.getLongValue(verloopdatum), nowSec, quarterOfAnHour);
- if (test) {
+ //boolean test =
articleMatchesConstraint(foundNode.getLongValue(embargo),
foundNode.getStringValue(use_verloopdatum),
foundNode.getLongValue(verloopdatum), nowSec, quarterOfAnHour);
+
+ if (true) {
hsetPagesNodes.add(paginaNumber);
hsetNodes.add(docNumber);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/rss xmlactiviteiten.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/rss
In directory james.mmbase.org:/tmp/cvs-serv26825/templates/natmm/rss
Modified Files:
xmlactiviteiten.jsp
Log Message:
NMCMS-408
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/rss
See also: http://www.mmbase.org/jira/browse/NMCMS-408
Index: xmlactiviteiten.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/rss/xmlactiviteiten.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- xmlactiviteiten.jsp 27 Feb 2008 15:00:38 - 1.6
+++ xmlactiviteiten.jsp 22 Apr 2008 11:26:41 - 1.7
@@ -21,7 +21,11 @@
lDateSearchTill = ((Long)
application.getAttribute(events_till)).longValue();
}
-String sChildConstraints =
Evenement.getEventsConstraint(lDateSearchFrom,lDateSearchTill);;
+String sChildConstraints =
Evenement.getEventsConstraint(lDateSearchFrom,lDateSearchTill);
+
+String pProvincie = request.getParameter(provincie);
+pProvincie = (pProvincie == null ? :
HtmlCleaner.filterAmps(pProvincie).trim());
+boolean isProvincieMatch = false;
%?xml version=1.0 encoding=utf-8 ?
@@ -75,14 +79,28 @@
if(omschrijving!=null) { %%=
HtmlCleaner.filterAmps(HtmlCleaner.cleanText(omschrijving,,,)).trim()
%% }
%/description
mm:listnodes type=evenement
constraints=%=sChildConstraints% jspvar=thisEvent orderby=begindatum
max=30 directions=UP
- item
+ %
+ String parent_number =
Evenement.findParentNumber(thisEvent.getStringValue(number));
+ %mm:node number=%= parent_number %
+ mm:related path=related,natuurgebieden,pos4rel,provincies
+mm:field name=provincies.naam jspvar=naam
vartype=String write=false%
+ naam = (naam==null ? :
HtmlCleaner.filterAmps(naam).trim());
+ isProvincieMatch = false;
+ if (pProvincie.toLowerCase().equals(naam.toLowerCase()))
isProvincieMatch = true;
+%/mm:field
+ /mm:related
+ /mm:node%=Provincie: | + pProvincie + |%%
+
+
+
+ if ((pProvincie == ) || (isProvincieMatch)) {
+%item
titlemm:field name=titel jspvar=naam vartype=String
write=false
%= (naam==null ? :
HtmlCleaner.filterAmps(naam).trim())
%/mm:field
/title
linkhttp://%= request.getServerName()
%/%=sPageTemplateURL%?p=%= thisPage.getStringValue(number)
%amp;e=mm:field name=number//link
- % String parent_number =
Evenement.findParentNumber(thisEvent.getStringValue(number));
- %mm:node number=%= parent_number %
+ mm:node number=%= parent_number %
description%
%mm:field name=tekst jspvar=tekst
vartype=String write=false
%= (tekst==null ? :
HtmlCleaner.filterAmps(HtmlCleaner.cleanText(tekst,,,)).trim())
@@ -176,8 +194,8 @@
einddatummm:field name=einddatum jspvar=datum
vartype=String write=falsemm:time time=%=datum% format=%=
DATA_FORMAT %//mm:field/einddatum
/activiteitdatum
/activiteitdata
- /item
-/mm:listnodes
+ /item% }
+ %/mm:listnodes
/mm:node
/channel
/mm:list
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/zoek/results natuurgebieden_nodes.jsp articles_nodes.jsp items_nodes.jsp evenement_nodes.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/zoek/results In directory james.mmbase.org:/tmp/cvs-serv743/templates/natmm/includes/zoek/results Modified Files: natuurgebieden_nodes.jsp articles_nodes.jsp items_nodes.jsp evenement_nodes.jsp Log Message: NMCMS-447 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/zoek/results See also: http://www.mmbase.org/jira/browse/NMCMS-447 Index: natuurgebieden_nodes.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/zoek/results/natuurgebieden_nodes.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- natuurgebieden_nodes.jsp22 Aug 2007 12:31:24 - 1.1 +++ natuurgebieden_nodes.jsp23 Apr 2008 09:14:28 - 1.2 @@ -20,11 +20,10 @@ templateUrl = ph.createPaginaUrl(sPageId,request.getContextPath()); templateUrl += (templateUrl.indexOf(?) ==-1 ? ? : ); - searchResults.add(span class=\colortitle\ + sRubriek + /spanbr/ - + b + sPagina + /b - + ul style=\margin:0px;margin-left:16px;\ - + lia href=\ + templateUrl + n= + sNatuurGebiedId + \ + sTitel + /a/li - + /ulbr/); + searchResults.add(ulli + + a href=\ + templateUrl + n= + sNatuurGebiedId + \ + sTitel + /abr/ + + span class=\colortitle\ + sRubriek + /span - b + sPagina + /b + + /li/ulbr/); % /mm:field /mm:related Index: articles_nodes.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/zoek/results/articles_nodes.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- articles_nodes.jsp 22 Aug 2007 12:31:24 - 1.1 +++ articles_nodes.jsp 23 Apr 2008 09:14:28 - 1.2 @@ -20,11 +20,10 @@ templateUrl = ph.createPaginaUrl(sPageId,request.getContextPath()); templateUrl += (templateUrl.indexOf(?) ==-1 ? ? : ); - searchResults.add(span class=\colortitle\ + sRubriek + /spanbr/ - + b + sPagina + /b - + ul style=\margin:0px;margin-left:16px;\ - + lia href=\ + templateUrl + id= + sArticleId + \ + sTitel + /a/li - + /ulbr/); + searchResults.add(ulli + + a href=\ + templateUrl + id= + sArticleId + \ + sTitel + /abr/ + + span class=\colortitle\ + sRubriek + /span - b + sPagina + /b + + /li/ulbr/); % /mm:field /mm:related Index: items_nodes.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/zoek/results/items_nodes.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- items_nodes.jsp 22 Aug 2007 12:31:24 - 1.1 +++ items_nodes.jsp 23 Apr 2008 09:14:28 - 1.2 @@ -20,11 +20,10 @@ templateUrl = ph.createPaginaUrl(sPageId,request.getContextPath()); templateUrl += (templateUrl.indexOf(?) ==-1 ? ? : ); - searchResults.add(span class=\colortitle\ + sRubriek + /spanbr/ -+ b + sPagina + /b -+ ul style=\margin:0px;margin-left:16px;\ -+ lia href=\ + templateUrl + u= + sItemId + \ + sTitel + /a/li -+ /ulbr/); + searchResults.add(ulli ++ a href=\ + templateUrl + u= + sItemId + \ + sTitel + /abr/ ++ span class=\colortitle\ + sRubriek + /span - b + sPagina + /b ++ /li/ulbr/); % /mm:field /mm:related Index: evenement_nodes.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/zoek/results/evenement_nodes.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- evenement_nodes.jsp 22 Aug 2007 12:31:24 - 1.1 +++ evenement_nodes.jsp 23 Apr 2008 09:14:28 - 1.2 @@ -25,11 +25,10 @@ %mm:node number=%= sEvenementId % mm:field name=titel jspvar=stitel vartype=String write=false%sTitel2 = stitel;%/mm:field % -searchResults.add(span class=\colortitle\ + sRubriek2 + /spanbr/ - + b + sPagina2 + /b - + ul style=\margin:0px;margin-left:16px;\ - + lia href=\ + templateUrl + e= + Evenement.getNextOccurence(sEvenementId) + \ + sTitel2 + /a/li - + /ulbr/); +searchResults.add(ulli +
[MMBASE CVS] contributions/natmm/templates/natmm/includes/zoek resultaten.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/zoek
In directory james.mmbase.org:/tmp/cvs-serv743/templates/natmm/includes/zoek
Modified Files:
resultaten.jsp
Log Message:
NMCMS-447
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/zoek
See also: http://www.mmbase.org/jira/browse/NMCMS-447
Index: resultaten.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/zoek/resultaten.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- resultaten.jsp 19 Sep 2007 10:11:02 - 1.19
+++ resultaten.jsp 23 Apr 2008 09:14:28 - 1.20
@@ -52,10 +52,11 @@
select name=pcontentype
style=width:100%;border:0;font-size:12px; /
%
Map contentTypes = new TreeMap();
- contentTypes.put(0,Artikelen);
- contentTypes.put(1,Producten uit de webwinkel);
- contentTypes.put(2,Activiteiten);
- contentTypes.put(3,Natuurgebieden);
+ contentTypes.put(0,Alles);
+ contentTypes.put(1,Artikelen);
+ contentTypes.put(2,Producten uit de webwinkel);
+ contentTypes.put(3,Activiteiten);
+ contentTypes.put(4,Natuurgebieden);
Iterator it1 = contentTypes.entrySet().iterator();
while(it1.hasNext()) {
@@ -100,19 +101,23 @@
int thisOffset = Integer.parseInt(offsetID);
List searchResults = new ArrayList();
+ boolean searchAllNodes = false;
+
switch (contentType) {
case 0:
- %[EMAIL PROTECTED] file=results/articles_nodes.jsp %%
- break;
+ searchAllNodes = true;
case 1:
- %[EMAIL PROTECTED] file=results/items_nodes.jsp %%
- break;
+ %[EMAIL PROTECTED] file=results/articles_nodes.jsp %%
+ if (!searchAllNodes) break;
case 2:
- %[EMAIL PROTECTED] file=results/evenement_nodes.jsp %%
- break;
+ %[EMAIL PROTECTED] file=results/items_nodes.jsp %%
+ if (!searchAllNodes) break;
case 3:
+ %[EMAIL PROTECTED] file=results/evenement_nodes.jsp %%
+ if (!searchAllNodes) break;
+case 4:
%[EMAIL PROTECTED] file=results/natuurgebieden_nodes.jsp
%%
- break;
+ if (!searchAllNodes) break;
}
int listSize = searchResults.size();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/attachments add_attachments_contentrel.xml
Update of
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/attachments
In directory
james.mmbase.org:/tmp/cvs-serv9528/templates/mmbase/edit/wizard/data/config/attachments
Modified Files:
add_attachments_contentrel.xml
Log Message:
NMCMS-421
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/attachments
See also: http://www.mmbase.org/jira/browse/NMCMS-421
Index: add_attachments_contentrel.xml
===
RCS file:
/var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/attachments/add_attachments_contentrel.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- add_attachments_contentrel.xml 4 Apr 2007 12:08:10 - 1.1
+++ add_attachments_contentrel.xml 23 Apr 2008 12:57:26 - 1.2
@@ -1,7 +1,7 @@
?xml version=1.0?
!DOCTYPE list PUBLIC -//MMBase/DTD editwizard 1.0//EN
http://www.mmbase.org/dtd/wizard-schema_1_0.dtd;
list role=contentrel destination=attachments minoccurs=0 maxoccurs=*
-orderby=expiredate ordertype=number
+orderby=[EMAIL PROTECTED]'pos'] ordertype=number
titlebijlagen/title
description/description
command name=search nodepath=attachments fields=title,filename
age=-1
@@ -24,7 +24,7 @@
/item
action type=create
relation role=contentrel destinationtype=attachments
-field name=pos-1/field
+field name=pos{sum(//[EMAIL PROTECTED]'contentrel' and
@lastitem='true' and object/@type ='attachments']/[EMAIL
PROTECTED]'pos'])+{$pos}}/field
/relation
/action
/list
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes webcam_content.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes In directory james.mmbase.org:/tmp/cvs-serv9528/templates/natmm/includes Modified Files: webcam_content.jsp Log Message: NMCMS-421 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes See also: http://www.mmbase.org/jira/browse/NMCMS-421 Index: webcam_content.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/webcam_content.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- webcam_content.jsp 11 Apr 2008 08:59:19 - 1.8 +++ webcam_content.jsp 23 Apr 2008 12:57:26 - 1.9 @@ -38,7 +38,7 @@ p br/ - mm:related path=contentrel,attachments fields=attachments.titel + mm:related path=contentrel,attachments fields=contentrel.pos,attachments.titel orderby=contentrel.pos mm:field name=attachments.number jspvar=pagina_number vartype=String write=false mm:first span class=colortitleHighlight video's/span ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/config/applications NatMM.xml
Update of /var/cvs/contributions/natmm/config/applications In directory james.mmbase.org:/tmp/cvs-serv9528/config/applications Modified Files: NatMM.xml Log Message: NMCMS-421 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/config/applications See also: http://www.mmbase.org/jira/browse/NMCMS-421 Index: NatMM.xml === RCS file: /var/cvs/contributions/natmm/config/applications/NatMM.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -b -r1.22 -r1.23 --- NatMM.xml 15 Feb 2007 08:11:42 - 1.22 +++ NatMM.xml 23 Apr 2008 12:57:26 - 1.23 @@ -213,6 +213,7 @@ relation from=pagina to=provincies type=posrel / relation from=pagina to=shorty type=rolerel / relation from=pagina to=teaser type=rolerel / +relation from=pagina to=attachments type=contentrel / relation from=panno to=contentelement type=readmore / relation from=provincies to=natuurgebieden type=posrel / relation from=questions to=answers type=posrel / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen/forms SubscribeAction.java SubscribeForm.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms
In directory james.mmbase.org:/tmp/cvs-serv20275/src/nl/leocms/evenementen/forms
Modified Files:
SubscribeAction.java SubscribeForm.java
Log Message:
NMCMS-491
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen/forms
See also: http://www.mmbase.org/jira/browse/NMCMS-491
Index: SubscribeAction.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeAction.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- SubscribeAction.java21 Nov 2007 12:48:02 - 1.25
+++ SubscribeAction.java28 Apr 2008 15:40:18 - 1.26
@@ -746,6 +746,7 @@
thisSubscription.setStringValue(source,subscribeForm.getSource());
thisSubscription.setStringValue(description,subscribeForm.getDescription());
thisSubscription.setStringValue(ticket_office,subscribeForm.getTicketOffice());
+
thisSubscription.setStringValue(ticket_office_source,subscribeForm.getTicketOfficeSource());
thisSubscription.setStringValue(betaalwijze,
subscribeForm.getPaymentType());
thisSubscription.setStringValue(bank_of_gironummer,
subscribeForm.getBankaccount());
thisSubscription.commit();
Index: SubscribeForm.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeForm.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- SubscribeForm.java 22 Dec 2006 13:17:28 - 1.16
+++ SubscribeForm.java 28 Apr 2008 15:40:18 - 1.17
@@ -100,6 +100,7 @@
private String status;
private String TicketOffice;
+ private String TicketOfficeSource;
private String userId;
private String paymentType;
private String pageNumber;
@@ -263,6 +264,9 @@
public String getTicketOffice() { return TicketOffice; }
public void setTicketOffice(String TicketOffice) { this.TicketOffice =
TicketOffice; }
+ public String getTicketOfficeSource() { return TicketOfficeSource; }
+ public void setTicketOfficeSource(String TicketOfficeSource) {
this.TicketOfficeSource = TicketOfficeSource; }
+
public String getUserId() { return userId; }
public void setUserId(String userId ) { this.userId = userId; }
@@ -359,6 +363,7 @@
this.status = ;
this.TicketOffice = backoffice;
+ this.TicketOfficeSource = ;
this.lastSentMessage = ;
this.extraText = ;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen edit_inschrijvingen.xml load_inschrijvingen.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen In directory james.mmbase.org:/tmp/cvs-serv20275/templates/mmbase/edit/wizard/data/config/inschrijvingen Modified Files: edit_inschrijvingen.xml load_inschrijvingen.xml Log Message: NMCMS-491 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen See also: http://www.mmbase.org/jira/browse/NMCMS-491 Index: edit_inschrijvingen.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen/edit_inschrijvingen.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- edit_inschrijvingen.xml 5 Mar 2006 21:44:34 - 1.1 +++ edit_inschrijvingen.xml 28 Apr 2008 15:40:18 - 1.2 @@ -10,6 +10,7 @@ field name=ingangsdatum_machtigingpromptdatum ingang machtiging/prompt/field field name=description ftype=textpromptomschrijving/prompt/field field name=source ftype=line promptbron/prompt/field + field name=ticket_office_source ftype=line promptherkomst aanmelding/prompt/field !-- list include=config/bevestigings_teksten/zoek_inschrijvingen_daterel_bevestigings_teksten.xml / -- list include=config/deelnemers/zoek_inschrijvingen_posrel_deelnemers.xml / !-- list include=config/leden/zoek_inschrijvingen_related_leden.xml / -- Index: load_inschrijvingen.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/inschrijvingen/load_inschrijvingen.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- load_inschrijvingen.xml 5 Mar 2006 21:44:34 - 1.1 +++ load_inschrijvingen.xml 28 Apr 2008 15:40:18 - 1.2 @@ -8,6 +8,7 @@ field name=ingangsdatum_machtiging/ field name=description/ field name=source/ + field name=ticket_office_source/ relation destination=answers role=posrel/ !-- relation destination=bevestigings_teksten role=daterel/ -- relation destination=deelnemers role=posrel/ ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/events subscribe.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/events In directory james.mmbase.org:/tmp/cvs-serv20275/templates/natmm/includes/events Modified Files: subscribe.jsp Log Message: NMCMS-491 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/events See also: http://www.mmbase.org/jira/browse/NMCMS-491 Index: subscribe.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/events/subscribe.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- subscribe.jsp 18 Aug 2006 17:24:13 - 1.7 +++ subscribe.jsp 28 Apr 2008 15:40:18 - 1.8 @@ -17,6 +17,7 @@ int ti = 1; % mm:import externid=p jspvar=paginaID vartype=String/ +mm:import externid=sid jspvar=subsiteID vartype=String/ % boolean isDemoLayout = sRubriekLayout.equals( + NatMMConfig.DEMO_LAYOUT); boolean isEventTemplate = true; @@ -28,6 +29,13 @@ /mm:node html:form action=%= localPath + /SubscribeAction % scope=session html:hidden property=ticketOffice value=website / + +mm:node number=%= subsiteID % + mm:field name=naam jspvar=p_naam vartype=String + html:hidden property=ticketOfficeSource value=%=p_naam% / + /mm:field +/mm:node + html:hidden property=selectedParticipant / html:hidden property=subscriptionNumber / html:hidden property=pageNumber value=%= paginaID % / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm events.jsp
Update of /var/cvs/contributions/natmm/templates/natmm
In directory james.mmbase.org:/tmp/cvs-serv20275/templates/natmm
Modified Files:
events.jsp
Log Message:
NMCMS-491
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-491
Index: events.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/events.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- events.jsp 15 Apr 2008 09:06:11 - 1.13
+++ events.jsp 28 Apr 2008 15:40:18 - 1.14
@@ -84,6 +84,7 @@
} else {
%jsp:include page=includes/events/subscribe.jsp
jsp:param name=p value=%= paginaID% /
+ jsp:param name=sid value=%= subsiteID% /
jsp:param name=rl value=%= iRubriekLayout % /
/jsp:include%
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen subscribe.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen In directory james.mmbase.org:/tmp/cvs-serv20275/templates/editors/evenementen Modified Files: subscribe.jsp Log Message: NMCMS-491 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen See also: http://www.mmbase.org/jira/browse/NMCMS-491 Index: subscribe.jsp === RCS file: /var/cvs/contributions/natmm/templates/editors/evenementen/subscribe.jsp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -b -r1.26 -r1.27 --- subscribe.jsp 1 Jun 2007 13:30:17 - 1.26 +++ subscribe.jsp 28 Apr 2008 15:40:18 - 1.27 @@ -183,6 +183,9 @@ } % html:form action=/editors/evenementen/SubscribeAction scope=session html:hidden property=ticketOffice value=backoffice / + +html:hidden property=ticketOfficeSource value=CAD / + html:hidden property=userId value=%= cloud.getUser().getIdentifier() % / html:hidden property=selectedParticipant / html:hidden property=subscriptionNumber / ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/config/applications/NatMM/builders/natmm inschrijvingen.xml
Update of /var/cvs/contributions/natmm/config/applications/NatMM/builders/natmm In directory james.mmbase.org:/tmp/cvs-serv20275/config/applications/NatMM/builders/natmm Modified Files: inschrijvingen.xml Log Message: NMCMS-491 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/config/applications/NatMM/builders/natmm See also: http://www.mmbase.org/jira/browse/NMCMS-491 Index: inschrijvingen.xml === RCS file: /var/cvs/contributions/natmm/config/applications/NatMM/builders/natmm/inschrijvingen.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- inschrijvingen.xml 27 Jun 2006 20:02:42 - 1.4 +++ inschrijvingen.xml 28 Apr 2008 15:40:18 - 1.5 @@ -198,6 +198,29 @@ field descriptions +description xml:lang=nl/description +description xml:lang=en/description + /descriptions + gui +guiname xml:lang=nlHerkomstBoeking/guiname +guiname xml:lang=enTicketOfficeSource/guiname +guitypestring/guitype + /gui + editor +positions + input12/input + list12/list + search12/search +/positions + /editor + db +name xml:lang=nlticket_office_source/name +type key=false notnull=false size=255 state=persistentSTRING/type + /db + /field + + field + descriptions description xml:lang=nlComma separated users list/description description xml:lang=enComma separated users list/description /descriptions @@ -208,9 +231,9 @@ /gui editor positions - input12/input - list12/list - search12/search + input13/input + list13/list + search13/search /positions /editor db ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen/util double_booking.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen/util
In directory
james.mmbase.org:/tmp/cvs-serv15739/templates/editors/evenementen/util
Modified Files:
double_booking.jsp
Log Message:
NMCMS-481
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen/util
See also: http://www.mmbase.org/jira/browse/NMCMS-481
Index: double_booking.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/util/double_booking.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- double_booking.jsp 5 Jun 2006 08:29:05 - 1.1
+++ double_booking.jsp 29 Apr 2008 08:46:46 - 1.2
@@ -15,25 +15,40 @@
long nowSec = (new java.util.Date()).getTime()/1000;
String lastName = ;
String lastTitle = ;
+ String lastDateTime = ;
+ String ticketOffice = ;
+ String ticketOfficeSource = ;
%
mm:list path=inschrijvingen,posrel,evenement
- constraints=%=
inschrijvingen.ticket_office='website' AND evenement.begindatum + nowSec
%
+ constraints=%= evenement.begindatum + nowSec %
orderby=inschrijvingen.number
mm:field name=evenement.begindatum jspvar=cdate
vartype=String write=false
mm:field name=evenement.titel jspvar=etitle
vartype=String write=false
mm:node element=inschrijvingen
+mm:field name=ticket_office jspvar=ticket_office
vartype=String write=false
+ %ticketOffice = ticket_office;%
+/mm:field
+mm:field name=ticket_office_source
jspvar=ticket_office_source vartype=String write=false
+ %ticketOfficeSource = ticket_office_source;%
+/mm:field
mm:field name=number jspvar=ticket_number
vartype=String write=false
mm:related path=posrel,deelnemers max=1
fields=deelnemers.titel
mm:field name=deelnemers.titel
jspvar=name vartype=String write=false
+ mm:time time=%= cdate % format=dd-MM- hh:mm
jspvar=dateTime vartype=String
+
%
- if(lastName.equals(name)
lastTitle.equals(etitle)) { // this is probably a double booking
+ if(lastName.equals(name)
lastTitle.equals(etitle) lastDateTime.equals(dateTime) ){ // this is
probably a double booking
%%= ticket_number %
- %= name %
- %= etitle %
- - mm:time time=%=
cdate % format=dd-MM- hh:mm /br/%
+ - %= dateTime %
+ - aanmelding via: %=ticketOffice %
(%=ticketOfficeSource %)br/%
+
}
lastName= name;
- lastTitle = etitle; %
+ lastTitle = etitle;
+ lastDateTime = dateTime; %
+ /mm:time
/mm:field
/mm:related
/mm:field
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists evenement_closetime.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists In directory james.mmbase.org:/tmp/cvs-serv16035/templates/mmbase/edit/wizard/data/config/option_lists Modified Files: evenement_closetime.xml Log Message: NMCMS-497 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists See also: http://www.mmbase.org/jira/browse/NMCMS-497 Index: evenement_closetime.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists/evenement_closetime.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- evenement_closetime.xml 6 Apr 2006 18:25:59 - 1.2 +++ evenement_closetime.xml 29 Apr 2008 08:56:46 - 1.3 @@ -1,9 +1,17 @@ ?xml version=1.0? !DOCTYPE optionlist PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; optionlist name=evenement_closetime + option id=0geen/option option id=22 uur voor activiteit/option + option id=66 uur voor activiteit/option option id=1212 uur voor activiteit/option + option id=1616 uur voor activiteit/option + option id=1818 uur voor activiteit/option + option id=2020 uur voor activiteit/option option id=2424 uur voor activiteit/option + option id=3030 uur voor activiteit/option + option id=3636 uur voor activiteit/option + option id=4242 uur voor activiteit/option option id=4848 uur voor activiteit/option option id=1681 week voor activiteit/option /optionlist \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen Evenement.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen
In directory james.mmbase.org:/tmp/cvs-serv20921/src/nl/leocms/evenementen
Modified Files:
Evenement.java
Log Message:
NMCMS-501
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-501
Index: Evenement.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/Evenement.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Evenement.java 24 May 2007 11:19:54 - 1.11
+++ Evenement.java 29 Apr 2008 12:07:04 - 1.12
@@ -34,7 +34,7 @@
* Evenement
*
* @author Henk Hangyi
- * @version $Revision: 1.11 $, $Date: 2007/05/24 11:19:54 $
+ * @version $Revision: 1.12 $, $Date: 2008/04/29 12:07:04 $
*
*/
@@ -239,8 +239,8 @@
String nextChild = thisParent;
String sChildConstraint =
(( evenement2.dagomschrijving LIKE '' AND evenement2.begindatum
+ now + )
- + OR ( evenement2.dagomschrijving NOT LIKE '' AND
evenement2.einddatum + now + )
- + AND ( evenement.isspare!='true') AND (
evenement.isoninternet='true' );
+ + OR ( evenement2.dagomschrijving NOT LIKE '' AND
evenement2.einddatum + now + ))
+ + AND ( evenement2.isspare!='true') AND (
evenement2.isoninternet='true' );
Cloud cloud = CloudFactory.getCloud();
NodeList cl = cloud.getList(thisParent,
evenement,partrel,evenement2,
evenement.begindatum,evenement2.number,evenement2.begindatum,
sChildConstraint,
@@ -431,6 +431,11 @@
public static boolean subscriptionClosed(Node parentEvent, Node childEvent)
{
boolean subscriptionClosed = true;
+ // the subscription is always open if the option geen sluitingstijd
has been set
+ if (parentEvent.getIntValue(reageer) == 0) {
+ return false;
+ }
+
// subscription is not used for multiple day events
DoubleDateNode ddn = new DoubleDateNode(childEvent);
Calendar cal = Calendar.getInstance();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists evenement_closetime.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists In directory james.mmbase.org:/tmp/cvs-serv20921/templates/mmbase/edit/wizard/data/config/option_lists Modified Files: evenement_closetime.xml Log Message: NMCMS-501 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists See also: http://www.mmbase.org/jira/browse/NMCMS-501 Index: evenement_closetime.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/option_lists/evenement_closetime.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- evenement_closetime.xml 29 Apr 2008 08:56:46 - 1.3 +++ evenement_closetime.xml 29 Apr 2008 12:07:04 - 1.4 @@ -1,7 +1,7 @@ ?xml version=1.0? !DOCTYPE optionlist PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; optionlist name=evenement_closetime - option id=0geen/option + option id=0geen sluitingstijd/option option id=22 uur voor activiteit/option option id=66 uur voor activiteit/option option id=1212 uur voor activiteit/option ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen/forms SubscribeForm.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms
In directory james.mmbase.org:/tmp/cvs-serv22422/src/nl/leocms/evenementen/forms
Modified Files:
SubscribeForm.java
Log Message:
NMCMS-233
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen/forms
See also: http://www.mmbase.org/jira/browse/NMCMS-233
Index: SubscribeForm.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeForm.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- SubscribeForm.java 28 Apr 2008 15:40:18 - 1.17
+++ SubscribeForm.java 29 Apr 2008 13:11:36 - 1.18
@@ -340,11 +340,8 @@
this.skipValidation = N;
Node thisEvent = CloudFactory.getCloud().getNode(this.getNode());
- if(thisEvent.getStringValue(adres_verplicht).equals(1)) {
+
this.showAddress = true;
- } else {
- this.showAddress = false;
- }
if(thisEvent.getLongValue(embargo) (new Date()).getTime()/1000) {
this.showPastDates = false;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen/forms SubscribeForm.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms In directory james.mmbase.org:/tmp/cvs-serv22646/src/nl/leocms/evenementen/forms Modified Files: SubscribeForm.java Log Message: NMCMS-493 previous commit is INCORRECT!!! -- (NMCMS-233) See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen/forms See also: http://www.mmbase.org/jira/browse/NMCMS-493 See also: http://www.mmbase.org/jira/browse/NMCMS-233 Index: SubscribeForm.java === RCS file: /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeForm.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- SubscribeForm.java 29 Apr 2008 13:11:36 - 1.18 +++ SubscribeForm.java 29 Apr 2008 13:16:07 - 1.19 @@ -93,6 +93,7 @@ private String description; private String bankaccount; + private String selectedParticipant; private String numberInCategory; private String participantsCategory; ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen Evenement.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen
In directory james.mmbase.org:/tmp/cvs-serv22862/src/nl/leocms/evenementen
Modified Files:
Evenement.java
Log Message:
NMCMS-498 fix has already been committed with a previous issue (NMCMS-501)
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-498
See also: http://www.mmbase.org/jira/browse/NMCMS-501
Index: Evenement.java
===
RCS file:
/var/cvs/contributions/natmm/src/nl/leocms/evenementen/Evenement.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Evenement.java 29 Apr 2008 12:07:04 - 1.12
+++ Evenement.java 29 Apr 2008 13:22:46 - 1.13
@@ -34,7 +34,7 @@
* Evenement
*
* @author Henk Hangyi
- * @version $Revision: 1.12 $, $Date: 2008/04/29 12:07:04 $
+ * @version $Revision: 1.13 $, $Date: 2008/04/29 13:22:46 $
*
*/
@@ -251,6 +251,7 @@
if ( (parentBegin = now) || (nextChildBegin parentBegin)) {
nextChild = cl.getNode(0).getStringValue(evenement2.number);
}
+
}
return nextChild;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/leocms/evenementen/forms SubscribeAction.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms In directory james.mmbase.org:/tmp/cvs-serv24563/src/nl/leocms/evenementen/forms Modified Files: SubscribeAction.java Log Message: NMCMS-496 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/evenementen/forms See also: http://www.mmbase.org/jira/browse/NMCMS-496 Index: SubscribeAction.java === RCS file: /var/cvs/contributions/natmm/src/nl/leocms/evenementen/forms/SubscribeAction.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -b -r1.26 -r1.27 --- SubscribeAction.java28 Apr 2008 15:40:18 - 1.26 +++ SubscribeAction.java5 May 2008 09:33:56 - 1.27 @@ -496,6 +496,9 @@ emailMsg.append(\nBetreft: \n); emailMsg.append(Aanmelding + thisEvent.getStringValue(titel) + , + (new DoubleDateNode(thisEvent)).getReadableValue() + \n); + emailMsg.append(\nActiviteitnummer: + thisEvent.getStringValue(number) + \n); + emailMsg.append(Aanmeldingsnummer: + thisSubscription.getStringValue(number) + \n); + emailMsg.append(\nAanmelder: \n); emailMsg.append(thisParticipantName + \n); emailMsg.append(thisParticipant.getStringValue(email) + \n); ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenement.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv25337/templates/editors/evenementen
Modified Files:
evenement.jsp
Log Message:
NMCMS-499
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-499
Index: evenement.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenement.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- evenement.jsp 5 May 2006 11:27:51 - 1.6
+++ evenement.jsp 5 May 2008 10:18:35 - 1.7
@@ -128,6 +128,17 @@
cancelClick=true;
return conf;
}
+
+function selectAllDates(field) {
+for (i = 0; i field.length; i++) {
+ if (field[i].checked) {
+ field[i].checked = false;
+ } else {
+ field[i].checked = true;
+ }
+}
+}
+
/script
/head
%
@@ -270,6 +281,7 @@
/mm:present
/div
span class=notvalidhtml:errors bundle=LEOCMS property=lijst
//spanbr
+ input type=button value=Alles (de)selecteren style=%= buttonStyle
% onclick=selectAllDates(document.forms[0].selectedDates);/
html:submit property=action value=Activeer selectie style=%=
buttonStyle %/
html:submit property=action value=Annuleer selectie style=%=
buttonStyle %/
mm:present referid=multidayfound
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/config/applications/NatMM/builders/leocms persoon.xml
Update of /var/cvs/contributions/natmm/config/applications/NatMM/builders/leocms In directory james.mmbase.org:/tmp/cvs-serv27993/config/applications/NatMM/builders/leocms Modified Files: persoon.xml Log Message: NMCMS-495 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/config/applications/NatMM/builders/leocms See also: http://www.mmbase.org/jira/browse/NMCMS-495 Index: persoon.xml === RCS file: /var/cvs/contributions/natmm/config/applications/NatMM/builders/leocms/persoon.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- persoon.xml 6 Sep 2006 20:55:23 - 1.3 +++ persoon.xml 5 May 2008 12:07:33 - 1.4 @@ -258,7 +258,7 @@ /editor db name xml:lang=nlemail/name -type key=false notnull=false size=64 state=persistentSTRING/type +type key=false notnull=true size=64 state=persistentSTRING/type /db /field field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers zoek_evenement_readmore_medewerkers_bu.xml zoek_evenement_readmore_medewerkers.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers In directory james.mmbase.org:/tmp/cvs-serv27993/templates/mmbase/edit/wizard/data/config/medewerkers Modified Files: zoek_evenement_readmore_medewerkers_bu.xml zoek_evenement_readmore_medewerkers.xml Log Message: NMCMS-495 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers See also: http://www.mmbase.org/jira/browse/NMCMS-495 Index: zoek_evenement_readmore_medewerkers_bu.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers/zoek_evenement_readmore_medewerkers_bu.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- zoek_evenement_readmore_medewerkers_bu.xml 5 Mar 2006 21:44:35 - 1.1 +++ zoek_evenement_readmore_medewerkers_bu.xml 5 May 2008 12:07:33 - 1.2 @@ -1,6 +1,6 @@ ?xml version=1.0? !DOCTYPE list PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; -list role=readmore destination=medewerkers minoccurs=0 maxoccurs=* +list role=readmore destination=medewerkers minoccurs=1 maxoccurs=* titlemedewerkers/title item field ftype=data name=titelpromptnaam/prompt/field Index: zoek_evenement_readmore_medewerkers.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers/zoek_evenement_readmore_medewerkers.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- zoek_evenement_readmore_medewerkers.xml 5 Mar 2006 21:44:35 - 1.1 +++ zoek_evenement_readmore_medewerkers.xml 5 May 2008 12:07:33 - 1.2 @@ -1,6 +1,6 @@ ?xml version=1.0? !DOCTYPE list PUBLIC -//MMBase/DTD editwizard 1.0//EN http://www.mmbase.org/dtd/wizard-schema_1_0.dtd; -list role=readmore destination=medewerkers minoccurs=0 maxoccurs=* +list role=readmore destination=medewerkers minoccurs=1 maxoccurs=* titlemedewerkers/title item field ftype=data name=titelpromptnaam/prompt/field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv26088/templates/editors/evenementen
Modified Files:
evenementen.jsp
Log Message:
NMCMS-494
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-494
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- evenementen.jsp 24 May 2007 09:53:26 - 1.15
+++ evenementen.jsp 6 May 2008 08:52:55 - 1.16
@@ -13,6 +13,11 @@
String soortIdFC = activiteiten;
String titelIdFC = ;
String natuurgebiedenIdFC = ;
+
+String aanmelderNaamIdFC = ;
+String aanmelderPostcodeIdFC = ;
+String aanmelderNummerIdFC = ;
+
String beginDyIdFC = + cal.get(Calendar.DAY_OF_MONTH);
String beginMnthIdFC = + (cal.get(Calendar.MONTH)+1);
String beginYrIdFC = + cal.get(Calendar.YEAR);
@@ -39,6 +44,11 @@
if(thisName.equals(soortIdFC)) { soortIdFC = thisValue; }
if(thisName.equals(titelIdFC)) { titelIdFC = thisValue; }
if(thisName.equals(natuurgebiedenIdFC)) { natuurgebiedenIdFC =
thisValue; }
+
+ if(thisName.equals(aanmelderNaamIdFC)) { aanmelderNaamIdFC =
thisValue; }
+ if(thisName.equals(aanmelderPostcodeIdFC)) { aanmelderPostcodeIdFC
= thisValue; }
+ if(thisName.equals(aanmelderNummerIdFC)) { aanmelderNummerIdFC =
thisValue; }
+
if(thisName.equals(beginDyIdFC)) { beginDyIdFC = thisValue; }
if(thisName.equals(beginMnthIdFC)) { beginMnthIdFC = thisValue;
}
if(thisName.equals(beginYrIdFC)) { beginYrIdFC = thisValue; }
@@ -62,6 +72,11 @@
mm:import externid=soort jspvar=soortId id=soortId%= soortIdFC
%/mm:import% if(soortId==null) { soortId = ; } %
mm:import externid=titel jspvar=titelId id=titelId /%
if(titelId==null) { titelId = titelIdFC; } %
mm:import externid=natuurgebieden jspvar=natuurgebiedenId
id=natuurgebiedenId /% if(natuurgebiedenId==null) { natuurgebiedenId =
natuurgebiedenIdFC; } %
+
+mm:import externid=aanmelder_naam jspvar=aanmelderNaamId
id=aanmelderNaamId /% if(aanmelderNaamId==null) { aanmelderNaamId =
aanmelderNaamIdFC; } %
+mm:import externid=aanmelder_postcode jspvar=aanmelderPostcodeId
id=aanmelderPostcodeId /% if(aanmelderPostcodeId==null) {
aanmelderPostcodeId = aanmelderPostcodeIdFC; } %
+mm:import externid=aanmelder_nummer jspvar=aanmelderNummerId
id=aanmelderNummerId /% if(aanmelderNummerId==null) { aanmelderNummerId =
aanmelderNummerIdFC; } %
+
mm:import externid=beginDy jspvar=beginDyId id=beginDyId /%
if(beginDyId==null||beginDyId.equals()) { beginDyId = beginDyIdFC; } %
mm:import externid=beginMnth jspvar=beginMnthId id=beginMnthId /%
if(beginMnthId==null||beginMnthId.equals()) { beginMnthId = beginMnthIdFC; }
%
mm:import externid=beginYr jspvar=beginYrId id=beginYrId /%
if(beginYrId==null||beginYrId.equals()) { beginYrId = beginYrIdFC; } %
@@ -81,6 +96,11 @@
soortId = activiteiten;
titelId = ;
natuurgebiedenId = ;
+
+ aanmelderNaamId = ;
+ aanmelderPostcodeId = ;
+ aanmelderNummerId = ;
+
beginDyId = + cal.get(Calendar.DAY_OF_MONTH);
beginMnthId = + (cal.get(Calendar.MONTH)+1);
beginYrId = + cal.get(Calendar.YEAR);
@@ -102,6 +122,11 @@
soort: %= soortId %br/
titel: %= titelId %br/
natuurgebieden:%= natuurgebiedenId %br/
+
+aanmelder_naam: %= aanmelderNaamId %br/
+aanmelder_postcode: %= aanmelderPostcodeId %br/
+aanmelder_nummer: %= aanmelderNummerId %br/
+
beginDy: %= beginDyId %br/
beginMnth: %= beginMnthId %br/
beginYr: %= beginYrId %br/
@@ -122,6 +147,11 @@
thisCookie = new Cookie(soortIdFC, soortId ); thisCookie.setMaxAge(maxAge);
response.addCookie(thisCookie);
thisCookie = new Cookie(titelIdFC, titelId ); thisCookie.setMaxAge(maxAge);
response.addCookie(thisCookie);
thisCookie = new Cookie(natuurgebiedenIdFC,natuurgebiedenId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+
+thisCookie = new Cookie(aanmelderNaamIdFC, aanmelderNaamId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+thisCookie = new Cookie(aanmelderPostcodeIdFC, aanmelderPostcodeId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+thisCookie = new Cookie(aanmelderNummerIdFC, aanmelderNummerId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
+
thisCookie = new Cookie(beginDyIdFC, beginDyId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
thisCookie = new Cookie(beginMnthIdFC, beginMnthId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
thisCookie = new Cookie(beginYrIdFC, beginYrId );
thisCookie.setMaxAge(maxAge); response.addCookie(thisCookie);
@@ -314,6 +344,25 @@
/mm:listcontainer%
}
+ // the
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenement.jsp evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv3802/templates/editors/evenementen
Modified Files:
evenement.jsp evenementen.jsp
Log Message:
NMCMS-478
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-478
Index: evenement.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenement.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- evenement.jsp 5 May 2008 10:18:35 - 1.7
+++ evenement.jsp 6 May 2008 14:40:50 - 1.8
@@ -119,13 +119,16 @@
}
return false;
}
+
var cancelClick = false;
-function doDelete(prompt) {
+function doDelete(thisObject,prompt) {
var conf;
if (prompt prompt!=) {
conf = confirm(prompt);
} else conf=true;
cancelClick=true;
+
+if (conf) showMessage(thisObject,'Verwijder selectie');
return conf;
}
@@ -139,6 +142,20 @@
}
}
+ var clickedButton = '';
+ function showMessage(obj,fAction){
+ string = 'theTarget = document.getElementById(message);';
+ eval(string);
+ if(theTarget != null){
+theTarget.innerHTML = 'Een moment geduld a.u.b.';
+ }
+ clickedButton=obj;
+ clickedButton.disabled=true;
+
+ document.getElementById(formAction).value= fAction;
+ document.forms[0].submit();
+ }
+
/script
/head
%
@@ -154,9 +171,12 @@
// the focus=name works together with the onkeypress for the name field, to
make sure the form is only posted once on [ENTER]-key
%
html:form action=/editors/evenementen/EvenementAction scope=session
focus=name
+
html:hidden property=userId value=%= cloud.getUser().getIdentifier() %
/
html:hidden property=node /
html:hidden property=selectedEvent /
+input type=hidden id=formAction name=action value= /
+
body style=overflow:auto; onload=javascript:setSelected(bean:write
name=EvenementForm property=selectedEvent /);javascript:resizeBlocks();
onResize=javascript:resizeBlocks();
logic:equal name=EvenementForm property=node value=
h1Nieuwe activiteit/h1
@@ -167,6 +187,12 @@
h1Activiteit wijzigen/h1
/logic:notEqual
table class=formcontent
+tr
+ td colspan=2 class=fieldname style=color:red;font-weight:bold;
id=message/td
+/tr
+tr
+ td colspan=2nbsp;/td
+/tr
trtd class=fieldname style=width:90px;Naam/td
tdhtml:text property=name style=width:349px; tabindex=1
onkeypress=return event.keyCode!=13 /
span class=notvalidbrhtml:errors bundle=LEOCMS
property=naam //span/td/tr
@@ -199,9 +225,9 @@
-html:text property=endYear maxlength=4 style=%= dateStyle %
tabindex=11/
a href=javascript:popUpCalendar('end') img
src='../../calendar/show-calendar-on-button.gif' width='24' height='24'
align='absmiddle' border='0' alt='Selecteer einddatum'/a
span class=notvalidhtml:errors bundle=LEOCMS
property=eindtijd//spanbr
- html:submit property=action value=Voeg toe style=%=
buttonStyle %/nbsp;
-html:submit property=action value=Wijzig style=%= buttonStyle
%/nbsp;
-html:submit property=action value=Wis style=%= buttonStyle
%/nbsp;
+ input type=button name=action value=Voeg toe
style=%= buttonStyle % onclick=javascript:showMessage(this,'Voeg
toe');/nbsp;
+input type=button name=action value=Wijzig style=%=
buttonStyle % onclick=javascript:showMessage(this,'Wijzig');/nbsp;
+input type=button name=action value=Wis style=%= buttonStyle
% onclick=javascript:showMessage(this,'Wis');/nbsp;
/td/tr
trtd class=fieldname style=width:90px;height:20px
% boolean bShowPastDates = false;
@@ -282,13 +308,13 @@
/div
span class=notvalidhtml:errors bundle=LEOCMS property=lijst
//spanbr
input type=button value=Alles (de)selecteren style=%= buttonStyle
% onclick=selectAllDates(document.forms[0].selectedDates);/
- html:submit property=action value=Activeer selectie style=%=
buttonStyle %/
- html:submit property=action value=Annuleer selectie style=%=
buttonStyle %/
+ input type=button name=action value=Activeer selectie style=%=
buttonStyle % onclick=javascript:showMessage(this,'Activeer selectie');/
+ input type=button name=action value=Annuleer selectie style=%=
buttonStyle % onclick=javascript:showMessage(this,'Annuleer selectie');/
mm:present referid=multidayfound
- html:submit property=action value=Periode - data style=%=
buttonStyle %/
+ input type=button name=action value=Periode - data style=%=
[MMBASE CVS] contributions/natmm/templates/editors/beheerbibliotheek searchresults.jsp
Update of /var/cvs/contributions/natmm/templates/editors/beheerbibliotheek
In directory
james.mmbase.org:/tmp/cvs-serv1065/templates/editors/beheerbibliotheek
Modified Files:
searchresults.jsp
Log Message:
NMCMS-504
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/beheerbibliotheek
See also: http://www.mmbase.org/jira/browse/NMCMS-504
Index: searchresults.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/beheerbibliotheek/searchresults.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- searchresults.jsp 12 Oct 2006 16:10:19 - 1.16
+++ searchresults.jsp 7 May 2008 09:57:48 - 1.17
@@ -208,7 +208,15 @@
%
mm:import id=pagesStringPagina's b %= pagesLinkString %
/b/mm:import
mm:list referid=contentresults
- % counter++; %
+ %
+ String thisType = ;
+ counter++;
+ %
+
+ mm:field name=contentelement.otype jspvar=otype vartype=String
+ % thisType = (String) contentHelper.getNameWithOtype(otype); %
+ /mm:field
+
mm:first
pbEr zijn mm:size/ content elementen gevonden/b/p
table border=0 cellpadding=0 cellspacing=0 width=876
height=73
@@ -221,11 +229,19 @@
/td
/tr
/table
- table border=0 cellpadding=0 cellspacing=0 width=876
height=73
+ table border=0 cellpadding=0 cellspacing=0 width=976
height=73
tr
th style=width:60;height:13;/th
th
style=width:60;height:13;vertical-align:bottom;text-align:left;a class=th
href=# onclick='javascript:changeOrder(contentelement.otype)'Type/a%
if(contentelement.otype.equals(orderColumn)) { %img border=0
src=../img/down.gif % } % /th
th
style=width:250;height:13;vertical-align:bottom;text-align:left;a
class=th href=#
onclick='javascript:changeOrder(contentelement.titel)'Titel/a%
if(contentelement.titel.equals(orderColumn)) { %img border=0
src=../img/down.gif % } % /th
+
+%
+if (thisType.equals(medewerkers)) {%
+th
style=width:100;height:13;vertical-align:bottom;text-align:left;
+Afbeelding?
+/th
+ % } %
+
th
style=width:200;height:13;vertical-align:bottom;text-align:left;a
class=th href=#
onclick='javascript:changeOrder(rubriek.naam)'Rubriek/a%
if(rubriek.naam.equals(orderColumn)) { %img border=0
src=../img/down.gif % } % /th
th
style=width:90;height:13;vertical-align:bottom;text-align:left;a class=th
href=#
onclick='javascript:changeOrder(contentelement.creatiedatum)'Creatie/a%
if(contentelement.creatiedatum.equals(orderColumn)) { %img border=0
src=../img/down.gif % } % /th
th
style=width:90;height:13;vertical-align:bottom;text-align:left;a class=th
href=#
onclick='javascript:changeOrder(contentelement.datumlaatstewijziging)'Geupdate/a%
if(contentelement.datumlaatstewijziging.equals(orderColumn)) { %img
border=0 src=../img/down.gif % } % /th
@@ -233,9 +249,10 @@
th
style=width:50;height:13;vertical-align:bottom;text-align:left;Versie/th
/tr
/mm:first
+
%
if( (counter (curPage-1)*AMOUNT_OF_RESULTS ) (counter
curPage*AMOUNT_OF_RESULTS+1) ) {
- String thisType = ;
+
String usedIn = ;
%mm:field name=contentelement.number
jspvar=contentelement_number vartype=String write=false
% NodeList nl =
contentHelper.usedInItems(contentelement_number);
@@ -247,9 +264,7 @@
// todo: not used content
elements can not be opened in the editwizard
usedIn = (usedIn.equals() ?
style=\color:red;\ title=\Dit object is niet in gebruik.\ :
title=\Gebruikt in: + usedIn + \ );%
/mm:field
- mm:field name=contentelement.otype
jspvar=otype vartype=String
- % thisType = (String) contentHelper.getNameWithOtype(otype); %
-/mm:field
+
tr height=11
td valign=top
%
@@ -298,6 +313,29 @@
}
} %
/td
+
+ %
+ if (thisType.equals(medewerkers)) {%
+td
+% boolean hasPicture = false; %
+
+mm:field name=contentelement.number jspvar=contentNumber
write=false vartype=String
+ mm:listcontainer nodes=%= contentNumber %
path=medewerkers,posrel,images
+ mm:list max=1
+ % hasPicture = true; %
+ /mm:list
+ /mm:listcontainer
+/mm:field
+
+% if (hasPicture) { %
+ ja
+% } else { %
+ nee
+% } %
+
+
[MMBASE CVS] contributions/natmm/templates/nmintra/includes/peoplefinder table.jsp
Update of /var/cvs/contributions/natmm/templates/nmintra/includes/peoplefinder In directory james.mmbase.org:/tmp/cvs-serv7558/templates/nmintra/includes/peoplefinder Modified Files: table.jsp Log Message: NMCMS-502 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes/peoplefinder See also: http://www.mmbase.org/jira/browse/NMCMS-502 Index: table.jsp === RCS file: /var/cvs/contributions/natmm/templates/nmintra/includes/peoplefinder/table.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- table.jsp 5 Mar 2007 22:25:56 - 1.12 +++ table.jsp 7 May 2008 14:03:40 - 1.13 @@ -20,7 +20,9 @@ td rowspan=2 valign=top style=padding-left:5px; mm:node number=%= employeeId % table border=0 cellpadding=0 cellspacing=0 -trtd colspan=2 style=padding-bottom:3px;mm:field name=gendermm:compare value=0mw. /mm:compare/mm:field +trtd colspan=2 style=padding-bottom:3px; +mm:field name=prefixmm:isnotemptymm:write/nbsp;/mm:isnotempty/mm:field +mm:field name=gendermm:compare value=0mw. /mm:compare/mm:field mm:field name=firstname jspvar=firstname vartype=String write=true mm:field name=initials jspvar=initials vartype=String write=false mm:isnotempty ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/nmintra thumbs.jsp
Update of /var/cvs/contributions/natmm/templates/nmintra
In directory james.mmbase.org:/tmp/cvs-serv14199/templates/nmintra
Modified Files:
thumbs.jsp
Log Message:
NMCMS-503
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra
See also: http://www.mmbase.org/jira/browse/NMCMS-503
Index: thumbs.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/nmintra/thumbs.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- thumbs.jsp 8 Nov 2006 10:54:14 - 1.13
+++ thumbs.jsp 8 May 2008 13:44:53 - 1.14
@@ -28,7 +28,9 @@
/tr
/table%
-if(departmentId.equals(default)programId.equals(default)) { // ***
select a random department ***
+String otherGroupsId = request.getParameter(othergroups);
if(otherGroupsId==null){ otherGroupsId=default; }
+
+if(departmentId.equals(default)programId.equals(default)otherGroupsId.equals(default))
{ // *** select a random department ***
Vector departments = new Vector();
%mm:list path=afdelingen constraints=afdelingen.importstatus!='-1'
AND afdelingen.importstatus!='inactive'
mm:field name=afdelingen.number jspvar=departments_number
vartype=String write=false%
@@ -67,14 +69,33 @@
/mm:list%
// = employeeConstraint
%%
+
boolean employeeFound = false;
int numberInRow = 0;
int maxInRow = 3;
-if(!departmentNodes.equals(default)) {
+
+if(departmentNodes.equals(default)) {
+ departmentNodes = ;
+}
%mm:list nodes=%= departmentNodes % path=%= employeePath %
orderby=medewerkers.firstname,medewerkers.lastname directions=UP,UP
constraints=%= employeeConstraint %
fields=medewerkers.number distinct=true
- mm:field name=medewerkers.number jspvar=employees_number
vartype=String write=false%
+ mm:field name=medewerkers.number jspvar=employees_number
vartype=String write=false
+
+ %
+ boolean matchProgram = true;
+ if (!otherGroupsId.equals(default)) {
+ matchProgram = false;
+ %mm:listcontainer nodes=%= employees_number %
path=medewerkers,readmore,programs
+mm:constraint field=programs.number operator== value=%=
otherGroupsId % /
+mm:list max=1%
+ matchProgram = true;
+%/mm:list
+ /mm:listcontainer
+ %
+ }
+
+ if (matchProgram) {
if(!employeeFound) {
employeeFound = true;
%table cellpadding=0 cellspacing=0 align=centertr%
@@ -94,9 +115,11 @@
%/trtr%
numberInRow=0;
}
- %/mm:field
+ }
+ %
+
+ /mm:field
/mm:list%
-}
if(employeeFound) {
while(numberInRowmaxInRow) {
@@ -113,7 +136,10 @@
}
if(!programId.equals(default)) {
%mm:node number=%= programId %li%if(!isFirst) { % en%
}% de lokatie mm:field name=naam //li/mm:node%
-} %./ul/span
+}
+if(!otherGroupsId.equals(default)) {
+ %mm:node number=%= otherGroupsId %li%if(!isFirst) { %
en% }% de groep mm:field name=title //li/mm:node%
+} %/ul/span
pEr zijn geen medewerkers gevonden die voldoen aan je selectie./p
/div%
}
@@ -153,7 +179,24 @@
/mm:field
/mm:field
/mm:list
-/select/td/tr
+/selectnbsp;brdiv align=rightspan
class=lighten/span/div/td/tr
+trtd
+
+select name=othergroups style=width:195px;
+ option value=default % if(otherGroupsId.equals(default)) {
%SELECTED% }%alle overige groepen
+ mm:list path=programs orderby=programs.title directions=UP
+mm:field name=programs.number jspvar=programs_number
vartype=String write=false
+mm:field name=programs.title jspvar=programs_title
vartype=String write=false
+ mm:list nodes=%= programs_number %
path=programs,readmore,medewerkers max=1
+ option value=%= programs_number % %
if(programs_number.equals(otherGroupsId)) { %SELECTED% }
+ %%= programs_title
+ %/mm:list
+/mm:field
+/mm:field
+ /mm:list
+ /select
+
+/td/tr
trtdimg src=media/spacer.gif width=1 height=20/td/tr
trtd
table border=0 cellspacing=0 cellpadding=0 style=width:100%;
@@ -175,7 +218,7 @@
if(el!='clear') {
var department =
escape(document.smoelenboek.elements[department].value);
var program = escape(document.smoelenboek.elements[program].value);
- href += department= + department + program= + program;
+ href += department= + department + program= + program +
othergroups= + othergroups;
}
document.location = href;
return false;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/nmintra/includes/shoppingcart result.jsp response.jsp
Update of /var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart
In directory
james.mmbase.org:/tmp/cvs-serv16647/templates/nmintra/includes/shoppingcart
Modified Files:
result.jsp response.jsp
Log Message:
NMCMS-310
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes/shoppingcart
See also: http://www.mmbase.org/jira/browse/NMCMS-310
Index: result.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart/result.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- result.jsp 26 Sep 2006 21:06:37 - 1.4
+++ result.jsp 13 May 2008 10:11:28 - 1.5
@@ -40,9 +40,10 @@
String warningLink = Terug naar het formulier;
boolean isValidAnswer = true;
- String clientEmail = ;// *** see
shoppingcartresponse.jsp
+ StringBuffer clientEmail = new StringBuffer(); // *** see
shoppingcartresponse.jsp
String clientDept = ; // *** see
shoppingcartresponse.jsp
TreeMap responses = new TreeMap(); // *** treemap with response
text for every shop item ordered ***
+ TreeMap shopItemPrices = new TreeMap(); // *** treemap with price for
every shop item ordered ***
TreeMap emails = new TreeMap(); // *** treemap with email address
for every shop item ordered ***
TreeMap product_groups = new TreeMap(); // *** treemap with product
group for every shop item ordered ***
// *** example:
@@ -140,17 +141,19 @@
if(shopItems.hasNext()) {
String responseText = ;
+ int totalPrice = 0;
while(shopItems.hasNext()) {
- responseText += responses.get(shopItems.next());
+ String currentShopItem = (String)shopItems.next();
+ responseText += responses.get(currentShopItem);
+ totalPrice = totalPrice +
((Integer)shopItemPrices.get(currentShopItem)).intValue();
}
-
%mm:node referid=productorder_email
mm:setfield name=subject%= emailSubject + orderId
%/mm:setfield
mm:setfield name=body
multipart id=plaintext type=text/plain
encoding=UTF-8
/multipart
multipart id=htmltext alt=plaintext type=text/html
encoding=UTF-8
- %= html + responseText + /html %
+ %= html + responseText + br/bTotaal prijs:
euro; + nf.format(((double) totalPrice )/100) + /b\n/html %
/multipart
/mm:setfield
mm:setfield name=to%= (debug ? debugEmail : thisEmail
) %/mm:setfield
@@ -168,12 +171,12 @@
/multipart
multipart id=htmltext alt=plaintext type=text/html
encoding=UTF-8
%= htmlUw onderstaande bestelling heeft als
ordernummer + orderId + en is verstuurd naar + thisEmail + brbr
- + responseText + /html %
+ + responseText + br/bTotaal prijs:
euro; + nf.format(((double) totalPrice )/100) + /b\n/html %
/multipart
/mm:setfield
/mm:node%
- String cEmails = clientEmail + ;;
+ String cEmails = clientEmail.toString() + ;;
int semicolon = cEmails.indexOf(;);
while(semicolon-1) {
String emailAddress =
cEmails.substring(0,semicolon).trim();
Index: response.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart/response.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- response.jsp21 Nov 2007 13:15:06 - 1.4
+++ response.jsp13 May 2008 10:11:28 - 1.5
@@ -25,6 +25,7 @@
}
%%
String responseText = ;
+Integer shopItemPrice = null;
String thisForm = null;
%mm:node number=%= thisShop_item %
mm:relatednodes type=pagina max=1 jspvar=thisPage
@@ -61,10 +62,17 @@
%/mm:notpresent
/mm:isempty
/mm:field
- mm:field name=titel jspvar=dummy vartype=String write=false%
- responseText += b + numberOfItems + x + dummy + /bbr\n;
- %/mm:field
- mm:related path=posrel,formulier orderby=formulier.pos
directions=UP searchdir=destination
+
+ mm:field name=price1 jspvar=price vartype=Integer write=false
+ % shopItemPrice = price;%
+ /mm:field
+
+ mm:field name=titel jspvar=dummy vartype=String write=false%
+ responseText += b + numberOfItems + x + dummy + á euro;
+ nf.format(((double)
[MMBASE CVS] contributions/natmm/src/nl/leocms/forms MembershipForm.java
Update of /var/cvs/contributions/natmm/src/nl/leocms/forms
In directory james.mmbase.org:/tmp/cvs-serv28147/src/nl/leocms/forms
Modified Files:
MembershipForm.java
Log Message:
NMCMS-38
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/leocms/forms
See also: http://www.mmbase.org/jira/browse/NMCMS-38
Index: MembershipForm.java
===
RCS file: /var/cvs/contributions/natmm/src/nl/leocms/forms/MembershipForm.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- MembershipForm.java 21 Nov 2007 12:46:08 - 1.16
+++ MembershipForm.java 15 May 2008 12:46:36 - 1.17
@@ -439,15 +439,21 @@
} else if(this.getHousenumber().length()6){
errors.add(warning,new
ActionError(membershipform.toolong.housenumber));
} else {
+
+int iHouseNumber = 0;
+try {
+ iHouseNumber = Integer.parseInt(this.getHousenumber());
+} catch(Exception e) {
+ errors.add(warning,new
ActionError(membershipform.housenumber.nan));
+}
try {
- int iHouseNumber = Integer.parseInt(this.getHousenumber());
if(!this.getAction().equals(skipValidationAction)
assertZipCodeMap()
!CSVReader.isInRange(zipCodeMap, zipcode, iHouseNumber)) {
errors.add(warning,new
ActionError(membershipform.housenumber.notinrange));
}
} catch(Exception e) {
- errors.add(warning,new
ActionError(membershipform.housenumber.nan));
+ errors.add(warning,new
ActionError(membershipform.housenumber.notinrange));
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/shoppingcart result.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/shoppingcart
In directory
james.mmbase.org:/tmp/cvs-serv28978/templates/natmm/includes/shoppingcart
Modified Files:
result.jsp
Log Message:
NMCMS-306
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/shoppingcart
See also: http://www.mmbase.org/jira/browse/NMCMS-306
Index: result.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/shoppingcart/result.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- result.jsp 2 May 2008 12:05:17 - 1.9
+++ result.jsp 15 May 2008 13:22:25 - 1.10
@@ -48,13 +48,15 @@
} else if(i==5
!com.cfdev.mail.verify.EmailVerifier.validateEmailAddressSyntax(answerValue)) {
isValidAnswer = false;
warningText += li + answerValue + is geen geldig emailadres/li;
- } else if(i==2 !memberId.equals()) {
- memberIDMessage =
SubscribeForm.getMemberIdMessage(memberId,answerValue.toUpperCase().replaceAll(
,));
+
+ } else if(i==2 ) {
+ memberIDMessage =
SubscribeForm.getZipCodeMessage(answerValue.toUpperCase().replaceAll( ,));
if(!.equals(memberIDMessage)) {
isValidAnswer = false;
warningText +=
ResourceBundle.getBundle(ApplicationResources).getString(memberIDMessage) +
/li;
}
}
+
responseText += answerValue;
responseTextToCustomer += answerValue;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/includes header.jsp
Update of /var/cvs/contributions/natmm/templates/natnh/includes In directory james.mmbase.org:/tmp/cvs-serv18574/templates/natnh/includes Modified Files: header.jsp Log Message: NMCMS-506 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/includes See also: http://www.mmbase.org/jira/browse/NMCMS-506 Index: header.jsp === RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/header.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- header.jsp 21 Apr 2008 11:45:42 - 1.7 +++ header.jsp 20 May 2008 08:16:21 - 1.8 @@ -13,7 +13,6 @@ meta name=author content=MMatch - MMBase consultancy and implementation / www.mmatch.nl meta http-equiv=imagetoolbar content=no script language=JavaScript src=scripts/launchcenter.js/script -!-- script type=text/javascript language=javaScript src=scripts/skyscraper_cookie.js/script-- /head body background=media/bg_top.gif @@ -23,24 +22,6 @@ td style=width:744px; div id=bigdiv style=position:relative; - - !-- - div id=skyscraper style=visibility: hidden; position:absolute; left:-1000px; top:-600px; width:2000; height:2000; color:#00; z-index:101; -div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; - img src=flash/cross.gif onclick=closeSkyscraper();/ -/div -object classid=clsid:d27cdb6e-ae6d-11cf-96b8-44455354 codebase=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 - param name=allowScriptAccess value=sameDomain / - param name=movie value=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; / - param name=menu value=false / - param name=quality value=high / - param name=scale value=noscale / - param name=wmode value=transparent / - param name=bgcolor value=#ff / - embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / -/object - /div - -- /td /tr /table ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes top4_head.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes In directory james.mmbase.org:/tmp/cvs-serv18574/templates/natmm/includes Modified Files: top4_head.jsp Log Message: NMCMS-506 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes See also: http://www.mmbase.org/jira/browse/NMCMS-506 Index: top4_head.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/top4_head.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -b -r1.13 -r1.14 --- top4_head.jsp 21 Apr 2008 11:45:42 - 1.13 +++ top4_head.jsp 20 May 2008 08:16:21 - 1.14 @@ -3,7 +3,6 @@ %-- link rel=alternate stylesheet type=text/css href=hoofdsite/themas/fontsize1.2.css title=groot / --% %-- link rel=alternate stylesheet type=text/css href=hoofdsite/themas/fontsize1.4.css title=groter / --% script type=text/javascript language=javaScript src=%= (isSubDir? ../ : ) %scripts/launchcenter.js/script - !-- script type=text/javascript language=javaScript src=%= (isSubDir? ../ : ) %scripts/skyscraper_cookie.js/script-- link rel=stylesheet type=text/css href=%= (isSubDir? ../ : ) %%= styleSheet % / titlemm:node number=rootmm:field name=naam//mm:node: mm:node number=%= rubriekID %mm:field name=naam id=rubriek_naam //mm:node mm:node number=%= paginaID % ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/mmatch CSVReader.java
Update of /var/cvs/contributions/natmm/src/nl/mmatch
In directory james.mmbase.org:/tmp/cvs-serv28517/src/nl/mmatch
Modified Files:
CSVReader.java
Log Message:
NMCMS-136
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/mmatch
See also: http://www.mmbase.org/jira/browse/NMCMS-136
Index: CSVReader.java
===
RCS file: /var/cvs/contributions/natmm/src/nl/mmatch/CSVReader.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- CSVReader.java 30 May 2007 13:59:26 - 1.20
+++ CSVReader.java 20 May 2008 14:36:09 - 1.21
@@ -141,7 +141,7 @@
// mark all relations for employees and departments
log.info(markNodesAndRelations + thisType);
NodeManager relatedNodeNM = cloud.getNodeManager(thisType);
-NodeList thisnodesList = relatedNodeNM.getList(null,null,null);
+NodeList thisnodesList = relatedNodeNM.getList(importstatus not like
'% + IGNORE_BEAUFORT + %',null,null);
RelationList relations = null;
Node thisnode = null;
int i = 0;
@@ -174,7 +174,7 @@
// deletes all nodes relations for employees and departments, which
are inactive
log.info(deleteNodesAndRelations + thisType);
NodeManager relatedNodeNM = cloud.getNodeManager(thisType);
-NodeList thisnodesList = relatedNodeNM.getList(null,null,null);
+NodeList thisnodesList = relatedNodeNM.getList(importstatus not like
'% + IGNORE_BEAUFORT + %',null,null);
RelationList relations = null;
Node thisnode = null;
int i = 0;
@@ -355,6 +355,10 @@
}
}
+
+// if null means not in db - new medewerker. set to active to prevent
NullPE. also being in beaufort means it is an active medewerker
+if ((personsNode.getValue(importstatus) == null) ||
(!personsNode.getValue(importstatus).equals(IGNORE_BEAUFORT))) {
+
personsNode.setValue(externid, thisPerson.get(SOFI_NR));
String alias = (String) personsNode.getValue(account);
if(alias==null||alias.equals()) { // no alias found, use the created
one
@@ -371,11 +375,10 @@
personsNode.setValue(lastname, thisPerson.get(E_NAAM));
}
personsNode.setValue(gender,getGender((String)
thisPerson.get(GENDER)));
-// if null means not in db - new medewerker. set to active to prevent
NullPE. also being in beaufort means it is an active medewerker
-if ((personsNode.getValue(importstatus) == null) ||
(!personsNode.getValue(importstatus).equals(IGNORE_BEAUFORT))) {
+
personsNode.setValue(importstatus,active);
-}
personsNode.commit();
+}
return personsNode;
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/membership form.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/membership
In directory
james.mmbase.org:/tmp/cvs-serv23046/templates/natmm/includes/membership
Modified Files:
form.jsp
Log Message:
NMCMS-38
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/membership
See also: http://www.mmbase.org/jira/browse/NMCMS-38
Index: form.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/membership/form.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- form.jsp5 Mar 2007 15:57:31 - 1.8
+++ form.jsp21 May 2008 09:19:33 - 1.9
@@ -145,6 +145,7 @@
}
case 3: {
String userSelectedStreet =
(String)pageContext.getAttribute(selectedStreet);
+ if (userSelectedStreet == null) userSelectedStreet
= leeg;
// maybe
nothing has been entered or we have only one street
if(allStreets == null ||
allStreets.size() == 0) {
%
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/form result.jsp table.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/form
In directory james.mmbase.org:/tmp/cvs-serv21990/templates/natmm/includes/form
Modified Files:
result.jsp table.jsp
Log Message:
NMCMS-399
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/form
See also: http://www.mmbase.org/jira/browse/NMCMS-399
Index: result.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/form/result.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- result.jsp 5 May 2008 11:49:41 - 1.18
+++ result.jsp 22 May 2008 09:42:03 - 1.19
@@ -37,6 +37,7 @@
Vector okMessage = new Vector();
Vector emailAddress = new Vector();
Vector formResponse = new Vector();
+ String thisFormNumber = ;
boolean isValidAnswer = true;
@@ -58,7 +59,7 @@
mm:related path=posrel,formulier orderby=posrel.pos directions=UP
mm:node element=formulier jspvar=thisForm
%
-String thisFormNumber = thisForm.getStringValue(number);
+thisFormNumber = thisForm.getStringValue(number);
if(!thisForm.getStringValue(titel_fra).equals()) {
okTitle.add(thisForm.getStringValue(titel_fra));
} else {
@@ -114,6 +115,9 @@
if(formulierveld_type.equals(6)) { // *** date ***
String answerValue = getResponseVal(q + thisFormNumber +
_ + formulierveld_number + _day,postingStr);
+ // save in session
+ session.setAttribute(q + thisFormNumber + _ +
formulierveld_number + _day, answerValue);
+
if(answerValue==null) { answerValue = ; }
if(answerValue.equals()) {
responseText += noAnswer;
@@ -125,6 +129,9 @@
responseText += answerValue;
}
answerValue = getResponseVal(q + thisFormNumber + _ +
formulierveld_number + _month,postingStr);
+ // save in session
+ session.setAttribute(q + thisFormNumber + _ +
formulierveld_number + _month, answerValue);
+
if(answerValue==null) { answerValue = ; }
if(answerValue.equals()) {
responseText += , + noAnswer;
@@ -136,6 +143,9 @@
responseText += - + answerValue;
}
answerValue = getResponseVal(q + thisFormNumber + _ +
formulierveld_number + _year,postingStr);
+ // save in session
+ session.setAttribute(q + thisFormNumber + _ +
formulierveld_number + _year, answerValue);
+
if(answerValue==null) { answerValue = ; }
if(answerValue.equals()) {
responseText += , + noAnswer;
@@ -152,6 +162,9 @@
%mm:related path=posrel,formulierveldantwoord
orderby=posrel.pos directions=UP
mm:field name=formulierveldantwoord.number
jspvar=formulierveldantwoord_number vartype=String write=false%
String answerValue = getResponseVal(q +
thisFormNumber + _ + formulierveld_number + _ +
formulierveldantwoord_number,postingStr);
+// save in session
+session.setAttribute(q + thisFormNumber + _ +
formulierveld_number + _ + formulierveldantwoord_number, answerValue);
+
if(answerValue==null) { answerValue = ; }
if(!answerValue.equals()) {
if (hasSelected){
@@ -163,6 +176,9 @@
%/mm:field
/mm:related%
String answer_else_Value = getResponseVal(q +
thisFormNumber + _ + formulierveld_number + _else,postingStr);
+ // save in session
+ session.setAttribute(q + thisFormNumber + _ +
formulierveld_number + _else, answer_else_Value);
+
if(answer_else_Value==null) { answer_else_Value = ; }
if (!answer_else_Value.equals()){
if (hasSelected){
@@ -181,6 +197,9 @@
} else { // *** textarea, textline, dropdown, radio buttons ***
String answerValue = getResponseVal(q + thisFormNumber +
_ + formulierveld_number,postingStr);
+ // save in session
+ session.setAttribute(q + thisFormNumber + _ +
formulierveld_number, answerValue);
+
if(answerValue==null) { answerValue = ; }
if(answerValue.equals()) {
responseText += noAnswer;
@@ -206,6 +225,14 @@
%
if(isValidAnswer)
{
+ // remove form values from the session because the form will be send
+
[MMBASE CVS] contributions/natmm/templates/natmm/includes/form result.jsp table.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/form In directory james.mmbase.org:/tmp/cvs-serv22290/templates/natmm/includes/form Modified Files: result.jsp table.jsp Log Message: NMCMS-46 last commit was wrong issue number. See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/form See also: http://www.mmbase.org/jira/browse/NMCMS-46 Index: result.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/form/result.jsp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -b -r1.19 -r1.20 Index: table.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/form/table.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv26756/templates/editors/evenementen
Modified Files:
evenementen.jsp
Log Message:
NMCMS-494
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-494
Index: evenementen.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- evenementen.jsp 6 May 2008 14:40:50 - 1.17
+++ evenementen.jsp 22 May 2008 14:56:30 - 1.18
@@ -347,7 +347,7 @@
// the search query much check for participant constraints
if(isValidEvent
(!aanmelderNaamId.equals()||!aanmelderPostcodeId.equals()||!aanmelderNummerId.equals()))
{
isValidEvent = false;
-%mm:listcontainer nodes=%= parent_number %
path=evenement,posrel,inschrijvingen,posrel,deelnemers%
+%mm:listcontainer nodes=%= event_number %
path=evenement,posrel,inschrijvingen,posrel,deelnemers%
if(!aanmelderNaamId.equals()) {
%mm:constraint field=deelnemers.lastname operator=LIKE
value=%= % + aanmelderNaamId + % % /%
}
@@ -437,6 +437,17 @@
document.EvenementForm.command.value = clickedButton.value;
}
+ function disableExtraSearch() {
+ document.EvenementForm.aanmelder_naam.disabled=true;
+ document.EvenementForm.aanmelder_postcode.disabled=true;
+ document.EvenementForm.aanmelder_nummer.disabled=true;
+
+ document.EvenementForm.aanmelder_naam.style.backgroundColor=#cc;
+
document.EvenementForm.aanmelder_postcode.style.backgroundColor=#cc;
+ document.EvenementForm.aanmelder_nummer.style.backgroundColor=#cc;
+ }
+
+
/script
% if(actionId.indexOf(print)-1) { %
style rel=stylesheet type=text/css
@@ -651,9 +662,12 @@
td style=padding-top:3px;input type=text
name=aanmelder_postcode tabindex=4 value=%= aanmelderPostcodeId %
style=width:100px; MAXLENGTH=6/td
!-- Aanmeldingsnummer --
td colspan=4style=padding-top:3px;input type=text
name=aanmelder_nummer tabindex=5 value=%= aanmelderNummerId %
style=width:100px;/td
+
+ % if(soortId.equals(activiteiten))
out.print(scriptdisableExtraSearch();/script); %
+
/tr
- td colspan=7nbsp;/td
tr
+ td colspan=7nbsp;/td
/tr
% } else { %
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/form result.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/form
In directory james.mmbase.org:/tmp/cvs-serv15049/templates/natmm/includes/form
Modified Files:
result.jsp
Log Message:
NMCMS-233
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/form
See also: http://www.mmbase.org/jira/browse/NMCMS-233
Index: result.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/form/result.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- result.jsp 22 May 2008 10:00:05 - 1.20
+++ result.jsp 23 May 2008 12:05:30 - 1.21
@@ -298,11 +298,6 @@
String formMessageHref = javascript:history.go(-1);
String formMessageLinktext = warningLink;
- //Override the href is a custom href is set in the title_eng variable
- if (!formMessageHrefCustom.equals()) {
- formMessageHref = formMessageHrefCustom;
- }
-
%[EMAIL PROTECTED] file=message.jsp %%
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/rss xmlactiviteiten.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/rss
In directory james.mmbase.org:/tmp/cvs-serv15337/templates/natmm/rss
Modified Files:
xmlactiviteiten.jsp
Log Message:
NMCMS-408
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/rss
See also: http://www.mmbase.org/jira/browse/NMCMS-408
Index: xmlactiviteiten.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/rss/xmlactiviteiten.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- xmlactiviteiten.jsp 22 Apr 2008 11:26:41 - 1.7
+++ xmlactiviteiten.jsp 23 May 2008 12:26:24 - 1.8
@@ -89,10 +89,7 @@
if (pProvincie.toLowerCase().equals(naam.toLowerCase()))
isProvincieMatch = true;
%/mm:field
/mm:related
- /mm:node%=Provincie: | + pProvincie + |%%
-
-
-
+ /mm:node%
if ((pProvincie == ) || (isProvincieMatch)) {
%item
titlemm:field name=titel jspvar=naam vartype=String
write=false
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/nmintra/update/sql_scripts migrate.20080421.sql
Update of /var/cvs/contributions/natmm/templates/nmintra/update/sql_scripts In directory james.mmbase.org:/tmp/cvs-serv16281/templates/nmintra/update/sql_scripts Modified Files: migrate.20080421.sql Log Message: migratie script See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/update/sql_scripts Index: migrate.20080421.sql === RCS file: /var/cvs/contributions/natmm/templates/nmintra/update/sql_scripts/migrate.20080421.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- migrate.20080421.sql28 Apr 2008 15:40:18 - 1.2 +++ migrate.20080421.sql23 May 2008 13:32:35 - 1.3 @@ -1,5 +1,2 @@ ## NMCMS-486 UPDATE v1_editwizards SET name = 'link' WHERE number = 8501; - -## NMCMS-491 -ALTER TABLE v1_inschrijvingen ADD ticket_office_source VARCHAR(255); \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/update/sql_scripts - New directory
Update of /var/cvs/contributions/natmm/templates/natmm/update/sql_scripts In directory james.mmbase.org:/tmp/cvs-serv16308/templates/natmm/update/sql_scripts Log Message: Directory /var/cvs/contributions/natmm/templates/natmm/update/sql_scripts added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/update/sql_scripts ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/update/sql_scripts migrate.20080421.sql
Update of /var/cvs/contributions/natmm/templates/natmm/update/sql_scripts In directory james.mmbase.org:/tmp/cvs-serv16324/templates/natmm/update/sql_scripts Added Files: migrate.20080421.sql Log Message: migratie script See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/update/sql_scripts migrate.20080421.sql is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/nmintra thumbs.jsp
Update of /var/cvs/contributions/natmm/templates/nmintra In directory james.mmbase.org:/tmp/cvs-serv21241/templates/nmintra Modified Files: thumbs.jsp Log Message: NMCMS-503 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra See also: http://www.mmbase.org/jira/browse/NMCMS-503 Index: thumbs.jsp === RCS file: /var/cvs/contributions/natmm/templates/nmintra/thumbs.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- thumbs.jsp 8 May 2008 13:44:53 - 1.14 +++ thumbs.jsp 29 May 2008 09:52:00 - 1.15 @@ -2,7 +2,6 @@ mm:cloud jspvar=cloud [EMAIL PROTECTED] file=includes/templateheader.jsp % [EMAIL PROTECTED] file=includes/cacheparams.jsp % -cache:cache groups=%= paginaID % key=%= cacheKey % time=%= expireTime % scope=application [EMAIL PROTECTED] file=includes/header.jsp % td[EMAIL PROTECTED] file=includes/pagetitle.jsp %/td td% String rightBarTitle = Zoek een collega; @@ -228,5 +227,4 @@ [EMAIL PROTECTED] file=includes/whiteline.jsp % /td [EMAIL PROTECTED] file=includes/footer.jsp % -/cache:cache /mm:cloud \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/404 menu-bovenkant.js index-403.jsp index-400.jsp index-405.jsp hooglander.jpg index-500.jsp nmlogo.gif index-404.jsp
Update of /var/cvs/contributions/natmm/templates/404 In directory james.mmbase.org:/tmp/cvs-serv1853/templates/404 Added Files: menu-bovenkant.js index-403.jsp index-400.jsp index-405.jsp hooglander.jpg index-500.jsp nmlogo.gif index-404.jsp Log Message: NMCMS-413 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/404 See also: http://www.mmbase.org/jira/browse/NMCMS-413 menu-bovenkant.js is new index-403.jsp is new index-400.jsp is new index-405.jsp is new hooglander.jpg is new index-500.jsp is new nmlogo.gif is new index-404.jsp is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/404 index-500.html nmlogo.gif index-403.html index-400.html index-405.html index-404.html menu-bovenkant.js
Update of /var/cvs/contributions/natmm/templates/natmm/404 In directory james.mmbase.org:/tmp/cvs-serv1890/templates/natmm/404 Removed Files: index-500.html nmlogo.gif index-403.html index-400.html index-405.html index-404.html menu-bovenkant.js Log Message: NMCMS-413 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/404 See also: http://www.mmbase.org/jira/browse/NMCMS-413 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/WEB-INF web.xml
Update of /var/cvs/contributions/natmm/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv1914/WEB-INF Modified Files: web.xml Log Message: NMCMS-413 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/WEB-INF See also: http://www.mmbase.org/jira/browse/NMCMS-413 Index: web.xml === RCS file: /var/cvs/contributions/natmm/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- web.xml 15 May 2008 13:01:24 - 1.5 +++ web.xml 30 May 2008 15:27:11 - 1.6 @@ -130,23 +130,23 @@ /welcome-file-list error-page error-code400/error-code - location/natmm/404/index-400.html/location + location/404/index-400.jsp/location /error-page error-page error-code403/error-code - location/natmm/404/index-403.html/location + location/404/index-403.jsp/location /error-page error-page error-code404/error-code - location/natmm/404/index-404.html/location + location/404/index-404.jsp/location /error-page error-page error-code405/error-code - location/natmm/404/index-405.html/location + location/404/index-405.jsp/location /error-page error-page error-code500/error-code - location/natmm/404/index-500.html/location + location/404/index-500.jsp/location /error-page taglib taglib-uri/WEB-INF/tld/struts-bean.tld/taglib-uri ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers medewerkers_peopletemplate.xml edit_medewerkers.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers In directory james.mmbase.org:/tmp/cvs-serv9237/templates/mmbase/edit/wizard/data/config/medewerkers Modified Files: medewerkers_peopletemplate.xml edit_medewerkers.xml Log Message: NMCMS-502 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers See also: http://www.mmbase.org/jira/browse/NMCMS-502 Index: medewerkers_peopletemplate.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers/medewerkers_peopletemplate.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- medewerkers_peopletemplate.xml 7 May 2008 14:03:40 - 1.3 +++ medewerkers_peopletemplate.xml 10 Jun 2008 11:50:06 - 1.4 @@ -14,7 +14,7 @@ step form-schema=edit_medewerkers/ /steps form-schema id=edit_medewerkers - field name=prefix ftype=linepromptvoorvoegsel/prompt/field + field name=prefix ftype=lineprompttitel/prompt/field field name=firstname ftype=line promptvoornaam/prompt/field field name=initials ftype=line promptinitialen/prompt/field field name=suffix ftype=line prompttussenvoegsel/prompt/field Index: edit_medewerkers.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/medewerkers/edit_medewerkers.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- edit_medewerkers.xml7 May 2008 14:03:40 - 1.9 +++ edit_medewerkers.xml10 Jun 2008 11:50:06 - 1.10 @@ -10,7 +10,7 @@ !-- field name=reageerpromptreageer/prompt/field -- !-- field name=statuspromptstatus/prompt/field -- field name=externidpromptsofinummer (beaufort - medewerkers met importstatus inactive staan niet in de algemene wie-is-wie; vul extern als sofinummer in als dit wel gewenst is)/prompt/field - field name=prefix ftype=linepromptvoorvoegsel/prompt/field + field name=prefix ftype=lineprompttitel (beaufort)/prompt/field field name=firstname ftype=linepromptvoornaam (beaufort)/prompt/field field name=initials ftype=linepromptinitialen (beaufort)/prompt/field field name=suffix ftype=lineprompttussenvoegsel (beaufort)/prompt/field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/nmintra/includes/shoppingcart response.jsp
Update of /var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart In directory james.mmbase.org:/tmp/cvs-serv12645/templates/nmintra/includes/shoppingcart Modified Files: response.jsp Log Message: NMCMS-310 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes/shoppingcart See also: http://www.mmbase.org/jira/browse/NMCMS-310 Index: response.jsp === RCS file: /var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart/response.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- response.jsp13 May 2008 10:11:28 - 1.5 +++ response.jsp24 Jun 2008 11:43:42 - 1.6 @@ -163,19 +163,19 @@ // *** check whether this question provides the client email address *** // *** the object cloud has to contain a question with alias client_email *** %mm:list nodes=client_email path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(answerValue); + clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email2 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(; + answerValue); + clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email3 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(; + answerValue); + clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email4 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(; + answerValue); + clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email5 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(; + answerValue); + clientEmail.append(answerValue + ;); %/mm:list% // *** check whether this question provides the client email address *** ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/nmintra/includes/shoppingcart response.jsp
Update of /var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart In directory james.mmbase.org:/tmp/cvs-serv18334/templates/nmintra/includes/shoppingcart Modified Files: response.jsp Log Message: NMCMS-310 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/nmintra/includes/shoppingcart See also: http://www.mmbase.org/jira/browse/NMCMS-310 Index: response.jsp === RCS file: /var/cvs/contributions/natmm/templates/nmintra/includes/shoppingcart/response.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- response.jsp24 Jun 2008 11:43:42 - 1.6 +++ response.jsp1 Jul 2008 10:00:31 - 1.7 @@ -162,20 +162,23 @@ responseText += answerValue; // *** check whether this question provides the client email address *** // *** the object cloud has to contain a question with alias client_email *** + + String clientEmailString = clientEmail.toString(); + %mm:list nodes=client_email path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(answerValue + ;); +if (clientEmailString.indexOf(answerValue) == -1) clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email2 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(answerValue + ;); +if (clientEmailString.indexOf(answerValue) == -1) clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email3 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(answerValue + ;); +if (clientEmailString.indexOf(answerValue) == -1) clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email4 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(answerValue + ;); +if (clientEmailString.indexOf(answerValue) == -1) clientEmail.append(answerValue + ;); %/mm:list mm:list nodes=client_email5 path=formulierveld constraints=%= formulierveld.number= + questions_number %% - clientEmail.append(answerValue + ;); +if (clientEmailString.indexOf(answerValue) == -1) clientEmail.append(answerValue + ;); %/mm:list% // *** check whether this question provides the client email address *** ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/rss xmlactiviteiten.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/rss
In directory james.mmbase.org:/tmp/cvs-serv27290/templates/natmm/rss
Modified Files:
xmlactiviteiten.jsp
Log Message:
NMCMS-531
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/rss
See also: http://www.mmbase.org/jira/browse/NMCMS-531
Index: xmlactiviteiten.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/rss/xmlactiviteiten.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- xmlactiviteiten.jsp 23 May 2008 12:26:24 - 1.8
+++ xmlactiviteiten.jsp 7 Jul 2008 09:08:08 - 1.9
@@ -4,15 +4,32 @@
%[EMAIL PROTECTED] uri=http://www.mmbase.org/mmbase-taglib-1.0; prefix=mm
%[EMAIL PROTECTED] uri=http://www.opensymphony.com/oscache; prefix=cache
%mm:cloud jspvar=cloud
-cache:cache time=%= 3600*24 % scope=application%
+%
String sPageTemplateURL = ;
String DATA_FORMAT =E, dd MMM , H:mm;
%[EMAIL PROTECTED] file=../includes/time.jsp %%
+
+int iSearchNumberOfDays = 7;
+String pSearchNumberOfDays = request.getParameter(dagen);
+pSearchNumberOfDays = (pSearchNumberOfDays == null ? :
HtmlCleaner.filterAmps(pSearchNumberOfDays).trim());
+
+// SearchNumberOfDays is default 7 and cannot be more than 365
+if (!.equals(pSearchNumberOfDays)) {
+ try {
+ iSearchNumberOfDays = Integer.valueOf(pSearchNumberOfDays).intValue();
+ }
+ catch (NumberFormatException nfe) {
+ System.out.print(xmlactiviteiten.jsp: value of parameter 'dagen' ( +
pSearchNumberOfDays + ) is not a number!);
+ }
+ if (iSearchNumberOfDays 365) iSearchNumberOfDays = 365;
+}
+
+
long lDateSearchFrom = nowSec;
-long lDateSearchTill = lDateSearchFrom + 7*24*60*60;
+long lDateSearchTill = lDateSearchFrom + iSearchNumberOfDays*24*60*60;
if(application.getAttribute(events_till)==null){
EventNotifier.updateAppAttributes(cloud);
@@ -197,9 +214,8 @@
/channel
/mm:list
/rss
-/mm:locale
-/cache:cache
-/mm:cloud
+/mm:locale
+/mm:cloud
%!
private String priceFormating(String sPrice)
{
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/evenement evenement_selection.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/evenement In directory james.mmbase.org:/tmp/cvs-serv489/templates/mmbase/edit/wizard/data/config/evenement Added Files: evenement_selection.xml Log Message: NMCMS-535 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/evenement See also: http://www.mmbase.org/jira/browse/NMCMS-535 evenement_selection.xml is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm activity1.jsp activity2.jsp activity3.jsp
Update of /var/cvs/contributions/natmm/templates/natmm
In directory james.mmbase.org:/tmp/cvs-serv1067/templates/natmm
Modified Files:
activity1.jsp activity2.jsp activity3.jsp
Log Message:
NMCMS-534
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm
See also: http://www.mmbase.org/jira/browse/NMCMS-534
Index: activity1.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/activity1.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- activity1.jsp 13 May 2008 13:21:36 - 1.3
+++ activity1.jsp 7 Jul 2008 12:50:08 - 1.4
@@ -102,9 +102,9 @@
} else {
%mm:node number=%= paginaID % jspvar=thispage
notfound=skip
- mm:field name=kortetitel
+ mm:field name=titel
mm:isnotempty
-span class=colortitle%=
thispage.getStringValue(kortetitel).toUpperCase() %/spanbr/
+span class=colortitle%=
thispage.getStringValue(titel).toUpperCase() %/spanbr/
/mm:isnotempty
/mm:field
mm:field name=omschrijving
Index: activity2.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/activity2.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- activity2.jsp 13 May 2008 13:21:36 - 1.3
+++ activity2.jsp 7 Jul 2008 12:50:08 - 1.4
@@ -102,9 +102,9 @@
} else {
%mm:node number=%= paginaID % jspvar=thispage
notfound=skip
- mm:field name=kortetitel
+ mm:field name=titel
mm:isnotempty
-span class=colortitle%=
thispage.getStringValue(kortetitel).toUpperCase() %/spanbr/
+span class=colortitle%=
thispage.getStringValue(titel).toUpperCase() %/spanbr/
/mm:isnotempty
/mm:field
mm:field name=omschrijving
Index: activity3.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/activity3.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- activity3.jsp 13 May 2008 13:21:36 - 1.1
+++ activity3.jsp 7 Jul 2008 12:50:08 - 1.2
@@ -102,9 +102,9 @@
} else {
%mm:node number=%= paginaID % jspvar=thispage
notfound=skip
- mm:field name=kortetitel
+ mm:field name=titel
mm:isnotempty
-span class=colortitle%=
thispage.getStringValue(kortetitel).toUpperCase() %/spanbr/
+span class=colortitle%=
thispage.getStringValue(titel).toUpperCase() %/spanbr/
/mm:isnotempty
/mm:field
mm:field name=omschrijving
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm activity3.jsp
Update of /var/cvs/contributions/natmm/templates/natmm In directory james.mmbase.org:/tmp/cvs-serv1582/templates/natmm Modified Files: activity3.jsp Log Message: NMCMS-533 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm See also: http://www.mmbase.org/jira/browse/NMCMS-533 Index: activity3.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/activity3.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- activity3.jsp 7 Jul 2008 12:50:08 - 1.2 +++ activity3.jsp 7 Jul 2008 13:11:06 - 1.3 @@ -148,20 +148,18 @@ /td /tr tr -td style=vertical-align:top;width:50%; - mm:remove referid=imageused - /mm:list nodes=%= parent_number % path=evenement,posrel,images max=1 - table style=margin:0px;padding:0px;tr + + mm:list nodes=%= parent_number % path=evenement,posrel,images max=1 + mm:remove referid=imageused + /td style=vertical-align:top;width:50%; + table style=margin:0px;padding:0px;tr td style=margin:0px;padding:0px;img src=mm:node element=imagesmm:image template=s(120) //mm:node alt=mm:field name=evenement.naam /nbsp;/td td style=margin:0px;padding:0px;vertical-align:top;mm:import id=imageused - //mm:list#32; - - mm:present referid=imageused/td/tr/table/mm:present -/td + /mm:present referid=imageused/td/tr/table/mm:present/td/mm:list -td style=vertical-align:top;width:50%;padding-right:3px;padding-top:10px; +td style=vertical-align:top;padding-right:3px;padding-top:10px; %= ddn.getReadableDate( | ) %nbsp;|nbsp;%= ddn.getReadableStartTime() % br/ mm:list nodes=%= parent_number % path=evenement,related,evenement_type ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes image_logic.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes
In directory james.mmbase.org:/tmp/cvs-serv2994/templates/natmm/includes
Modified Files:
image_logic.jsp
Log Message:
NMCMS-540
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes
See also: http://www.mmbase.org/jira/browse/NMCMS-540
Index: image_logic.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/image_logic.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- image_logic.jsp 22 Apr 2008 12:53:22 - 1.9
+++ image_logic.jsp 7 Jul 2008 14:02:13 - 1.10
@@ -103,11 +103,8 @@
} %%-- role=%= shortyRol %,iForm=%=imgFormat
%,iFloat=%=imgFloat %,iPar=%= imgParams %,rmUrl=%= (validLink ?
readmoreURL : ) % --%
table style=width:1%;%= imgFloat % border=0
cellspacing=0 cellpadding=0
tr
- % if(posrel_pos.equals(4)) { %
- td style=padding:10 0 10
0;margin:0px;text-align:right;
- % } else { %
td style=padding:0 0 0
0;margin:0px;text-align:right;
- % }
+ %
if(validLink){
if(readmoreURL.indexOf(javascript:)-1) {
%
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier edit.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier In directory james.mmbase.org:/tmp/cvs-serv3567/templates/mmbase/edit/wizard/data/config/formulier Modified Files: edit.xml Log Message: NMCMS-538 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier See also: http://www.mmbase.org/jira/browse/NMCMS-538 Index: edit.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier/edit.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- edit.xml5 May 2008 11:49:41 - 1.3 +++ edit.xml7 Jul 2008 14:25:00 - 1.4 @@ -13,6 +13,9 @@ field name=titel_eng promptterugknop-URL na versturen (optioneel)/prompt /field + field name=omschrijving_eng ftype=html + promptterugknop-tekst na versturen (optioneel)/prompt + /field field name=titel_fra promptfeedback-titel na versturen/prompt /field ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier edit.xml
Update of /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier In directory james.mmbase.org:/tmp/cvs-serv3730/templates/mmbase/edit/wizard/data/config/formulier Modified Files: edit.xml Log Message: NMCMS-538 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier See also: http://www.mmbase.org/jira/browse/NMCMS-538 Index: edit.xml === RCS file: /var/cvs/contributions/natmm/templates/mmbase/edit/wizard/data/config/formulier/edit.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- edit.xml7 Jul 2008 14:25:00 - 1.4 +++ edit.xml7 Jul 2008 14:30:24 - 1.5 @@ -13,7 +13,7 @@ field name=titel_eng promptterugknop-URL na versturen (optioneel)/prompt /field - field name=omschrijving_eng ftype=html + field name=omschrijving_eng promptterugknop-tekst na versturen (optioneel)/prompt /field field name=titel_fra ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/form result.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/form
In directory james.mmbase.org:/tmp/cvs-serv3730/templates/natmm/includes/form
Modified Files:
result.jsp
Log Message:
NMCMS-538
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/form
See also: http://www.mmbase.org/jira/browse/NMCMS-538
Index: result.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/includes/form/result.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- result.jsp 23 May 2008 12:05:30 - 1.21
+++ result.jsp 7 Jul 2008 14:30:24 - 1.22
@@ -85,6 +85,11 @@
formMessageHrefCustom = thisForm.getStringValue(titel_eng);
}
+String omschrijving_eng =
thisForm.getStringValue(omschrijving_eng);
+
if(omschrijving_eng!=null!HtmlCleaner.cleanText(omschrijving_eng,,,).trim().equals())
{
+ okLink = omschrijving_eng;
+}
+
String responseText = b + responseTextDefault + pages_title +
/bbr
+ brbr +
thisForm.getStringValue(titel).toUpperCase()+ br
+
--br;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natnh/includes relatedarticle.jsp
Update of /var/cvs/contributions/natmm/templates/natnh/includes In directory james.mmbase.org:/tmp/cvs-serv4677/templates/natnh/includes Modified Files: relatedarticle.jsp Log Message: NMCMS-541 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natnh/includes See also: http://www.mmbase.org/jira/browse/NMCMS-541 Index: relatedarticle.jsp === RCS file: /var/cvs/contributions/natmm/templates/natnh/includes/relatedarticle.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- relatedarticle.jsp 11 Apr 2008 09:43:55 - 1.6 +++ relatedarticle.jsp 7 Jul 2008 15:03:47 - 1.7 @@ -1,14 +1,16 @@ mm:node element=artikel [EMAIL PROTECTED] file=newsteaser.jsp % - table width=100% - tr - td - [EMAIL PROTECTED] file=image_logic.jsp % + mm:field name=titel_zichtbaar mm:compare value=0 inverse=true - div class=pageheadermm:field name=titel//div +div class=pageheader style=margin-top:10px;mm:field name=titel//div /mm:compare /mm:field + + table width=100% + tr + td + [EMAIL PROTECTED] file=image_logic.jsp % bmm:field name=intro//bbr/ mm:field name=tekst/br/ /td @@ -17,6 +19,13 @@ mm:related path=posrel,paragraaf orderby=posrel.pos directions=UP fields=paragraaf.number,paragraaf.titel,paragraaf.omschrijving + + mm:field name=paragraaf.titel_zichtbaar + mm:compare value=0 inverse=true + div class=pageheader style=margin-top:10px;mm:field name=paragraaf.titel //div + /mm:compare +/mm:field + table cellspacing=0 cellpadding=0 border=0 width=100% tr td @@ -24,12 +33,7 @@ [EMAIL PROTECTED] file=image_logic.jsp % /mm:node mm:field name=paragraaf.number jspvar=paragraaf_number vartype=String write=false - mm:field name=paragraaf.titel_zichtbaar - mm:compare value=0 inverse=true - div class=pageheadermm:field name=paragraaf.titel //div - /mm:compare - /mm:field - mm:field name=paragraaf.tekst +mm:field name=paragraaf.tekst /mm:node number=%= paragraaf_number % [EMAIL PROTECTED] file=attachment.jsp %/mm:node ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/src/nl/mmatch CSVReader.java
Update of /var/cvs/contributions/natmm/src/nl/mmatch
In directory james.mmbase.org:/tmp/cvs-serv6293/src/nl/mmatch
Modified Files:
CSVReader.java
Log Message:
NMCMS-539
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/mmatch
See also: http://www.mmbase.org/jira/browse/NMCMS-539
Index: CSVReader.java
===
RCS file: /var/cvs/contributions/natmm/src/nl/mmatch/CSVReader.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- CSVReader.java 20 May 2008 14:36:09 - 1.21
+++ CSVReader.java 7 Jul 2008 15:48:33 - 1.22
@@ -755,7 +755,7 @@
ArrayList addresses = getAddresses(zipCodeMap, zipCode);
if(addresses == null) {
addresses = new ArrayList();
- addresses.add(street);
+if (street != null) addresses.add(street);
return addresses;
}
ArrayList returner = new ArrayList();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/rss xmlactiviteiten.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/rss
In directory james.mmbase.org:/tmp/cvs-serv15547/templates/natmm/rss
Modified Files:
xmlactiviteiten.jsp
Log Message:
NMCMS-531
See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/rss
See also: http://www.mmbase.org/jira/browse/NMCMS-531
Index: xmlactiviteiten.jsp
===
RCS file: /var/cvs/contributions/natmm/templates/natmm/rss/xmlactiviteiten.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- xmlactiviteiten.jsp 8 Jul 2008 15:59:57 - 1.10
+++ xmlactiviteiten.jsp 8 Jul 2008 16:00:36 - 1.11
@@ -31,8 +31,6 @@
long lDateSearchFrom = nowSec;
long lDateSearchTill = lDateSearchFrom + iSearchNumberOfDays*24*60*60;
-System.out.println(lDateSearchTill 1: + lDateSearchTill);
-
//if(application.getAttribute(events_till)==null){
// EventNotifier.updateAppAttributes(cloud);
//}
@@ -40,8 +38,6 @@
// lDateSearchTill = ((Long)
application.getAttribute(events_till)).longValue();
//}
-System.out.println(lDateSearchTill 2: + lDateSearchTill);
-
String sChildConstraints =
Evenement.getEventsConstraint(lDateSearchFrom,lDateSearchTill);
String pProvincie = request.getParameter(provincie);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen subscribe.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv10033/templates/editors/evenementen
Modified Files:
subscribe.jsp
Log Message:
NMCMS-547
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen
See also: http://www.mmbase.org/jira/browse/NMCMS-547
Index: subscribe.jsp
===
RCS file:
/var/cvs/contributions/natmm/templates/editors/evenementen/subscribe.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- subscribe.jsp 28 Apr 2008 15:40:18 - 1.27
+++ subscribe.jsp 18 Sep 2008 14:43:38 - 1.28
@@ -684,7 +684,6 @@
/td
td colspan=5
nobr
- html:submit property=action value=%=
SubscribeForm.ADDRESS_ACTION % style=%= extButtonStyle %
onclick=deleteCookie('ew')/
html:submit property=action value=%=
SubscribeForm.SUBSCRIBE_ACTION % style=%= buttonStyle % onclick=%=
((!isGroupExcursion ? checkMaxPerGroup(): ) + ;deleteCookie('ew')) % /
html:submit property=action value=%=
SubscribeForm.CHANGE_ACTION % style=%= buttonStyle % onclick=%=
((!isGroupExcursion ? checkMaxPerGroup(): ) + ;deleteCookie('ew'))% /
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen
In directory james.mmbase.org:/tmp/cvs-serv10099/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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- evenementen.jsp 21 Aug 2008 15:13:57 - 1.19
+++ evenementen.jsp 18 Sep 2008 14:48:34 - 1.20
@@ -634,13 +634,13 @@
!--1--td style=padding-top:3px;input type=text name=titel
tabindex=1 value=%= titelId % style=width:130px; onkeypress=return
event.keyCode!=13/td
!--2--td style=padding-top:3px;input type=text
name=natuurgebieden tabindex=2 value=%= natuurgebiedenId %
style=width:130px;/td
!--3--td colspan=4input type=hidden name=_hiddenDate
- input type=text name=beginDy maxlength=2 tabindex=6 value=%=
beginDyId % style=width:40px;text-align:right;
- -input type=text name=beginMnth maxlength=2 tabindex=7
value=%= beginMnthId % style=width:40px;text-align:right;
- -input type=text name=beginYr maxlength=4 tabindex=8
value=%= beginYrId % style=width:40px;text-align:right;
+ input type=text name=beginDy maxlength=2 tabindex=3 value=%=
beginDyId % style=width:40px;text-align:right;
+ -input type=text name=beginMnth maxlength=2 tabindex=4
value=%= beginMnthId % style=width:40px;text-align:right;
+ -input type=text name=beginYr maxlength=4 tabindex=5
value=%= beginYrId % style=width:40px;text-align:right;
a href=javascript:popUpCalendar('begin') img
src='../../calendar/show-calendar-on-button.gif' width='24' height='24'
align='absmiddle' border='0' alt='Selecteer begindatum'/a
- input type=text name=endDy maxlength=2 tabindex=9 value=%=
endDyId % style=width:40px;text-align:right;
--input type=text name=endMnth maxlength=2 tabindex=10
value=%= endMnthId % style=width:40px;text-align:right;
--input type=text name=endYr maxlength=4 tabindex=11
value=%= endYrId % style=width:40px;text-align:right;
+ input type=text name=endDy maxlength=2 tabindex=6 value=%=
endDyId % style=width:40px;text-align:right;
+-input type=text name=endMnth maxlength=2 tabindex=7
value=%= endMnthId % style=width:40px;text-align:right;
+-input type=text name=endYr maxlength=4 tabindex=8 value=%=
endYrId % style=width:40px;text-align:right;
a href=javascript:popUpCalendar('end') img
src='../../calendar/show-calendar-on-button.gif' width='24' height='24'
align='absmiddle' border='0' alt='Selecteer einddatum'/a/td
/tr
@@ -657,11 +657,11 @@
tr
td/td
!-- Aanmelder --
- td style=padding-top:3px;input type=text name=aanmelder_naam
tabindex=3 value=%= aanmelderNaamId % style=width:130px;/td
+ td style=padding-top:3px;input type=text name=aanmelder_naam
tabindex=9 value=%= aanmelderNaamId % style=width:130px;/td
!-- Postcode aanmelder --
- td style=padding-top:3px;input type=text
name=aanmelder_postcode tabindex=4 value=%= aanmelderPostcodeId %
style=width:100px; MAXLENGTH=6/td
+ td style=padding-top:3px;input type=text
name=aanmelder_postcode tabindex=10 value=%= aanmelderPostcodeId %
style=width:100px; MAXLENGTH=6/td
!-- Aanmeldingsnummer --
- td colspan=4style=padding-top:3px;input type=text
name=aanmelder_nummer tabindex=5 value=%= aanmelderNummerId %
style=width:100px;/td
+ td colspan=4style=padding-top:3px;input type=text
name=aanmelder_nummer tabindex=11 value=%= aanmelderNummerId %
style=width:100px;/td
% if(soortId.equals(activiteiten))
out.print(scriptdisableExtraSearch();/script); %
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes/fun fun_index.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes/fun In directory james.mmbase.org:/tmp/cvs-serv8321/templates/natmm/includes/fun Modified Files: fun_index.jsp Log Message: NMCMS-546 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes/fun See also: http://www.mmbase.org/jira/browse/NMCMS-546 Index: fun_index.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/fun/fun_index.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- fun_index.jsp 18 Apr 2008 12:19:04 - 1.7 +++ fun_index.jsp 19 Sep 2008 14:49:48 - 1.8 @@ -5,7 +5,6 @@ mm:import id=nodotline / [EMAIL PROTECTED] file=../../includes/image_vars.jsp % [EMAIL PROTECTED] file=../../includes/page_intro.jsp % -div style=margin:7px 0px 7px 0xMaak een keuze uit de volgende categorieeuml;n:/div [EMAIL PROTECTED] file=../../includes/dossier_form.jsp % br jsp:include page=../includes/shorty.jsp ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/includes dossier_form.jsp
Update of /var/cvs/contributions/natmm/templates/natmm/includes In directory james.mmbase.org:/tmp/cvs-serv8321/templates/natmm/includes Modified Files: dossier_form.jsp Log Message: NMCMS-546 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/includes See also: http://www.mmbase.org/jira/browse/NMCMS-546 Index: dossier_form.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/includes/dossier_form.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- dossier_form.jsp18 Apr 2008 12:19:04 - 1.2 +++ dossier_form.jsp19 Sep 2008 14:49:48 - 1.3 @@ -8,6 +8,7 @@ mm:size id=number_of_dossiers mm:isgreaterthan value=1 mm:first + div style=margin:7px 0px 7px 0xMaak een keuze uit de volgende categorieeuml;n:/div form method=get name=dossiers id=dossiers select name=d id=dossier onChange=this.form.submit() /mm:first ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/natmm/META-INF - New directory
Update of /var/cvs/contributions/natmm/natmm/META-INF In directory james.mmbase.org:/tmp/cvs-serv19652/natmm/META-INF Log Message: Directory /var/cvs/contributions/natmm/natmm/META-INF added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/natmm/META-INF ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/natmm - New directory
Update of /var/cvs/contributions/natmm/natmm In directory james.mmbase.org:/tmp/cvs-serv19652/natmm Log Message: Directory /var/cvs/contributions/natmm/natmm added to the repository See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/natmm ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm .classpath .project
Update of /var/cvs/contributions/natmm In directory james.mmbase.org:/tmp/cvs-serv19681 Added Files: .classpath .project Log Message: NMCMS-584 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm See also: http://www.mmbase.org/jira/browse/NMCMS-584 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/conf/intranet nmintraconfig.local.properties filters.finalist.properties filters.local.properties
Update of /var/cvs/contributions/natmm/conf/intranet In directory james.mmbase.org:/tmp/cvs-serv19681/conf/intranet Modified Files: nmintraconfig.local.properties filters.finalist.properties filters.local.properties Log Message: NMCMS-584 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/conf/intranet See also: http://www.mmbase.org/jira/browse/NMCMS-584 Index: nmintraconfig.local.properties === RCS file: /var/cvs/contributions/natmm/conf/intranet/nmintraconfig.local.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- nmintraconfig.local.properties 27 Jun 2007 08:33:11 - 1.4 +++ nmintraconfig.local.properties 22 Sep 2008 09:06:39 - 1.5 @@ -8,9 +8,9 @@ [EMAIL PROTECTED] [EMAIL PROTECTED] -nmintraconf.sDocumentsUrl=C:/bin/tomcat/tmp/ -nmintraconf.sDocumentsRoot=C:/bin/tomcat/webapps/tmp/ -nmintraconf.incomingDir=C:/bin/tomcat/tmp/ -nmintraconf.tempDir=C:/bin/tomcat/tmp/ +nmintraconf.sDocumentsUrl=C:/servers/jakarta-tomcat-5.0.30/tmp/ +nmintraconf.sDocumentsRoot=C:/servers/jakarta-tomcat-5.0.30/webapps/tmp/ +nmintraconf.incomingDir=C:/servers/jakarta-tomcat-5.0.30/tmp/ +nmintraconf.tempDir=C:/servers/jakarta-tomcat-5.0.30/tmp/ nmintraconf.sCorporateWebsite=http://natmm-internet.finalist.com/natmm-internet/natmm/ nmintraconf.sCorporateEditors=http://natmm-internet.finalist.com/natmm-internet/editors/ \ No newline at end of file Index: filters.finalist.properties === RCS file: /var/cvs/contributions/natmm/conf/intranet/filters.finalist.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- filters.finalist.properties 27 Nov 2007 15:02:33 - 1.6 +++ filters.finalist.properties 22 Sep 2008 09:06:39 - 1.7 @@ -6,7 +6,7 @@ database.url=jdbc:mysql://$HOST:$PORT/$DBM?useServerPrepStmts=false database.user=jurn database.password=jurn -database.name=beheer_natuurmm_intra +database.name=natmm_intranet_test_1_0_10 database.connections=20 database.host=amiga database.port=3306 Index: filters.local.properties === RCS file: /var/cvs/contributions/natmm/conf/intranet/filters.local.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- filters.local.properties16 Apr 2007 10:14:41 - 1.4 +++ filters.local.properties22 Sep 2008 09:06:39 - 1.5 @@ -6,7 +6,7 @@ database.url=jdbc:mysql://$HOST:$PORT/$DBM?useServerPrepStmts=false database.user=jurn database.password=jurn -database.name=beheer_natuurmm_intra +database.name=natmm_intranet_test_1_0_10 database.connections=20 database.host=amiga.finalist.nl database.port=3306 @@ -14,7 +14,7 @@ ## images.xml builder properties images.convertercommand=convert.exe -images.converterroot=c:/bin/ImageMagick/ +images.converterroot=c:/apps/imageMagick/ ## sendmail.xml builder properties natmm.comment.begin= @@ -24,5 +24,5 @@ mailhost.sendmail=192.168.0.4 ## log4j.xml properties -log.dir=C:/bin/tomcat/logs/ +log.dir=C:/servers/jakarta-tomcat-5.0.30/logs/ log.level=info \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/conf natmmconfig.properties filters.properties nmintraconfig.properties
Update of /var/cvs/contributions/natmm/conf In directory james.mmbase.org:/tmp/cvs-serv19681/conf Modified Files: natmmconfig.properties filters.properties nmintraconfig.properties Log Message: NMCMS-584 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/conf See also: http://www.mmbase.org/jira/browse/NMCMS-584 Index: natmmconfig.properties === RCS file: /var/cvs/contributions/natmm/conf/natmmconfig.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- natmmconfig.properties 6 Mar 2007 12:57:35 - 1.3 +++ natmmconfig.properties 22 Sep 2008 09:06:39 - 1.4 @@ -0,0 +1,17 @@ +### NatMMConfig.java properties ### + +natmmconf.companyName=Natuurmonumenten [EMAIL PROTECTED] [EMAIL PROTECTED] +natmmconf.infoUrl=http://localhost:8080/vragen + [EMAIL PROTECTED] +natmmconf.liveUrl=http://localhost:8080/natmm-internet/natmm/ +natmmconf.tmpMemberId=9002162 + [EMAIL PROTECTED] +natmmconf.rootDir=C:/servers/jakarta-tomcat-5.0.30/webapps/natmm-internet/ +natmmconf.tempDir=C:/servers/jakarta-tomcat-5.0.30/tmp/ +natmmconf.incomingDir=C:/servers/jakarta-tomcat-5.0.30/tmp/ + +natmmconfig.is.production=false Index: filters.properties === RCS file: /var/cvs/contributions/natmm/conf/filters.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- filters.properties 6 Mar 2007 12:57:35 - 1.3 +++ filters.properties 22 Sep 2008 09:06:39 - 1.4 @@ -0,0 +1,28 @@ +## mmbaseroot.xml properties +database.tableprefix=v1 + +## jdbc.xml properties +database.type=mysql +database.url=jdbc:mysql://$HOST:$PORT/$DBM?useServerPrepStmts=false +database.user=jurn +database.password=jurn +database.name=beheer_natuurmm_inter3 +database.connections=20 +database.host=amiga +database.port=3306 +database.driver=com.mysql.jdbc.Driver + +## images.xml builder properties +images.convertercommand=convert.exe +images.converterroot=C:/apps/imageMagick + +## sendmail.xml builder properties +natmm.comment.begin=!-- +natmm.comment.end=-- +nmintra.comment.begin= +nmintra.comment.end= +mailhost.sendmail= + +## log4j.xml properties +log.dir=C:/servers/jakarta-tomcat-5.0.30/logs/ +log.level=info \ No newline at end of file Index: nmintraconfig.properties === RCS file: /var/cvs/contributions/natmm/conf/nmintraconfig.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- nmintraconfig.properties6 Mar 2007 12:57:35 - 1.4 +++ nmintraconfig.properties22 Sep 2008 09:06:39 - 1.5 @@ -0,0 +1,16 @@ +### NMIntraConfig.java properties ### + +### local development properties ### [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + +nmintraconf.sDocumentsUrl=C:/servers/jakarta-tomcat-5.0.30/tmp/ +nmintraconf.sDocumentsRoot=C:/servers/jakarta-tomcat-5.0.30/webapps/tmp/ +nmintraconf.incomingDir=C:/servers/jakarta-tomcat-5.0.30/tmp/ +nmintraconf.tempDir=C:/servers/jakarta-tomcat-5.0.30/tmp/ +nmintraconf.sCorporateWebsite=http://natmm-internet.finalist.com/natmm-internet/natmm/ +nmintraconf.sCorporateEditors=http://natmm-internet.finalist.com/natmm-internet/editors/ \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/conf/internet filters.finalist.properties filters.local.properties
Update of /var/cvs/contributions/natmm/conf/internet In directory james.mmbase.org:/tmp/cvs-serv19681/conf/internet Modified Files: filters.finalist.properties filters.local.properties Log Message: NMCMS-584 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/conf/internet See also: http://www.mmbase.org/jira/browse/NMCMS-584 Index: filters.finalist.properties === RCS file: /var/cvs/contributions/natmm/conf/internet/filters.finalist.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- filters.finalist.properties 26 Mar 2007 15:51:38 - 1.4 +++ filters.finalist.properties 22 Sep 2008 09:06:39 - 1.5 @@ -6,7 +6,7 @@ database.url=jdbc:mysql://$HOST:$PORT/$DBM?useServerPrepStmts=false database.user=jurn database.password=jurn -database.name=beheer_natuurmm_inter +database.name=natmm_internet_test_1_0_10 database.connections=20 database.host=amiga database.port=3306 Index: filters.local.properties === RCS file: /var/cvs/contributions/natmm/conf/internet/filters.local.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- filters.local.properties8 May 2008 16:10:15 - 1.4 +++ filters.local.properties22 Sep 2008 09:06:39 - 1.5 @@ -14,7 +14,7 @@ ## images.xml builder properties images.convertercommand=convert.exe -images.converterroot=C:/bin/ImageMagick +images.converterroot=C:/apps/imageMagick ## sendmail.xml builder properties natmm.comment.begin=!-- @@ -24,5 +24,5 @@ mailhost.sendmail= ## log4j.xml properties -log.dir=C:/bin/apache-tomcat-5.0.30/logs/ +log.dir=C:/servers/jakarta-tomcat-5.0.30/logs/ log.level=info \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm index.jsp home.jsp
Update of /var/cvs/contributions/natmm/templates/natmm In directory james.mmbase.org:/tmp/cvs-serv19681/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.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- index.jsp 20 May 2008 08:16:21 - 1.7 +++ index.jsp 22 Sep 2008 09:06:39 - 1.8 @@ -13,6 +13,22 @@ div id=bigdiv style=position:relative; +div id=skyscraper style=visibility: hidden; position:absolute; left:-625px; top:-850px; width:2000; height:2000; color:#00; z-index:101; + div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; + img src=flash/cross.gif onclick=closeSkyscraper();/ + /div + object classid=clsid:d27cdb6e-ae6d-11cf-96b8-44455354 codebase=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 + param name=allowScriptAccess value=sameDomain / + param name=movie value=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; / + param name=menu value=false / + param name=quality value=high / + param name=scale value=noscale / + param name=wmode value=transparent / + param name=bgcolor value=#ff / + embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / + /object +/div + table width=744 border=0 cellspacing=0 cellpadding=0 align=center valign=top tr td style=vertical-align:top;padding:10px;padding-top:0px;width:185px; Index: home.jsp === RCS file: /var/cvs/contributions/natmm/templates/natmm/home.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- home.jsp20 May 2008 08:16:21 - 1.11 +++ home.jsp22 Sep 2008 09:06:39 - 1.12 @@ -24,6 +24,22 @@ div id=bigdiv style=position:relative; +div id=skyscraper style=visibility: hidden; position:absolute; left:-625px; top:-700px; width:2000; height:2000; color:#00; z-index:101; + div style=position: absolute; left: 1280px; top:705px; z-index:102; display: block; + img src=flash/cross.gif onclick=closeSkyscraper();/ + /div + object classid=clsid:d27cdb6e-ae6d-11cf-96b8-44455354 codebase=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 + param name=allowScriptAccess value=sameDomain / + param name=movie value=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; / + param name=menu value=false / + param name=quality value=high / + param name=scale value=noscale / + param name=wmode value=transparent / + param name=bgcolor value=#ff / + embed src=flash/overlayerbanner_pop_600x600.swf?clickTag=http://www.natuurmonumenten.nlclickTarget=_blank; menu=false quality=high scale=noscale wmode=transparent bgcolor=#ff width=2000 height=2000 name=overlayerbanner_pop_600x600 align=middle allowScriptAccess=sameDomain type=application/x-shockwave-flash pluginspage=http://www.macromedia.com/go/getflashplayer; / + /object +/div + table width=744 border=0 cellspacing=0 cellpadding=0 align=center valign=top tr td style=vertical-align:top;width:185px;padding:10px;padding-top:0px; ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/natmm/templates/natmm/scripts skyscraper_cookie.js
Update of /var/cvs/contributions/natmm/templates/natmm/scripts
In directory james.mmbase.org:/tmp/cvs-serv19681/templates/natmm/scripts
Modified Files:
skyscraper_cookie.js
Log Message:
NMCMS-584
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/natmm/scripts
See also: http://www.mmbase.org/jira/browse/NMCMS-584
Index: skyscraper_cookie.js
===
RCS file:
/var/cvs/contributions/natmm/templates/natmm/scripts/skyscraper_cookie.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- skyscraper_cookie.js5 Mar 2008 10:33:35 - 1.4
+++ skyscraper_cookie.js22 Sep 2008 09:06:39 - 1.5
@@ -19,8 +19,8 @@
var skyscraperElement = document.getElementById('skyscraper');
if (skyscraperElement != null)
document.getElementById('skyscraper').style.display = 'none';
- //var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
- var skyscraperIsViewed = yes;
+ var skyscraperIsViewed = ReadCookie(skyscraper_is_viewed);
+ //var skyscraperIsViewed = yes;
//alert(skyscraperIsViewed: + skyscraperIsViewed);
if ( skyscraperIsViewed == null || skyscraperIsViewed == ) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
