ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaco...@apache.org
Subject svn commit: r514106 [1/6] - in /ofbiz/trunk/applications/party: config/ webapp/partymgr/WEB-INF/ webapp/partymgr/communication/ webapp/partymgr/contactlist/ webapp/partymgr/includes/ webapp/partymgr/lookup/ webapp/partymgr/party/ webapp/partymgr/securi...
Date Sat, 03 Mar 2007 09:41:17 GMT
Author: jacopoc
Date: Sat Mar  3 01:41:15 2007
New Revision: 514106

URL: http://svn.apache.org/viewvc?view=rev&rev=514106
Log:
Applied patch from Adrian Crum (OFBIZ-763) to refactor the layout of the partymgr application according to the new css/patterns: this is still a work in progress and a PoC.

Added:
    ofbiz/trunk/applications/party/webapp/partymgr/static/
    ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.css
    ofbiz/trunk/applications/party/webapp/partymgr/static/partymgr.js
Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.properties
    ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcontactmech.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl
    ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PaymentMethodScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/SecurityScreens.xml

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Sat Mar  3 01:41:15 2007
@@ -343,6 +343,7 @@
 PartyNewCommWorkEffort=New Communication Work Effort
 PartyNewEvent=New Event
 PartyNewFind=New Find
+PartyNewRelationship=New Relationship
 PartyNewRelationshipType=New Relationship Type
 PartyNewRoleType=New Role Type
 PartyNewSecurityGroup=New Security Group

Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml Sat Mar  3 01:41:15 2007
@@ -60,7 +60,7 @@
         </init-param>
         <init-param>
             <param-name>allowedPaths</param-name>
-            <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/includes/maincss.css</param-value>
+            <param-value>/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/static</param-value>
         </init-param>
         <init-param>
             <param-name>errorCode</param-name>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat Mar  3 01:41:15 2007
@@ -19,8 +19,8 @@
 -->
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
-    <form name="viewCommunication" default-map-name="communicationEvent" default-title-style="tableheadtext" 
-        default-tooltip-style="tabletext" default-widget-style="tabletext" target="editCommunication" title="" type="single">
+
+    <form name="viewCommunication" type="single" target="editCommunication" default-map-name="communicationEvent">
         <alt-target target="createCommunicationEvent" use-when="communicationEvent==null"/>
         <field name="communicationEventId" use-when="communicationEvent != null"><display/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display/></field>
@@ -40,18 +40,16 @@
         <field name="content" title="${uiLabelMap.CommonContent}"><text size="1"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonEdit}"><submit button-type="button"/></field>
     </form>
-    <form name="EditCommEvent" default-map-name="communicationEvent" target="updateCommunicationEvent" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+
+    <form name="EditCommEvent" type="single" target="updateCommunicationEvent" default-map-name="communicationEvent">
         <actions>
             <entity-one entity-name="StatusItem" value-name="currentStatus" auto-field-map="false">
                 <field-map field-name="statusId" env-name="communicationEvent.statusId"/>
             </entity-one>
         </actions>
-        
         <alt-target target="createCommunicationEvent" use-when="communicationEvent==null"/>
-
         <field name="partyId" map-name="parameters"><hidden/></field>
-        <field name="communicationEventId" use-when="communicationEvent!=null" widget-style="tabletext"><display/></field>
+        <field name="communicationEventId" use-when="communicationEvent!=null"><display/></field>
         <field name="communicationEventTypeId">
             <drop-down>
                 <entity-options entity-name="CommunicationEventType" description="${description}">
@@ -59,10 +57,9 @@
                 </entity-options>
             </drop-down>
         </field>
-        
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName" default-value="${userLogin.partyId}"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName" default-value="${userLogin.partyId}"/></field>
-        <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+        <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}" >
             <drop-down>
                 <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId">
                     <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/>
@@ -70,7 +67,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox">
+        <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}" >
             <drop-down allow-empty="false" current-description="${currentStatus.description}">
                 <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
                     <entity-constraint name="statusId" value="${communicationEvent.statusId}"/>
@@ -78,7 +75,6 @@
                 </entity-options>
             </drop-down>
         </field>
-        
         <field name="contactMechTypeId">  <!-- does not have use-when restrictions so we can enter what the contactMechTypeId is -->
             <drop-down>
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
@@ -86,7 +82,6 @@
                 </entity-options>
             </drop-down>
         </field>
-
         <!-- this is an example of how to display different types of contact mech to the user -->
         <field name="contactMechIdFrom" title="${uiLabelMap.PartyFromEmailAddress}"
             use-when="(parameters.get(&quot;communicationEventTypeId&quot;)!=null)&amp;&amp;(parameters.get(&quot;communicationEventTypeId&quot;).equals(&quot;EMAIL_COMMUNICATION&quot;))">
@@ -105,7 +100,6 @@
         </field>
         <field name="contactMechIdTo" title="${uiLabelMap.PartyToContactMech}"
             use-when="(parameters.get(&quot;communicationEventTypeId&quot;)==null)||!(parameters.get(&quot;communicationEventTypeId&quot;).equals(&quot;EMAIL_COMMUNICATION&quot;))"><text/></field>
-        
         <field name="roleTypeIdFrom" use-when="commEventRoleTypeIdFrom!=null">
             <drop-down no-current-selected-key="_NA_">
                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
@@ -120,10 +114,9 @@
                 </entity-options>
             </drop-down>
         </field>
-
         <field name="contactListId">
             <lookup size="20" target-form-name="LookupContactList">
