Menu
▾
▴
burgerweeshuis-autocvs — CVS commit list for burgerweeshuis
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(68) |
May
(79) |
Jun
|
Jul
(5) |
Aug
(23) |
Sep
(58) |
Oct
(32) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(5) |
Feb
(4) |
Mar
(3) |
Apr
(264) |
May
(414) |
Jun
(432) |
Jul
(19) |
Aug
(86) |
Sep
(23) |
Oct
(119) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(1) |
Mar
(6) |
Apr
(1) |
May
|
Jun
(73) |
Jul
(184) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: Eelco H. <ee...@us...> - 2007-12-05 10:01:31
|
Update of /cvsroot/burgerweeshuis/old-site In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12064 Modified Files: pom.xml .classpath Log Message: tweak Index: pom.xml =================================================================== RCS file: /cvsroot/burgerweeshuis/old-site/pom.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pom.xml 5 Dec 2007 09:14:16 -0000 1.1 --- pom.xml 5 Dec 2007 10:01:31 -0000 1.2 *************** *** 144,152 **** </dependency> <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.0.1b</version> - </dependency> - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> --- 144,147 ---- Index: .classpath =================================================================== RCS file: /cvsroot/burgerweeshuis/old-site/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 5 Dec 2007 09:14:16 -0000 1.2 --- .classpath 5 Dec 2007 10:01:31 -0000 1.3 *************** *** 5,9 **** <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.4/avalon-framework-4.1.4.jar"/> <classpathentry kind="var" path="M2_REPO/batik/batik/1.5-b5/batik-1.5-b5.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.6.1/commons-beanutils-1.6.1.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.6.1/commons-beanutils-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0/commons-logging-1.0.jar"/> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.0/commons-collections-2.0.jar"/> --- 5,9 ---- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.4/avalon-framework-4.1.4.jar"/> <classpathentry kind="var" path="M2_REPO/batik/batik/1.5-b5/batik-1.5-b5.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.6.1/commons-beanutils-1.6.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0/commons-logging-1.0.jar"/> <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.0/commons-collections-2.0.jar"/> *************** *** 11,39 **** <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar"/> <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.3/commons-digester-1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/> <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/> <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/1.0.1/commons-lang-1.0.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/fop/fop/1.0dev/fop-1.0dev.jar"/> ! <classpathentry kind="var" path="M2_REPO/hibernate/hibernate/2.1.8/hibernate-2.1.8.jar" sourcepath="M2_REPO/hibernate/hibernate/2.1.8/hibernate-2.1.8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/jasperreports/jasperreports/0.5.2/jasperreports-0.5.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> <classpathentry kind="var" path="M2_REPO/jdom/jdom/b9/jdom-b9.jar"/> <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> ! <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar" sourcepath="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/maverick/maverick/2.2.3/maverick-2.2.3.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/3.1.14/mysql-connector-java-3.1.14.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/oe-mailjob/oe-mailjob/1.4/oe-mailjob-1.4.jar"/> <classpathentry kind="var" path="M2_REPO/oe-thumbs/oe-thumbs/1.2/oe-thumbs-1.2.jar"/> <classpathentry kind="var" path="M2_REPO/oe-usermanager-hib/oe-usermanager-hib/1.2/oe-usermanager-hib-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9.jar" sourcepath="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9-sources.jar"/> <classpathentry kind="var" path="M2_REPO/openedge/baritus/1.0.13/baritus-1.0.13.jar"/> <classpathentry kind="var" path="M2_REPO/openedge-access/openedge-access/1.2.5/openedge-access-1.2.5.jar"/> --- 11,38 ---- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar"/> <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.3/commons-digester-1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/> <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/> <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/> <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/1.0.1/commons-lang-1.0.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/> <classpathentry kind="var" path="M2_REPO/fop/fop/1.0dev/fop-1.0dev.jar"/> ! <classpathentry kind="var" path="M2_REPO/hibernate/hibernate/2.1.8/hibernate-2.1.8.jar"/> <classpathentry kind="var" path="M2_REPO/jasperreports/jasperreports/0.5.2/jasperreports-0.5.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/> <classpathentry kind="var" path="M2_REPO/jdom/jdom/b9/jdom-b9.jar"/> <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> ! <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar"/> <classpathentry kind="var" path="M2_REPO/maverick/maverick/2.2.3/maverick-2.2.3.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/3.1.14/mysql-connector-java-3.1.14.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/> <classpathentry kind="var" path="M2_REPO/oe-mailjob/oe-mailjob/1.4/oe-mailjob-1.4.jar"/> <classpathentry kind="var" path="M2_REPO/oe-thumbs/oe-thumbs/1.2/oe-thumbs-1.2.jar"/> <classpathentry kind="var" path="M2_REPO/oe-usermanager-hib/oe-usermanager-hib/1.2/oe-usermanager-hib-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9.jar"/> <classpathentry kind="var" path="M2_REPO/openedge/baritus/1.0.13/baritus-1.0.13.jar"/> <classpathentry kind="var" path="M2_REPO/openedge-access/openedge-access/1.2.5/openedge-access-1.2.5.jar"/> *************** *** 44,48 **** <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/> <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.2.3/quartz-1.2.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar" sourcepath="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/taglibs/string/1.1.0/string-1.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4-rc1/velocity-1.4-rc1.jar"/> --- 43,47 ---- <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/> <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.2.3/quartz-1.2.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/> <classpathentry kind="var" path="M2_REPO/taglibs/string/1.1.0/string-1.1.0.jar"/> <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4-rc1/velocity-1.4-rc1.jar"/> |
|
From: Eelco H. <ee...@us...> - 2007-12-05 09:14:17
|
Update of /cvsroot/burgerweeshuis/old-site/src/webapp/WEB-INF In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25834/src/webapp/WEB-INF Modified Files: maverick.xml Log Message: update update Index: maverick.xml =================================================================== RCS file: /cvsroot/burgerweeshuis/old-site/src/webapp/WEB-INF/maverick.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** maverick.xml 4 May 2005 14:42:39 -0000 1.1 --- maverick.xml 5 Dec 2007 09:14:16 -0000 1.2 *************** *** 233,246 **** </command> ! <command name="admin.edititem"> ! <controller class="nl.burgerweeshuis.website.maint.ctl.AgendaItemEditCtrl" /> ! <view name="success" path="/admin.listitems.m" /> ! <view name="error" path="/admin/edititem.vm"> ! <transform path="/admin/layout.vm" /> ! </view> ! <view name="input" path="/admin/edititem.vm"> ! <transform path="/admin/layout.vm" /> ! </view> ! </command> <command name="admin.editdynapage"> --- 233,246 ---- </command> ! <command name="admin.edititem"> ! <controller class="nl.burgerweeshuis.website.maint.ctl.AgendaItemEditCtrl" /> ! <view name="success" path="/admin.listitems.m" /> ! <view name="error" path="/admin/edititem.vm"> ! <transform path="/admin/layout.vm" /> ! </view> ! <view name="input" path="/admin/edititem.vm"> ! <transform path="/admin/layout.vm" /> ! </view> ! </command> <command name="admin.editdynapage"> |
|
From: Eelco H. <ee...@us...> - 2007-12-05 09:14:15
|
Update of /cvsroot/burgerweeshuis/old-site In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25834 Modified Files: .classpath .project Added Files: pom.xml Log Message: update update Index: .project =================================================================== RCS file: /cvsroot/burgerweeshuis/old-site/.project,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .project 4 May 2005 14:42:59 -0000 1.1 --- .project 5 Dec 2007 09:14:16 -0000 1.2 *************** *** 1,18 **** - <?xml version="1.0" encoding="UTF-8"?> <projectDescription> ! <name>burgerweeshuis-website</name> ! <comment>Website burgerweeshuis</comment> ! <projects> ! </projects> ! <buildSpec> ! <buildCommand> ! <name>org.eclipse.jdt.core.javabuilder</name> ! <arguments> ! </arguments> ! </buildCommand> ! </buildSpec> ! <natures> ! <nature>org.eclipse.jdt.core.javanature</nature> ! <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature> ! </natures> ! </projectDescription> --- 1,14 ---- <projectDescription> ! <name>site</name> ! <comment/> ! <projects/> ! <buildSpec> ! <buildCommand> ! <name>org.eclipse.jdt.core.javabuilder</name> ! </buildCommand> ! </buildSpec> ! <natures> ! <nature>org.eclipse.jdt.core.javanature</nature> ! <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature> ! </natures> ! </projectDescription> \ No newline at end of file --- NEW FILE: pom.xml --- <?xml version="1.0" encoding="UTF-8"?> <project> <modelVersion>4.0.0</modelVersion> <groupId>burgerweeshuis</groupId> <artifactId>site</artifactId> <packaging>war</packaging> <name>Burgerweeshuis site</name> <version>1.0-SNAPSHOT</version> <inceptionYear>2003</inceptionYear> <organization> <name>Burgerweeshuis</name> <url>http://www.burgerweeshuis.com</url> </organization> <build> <sourceDirectory>src/java</sourceDirectory> <resources> <resource> <directory>src/java</directory> <includes> <include>**</include> </includes> <excludes> <exclude>**/*.java</exclude> </excludes> </resource> </resources> <finalName>site</finalName> <plugins> <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> <warSourceDirectory>src/webapp</warSourceDirectory> </configuration> </plugin> </plugins> </build> <repositories> <repository> <id>mergere.com</id> <url>http://repo.mergere.com/maven2/</url> </repository> <repository> <id>topicus</id> <url>http://test.topicus.nl/maven/</url> <layout>legacy</layout> </repository> </repositories> <pluginRepositories> <pluginRepository> <releases> <enabled>false</enabled> </releases> <snapshots /> <id>Maven Snapshots</id> <url>http://snapshots.maven.codehaus.org/maven2/</url> </pluginRepository> </pluginRepositories> <dependencies> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.3</version> <scope>provided</scope> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> <version>1.1.1</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> <version>1.6.1</version> </dependency> <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>1.3</version> </dependency> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <version>1.0.1</version> </dependency> <dependency> <groupId>commons-betwixt</groupId> <artifactId>commons-betwixt</artifactId> <version>0.8</version> </dependency> <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> <version>1.3</version> </dependency> <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> <version>1.2.2</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> <version>1.1.2</version> </dependency> <dependency> <groupId>taglibs</groupId> <artifactId>standard</artifactId> <version>1.1.2</version> </dependency> <dependency> <groupId>taglibs</groupId> <artifactId>string</artifactId> <version>1.1.0</version> </dependency> <dependency> <groupId>lucene</groupId> <artifactId>lucene</artifactId> <version>1.4.3</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.8</version> </dependency> <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> <version>b9</version> </dependency> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> <dependency> <groupId>quartz</groupId> <artifactId>quartz</artifactId> <version>1.2.3</version> </dependency> <dependency> <groupId>hibernate</groupId> <artifactId>hibernate</artifactId> <version>2.1.8</version> </dependency> <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> <version>1.0.1b</version> </dependency> <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <version>1.2.3</version> </dependency> <dependency> <groupId>velocity</groupId> <artifactId>velocity</artifactId> <version>1.4-rc1</version> </dependency> <dependency> <groupId>velocity-tools</groupId> <artifactId>velocity-tools</artifactId> <version>1.2</version> </dependency> <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4</version> </dependency> <dependency> <groupId>opensymphony</groupId> <artifactId>oscache</artifactId> <version>2.0.2</version> </dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>3.1.14</version> </dependency> <dependency> <groupId>ognl</groupId> <artifactId>ognl</artifactId> <version>2.6.9</version> </dependency> <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <version>0.5.2</version> </dependency> <dependency> <groupId>oro</groupId> <artifactId>oro</artifactId> <version>2.0.7</version> </dependency> <dependency> <groupId>fop</groupId> <artifactId>fop</artifactId> <version>1.0dev</version> </dependency> <dependency> <groupId>avalon-framework</groupId> <artifactId>avalon-framework</artifactId> <version>4.1.4</version> </dependency> <dependency> <groupId>batik</groupId> <artifactId>batik</artifactId> <version>1.5-b5</version> </dependency> <dependency> <groupId>maverick</groupId> <artifactId>maverick</artifactId> <version>2.2.3</version> </dependency> <dependency> <groupId>openedge-modules</groupId> <artifactId>openedge-modules</artifactId> <version>1.2</version> </dependency> <dependency> <groupId>openedge-access</groupId> <artifactId>openedge-access</artifactId> <version>1.2.5</version> </dependency> <dependency> <groupId>oe-mailjob</groupId> <artifactId>oe-mailjob</artifactId> <version>1.4</version> </dependency> <dependency> <groupId>oe-usermanager-hib</groupId> <artifactId>oe-usermanager-hib</artifactId> <version>1.2</version> </dependency> <dependency> <groupId>oe-thumbs</groupId> <artifactId>oe-thumbs</artifactId> <version>1.2</version> </dependency> <dependency> <groupId>openedge-util</groupId> <artifactId>openedge-util</artifactId> <version>1.2.7</version> </dependency> <dependency> <groupId>openedge-velocity-stringresources</groupId> <artifactId>openedge-velocity-stringresources</artifactId> <version>1.0</version> </dependency> <dependency> <groupId>openedge</groupId> <artifactId>baritus</artifactId> <version>1.0.13</version> </dependency> </dependencies> </project> Index: .classpath =================================================================== RCS file: /cvsroot/burgerweeshuis/old-site/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 4 May 2005 14:42:59 -0000 1.1 --- .classpath 5 Dec 2007 09:14:16 -0000 1.2 *************** *** 1,51 **** - <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path="src/java"/> ! <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/servletapi-2.3-src.jar" kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/commons-beanutils-1.6.1-src.jar" kind="var" path="MAVEN_REPO/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/commons-fileupload-1.0-src.jar" kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-collections/jars/commons-collections-2.1.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-digester/jars/commons-digester-1.3.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.1-dev.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-1.0.1.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-io/jars/commons-io-SNAPSHOT.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-betwixt/jars/commons-betwixt-SNAPSHOT.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.1.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/commons-pool/jars/commons-pool-1.1.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/oro/jars/oro-2.0.7.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/fop/jars/fop-1.0dev.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/avalon-framework/jars/avalon-framework-4.1.4.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/batik/jars/batik-1.5-b5.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/jstl/jars/jstl-1.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/jakarta-taglibs-standard/jars/jakarta-taglibs-standard-1.0.3.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/jakarta-taglibs-string/jars/jakarta-taglibs-string-1.1.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/lucene/jars/lucene-1.3-rc2-dev.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.8.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-b8.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/dom4j/jars/dom4j-1.4.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/quartz-1.2.3-src.jar" kind="var" path="MAVEN_REPO/quartz/jars/quartz-1.2.3.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/ehcache/jars/ehcache-0.7.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/jta/jars/jta-1.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/odmg/jars/odmg-3.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/cglib/jars/cglib-full-2.0-RC2.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/maverick/jars/maverick-2.2.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/velocity-tools/jars/velocity-tools-1.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/jaf/jars/activation-1.0.2.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/opensymphony/jars/oscache-2.0.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/javamail/jars/javamail-1.3.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/mysql/jars/mysql-connector-java-3.0.11-stable-bin.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/openedge-modules-1.2-src.jar" kind="var" path="MAVEN_REPO/openedge-modules/jars/openedge-modules-1.2.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/openedge-access/jars/openedge-access-1.2.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/oe-mailjob/jars/oe-mailjob-1.4.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/oe-usermanager-hib/jars/oe-usermanager-hib-1.2.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/oe-thumbs/jars/oe-thumbs-1.2.jar"/> ! <classpathentry kind="var" path="MAVEN_REPO/ognl/jars/ognl-2.6.4.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/openedge-velocity-stringresources-1.0-src.jar" kind="var" path="MAVEN_REPO/openedge-velocity-stringresources/jars/openedge-velocity-stringresources-1.0.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/jetty-4.2.11-src.jar" kind="var" path="MAVEN_REPO/jetty/jars/jetty-4.2.11.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/velocity-1.4-rc1-src.jar" kind="var" path="MAVEN_REPO/velocity/jars/velocity-1.4-rc1.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/hibernate-2.1.3-src.jar" kind="var" path="MAVEN_REPO/hibernate/jars/hibernate-2.1.3.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/openedge-util-1.2.7-src.jar" kind="var" path="MAVEN_REPO/openedge-util/jars/openedge-util-1.2.7.jar"/> ! <classpathentry sourcepath="ECLIPSE_HOME/workspace/java-source-jars/source-jars/baritus-1.0.8-src.jar" kind="var" path="MAVEN_REPO/openedge/jars/baritus-1.0.8.jar"/> ! <classpathentry kind="output" path="target/classes"/> ! </classpath> --- 1,50 ---- <classpath> ! <classpathentry kind="src" path="src/java"/> ! <classpathentry kind="output" path="target/classes"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.4/avalon-framework-4.1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/batik/batik/1.5-b5/batik-1.5-b5.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.6.1/commons-beanutils-1.6.1.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.6.1/commons-beanutils-1.6.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0/commons-logging-1.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.0/commons-collections-2.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-betwixt/commons-betwixt/0.8/commons-betwixt-0.8.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.3/commons-digester-1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.2/commons-dbcp-1.2.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/1.0.1/commons-lang-1.0.1.jar"/> ! <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/fop/fop/1.0dev/fop-1.0dev.jar"/> ! <classpathentry kind="var" path="M2_REPO/hibernate/hibernate/2.1.8/hibernate-2.1.8.jar" sourcepath="M2_REPO/hibernate/hibernate/2.1.8/hibernate-2.1.8-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/jasperreports/jasperreports/0.5.2/jasperreports-0.5.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> ! <classpathentry kind="var" path="M2_REPO/jdom/jdom/b9/jdom-b9.jar"/> ! <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/> ! <classpathentry kind="var" path="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3.jar" sourcepath="M2_REPO/lucene/lucene/1.4.3/lucene-1.4.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/maverick/maverick/2.2.3/maverick-2.2.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/3.1.14/mysql-connector-java-3.1.14.jar"/> ! <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar" sourcepath="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/oe-mailjob/oe-mailjob/1.4/oe-mailjob-1.4.jar"/> ! <classpathentry kind="var" path="M2_REPO/oe-thumbs/oe-thumbs/1.2/oe-thumbs-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/oe-usermanager-hib/oe-usermanager-hib/1.2/oe-usermanager-hib-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9.jar" sourcepath="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/openedge/baritus/1.0.13/baritus-1.0.13.jar"/> ! <classpathentry kind="var" path="M2_REPO/openedge-access/openedge-access/1.2.5/openedge-access-1.2.5.jar"/> ! <classpathentry kind="var" path="M2_REPO/openedge-modules/openedge-modules/1.2/openedge-modules-1.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/openedge-util/openedge-util/1.2.7/openedge-util-1.2.7.jar"/> ! <classpathentry kind="var" path="M2_REPO/openedge-velocity-stringresources/openedge-velocity-stringresources/1.0/openedge-velocity-stringresources-1.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/opensymphony/oscache/2.0.2/oscache-2.0.2.jar"/> ! <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/> ! <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.2.3/quartz-1.2.3.jar"/> ! <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar" sourcepath="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2-sources.jar"/> ! <classpathentry kind="var" path="M2_REPO/taglibs/string/1.1.0/string-1.1.0.jar"/> ! <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4-rc1/velocity-1.4-rc1.jar"/> ! <classpathentry kind="var" path="M2_REPO/velocity-tools/velocity-tools/1.2/velocity-tools-1.2.jar"/> ! </classpath> \ No newline at end of file |
|
From: Eelco H. <ee...@us...> - 2007-12-05 09:14:13
|
Update of /cvsroot/burgerweeshuis/old-site/.settings In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25834/.settings Modified Files: org.eclipse.jdt.core.prefs Log Message: update update Index: org.eclipse.jdt.core.prefs =================================================================== RCS file: /cvsroot/burgerweeshuis/old-site/.settings/org.eclipse.jdt.core.prefs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** org.eclipse.jdt.core.prefs 1 Oct 2005 10:02:46 -0000 1.1 --- org.eclipse.jdt.core.prefs 5 Dec 2007 09:14:16 -0000 1.2 *************** *** 1,4 **** ! #Sat Oct 01 12:02:26 CEST 2005 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.doc.comment.support=disabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning --- 1,6 ---- ! #Wed Dec 05 00:37:23 PST 2007 eclipse.preferences.version=1 + org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 + org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.doc.comment.support=disabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning *************** *** 58,59 **** --- 60,62 ---- org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning + org.eclipse.jdt.core.compiler.source=1.3 |
|
From: Eelco H. <ee...@us...> - 2007-07-04 01:37:02
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel3 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11778/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel3 Modified Files: Planning.java Planning.html Log Message: more wip Index: Planning.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel3/Planning.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Planning.java 3 Jul 2007 05:43:19 -0000 1.26 --- Planning.java 4 Jul 2007 01:37:01 -0000 1.27 *************** *** 14,23 **** import nl.topicus.bwh.entities.Catagory; ! import org.apache.wicket.extensions.yui.calendar.DatePicker; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; - import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.PropertyModel; --- 14,22 ---- import nl.topicus.bwh.entities.Catagory; ! import org.apache.wicket.extensions.yui.calendar.DateTimeField; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.PropertyModel; *************** *** 98,102 **** add(new Label("catagory", allCategories) .setEscapeModelStrings(false)); ! addDatePickers(); addDropDownChoices(); } --- 97,114 ---- add(new Label("catagory", allCategories) .setEscapeModelStrings(false)); ! ! add(new DateTimeField("dateProperty", new PropertyModel(properties, ! "dateProperty"))); ! add(new DateTimeField("dateProperty1", new PropertyModel( ! properties, "dateProperty1"))); ! add(new DateTimeField("dateProperty2", new PropertyModel( ! properties, "dateProperty2"))); ! ! // if (!panel.isNewplanning()) { ! // startReservationDateField.setModelValue(startReservationDate); ! // endReservationDateField.setModelValue(endReservationDate); ! // activityDateField.setModelValue(startActivityDate); ! // } ! addDropDownChoices(); } *************** *** 109,202 **** */ public boolean validInput() { ! startReservationDate = startReservationDateField ! .getModelObjectAsString(); ! endReservationDate = endReservationDateField ! .getModelObjectAsString(); ! startActivityDate = activityDateField.getModelObjectAsString(); ! startReservationHours = selectResStartHours ! .getModelObjectAsString(); ! endReservationHours = selectResEndHours.getModelObjectAsString(); ! startActivityHours = selectActivityHours.getModelObjectAsString(); ! startReservationMinutes = selectResStartMinutes ! .getModelObjectAsString(); ! endReservationMinutes = selectResEndMinutes ! .getModelObjectAsString(); ! startActivityMinutes = selectActivityMinutes ! .getModelObjectAsString(); ! ! boolean correct = true; ! DateFormat datetimeForm = DateFormat.getDateTimeInstance( ! DateFormat.SHORT, DateFormat.SHORT, nl); ! ! if (startReservationDate.length() > 0) ! try { ! datetimeForm.parse(startReservationDate + " " ! + startReservationHours + ":" ! + startReservationMinutes); ! } catch (ParseException e) { ! correct = false; ! System.out.println("unable to parse: " ! + startReservationDate + " " ! + startReservationHours + ":" ! + startReservationMinutes); ! info("'Datum aanvang reserveringen' is nog niet correct ingevult. Correcte format: dd-mm-jjjj"); ! } ! ! if (endReservationDate.length() > 0) ! try { ! datetimeForm ! .parse(endReservationDate + " " ! + endReservationHours + ":" ! + endReservationMinutes); ! } catch (ParseException e) { ! correct = false; ! System.out.println("unable to parse: " + endReservationDate ! + " " + endReservationHours + ":" ! + endReservationMinutes); ! info("'Datum einde reserveringen' is nog niet correct ingevult. Correcte format: dd-mm-jjjj"); ! } ! ! try { ! datetimeForm.parse(startActivityDate + " " + startActivityHours ! + ":" + startActivityMinutes); ! } catch (ParseException e) { ! correct = false; ! System.out ! .println("unable to parse: " + startActivityDate + " " ! + startActivityHours + ":" ! + startActivityMinutes); ! info("'Datum aanvang activiteit' is nog niet correct ingevult. Correcte format: dd-mm-jjjj"); ! } ! ! return correct; ! } ! ! private void addDatePickers() { ! WebMarkupContainer dateLabel = new WebMarkupContainer("dateLabel"); ! add(dateLabel); ! startReservationDateField = new TextField("dateProperty", ! new PropertyModel(properties, "dateProperty")); ! startReservationDateField.add(new DatePicker()); ! add(startReservationDateField); ! ! WebMarkupContainer dateLabel1 = new WebMarkupContainer("dateLabel1"); ! add(dateLabel1); ! endReservationDateField = new TextField("dateProperty1", ! new PropertyModel(properties, "dateProperty1")); ! endReservationDateField.add(new DatePicker()); ! add(endReservationDateField); ! ! WebMarkupContainer dateLabel2 = new WebMarkupContainer("dateLabel2"); ! add(dateLabel2); ! activityDateField = new TextField("dateProperty2", ! new PropertyModel(properties, "dateProperty2")); ! activityDateField.add(new DatePicker()); ! add(activityDateField); ! if (!panel.isNewplanning()) { ! startReservationDateField.setModelValue(startReservationDate); ! endReservationDateField.setModelValue(endReservationDate); ! activityDateField.setModelValue(startActivityDate); ! } } --- 121,191 ---- */ public boolean validInput() { ! // startReservationDate = startReservationDateField ! // .getModelObjectAsString(); ! // endReservationDate = endReservationDateField ! // .getModelObjectAsString(); ! // startActivityDate = activityDateField.getModelObjectAsString(); ! // startReservationHours = selectResStartHours ! // .getModelObjectAsString(); ! // endReservationHours = selectResEndHours.getModelObjectAsString(); ! // startActivityHours = ! // selectActivityHours.getModelObjectAsString(); ! // startReservationMinutes = selectResStartMinutes ! // .getModelObjectAsString(); ! // endReservationMinutes = selectResEndMinutes ! // .getModelObjectAsString(); ! // startActivityMinutes = selectActivityMinutes ! // .getModelObjectAsString(); ! // ! // boolean correct = true; ! // DateFormat datetimeForm = DateFormat.getDateTimeInstance( ! // DateFormat.SHORT, DateFormat.SHORT, nl); ! // ! // if (startReservationDate.length() > 0) ! // try { ! // datetimeForm.parse(startReservationDate + " " ! // + startReservationHours + ":" ! // + startReservationMinutes); ! // } catch (ParseException e) { ! // correct = false; ! // System.out.println("unable to parse: " ! // + startReservationDate + " " ! // + startReservationHours + ":" ! // + startReservationMinutes); ! // info("'Datum aanvang reserveringen' is nog niet correct ingevult. ! // Correcte format: dd-mm-jjjj"); ! // } ! // ! // if (endReservationDate.length() > 0) ! // try { ! // datetimeForm ! // .parse(endReservationDate + " " ! // + endReservationHours + ":" ! // + endReservationMinutes); ! // } catch (ParseException e) { ! // correct = false; ! // System.out.println("unable to parse: " + endReservationDate ! // + " " + endReservationHours + ":" ! // + endReservationMinutes); ! // info("'Datum einde reserveringen' is nog niet correct ingevult. ! // Correcte format: dd-mm-jjjj"); ! // } ! // ! // try { ! // datetimeForm.parse(startActivityDate + " " + startActivityHours ! // + ":" + startActivityMinutes); ! // } catch (ParseException e) { ! // correct = false; ! // System.out ! // .println("unable to parse: " + startActivityDate + " " ! // + startActivityHours + ":" ! // + startActivityMinutes); ! // info("'Datum aanvang activiteit' is nog niet correct ingevult. ! // Correcte format: dd-mm-jjjj"); ! // } ! // ! // return correct; ! return true; } *************** *** 426,432 **** private DropDownChoice selectStageOpenHours, selectStageOpenMinutes; - private TextField startReservationDateField, endReservationDateField, - activityDateField; - /** * @param id --- 415,418 ---- Index: Planning.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel3/Planning.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Planning.html 4 Jul 2007 00:14:47 -0000 1.3 --- Planning.html 4 Jul 2007 01:37:01 -0000 1.4 *************** *** 1,94 **** <?xml version="1.0" encoding="UTF-8"?> ! <html xmlns="http://www.w3.org/1999/xhtml" > <wicket:panel> <div id="nestedTabContentContainer"> <form wicket:id="planning"> ! <fieldset id="AgendaInfo"> ! ! <legend>Info</legend> ! <div id="AgendaLabel"> ! <label>ID:</label><br> <label>Titel:</label><br> <label>Subtitel:</label><br> ! <label>Categorie:</label> ! </div> ! <div id="AgendaLabelInfo"> ! <label wicket:id="agendaid">5498</label><br> <label wicket:id="title">Eclipse met O.A. D.J. Remy</label><br> <label wicket:id="subtitle">Techno/tech-house/hardstyle</label><br> ! <label wicket:id="catagory">Dance(hedendaags)</label> ! </div> ! </fieldset> ! ! <fieldset id="AgendaPlanning"> ! <legend>Planning</legend> ! ! <div id="date1"> ! <label wicket:id="dateLabel" for="dateProperty" id="AgendaLabel">Datum aanvang reserveringen:</label> ! <input wicket:id="dateProperty" type=text size=10 id="AgendaLabelField" class="test" /> ! <span wicket:id="datePicker" id="AgendaCal"></span> ! </div> ! ! <div id="time1"> ! <label id="agendaTime">Tijd aanvang reserveringen:</label> ! <select wicket:id="hours" id="AgendaHour"> uren ! </select> ! <select wicket:id="minutes" id="AgendaMinutes"> ! minuten ! </select> ! </div> ! ! <div id="date2"> ! <label wicket:id="dateLabel1" for="dateProperty1" id="AgendaLabel">Datum einde reserveringen:</label> ! <input wicket:id="dateProperty1" type=text size=10 id="AgendaLabelField" class="test" /> ! <span wicket:id="datePicker1" id="AgendaCal"></span> ! </div> ! ! <div id="time2"> ! <label id="agendaTime">Tijd einde reserveringen:</label> ! <select wicket:id="hours1" id="AgendaHour"> uren ! </select> ! <select wicket:id="minutes1" id="AgendaMinutes"> ! minuten ! </select> ! </div> ! ! ! <div id="date3" class="test0"> ! <label wicket:id="dateLabel2" for="dateProperty2" id="AgendaLabel">Datum aanvang activiteit:</label> ! <input wicket:id="dateProperty2" type=text size=10 id="AgendaLabelField" class="test" /> ! <span wicket:id="datePicker2" id="AgendaCal"></span> ! </div> ! <div id="time3"> ! <label id="agendaTime">Tijd aanvang activiteit:</label> ! <select wicket:id="hours2" id="AgendaHour"> uren ! </select> ! <select wicket:id="minutes2" id="AgendaMinutes"> ! minuten ! </select> ! </div> ! ! <div id="time4"> ! <label id="agendaTime">Zaal open:</label> ! <select wicket:id="hours3" id="AgendaHour"> uren ! </select> ! <select wicket:id="minutes3" id="AgendaMinutes"> ! minuten ! </select> ! </div> ! <div id="AgendaPlanningButtons"> ! <input type="submit" value="Opslaan" /> ! </div> </fieldset> ! ! </form> ! </div> ! </wicket:panel> </html> \ No newline at end of file --- 1,65 ---- <?xml version="1.0" encoding="UTF-8"?> ! <html xmlns="http://www.w3.org/1999/xhtml"> <wicket:panel> <div id="nestedTabContentContainer"> <form wicket:id="planning"> ! <fieldset id="AgendaInfo"><legend>Info</legend> ! <div id="AgendaLabel"><label>ID:</label><br> <label>Titel:</label><br> <label>Subtitel:</label><br> ! <label>Categorie:</label></div> ! <div id="AgendaLabelInfo"><label wicket:id="agendaid">5498</label><br> <label wicket:id="title">Eclipse met O.A. D.J. Remy</label><br> <label wicket:id="subtitle">Techno/tech-house/hardstyle</label><br> ! <label wicket:id="catagory">Dance(hedendaags)</label></div> ! </fieldset> ! ! <fieldset id="AgendaPlanning"><legend>Planning</legend> ! ! <div id="date1">Datum aanvang reserveringen: <span ! wicket:id="dateProperty" /></div> ! ! <div id="time1"><label id="agendaTime">Tijd aanvang ! reserveringen:</label> <select wicket:id="hours" id="AgendaHour"> uren ! </select> <select wicket:id="minutes" id="AgendaMinutes"> ! minuten ! </select></div> ! ! <div id="date2">Datum einde reserveringen: <span ! wicket:id="dateProperty1" /></div> ! ! <div id="time2"><label id="agendaTime">Tijd einde ! reserveringen:</label> <select wicket:id="hours1" id="AgendaHour"> uren ! </select> <select wicket:id="minutes1" id="AgendaMinutes"> ! minuten ! </select></div> ! ! ! <div id="date3" class="test0">Datum aanvang activiteit: <span ! wicket:id="dateProperty2" /></div> ! <div id="time3"><label id="agendaTime">Tijd aanvang ! activiteit:</label> <select wicket:id="hours2" id="AgendaHour"> uren ! </select> <select wicket:id="minutes2" id="AgendaMinutes"> ! minuten ! </select></div> ! ! <div id="time4"><label id="agendaTime">Zaal open:</label> <select ! wicket:id="hours3" id="AgendaHour"> uren ! </select> <select wicket:id="minutes3" id="AgendaMinutes"> ! minuten ! </select></div> ! <div id="AgendaPlanningButtons"><input type="submit" ! value="Opslaan" /></div> </fieldset> ! ! </form> ! </div> ! </wicket:panel> </html> \ No newline at end of file |
|
From: Eelco H. <ee...@us...> - 2007-07-04 01:37:02
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/dao/hibernate In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11778/src/main/java/nl/topicus/bwh/dao/hibernate Modified Files: WebsiteUserDataAccessHelper.java ReservationDataAccessHelper.java Log Message: more wip Index: WebsiteUserDataAccessHelper.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/dao/hibernate/WebsiteUserDataAccessHelper.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** WebsiteUserDataAccessHelper.java 25 Jun 2007 16:38:48 -0000 1.10 --- WebsiteUserDataAccessHelper.java 4 Jul 2007 01:37:01 -0000 1.11 *************** *** 20,32 **** * @author Graduates at Topicus */ ! public class WebsiteUserDataAccessHelper extends HibernateDataAccesshelper<WebsiteUser> implements ! Serializable, nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper ! { /** * @param provider */ ! public WebsiteUserDataAccessHelper(HibernateSessionProvider provider) ! { super(provider); } --- 20,31 ---- * @author Graduates at Topicus */ ! public class WebsiteUserDataAccessHelper extends ! HibernateDataAccesshelper<WebsiteUser> implements Serializable, ! nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper { /** * @param provider */ ! public WebsiteUserDataAccessHelper(HibernateSessionProvider provider) { super(provider); } *************** *** 35,41 **** * @see nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper#getUserId(java.lang.String) */ ! public Long getUserId(String email) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(WebsiteUser.class); criteria.add(Restrictions.like("emailAddress", email)); return ((WebsiteUser) criteria.uniqueResult()).getId(); --- 34,40 ---- * @see nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper#getUserId(java.lang.String) */ ! public Long getUserId(String email) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! WebsiteUser.class); criteria.add(Restrictions.like("emailAddress", email)); return ((WebsiteUser) criteria.uniqueResult()).getId(); *************** *** 46,52 **** * java.lang.String, java.lang.String) */ ! public WebsiteUser getUser(String email, String firstName, String lastName) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(WebsiteUser.class); criteria.add(Restrictions.like("emailAddress", email)); criteria.add(Restrictions.like("firstName", firstName)); --- 45,51 ---- * java.lang.String, java.lang.String) */ ! public WebsiteUser getUser(String email, String firstName, String lastName) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! WebsiteUser.class); criteria.add(Restrictions.like("emailAddress", email)); criteria.add(Restrictions.like("firstName", firstName)); *************** *** 59,68 **** * java.lang.String, boolean) */ ! public List<WebsiteUser> find(int offset, int aantal, String sortProperty, boolean ascending) ! { Order order = Order.asc(sortProperty); if (!ascending) order = Order.desc(sortProperty); ! Criteria criteria = getSessionProvider().getSession().createCriteria(WebsiteUser.class); criteria.addOrder(order).setFirstResult(offset).setFetchSize(aantal); return typeSafeList(criteria); --- 58,68 ---- * java.lang.String, boolean) */ ! public List<WebsiteUser> find(int offset, int aantal, String sortProperty, ! boolean ascending) { Order order = Order.asc(sortProperty); if (!ascending) order = Order.desc(sortProperty); ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! WebsiteUser.class); criteria.addOrder(order).setFirstResult(offset).setFetchSize(aantal); return typeSafeList(criteria); *************** *** 72,79 **** * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#find(int, int) */ ! public List<WebsiteUser> find(int offset, int aantal) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(WebsiteUser.class) ! .setFirstResult(offset).setFetchSize(aantal); return typeSafeList(criteria); } --- 72,78 ---- * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#find(int, int) */ ! public List<WebsiteUser> find(int offset, int aantal) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! WebsiteUser.class).setFirstResult(offset).setFetchSize(aantal); return typeSafeList(criteria); } *************** *** 82,89 **** * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#count() */ ! public int count() ! { ! return (Integer) typeUnSafeUnique(getSessionProvider().getSession().createCriteria( ! WebsiteUser.class).setProjection(Projections.rowCount())); } --- 81,88 ---- * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#count() */ ! public int count() { ! return (Integer) typeUnSafeUnique(getSessionProvider().getSession() ! .createCriteria(WebsiteUser.class).setProjection( ! Projections.rowCount())); } *************** *** 93,104 **** */ @SuppressWarnings("unchecked") ! public List<WebsiteUser> find(int offset, int aantal, String sortProperty, boolean ascending, ! List<Catagory> catagories) ! { int length = catagories.size(); String query = "select distinct websiteuser from WebsiteUser websiteuser "; int length1 = length; ! if (length1 != 0) ! { query = query + "join websiteuser.catagories catagorie where catagorie = :description" --- 92,101 ---- */ @SuppressWarnings("unchecked") ! public List<WebsiteUser> find(int offset, int aantal, String sortProperty, ! boolean ascending, List<Catagory> catagories) { int length = catagories.size(); String query = "select distinct websiteuser from WebsiteUser websiteuser "; int length1 = length; ! if (length1 != 0) { query = query + "join websiteuser.catagories catagorie where catagorie = :description" *************** *** 108,113 **** // unknown how many catagories are selected ! while (length1 > 0) ! { query = query + " or catagorie = :description" + length1; length1--; --- 105,109 ---- // unknown how many catagories are selected ! while (length1 > 0) { query = query + " or catagorie = :description" + length1; length1--; *************** *** 123,129 **** length1 = length; ! while (length1 > 0) ! { ! select.setParameter("description" + length1, catagories.get(length1 - 1)); length1--; } --- 119,125 ---- length1 = length; ! while (length1 > 0) { ! select.setParameter("description" + length1, catagories ! .get(length1 - 1)); length1--; } *************** *** 138,149 **** * @see nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper#count(java.util.List) */ ! public int count(List<Catagory> catagories) ! { int length = catagories.size(); String query = "select count(distinct websiteuser) from WebsiteUser websiteuser "; int length1 = length; ! if (length1 != 0) ! { query = query + "join websiteuser.catagories catagorie where catagorie = :description" --- 134,143 ---- * @see nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper#count(java.util.List) */ ! public int count(List<Catagory> catagories) { int length = catagories.size(); String query = "select count(distinct websiteuser) from WebsiteUser websiteuser "; int length1 = length; ! if (length1 != 0) { query = query + "join websiteuser.catagories catagorie where catagorie = :description" *************** *** 151,156 **** length1--; } ! while (length1 > 0) ! { query = query + " or catagorie = :description" + length1; length1--; --- 145,149 ---- length1--; } ! while (length1 > 0) { query = query + " or catagorie = :description" + length1; length1--; *************** *** 159,168 **** Query select = getSessionProvider().getSession().createQuery(query); length1 = length; ! while (length1 > 0) ! { ! select.setParameter("description" + length1, catagories.get(length1 - 1)); length1--; } ! return (Integer) select.uniqueResult(); } --- 152,161 ---- Query select = getSessionProvider().getSession().createQuery(query); length1 = length; ! while (length1 > 0) { ! select.setParameter("description" + length1, catagories ! .get(length1 - 1)); length1--; } ! return ((Number) select.uniqueResult()).intValue(); } *************** *** 170,180 **** * @see nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper#getCatagoryWebsiteUsers(java.util.List) */ ! public List<WebsiteUser> getCatagoryWebsiteUsers(List<Catagory> catagories) ! { int length = catagories.size(); String query = "select distinct websiteuser from WebsiteUser websiteuser "; int length1 = length; ! if (length1 != 0) ! { query = query + "join websiteuser.catagories catagorie where catagorie = :description" --- 163,171 ---- * @see nl.topicus.bwh.dao.helper.WebsiteUserDataAccessHelper#getCatagoryWebsiteUsers(java.util.List) */ ! public List<WebsiteUser> getCatagoryWebsiteUsers(List<Catagory> catagories) { int length = catagories.size(); String query = "select distinct websiteuser from WebsiteUser websiteuser "; int length1 = length; ! if (length1 != 0) { query = query + "join websiteuser.catagories catagorie where catagorie = :description" *************** *** 184,189 **** // unknown how many catagories are selected ! while (length1 > 0) ! { query = query + " or catagorie = :description" + length1; length1--; --- 175,179 ---- // unknown how many catagories are selected ! while (length1 > 0) { query = query + " or catagorie = :description" + length1; length1--; *************** *** 193,199 **** length1 = length; ! while (length1 > 0) ! { ! select.setParameter("description" + length1, catagories.get(length1 - 1)); length1--; } --- 183,189 ---- length1 = length; ! while (length1 > 0) { ! select.setParameter("description" + length1, catagories ! .get(length1 - 1)); length1--; } Index: ReservationDataAccessHelper.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/dao/hibernate/ReservationDataAccessHelper.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ReservationDataAccessHelper.java 25 Jun 2007 16:38:48 -0000 1.13 --- ReservationDataAccessHelper.java 4 Jul 2007 01:37:01 -0000 1.14 *************** *** 19,31 **** * @author Authors at Topicus */ ! public class ReservationDataAccessHelper extends HibernateDataAccesshelper<Reservation> implements ! Serializable, nl.topicus.bwh.dao.helper.ReservationDataAccessHelper ! { /** * @param provider */ ! public ReservationDataAccessHelper(HibernateSessionProvider provider) ! { super(provider); } --- 19,30 ---- * @author Authors at Topicus */ ! public class ReservationDataAccessHelper extends ! HibernateDataAccesshelper<Reservation> implements Serializable, ! nl.topicus.bwh.dao.helper.ReservationDataAccessHelper { /** * @param provider */ ! public ReservationDataAccessHelper(HibernateSessionProvider provider) { super(provider); } *************** *** 35,47 **** * java.lang.String, boolean) */ ! public List<Reservation> find(int offset, int aantal, String sortProperty, boolean ascending) ! { Order order = Order.asc(sortProperty); if (!ascending) order = Order.desc(sortProperty); ! Criteria criteria = getSessionProvider().getSession().createCriteria(AgendaItem.class); ! criteria.addOrder(order).createAlias("agendaItem", "agendaItem").setFirstResult(offset) ! .setFetchSize(aantal); ! // criteria.setProjection(( Projections.sqlGroupProjection("reservation from // Reservation as reservation", "agendaItem.title", null, null))); return typeSafeList(criteria); --- 34,48 ---- * java.lang.String, boolean) */ ! public List<Reservation> find(int offset, int aantal, String sortProperty, ! boolean ascending) { Order order = Order.asc(sortProperty); if (!ascending) order = Order.desc(sortProperty); ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! AgendaItem.class); ! criteria.addOrder(order).createAlias("agendaItem", "agendaItem") ! .setFirstResult(offset).setFetchSize(aantal); ! // criteria.setProjection(( Projections.sqlGroupProjection("reservation ! // from // Reservation as reservation", "agendaItem.title", null, null))); return typeSafeList(criteria); *************** *** 52,64 **** * java.lang.String, boolean, AgendaItem) */ ! public List<Reservation> find(int offset, int aantal, String sortProperty, boolean ascending, ! AgendaItem agendaItem) ! { Order order = Order.asc(sortProperty); if (!ascending) order = Order.desc(sortProperty); ! Criteria criteria = getSessionProvider().getSession().createCriteria(Reservation.class); ! criteria.addOrder(order).createAlias("websiteUser", "websiteUser").setFirstResult(offset) ! .setFetchSize(aantal); criteria.add(Restrictions.like("agendaItem", agendaItem)); return typeSafeList(criteria); --- 53,65 ---- * java.lang.String, boolean, AgendaItem) */ ! public List<Reservation> find(int offset, int aantal, String sortProperty, ! boolean ascending, AgendaItem agendaItem) { Order order = Order.asc(sortProperty); if (!ascending) order = Order.desc(sortProperty); ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! Reservation.class); ! criteria.addOrder(order).createAlias("websiteUser", "websiteUser") ! .setFirstResult(offset).setFetchSize(aantal); criteria.add(Restrictions.like("agendaItem", agendaItem)); return typeSafeList(criteria); *************** *** 68,75 **** * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#count() */ ! public int count() ! { ! return (Integer) typeUnSafeUnique(getSessionProvider().getSession().createCriteria( ! Reservation.class).setProjection(Projections.rowCount())); } --- 69,76 ---- * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#count() */ ! public int count() { ! return (Integer) typeUnSafeUnique(getSessionProvider().getSession() ! .createCriteria(Reservation.class).setProjection( ! Projections.rowCount())); } *************** *** 77,82 **** * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#getAmountOfReservations(nl.topicus.bwh.entities.AgendaItem) */ ! public Integer getAmountOfReservations(AgendaItem agendaItem) ! { Query query = getSessionProvider() .getSession() --- 78,82 ---- * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#getAmountOfReservations(nl.topicus.bwh.entities.AgendaItem) */ ! public Integer getAmountOfReservations(AgendaItem agendaItem) { Query query = getSessionProvider() .getSession() *************** *** 84,88 **** "select sum(reservation.amount) from Reservation as reservation where agendaItem = :agenda"); query.setParameter("agenda", agendaItem); ! return (Integer) query.uniqueResult(); } --- 84,88 ---- "select sum(reservation.amount) from Reservation as reservation where agendaItem = :agenda"); query.setParameter("agenda", agendaItem); ! return ((Number) query.uniqueResult()).intValue(); } *************** *** 90,97 **** * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#find(int, int) */ ! public List<Reservation> find(int offset, int aantal) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(Reservation.class) ! .setFirstResult(offset).setFetchSize(aantal); return typeSafeList(criteria); } --- 90,96 ---- * @see nl.topicus.bwh.dao.helper.DataTableAccessHelper#find(int, int) */ ! public List<Reservation> find(int offset, int aantal) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! Reservation.class).setFirstResult(offset).setFetchSize(aantal); return typeSafeList(criteria); } *************** *** 100,108 **** * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#count(nl.topicus.bwh.entities.AgendaItem) */ ! public int count(AgendaItem agendaItem) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(Reservation.class); criteria.add(Restrictions.like("agendaItem", agendaItem)); ! return (Integer) typeUnSafeUnique(criteria.setProjection(Projections.rowCount())); } --- 99,108 ---- * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#count(nl.topicus.bwh.entities.AgendaItem) */ ! public int count(AgendaItem agendaItem) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! Reservation.class); criteria.add(Restrictions.like("agendaItem", agendaItem)); ! return (Integer) typeUnSafeUnique(criteria.setProjection(Projections ! .rowCount())); } *************** *** 110,121 **** * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#getReservations(nl.topicus.bwh.entities.AgendaItem) */ ! public Iterator getReservations(AgendaItem agendaItem) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(Reservation.class); criteria.add(Restrictions.like("agendaItem", agendaItem)); return typeSafeList(criteria).iterator(); ! // String query = "select distinct reservation from Reservation as reservation // where agendaItem = :agenda order by websiteUser.lastName asc"; // Query select = getSessionProvider().getSession().createQuery(query); --- 110,122 ---- * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#getReservations(nl.topicus.bwh.entities.AgendaItem) */ ! public Iterator getReservations(AgendaItem agendaItem) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! Reservation.class); criteria.add(Restrictions.like("agendaItem", agendaItem)); return typeSafeList(criteria).iterator(); ! // String query = "select distinct reservation from Reservation as ! // reservation // where agendaItem = :agenda order by websiteUser.lastName asc"; // Query select = getSessionProvider().getSession().createQuery(query); *************** *** 133,139 **** * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#getReservations(nl.topicus.bwh.entities.WebsiteUser) */ ! public Iterator getReservations(WebsiteUser websiteUser) ! { ! Criteria criteria = getSessionProvider().getSession().createCriteria(Reservation.class); criteria.add(Restrictions.like("websiteUser", websiteUser)); return criteria.list().iterator(); --- 134,140 ---- * @see nl.topicus.bwh.dao.helper.ReservationDataAccessHelper#getReservations(nl.topicus.bwh.entities.WebsiteUser) */ ! public Iterator getReservations(WebsiteUser websiteUser) { ! Criteria criteria = getSessionProvider().getSession().createCriteria( ! Reservation.class); criteria.add(Restrictions.like("websiteUser", websiteUser)); return criteria.list().iterator(); |
|
From: Eelco H. <ee...@us...> - 2007-07-04 01:37:02
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel1 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11778/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel1 Modified Files: TabPanel1.java Log Message: more wip Index: TabPanel1.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel1/TabPanel1.java,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** TabPanel1.java 3 Jul 2007 11:35:26 -0000 1.55 --- TabPanel1.java 4 Jul 2007 01:37:02 -0000 1.56 *************** *** 203,207 **** String dbFilePath = newFile.getPath().replace( basefolder.getPath(), ""); ! download.setPath("\\resources" + dbFilePath); DataAccessHelper helper = DataAccessRegistry.getInstance() .getAccessHelper(DataAccessHelper.class); --- 203,207 ---- String dbFilePath = newFile.getPath().replace( basefolder.getPath(), ""); ! download.setPath("/res" + dbFilePath); DataAccessHelper helper = DataAccessRegistry.getInstance() .getAccessHelper(DataAccessHelper.class); *************** *** 211,215 **** String dbFilePath = newFile.getPath().replace( basefolder.getPath(), ""); ! dbFile.setPath("\\resources" + dbFilePath); dbFile.setName(fileDescription.getValue()); DataAccessHelper helper = DataAccessRegistry.getInstance() --- 211,215 ---- String dbFilePath = newFile.getPath().replace( basefolder.getPath(), ""); ! dbFile.setPath("/res" + dbFilePath); dbFile.setName(fileDescription.getValue()); DataAccessHelper helper = DataAccessRegistry.getInstance() *************** *** 266,270 **** this.uploadFolder = new Folder(((BwhApplication) getApplication()) .getUploadFolder() ! + "\\resources\\"); this.basefolder = uploadFolder; --- 266,270 ---- this.uploadFolder = new Folder(((BwhApplication) getApplication()) .getUploadFolder() ! + "/res/"); this.basefolder = uploadFolder; *************** *** 344,348 **** protected void onJunctionLinkClicked(AjaxRequestTarget target, TreeNode node) { - // TODO Auto-generated method stub super.onJunctionLinkClicked(target, node); } --- 344,347 ---- *************** *** 359,364 **** .getUploadFolder()); } else { ! selectedMap(((List) userObject).get(0).toString()); } } }; --- 358,373 ---- .getUploadFolder()); } else { ! ! selectedMap(userObject.toString()); ! } ! } ! ! @Override ! protected String renderNode(TreeNode node) { ! Object o = ((DefaultMutableTreeNode) node).getUserObject(); ! if (!(o instanceof List)) { ! return super.renderNode(node); } + return ""; } }; *************** *** 389,395 **** Object o = i.next(); if (o instanceof List) { DefaultMutableTreeNode child = new DefaultMutableTreeNode(o); parent.add(child); - add(child, (List) o); } } --- 398,405 ---- Object o = i.next(); if (o instanceof List) { + add(parent, (List) o); + } else { DefaultMutableTreeNode child = new DefaultMutableTreeNode(o); parent.add(child); } } |
|
From: Eelco H. <ee...@us...> - 2007-07-04 01:37:02
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11778 Modified Files: pom.xml Log Message: more wip Index: pom.xml =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/pom.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** pom.xml 3 Jul 2007 17:28:53 -0000 1.16 --- pom.xml 4 Jul 2007 01:37:02 -0000 1.17 *************** *** 5,9 **** <modelVersion>4.0.0</modelVersion> <groupId>Burgerweeshuis</groupId> ! <artifactId>Burgerweeshuis-cms</artifactId> <packaging>war</packaging> <version>1.0-SNAPSHOT</version> --- 5,9 ---- <modelVersion>4.0.0</modelVersion> <groupId>Burgerweeshuis</groupId> ! <artifactId>site</artifactId> <packaging>war</packaging> <version>1.0-SNAPSHOT</version> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 01:37:02
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11778/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4 Modified Files: ResDetailsPanel.html Log Message: more wip Index: ResDetailsPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4/ResDetailsPanel.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ResDetailsPanel.html 4 Jul 2007 00:14:44 -0000 1.12 --- ResDetailsPanel.html 4 Jul 2007 01:37:02 -0000 1.13 *************** *** 2,5 **** --- 2,18 ---- <html xmlns="http://www.w3.org/1999/xhtml" > <wicket:panel> + <fieldset id="ResList"> + <legend>Reserveringen voor <span wicket:id="tostring"> </span></legend> + <TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=85%> + <table class="dataview" cellspacing="0" ALIGN="LEFT" wicket:id="table" WIDTH="100%" >[table]</table> + </TABLE> + <label id="resbeschikbaar">in totaal <span wicket:id="reservedTickets"></span> kaartjes gereserveerd (uit <span wicket:id="available"></span> kaartjes beschikbaar)</label> + <div id="resbuttons"> + + <input type=submit value="Terug" name="" /> + <a wicket:id="reserveringpdf"><input type=submit value="PDF" /></a> + <a wicket:id="reserveringcsv"><input type=submit value="Export naar CSV (excel)" /></a> + </div> + </fieldset> <fieldset id="EmailRes"> <legend>Emailbericht voor <span wicket:id="title"> </span></legend> *************** *** 18,34 **** </form> </fieldset> - <fieldset id="ResList"> - <legend>Reserveringen voor <span wicket:id="tostring"> </span></legend> - <TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0 WIDTH=85%> - <table class="dataview" cellspacing="0" ALIGN="LEFT" wicket:id="table" WIDTH="100%" >[table]</table> - </TABLE> - <label id="resbeschikbaar">in totaal <span wicket:id="reservedTickets"></span> kaartjes gereserveerd (uit <span wicket:id="available"></span> kaartjes beschikbaar)</label> - <div id="resbuttons"> - - <input type=submit value="Terug" name="" /> - <a wicket:id="reserveringpdf"><input type=submit value="PDF" /></a> - <a wicket:id="reserveringcsv"><input type=submit value="Export naar CSV (excel)" /></a> - </div> - </fieldset> <span wicket:id="feedback" class="errorfeedback" /> </wicket:panel> --- 31,34 ---- |
|
From: Eelco H. <ee...@us...> - 2007-07-04 01:37:02
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/application In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11778/src/main/java/nl/topicus/bwh/application Modified Files: BwhApplication.java Log Message: more wip Index: BwhApplication.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/application/BwhApplication.java,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** BwhApplication.java 4 Jul 2007 00:14:47 -0000 1.53 --- BwhApplication.java 4 Jul 2007 01:37:01 -0000 1.54 *************** *** 150,154 **** properties.setProperty("uploadfolder", path.replace( "bwh.properties", "") ! + "dir\\naar\\uploadfolder"); try { properties --- 150,154 ---- properties.setProperty("uploadfolder", path.replace( "bwh.properties", "") ! + "./src/webapp/"); try { properties |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:21
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/goedeburen In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/goedeburen Modified Files: GoedeBuren.html Log Message: wip Index: GoedeBuren.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/goedeburen/GoedeBuren.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GoedeBuren.html 3 Jul 2007 18:27:50 -0000 1.2 --- GoedeBuren.html 4 Jul 2007 00:14:48 -0000 1.3 *************** *** 8,14 **** <td bgcolor="#CCCCCC" class="text"><a href="http://www.deventerpopcollectief.nl/" target="_blank"><img ! src="/Fp/popkol.gif" border="0" width="150" height="50"></a><br> <a href="http://www.oninternet.nl/" target="_blank"><img ! src="/Fp/on.gif" border="0" width="150" height="50"></a></td> </tr> </table> --- 8,14 ---- <td bgcolor="#CCCCCC" class="text"><a href="http://www.deventerpopcollectief.nl/" target="_blank"><img ! src="Fp/popkol.gif" border="0" width="150" height="50"></a><br> <a href="http://www.oninternet.nl/" target="_blank"><img ! src="Fp/on.gif" border="0" width="150" height="50"></a></td> </tr> </table> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:19
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/entities In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/entities Modified Files: User.java Log Message: wip Index: User.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/entities/User.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** User.java 25 Jun 2007 16:38:47 -0000 1.13 --- User.java 4 Jul 2007 00:14:47 -0000 1.14 *************** *** 8,18 **** */ @MappedSuperclass ! public abstract class User extends BwhEntity ! { ! @Column(nullable = false, length = 30) private String firstName; ! @Column(nullable = false, length = 30) private String lastName; --- 8,17 ---- */ @MappedSuperclass ! public abstract class User extends BwhEntity { ! @Column(length = 30) private String firstName; ! @Column(length = 30) private String lastName; *************** *** 33,39 **** * @param mobilePhone */ ! public User(String firstName, String lastName, String emailAddress, String homePhone, ! String mobilePhone) ! { super(); this.firstName = firstName; --- 32,37 ---- * @param mobilePhone */ ! public User(String firstName, String lastName, String emailAddress, ! String homePhone, String mobilePhone) { super(); this.firstName = firstName; *************** *** 47,52 **** * needed for hibernate */ ! public User() ! { } --- 45,49 ---- * needed for hibernate */ ! public User() { } *************** *** 54,67 **** * @return Returns the emailAdres. */ ! public String getEmailAddress() ! { return emailAddress; } /** ! * @param emailAddress The emailAdres to set. */ ! public void setEmailAddress(String emailAddress) ! { this.emailAddress = emailAddress; } --- 51,63 ---- * @return Returns the emailAdres. */ ! public String getEmailAddress() { return emailAddress; } /** ! * @param emailAddress ! * The emailAdres to set. */ ! public void setEmailAddress(String emailAddress) { this.emailAddress = emailAddress; } *************** *** 70,83 **** * @return Returns the firstName. */ ! public String getFirstName() ! { return firstName; } /** ! * @param firstName The firstName to set. */ ! public void setFirstName(String firstName) ! { this.firstName = firstName; } --- 66,78 ---- * @return Returns the firstName. */ ! public String getFirstName() { return firstName; } /** ! * @param firstName ! * The firstName to set. */ ! public void setFirstName(String firstName) { this.firstName = firstName; } *************** *** 86,99 **** * @return Returns the homePhone. */ ! public String getHomePhone() ! { return homePhone; } /** ! * @param homePhone The homePhone to set. */ ! public void setHomePhone(String homePhone) ! { this.homePhone = homePhone; } --- 81,93 ---- * @return Returns the homePhone. */ ! public String getHomePhone() { return homePhone; } /** ! * @param homePhone ! * The homePhone to set. */ ! public void setHomePhone(String homePhone) { this.homePhone = homePhone; } *************** *** 102,115 **** * @return Returns the lastName. */ ! public String getLastName() ! { return lastName; } /** ! * @param lastName The lastName to set. */ ! public void setLastName(String lastName) ! { this.lastName = lastName; } --- 96,108 ---- * @return Returns the lastName. */ ! public String getLastName() { return lastName; } /** ! * @param lastName ! * The lastName to set. */ ! public void setLastName(String lastName) { this.lastName = lastName; } *************** *** 118,131 **** * @return Returns the mobilePhone. */ ! public String getMobilePhone() ! { return mobilePhone; } /** ! * @param mobilePhone The mobilePhone to set. */ ! public void setMobilePhone(String mobilePhone) ! { this.mobilePhone = mobilePhone; } --- 111,123 ---- * @return Returns the mobilePhone. */ ! public String getMobilePhone() { return mobilePhone; } /** ! * @param mobilePhone ! * The mobilePhone to set. */ ! public void setMobilePhone(String mobilePhone) { this.mobilePhone = mobilePhone; } |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:19
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/nadorst In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/nadorst Modified Files: NadorstPage.html NadorstMainPage.html Log Message: wip Index: NadorstPage.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/nadorst/NadorstPage.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NadorstPage.html 3 Jul 2007 18:27:50 -0000 1.2 --- NadorstPage.html 4 Jul 2007 00:14:47 -0000 1.3 *************** *** 9,15 **** content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> <link rel="stylesheet" type="text/css" href="bwh.css"> - <SCRIPT language="JavaScript" src="/scripts/stm31.js" - type="text/javascript"> - </SCRIPT> </head> <body bgcolor="#000000"> --- 9,12 ---- *************** *** 90,107 **** <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcFirst"/> ! <img wicket:id="srcwmcfirst" src="/Fp/begin.gif" width="10" height="10" border="0" alt="begin"> </td> <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcPrevious"/> ! <img wicket:id="srcwmcprevious" src="/Fp/vorige.gif" width="10" height="10" border="0" alt="vorige"> </td> <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcNext"/> ! <img wicket:id="srcwmcnext" src="/Fp/volgende.gif " width="10" height="10" border="0" alt="volgende"> </td> <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcLast"/> ! <img wicket:id="srcwmclast" src="/Fp/eind.gif" width="10" height="10" border="0" alt="einde"> </td> </tr> --- 87,104 ---- <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcFirst" /> ! <img wicket:id="srcwmcfirst" src="Fp/begin.gif" width="10" height="10" border="0" alt="begin"> </td> <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcPrevious" /> ! <img wicket:id="srcwmcprevious" src="Fp/vorige.gif" width="10" height="10" border="0" alt="vorige"> </td> <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcNext" /> ! <img wicket:id="srcwmcnext" src="Fp/volgende.gif " width="10" height="10" border="0" alt="volgende"> </td> <td width="12" bgcolor="#CC6633" class="textKop"> ! <a wicket:id="urlhrefwmcLast" /> ! <img wicket:id="srcwmclast" src="Fp/eind.gif" width="10" height="10" border="0" alt="einde"> </td> </tr> *************** *** 111,115 **** <br> <span wicket:id="repeating"> ! <a wicket:id="hrefwmc" target="_blank"/><img wicket:id="imagewmc" height="112" width="150" border="0" align="top"></img> </span> </center> --- 108,112 ---- <br> <span wicket:id="repeating"> ! <a wicket:id="hrefwmc" target="_blank" /><img wicket:id="imagewmc" height="112" width="150" border="0" align="top"></img> </span> </center> *************** *** 146,150 **** <td bgcolor="#CCCCCC" class="text"> <span wicket:id="repeatingfotos"> ! <a wicket:id="fotoshrefwmc" target="_blank"/><img wicket:id="fotosimagewmc" width="150" border="0" align="top"><div wicket:id="fotolabel"></div></img> </span> </td> --- 143,147 ---- <td bgcolor="#CCCCCC" class="text"> <span wicket:id="repeatingfotos"> ! <a wicket:id="fotoshrefwmc" target="_blank" /><img wicket:id="fotosimagewmc" width="150" border="0" align="top"><div wicket:id="fotolabel"></div></img> </span> </td> *************** *** 166,170 **** <td bgcolor="#CCCCCC" class="text"> <span wicket:id="repeatinglinks"> ! <a wicket:id="urlhrefwmc" target="_blank"/><div wicket:id="linklabel"></div> </span> </td> --- 163,167 ---- <td bgcolor="#CCCCCC" class="text"> <span wicket:id="repeatinglinks"> ! <a wicket:id="urlhrefwmc" target="_blank" /><div wicket:id="linklabel"></div> </span> </td> Index: NadorstMainPage.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/nadorst/NadorstMainPage.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NadorstMainPage.html 3 Jul 2007 18:27:50 -0000 1.2 --- NadorstMainPage.html 4 Jul 2007 00:14:47 -0000 1.3 *************** *** 9,15 **** content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> <link rel="stylesheet" type="text/css" href="bwh.css"> - <SCRIPT language="JavaScript" src="/scripts/stm31.js" - type="text/javascript"> - </SCRIPT> </head> <body bgcolor="#000000"> --- 9,12 ---- |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:19
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel5 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel5 Modified Files: EditEmailPanel.html SelectPanel.html ListEmailPanel.html Log Message: wip Index: EditEmailPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel5/EditEmailPanel.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** EditEmailPanel.html 28 Jun 2006 12:55:56 -0000 1.7 --- EditEmailPanel.html 4 Jul 2007 00:14:47 -0000 1.8 *************** *** 7,16 **** <form wicket:id="userform"> <div class="emailinput"> ! <label>E-mail adres:</label><input type=text wicket:id="email"/><br> ! <label>voornaam</label><input type=text wicket:id="voornaam"/><br> ! <label>achternaam</label><input type=text wicket:id="achternaam"/><br> ! <label>telefoon</label><input type=text wicket:id="tel"/><br> ! <label>mobiel</label><input type=text wicket:id="mob"/><br> ! <label>postcode</label><input type=text wicket:id="postalcode"/><br> <label>Toegevoegd:</label><span class="tab"><label wicket:id="added">01-02-2003</label></span><br> <label>Laatst:</label><span class="tab"><label wicket:id="lastres">01-02-2003</label></span><br> --- 7,16 ---- <form wicket:id="userform"> <div class="emailinput"> ! <label>E-mail adres:</label><input type=text wicket:id="email" /><br> ! <label>voornaam</label><input type=text wicket:id="voornaam" /><br> ! <label>achternaam</label><input type=text wicket:id="achternaam" /><br> ! <label>telefoon</label><input type=text wicket:id="tel" /><br> ! <label>mobiel</label><input type=text wicket:id="mob" /><br> ! <label>postcode</label><input type=text wicket:id="postalcode" /><br> <label>Toegevoegd:</label><span class="tab"><label wicket:id="added">01-02-2003</label></span><br> <label>Laatst:</label><span class="tab"><label wicket:id="lastres">01-02-2003</label></span><br> *************** *** 19,23 **** </div> ! <input type=submit value="Opslaan" id="EmailChangeButtons"/> </form> </fieldset> --- 19,23 ---- </div> ! <input type=submit value="Opslaan" id="EmailChangeButtons" /> </form> </fieldset> Index: ListEmailPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel5/ListEmailPanel.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ListEmailPanel.html 25 Jun 2007 16:36:37 -0000 1.8 --- ListEmailPanel.html 4 Jul 2007 00:14:47 -0000 1.9 *************** *** 6,19 **** <form wicket:id="message"> <label id="EmailSubject2">Onderwerp:</label> ! <input type=text name="emailonderwerp" id="EmailSubjectField2" wicket:id="subjectfield"/> <label id="EmailBody2">Bericht:</label> <textarea name="emailbody" cols=80 rows=8 id="emailtextveld2" wicket:id="messagearea">Typ hier uw emailbericht</textarea> <input type=submit value="Voorbeeld" name="" id="Button_example2" /> <div id="emaileditbuttons2"> ! <input type=submit value="Bold" name="" id="Button_bold" wicket:id="bold"/> ! <input type=submit value="Italic" name="" id="Button_italic" wicket:id="italic"/> ! <input type=submit value="Underline" name="" id="Button_underline" wicket:id="underline"/> </div> ! <input type=submit value="Verstuur" name="" id="Button_send2" wicket:id="send"/> </form> </fieldset> --- 6,19 ---- <form wicket:id="message"> <label id="EmailSubject2">Onderwerp:</label> ! <input type=text name="emailonderwerp" id="EmailSubjectField2" wicket:id="subjectfield" /> <label id="EmailBody2">Bericht:</label> <textarea name="emailbody" cols=80 rows=8 id="emailtextveld2" wicket:id="messagearea">Typ hier uw emailbericht</textarea> <input type=submit value="Voorbeeld" name="" id="Button_example2" /> <div id="emaileditbuttons2"> ! <input type=submit value="Bold" name="" id="Button_bold" wicket:id="bold" /> ! <input type=submit value="Italic" name="" id="Button_italic" wicket:id="italic" /> ! <input type=submit value="Underline" name="" id="Button_underline" wicket:id="underline" /> </div> ! <input type=submit value="Verstuur" name="" id="Button_send2" wicket:id="send" /> </form> </fieldset> *************** *** 27,31 **** </div> </fieldset> ! <span wicket:id="feedback" class="errorfeedback"/> </wicket:panel> </html> \ No newline at end of file --- 27,31 ---- </div> </fieldset> ! <span wicket:id="feedback" class="errorfeedback" /> </wicket:panel> </html> \ No newline at end of file Index: SelectPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel5/SelectPanel.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SelectPanel.html 18 Oct 2006 07:14:55 -0000 1.5 --- SelectPanel.html 4 Jul 2007 00:14:47 -0000 1.6 *************** *** 10,14 **** <div id="emailbuttonsmain"> <input type=submit value="Toon Selectie" /> ! <input type="button" wicket:id="add" value="Voeg nieuwe gebruiker toe"/> </div> </form> --- 10,14 ---- <div id="emailbuttonsmain"> <input type=submit value="Toon Selectie" /> ! <input type="button" wicket:id="add" value="Voeg nieuwe gebruiker toe" /> </div> </form> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:19
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/db_converter/bwhDatabaseConversion In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/db_converter/bwhDatabaseConversion Modified Files: ConnectionOldDatabase.java RefactorDatabaseData.java Log Message: wip Index: RefactorDatabaseData.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/db_converter/bwhDatabaseConversion/RefactorDatabaseData.java,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** RefactorDatabaseData.java 3 Jul 2007 05:43:20 -0000 1.63 --- RefactorDatabaseData.java 4 Jul 2007 00:14:48 -0000 1.64 *************** *** 52,62 **** import nl.topicus.db_converter.oldDatabaseEntities.Reservering; /** ! * This class will take care of the conversion and storing for data from the old database ! * to the new database * @author Graduates at Topicus */ ! public class RefactorDatabaseData ! { [...1845 lines suppressed...] --- 1038,1042 ---- * @param homeNumber */ ! public void setHomeNumber(String homeNumber) { this.homeNumber = homeNumber; } *************** *** 1120,1125 **** * @param mobileNumber */ ! public void setMobileNumber(String mobileNumber) ! { this.mobileNumber = mobileNumber; } --- 1045,1049 ---- * @param mobileNumber */ ! public void setMobileNumber(String mobileNumber) { this.mobileNumber = mobileNumber; } Index: ConnectionOldDatabase.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/db_converter/bwhDatabaseConversion/ConnectionOldDatabase.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ConnectionOldDatabase.java 25 Jun 2007 16:38:47 -0000 1.7 --- ConnectionOldDatabase.java 4 Jul 2007 00:14:48 -0000 1.8 *************** *** 7,43 **** /** * This class takes care of the connection to the (old) database * @author Graduates at Topicus */ ! public class ConnectionOldDatabase ! { ! Connection conn = null; /** ! * */ ! public ConnectionOldDatabase() ! { ! try ! { Class.forName("com.mysql.jdbc.Driver"); - } - catch (ClassNotFoundException e) - { - System.out.println("Error: " + e); - } - - try - { conn = DriverManager ! .getConnection("jdbc:mysql://localhost/bwh_use?user=root&password=topicus"); ! } ! catch (SQLException ex) ! { ! // handle any errors ! System.out.println("SQLException: " + ex.getMessage()); ! System.out.println("SQLState: " + ex.getSQLState()); ! System.out.println("VendorError: " + ex.getErrorCode()); } } --- 7,31 ---- /** * This class takes care of the connection to the (old) database + * * @author Graduates at Topicus */ ! public class ConnectionOldDatabase { ! private final Connection conn; /** ! * Construct */ ! public ConnectionOldDatabase() { ! try { Class.forName("com.mysql.jdbc.Driver"); conn = DriverManager ! .getConnection("jdbc:mysql://localhost/burgerweeshuis_website" ! + "?user=burgerweeshuis&password=dbuser"); ! } catch (SQLException e) { ! throw new RuntimeException(e); ! } catch (ClassNotFoundException e) { ! throw new RuntimeException(e); } } *************** *** 46,51 **** * @return the current connection */ ! public Connection getConnection() ! { return conn; } --- 34,38 ---- * @return the current connection */ ! public Connection getConnection() { return conn; } |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:19
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/webapp In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/webapp Modified Files: index.html Added Files: favicon.ico Removed Files: Kroegcam.html Log Message: wip --- Kroegcam.html DELETED --- --- NEW FILE: favicon.ico --- (This appears to be a binary file; contents omitted.) Index: index.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/webapp/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.html 20 Apr 2006 10:17:54 -0000 1.1 --- index.html 4 Jul 2007 00:14:48 -0000 1.2 *************** *** 5,9 **** <head> <title>Redirect</title> ! <meta http-equiv="Refresh" content="0; url=app1"/> </head> <body> --- 5,9 ---- <head> <title>Redirect</title> ! <meta http-equiv="Refresh" content="0; url=app1" /> </head> <body> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:19
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/links In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/links Modified Files: LinkPage.html Log Message: wip Index: LinkPage.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/links/LinkPage.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LinkPage.html 3 Jul 2007 18:27:50 -0000 1.3 --- LinkPage.html 4 Jul 2007 00:14:48 -0000 1.4 *************** *** 9,16 **** <meta http-equiv="KeyWords" content=" .. "> <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> ! <SCRIPT language="JavaScript" src="/scripts/stm31.js" ! type="text/javascript"> ! </SCRIPT> </head> <body bgcolor="#000000"> --- 9,13 ---- <meta http-equiv="KeyWords" content=" .. "> <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> </head> <body bgcolor="#000000"> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:18
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/dao/helper In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/dao/helper Modified Files: AgendaItemDataAccessHelper.java Log Message: wip Index: AgendaItemDataAccessHelper.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/dao/helper/AgendaItemDataAccessHelper.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** AgendaItemDataAccessHelper.java 25 Jun 2007 16:38:48 -0000 1.24 --- AgendaItemDataAccessHelper.java 4 Jul 2007 00:14:48 -0000 1.25 *************** *** 10,26 **** * @author Gratuates at Topicus */ ! public interface AgendaItemDataAccessHelper extends DataTableAccessHelper<AgendaItem> ! { /** ! * @return a list of upcoming agendaItems */ ! public abstract Iterator getAgendaItems(); /** ! * @param catagory ! * @return a list of upcoming agendaItems with catagory */ ! public abstract Iterator getAgendaItems(Catagory catagory); /** --- 10,35 ---- * @author Gratuates at Topicus */ ! public interface AgendaItemDataAccessHelper extends ! DataTableAccessHelper<AgendaItem> { /** ! * @param onlyUpcoming ! * @param searchString ! * @return number of (upcoming) agendaitems */ ! public abstract int count(boolean onlyUpcoming, String searchString); /** ! * @param offset ! * @param aantal ! * @param sortProperty ! * @param ascending ! * @param onlyUpcoming ! * @param searchString ! * @return list */ ! public abstract List<AgendaItem> find(int offset, int aantal, ! String sortProperty, boolean ascending, boolean onlyUpcoming, ! String searchString); /** *************** *** 31,84 **** /** ! * @return all AgendaItems where reservation is possible */ ! public abstract Iterator getReservationItems(); /** ! * @return the next id needed for creating a new object (/ row in database) */ ! public abstract Long getNextId(); /** ! * @return the 2 'binnenkort' items, the 'comming-up' items */ ! public abstract Iterator getBinnenkort(); /** ! * @return the list with Nadorst items */ ! public abstract List<AgendaItem> getNadorstItems(); /** ! * @return the list with all the AgendaItem object ordered by date */ ! public abstract List<AgendaItem> getAgendaItemsWithNadorstSortedByDate(); /** ! * This method searches through the AgendaItem with the given string on occurences The ! * fields being search in the AgendaItem are title, subtitle and content ! * @param searchString ! * @return the list with Agenda items that were found and matched the searchString */ ! public abstract List<AgendaItem> searchAgendaItem(String searchString); /** ! * @param offset ! * @param aantal ! * @param sortProperty ! * @param ascending ! * @param onlyUpcoming ! * @param searchString ! * @return list */ ! public abstract List<AgendaItem> find(int offset, int aantal, String sortProperty, ! boolean ascending, boolean onlyUpcoming, String searchString); /** ! * @param onlyUpcoming * @param searchString ! * @return number of (upcoming) agendaitems */ ! public abstract int count(boolean onlyUpcoming, String searchString); } \ No newline at end of file --- 40,88 ---- /** ! * @return a list of upcoming agendaItems */ ! public abstract Iterator<AgendaItem> getAgendaItems(); /** ! * @param catagory ! * @return a list of upcoming agendaItems with catagory */ ! public abstract Iterator<AgendaItem> getAgendaItems(Catagory catagory); /** ! * @return the list with all the AgendaItem object ordered by date */ ! public abstract List<AgendaItem> getAgendaItemsWithNadorstSortedByDate(); /** ! * @return the 2 'binnenkort' items, the 'comming-up' items */ ! public abstract Iterator<AgendaItem> getBinnenkort(); /** ! * @return the list with Nadorst items */ ! public abstract List<AgendaItem> getNadorstItems(); /** ! * @return the next id needed for creating a new object (/ row in database) */ ! public abstract Long getNextId(); /** ! * @return all AgendaItems where reservation is possible */ ! public abstract Iterator<AgendaItem> getReservationItems(); /** ! * This method searches through the AgendaItem with the given string on ! * occurences The fields being search in the AgendaItem are title, subtitle ! * and content ! * * @param searchString ! * @return the list with Agenda items that were found and matched the ! * searchString */ ! public abstract List<AgendaItem> searchAgendaItem(String searchString); } \ No newline at end of file |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:18
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/abbonementje In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/abbonementje Modified Files: Abonnementje.html Log Message: wip Index: Abonnementje.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/abbonementje/Abonnementje.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Abonnementje.html 3 Jul 2007 18:27:51 -0000 1.4 --- Abonnementje.html 4 Jul 2007 00:14:48 -0000 1.5 *************** *** 13,18 **** <td valign="top" bgcolor="#CCCCCC" class="text"> <div align="center"> ! <input wicket:id="email" type="text"/> ! <img src="/Fp/dummy.gif" width="150" height="8"><br> <input type="submit" class="button" value="Verzend"></div> </td> --- 13,18 ---- <td valign="top" bgcolor="#CCCCCC" class="text"> <div align="center"> ! <input wicket:id="email" type="text" /> ! <img src="Fp/dummy.gif" width="150" height="8"><br> <input type="submit" class="button" value="Verzend"></div> </td> |
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/agenda In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/agenda Modified Files: AgendaSearch.html AgendaList.java AgendaList.html AgendaItemPage.html Log Message: wip Index: AgendaSearch.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/agenda/AgendaSearch.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AgendaSearch.html 3 Jul 2007 18:27:50 -0000 1.3 --- AgendaSearch.html 4 Jul 2007 00:14:46 -0000 1.4 *************** *** 9,16 **** <meta http-equiv="KeyWords" content=" .. "> <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> ! <SCRIPT language="JavaScript" src="/scripts/stm31.js" ! type="text/javascript"> ! </SCRIPT> </head> <body bgcolor="#000000"> --- 9,13 ---- <meta http-equiv="KeyWords" content=" .. "> <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> </head> <body bgcolor="#000000"> *************** *** 67,71 **** <tr> <td class="textKop"> ! <input wicket:id="query" type="text" size="30"/> <input type="submit" value="zoek"> </td> --- 64,68 ---- <tr> <td class="textKop"> ! <input wicket:id="query" type="text" size="30" /> <input type="submit" value="zoek"> </td> Index: AgendaList.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/agenda/AgendaList.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** AgendaList.java 3 Jul 2007 05:43:19 -0000 1.24 --- AgendaList.java 4 Jul 2007 00:14:46 -0000 1.25 *************** *** 1,11 **** package nl.topicus.bwh.frontpage.agenda; import java.util.Iterator; import nl.topicus.bwh.dao.DataAccessRegistry; import nl.topicus.bwh.dao.helper.AgendaItemDataAccessHelper; - import nl.topicus.bwh.dao.helper.CatagoryDataAccessHelper; import nl.topicus.bwh.entities.AgendaItem; - import nl.topicus.bwh.entities.Catagory; import nl.topicus.bwh.frontpage.BwhWebPage; import nl.topicus.bwh.frontpage.abbonementje.Abonnementje; --- 1,11 ---- package nl.topicus.bwh.frontpage.agenda; + import java.util.HashMap; import java.util.Iterator; + import java.util.Map; import nl.topicus.bwh.dao.DataAccessRegistry; import nl.topicus.bwh.dao.helper.AgendaItemDataAccessHelper; import nl.topicus.bwh.entities.AgendaItem; import nl.topicus.bwh.frontpage.BwhWebPage; import nl.topicus.bwh.frontpage.abbonementje.Abonnementje; *************** *** 28,31 **** --- 28,43 ---- public class AgendaList extends BwhWebPage { + private static Map<String, String> HEADER_LABELS = new HashMap<String, String>(); + + static { + + HEADER_LABELS.put("totaal", "AGENDA::TOTAAL"); + HEADER_LABELS.put("concert", "AGENDA::CONCERT"); + HEADER_LABELS.put("dans", "AGENDA::DANS"); + HEADER_LABELS.put("film", "AGENDA::FILM"); + HEADER_LABELS.put("cafe", "AGENDA::CAFE"); + HEADER_LABELS.put("zoeken", "AGENDA::ZOEKEN"); + } + /** * @param parameters *************** *** 38,87 **** add(repeating); ! Iterator agendaItemSet = getAgendaItems(); ! try { ! AgendaItemDataAccessHelper agendaHelper = (AgendaItemDataAccessHelper) DataAccessRegistry ! .getInstance().getAccessHelper( ! AgendaItemDataAccessHelper.class); ! String parameter = parameters.getString("bookmarkparameter"); ! if (!parameter.equals("totaal") && !parameter.equals("zoeken")) { ! CatagoryDataAccessHelper catagoryHelper = (CatagoryDataAccessHelper) DataAccessRegistry ! .getInstance().getAccessHelper( ! CatagoryDataAccessHelper.class); ! Catagory catagory = catagoryHelper ! .getCatagoryByDescription(parameter); ! agendaItemSet = agendaHelper.getAgendaItems(catagory); ! } ! if (!parameter.equals("totaal")) { ! CatagoryDataAccessHelper catagoryHelper = (CatagoryDataAccessHelper) DataAccessRegistry ! .getInstance().getAccessHelper( ! CatagoryDataAccessHelper.class); ! Catagory catagory = catagoryHelper ! .getCatagoryByDescription(parameter); ! agendaItemSet = agendaHelper.getAgendaItems(catagory); ! } ! if (parameter.equals("totaal")) { ! add(new Label("agendaheaderlabel", "AGENDA::TOTAAL")); ! } ! if (parameter.equals("concert")) { ! add(new Label("agendaheaderlabel", "AGENDA::CONCERT")); ! } ! if (parameter.equals("dans")) { ! add(new Label("agendaheaderlabel", "AGENDA::DANS")); ! } ! if (parameter.equals("film")) { ! add(new Label("agendaheaderlabel", "AGENDA::FILM")); ! } ! if (parameter.equals("cafe")) { ! add(new Label("agendaheaderlabel", "AGENDA::CAFE")); ! } ! if (parameter.equals("zoeken")) { ! add(new Label("agendaheaderlabel", "ZOEKEN")); ! } ! } catch (Exception e) { ! e.printStackTrace(); ! } int index = 0; while (agendaItemSet.hasNext()) { --- 50,67 ---- add(repeating); ! final String parameter = parameters.getString("list"); ! add(new Label("agendaheaderlabel", new AbstractReadOnlyModel() { ! @Override ! public Object getObject() { ! return HEADER_LABELS.get(parameter); ! } ! })); + AgendaItemDataAccessHelper agendaHelper = (AgendaItemDataAccessHelper) DataAccessRegistry + .getInstance() + .getAccessHelper(AgendaItemDataAccessHelper.class); + Iterator<AgendaItem> agendaItemSet = agendaHelper.getAgendaItems(); int index = 0; while (agendaItemSet.hasNext()) { *************** *** 120,132 **** add(new Hi_lites("hilites")); } - - /** - * @return Iterator which points to all the AgendaItems - */ - public Iterator getAgendaItems() { - AgendaItemDataAccessHelper helper = (AgendaItemDataAccessHelper) DataAccessRegistry - .getInstance() - .getAccessHelper(AgendaItemDataAccessHelper.class); - return helper.getAgendaItems(); - } } \ No newline at end of file --- 100,102 ---- Index: AgendaList.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/agenda/AgendaList.html,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AgendaList.html 3 Jul 2007 18:27:50 -0000 1.15 --- AgendaList.html 4 Jul 2007 00:14:46 -0000 1.16 *************** *** 1,29 **** <html> ! <head> ! <title> ! ..:: HET BURGERWEESHUIS :: POPPODIUM :: DEVENTER [NL] ::.. ! </title> ! <meta name="robots" content="index,follow"> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="KeyWords" content=" .. "> ! <meta http-equiv="KeyWords" content=" .. "> ! <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> ! <SCRIPT language="JavaScript" src="/scripts/stm31.js" ! type="text/javascript"> ! </SCRIPT> ! </head> ! <body bgcolor="#000000"> ! <table width="760" border="0" align="center"> ! <tr> ! <td> ! <div wicket:id="pageheader"></div> ! <table width="100%" border="0" cellspacing="3" cellpadding="2"> <tr> <td width="150" valign="top"> ! <div wicket:id="menu"> ! </div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> --- 1,24 ---- <html> ! <head> ! <title>..:: HET BURGERWEESHUIS :: POPPODIUM :: DEVENTER [NL] ::..</title> ! <meta name="robots" content="index,follow"> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="KeyWords" content=" .. "> ! <meta http-equiv="KeyWords" content=" .. "> ! <meta name="Description" ! content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> ! </head> ! <body bgcolor="#000000"> ! <table width="760" border="0" align="center"> ! <tr> ! <td> ! <div wicket:id="pageheader"></div> ! <table width="100%" border="0" cellspacing="3" cellpadding="2"> <tr> <td width="150" valign="top"> ! <div wicket:id="menu"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> *************** *** 32,113 **** </table> <div wicket:id="reservation"></div> - - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td height="5" width="100%"> - </td> - </tr> - </table> - - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td height="5" width="100%"> - </td> - </tr> - </table> - <div wicket:id="downloads"></div> - - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td height="5" width="100%"> - </td> - </tr> - </table> - - </td> - <td valign="top"> - - <table width="100%" border="1" cellspacing="0" cellpadding="2" bordercolor="#CCCCCC"> - <tr> - <td nowrap bgcolor="#CC6633" class="textKop"> - <span wicket:id="agendaheaderlabel"></span> - </td> - </tr> - <tr> - <td class="text"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <span wicket:id="repeating"> - <tr> - <td valign="bottom" align="right" nowrap height="100%"><span class="textOpmerking"></span></td> - </tr> - <tr wicket:id="container"> - <td align="left" valign="top" rowspan="2"> - <a wicket:id="Itemlink" class="textKop"><div wicket:id="Title">here comes clickable title</div></a> - <span class="text" wicket:id="Subtitle">here comes subtitle</span> - </td> - <td valign="top" align="right" nowrap> - <span class="text" wicket:id="Date">here comes date</span> - </td> - </tr> - </span> - </table> - </td> - </tr> - </table> - </td> - <td width="150" class="text" valign="top"> - <div wicket:id="hilites">here comes item hi-lite</div> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td height="5" width="100%"> - </td> - </tr> - </table> - <div wicket:id="abonnement"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! <div wicket:id="goedeburen"></div> ! </td> ! </tr> ! </table> ! <div wicket:id="footer"></div> ! </td> ! </tr> ! </table> ! </body> </html> \ No newline at end of file --- 27,104 ---- </table> <div wicket:id="reservation"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <div wicket:id="downloads"></div> ! ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! ! </td> ! <td valign="top"> ! ! <table width="100%" border="1" cellspacing="0" cellpadding="2" ! bordercolor="#CCCCCC"> ! <tr> ! <td nowrap bgcolor="#CC6633" class="textKop"><span ! wicket:id="agendaheaderlabel"></span></td> ! </tr> ! <tr> ! <td class="text"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <span wicket:id="repeating"> ! <tr> ! <td valign="bottom" align="right" nowrap height="100%"><span ! class="textOpmerking"></span></td> ! </tr> ! <tr wicket:id="container"> ! <td align="left" valign="top" rowspan="2"><a ! wicket:id="Itemlink" class="textKop"> ! <div wicket:id="Title">here comes clickable title</div> ! </a> <span class="text" wicket:id="Subtitle">here comes ! subtitle</span></td> ! <td valign="top" align="right" nowrap><span class="text" ! wicket:id="Date">here comes date</span></td> ! </tr> ! </span> ! </table> ! </td> ! </tr> ! </table> ! </td> ! <td width="150" class="text" valign="top"> ! <div wicket:id="hilites">here comes item hi-lite</div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <div wicket:id="abonnement"></div> ! ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <div wicket:id="goedeburen"></div> ! </td> ! </tr> ! </table> ! <div wicket:id="footer"></div> ! </td> ! </tr> ! </table> ! </body> </html> \ No newline at end of file Index: AgendaItemPage.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/agenda/AgendaItemPage.html,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AgendaItemPage.html 3 Jul 2007 18:27:50 -0000 1.19 --- AgendaItemPage.html 4 Jul 2007 00:14:46 -0000 1.20 *************** *** 1,18 **** <html> ! <head> ! <title> ! ..:: HET BURGERWEESHUIS :: POPPODIUM :: DEVENTER [NL] ::.. ! </title> ! <meta name="robots" content="index,follow"> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="KeyWords" content=" .. "> ! <meta http-equiv="KeyWords" content=" .. "> ! <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> ! <SCRIPT language="JavaScript" src="/scripts/stm31.js" type="text/javascript"> ! </SCRIPT> ! </head> ! <body bgcolor="#000000"> ! <script type="text/javascript"> function showButton() { --- 1,16 ---- <html> ! <head> ! <title>..:: HET BURGERWEESHUIS :: POPPODIUM :: DEVENTER [NL] ! ::..</title> ! <meta name="robots" content="index,follow"> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="KeyWords" content=" .. "> ! <meta http-equiv="KeyWords" content=" .. "> ! <meta name="Description" ! content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> ! <link rel="stylesheet" type="text/css" href="bwh.css"> ! </head> ! <body bgcolor="#000000"> ! <script type="text/javascript"> function showButton() { *************** *** 27,39 **** } </script> ! <table width="760" border="0" align="center"> ! <tr> ! <td> ! <div wicket:id="pageheader"></div> ! <table width="100%" border="0" cellspacing="3" cellpadding="2"> <tr> <td width="150" valign="top"> ! <div wicket:id="menu"> ! </div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> --- 25,36 ---- } </script> ! <table width="760" border="0" align="center"> ! <tr> ! <td> ! <div wicket:id="pageheader"></div> ! <table width="100%" border="0" cellspacing="3" cellpadding="2"> <tr> <td width="150" valign="top"> ! <div wicket:id="menu"></div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> *************** *** 53,58 **** </tr> <tr> ! <td bgcolor="#CCCCCC"><a href="/burgerweeshuiscms/Kroegcam.html"><img src="http://webcam.burgerweeshuis.nl/cam_front.jpg" border="0" ! width="140" height="105" u="" onerror="imgOnError(this)"></a></td> </tr> </table> --- 50,58 ---- </tr> <tr> ! <td bgcolor="#CCCCCC"><wicket:link> ! <a href="Kroegcam.html"><img ! src="http://webcam.burgerweeshuis.nl/cam_front.jpg" border="0" ! width="140" height="105" u="" onerror="imgOnError(this)"></a> ! </wicket:link></td> </tr> </table> *************** *** 63,177 **** </table> <div wicket:id="downloads"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! </td> ! <td valign="top"> ! <table width="100%" height="100%" border="1" cellpadding="2" cellspacing="0" bordercolor="#CCCCCC"> ! <tr> ! <td colspan="2" class="textKop"> ! <table width="100%" border="0" cellpadding="2" cellspacing="0"> ! <tr> ! <td valign="top" bgcolor="#CC6633"> ! <span class="aktDatum" wicket:id="itemdate">here comes the performance date</span> ! </td> ! </tr> ! <tr> ! <td valign="top" bgcolor="#000000"> ! <span class="aktArtiest" wicket:id="title">here comes the title</span> <br> ! <span class="aktArtiestSub" wicket:id="subtitle">subtitle</span> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! <tr> ! <td width="150" height="100%" align="center" valign="top" bgcolor="#CC6633" class="aktFoto"> ! <div wicket:id="pics"> ! <a wicket:id="link"/><img align="right" wicket:id="picture" id="fppic"/> ! <div wicket:id="imagename">naam</div><br> ! </div> ! </td> ! <td height="100%" rowspan="2" valign="top" bgcolor="#CCCCCC" class="aktTekst" wicket:id= ! "description"> ! here comes info ! </td> ! </tr> ! <tr> ! <td width="150" valign="top" bgcolor="#000000" class="aktTekstWit"> ! open: <span wicket:id="stage">20:30 uur</span> uur<br> ! aanvang: <span wicket:id="start">21:00 uur</span> uur<br> ! <span wicket:id="entree">priceinformation</span> <b><a wicket:id="reservationLink">Reserveren</a></b> ! </td> ! </tr> ! ! <tr > ! <form wicket:id="form"> ! <td colspan="2" > ! <table width="100%" border="0" cellpadding="2" cellspacing="0"> ! <tr id="1"> ! <input class="button_U" value="Tip een vriend" onClick="showInputFields()"> ! </tr> ! <tr id="2"> ! <td valign="top" bgcolor="#000000"> ! <span class="aktTekstWit">Stuur dit agenda-item als tip naar een vriend:<br> ! Jouw e-mail adres: <input wicket:id="email" type="text"/><br> ! E-mail adres vriend: <input wicket:id="email2" type="text"/><br></span> ! <input type="submit" class="button" value="Verzend"> ! </td> ! <span wicket:id="feedbackEmail" id="feedbackEmail">feedbackmessages will be put here</span> ! </tr> ! </table> ! </td> ! </form> ! </tr> ! ! </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! </td> ! <td width="150" class="text" valign="top"> ! <div wicket:id="hilites">here comes item hi-lite</div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! <div wicket:id="abonnement"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"> ! </td> ! </tr> ! </table> ! <div wicket:id="goedeburen"></div> ! </td> ! </tr> ! </table> ! <div wicket:id="footer"></div> ! </td> ! </tr> ! </table> ! </body> <script language="javascript"> showButton(); --- 63,172 ---- </table> <div wicket:id="downloads"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! </td> ! <td valign="top"> ! <table width="100%" height="100%" border="1" cellpadding="2" ! cellspacing="0" bordercolor="#CCCCCC"> ! <tr> ! <td colspan="2" class="textKop"> ! <table width="100%" border="0" cellpadding="2" cellspacing="0"> ! <tr> ! <td valign="top" bgcolor="#CC6633"><span class="aktDatum" ! wicket:id="itemdate">here comes the performance date</span></td> ! </tr> ! <tr> ! <td valign="top" bgcolor="#000000"><span class="aktArtiest" ! wicket:id="title">here comes the title</span> <br> ! <span class="aktArtiestSub" wicket:id="subtitle">subtitle</span> ! </td> ! </tr> ! </table> ! </td> ! </tr> ! <tr> ! <td width="150" height="100%" align="center" valign="top" ! bgcolor="#CC6633" class="aktFoto"> ! <div wicket:id="pics"><a wicket:id="link" /><img ! align="right" wicket:id="picture" id="fppic" /> ! <div wicket:id="imagename">naam</div> ! <br></div> ! </td> ! <td height="100%" rowspan="2" valign="top" bgcolor="#CCCCCC" ! class="aktTekst" wicket:id="description">here comes info</td> ! </tr> ! <tr> ! <td width="150" valign="top" bgcolor="#000000" class="aktTekstWit"> ! open: <span wicket:id="stage">20:30 uur</span> uur<br> ! aanvang: <span wicket:id="start">21:00 uur</span> uur<br> ! <span wicket:id="entree">priceinformation</span> <b><a ! wicket:id="reservationLink">Reserveren</a></b></td> ! </tr> ! ! <tr> ! <form wicket:id="form"> ! <td colspan="2"> ! <table width="100%" border="0" cellpadding="2" cellspacing="0"> ! <tr id="1"> ! <input class="button_U" value="Tip een vriend" ! onClick="showInputFields()"> ! </tr> ! <tr id="2"> ! <td valign="top" bgcolor="#000000"><span ! class="aktTekstWit">Stuur dit agenda-item als tip naar ! een vriend:<br> ! Jouw e-mail adres: <input wicket:id="email" type="text" /><br> ! E-mail adres vriend: <input wicket:id="email2" type="text" /><br> ! </span> <input type="submit" class="button" value="Verzend"></td> ! <span wicket:id="feedbackEmail" id="feedbackEmail">feedbackmessages ! will be put here</span> ! </tr> ! </table> ! </td> ! </form> ! </tr> ! ! </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! </td> ! <td width="150" class="text" valign="top"> ! <div wicket:id="hilites">here comes item hi-lite</div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <div wicket:id="abonnement"></div> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td height="5" width="100%"></td> ! </tr> ! </table> ! <div wicket:id="goedeburen"></div> ! </td> ! </tr> ! </table> ! <div wicket:id="footer"></div> ! </td> ! </tr> ! </table> ! </body> <script language="javascript"> showButton(); |
![http://webcam.burgerweeshuis.nl/cam_front.jpg"](http://webcam.burgerweeshuis.nl/cam_front.jpg"){kind=link}
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:15
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage Modified Files: BwhWebPage.java Log Message: wip Index: BwhWebPage.java =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/BwhWebPage.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** BwhWebPage.java 3 Jul 2007 05:41:34 -0000 1.24 --- BwhWebPage.java 4 Jul 2007 00:14:45 -0000 1.25 *************** *** 9,31 **** import nl.topicus.bwh.frontpage.footer.Footer; import nl.topicus.bwh.frontpage.header.Header; ! import nl.topicus.bwh.frontpage.header.MenuPanel; import nl.topicus.bwh.frontpage.reservation.ReservationPanel; import org.apache.wicket.markup.html.WebPage; /** * Class for implementing some standard bwhwebpage functionality * @author Graduates at Topicus */ ! public class BwhWebPage extends WebPage ! { /** ! * */ ! public BwhWebPage() ! { super(); add(new Header("pageheader")); ! add(new MenuPanel("menu")); add(new Footer("footer")); add(new Downloads("downloads")); --- 9,31 ---- import nl.topicus.bwh.frontpage.footer.Footer; import nl.topicus.bwh.frontpage.header.Header; ! import nl.topicus.bwh.frontpage.header.Menu; import nl.topicus.bwh.frontpage.reservation.ReservationPanel; + import org.apache.wicket.markup.html.WebPage; /** * Class for implementing some standard bwhwebpage functionality + * * @author Graduates at Topicus */ ! public class BwhWebPage extends WebPage { /** ! * Construct. */ ! public BwhWebPage() { super(); add(new Header("pageheader")); ! add(new Menu("menu")); add(new Footer("footer")); add(new Downloads("downloads")); *************** *** 34,45 **** /** ! * @param description getDynamicContent is needed by classes that derive from * BwhWebPage like Links and HighLites * @return gets the content from dynamic content with description */ ! public String getDynamicContent(String description) ! { DynamicContentDataAccessHelper helper = (DynamicContentDataAccessHelper) DataAccessRegistry ! .getInstance().getAccessHelper(DynamicContentDataAccessHelper.class); return helper.getDynamicContent(description).getContent(); } --- 34,46 ---- /** ! * @param description ! * getDynamicContent is needed by classes that derive from * BwhWebPage like Links and HighLites * @return gets the content from dynamic content with description */ ! public String getDynamicContent(String description) { DynamicContentDataAccessHelper helper = (DynamicContentDataAccessHelper) DataAccessRegistry ! .getInstance().getAccessHelper( ! DynamicContentDataAccessHelper.class); return helper.getDynamicContent(description).getContent(); } *************** *** 48,55 **** * @return All the agenda items for witch reservation is possible */ ! public Iterator getReservationItems() ! { AgendaItemDataAccessHelper helper = (AgendaItemDataAccessHelper) DataAccessRegistry ! .getInstance().getAccessHelper(AgendaItemDataAccessHelper.class); return helper.getReservationItems(); } --- 49,56 ---- * @return All the agenda items for witch reservation is possible */ ! public Iterator getReservationItems() { AgendaItemDataAccessHelper helper = (AgendaItemDataAccessHelper) DataAccessRegistry ! .getInstance() ! .getAccessHelper(AgendaItemDataAccessHelper.class); return helper.getReservationItems(); } |
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel6 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel6 Modified Files: BevestigingsmailPanel.html GevondenDoor.html AddFoundBy.html ReserveringsmailPanel.html Log Message: wip Index: ReserveringsmailPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel6/ReserveringsmailPanel.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ReserveringsmailPanel.html 31 Oct 2006 09:05:40 -0000 1.5 --- ReserveringsmailPanel.html 4 Jul 2007 00:14:44 -0000 1.6 *************** *** 11,20 **** <select name="area" wicket:id="variables"> </select> ! <input type=submit value="Voeg variabele toe in bericht" wicket:id="addVariabele"/> </div> <label id="BevestigLabel2">Met als onderwerp:</label> ! <input type=text name="emailonderwerp" size=63 id="Bevestigsubject" wicket:id="subject"/> <label id="BevestigLabel3">Naar:</label> ! <input type=text name="emailonderwerp" id="Bevestigsender" size=30 wicket:id="receipent"/> <input type=submit value="sla wijzigingen op" name="" id="bevestigsave" /> --- 11,20 ---- <select name="area" wicket:id="variables"> </select> ! <input type=submit value="Voeg variabele toe in bericht" wicket:id="addVariabele" /> </div> <label id="BevestigLabel2">Met als onderwerp:</label> ! <input type=text name="emailonderwerp" size=63 id="Bevestigsubject" wicket:id="subject" /> <label id="BevestigLabel3">Naar:</label> ! <input type=text name="emailonderwerp" id="Bevestigsender" size=30 wicket:id="receipent" /> <input type=submit value="sla wijzigingen op" name="" id="bevestigsave" /> Index: AddFoundBy.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel6/AddFoundBy.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddFoundBy.html 29 May 2006 14:34:47 -0000 1.1 --- AddFoundBy.html 4 Jul 2007 00:14:44 -0000 1.2 *************** *** 19,24 **** <body> <form wicket:id="addform"> ! omschrijving: <input type=text wicket:id="description"/><br> ! <input type=submit value="voeg toe" wicket:id="confirm"/> </form> </body> --- 19,24 ---- <body> <form wicket:id="addform"> ! omschrijving: <input type=text wicket:id="description" /><br> ! <input type=submit value="voeg toe" wicket:id="confirm" /> </form> </body> Index: BevestigingsmailPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel6/BevestigingsmailPanel.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BevestigingsmailPanel.html 31 Oct 2006 09:05:40 -0000 1.4 --- BevestigingsmailPanel.html 4 Jul 2007 00:14:44 -0000 1.5 *************** *** 11,23 **** <select name="area" wicket:id="variables"> </select> ! <input type=submit value="Voeg variabele toe in bericht" wicket:id="addVariabele"/> </div> <label id="BevestigLabel2">Met als onderwerp:</label> ! <input type=text name="emailonderwerp" size=63 id="Bevestigsubject" wicket:id="subject""/> <label id="BevestigLabel3">En met afzender:</label> ! <input type=text name="emailonderwerp" id="Bevestigsender" size=30 wicket:id="sender"/> <div id="bevestigsave"> ! <a wicket:id="example"><input type=submit value="voorbeeld" name=""/></a> ! <input type=submit value="sla wijzigingen op" name="" wicket:id="save"/> </div> </form> --- 11,23 ---- <select name="area" wicket:id="variables"> </select> ! <input type=submit value="Voeg variabele toe in bericht" wicket:id="addVariabele" /> </div> <label id="BevestigLabel2">Met als onderwerp:</label> ! <input type=text name="emailonderwerp" size=63 id="Bevestigsubject" wicket:id="subject"" /> <label id="BevestigLabel3">En met afzender:</label> ! <input type=text name="emailonderwerp" id="Bevestigsender" size=30 wicket:id="sender" /> <div id="bevestigsave"> ! <a wicket:id="example"><input type=submit value="voorbeeld" name="" /></a> ! <input type=submit value="sla wijzigingen op" name="" wicket:id="save" /> </div> </form> Index: GevondenDoor.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel6/GevondenDoor.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GevondenDoor.html 29 Jun 2006 13:20:40 -0000 1.5 --- GevondenDoor.html 4 Jul 2007 00:14:44 -0000 1.6 *************** *** 4,10 **** <wicket:panel> <div id="nestedTabContentContainer"> ! <input type=submit value="Toevoegen" wicket:id="addItem"/> <form wicket:id="form"> ! <input type=submit value="Wijzigingen Opslaan" name=""/><br> <div wicket:id="foundbyrepeater"> --- 4,10 ---- <wicket:panel> <div id="nestedTabContentContainer"> ! <input type=submit value="Toevoegen" wicket:id="addItem" /> <form wicket:id="form"> ! <input type=submit value="Wijzigingen Opslaan" name="" /><br> <div wicket:id="foundbyrepeater"> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:14
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/downloads In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/downloads Modified Files: Downloads.html Log Message: wip Index: Downloads.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/downloads/Downloads.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Downloads.html 3 Jul 2007 18:27:50 -0000 1.2 --- Downloads.html 4 Jul 2007 00:14:45 -0000 1.3 *************** *** 7,12 **** <td bgcolor="#CCCCCC" class="text"> <span wicket:id="downloadrepeating"> ! <a wicket:id="download" alt="test"/> ! <img src="/Fp/listSquare.gif" align="absmiddle" width="1" height="1"/> <span wicket:id="downloadlabel"></span> <br> --- 7,12 ---- <td bgcolor="#CCCCCC" class="text"> <span wicket:id="downloadrepeating"> ! <a wicket:id="download" alt="test" /> ! <img src="Fp/listSquare.gif" align="absmiddle" width="1" height="1" /> <span wicket:id="downloadlabel"></span> <br> |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:14
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/main In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/frontpage/main Modified Files: Index.html Added Files: Kroegcam.html Kroegcam.java Log Message: wip --- NEW FILE: Kroegcam.html --- <html> <head> <title>..:: HET BURGERWEESHUIS :: KROEGCAM ::..</title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <link href="bwh.css" rel="stylesheet" type="text/css" /> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> </head> <body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" BACKGROUND="Fp/huisjesbg.jpg"> <div align="center"><img src="Fp/bwhlogo.gif" width="191" height="89" /><br /> <applet codebase="http://webcam.burgerweeshuis.nl/" code="campict.class" width=320 height=240> <param name="Image" value="cam00001.jpg" /> <param name="ImageLabel" value="First imagev" /> <param name="Interval" value="1" /> <param name="NoOptions" value="true" /> <param name="NoFrame" value="true" /> <param name="bgcolor" value="#000000" /> <hr /> If you were using a Java-enabled browser, you would see a continuously updating image instead of this paragraph. <hr /> </applet></div> </body> </html> Index: Index.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/frontpage/main/Index.html,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Index.html 3 Jul 2007 18:27:50 -0000 1.18 --- Index.html 4 Jul 2007 00:14:43 -0000 1.19 *************** *** 1,13 **** <html> <head> ! <title>..:: HET BURGERWEESHUIS :: POPPODIUM :: DEVENTER [NL] ::..</title> <meta name="robots" content="index,follow"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="KeyWords" content=" .. "> <meta http-equiv="KeyWords" content=" .. "> ! <meta name="Description" content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> <link rel="stylesheet" type="text/css" href="bwh.css"> - <SCRIPT language="JavaScript" src="/scripts/stm31.js" type="text/javascript"> - </SCRIPT> </head> <body bgcolor="#000000"> --- 1,13 ---- <html> <head> ! <title>..:: HET BURGERWEESHUIS :: POPPODIUM :: DEVENTER [NL] ! ::..</title> <meta name="robots" content="index,follow"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta name="KeyWords" content=" .. "> <meta http-equiv="KeyWords" content=" .. "> ! <meta name="Description" ! content="Het Burgerweeshuis is het cultuur- en poppodium van Deventer"> <link rel="stylesheet" type="text/css" href="bwh.css"> </head> <body bgcolor="#000000"> *************** *** 19,23 **** <tr> <td width="150" valign="top"> ! <div wicket:id="menu"> </div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> --- 19,23 ---- <tr> <td width="150" valign="top"> ! <div wicket:id="menu"></div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> *************** *** 25,29 **** </tr> </table> ! <div wicket:id="reservation"></div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> --- 25,29 ---- </tr> </table> ! <div wicket:id="reservation"></div> <table width="100%" border="0" cellspacing="0" cellpadding="0"> *************** *** 38,43 **** </tr> <tr> ! <td bgcolor="#CCCCCC"><a href="/burgerweeshuiscms/Kroegcam.html"><img src="http://webcam.burgerweeshuis.nl/cam_front.jpg" border="0" ! width="140" height="105" u="" onerror="imgOnError(this)"></a></td> </tr> </table> --- 38,46 ---- </tr> <tr> ! <td bgcolor="#CCCCCC"><wicket:link> ! <a href="Kroegcam.html"><img ! src="http://webcam.burgerweeshuis.nl/cam_front.jpg" border="0" ! width="140" height="105" u="" onerror="imgOnError(this)"></a> ! </wicket:link></td> </tr> </table> *************** *** 62,67 **** <tr> <td valign="top" align="left" width="50%" bgcolor="#666666"> ! <div class="textKop" wicket:id="b1title"> ! All Times Party met dj's Clay & Frank jr.</div> <div class="text" wicket:id="b1date">zaterdag 6 mei 2006</div> </td> --- 65,70 ---- <tr> <td valign="top" align="left" width="50%" bgcolor="#666666"> ! <div class="textKop" wicket:id="b1title">All Times Party met ! dj's Clay & Frank jr.</div> <div class="text" wicket:id="b1date">zaterdag 6 mei 2006</div> </td> *************** *** 72,83 **** </tr> <tr> - <td class="text" valign="middle" align="center" width="210" height="210"> - <a wicket:id="binnenkort1link"> - <img wicket:id="picture1"/> - </a></td> <td class="text" valign="middle" align="center" width="210" ! height="210"><a wicket:id="binnenkort2link"> ! <img wicket:id="picture2"/> ! </a></td> </tr> <tr> --- 75,84 ---- </tr> <tr> <td class="text" valign="middle" align="center" width="210" ! height="210"><a wicket:id="binnenkort1link"> <img ! wicket:id="picture1" /> </a></td> ! <td class="text" valign="middle" align="center" width="210" ! height="210"><a wicket:id="binnenkort2link"> <img ! wicket:id="picture2" /> </a></td> </tr> <tr> *************** *** 94,98 **** </tr> <tr valign="top"> ! <td class="text" bgcolor="#cccccc" wicket:id="nieuws">here comes news</td> </tr> </table> --- 95,100 ---- </tr> <tr valign="top"> ! <td class="text" bgcolor="#cccccc" wicket:id="nieuws">here ! comes news</td> </tr> </table> --- NEW FILE: Kroegcam.java --- /** * */ package nl.topicus.bwh.frontpage.main; import org.apache.wicket.markup.html.WebPage; /** * @author Graduates at Topicus */ public class Kroegcam extends WebPage { /** * Construct. */ public Kroegcam() { } } |
|
From: Eelco H. <ee...@us...> - 2007-07-04 00:15:14
|
Update of /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12427/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4 Modified Files: ResEditPanel.html ResDetailsPanel.html Log Message: wip Index: ResEditPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4/ResEditPanel.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ResEditPanel.html 25 Jun 2007 16:36:37 -0000 1.3 --- ResEditPanel.html 4 Jul 2007 00:14:44 -0000 1.4 *************** *** 5,10 **** <form wicket:id="resform"> <label>Aantal gereserveerde kaarten: </label><input type="text" wicket:id="aantal" /> ! <input type=submit value="update" wicket:id="change"/> ! <span wicket:id="feedback" class="errorfeedback"/> </form> </wicket:panel> --- 5,10 ---- <form wicket:id="resform"> <label>Aantal gereserveerde kaarten: </label><input type="text" wicket:id="aantal" /> ! <input type=submit value="update" wicket:id="change" /> ! <span wicket:id="feedback" class="errorfeedback" /> </form> </wicket:panel> Index: ResDetailsPanel.html =================================================================== RCS file: /cvsroot/burgerweeshuis/burgerweeshuis-wicket/src/main/java/nl/topicus/bwh/cms/tabbedPages/TabPanel4/ResDetailsPanel.html,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ResDetailsPanel.html 25 Jun 2007 16:36:37 -0000 1.11 --- ResDetailsPanel.html 4 Jul 2007 00:14:44 -0000 1.12 *************** *** 6,19 **** <form wicket:id="message"> <label id="EmailSubject">Onderwerp:</label> ! <input type=text name="emailonderwerp" id="EmailSubjectField" wicket:id="subjectfield"/> <label id="EmailBody">Bericht:</label> <textarea name="emailbody" cols=80 rows=8 id="emailtextveld" wicket:id="messagearea">Typ hier uw emailbericht</textarea> <input type=submit value="Voorbeeld" name="" id="Button_example" /> <div id="emaileditbuttons"> ! <input type=submit value="Bold" name="" id="Button_bold" wicket:id="bold"/> ! <input type=submit value="Italic" name="" id="Button_italic" wicket:id="italic"/> ! <input type=submit value="Underline" name="" id="Button_underline" wicket:id="underline"/> </div> ! <input type=submit value="Verstuur" name="" id="Button_send" wicket:id="send"/> </form> </fieldset> --- 6,19 ---- <form wicket:id="message"> <label id="EmailSubject">Onderwerp:</label> ! <input type=text name="emailonderwerp" id="EmailSubjectField" wicket:id="subjectfield" /> <label id="EmailBody">Bericht:</label> <textarea name="emailbody" cols=80 rows=8 id="emailtextveld" wicket:id="messagearea">Typ hier uw emailbericht</textarea> <input type=submit value="Voorbeeld" name="" id="Button_example" /> <div id="emaileditbuttons"> ! <input type=submit value="Bold" name="" id="Button_bold" wicket:id="bold" /> ! <input type=submit value="Italic" name="" id="Button_italic" wicket:id="italic" /> ! <input type=submit value="Underline" name="" id="Button_underline" wicket:id="underline" /> </div> ! <input type=submit value="Verstuur" name="" id="Button_send" wicket:id="send" /> </form> </fieldset> *************** *** 27,35 **** <input type=submit value="Terug" name="" /> ! <a wicket:id="reserveringpdf"><input type=submit value="PDF"/></a> <a wicket:id="reserveringcsv"><input type=submit value="Export naar CSV (excel)" /></a> </div> </fieldset> ! <span wicket:id="feedback" class="errorfeedback"/> </wicket:panel> </html> --- 27,35 ---- <input type=submit value="Terug" name="" /> ! <a wicket:id="reserveringpdf"><input type=submit value="PDF" /></a> <a wicket:id="reserveringcsv"><input type=submit value="Export naar CSV (excel)" /></a> </div> </fieldset> ! <span wicket:id="feedback" class="errorfeedback" /> </wicket:panel> </html> |