svn commit: r617713 [1/3] - in /ofbiz/trunk/applications/content: config/ webapp/content/cms/ webapp/content/contentsetup/ webapp/content/datasetup/ webapp/content/layout/ widget/ widget/cms/ widget/compdoc/ widget/content/ widget/contentsetup/ widget/...

[mrisaliti]

Author: mrisaliti
Date: Fri Feb  1 15:56:39 2008
New Revision: 617713

URL: http://svn.apache.org/viewvc?rev=617713&view=rev
Log:
CMS/Content Setup/Data Setup/Layout/CompDoc/Data Resouces forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1601)

Modified:
    ofbiz/trunk/applications/content/config/ContentUiLabels.properties
    ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties
    ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
    ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
    ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml
    ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml
    ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml
    ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
    ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml
    ofbiz/trunk/applications/content/widget/CommonScreens.xml
    ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml
    ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceForms.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml
    ofbiz/trunk/applications/content/widget/content/DataResourceScreens.xml
    ofbiz/trunk/applications/content/widget/contentsetup/ContentSetupScreens.xml
    ofbiz/trunk/applications/content/widget/datasetup/DataResourceSetupScreens.xml
    ofbiz/trunk/applications/content/widget/layout/LayoutScreens.xml

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.properties?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels.properties (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels.properties Fri Feb  1 15:56:39 2008
@@ -68,8 +68,11 @@
 ContentCompDoc=CompDoc
 ContentCompDocApprovalsFor=Content Approvals for
 ContentCompDocApprovals=Approvals
+ContentCompDocViewInstances=View CompDoc Instances of
 ContentCompDocRev=rev.
+ContentCompDocRevisionListPageForContent=Revision List Page for Content
 ContentCompDocRevisions=Revisions
+ContentCompDocRevisionItemEditPage=Content Revision Item Edit Page for Content
 ContentCompDocViewTree=View Tree
 ContentCompDocViewWaitingApprovals=View Waiting Approvals
 ContentPDF=PDF Content ID
@@ -125,9 +128,14 @@
 PageTitleAddPurpose=Add a Purpose
 PageTitleAddRole=Add a Role
 PageTitleAddWorkEffortContent=Add workeffort content
+PageTitleCreateInstanceOfThisTemplate=Create Instance of This Template
+PageTitleCreateNewRootCompDocTemplate=Create New Root CompDoc Template
 PageTitleEditAssociation=Edit an association
 PageTitleEditCMSContent=CMS Content Edit
+PageTitleEditCompDocInstance=Edit CompDoc Instance
+PageTitleEditCompDocTemplate=Edit CompDoc Template
 PageTitleEditContent=Edit Content
+PageTitleEditContentApprovalEditPage=Content Approval Edit Page for
 PageTitleEditContentAssoc=Edit Content Association
 PageTitleEditContentAssocType=Edit Content Association Type
 PageTitleEditContentAssocPredicate=Edit Content Association Predicate
@@ -175,6 +183,7 @@
 PageTitleFindDataResource=Find Data Resource
 PageTitleFindContent=Search Content
 PageTitleFindWebSite=Find WebSite
+PageTitleListContentApproval=List Content Approval
 PageTitleListAssociations=List associations
 PageTitleListDataResource=Data Resource List
 PageTitleListContent=Content List
@@ -206,6 +215,7 @@
 PageTitleWebSiteCMSContent=Web Site CMS Content
 PageTitleAutoCreateContentPublishPoints=Auto-Create Content Publish Points
 PageTitleEditLayout=Edit Layout
+PageTitleEditLayoutSubContent=Edit Layout Sub Content
 PageTitleFindLayout=Find Layout
 PageTitleListLayout=List Layout
 PageTitleNavigateDataResources=Navigate Data Resources using Data Categories
@@ -404,4 +414,5 @@
 FormFieldTitle_pasteContent=Paste Content
 FormFieldTitle_dataResourceName=Data Resource Name
 FormFieldTitle_dataCategoryId=Data Category Id
-FormFieldTitle_drObjectInfo=Template File
\ No newline at end of file
+FormFieldTitle_drObjectInfo=Template File
+FormFieldTitle_templateLocation=Template Location
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/content/config/ContentUiLabels_it.properties Fri Feb  1 15:56:39 2008
@@ -68,8 +68,11 @@
 ContentCompDoc=Composizione Documenti
 ContentCompDocApprovalsFor=Approvazioni Contenuto
 ContentCompDocApprovals=Approvazioni
+ContentCompDocViewInstances=Mostra Istanze di CompDoc
 ContentCompDocRev=rev.
+ContentCompDocRevisionListPageForContent=Lista Revisioni Pagina per Contenuto
 ContentCompDocRevisions=Revisioni
+ContentCompDocRevisionItemEditPage=Riga Revisione Pagina Aggiornamento per Contenuto
 ContentCompDocViewTree=Mostra Albero
 ContentCompDocViewWaitingApprovals=Mostra Approvazioni in Attesa
 ContentPDF=Contenuto PDF
@@ -124,9 +127,14 @@
 PageTitleAddRole=Aggiungi un Ruolo
 PageTitleCreateWebSiteContent=Creare Contenuto Sito Web
 PageTitleCreateWebSiteParties=Creare Soggetti Sito Web
+PageTitleCreateInstanceOfThisTemplate=Creare Istanza per Questo Template
+PageTitleCreateNewRootCompDocTemplate=Creare Nuovo Template Radice CompDoc
 PageTitleEditAssociation=Aggiorna una associazione
 PageTitleEditCMSContent=Aggiorna Contenuto CMS
+PageTitleEditCompDocInstance=Aggiorna Istanza CompDoc
+PageTitleEditCompDocTemplate=Aggiorna Template CompDoc
 PageTitleEditContent=Aggiorna Contenuto
+PageTitleEditContentApprovalEditPage=Pagina per Editare Approvazione Contenuto per
 PageTitleEditContentAssoc=Aggiorna Associazione Contenuto
 PageTitleEditContentAssocType=Aggiorna Tipo Associazione Contenuto
 PageTitleEditContentAssocPredicate=Aggiorna Associazione Contenuto Predicato
@@ -172,6 +180,7 @@
 PageTitleFindDataResource=Ricerca Risorsa Dati
 PageTitleFindContent=Ricerca Contenuto
 PageTitleFindWebSite=Ricerca Sito Web
+PageTitleListContentApproval=Lista Approvazione Contenuto
 PageTitleListAssociations=Lista associazioni
 PageTitleListDataResource=Lista Risorse Dati
 PageTitleListContent=Lista Contenuti
@@ -203,8 +212,10 @@
 PageTitleWebSiteCMSContent=Sito Web CMS Contenuto
 PageTitleAutoCreateContentPublishPoints=Creazioni-Automatica Contenuto Punti Pubblicati
 PageTitleEditLayout=Aggiorna Layout
+PageTitleEditLayoutSubContent=Aggiorna Layout Sotto-Contenuto
 PageTitleFindLayout=Ricerca Layout
 PageTitleListLayout=Lista Layout
+PageTitleNavigateDataResources=Naviga nelle Risorse Dati usando i Dati Categorie
 
 PartyParties=Soggetti
 PartyPartyId=Codice Soggetto
@@ -401,4 +412,5 @@
 FormFieldTitle_pasteContent=Incolla Contenuto
 FormFieldTitle_dataResourceName=Nome Risorsa Dati
 FormFieldTitle_dataCategoryId=Categoria Dati
-FormFieldTitle_drObjectInfo=File Template
\ No newline at end of file
+FormFieldTitle_drObjectInfo=File Template
+FormFieldTitle_templateLocation=Posizione Template
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSForms.xml Fri Feb  1 15:56:39 2008
@@ -20,7 +20,8 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    <form name="findContent" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single">
+    <form name="findContent" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="caContentIdTo"><text-find/></field>
         <field name="caMapKey"><text-find/></field>
         <field name="caContentAssocTypeId"><text-find/></field>
@@ -35,7 +36,8 @@
 
     </form>
 
-    <form name="listFindContent" type="list" target="" paginate-target="/CMSContentFind" view-size="20">
+    <form name="listFindContent" type="list" target="" paginate-target="/CMSContentFind" view-size="20"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
@@ -57,7 +59,8 @@
         <field name="contentName"><display/></field>
     </form>
 
-    <form name="EditContent" target="uploadContentAndImage" title="" type="upload">
+    <form name="EditContent" target="uploadContentAndImage" title="" type="upload"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="imageData" >
             <file />
         </field>
@@ -163,13 +166,15 @@
     </form>
 
     <!-- ContentPurposeOperation forms -->
-   <form name="UpdateContentPurposeOperation" list-name="contentList" target="updateContentPurposeOperation" title="" type="list">
+   <form name="UpdateContentPurposeOperation" list-name="contentList" target="updateContentPurposeOperation" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <auto-fields-service service-name="updateContentPurposeOperation" default-field-type="display"/>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation?contentPurposeTypeId=${contentPurposeTypeId}&amp;contentOperationId=${contentOperationId}&amp;roleTypeId=${roleTypeId}&amp;statusId=${statusId}&amp;privilegeEnumId=${privilegeEnumId}"/>
         </field>
     </form>
-    <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single">
+    <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentPurposeOperation"/>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="false">
@@ -212,7 +217,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="EditAddContentMaster" target="" title="" type="single">
+    <form name="EditAddContentMaster" target="" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId" map-name="currentValue">
             <hidden/>
         </field>
@@ -277,16 +283,16 @@
                 <hidden value="true"/>
         </field>
     </form>
-    <form name="EditAddContent" target="persistContent" title="" type="single" extends="EditAddContentMaster">
+    <form name="EditAddContent" target="persistContent" title="" type="single" extends="EditAddContentMaster" header-row-style="header-row" default-table-style="basic-table">
     </form>
-    <form name="EditAddBioContent" target="persistBioContent" title="" type="single" extends="EditAddContentMaster">
+    <form name="EditAddBioContent" target="persistBioContent" title="" type="single" extends="EditAddContentMaster" header-row-style="header-row" default-table-style="basic-table">
     </form>
 <!--
     <form name="AddResponse" target="uploadResponse" title="" type="single" extends="EditAddContentMaster">
     </form>
 -->
 
-    <form name="EditAddImageMaster" target="" title="" type="upload">
+    <form name="EditAddImageMaster" target="" title="" type="upload" header-row-style="header-row" default-table-style="basic-table">
         <field name="dataResourceId" map-name="currentValue">
             <hidden/>
         </field>
@@ -356,27 +362,27 @@
                 <hidden value="true"/>
         </field>
     </form>
-    <form name="EditAddImage" target="persistImage" title="" type="upload" extends="EditAddImageMaster">
+    <form name="EditAddImage" target="persistImage" title="" type="upload" extends="EditAddImageMaster" header-row-style="header-row" default-table-style="basic-table">
     </form>
-    <form name="EditAddBioImage" target="persistBioImage" title="" type="upload" extends="EditAddImageMaster">
+    <form name="EditAddBioImage" target="persistBioImage" title="" type="upload" extends="EditAddImageMaster" header-row-style="header-row" default-table-style="basic-table">
     </form>
   
-    <form name="AdminIndex" target="AdminIndex" title="" type="single">
+    <form name="AdminIndex" target="AdminIndex" title="" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="indexContentIds" position="1"><text size="50"/></field>
         <field name="submitButton" title="${uiLabelMap.ContentIndexEnteredIds}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field>
     </form>
 
-    <form name="AdminIndexAll" target="indexTree" title="" type="single">
+    <form name="AdminIndexAll" target="indexTree" title="" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" position="1"><text size="50" default-value="WebStoreCONTENT"/></field>
         <field name="submitButton" title="${uiLabelMap.ContentIndexAll}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field>
     </form>
 
-    <form name="searchQuery" target="AdminSearch" title="" type="single">
+    <form name="searchQuery" target="AdminSearch" title="" type="single" header-row-style="header-row" default-table-style="basic-table">
         <field name="queryLine"><text size="60"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
-
     </form>
-    <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch">
+    <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}">
             <hyperlink also-hidden="false" description="Edit" target="CMSContentEdit?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}&amp;contentIdTo=${contentIdTo}"/>
         </field>
