LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some minor fine tunig (added doc, naming conventions, etc.) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5775 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2018-12-10 09:39:30 +00:00
parent a8889c03b0
commit e73f02dbca
10 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ccm-navigation/web/templates/ccm-navigation/navigation/def-events.jsp
View File

@ -1,3 +1,11 @@
<!--
Template to generate a list of events
##Title: Events Page
##Descr: Generates an event list ordering items in ??? order.
##Path : /templates/ccm-navigation/navigation/def-events.jsp
-->
<jsp:root
xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:define="/WEB-INF/bebop-define.tld"
@ -40,6 +48,7 @@
<define:component name="eventList"
classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
<jsp:scriptlet>
((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setDefinition(new CMSDataCollectionDefinition());
((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setRenderer(new CMSDataCollectionRenderer());
@ -47,17 +56,15 @@
((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
// Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
// abstract. Deshalb muss man java.util.GregorianCalendar verwenden. Dann kann man mit der add-Methode verschiedene Felder manipulieren.
// Aber Achtung - die add-Method liefert void zurück. Daher kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
// Komplizierter geht's wohl nicht mehr.
// Java needs a java.util.GregorianCalendar object to be able to manipulate various fields using
// the add method. The add method returns void, so we need an additional variable.
java.util.GregorianCalendar now = new java.util.GregorianCalendar();
java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
now.get(java.util.GregorianCalendar.MONTH),
now.get(java.util.GregorianCalendar.DATE))).getTime();
// Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
// das Datum nicht gesetzt, so daß der Timestamp immer eine Uhrzeit am 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier
// diesen kompliezierten Vergleich notwendig. Sonst könnte man einfach mit dem aktuellen Timestamp vergleichen.
// The Event content type does use a SQL type for date, but the time as SQL-Typ timestamptz.
// Unfortunately, ccm does not set the date in the last step, therefore timestamp date is
// always 1970-01-01. So we have to use a rather complicated comparison here.
java.util.Date time = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
now.get(java.util.GregorianCalendar.MINUTE),

26
ccm-navigation/web/templates/ccm-navigation/navigation/def-welcome.jsp
View File

@ -81,23 +81,15 @@
((com.arsdigita.navigation.ui.object.ComplexObjectList) eventList).setSQLFilter("(endDate &gt;= :today and (endTime &gt; :time or endTime is null)) or (endDate is null and startDate &gt;= :today)");
// Java ist mal wieder kompliziert. Man braucht ein Calender-Object,
// damit man Datumsarithmetik betreiben kann. java.util.Calendar ist
// allerdings abstract. Deshalb muss man java.util.GregorianCalendar
// verwenden. Dann kann man mit der add-Methode verschiedene Felder
// manipulieren. Aber Achtung - die add-Method liefert void zurueck. Daher
// kann man das nicht alles in einer Zeile machen. Also Variablen anlegen.
// Komplizierter geht's wohl nicht mehr.
// Java needs a java.util.GregorianCalendar object to be able to manipulate various fields using
// the add method. The add method returns void, so we need an additional variable.
java.util.GregorianCalendar now = new java.util.GregorianCalendar();
java.util.Date today = (new java.util.GregorianCalendar(now.get(java.util.GregorianCalendar.YEAR),
now.get(java.util.GregorianCalendar.MONTH),
now.get(java.util.GregorianCalendar.DATE))).getTime();
// Im Event-CT ist das Datum als SQL-Type Date eingetragen, die Uhrzeit
// aber als SQL-Typ timestamptz. Leider wird von ccm im letzten
// das Datum nicht gesetzt, so dass der Timestamp immer eine Uhrzeit am
// 1.1.1970 angibt. Das ist ziemlich bescheuert und macht hier diesen
// kompliezierten Vergleich notwendig. Sonst koennte man einfach mit dem
// aktuellen Timestamp vergleichen.
// The Event content type does use a SQL type for date, but the time as SQL-Typ timestamptz.
// Unfortunately, ccm does not set the date in the last step, therefore timestamp date is
// always 1970-01-01. So we have to use a rather complicated comparison here.
java.util.Date time = (new java.util.GregorianCalendar(70,0,1, // this is 01.01.1970 - start of UNIX timestamp
now.get(java.util.GregorianCalendar.HOUR_OF_DAY),
now.get(java.util.GregorianCalendar.MINUTE),
@ -130,13 +122,7 @@
((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setSQLFilter("newsDate &gt; :oldNewsDate");
// Java ist mal wieder kompliziert. Man braucht ein Calender-Object, damit
// man Datumsarithmetik betreiben kann. java.util.Calendar ist allerdings
// abstract. Deshalb muss man java.util.GregorianCalendar verwenden. Dann
// kann man mit der add-Methode verschiedene Felder manipulieren.
// Aber Achtung - die add-Method liefert void zurueck. Daher kann man das
// nicht alles in einer Zeile machen. Also Variablen anlegen.
// Komplizierter geht's wohl nicht mehr.
// Again, java.util.GregorianCalendar object, see above
java.util.GregorianCalendar oldDate = new java.util.GregorianCalendar();
oldDate.add(java.util.Calendar.MONTH, -2);
((com.arsdigita.navigation.ui.object.ComplexObjectList) newsList).setParameter("oldNewsDate", oldDate.getTime());

2
ccm-navigation/web/templates/ccm-navigation/navigation/min-default.jsp
View File

@ -36,6 +36,8 @@
<define:component name="greetingItem"
classname="com.arsdigita.navigation.ui.GreetingItem"/>
<define:component name="greetingItemExtraXML"
classname="com.arsdigita.navigation.ui.GreetingItemExtraXML"/>
<define:component name="categoryPath"
classname="com.arsdigita.navigation.ui.category.Path"/>
<define:component name="categoryMenu"

2
ccm-sci-bundle/bundles/base/res/bundle/navigation/sci-templates.txt
View File

@ -6,5 +6,5 @@ ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigat
ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
ScientificCMS Specializing Items List,Sci Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationslist.jsp
ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp

2
ccm-sci-bundle/bundles/demo/res/bundle/navigation/sci-templates.txt
View File

@ -6,5 +6,5 @@ ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigat
ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
ScientificCMS Specializing Items List,Sci Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationslist.jsp
ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp

2
ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
View File

@ -6,5 +6,5 @@ ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigat
ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
ScientificCMS Specializing Items List,Sci Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationslist.jsp
ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp

2
ccm-sci-bundle/bundles/extended/res/bundle/navigation/sci-templates.txt
View File

@ -6,5 +6,5 @@ ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigat
ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
ScientificCMS Specializing Items List,Sci Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationslist.jsp
ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp

2
ccm-sci-bundle/bundles/standard/res/bundle/navigation/sci-templates.txt
View File

@ -6,5 +6,5 @@ ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigat
ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/def-portal-welcome.jsp
ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/def-welcome.jsp
ScientificCMS Specializing Items List,Index page of items with a full set of attributes,/templates/ccm-navigation/navigation/def-specializing-list.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationList.jsp
ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/sci-publicationslist.jsp
ScientificCMS Institut Project List,Sci project listing page,/templates/ccm-navigation/navigation/sci-institute-projectlist.jsp

0
ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publicationList.jsp → ccm-sci-bundle/web/templates/ccm-navigation/navigation/sci-publicationslist.jsp
View File

2
tools-ng/netbeans/project.xml
View File

@ -1330,7 +1330,7 @@
<package-root>ccm-sci-types-institute/src</package-root>
<package-root>ccm-sci-types-member/src</package-root>
<package-root>ccm-sci-types-project/src</package-root>
<classpath mode="compile">ccm-core/lib/log4j-1.2-api-2.8.2.jar:ccm-core/lib/log4j-api-2.8.2.jar: ccm-core/lib/log4j-core-2.8.2.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon9h2.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:ccm-themedirector/lib/jlessc-1.5.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar:ccm-themedirector/lib/jlessc-1.5.jar</classpath>
<classpath mode="compile">ccm-core/lib/log4j-1.2-api-2.8.2.jar:ccm-core/lib/log4j-api-2.8.2.jar: ccm-core/lib/log4j-core-2.8.2.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon9h2.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:ccm-themedirector/lib/jlessc-1.6.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar:ccm-themedirector/lib/jlessc-1.5.jar</classpath>
<source-level>1.8</source-level>
</compilation-unit>
</java-data>