[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-serv11934/templates/editors/evenementen Modified Files: Tag: BRANCH_NATMM_1_2 evenementen.jsp Log Message: Small layout displaying fixes See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen Index: evenementen.jsp === RCS file: /var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -b -r1.21 -r1.21.2.1 --- evenementen.jsp 26 Sep 2008 14:07:15 - 1.21 +++ evenementen.jsp 6 Mar 2009 11:13:22 - 1.21.2.1 @@ -1,9 +1,10 @@ -%...@page language=java contentType=text/html;charset=UTF-8% -%...@page import=nl.leocms.util.DoubleDateNode,nl.leocms.evenementen.Evenement,java.util.* % -%...@include file=/taglibs.jsp % +%...@page language=java contentType=text/html;charset=UTF-8 +%%...@page import=nl.leocms.util.DoubleDateNode,nl.leocms.evenementen.Evenement,java.util.* +%%...@include file=/taglibs.jsp +%mm:content type=text/html escaper=none mm:cloud method=http rank=basic user jspvar=cloud -!-- *** IMPORT PARAMETERS -- % +//*** IMPORT PARAMETERS Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); int maxAge = 60 * 60 * 24 * 365; @@ -901,15 +902,14 @@ /table /form script type=text/javascript language=JavaScript - !-- // works together with the the onkeypress for the titel field, to make sure the form is only posted once on [ENTER]-key var focusControl = document.forms[EvenementForm].elements[titel]; if (focusControl.type != hidden) { focusControl.focus(); } - // -- /script br/br/ /body /html /mm:cloud +/mm:content \ 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/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen In directory james.mmbase.org:/tmp/cvs-serv11969/templates/editors/evenementen Modified Files: evenementen.jsp Log Message: Small layout displaying fixes See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen Index: evenementen.jsp === RCS file: /var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- evenementen.jsp 26 Sep 2008 14:07:15 - 1.21 +++ evenementen.jsp 6 Mar 2009 11:13:32 - 1.22 @@ -1,9 +1,10 @@ -%...@page language=java contentType=text/html;charset=UTF-8% -%...@page import=nl.leocms.util.DoubleDateNode,nl.leocms.evenementen.Evenement,java.util.* % -%...@include file=/taglibs.jsp % +%...@page language=java contentType=text/html;charset=UTF-8 +%%...@page import=nl.leocms.util.DoubleDateNode,nl.leocms.evenementen.Evenement,java.util.* +%%...@include file=/taglibs.jsp +%mm:content type=text/html escaper=none mm:cloud method=http rank=basic user jspvar=cloud -!-- *** IMPORT PARAMETERS -- % +//*** IMPORT PARAMETERS Calendar cal = Calendar.getInstance(); cal.setTime(new Date()); int maxAge = 60 * 60 * 24 * 365; @@ -901,15 +902,14 @@ /table /form script type=text/javascript language=JavaScript - !-- // works together with the the onkeypress for the titel field, to make sure the form is only posted once on [ENTER]-key var focusControl = document.forms[EvenementForm].elements[titel]; if (focusControl.type != hidden) { focusControl.focus(); } - // -- /script br/br/ /body /html /mm:cloud +/mm:content \ 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/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen In directory james.mmbase.org:/tmp/cvs-serv29487/templates/editors/evenementen Modified Files: evenementen.jsp Log Message: NMCMS-586 See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen See also: http://www.mmbase.org/jira/browse/NMCMS-586 Index: evenementen.jsp === RCS file: /var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -r1.20 -r1.21 --- evenementen.jsp 18 Sep 2008 14:48:34 - 1.20 +++ evenementen.jsp 26 Sep 2008 14:07:15 - 1.21 @@ -637,11 +637,11 @@ 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=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 + a tabindex=6 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=7 value=%= endDyId % style=width:40px;text-align:right; +-input type=text name=endMnth maxlength=2 tabindex=8 value=%= endMnthId % style=width:40px;text-align:right; +-input type=text name=endYr maxlength=4 tabindex=9 value=%= endYrId % style=width:40px;text-align:right; + a tabindex=10 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 tr @@ -657,11 +657,11 @@ tr td/td !-- Aanmelder -- - td style=padding-top:3px;input type=text name=aanmelder_naam tabindex=9 value=%= aanmelderNaamId % style=width:130px;/td + td style=padding-top:3px;input type=text name=aanmelder_naam tabindex=11 value=%= aanmelderNaamId % style=width:130px;/td !-- Postcode aanmelder -- - td style=padding-top:3px;input type=text name=aanmelder_postcode tabindex=10 value=%= aanmelderPostcodeId % style=width:100px; MAXLENGTH=6/td + td style=padding-top:3px;input type=text name=aanmelder_postcode tabindex=12 value=%= aanmelderPostcodeId % style=width:100px; MAXLENGTH=6/td !-- Aanmeldingsnummer -- - td colspan=4style=padding-top:3px;input type=text name=aanmelder_nummer tabindex=11 value=%= aanmelderNummerId % style=width:100px;/td + td colspan=4style=padding-top:3px;input type=text name=aanmelder_nummer tabindex=13 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/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/editors/evenementen evenementen.jsp
Update of /var/cvs/contributions/natmm/templates/editors/evenementen In directory james.mmbase.org:/tmp/cvs-serv5343/templates/editors/evenementen Modified Files: evenementen.jsp Log Message: NMCMS-567 Saving activities fails in some IE6 versions, because the browser accepts no more than 20 cookies. Temporary fixed this by disabling the newly added cookies. See also: http://cvs.mmbase.org/viewcvs/contributions/natmm/templates/editors/evenementen See also: http://www.mmbase.org/jira/browse/NMCMS-567 Index: evenementen.jsp === RCS file: /var/cvs/contributions/natmm/templates/editors/evenementen/evenementen.jsp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- evenementen.jsp 22 May 2008 14:56:30 - 1.18 +++ evenementen.jsp 21 Aug 2008 15:13:57 - 1.19 @@ -148,9 +148,9 @@ 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(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); ___ 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/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