@@ -385,8 +391,8 @@
         <field name="contentName"><display/></field>
     </form>
 
-    <form name="EditAddContentStuff" target="persistContentStuff" title="" type="upload" default-map-name="currentValue">
-
+    <form name="EditAddContentStuff" target="persistContentStuff" title="" type="upload" default-map-name="currentValue"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="contentAssocTitle" title="${uiLabelMap.ContentAssoc}" title-style="head1" map-name="dummy">
             <display description=""/>
         </field>
@@ -580,10 +586,12 @@
         <field name="MASTER_caFromDate" ><hidden value="${MASTER_caFromDate}" /></field>
         <field name="MASTER_drDataResource" ><hidden value="${MASTER_drDataResource}" /></field>
     </form>
-    <form name="EditAddSubContentStuff" target="persistSubContentStuff" title="" type="upload" default-map-name="currentValue" extends="EditAddContentStuff">
+    <form name="EditAddSubContentStuff" target="persistSubContentStuff" title="" type="upload" default-map-name="currentValue" extends="EditAddContentStuff"
+        header-row-style="header-row" default-table-style="basic-table">
     </form>
 
-    <form name="TestPermission" target="TestPermission" title="" type="single">
+    <form name="TestPermission" target="TestPermission" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="contentId">
             <text/>
         </field>
