svn commit: r803427 - in /ofbiz/trunk: applications/content/data/TemplateData.xml themes/flatgrey/data/FlatGreyThemeData.xml

[hansbak-2]

Author: hansbak
Date: Wed Aug 12 09:58:29 2009
New Revision: 803427

URL: http://svn.apache.org/viewvc?rev=803427&view=rev
Log:
moved the help template to the content component, in the themes directory it was loading much too early

Modified:
    ofbiz/trunk/applications/content/data/TemplateData.xml
    ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml

Modified: ofbiz/trunk/applications/content/data/TemplateData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/TemplateData.xml?rev=803427&r1=803426&r2=803427&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/data/TemplateData.xml (original)
+++ ofbiz/trunk/applications/content/data/TemplateData.xml Wed Aug 12 09:58:29 2009
@@ -462,4 +462,42 @@
   </tr>
 </table>]]></textData>
     </ElectronicText>
+    
+    
+<!-- help template -->
+<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELP_TEMPL" resourceValue="HELP-TEMPL-FLAT_GREY" sequenceId="01"/>
+<DataResource dataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
+<ElectronicText dataResourceId="HELP-TEMPL-FLAT_GREY">
+        <textData><![CDATA[
+<div class="contentarea">
+  <div id="column-container">
+    <div id="content-main-section">
+            
+          <#if doc.root.definition?has_content>
+            <h1>${uiLabelMap.CommonExtHelpDefinition}</h1>
+            <p class=h2>${doc.root.definition}</p></br>
+          </#if>
+
+          <#if doc.root.usedFor?has_content>
+            <h1>${uiLabelMap.CommonExtHelpUsedFor}</h1>
+            <p class=h2>${doc.root.usedFor}</p></br>
+          </#if>
+            
+          <#if doc.root.onScreen?has_content>
+            <h1>${uiLabelMap.CommonExtHelpOnScreen}</h1>
+            <p class=h2>${doc.root.onScreen}</p>
+          </#if>
+          
+          <#if doc.root.general?has_content>
+            <h1>${doc.root.generalTitle?if_exists}</h1>
+            <p class=h2>${doc.root.general}</p>
+          </#if>
+          
+    </div>
+  </div>
+</div>
+        ]]></textData>
+</ElectronicText>
+    
+    
 </entity-engine-xml>

Modified: ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml?rev=803427&r1=803426&r2=803427&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/trunk/themes/flatgrey/data/FlatGreyThemeData.xml Wed Aug 12 09:58:29 2009
@@ -29,40 +29,4 @@
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_FTR_TMPLT_LOC" resourceValue="component://flatgrey/includes/footer.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAV_TMPLT_LOC" resourceValue="component://flatgrey/includes/appbar.ftl" sequenceId="01"/>
     <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SCREENSHOT" resourceValue="/flatgrey/screenshot.gif" sequenceId="01"/>
-    <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELP_TEMPL" resourceValue="HELP-TEMPL-FLAT_GREY" sequenceId="01"/>
-    
-    <!-- help template -->
-    <DataResource dataResourceId="HELP-TEMPL-FLAT_GREY" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="FTL" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
-    <ElectronicText dataResourceId="HELP-TEMPL-FLAT_GREY">
-        <textData><![CDATA[
-<div class="contentarea">
-  <div id="column-container">
-    <div id="content-main-section">
-            
-          <#if doc.root.definition?has_content>
-            <h1>${uiLabelMap.CommonExtHelpDefinition}</h1>
-            <p class=h2>${doc.root.definition}</p></br>
-          </#if>
-
-          <#if doc.root.usedFor?has_content>
-            <h1>${uiLabelMap.CommonExtHelpUsedFor}</h1>
-            <p class=h2>${doc.root.usedFor}</p></br>
-          </#if>
-            
-          <#if doc.root.onScreen?has_content>
-            <h1>${uiLabelMap.CommonExtHelpOnScreen}</h1>
-            <p class=h2>${doc.root.onScreen}</p>
-          </#if>
-          
-          <#if doc.root.general?has_content>
-            <h1>${doc.root.generalTitle?if_exists}</h1>
-            <p class=h2>${doc.root.general}</p>
-          </#if>
-          
-    </div>
-  </div>
-</div>
-        ]]></textData>
-    </ElectronicText>
-    
 </entity-engine-xml>