-                <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${communicationEvent.contactListId}" target-type="inter-app" link-style="buttontext"/>
+                <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${communicationEvent.contactListId}" target-type="inter-app" link-style="smallSubmit"/>
             </lookup>
         </field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-time/></field>
@@ -138,15 +131,14 @@
         </field>
         <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10"/></field>
         <field name="note" title="${uiLabelMap.CommonNote}"><textarea cols="60" rows="3"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
     </form>
-    <form name="ViewCommEvent" default-map-name="communicationEvent" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
+
+    <form name="ViewCommEvent" type="single" default-map-name="communicationEvent">
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><display-entity description="${firstName} ${lastName} [${partyId}]" entity-name="Person" key-field-name="partyId"/></field>
         <field name="statusId"><display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/></field>
         <field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
-
         <!-- This will display email addresses when it is an email.  This could be more elaborate to show the actual string, or it could
             be done probably with a Java helper method to cut down on repetitive code -->
         <field name="contactMechIdFrom" title="${uiLabelMap.PartyFromEmailAddress}" 
@@ -161,7 +153,6 @@
         </field>
         <field name="contactMechIdTo" title="${uiLabelMap.PartyToContactMech}"
             use-when="((communicationEvent.getString(&quot;contactMechTypeId&quot;)==null)||!(communicationEvent.getString(&quot;contactMechTypeId&quot;).equals(&quot;EMAIL_ADDRESS&quot;)))"><display/></field>
-
         <field name="roleTypeIdFrom"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
@@ -174,7 +165,9 @@
             <display also-hidden="false"/>  <!-- if not set, it is also hidden, which could cause it to re-dislay -->
         </field>
     </form>
-    <form name="findCommEvents" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" paginate="true" target="ListLookupCommEvents" title="" type="single">
+
+    <form name="findCommEvents" type="single" target="ListLookupCommEvents"
+        paginate="true">
         <field name="communicationEventId" use-when="communicationEvent != null"><text-find/></field>
         <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
@@ -206,10 +199,11 @@
         <field map-name="subjectMap" name="subject"><text-find/></field>
 
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
-    <form name="ListCommEvents" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" title="" type="list">
-        <field name="communicationEventId" widget-style="buttontext">
+
+    <form name="ListCommEvents" type="list">
+        <field name="communicationEventId" widget-style="smallSubmit">
             <hyperlink description="${communicationEventId}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}" target-type="intra-app"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}">
@@ -225,10 +219,11 @@
         <field name="roleTypeIdTo"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field>
         <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
-        <field name="custRequestId" widget-style="buttontext"><hyperlink target="/ordermgr/control/EditRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field>
+        <field name="custRequestId" widget-style="smallSubmit"><hyperlink target="/ordermgr/control/EditRequest?custRequestId=${custRequestId}" target-type="inter-app"/></field>
         <field map-name="subjectMap" name="subject"><display/></field>
     </form>
-    <form name="ListPartyCommEvents" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" extends="ListCommEvents" type="list">
+
+    <form name="ListPartyCommEvents" type="list"  extends="ListCommEvents">
         <actions>
             <entity-condition entity-name="CommunicationEvent">
                 <condition-list combine="or">
@@ -237,14 +232,15 @@
                 </condition-list>
             </entity-condition>
         </actions>
-        <field name="communicationEventId" widget-style="buttontext">
+        <field name="communicationEventId" widget-style="smallSubmit">
             <hyperlink description="${communicationEventId}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}" target-type="intra-app"/>
         </field>
-        <field name="removeLink" title="" widget-style="buttontext">
+        <field name="removeLink" title="" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
         </field>
     </form>
-    <form name="ListPendingCommEvents" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" extends="ListCommEvents" title="" type="list">
+
+    <form name="ListPendingCommEvents" type="list" extends="ListCommEvents">
         <actions>
             <entity-condition entity-name="CommunicationEvent">
                 <condition-list combine="and">
@@ -257,8 +253,9 @@
             </entity-condition>
         </actions>
     </form>
-    <form name="ListLookupCommEvents" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" 
-        extends="ListCommEvents" list-name="listIt" paginate-target="ListLookupCommEvents" target="updateCommunicationEvent" title="" type="list">
+
+    <form name="ListLookupCommEvents" type="list" list-name="listIt" extends="ListCommEvents" target="updateCommunicationEvent"
+        paginate-target="ListLookupCommEvents">
         <actions>
             <service result-map-list-name="listIt" result-map-name="result" service-name="performFind">
                 <field-map env-name="parameters" field-name="inputFields"/>
@@ -266,12 +263,12 @@
                 <field-map value="datetimeStarted DESC" field-name="orderBy"/>
             </service>
         </actions>
-        <field name="removeLink" title="" widget-style="buttontext">
+        <field name="removeLink" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteCommunicationEvent?communicationEventId=${communicationEventId}"/>
         </field>
     </form>
     
-    <form name="ListCommWorkEfforts" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="" title="" type="list">
+    <form name="ListCommWorkEfforts" type="list">
         <actions>
             <entity-and entity-name="CommunicationEventWorkEff" use-cache="false">
                 <field-map field-name="communicationEventId"/>
@@ -280,91 +277,94 @@
         </actions>
         <field name="workEffortId" title="${uiLabelMap.WorkEffort}">
             <display-entity entity-name="WorkEffort" description="${workEffortName}">