@@ -623,4 +631,4 @@
             <submit button-type="button"/>
         </field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml Fri Feb  1 15:56:39 2008
@@ -22,7 +22,8 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     <menu name="cms" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
         default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}"
-        selected-menuitem-context-field-name="currentCMSMenuItemName" title="" type="simple">
+        selected-menuitem-context-field-name="currentCMSMenuItemName" title="" type="simple"
+        menu-container-style="button-bar tab-bar" default-selected-style="selected">
 
         <menu-item name="contentfind" title="${uiLabelMap.ContentContent}" >
             <link id="contentfind" target="CMSContentFind"/>

Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupForms.xml Fri Feb  1 15:56:39 2008
@@ -21,13 +21,15 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- ContentType forms -->
-    <form name="AddContentType" target="addContentType" title="" type="single">
+    <form name="AddContentType" target="addContentType" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentType"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentType" list-name="contentList" target="updateContentType" title="" type="list">
+    <form name="UpdateContentType" list-name="contentList" target="updateContentType" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
           <entity-condition entity-name="ContentType" use-cache="false"/>
         </actions>
@@ -44,7 +46,8 @@
     </form>
     
     <!-- ContentTypeAttr forms -->
-    <form name="AddContentTypeAttr" target="addContentTypeAttr" title="" type="single">
+    <form name="AddContentTypeAttr" target="addContentTypeAttr" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentTypeAttr"/>
         <field entity-name="ContentType" name="contentTypeId">
             <drop-down allow-empty="false">
@@ -56,7 +59,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentTypeAttr" list-name="contentList" target="updateContentTypeAttr" title="" type="list">
+    <form name="UpdateContentTypeAttr" list-name="contentList" target="updateContentTypeAttr" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
         <entity-condition entity-name="ContentTypeAttr" use-cache="false"/>
         </actions>
@@ -73,13 +77,15 @@
     </form>
     
     <!-- ContentAssocType forms -->
-    <form name="AddContentAssocType" target="addContentAssocType" title="" type="single">
+    <form name="AddContentAssocType" target="addContentAssocType" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentAssocType"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentAssocType" list-name="contentList" target="updateContentAssocType" title="" type="list">
+    <form name="UpdateContentAssocType" list-name="contentList" target="updateContentAssocType" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="ContentAssocType" use-cache="false"/>
         </actions>
@@ -96,13 +102,15 @@
     </form>
     
     <!-- ContentPurposeType forms -->
