svn commit: r813222 - in /ofbiz/trunk: applications/content/data/helpdata/ applications/content/documents/ framework/base/documents/ framework/common/webcommon/includes/ framework/documents/

[hansbak-2]

Author: hansbak
Date: Thu Sep 10 04:14:32 2009
New Revision: 813222

URL: http://svn.apache.org/viewvc?rev=813222&view=rev
Log:
changed the request -> helptopic=contentId name generation when the name is longer than 20 because of duplicates in the accounting component + updated some documents

Added:
    ofbiz/trunk/framework/base/documents/
    ofbiz/trunk/framework/base/documents/FrameworkBase.xml   (with props)
Modified:
    ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT_NL.xml
    ofbiz/trunk/applications/content/documents/Content.xml
    ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
    ofbiz/trunk/framework/documents/Framework.xml

Modified: ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT_NL.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT_NL.xml?rev=813222&r1=813221&r2=813222&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT_NL.xml (original)
+++ ofbiz/trunk/applications/content/data/helpdata/HELP_ROOT_NL.xml Thu Sep 10 04:14:32 2009
@@ -17,17 +17,21 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<root>
-    <generalTitle>
-        Welkom in het Apache OFBiz help systeem.
-    </generalTitle>
-    <general>
-        <section>
-            <text>Als je op deze pagina beland zonder de index geselecteerd te hebben,wordt veroorzaakt doordat de specifieke help pagina nog niet beschikbaar is.</text>
-        </section>
-        <section>
-            <text>Dit help systeem geeft je scherm afhankelijke informatie.</text>
-        </section>
-    </general>
-</root>
-
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+    xmlns="http://docbook.org/ns/docbook">
+    <title>Welkom in het Apache OFBiz help systeem.</title>
+    <section>
+        <para>
+            Als je op deze pagina beland zonder de index geselecteerd te
+            hebben,wordt veroorzaakt doordat de specifieke help pagina nog niet
+            beschikbaar is.
+        </para>
+    </section>
+    <section>
+        <para>
+            Dit help systeem geeft je scherm afhankelijke informatie.
+        </para>
+    </section>
+</section>

Modified: ofbiz/trunk/applications/content/documents/Content.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/documents/Content.xml?rev=813222&r1=813221&r2=813222&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/documents/Content.xml (original)
+++ ofbiz/trunk/applications/content/documents/Content.xml Thu Sep 10 04:14:32 2009
@@ -25,7 +25,6 @@
  <section>
  <title>Introduction</title>
  <para>
- and a introduction paragraph for he content component
         </para>
  </section>
 </chapter>

Added: ofbiz/trunk/framework/base/documents/FrameworkBase.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/documents/FrameworkBase.xml?rev=813222&view=auto
==============================================================================
--- ofbiz/trunk/framework/base/documents/FrameworkBase.xml (added)
+++ ofbiz/trunk/framework/base/documents/FrameworkBase.xml Thu Sep 10 04:14:32 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="5.0" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"
+    xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd"
+    xmlns="http://docbook.org/ns/docbook">
+    <title>Framework Base components</title>
+    <para>
+        This part of the framework contain the basic components like the several different connectors, catalina(tomcat)
+        which are the base of the other framwork.
+    </para>
+    
+    <section>
+        <title>Java Mail Listener</title>
+        <para>
+            The java mail listener will logon to the mailserver as defined in the config/ofbiz-containers.xml and will
+            receive the mail present in the POP/IMAP mail account. When mail is received it will trigger MCA rules.
+            Examples of MCA files can be found in the party and content component.
+        </para>
+    </section>
+</section>
+

Propchange: ofbiz/trunk/framework/base/documents/FrameworkBase.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/framework/base/documents/FrameworkBase.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/framework/base/documents/FrameworkBase.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl?rev=813222&r1=813221&r2=813222&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl Thu Sep 10 04:14:32 2009
@@ -23,7 +23,8 @@
 
   <#if Static["org.ofbiz.base.component.ComponentConfig"].componentExists("content")>
     <#if (helpTopic?length > 20)>
-     <#assign helpTopic = helpTopic?substring(0,20)>
+     <#assign len = helpTopic?length - 5/>
+     <#assign helpTopic = helpTopic?substring(0,15) + helpTopic?substring(len)/>
     </#if>
 <#-- uncomment this to show the current screen help topic key (this is usefull to cut and paste in the help link resources files
 ${helpTopic}

Modified: ofbiz/trunk/framework/documents/Framework.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/documents/Framework.xml?rev=813222&r1=813221&r2=813222&view=diff
==============================================================================
--- ofbiz/trunk/framework/documents/Framework.xml (original)
+++ ofbiz/trunk/framework/documents/Framework.xml Thu Sep 10 04:14:32 2009
@@ -28,13 +28,8 @@
  For a core configuration guide check <link xl:href="http://ofbiz.apache.org/docs/coreconfig.html">the OFBiz website.</link>
         </para>
  </section>
+    <xi:include href="../base/documents/FrameworkBase.xml" />
     <xi:include href="../entity/documents/EntityEngine.xml" />
     <xi:include href="../service/documents/ServiceEngine.xml" />
 
-    <section>
-        <title>The widget system: screens and forms.</title>
-        <para>
-
-        </para>
-    </section>
 </chapter>