-                <sub-hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" link-style="buttontext"/>
+                <sub-hyperlink description="${workEffortId}" target="/workeffort/control/WorkEffortSummary?workEffortId=${workEffortId}" target-type="inter-app" link-style="smallSubmit"/>
             </display-entity>
         </field>
     </form>
-    <form name="AddCommEventWorkEffort" 
-            default-title-style="tableheadtext" default-tooltip-style="tabletext" 
-            default-widget-style="inputBox" 
-            extends="EditWorkEffort" extends-resource="component://workeffort/widget/WorkEffortForms.xml"
-            target="createCommEventWorkEffort" title="" type="single">
+
+    <form name="AddCommEventWorkEffort" type="single" extends="EditWorkEffort"
+        extends-resource="component://workeffort/widget/WorkEffortForms.xml"
+        target="createCommEventWorkEffort">
         <field name="communicationEventId"><display/></field>
         <field name="workEffortId"  use-when="workEffort==null&amp;&amp;workEffortId==null" ><lookup target-form-name="/workeffort/control/LookupWorkEffort"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"> <submit button-type="text-link"/> </field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/> </field>
         <sort-order>
             <sort-field name="communicationEventId"/>
-            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner1}"/>
+            <banner left-text="${uiLabelMap.WorkEffortBanner1}"/>
             <sort-field name="workEffortId"/>
-            <banner left-text-style="tabletext" left-text="${uiLabelMap.WorkEffortBanner2}"/>
+            <banner left-text="${uiLabelMap.WorkEffortBanner2}"/>
         </sort-order>
     </form>
 
-    <form name="ListCommPurposes" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="" title="" type="list">
+    <form name="ListCommPurposes" type="list">
         <actions>
             <entity-and entity-name="CommunicationEventPurpose" use-cache="true">
                 <field-map field-name="communicationEventId"/>
             </entity-and>
         </actions>
-        <field name="communicationEventPrpTypId" widget-style="tabletext">
+        <field name="communicationEventPrpTypId">
             <display-entity description="${description}" entity-name="CommunicationEventPrpTyp"/>
         </field>
-        <field name="removeLink" title="" widget-style="buttontext">
+        <field name="removeLink" title="" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeCommunicationEventPurpose?communicationEventPrpTypId=${communicationEventPrpTypId}&amp;communicationEventId=${communicationEventId}"/>
         </field>
     </form>
-    <form name="AddEventPurpose" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="createCommunicationEventPurpose" title="" type="single">
+
+    <form name="AddEventPurpose" type="single" target="createCommunicationEventPurpose">
         <field name="communicationEventId"><hidden/></field>
         <field name="partyId"><hidden/></field>
-        <field name="communicationEventPrpTypId" widget-style="selectBox">
+        <field name="communicationEventPrpTypId" >
             <drop-down>
                 <entity-options description="${description}" entity-name="CommunicationEventPrpTyp" key-field-name="communicationEventPrpTypId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.PartyAddPurpose}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.PartyAddPurpose}"><submit button-type="button"/></field>
     </form>
-    <form name="ListCommRoles" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="" title="" type="list">
+
+    <form name="ListCommRoles" type="list">
         <actions>
             <entity-and entity-name="CommunicationEventRole" use-cache="true">
                 <field-map field-name="communicationEventId"/>
             </entity-and>
         </actions>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="tabletext">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display-entity description="${firstName} ${middleName} ${lastName} ${groupName}" entity-name="PartyNameView">
-                <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="buttontext" description="${partyId}"/>
+                <sub-hyperlink target="viewprofile?partyId=${partyId}" link-style="smallSubmit" description="${partyId}"/>
             </display-entity>
         </field>
-        <field name="roleTypeId" widget-style="tabletext"><display-entity description="${description}" entity-name="RoleType"/></field>
-        <field name="removeLink" title="" widget-style="buttontext">
+        <field name="roleTypeId"><display-entity description="${description}" entity-name="RoleType"/></field>
+        <field name="removeLink" title="" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="/RemoveCommunicationEventRole?partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;communicationEventId=${communicationEventId}"/>
         </field>
     </form>
-    <form name="AddEventRole" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="createCommunicationEventRole" title="" type="single">
+
+    <form name="AddEventRole" type="single" target="createCommunicationEventRole">
         <field name="communicationEventId"><hidden/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="roleTypeId" widget-style="selectBox">
+        <field name="roleTypeId" >
             <drop-down>
                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.PartyAddRole}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.PartyAddRole}"><submit button-type="button"/></field>
     </form>
 	
-    <form name="listCommContent" type="list" list-name="contentDataResourceList" target="" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" paginate-target="/ListCommContent" view-size="20">
+    <form name="listCommContent" type="list" list-name="contentDataResourceList"
+        paginate-target="/ListCommContent" view-size="20">
         <actions>
             <entity-and entity-name="CommEventContentDataResource" list-name="contentDataResourceList">
                 <field-map field-name="communicationEventId"/>
             </entity-and>
         </actions>
     
-        <field name="editContent" widget-style="buttontext">
+        <field name="editContent" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditCommContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/> 
         </field>
-        <field name="viewContent" widget-style="buttontext">
+        <field name="viewContent" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonView}" target="ViewSimpleContent?contentId=${contentId}&amp;dataResourceId=${dataResourceId}&amp;communicationEventId=${communicationEventId}&amp;fromDate=${fromDate}"/> 
         </field>
         <field name="contentName"><display/></field>
@@ -373,8 +373,7 @@
         <field name="dataResourceId"><display/></field>
     </form>
 