-    <form name="AddContentPurposeType" target="addContentPurposeType" title="" type="single">
+    <form name="AddContentPurposeType" target="addContentPurposeType" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentPurposeType"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentPurposeType" list-name="contentList" target="updateContentPurposeType" title="" type="list">
+    <form name="UpdateContentPurposeType" list-name="contentList" target="updateContentPurposeType" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="ContentPurposeType" use-cache="false"/>
         </actions>
@@ -119,13 +127,15 @@
     </form>
     
     <!-- ContentAssocPredicate forms -->
-   <form name="AddContentAssocPredicate" target="addContentAssocPredicate" title="" type="single">
+   <form name="AddContentAssocPredicate" target="addContentAssocPredicate" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentAssocPredicate"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentAssocPredicate" list-name="contentList" target="updateContentAssocPredicate" title="" type="list">
+    <form name="UpdateContentAssocPredicate" list-name="contentList" target="updateContentAssocPredicate" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="ContentAssocPredicate" use-cache="false"/>
         </actions>
@@ -137,19 +147,20 @@
             <submit button-type="button"/>
         </field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink also-hidden="false" description="[${uiLabelMap.CommonDelete}]" target="removeContentAssocPredicate?contentAssocPredicateId=${contentAssocPredicateId}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssocPredicate?contentAssocPredicateId=${contentAssocPredicateId}"/>
         </field>
     </form>
     
     <!-- ContentOperation forms -->
     <form name="AddContentOperation" target="addContentOperation" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentOperation"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentOperation" list-name="contentList" target="updateContentOperation" title="" type="list">
+    <form name="UpdateContentOperation" list-name="contentList" target="updateContentOperation" title="" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="ContentOperation" use-cache="false"/>
         </actions>
@@ -165,7 +176,8 @@
         </field>
     </form>
     <!-- ContentPurposeOperation forms -->
-    <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single">
+    <form name="AddContentPurposeOperation" target="addContentPurposeOperation" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createContentPurposeOperation"/>
         <field name="contentPurposeTypeId">
             <drop-down allow-empty="true">
@@ -189,7 +201,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateContentPurposeOperation" target="" title="" type="list" list-name="contentList">
+    <form name="UpdateContentPurposeOperation" target="" title="" type="list" list-name="contentList"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="ContentPurposeOperation" use-cache="false"/>
         </actions>
@@ -198,4 +211,4 @@
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentPurposeOperation?contentPurposeTypeId=${contentPurposeTypeId}&amp;contentOperationId=${contentOperationId}&amp;roleTypeId=${roleTypeId}&amp;statusId=${statusId}&amp;privilegeEnumId=${privilegeEnumId}"/>
         </field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/contentsetup/ContentSetupMenus.xml Fri Feb  1 15:56:39 2008
@@ -21,7 +21,8 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     <menu name="contentsetup" selected-menuitem-context-field-name="currentMenuItemName" default-menu-item-name="content"
-        default-associated-content-id="${userLogin.userLoginId}" title="" type="simple">
+        default-associated-content-id="${userLogin.userLoginId}" title="" type="simple"
+        menu-container-style="button-bar tab-bar" default-selected-style="selected">
 
         <menu-item name="contentPurposeOp" title="${uiLabelMap.PageTitleEditContentPurposeOperation}" >
             <link target="EditContentPurposeOperation" target-window="_top" style="tabButton" />

Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataResourceSetupMenus.xml Fri Feb  1 15:56:39 2008
@@ -20,8 +20,8 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="dataresourcesetup" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple">
-
+    <menu name="dataresourcesetup" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple"
+        menu-container-style="button-bar tab-bar" default-selected-style="selected">
         <menu-item name="EditDataResourceType" title="${uiLabelMap.CommonType}" >
             <link target="EditDataResourceType" target-window="_top" style="tabButton" />
         </menu-item>

Modified: ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/datasetup/DataSetupForms.xml Fri Feb  1 15:56:39 2008
@@ -21,13 +21,15 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- DataResourceType forms -->
-    <form name="AddDataResourceType" target="addDataResourceType" title="" type="single">
+    <form name="AddDataResourceType" target="addDataResourceType" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createDataResourceType"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateDataResourceType" list-name="contentList" target="updateDataResourceType" title="" type="list" paginate-target="EditDataResourceType">
+    <form name="UpdateDataResourceType" list-name="contentList" target="updateDataResourceType" title="" type="list" paginate-target="EditDataResourceType"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
           <entity-condition entity-name="DataResourceType" use-cache="false"/>
         </actions>
@@ -44,7 +46,8 @@
     </form>
     
     <!-- DataResourceTypeAttr forms -->
-    <form name="AddDataResourceTypeAttr" target="addDataResourceTypeAttr" title="" type="single">
+    <form name="AddDataResourceTypeAttr" target="addDataResourceTypeAttr" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createDataResourceTypeAttr"/>
         <field entity-name="DataResource" name="dataResourceTypeId">
             <drop-down allow-empty="false">
@@ -57,7 +60,7 @@
         </field>
     </form>
     <form name="UpdateDataResourceTypeAttr" list-name="contentList" target="updateDataResourceTypeAttr" title="" type="list"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" paginate-target="EditDataResourceTypeAttr">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="EditDataResourceTypeAttr">
         <actions>
           <entity-condition entity-name="DataResourceTypeAttr" use-cache="false"/>
         </actions>
