ZeS integration layer minor update

git-svn-id: https://svn.libreccm.org/ccm/trunk@338 8810af33-2d31-482b-a856-94f89814c4df

ccm-zes-aplaws/application.xml

@@ -11,6 +11,9 @@
     <ccm:requires name="ccm-ldn-subsite" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-portal" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-terms" version="6.6.0" relation="ge"/>
+    <!--  not required anymore (2007-06-09)
+    <ccm:requires name="ccm-ldn-dublin" version="6.6.0" relation="ge"/>
+    -->
     <ccm:requires name="ccm-ldn-navigation" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-ldn-search" version="6.6.0" relation="ge"/>
   </ccm:dependencies>

ccm-zes-aplaws/bundles/devel/bundle.in

@@ -1,4 +1,4 @@
 BUNDLE_NAME=aplaws-plus-zes-devel
 BUNDLE_PRETTY_NAME="APLAWS+ ZeS Devel Bundle"
-VERSION=1.0.5devel
+VERSION=1.0.9devel
 RELEASE=1

ccm-zes-aplaws/bundles/devel/cfg/applications.cfg

@@ -73,6 +73,6 @@ ccm-ldn-terms
 ccm-ldn-theme
 ccm-ldn-util
 
-# zes extensions
+# integration layer
 ccm-zes-aplaws
 

ccm-zes-aplaws/src/com/arsdigita/aplaws/Initializer.java

@@ -19,12 +19,14 @@
 package com.arsdigita.aplaws;
 
 import com.arsdigita.categorization.Categorization;
-import com.arsdigita.london.terms.TermCategoryListener;
 import com.arsdigita.runtime.CompoundInitializer;
 import com.arsdigita.runtime.DomainInitEvent;
+import com.arsdigita.templating.PatternStylesheetResolver;
+
+import com.arsdigita.london.terms.TermCategoryListener;
+
 import org.apache.log4j.Logger;
 
-import com.arsdigita.templating.PatternStylesheetResolver;
 
 /**
  * The APLAWS initializer.

ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java

@@ -64,10 +64,6 @@ import java.util.Set;
  * @version $Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $
  */
 public class Loader extends PackageLoader {
-    public final static String versionId =
-        "$Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $" +
-        "$Author: sskracic $" +
-        "$DateTime: 2004/03/25 09:34:39 $";
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
@@ -211,8 +207,11 @@ public class Loader extends PackageLoader {
      * TODO: make configurable without recompiling!
      */
     public void registerNavigationTemplates() {
+
         Template template ;
 
+    /*  In navigation werden bereits Grund-Templates erstellt.
+    */
         template = Template.create(
             "ZeS AtoZ paginator",
             "ZeS AtoZ paginator index page",

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl

@@ -8,7 +8,7 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/navigation-index.xsl"/>
+  <xsl:import href="../../themes/aplaws-generic/navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />

ccm-zes-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css

@@ -1,5 +1,5 @@
 @import url("css/main.css");
-/* Chris presumalby forgot the ! to cemment the following 2 lines out
+/* Chris presumably forgot the ! to comment the following 2 lines out
 /* <--@import url("/css/acs-master.css");-->   */
 /* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
 

ccm-zes-aplaws/web/assets/xinha/XinhaConfig.js

@@ -0,0 +1,18 @@
+/* This compressed file is part of Xinha. For uncompressed sources, forum, and bug reports, go to xinha.org */
+/* This file is part of version 0.95 released Mon, 12 May 2008 17:33:15 +0200 */
+/* The URL of the most recent version of this file is http://svn.xinha.webfactional.com/trunk/examples/XinhaConfig.js */
+xinha_init=null;
+xinha_config=null;
+xinha_init=xinha_init?xinha_init:function(){
+xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"];
+xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","ContextMenu","SmartReplace","Stylist","Linker","SuperClean","TableOperations"];
+if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){
+return;
+}
+xinha_config=xinha_config?xinha_config():new Xinha.Config();
+xinha_config.pageStyleSheets=[_editor_url+"examples/full_example.css"];
+xinha_editors=Xinha.makeEditors(xinha_editors,xinha_config,xinha_plugins);
+Xinha.startEditors(xinha_editors);
+};
+Xinha.addOnloadHandler(xinha_init);
+

ccm-zes-aplaws/web/packages/navigation/templates/zes-welcome.jsp

@@ -4,7 +4,7 @@
   xmlns:show="/WEB-INF/bebop-show.tld"
   version="1.2">
 
-  <%-- JSP template for the ZeS welcome / start page using navigation --%>
+  <!-- JSP template for the ZeS welcome / start page using navigation -->
 
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>

ccm-zes-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp

@@ -3,6 +3,8 @@
           xmlns:show="/WEB-INF/bebop-show.tld"
 	  version="1.2"> 
 
+<!--  Anpassung sitemap-Seite, die auch Navigationsspalte und Breadcrumbs enthaelt.   -->
+
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
 
   <jsp:scriptlet>
@@ -16,6 +18,10 @@
       sitemapPage.setClassAttr("sitemapPage");
     </jsp:scriptlet>
 
+    <define:component name="categoryPath"
+      classname="com.arsdigita.london.navigation.ui.category.Path"/>
+    <define:component name="categoryMenu"
+      classname="com.arsdigita.london.navigation.ui.category.Menu"/>
     <define:component name="categoryNav"
                       classname="com.arsdigita.london.navigation.ui.category.Hierarchy">
       <jsp:scriptlet>

ccm-zes-aplaws/web/templates/ccm-ldn-portal/portal/README.txt

@@ -1,4 +1,4 @@
-jsp files replace  files provided by ccm-ldn-protal.
+jsp files replace  files provided by ccm-ldn-portal.
 
 goal: Make the portal homepage read-only and cached for 15min. EXPERIMENTAL