-    <form name="addCommContent" default-map-name="" type="single" target="createCommContentDataResource"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+    <form name="addCommContent" type="single" target="createCommContentDataResource">
         <field name="communicationEventId"><hidden/></field>
         <field name="contentId"><ignored/></field>
         <field name="contentName"><text/></field>
@@ -398,21 +397,18 @@
                 <option key="application/octet-stream" description="Other"/>
             </drop-down>
         </field>
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
 	
-    <form name="editCommContent" default-map-name="commEventContentDataResource" type="single" target="updateCommContentDataResource"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
-        
+    <form name="editCommContent" type="single" target="updateCommContentDataResource" default-map-name="commEventContentDataResource">
         <field name="communicationEventId"><display/></field>
-        <field name="contentId" widget-style="tabletext"><display/></field>
-        <field name="dataResourceId" widget-style="tabletext"><display/></field>
+        <field name="contentId"><display/></field>
+        <field name="dataResourceId"><display/></field>
         <field name="contentName"><text/></field>
-        <field name="fromDate" widget-style="tabletext"><display/></field>
+        <field name="fromDate"><display/></field>
         <field name="thruDate"><date-time/></field>
         <field name="sequenceNum"><text/></field>
-        
-        <field name="drMimeTypeId" widget-style="tabletext">
+        <field name="drMimeTypeId">
             <drop-down allow-empty="false">
                 <option key="application/msword" description="MS Word"/>
                 <option key="application/pdf" description="PDF File"/>
@@ -426,20 +422,20 @@
                 <option key="application/octet-stream" description="Other"/>
             </drop-down>
         </field>
-        <field name="dataResourceTypeId" entry-name="drDataResourceTypeId"  widget-style="tabletext">
+        <field name="dataResourceTypeId" entry-name="drDataResourceTypeId">
             <drop-down allow-empty="false">
 				<entity-options entity-name="DataResourceType" description="${description}">
 					
 				</entity-options>
             </drop-down>
         </field>
-        <!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type"  widget-style="tabletext"><display/></field> -->
-        <!-- <field name="contentTypeId" map-name="content" title="Content Type"  widget-style="tabletext"><display/></field> -->
+        <!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type"><display/></field> -->
+        <!-- <field name="contentTypeId" map-name="content" title="Content Type"><display/></field> -->
         <!-- add these back if it looks like Surveys need to be added to CommEvents
         <field name="relatedDetailId" map-name="dataResource" title="Survey ID"
             use-when="dataResource!=null &amp;&amp; &quot;SURVEY&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">
             <lookup target-form-name="LookupSurvey">
-                <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="buttontext" 
+                <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="smallSubmit" 
                     use-when="dataResource.get(&quot;relatedDetailId&quot;)!=null"/>
             </lookup>
         </field>
@@ -447,27 +443,25 @@
             use-when="dataResource!=null &amp;&amp; &quot;SURVEY_RESPONSE&quot;.equals(dataResource.getString(&quot;dataResourceTypeId&quot;))">      
             <lookup target-form-name="LookupSurveyResponse">
                 <sub-hyperlink target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}" 
-                    description="Edit Survey Response" link-style="buttontext" use-when="dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)!=null"/>
+                    description="Edit Survey Response" link-style="smallSubmit" use-when="dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)!=null"/>
             </lookup>
         </field>
-        <field name="surveyResponseLink" map-name="dummy" widget-style="buttontext" 
+        <field name="surveyResponseLink" map-name="dummy" widget-style="smallSubmit" 
             use-when="&quot;DOCUMENT&quot;.equals(contentTypeId) &amp;&amp; dataResource!=null &amp;&amp; dataResource.get(&quot;relatedDetailId&quot;)==null &amp;&amp; templateDataResource!=null &amp;&amp; templateDataResource.get(&quot;relatedDetailId&quot;)!=null">
             <hyperlink description="Create Response (for Survey ${templateDataResource.relatedDetailId})" target="EditSurveyResponse?surveyId=${templateDataResource.relatedDetailId}" also-hidden="false" target-window="_blank"/>
         </field>
         -->
 		<!--
-        <field name="objectInfo" title="Current File Name" map-name="dataResource" widget-style="tabletext"
+        <field name="objectInfo" title="Current File Name" map-name="dataResource" 
             use-when="mimeTypeId!=null &amp;&amp; !mimeTypeId.startsWith(&quot;text&quot;)">
             <display also-hidden="false"/>
         </field>
 			-->
 
-        <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field>
     </form>
 	
-    <form name="uploadCommContent" type="upload" default-title-style="tableheadtext"  default-map-name="commEventContentDataResource"
-        target="uploadCommEventContent" default-tooltip-style="tabletext" default-widget-style="tabletext">
-        
+    <form name="uploadCommContent" type="upload" target="uploadCommEventContent" default-map-name="commEventContentDataResource">
         <field name="contentId" map-name="contentAssoc"><hidden/></field>
         <field name="drDataResourceId"><hidden/></field>
         <field name="drDataResourceTypeId"><hidden/></field>
@@ -477,11 +471,10 @@
         <field name="drObjectInfo"><text/></field>
         <!-- would show previous file name... doesn't make too much sense <field name="objectInfo" title="File Name" map-name="dataResource"><display also-hidden="false"/></field> -->
         <field name="imageData" map-name="empty"><file/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonUpload}"><submit/></field>
     </form>
     