@@ -74,13 +77,15 @@
     </form>
     
     <!-- CharacterSet forms -->
-    <form name="AddCharacterSet" target="addCharacterSet" title="" type="single">
+    <form name="AddCharacterSet" target="addCharacterSet" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createCharacterSet"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateCharacterSet" list-name="contentList" target="updateCharacterSet" title="" type="list" paginate-target="EditCharacterSet">
+    <form name="UpdateCharacterSet" list-name="contentList" target="updateCharacterSet" title="" type="list" paginate-target="EditCharacterSet"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
           <entity-condition entity-name="CharacterSet" use-cache="false"/>
         </actions>
@@ -97,7 +102,8 @@
     </form>
     
     <!-- DataCategory forms -->
-    <form name="AddDataCategory" target="addDataCategory" title="" type="single">
+    <form name="AddDataCategory" target="addDataCategory" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createDataCategory"/>
         <field name="parentCategoryId">
             <drop-down allow-empty="true">
@@ -108,7 +114,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateDataCategory" list-name="dataCategoryList" target="updateDataCategory" title="" type="list" paginate-target="EditDataCategory">
+    <form name="UpdateDataCategory" list-name="dataCategoryList" target="updateDataCategory" title="" type="list" paginate-target="EditDataCategory"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="DataCategory" use-cache="false"/>
         </actions>
@@ -132,7 +139,8 @@
     </form>
     
     <!-- FileExtension forms -->
-    <form name="AddFileExtension" target="addFileExtension" title="" type="single">
+    <form name="AddFileExtension" target="addFileExtension" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createFileExtension"/>
         <field name="mimeTypeId" title="${uiLabelMap.CommonEmptyHeader}">
             <drop-down allow-empty="false">
@@ -144,7 +152,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateFileExtension" list-name="contentList" target="updateFileExtension" title="" type="list" paginate-target="EditFileExtension">
+    <form name="UpdateFileExtension" list-name="contentList" target="updateFileExtension" title="" type="list" paginate-target="EditFileExtension"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
           <entity-condition entity-name="FileExtension" use-cache="false"/>
         </actions>
@@ -167,14 +176,15 @@
     </form>
     
     <!-- MetaDataPredicate forms -->
-    <form name="AddMetaDataPredicate" target="addMetaDataPredicate" title="" type="single">
+    <form name="AddMetaDataPredicate" target="addMetaDataPredicate" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createMetaDataPredicate"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
     <form name="UpdateMetaDataPredicate" list-name="contentList" target="updateMetaDataPredicate" title="" type="list"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" paginate-target="EditMetaDataPredicate">
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="EditMetaDataPredicate">
         <actions>
           <entity-condition entity-name="MetaDataPredicate" use-cache="false"/>
         </actions>
@@ -191,13 +201,15 @@
     </form>
     
     <!-- MimeType forms -->
-    <form name="AddMimeType" target="addMimeType" title="" type="single">
+    <form name="AddMimeType" target="addMimeType" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createMimeType"/>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="UpdateMimeType" list-name="contentList" target="updateMimeType" title="" type="list" paginate-target="EditMimeType">
+    <form name="UpdateMimeType" list-name="contentList" target="updateMimeType" title="" type="list" paginate-target="EditMimeType"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
           <entity-condition entity-name="MimeType" use-cache="false"/>
         </actions>
@@ -214,7 +226,8 @@
     </form>
 
     <!-- MimeTypeHtmlTemplate Froms -->
-    <form name="CreateMimeTypeHtmlTemplate" target="createMimeTypeHtmlTemplate" title="" type="single">
+    <form name="CreateMimeTypeHtmlTemplate" target="createMimeTypeHtmlTemplate" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createMimeTypeHtmlTemplate"/>
         <field name="mimeTypeId" widget-style="tabletext">
             <drop-down allow-empty="false">
@@ -226,7 +239,8 @@
         </field>
     </form>
 
-    <form name="UpdateMimeTypeHtmlTemplate" target="updateMimeTypeHtmlTemplate" title="" type="list" list-name="contentList" paginate-target="EditMimeTypeHtmlTemplate">
+    <form name="UpdateMimeTypeHtmlTemplate" target="updateMimeTypeHtmlTemplate" title="" type="list" list-name="contentList" paginate-target="EditMimeTypeHtmlTemplate"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
           <entity-condition entity-name="MimeTypeHtmlTemplate" use-cache="false"/>
         </actions>
@@ -241,4 +255,4 @@
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeMimeTypeHtmlTemplate?mimeTypeId=${mimeTypeId}&amp;dataResourceId=${dataResourceId}&amp;fromDate=${fromDate}"/>
         </field>
     </form>
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutForms.xml Fri Feb  1 15:56:39 2008
@@ -21,7 +21,8 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <!-- LayoutFind forms -->
-    <form name="findLayout" default-entity-name="Content" target="FindLayout" title="" type="single">
+    <form name="findLayout" default-entity-name="Content" target="FindLayout" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <!--<auto-fields-entity entity-name="Content" default-field-type="find" />-->
         <field name="contentTypeId">
             <hidden value="DOCUMENT"/>
@@ -53,7 +54,8 @@
     </form>
 
     <!-- LayoutEdit forms -->
-    <form name="EditLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single">
+    <form name="EditLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="contentId" >
             <display/>
         </field>
@@ -101,7 +103,8 @@
                 target="cloneLayout?contentId=${currentValue.contentId}"/>
         </field>
     </form>