-    <form name="editCommTextContent" type="single" default-title-style="tableheadtext"  default-map-name="commEventContentDataResource"
-        target="uploadCommEventContent" default-tooltip-style="tabletext" default-widget-style="tabletext">
+    <form name="editCommTextContent" type="single" target="uploadCommEventContent" default-map-name="commEventContentDataResource">
         <field name="contentId" ><hidden/></field>
         <field name="drDataResourceId" ><hidden/></field>
         <field name="drDataResourceTypeId" ><hidden/></field>
@@ -489,8 +482,7 @@
         <field name="communicationEventId"><hidden/></field>
         <field name="fromDate"><hidden/></field>
         <field name="textData" map-name="electronicText" title="Text Data"><textarea rows="30" cols="60"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit/></field>
     </form>
-
 
 </forms>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Sat Mar  3 01:41:15 2007
@@ -18,9 +18,8 @@
 under the License.
 -->
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
-    <menu name="CommEventTabBar" default-menu-item-name="viewprofile" default-selected-style="tabButtonSelected" 
-            default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton" 
-            orientation="horizontal" type="simple"  selected-menuitem-context-field-name="subTabButtonItem">
+    <menu name="CommEventTabBar" default-menu-item-name="viewprofile" menu-container-style="button-bar button-style-1"
+        type="simple" selected-menuitem-context-field-name="subTabButtonItem">
         <menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}">
             <link target="EditCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
         </menu-item>
@@ -42,8 +41,7 @@
         </menu-item>
         -->
     </menu>
-    <menu name="CommFindTabBar" default-menu-item-name="find" default-selected-style="tabButtonSelected" default-title-style="tabButton" 
-            default-tooltip-style="tabletext" default-widget-style="tabButton" orientation="horizontal" type="simple">
+    <menu name="CommFindTabBar" default-menu-item-name="find" type="simple">
         <menu-item name="find" title="${uiLabelMap.CommonFind}">
             <link target="findCommunications?partyId=${partyId}&amp;communicationEventId=${communicationEventId}" url-mode="intra-app"/>
         </menu-item>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/listCommunications.ftl Sat Mar  3 01:41:15 2007
@@ -43,7 +43,7 @@
               &nbsp;
             </#if>
             <#if (eventListSize > 0)>
-              <span class="tableheadtext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${eventListSize}</span>
+              <span class="label">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${eventListSize}</span>
             </#if>
             <#if (eventListSize > highIndex)>
               <a href="<@ofbizUrl>${target}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml Sat Mar  3 01:41:15 2007
@@ -18,22 +18,22 @@
 under the License.
 -->
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
-    <form name="ListPartyContactLists" target="updateContactListParty" separate-columns="false"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        title="" type="list">
+
+    <form name="ListPartyContactLists" type="list" target="updateContactListParty"
+        separate-columns="false">
         <actions>
             <entity-and entity-name="ContactListParty">
                 <field-map field-name="partyId"/>
             </entity-and>
         </actions>
         <field name="partyId"><hidden/></field>
-        <field name="contactListId"  widget-style="tabletext" title="${uiLabelMap.PartyContactList}">
+        <field name="contactListId" title="${uiLabelMap.PartyContactList}">
             <display-entity entity-name="ContactList" description="${contactListName}">
-                <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${contactListId}" description="${contactListId}" target-type="inter-app" link-style="buttontext"/>
+                <sub-hyperlink target="/marketing/control/EditContactList?contactListId=${contactListId}" description="${contactListId}" target-type="inter-app" link-style="smallSubmit"/>
             </display-entity>
         </field>
         <field name="fromDate"><display/></field>
-        <field name="statusHistory" widget-style="selectBox">
+        <field name="statusHistory">
             <drop-down>
                 <option key="" description="-- ${uiLabelMap.CommonStatusHistory} --"/>
                 <entity-options entity-name="ContactListPartyAndStatus" key-field-name="statusId" description="${statusDate} ${description} [${uiLabelMap.CommonBy}: ${setByUserLoginId}] [${uiLabelMap.FormFieldTitle_optInVerifyCode}: ${optInVerifyCode}]">
@@ -44,8 +44,8 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="thruDate" widget-style="inputBox"><date-time/></field>
-        <field name="statusId" widget-style="selectBox">
+        <field name="thruDate"><date-time/></field>
+        <field name="statusId">
             <drop-down>
                 <entity-options entity-name="StatusItem" description="${description}">
                     <entity-constraint name="statusTypeId" operator="equals" value="CONTACTLST_PARTY"/>