-    <form name="AddLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutSubContent" title="" type="single">
+    <form name="AddLayout" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutSubContent" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="contentId" >
             <text/>
         </field>
@@ -137,21 +140,22 @@
             <text />
         </field>
         <field name="textData" title="Text (Use '&lt;&gt;' to enter plain text)"  id-name="textData">
- <textarea rows="24" cols="80" />
+        <textarea rows="24" cols="80" />
         </field>
         <field name="submitButton" title="Create" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
 
-    <form name="listFindLayout" default-entity-name="ContentDataResourceView" title="" type="list" list-name="listIt" target="" paginate-target="FindLayout">
-       <actions>
+    <form name="listFindLayout" default-entity-name="ContentDataResourceView" title="" type="list" list-name="listIt" target="" paginate-target="FindLayout"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+          <actions>
             <set field="requestParameters.contentTypeId" value="DOCUMENT"/>
-          <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
-              <field-map field-name="inputFields" env-name="parameters"/>
-              <field-map field-name="entityName" value="ContentDataResourceView"/>
-          </service>
-       </actions>
+              <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+                  <field-map field-name="inputFields" env-name="parameters"/>
+                  <field-map field-name="entityName" value="ContentDataResourceView"/>
+              </service>
+          </actions>
         <field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>
         </field>
@@ -168,7 +172,8 @@
         -->
     </form>
 
-    <form name="listListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList" target="" title="" type="list" paginate-target="FindLayout">
+    <form name="listListLayout" default-entity-name="ContentAssocDataResourceViewFrom" list-name="layoutList" target="" title="" type="list" paginate-target="FindLayout"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>
         </field>
@@ -180,8 +185,8 @@
         </field>
     </form>
 
-    <form name="LayoutSubContentMaster" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" title="" type="single">
-            
+    <form name="LayoutSubContentMaster" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="contentId" position="1" >
         </field>
         <field name="contentTypeIdDisplay"  title="${uiLabelMap.ContentType}" position="2" map-name="dummy">
@@ -213,9 +218,8 @@
         </field>
     </form>
 
-
-    <form name="EditLayoutHtml" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutHtml" title="" type="single">
-        
+    <form name="EditLayoutHtml" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutHtml" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="currentValue==null" target="createLayoutHtml"/>
         <field name="drDataResourceTypeId" >
             <display description="ELECTRONIC_TEXT"/>
@@ -224,7 +228,7 @@
             <display description="text/plain"/>
         </field>
         <field name="textData" title="Text (Use '&lt;&gt;' to enter plain text)"  id-name="textData">
- <textarea rows="24" cols="80" />
+        <textarea rows="24" cols="80" />
         </field>
         <field name="createdByUserLogin" position="1">
             <display/>
@@ -243,7 +247,8 @@
         </field>
     </form>
 
-    <form name="EditLayoutText" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutText" title="" type="single">
+    <form name="EditLayoutText" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutText" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="currentValue==null" target="createLayoutText"/>
         <field name="drDataResourceTypeId" >
             <display description="ELECTRONIC_TEXT"/>
@@ -252,7 +257,7 @@
             <display description="text/plain"/>
         </field>
         <field name="textData" title="Text" >
- <textarea rows="24" cols="80" />
+        <textarea rows="24" cols="80" />
         </field>
         <field name="createdByUserLogin" position="1">
             <display/>
@@ -271,7 +276,8 @@
         </field>
     </form>
 
-    <form name="EditLayoutImage" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutImage" title="" type="upload">
+    <form name="EditLayoutImage" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutImage" title="" type="upload"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="drDataResourceTypeId" >
             <display description="IMAGE_OBJECT"/>
         </field>
@@ -305,8 +311,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="AddLayoutImage" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutImage" title="" type="upload">
-        
+    <form name="AddLayoutImage" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="createLayoutImage" title="" type="upload"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="drDataResourceTypeId" >
             <hidden value="IMAGE_OBJECT"/>
         </field>
@@ -332,7 +338,8 @@
         </field>
     </form>
 
-    <form name="EditLayoutUrl" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutUrl" title="" type="single">
+    <form name="EditLayoutUrl" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutUrl" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="currentValue==null" target="createLayoutUrl"/>
         <field name="drDataResourceTypeId" >
             <display description="URL_RESOURCE"/>
@@ -359,7 +366,8 @@
             <submit button-type="button"/>
         </field>
     </form>
-    <form name="ListRelatedLayouts" default-entity-name="ContentDataResourceViewTo" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout">
+    <form name="ListRelatedLayouts" default-entity-name="ContentDataResourceViewTo" list-name="entityList" target="" title="" type="list" paginate-target="FindLayout"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="contentId" title="Edit" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${contentId}" target="EditLayout?contentId=${contentId}&amp;drDataResourceId=${drDataResourceId}"/>
         </field>
@@ -368,7 +376,8 @@
         <field name="drObjectInfo" title="Template File"><display/></field>
     </form>
 
-    <form name="EditLayoutSubContent" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single">
+    <form name="EditLayoutSubContent" default-entity-name="SubContentDataResourceView" default-map-name="currentValue" extends="LayoutSubContentMaster" target="updateLayoutSubContent" title="" type="single"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="currentValue==null" target="createLayoutSubContent"/>
         <field name="contentIdToDisplay" >
            <ignored/>