@@ -53,7 +53,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="optInVerifyCode" widget-style="inputBox"><text size="10"/></field>
+        <field name="optInVerifyCode"><text size="10"/></field>
         <field name="preferredContactMechId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="PartyAndContactMech" key-field-name="contactMechId" description="[${contactMechId}] [${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]">
@@ -62,12 +62,10 @@
                 </entity-options>
             </drop-down>
         </field>
-        
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
     </form>
-    <form name="AddPartyContactList" type="single" 
-            target="createContactListParty" title=""
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+
+    <form name="AddPartyContactList" type="single" target="createContactListParty" >
         <field name="contactListId"><lookup target-form-name="LookupContactList"/></field>
         <field name="partyId"><hidden/></field>
         <field name="fromDate"><date-time/></field>
@@ -88,17 +86,14 @@
                 </entity-options>
             </drop-down>
         </field>
-        
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
     </form>
-    <form name="ListLookupContactList" type="list" 
-            target="LookupContactList" title="" default-map-name="contactList"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+
+    <form name="ListLookupContactList" type="list" target="LookupContactList" default-map-name="contactList">
         <actions>
             <entity-condition entity-name="ContactList"/>
         </actions>
-        
-        <field name="contactListId"  widget-style="buttontext">
+        <field name="contactListId"  widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${contactListId}" target="javascript:set_value('${contactListId}')"/>
         </field>
         <field name="contactListName"><display/></field>
@@ -106,4 +101,5 @@
         <field name="contactMechTypeId" title="${uiLabelMap.PartyContactMechType}"><display-entity description="${description}" entity-name="ContactMechType"/></field>
         <field name="marketingCampaignId"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
     </form>
+
 </forms>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/includes/appheader.ftl Sat Mar  3 01:41:15 2007
@@ -17,37 +17,34 @@
 under the License.
 -->
 
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-<#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if>
-<#if (requestAttributes.userLogin)?exists><#assign userLogin = requestAttributes.userLogin></#if>
-<#if (requestAttributes.checkLoginUrl)?exists><#assign checkLoginUrl = requestAttributes.checkLoginUrl></#if>
+<#assign selected = headerItem?default("void")>
 
-<#assign unselectedLeftClassName = "headerButtonLeft">
-<#assign unselectedRightClassName = "headerButtonRight">
-<#assign selectedLeftClassMap = {(page.headerItem)?default("void") : "headerButtonLeftSelected"}>
-<#assign selectedRightClassMap = {(page.headerItem)?default("void") : "headerButtonRightSelected"}>
-
-<div class="apptitle">&nbsp;${uiLabelMap.PartyManagerApplication}&nbsp;</div>
-<div class="row">
-  <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.CommonMain}</a></div>
-  <div class="col"><a href="<@ofbizUrl>findparty</@ofbizUrl>" class="${selectedLeftClassMap.find?default(unselectedLeftClassName)}">${uiLabelMap.CommonFind}</a></div>
-  <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
-    <div class="col"><a href="<@ofbizUrl>createnew</@ofbizUrl>" class="${selectedLeftClassMap.create?default(unselectedLeftClassName)}">${uiLabelMap.CommonCreate}</a></div>
-  </#if>
-  <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
-    <div class="col"><a href="<@ofbizUrl>linkparty</@ofbizUrl>" class="${selectedLeftClassMap.link?default(unselectedLeftClassName)}">${uiLabelMap.PartyLink}</a></div>
-  </#if>
-  <div class="col"><a href="<@ofbizUrl>FindCommunicationEvents</@ofbizUrl>" class="${selectedLeftClassMap.comm?default(unselectedLeftClassName)}">${uiLabelMap.PartyCommunications}</a></div>
-  <div class="col"><a href="<@ofbizUrl>showvisits</@ofbizUrl>" class="${selectedLeftClassMap.visits?default(unselectedLeftClassName)}">${uiLabelMap.PartyVisits}</a></div>
-  <div class="col"><a href="<@ofbizUrl>showclassgroups</@ofbizUrl>" class="${selectedLeftClassMap.classification?default(unselectedLeftClassName)}">${uiLabelMap.PartyClassifications}</a></div>
-  <#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
-    <div class="col"><a href="<@ofbizUrl>FindSecurityGroup</@ofbizUrl>" class="${selectedLeftClassMap.security?default(unselectedLeftClassName)}">${uiLabelMap.CommonSecurity}</a></div>
-  </#if>
-  <#if userLogin?has_content>
-    <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${unselectedRightClassName}">${uiLabelMap.CommonLogout}</a></div>
-  <#else>
-    <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
-  </#if>
-  <div class="col-right"><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>" class="${selectedLeftClassMap.addrmap?default(unselectedLeftClassName)}">${uiLabelMap.PageTitleAddressMatchMap}</a></div>
-  <div class="col-fill">&nbsp;</div>
+<!-- begin appHeader.ftl -->
+<div id="app-navigation">
+  <h2>${uiLabelMap.PartyManagerApplication}</h2>
+  <ul>
+    <li<#if selected == "main"> class="selected"</#if>><a href="<@ofbizUrl>main</@ofbizUrl>">${uiLabelMap.CommonMain}</a></li>
+    <li<#if selected == "find"> class="selected"</#if>><a href="<@ofbizUrl>findparty</@ofbizUrl>">${uiLabelMap.CommonFind}</a></li>
+    <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
+      <li<#if selected == "create"> class="selected"</#if>><a href="<@ofbizUrl>createnew</@ofbizUrl>">${uiLabelMap.CommonCreate}</a></li>
+    </#if>
+    <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
+      <li<#if selected == "link"> class="selected"</#if>><a href="<@ofbizUrl>linkparty</@ofbizUrl>">${uiLabelMap.PartyLink}</a></li>
+    </#if>
+    <li<#if selected == "comm"> class="selected"</#if>><a href="<@ofbizUrl>FindCommunicationEvents</@ofbizUrl>">${uiLabelMap.PartyCommunications}</a></li>
+    <li<#if selected == "visits"> class="selected"</#if>><a href="<@ofbizUrl>showvisits</@ofbizUrl>">${uiLabelMap.PartyVisits}</a></li>
+    <li<#if selected == "classification"> class="selected"</#if>><a href="<@ofbizUrl>showclassgroups</@ofbizUrl>">${uiLabelMap.PartyClassifications}</a></li>
+    <#if security.hasEntityPermission("SECURITY", "_VIEW", session)>
+      <li<#if selected == "security"> class="selected"</#if>><a href="<@ofbizUrl>FindSecurityGroup</@ofbizUrl>">${uiLabelMap.CommonSecurity}</a></li>
+    </#if>
+  </ul>
+  <ul class="opposed">
+    <#if userLogin?has_content>
+      <li><a href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
+    <#else>
+      <li><a href="<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
+    </#if>
+    <li<#if selected == "addrmap"> class="selected"</#if>><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>">${uiLabelMap.PageTitleAddressMatchMap}</a></li>
+  </ul>
+  <br class="clear" />
 </div>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/lookup/LookupForms.xml Sat Mar  3 01:41:15 2007