@@ -410,7 +419,7 @@
             <text />
         </field>
         <field name="textData" id-name="textData">
- <textarea rows="24" cols="80" default-value="${context.textData}"/>
+        <textarea rows="24" cols="80" default-value="${context.textData}"/>
         </field>
         <field name="createdByUserLogin" position="1">
             <display/>
@@ -442,4 +451,4 @@
               description="${uiLabelMap.ContentPaste}"/>
         </field>
 -->
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml Fri Feb  1 15:56:39 2008
@@ -20,8 +20,8 @@
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="layout" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple">
-
+    <menu name="layout" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple"
+        menu-container-style="button-bar tab-bar" default-selected-style="selected">
         <menu-item name="ListLayout" title="${uiLabelMap.CommonList}" >
             <link target="ListLayout" target-window="_top" style="tabButton" />
         </menu-item>
@@ -30,45 +30,57 @@
         </menu-item>
         <menu-item name="EditLayout" title="${uiLabelMap.CommonEdit}">
             <condition>
-                <not><if-empty field-name="parameters.contentId"/></not>
-                <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                <and>
+                    <not><if-empty field-name="parameters.contentId"/></not>
+                    <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                </and>
             </condition>
             <link target="EditLayout?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
         </menu-item>
         <menu-item name="EditLayoutSubContent" title="${uiLabelMap.ContentSubContent}" >
             <condition>
-                <not><if-empty field-name="parameters.contentId"/></not>
-                <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                <and>
+                    <not><if-empty field-name="parameters.contentId"/></not>
+                    <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                </and>
             </condition>
             <link target="EditLayoutSubContent?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
         </menu-item>
         <menu-item name="EditLayoutText" title="${uiLabelMap.ContentText}" >
             <condition>
-                <not><if-empty field-name="parameters.contentId"/></not>
-                <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                <and>
+                    <not><if-empty field-name="parameters.contentId"/></not>
+                    <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                </and>
             </condition>
             <link target="EditLayoutText?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
         </menu-item>
         <menu-item name="EditLayoutHtml" title="${uiLabelMap.ContentHtml}" >
             <condition>
-                <not><if-empty field-name="parameters.contentId"/></not>
-                <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                <and>
+                    <not><if-empty field-name="parameters.contentId"/></not>
+                    <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                </and>
             </condition>
             <link target="EditLayoutHtml?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
         </menu-item>
         <menu-item name="EditLayoutImage" title="${uiLabelMap.ContentImage}" >
             <condition>
-                <not><if-empty field-name="parameters.contentId"/></not>
-                <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                <and>
+                    <not><if-empty field-name="parameters.contentId"/></not>
+                    <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                </and>
             </condition>
             <link target="EditLayoutImage?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
         </menu-item>
         <menu-item name="EditLayoutUrl" title="${uiLabelMap.ContentUrl}" >
             <condition>
-                <not><if-empty field-name="parameters.contentId"/></not>
-                <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                <and>
+                    <not><if-empty field-name="parameters.contentId"/></not>
+                    <not><if-empty field-name="parameters.drDataResourceId"/></not>
+                </and>
             </condition>
             <link target="EditLayoutUrl?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" />
         </menu-item>
     </menu>
-</menus>
+</menus>
\ No newline at end of file

Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Fri Feb  1 15:56:39 2008
@@ -175,13 +175,13 @@
                                         <not><if-empty field-name="currentValue.dataResourceId"/></not>
                                     </condition>
                                     <widgets>
-                                        <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}]  ${uiLabelMap.${extraFunctionName}}"/>
                                         <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/>
                                         <include-menu name="dataresource" location="component://content/widget/content/DataResourceMenus.xml"/>
+                                        <label style="head1" text="${uiLabelMap.${titleProperty}} ${uiLabelMap.CommonFor}: ${currentValue.dataResourceName} [${currentValue.dataResourceId}]  ${uiLabelMap.${extraFunctionName}}"/>
                                     </widgets>
                                     <fail-widgets>
-                                        <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
                                         <include-menu name="dataresourceTopMenu" location="component://content/widget/content/DataResourceMenus.xml"/>
+                                        <label style="head1" text="${uiLabelMap.${titleProperty}}"/>
                                     </fail-widgets>
                                 </section>
                                 <link text="${uiLabelMap.CommonNew}" target="editDataResource" style="buttontext"/>

Modified: ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml?rev=617713&r1=617712&r2=617713&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/cms/CMSScreens.xml Fri Feb  1 15:56:39 2008
@@ -36,8 +36,34 @@
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="findContent" location="component://content/webapp/content/cms/CMSForms.xml" />
-                        <include-form name="listFindContent" location="component://content/webapp/content/cms/CMSForms.xml" />
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.PageTitleFindCMSContent}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <include-form name="findContent" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.PageTitleFindCMSContent}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <include-form name="listFindContent" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -66,11 +92,24 @@
             <widgets>
                <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                  <decorator-section name="body">
-                    <platform-specific>
-                         <html>
-                             <html-template location="component://content/webapp/content/cms/CMSContentEdit.ftl"/>
-                         </html>
-                    </platform-specific>
+                    <container style="screenlet">
+                        <container style="screenlet-title-bar">
+                            <container style="head3">
+                                <label text="${uiLabelMap.PageTitleEditCMSContent}"/>
+                            </container>
+                        </container>
+                        <container style="screenlet-body">
+                            <section>
+                                <widgets>    
+                                    <platform-specific>
+                                         <html>
+                                             <html-template location="component://content/webapp/content/cms/CMSContentEdit.ftl"/>
+                                         </html>
+                                    </platform-specific>
+                                </widgets>
+                            </section>
+                        </container>
+                    </container>
                   </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -81,13 +120,25 @@
         <section>
             <actions>
                 <script location="component://content/widget/getMenuContext.bsh"/>