@@ -21,9 +21,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
         xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-form.xsd">
 
-    <form name="lookupPartyName" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupPartyName" title="" type="single">
+    <form name="lookupPartyName" target="LookupPartyName" type="single">
         <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="find" />-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}">
@@ -35,10 +33,11 @@
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><text-find/></field>
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupPartyName" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="listIt" paginate-target="LookupPartyName" title="" type="list">
+
+    <form name="listLookupPartyName" type="list" list-name="listIt" 
+        paginate-target="LookupPartyName">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>
@@ -47,7 +46,7 @@
             </service>
         </actions>
         <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="display"/>-->
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="buttontext">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}"  widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
         </field>
         <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}"> 
@@ -59,19 +58,17 @@
     </form>
     
     <!-- Person Lookup forms -->
-    <form name="lookupPerson" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupPerson" title="" type="single">
+    <form name="lookupPerson" type="single" target="LookupPerson">
         <!--<auto-fields-entity entity-name="Person" default-field-type="find" />-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
         <field name="lastName"  title="${uiLabelMap.PartyLastName}"><text-find/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupPerson" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="listIt" target="" paginate-target="LookupPerson" title="" type="list">
+
+    <form name="listLookupPerson" type="list" list-name="listIt"
+        paginate-target="LookupPerson">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
@@ -79,7 +76,7 @@
             </service>
         </actions>
         <!--<auto-fields-entity entity-name="Person" default-field-type="display"/>-->
-        <field name="partyId"  widget-style="buttontext" title="${uiLabelMap.PartyPartyId}">
+        <field name="partyId"  widget-style="smallSubmit" title="${uiLabelMap.PartyPartyId}">
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
         </field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><display/></field>
@@ -90,10 +87,8 @@
         <field name="nickname" title="${uiLabelMap.PartyNickname}"><display/></field>
     </form>
     
-    <form name="lookupPartyAndUserLoginAndPerson" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="inputBox"
-        target="LookupPartyAndUserLoginAndPerson" paginate-target="LookupPartyAndUserLoginAndPerson"
-        title="" type="single">
+    <form name="lookupPartyAndUserLoginAndPerson" type="single" target="LookupPartyAndUserLoginAndPerson" 
+        paginate-target="LookupPartyAndUserLoginAndPerson">
         <!--<auto-fields-entity entity-name="PartyAndUserLoginAndPerson" default-field-type="find" />-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><text-find/></field>
@@ -103,11 +98,11 @@
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field>
         <field name="createdDate" title="${uiLabelMap.PartyCreatedDate}"><date-find/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupPartyAndUserLoginAndPerson" default-title-style="tableheadtext"
-        default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="listIt" target="" paginate-target="LookupPartyAndUserLoginAndPerson" title="" type="list">
+
+    <form name="listLookupPartyAndUserLoginAndPerson" type="list" list-name="listIt"
+        paginate-target="LookupPartyAndUserLoginAndPerson">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
@@ -118,16 +113,14 @@
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
             <display description="${partyId}"/>
         </field>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="buttontext">
+        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
         </field>
         <field name="lastName" title="${uiLabelMap.PartyName}"><display description="${firstName} ${middleName} ${lastName} ${groupName}"/></field>
     </form>
     
-    <form name="lookupUserLoginAndPartyDetails" default-title-style="tableheadtext"
-            default-tooltip-style="tabletext" default-widget-style="inputBox"
-            target="LookupUserLoginAndPartyDetails" paginate-target="LookupUserLoginAndPartyDetails"
-            title="" type="single">
+    <form name="lookupUserLoginAndPartyDetails" type="single" target="LookupUserLoginAndPartyDetails"
+        paginate-target="LookupUserLoginAndPartyDetails">
         <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><text-find/></field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field>
@@ -136,18 +129,18 @@
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field>
         <field name="createdDate" title="${uiLabelMap.PartyCreatedDate}"><date-find/></field>
         <field name="noConditionFind"><hidden value="Y"/></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupUserLoginAndPartyDetails" default-title-style="tableheadtext"
-            default-tooltip-style="tabletext" default-widget-style="tabletext"
-            list-name="listIt" target="" paginate-target="LookupUserLoginAndPartyDetails" title="" type="list">
+
+    <form name="listLookupUserLoginAndPartyDetails" type="list" list-name="listIt"
+        paginate-target="LookupUserLoginAndPartyDetails">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="requestParameters"/>
                 <field-map field-name="entityName" env-name="entityName"/>
             </service>
         </actions>
-        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="buttontext">
+        <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${userLoginId}" target="javascript:set_value('${userLoginId}', '${userLoginId}', '${parameters.webSitePublishPoint}')"/>
         </field>
         <field name="partyId" title="${uiLabelMap.PartyPartyId}">
@@ -157,17 +150,17 @@
 		<field name="groupName" title="${uiLabelMap.PartyGroupName}"><display description="${groupName}"/></field>
     </form>
     
-    <form name="lookupPartyGroup" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="LookupPartyGroup" 
-        title="" type="single">
+    <form name="lookupPartyGroup" type="single" target="LookupPartyGroup">
         <!--<auto-fields-entity entity-name="PartyGroup" default-field-type="find"/>-->
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field>
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupPartyGroup" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext"
-        list-name="listIt" paginate-target="LookupPartyGroup" title="" type="list">
-          <actions>
+
+    <form name="listLookupPartyGroup" type="list" list-name="listIt"
+        paginate-target="LookupPartyGroup">
+        <actions>
           <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
             <field-map field-name="inputFields" env-name="requestParameters"/>
             <field-map field-name="entityName" env-name="entityName"/>
@@ -177,13 +170,12 @@
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
         <field name="groupName" title="${uiLabelMap.PartyGroupName}"><display/></field>
         <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
-        <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="buttontext">
+        <field name="partyId" title="${uiLabelMap.PartyPartyId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${partyId}" target="javascript:set_value('${partyId}')"/>
         </field>
     </form>
 
-    <form name="LookupPartyClassificationGroup" target="LookupPartyClassificationGroup" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+    <form name="LookupPartyClassificationGroup" type="single" target="LookupPartyClassificationGroup">
         <auto-fields-entity entity-name="PartyClassificationGroup" default-field-type="find"/>
         <field name="partyClassificationTypeId">
             <drop-down allow-empty="true">
@@ -193,10 +185,10 @@
             </drop-down>
         </field>
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
-        <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field>
     </form>
-    <form name="listLookupPartyClassificationGroup" list-name="listIt" target="" paginate-target="" title="" type="list"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="display">
+
+    <form name="listLookupPartyClassificationGroup" type="list" list-name="listIt">
         <actions>
             <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
                 <field-map field-name="inputFields" env-name="parameters"/>
@@ -205,7 +197,7 @@
             </service>
         </actions>
         
-        <field name="partyClassificationGroupId" title="" widget-style="buttontext">
+        <field name="partyClassificationGroupId" title="" widget-style="smallSubmit">
             <hyperlink also-hidden="false" target-type="plain" description="${partyClassificationGroupId}" target="javascript:set_value('${partyClassificationGroupId}')"/>
         </field>
         <field name="partyClassificationTypeId"><display/></field>
@@ -213,7 +205,7 @@
         <field name="description"><display/></field>
     </form>
 
-    <form name="LookupCommEvent"  default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox" target="LookupCommEvent" title="" type="single">
+    <form name="LookupCommEvent" type="single" target="LookupCommEvent">
         <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field>
@@ -253,14 +245,15 @@
         <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> 
         <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field>
     </form>
-    <form name="ListLookupCommEvent" default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext" target="" title="" list-name="listIt" type="list">
+
+    <form name="ListLookupCommEvent" type="list" list-name="listIt">
         <actions>
             <service service-name="performFind" result-map-list-name="listIt" result-map-name="result">
                 <field-map field-name="inputFields" env-name="parameters"/>
                 <field-map field-name="entityName" value="CommunicationEvent"/>
             </service>
         </actions>
-        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="buttontext">
+        <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${communicationEventId}" target="javascript:set_value('${communicationEventId}')" target-type="plain"/>
         </field>
         <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl?view=diff&rev=514106&r1=514105&r2=514106
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl Sat Mar  3 01:41:15 2007
@@ -17,20 +17,19 @@
 under the License.
 -->
 
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-
+<!-- begin SecurityGroupTabBar.ftl -->
 <#if security.hasEntityPermission("PARTYMGR", "_VIEW", session)>
-<#-- Main Heading -->
-<#if partyClassificationGroup?has_content>
-<div class="tabContainer">
-    <a href="<@ofbizUrl>EditPartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroup.partyClassificationGroupId}</@ofbizUrl>" class="${selectedClassMap.EditPartyClassificationGroup?default(unselectedClassName)}">${uiLabelMap.PartyClassificationGroups}</a>
-    <a href="<@ofbizUrl>EditPartyClassificationGroupParties?partyClassificationGroupId=${partyClassificationGroup.partyClassificationGroupId}</@ofbizUrl>" class="${selectedClassMap.EditPartyClassificationGroupParties?default(unselectedClassName)}">${uiLabelMap.Parties}</a>
-</div>
-</#if>
-
+  <#-- Main Heading -->
+  <#if partyClassificationGroup?has_content>
+    <#assign selected = page.tabButtonItem?default("void")>
+    <div class="button-bar button-style-1">
+      <ul>
+        <li<#if selected == "EditPartyClassificationGroup"> class="selected"</#if>><a href="<@ofbizUrl>EditPartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroup.partyClassificationGroupId}</@ofbizUrl>">${uiLabelMap.PartyClassificationGroups}</a></li>
+        <li<#if selected == "EditPartyClassificationGroupParties"> class="selected"</#if>><a href="<@ofbizUrl>EditPartyClassificationGroupParties?partyClassificationGroupId=${partyClassificationGroup.partyClassificationGroupId}</@ofbizUrl>">${uiLabelMap.Parties}</a></li>
+      </ul>
+      <br class="clear" />
+    </div>
+  </#if>
 <#else>
-  <div class="head2">${uiLabelMap.PartyMgrViewPermissionError}</div>
+  <h2">${uiLabelMap.PartyMgrViewPermissionError}</h2>
 </#if>



Mime
View raw message