-                <set field="title" value="CMS Content Edit Page"/>
                 <set field="titleProperty" value="PageTitleEditContent"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="AddContent" location="component://content/webapp/content/cms/CMSForms.xml" />
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.PageTitleEditContent}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <include-form name="AddContent" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -124,9 +175,22 @@
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <link  text="Goto Find" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&amp;${CMSContentFindQueryString}" style="tabletext"/>
-                        <include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" />
-                        <content content-id="${contentId}" enable-edit-name="notfound"  edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&amp;MASTER_caContentIdTo=${MASTER_caContentIdTo}&amp;MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&amp;MASTER_caFromDate=${MASTER_caFromDate}&amp;MASTER_drDataResourceId=${MASTER_drDataResourceId}&amp;caContentIdTo=${caContentIdTo}"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="CMS Content Edit Page"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <link  text="Goto Find" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&amp;${CMSContentFindQueryString}" style="tabletext"/>
+                                        <include-form name="EditAddContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" />
+                                        <content content-id="${contentId}" enable-edit-name="notfound"  edit-request="EditAddSubContent?MASTER_contentId=${MASTER_contentId}&amp;MASTER_caContentIdTo=${MASTER_caContentIdTo}&amp;MASTER_caContentAssocTypeId=${MASTER_caContentAssocTypeId}&amp;MASTER_caFromDate=${MASTER_caFromDate}&amp;MASTER_drDataResourceId=${MASTER_drDataResourceId}&amp;caContentIdTo=${caContentIdTo}"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -136,7 +200,7 @@
     <screen name="EditAddSubContent">
         <section>
             <actions>
-                <set field="title" value="CMS Content Edit Page"/>
+                <set field="title" value="CMS Content Add Sub Content"/>
                 <set field="entityOperation" value="_UPDATE"/>
                 <set field="targetOperation" value="CONTENT_UPDATE|CONTENT_CREATE|CONTENT_CREATE_SUB"/>
                 <set field="requiredRoles" value="OWNER|BLOG_AUTHOR|BLOG_EDITOR|BLOG_ADMIN|BLOG_PUBLISHER"/>
@@ -157,8 +221,21 @@
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <link  text="Goto Find" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&amp;${CMSContentFindQueryString}" style="tabletext"/>
-                        <include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" />
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="CMS Content Add Sub Content"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <link  text="Goto Find" target="CMSContentFind?VIEW_INDEX=${CMSContentFindViewIndex}&amp;${CMSContentFindQueryString}" style="tabletext"/>
+                                        <include-form name="EditAddSubContentStuff" location="component://content/webapp/content/cms/CMSForms.xml" />
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -178,12 +255,25 @@
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html>
-                                <html-template location="component://content/webapp/content/cms/AdminSearch.ftl"/>
-                            </html>
-                        </platform-specific>
-                        <include-form name="searchList" location="component://content/webapp/content/cms/CMSForms.xml" />
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="CMS Search Page"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <platform-specific>
+                                            <html>
+                                                <html-template location="component://content/webapp/content/cms/AdminSearch.ftl"/>
+                                            </html>
+                                        </platform-specific>
+                                        <include-form name="searchList" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -202,8 +292,21 @@
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="AdminIndex" location="component://content/webapp/content/cms/CMSForms.xml" />
-                        <include-form name="AdminIndexAll" location="component://content/webapp/content/cms/CMSForms.xml" />
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="CMS Search Page"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <include-form name="AdminIndex" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                        <include-form name="AdminIndexAll" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -225,33 +328,57 @@
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html>
-                                <html-template location="component://content/webapp/content/cms/CMSSites.ftl"/>
-                            </html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="CMS Search Page"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <platform-specific>
+                                            <html>
+                                                <html-template location="component://content/webapp/content/cms/CMSSites.ftl"/>
+                                            </html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
 
-
     <screen name="addSubSite">
         <section>
             <actions>
                 <script location="component://content/widget/getMenuContext.bsh"/>
-                <set field="title" value="Add SubSite"/>
                 <set field="titleProperty" value="PageTitleSearchContent"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <platform-specific>
-                            <html>
-                                <html-template location="component://content/webapp/content/cms/addSubSite.ftl"/>
-                            </html>
-                        </platform-specific>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="${uiLabelMap.PageTitleSearchContent}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <platform-specific>
+                                            <html>
+                                                <html-template location="component://content/webapp/content/cms/addSubSite.ftl"/>
+                                            </html>
+                                        </platform-specific>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -261,17 +388,28 @@
         <section>
             <actions>
                 <script location="component://content/widget/getMenuContext.bsh"/>
-                <set field="title" value="Test Permission"/>
                 <set field="titleProperty" value="Test Permission"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-form name="TestPermission" location="component://content/webapp/content/cms/CMSForms.xml" />
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head3">
+                                    <label text="Test Permission"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>    
+                                        <include-form name="TestPermission" location="component://content/webapp/content/cms/CMSForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
-
+</screens>
\ No newline at end of file