svn commit: r613473 [1/2] - in /ofbiz/trunk/applications/party: config/ webapp/partymgr/contactlist/ webapp/partymgr/party/ webapp/partymgr/security/ webapp/partymgr/visit/ widget/partymgr/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r613473 [1/2] - in /ofbiz/trunk/applications/party: config/ webapp/partymgr/contactlist/ webapp/partymgr/party/ webapp/partymgr/security/ webapp/partymgr/visit/ widget/partymgr/

mrisaliti
Author: mrisaliti
Date: Sat Jan 19 14:29:09 2008
New Revision: 613473

URL: http://svn.apache.org/viewvc?rev=613473&view=rev
Log:
Contact List/Visits/Security/Classification forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1583)

Modified:
    ofbiz/trunk/applications/party/config/PartyUiLabels.properties
    ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties
    ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
    ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.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/PartyClassificationForms.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
    ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.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?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Sat Jan 19 14:29:09 2008
@@ -71,6 +71,7 @@
 
 OrderNewOrder=New Order
 OrderOrders=Orders
+PageTitleAddIssuerProvisions=Add Issuer Provisions
 PageTitleAddPartyContent=Add Party Content
 PageTitleAddressMatchMap=Address Match Map
 PageTitleAddressMatches=Address Matches
@@ -121,6 +122,7 @@
 PageTitleViewCommPurposes=View Communication Purposes
 PageTitleViewCommRoles=View Communication Roles
 PageTitleViewPartyClassifications=View Party Classifications
+PageTitleViewPartyClassificationGroupParties=View Party Classification Group Parties
 PageTitleViewPartyProfile=View Party Profile
 PageTitleViewPartyRole=View Party Roles
 PageTitleViewPartySegmentRoles=View Party Segment Roles
@@ -167,6 +169,15 @@
 PartyBirthDate=Birth Date
 PartyBirthDateMissingError=Birthdate is not formatted correctly: must be yyyy-mm-dd, like 1982-07-21
 PartyBusinessPhone=Business Phone
+PartyCertComponent=Component
+PartyCertKeyAlias=Key Alias
+PartyCertKeyStore=Keystore
+PartyCertImportIssuer=Import Issuer
+PartyCertInvalid=Invalid certificate
+PartyCertName=Cert Name
+PartyCertSaveToKeyStore=Save to KeyStore
+PartyCertSerialNumber=Cert Serial Number
+PartyCertType=Cert Type
 PartyCertIssuers=Cert Issuers
 PartyChildShoppingList=Child Shopping List
 PartyCannotUpdateContactBecauseNotWithSpecifiedParty=ERROR: Cannot update specified contact info because it does not correspond to the specified party.
@@ -394,6 +405,7 @@
 PartyNoPartyRelationshipsFound=No relationships found.
 PartyNoPartyRolesFound=No party roles found.
 PartyNoPaymentMethodInformation=No payment method information on file.
+PartyNoServerHitsFound=No Server Hits found for this Visit
 PartyNoShoppingCartSavedForParty=No shopping cart saved for party
 PartyNoShoppingListsParty=No Shopping lists for party
 PartyNoSupplier=No Supplier

Modified: ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels_it.properties Sat Jan 19 14:29:09 2008
@@ -66,6 +66,7 @@
 
 OrderNewOrder=Nuovo Ordine
 OrderOrders=Ordini
+PageTitleAddIssuerProvisions=Aggiorni Fornitore di Certificati
 PageTitleAddressMatchMap=Mappatura Uguaglianza Indirizzi
 PageTitleAddressMatches=Indirizzo Uguali
 PageTitleCommEvents=Comunicazione Eventi
@@ -78,7 +79,7 @@
 PageTitleEditEftAccount=Aggiorna Conto EFT
 PageTitleEditGiftCard=Aggiorna Carta Omaggio
 PageTitleEditGroupInformation=Aggiorna Informazioni Gruppo
-PageTitleEditIssuerProvisions=Aggiorna Misure Emittenti
+PageTitleEditIssuerProvisions=Aggiorna Fornitore Certificati
 PageTitleEditPartyAttribute=Aggiorna Attributo Soggetto
 PageTitleEditPartyClassificationGroup=Aggiorna Classificazione Gruppo Soggetto
 PageTitleEditPartyClassificationGroupParties=Aggiorna Classificazione Gruppo Soggetto
@@ -95,6 +96,7 @@
 PageTitleFindParty=Ricerca Cliente(i)/Fornitore(i)
 PageTitleFindPartyClassificationGroups=Ricerca Gruppi Classificazione Soggetti
 PageTitleFindSecurityGroup=Ricerca Gruppo Sicurezza
+PageTitleImportCertificate=Importa Certificato
 PageTitleListCommCustRequests=Lista Richiesta Comunicazioni Clienti
 PageTitleListCommunications=Lista Comunicazioni
 PageTitleListCommWorkEfforts=Lista Comunicazioni Impegni di Lavoro
@@ -108,6 +110,7 @@
 PageTitleViewCommPurposes=Mostra Funzioni Comunicazione
 PageTitleViewCommRoles=Mostra Ruoli Comunicazione
 PageTitleViewPartyClassifications=Mostra Classificazioni Soggetto
+PageTitleViewPartyClassificationGroupParties=Mostra Gruppo Classificazioni Soggetto
 PageTitleViewPartyProfile=Mostra Profilo Soggetto
 PageTitleViewPartyRole=Mostra Ruoli Soggetto
 PageTitleViewPartySegmentRoles=Mostra Ruoli Segmento Soggetto
@@ -152,7 +155,16 @@
 PartyBirthDate=Data Nascita
 PartyBirthDateMissingError=Data Nascita non \u00e8 formattata correttamente: dovrebbe essere yyyy-mm-dd, come 1982-07-21
 PartyBusinessPhone=Telefono Ufficio
-PartyCertIssuers=Certificati Emessi
+PartyCertComponent=Componente
+PartyCertKeyAlias=Chiave Alias
+PartyCertKeyStore=Keystore
+PartyCertImportIssuer=Importa Certificato
+PartyCertInvalid=Certificato Invalido
+PartyCertName=Nome Certificato
+PartyCertSaveToKeyStore=Salva sul KeyStore
+PartyCertSerialNumber=Numero di Serie Certificato
+PartyCertType=Tipo Certificato
+PartyCertIssuers=Fornitori di Certificati
 PartyChildShoppingList=Figlio Lista Acquisto
 PartyCannotUpdateContactBecauseNotWithSpecifiedParty=ERRORE: Non \u00e8 possibile aggiornare le informazioni contatto specificate perch\u00e8 non corrisponde al cliente specificato.
 PartyChangeParty=Cambia Soggetto
@@ -276,6 +288,7 @@
 PartyInitialReferer=Iniziale Riferimento
 PartyInitialRequest=Iniziale Richiesta
 PartyInitialUserAgent=Iniziale User Agent
+PartyInvitation=Inviti Soggetti
 PartyLastName=Cognome
 PartyLastNameMissingError=Cognome Mancante
 PartyLastVisit=Ultima Visita(e)
@@ -348,6 +361,7 @@
 PartyNoPartyRelationshipsFound=Nessun rapporto trovato.
 PartyNoPartyRolesFound=Nessun ruolo Soggetto trovato.
 PartyNoPaymentMethodInformation=Nessuna informazione sul metodo di pagamento sul file.
+PartyNoServerHitsFound=Nessun Server Hits trovato per questa Visita
 PartyNoShoppingCartSavedForParty=Nessun carrello registrato per il Soggetto.
 PartyNoShoppingListsParty=Nessuna lista di Acquisto per il Soggetto
 PartyNoSupplier=Nessun Fornitore
@@ -666,7 +680,7 @@
 FormFieldTitle_existingCustomer=Cliente Esistente
 FormFieldTitle_editContent=Aggiorna Contenuto
 FormFieldTitle_viewContent=Mostra Contenuto
-FormFieldTitle_certProvisionId=Misura Certificato
+FormFieldTitle_certProvisionId=Fornitore Certificato
 FormFieldTitle_commonName=Nome Comune
 FormFieldTitle_organizationalUnit=Unit\u00e0 Organizzativa
 FormFieldTitle_organizationName=Nome Organizzazione

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?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/contactlist/PartyContactListForms.xml Sat Jan 19 14:29:09 2008
@@ -20,7 +20,7 @@
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="ListPartyContactLists" type="list" target="updateContactListParty"
-        separate-columns="false">
+        separate-columns="false"  odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="ContactListParty">
                 <field-map field-name="partyId"/>
@@ -65,7 +65,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="AddPartyContactList" type="single" target="createContactListParty" >
+    <form name="AddPartyContactList" type="single" target="createContactListParty"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="contactListId"><lookup target-form-name="LookupContactList"/></field>
         <field name="partyId"><hidden/></field>
         <field name="fromDate"><date-time/></field>
@@ -89,7 +90,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="ListLookupContactList" type="list" target="LookupContactList" default-map-name="contactList">
+    <form name="ListLookupContactList" type="list" target="LookupContactList" default-map-name="contactList"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="ContactList"/>
         </actions>
@@ -101,5 +103,4 @@
         <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>
+</forms>
\ No newline at end of file

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?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl Sat Jan 19 14:29:09 2008
@@ -21,15 +21,16 @@
 <#if security.hasEntityPermission("PARTYMGR", "_VIEW", session)>
   <#-- Main Heading -->
   <#if partyClassificationGroup?has_content>
-    <#assign selected = page.tabButtonItem?default("void")>
-    <div class="button-bar button-style-1">
+    <#assign selected = tabButtonItem?default("void")>
+    <div class="button-bar tab-bar">
       <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" />
+      <br class="clear"/>
     </div>
+    <br/>
   </#if>
 <#else>
   <h2">${uiLabelMap.PartyMgrViewPermissionError}</h2>
-</#if>
+</#if>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/security/SecurityGroupTabBar.ftl Sat Jan 19 14:29:09 2008
@@ -19,8 +19,8 @@
 
 <#if groupId?has_content>
 <!-- begin SecurityGroupTabBar.ftl -->
-  <#assign selected = page.tabButtonItem?default("void")>
-  <div class="button-bar button-style-1">
+  <#assign selected = tabButtonItem?default("void")>
+  <div class="button-bar tab-bar">
     <ul>
       <li<#if selected == "EditSecurityGroup"> class="selected"</#if>><a href="<@ofbizUrl>EditSecurityGroup?groupId=${groupId}</@ofbizUrl>">${uiLabelMap.PartySecurityGroups}</a></li>
       <li<#if selected == "EditSecurityGroupPermissions"> class="selected"</#if>><a href="<@ofbizUrl>EditSecurityGroupPermissions?groupId=${groupId}</@ofbizUrl>">${uiLabelMap.PartyPermissions}</a></li>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/security/ViewCertificate.ftl Sat Jan 19 14:29:09 2008
@@ -21,44 +21,59 @@
 <#if (requestParameters.certString?has_content)>
     <#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
 </#if>
-<br/>
-
-<#if (cert?has_content)>
-    <div><b>Cert: ${cert.getType()} : ${cert.getSubjectX500Principal()}</b></div>
-    <div><b>Name: ${cert.getSubjectX500Principal().getName()}</b></div>
-    <div><b>Serial Number: ${cert.getSerialNumber().toString(16)}</b></div>
-<#else>
-    <h3>Invalid certificate</h3>
-</#if>
-
-<br/>
-<h1>Save to KeyStore</h1>
-<table cellspacing="0" class="basic-table form-widget-table dark-grid">
-  <tr class="header-row">
-    <td>Component</td>
-    <td>Keystore</td>
-    <td>Import Issuer</td>
-    <td>Key Alias</td>
-    <td>&nbsp;</td>
-  </tr>
-  <#list components as component>
-    <#assign keystores = component.getKeystoreInfos()?if_exists/>    
-      <#list keystores as store>
-        <#if (store.isTrustStore())>
-          <tr>
-            <form method="post" action="<@ofbizUrl>/importIssuerProvision</@ofbizUrl>">
-              <input type="hidden" name="componentName" value="${component.getComponentName()}"/>
-              <input type="hidden" name="keystoreName" value="${store.getName()}"/>
-              <input type="hidden" name="certString" value="${requestParameters.certString}"/>
-
-              <td>${component.getComponentName()}</td>
-              <td>${store.getName()}</td>
-              <td align="center"><input type="checkbox" name="importIssuer" value="Y"/>
-              <td><input type="text" class="inputBox" name="alias" size="20"/>
-              <td align="right"><input type="submit" value="Save"/>
-            </form>
-          </tr>
-        </#if>
+<div id="findPartyParameters" class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.PageTitleImportCertificate}</li>
+    </ul>
+    <br class="clear" />
+  </div>
+  <div class="screenlet-body">
+    <#if (cert?has_content)>
+        <span class="label">${uiLabelMap.PartyCertType}</span>&nbsp;${cert.getType()} : ${cert.getSubjectX500Principal()}
+        <span class="label">${uiLabelMap.PartyCertName}</span>&nbsp;${cert.getSubjectX500Principal().getName()}
+        <span class="label">${uiLabelMap.PartyCertSerialNumber}</span>&nbsp;${cert.getSerialNumber().toString(16)}
+    <#else>
+        <h3>${uiLabelMap.PartyCertInvalid}</h3>
+    </#if>
+  </div>
+</div>
+<div id="findPartyParameters" class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.PartyCertSaveToKeyStore}</li>
+    </ul>
+    <br class="clear" />
+  </div>
+  <div class="screenlet-body">
+    <table cellspacing="0" class="basic-table">
+      <tr class="header-row">
+        <td>${uiLabelMap.PartyCertComponent}</td>
+        <td>${uiLabelMap.PartyCertKeyStore}</td>
+        <td>${uiLabelMap.PartyCertImportIssuer}</td>
+        <td>${uiLabelMap.PartyCertKeyAlias}</td>
+        <td>&nbsp;</td>
+      </tr>
+      <#list components as component>
+        <#assign keystores = component.getKeystoreInfos()?if_exists/>    
+          <#list keystores as store>
+            <#if (store.isTrustStore())>
+              <tr>
+                <form method="post" action="<@ofbizUrl>/importIssuerProvision</@ofbizUrl>">
+                  <input type="hidden" name="componentName" value="${component.getComponentName()}"/>
+                  <input type="hidden" name="keystoreName" value="${store.getName()}"/>
+                  <input type="hidden" name="certString" value="${requestParameters.certString}"/>
+    
+                  <td>${component.getComponentName()}</td>
+                  <td>${store.getName()}</td>
+                  <td align="center"><input type="checkbox" name="importIssuer" value="Y"/>
+                  <td><input type="text" name="alias" size="20"/>
+                  <td align="right"><input type="submit" value="${uiLabelMap.CommonSave}"/>
+                </form>
+              </tr>
+            </#if>
+          </#list>
       </#list>
-  </#list>
-</table>
\ No newline at end of file
+    </table>
+  </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Sat Jan 19 14:29:09 2008
@@ -16,76 +16,82 @@
 specific language governing permissions and limitations
 under the License.
 -->
-
+<div class="screenlet">
   <#if partyId?exists>
     <#assign title = uiLabelMap.PartyParty>
   <#else>
     <#assign title = uiLabelMap.PartyActive>
   </#if>
-  <h1>${title}&nbsp;${uiLabelMap.PartyVisitListing}</h1>
-  <#if !partyId?exists && showAll?lower_case == "true">
-    <a href="<@ofbizUrl>showvisits?showAll=false</@ofbizUrl>" class="smallSubmit">[${uiLabelMap.PartyShowActive}]</a>
-  <#elseif !partyId?exists>
-    <a href="<@ofbizUrl>showvisits?showAll=true</@ofbizUrl>" class="smallSubmit">[${uiLabelMap.PartyShowAll}]</a>
-  </#if>
-  <br/>
-    <div class="align-float">
-      <b>
-        <#if (visitSize > 0)>
-          <#if (viewIndex > 1)>
-            <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
-          </#if>
-          ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize}
-          <#if highIndex < visitSize>
-            | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>              
-          </#if>
-        </#if>
-      </b>
-    </div>
-    <br class="clear" />
-  <br/>
-  
-  <table class="basic-table hover-bar" cellspacing="0">
-    <tr class="header-row">
-      <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td>      
-      <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=partyId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyPartyId}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyUserLoginId}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyNewUser}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=webappName&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyWebApp}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyClientIP}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonFromDate}</a></td>
-      <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonThruDate}</a></td>
-    </tr>
-    <#assign alt_row = false>
-    <#list visitList as visitObj>
-      <tr<#if alt_row> class="alternate-row"</#if>>
-        <td class="button-col"><a href="<@ofbizUrl>visitdetail?visitId=${visitObj.visitId}</@ofbizUrl>">${visitObj.visitId}</a></td>      
-        <td>${visitObj.visitorId?if_exists}</td>
-        <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId?if_exists}</@ofbizUrl>">${visitObj.partyId?if_exists}</a></td>
-        <td>${visitObj.userLoginId?if_exists}</td>
-        <td>${visitObj.userCreated?if_exists}</td>
-        <td>${visitObj.webappName?if_exists}</td>
-        <td>${visitObj.clientIpAddress?if_exists}</td>
-        <td>${(visitObj.fromDate?string)?if_exists}</td>
-        <td>${(visitObj.thruDate?string)?if_exists}</td>
-      </tr>
-      <#assign alt_row = !alt_row>
-    </#list>
-  </table>
-
-    <br />
-    <div class="align-float">
-      <b>
-        <#if (visitSize > 0)>
-          <#if (viewIndex > 1)>
-            <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
-          </#if>
-          ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize}
-          <#if highIndex < visitSize>
-            | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>              
-          </#if>
-        </#if>
-      </b>
-    </div>
-    <br class="clear" />
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${title}&nbsp;${uiLabelMap.PartyVisitListing}</li>
+      <#if !partyId?exists && showAll?lower_case == "true">
+        <li><a href="<@ofbizUrl>showvisits?showAll=false</@ofbizUrl>">${uiLabelMap.PartyShowActive}</a></li>
+      <#elseif !partyId?exists>
+        <li><a href="<@ofbizUrl>showvisits?showAll=true</@ofbizUrl>">${uiLabelMap.PartyShowAll}</a></li>
+      </#if>      
+    </ul>
+    <br class="clear"/>
+  </div>  
+  <div class="screenlet-body">
+      <br/>
+        <div class="align-float">
+            <span class="label">
+            <#if (visitSize > 0)>
+                <#if (viewIndex > 1)>
+                  <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
+                </#if>
+                ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize}
+                <#if highIndex < visitSize>
+                  | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>              
+                </#if>
+            </#if>
+            </span>
+        </div>
+        <br class="clear"/>
+      <br/>  
+      <table class="basic-table hover-bar" cellspacing="0">
+        <tr class="header-row">
+          <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td>      
+          <td><a href="<@ofbizUrl>showvisits?sort=visitorId&showAll=${showAll}<#if visitorId?has_content>&visitorId=${visitorId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitorId}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=partyId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyPartyId}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=userLoginId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyUserLoginId}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=-userCreated&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyNewUser}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=webappName&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyWebApp}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=clientIpAddress&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyClientIP}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=fromDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonFromDate}</a></td>
+          <td><a href="<@ofbizUrl>showvisits?sort=thruDate&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.CommonThruDate}</a></td>
+        </tr>
+        <#assign alt_row = false>
+        <#list visitList as visitObj>
+          <tr<#if alt_row> class="alternate-row"</#if>>
+            <td class="button-col"><a href="<@ofbizUrl>visitdetail?visitId=${visitObj.visitId}</@ofbizUrl>">${visitObj.visitId}</a></td>      
+            <td>${visitObj.visitorId?if_exists}</td>
+            <td class="button-col"><a href="<@ofbizUrl>viewprofile?partyId=${visitObj.partyId?if_exists}</@ofbizUrl>">${visitObj.partyId?if_exists}</a></td>
+            <td>${visitObj.userLoginId?if_exists}</td>
+            <td>${visitObj.userCreated?if_exists}</td>
+            <td>${visitObj.webappName?if_exists}</td>
+            <td>${visitObj.clientIpAddress?if_exists}</td>
+            <td>${(visitObj.fromDate?string)?if_exists}</td>
+            <td>${(visitObj.thruDate?string)?if_exists}</td>
+          </tr>
+          <#assign alt_row = !alt_row>
+        </#list>
+      </table>
+      <br/>
+      <div class="align-float">
+          <span class="label">
+          <#if (visitSize > 0)>
+              <#if (viewIndex > 1)>
+                <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
+              </#if>
+              ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${visitSize}
+              <#if highIndex < visitSize>
+                | <a href="<@ofbizUrl>showvisits?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}<#if sort?has_content>&sort=${sort}</#if><#if partyId?has_content>&partyId=${partyId}</#if>&showAll=${showAll}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>              
+              </#if>
+           </#if>
+           </span>
+      </div>
+      <br class="clear"/>
+  </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Sat Jan 19 14:29:09 2008
@@ -18,180 +18,192 @@
 -->
 
 <!-- begin visitdetail.ftl -->
-  <h1>${uiLabelMap.PartyVisitDetail}</h1>
-  <br/>
-
-  <table class="basic-table" cellspacing="0">
-    <tr>
-      <td class="label">${uiLabelMap.PartyVisitIDSessionID}</td>
-      <td>${visit.visitId?if_exists} / ${visit.sessionId?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyVisitorId}</td>
-      <td>${visit.visitorId?default("${uiLabelMap.CommonNot} ${uiLabelMap.CommonFound}")}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyPartyIDUserLoginID}</td>
-      <td><a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.partyId?if_exists}</a> / <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.userLoginId?if_exists}</a></td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyUserCreated}</td>
-      <td>${visit.userCreated?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyWebApp}</td>
-      <td>${visit.webappName?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyServer}</td>
-      <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverIpAddress?if_exists}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverHostName?if_exists}</a></td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyClient}</td>
-      <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyClientUser}</td>
-      <td>${visit.clientUser?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyInitialLocale}</td>
-      <td>${visit.initialLocale?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyInitialRequest}</td>
-      <td><a href="${visit.initialRequest?if_exists}" >${visit.initialRequest?if_exists}</a></td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyInitialReferer}</td>
-      <td><a href="${visit.initialReferrer?if_exists}" >${visit.initialReferrer?if_exists}</a></td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyInitialUserAgent}</td>
-      <td>${visit.initialUserAgent?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.PartyCookie}</td>
-      <td>${visit.cookie?if_exists}</td>
-    </tr>
-    <tr>
-      <td class="label">${uiLabelMap.CommonFromDateThruDate}</td>
-      <td>${(visit.fromDate?string)?if_exists} / ${(visit.thruDate?string)?default("["+uiLabelMap.PartyStillActive+"]")}</td>
-    </tr>
-  </table>
-
-  <br/>
-  <h1>${uiLabelMap.PartyHitTracker}</h1>
-
-  <#if serverHits?has_content>
-    <div class="align-float">
-      <b>
-        <#if 0 < viewIndex>
-          <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
-        </#if>
-        <#if 0 < listSize>
-          ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
-        </#if>
-        <#if highIndex < listSize>
-          | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>
-        </#if>
-      </b>
-    </div>
-    <br class="clear" />
-  </#if>
-
-  <table class="basic-table" cellspacing="0">
-    <tr class="header-row">
-      <td>${uiLabelMap.PartyContentId}</td>
-      <td>${uiLabelMap.PartyType}</td>
-      <td>${uiLabelMap.PartySize}</td>
-      <td>${uiLabelMap.PartyStartTime}</td>
-      <td>${uiLabelMap.PartyTime}</td>
-      <td>${uiLabelMap.PartyURI}</td>
-    </tr>
-    <#-- set initial row color -->
-    <#assign rowClass = "2">
-    <#if serverHits?has_content>
-    <#list serverHits[lowIndex..highIndex-1] as hit>
-      <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists>      
-      <tr<#if rowClass == "1"> class="alternate-row"</#if>>
-        <td>${hit.contentId?if_exists}</td>
-        <td>${serverHitType.get("description",locale)?if_exists}</td>
-        <td>&nbsp;&nbsp;${hit.numOfBytes?default("?")}</td>
-        <td>${hit.hitStartDateTime?string?if_exists}</td>
-        <td>${hit.runningTimeMillis?if_exists}</td>
-        <td>
-          <#assign url = (hit.requestUrl)?if_exists>
-          <#if url?exists>
-            <#assign len = url?length>
-            <#if 45 < len>
-              <#assign url = url[0..45] + "...">
-            </#if>
-          </#if>
-          <a href="${hit.requestUrl?if_exists}" target="_blank">${url}</a>
-        </td>
-      </tr>
-      <#-- toggle the row color -->
-      <#if rowClass == "2">
-        <#assign rowClass = "1">
-      <#else>
-        <#assign rowClass = "2">
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.PartyVisitDetail}</li>            
+    </ul>
+    <br class="clear"/>
+  </div>  
+  <div class="screenlet-body">
+      <table class="basic-table" cellspacing="0">
+        <tr>
+          <td class="label">${uiLabelMap.PartyVisitIDSessionID}</td>
+          <td>${visit.visitId?if_exists} / ${visit.sessionId?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyVisitorId}</td>
+          <td>${visit.visitorId?default("${uiLabelMap.CommonNot} ${uiLabelMap.CommonFound}")}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyPartyIDUserLoginID}</td>
+          <td><a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.partyId?if_exists}</a> / <a href="<@ofbizUrl>viewprofile?partyId=${visit.partyId?if_exists}</@ofbizUrl>">${visit.userLoginId?if_exists}</a></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyUserCreated}</td>
+          <td>${visit.userCreated?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyWebApp}</td>
+          <td>${visit.webappName?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyServer}</td>
+          <td><a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverIpAddress?if_exists}</a> / <a href="http://uptime.netcraft.com/up/graph/?site=${visit.serverIpAddress?if_exists}" target="_blank">${visit.serverHostName?if_exists}</a></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyClient}</td>
+          <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=${visit.clientIpAddress?if_exists}" target="_blank">${visit.clientIpAddress?if_exists}</a> / <a href="http://www.networksolutions.com/cgi-bin/whois/whois?STRING=${visit.clientHostName?if_exists}&SearchType=do" target="_blank">${visit.clientHostName?if_exists}</a></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyClientUser}</td>
+          <td>${visit.clientUser?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyInitialLocale}</td>
+          <td>${visit.initialLocale?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyInitialRequest}</td>
+          <td><a href="${visit.initialRequest?if_exists}" >${visit.initialRequest?if_exists}</a></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyInitialReferer}</td>
+          <td><a href="${visit.initialReferrer?if_exists}" >${visit.initialReferrer?if_exists}</a></td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyInitialUserAgent}</td>
+          <td>${visit.initialUserAgent?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.PartyCookie}</td>
+          <td>${visit.cookie?if_exists}</td>
+        </tr>
+        <tr>
+          <td class="label">${uiLabelMap.CommonFromDateThruDate}</td>
+          <td>${(visit.fromDate?string)?if_exists} / ${(visit.thruDate?string)?default(uiLabelMap.PartyStillActive)}</td>
+        </tr>
+      </table>
+  </div>
+</div>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.PartyHitTracker}</li>            
+    </ul>
+    <br class="clear"/>
+  </div>  
+  <div class="screenlet-body">
+      <#if serverHits?has_content>
+        <div class="align-float">
+          <span class="label">
+            <#if 0 < viewIndex>
+              <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
+            </#if>
+            <#if 0 < listSize>
+              ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+            </#if>
+            <#if highIndex < listSize>
+              | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>
+            </#if>
+          </span>
+        </div>
+        <br class="clear"/>
       </#if>
-    </#list>
-    <#else/>
-      <tr class="header-row">
-        <td colspan="6">No Server Hits found for this Visit</td>
-      </tr>
-    </#if>
-  </table>
-
-  <#if serverHits?has_content>
-    <div class="align-float">
-      <b>
-        <#if 0 < viewIndex>
-          <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
-        </#if>
-        <#if 0 < listSize>
-          ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
-        </#if>
-        <#if highIndex < listSize>
-          | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>
-        </#if>
-      </b>
-    </div>
-    <br class="clear" />
-  </#if>
-
-  <#if security.hasPermission("SEND_CONTROL_APPLET", session)>
-    <br/>
-    <h1>${uiLabelMap.PartyPagePushFollowing}</h1>
-    <br/>
-
-    <table border="0" cellpadding="5" cellspacing="5">
-      <form name="pushPage" method="get" action="<@ofbizUrl>pushPage</@ofbizUrl>">
-        <tr>
-          <th>${uiLabelMap.PartyPushURL}</th>
-          <td>
-            <input type="hidden" name="followerSid" value="${visit.sessionId}">
-            <input type="hidden" name="visitId" value="${visit.visitId}">
-            <input type="input" name="pageUrl">
-          </td>
-          <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td>
-        </tr>
-        <tr>
-          <td colspan="3"><hr/></td>
-        </tr>
-      </form>
-      <form name="setFollower" method="get" action="<@ofbizUrl>setAppletFollower</@ofbizUrl>">
-        <tr>
-          <th>${uiLabelMap.PartyFollowSession}</th>
-          <td>
-            <input type="hidden" name="followerSid" value="${visit.sessionId}">
-            <input type="hidden" name="visitId" value="${visit.visitId}">
-            <input type="text" name="followSid">
-          </td>
-          <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td>
-        </tr>
-      </form>
-    </table>
-  </#if>
+      <table class="basic-table hover-bar" cellspacing="0">
+        <tr class="header-row">
+          <td>${uiLabelMap.PartyContentId}</td>
+          <td>${uiLabelMap.PartyType}</td>
+          <td>${uiLabelMap.PartySize}</td>
+          <td>${uiLabelMap.PartyStartTime}</td>
+          <td>${uiLabelMap.PartyTime}</td>
+          <td>${uiLabelMap.PartyURI}</td>
+        </tr>
+        <#-- set initial row color -->
+        <#assign alt_row = false>
+        <#if serverHits?has_content>
+        <#list serverHits[lowIndex..highIndex-1] as hit>
+          <#assign serverHitType = hit.getRelatedOne("ServerHitType")?if_exists>      
+          <tr<#if alt_row> class="alternate-row"</#if>>
+            <td>${hit.contentId?if_exists}</td>
+            <td>${serverHitType.get("description",locale)?if_exists}</td>
+            <td>&nbsp;&nbsp;${hit.numOfBytes?default("?")}</td>
+            <td>${hit.hitStartDateTime?string?if_exists}</td>
+            <td>${hit.runningTimeMillis?if_exists}</td>
+            <td>
+              <#assign url = (hit.requestUrl)?if_exists>
+              <#if url?exists>
+                <#assign len = url?length>
+                <#if 45 < len>
+                  <#assign url = url[0..45] + "...">
+                </#if>
+              </#if>
+              <a href="${hit.requestUrl?if_exists}" target="_blank">${url}</a>
+            </td>
+          </tr>
+          <#-- toggle the row color -->
+          <#assign alt_row = !alt_row>
+        </#list>
+        <#else/>
+          <tr align="left">
+            <td colspan="6">${uiLabelMap.PartyNoServerHitsFound}</td>
+          </tr>
+        </#if>
+      </table>
+      <#if serverHits?has_content>
+        <div class="align-float">
+          <span class="label">
+            <#if 0 < viewIndex>
+              <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex-1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonPrevious}</a> |
+            </#if>
+            <#if 0 < listSize>
+              ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
+            </#if>
+            <#if highIndex < listSize>
+              | <a href="<@ofbizUrl>visitdetail?visitId=${visitId}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}</@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonNext}</a>
+            </#if>
+          </span>
+        </div>
+        <br class="clear"/>
+      </#if>
+  </div>
+</div>
+<div class="screenlet">
+  <div class="screenlet-title-bar">
+    <ul>
+      <li class="head3">${uiLabelMap.PartyPagePushFollowing}</li>            
+    </ul>
+    <br class="clear"/>
+  </div>  
+  <div class="screenlet-body">    
+      <#if security.hasPermission("SEND_CONTROL_APPLET", session)>
+        <table class="basic-table" cellspacing="0">
+          <form name="pushPage" method="get" action="<@ofbizUrl>pushPage</@ofbizUrl>">
+            <tr>
+              <th>${uiLabelMap.PartyPushURL}</th>
+              <td>
+                <input type="hidden" name="followerSid" value="${visit.sessionId}">
+                <input type="hidden" name="visitId" value="${visit.visitId}">
+                <input type="text" name="pageUrl">
+              </td>
+              <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td>
+            </tr>
+            <tr>
+              <td colspan="3"><hr/></td>
+            </tr>
+          </form>
+          <form name="setFollower" method="get" action="<@ofbizUrl>setAppletFollower</@ofbizUrl>">
+            <tr>
+              <th>${uiLabelMap.PartyFollowSession}</th>
+              <td>
+                <input type="hidden" name="followerSid" value="${visit.sessionId}">
+                <input type="hidden" name="visitId" value="${visit.visitId}">
+                <input type="text" name="followSid">
+              </td>
+              <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td>
+            </tr>
+          </form>
+        </table>
+      </#if>
+  </div>
+</div>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Sat Jan 19 14:29:09 2008
@@ -169,7 +169,7 @@
                                 </container>
                                 <container style="button-bar">
                                     <link target="EditSecurityGroup" style="smallSubmit" text="${uiLabelMap.PartyNewSecurityGroup}"/>
-                                    <link target="EditCertIssuerProvisions" style="smallSubmit" text="Cert Issuers"/>
+                                    <link target="EditCertIssuerProvisions" style="smallSubmit" text="${uiLabelMap.PartyCertIssuers}"/>
                                 </container>
                                 
                                 <decorator-section-include name="body"/>

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationForms.xml Sat Jan 19 14:29:09 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">
 
-    <form name="ListPartyClassifications" type="list" target="updatePartyClassification">
+    <form name="ListPartyClassifications" type="list" target="updatePartyClassification"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
         <entity-and entity-name="PartyClassification">
             <field-map field-name="partyId"/>
@@ -40,11 +41,12 @@
         </field>
     </form>
 
-    <form name="ListPartyClassificationGroups" type="list">
+    <form name="ListPartyClassificationGroups" type="list"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="PartyClassificationGroup"/>
         </actions>
-        <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
+        <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" widget-style="buttontext">
             <hyperlink target="EditPartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroupId}"
                 description="${partyClassificationGroupId}" also-hidden="false"/>
         </field>
@@ -53,13 +55,14 @@
         </field>
         <field name="parentGroupId" title="${uiLabelMap.ParentGroupId}"><display/></field>
         <field name="description" title="${uiLabelMap.Description}"><display/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deletePartyClassificationGroup?partyClassificationGroupId=${partyClassificationGroupId}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
 
-    <form name="EditPartyClassificationGroup" type="single" target="updatePartyClassificationGroup" default-map-name="partyClassificationGroup">
+    <form name="EditPartyClassificationGroup" type="single" target="updatePartyClassificationGroup" default-map-name="partyClassificationGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="partyClassificationGroup==null" target="createPartyClassificationGroup"/>
         <field use-when="partyClassificationGroup!=null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field use-when="partyClassificationGroup==null&amp;&amp;partyClassificationGroupId==null" name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}"><ignored/></field>
@@ -73,10 +76,11 @@
         </field>
         <field name="parentGroupId" title="${uiLabelMap.ParentGroupId}"><lookup target-form-name="LookupPartyClassificationGroup"/></field>
         <field name="description" title="${uiLabelMap.Description}"><text size="55"/></field>
-        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
+        <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
     </form>
 
-    <form name="AddPartyClassification" type="single" target="createPartyClassification" default-map-name="partyClassification">
+    <form name="AddPartyClassification" type="single" target="createPartyClassification" default-map-name="partyClassification"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
         <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
             <drop-down>
@@ -91,7 +95,8 @@
         <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> -->
     </form>
 
-    <form name="AddPartyClassificationParty" type="single" target="createPartyClassificationParty" default-map-name="partyClassification">
+    <form name="AddPartyClassificationParty" type="single" target="createPartyClassificationParty" default-map-name="partyClassification"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="partyClassificationGroupId" title="${uiLabelMap.PartyClassificationGroupId}">
             <display-entity entity-name="PartyClassificationGroup" description="${description}" key-field-name="partyClassificationGroupId"/>
         </field>
@@ -102,7 +107,8 @@
         <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${donePage}?segmentGroupId=${segmentGroupId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> -->
     </form>
 
-    <form name="ListPartyClassificationGroupParties" type="list" target="updatePartyClassificationParty">
+    <form name="ListPartyClassificationGroupParties" type="list" target="updatePartyClassificationParty"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-and entity-name="PartyClassification">
                 <field-map field-name="partyClassificationGroupId"/>
@@ -124,5 +130,4 @@
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
         </field>
     </form>
-
-</forms>
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sat Jan 19 14:29:09 2008
@@ -38,11 +38,30 @@
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
-                                <label style="head3" text="${uiLabelMap.PartyClassifications}"/>
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PartyClassifications}"/>
+                                </container>
                             </container>
                             <container style="screenlet-body">
-                                <include-form name="ListPartyClassifications" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
-                                <include-form name="AddPartyClassification" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                <section>
+                                    <widgets>
+                                        <include-form name="ListPartyClassifications" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PartyClassifications}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form name="AddPartyClassification" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                    </widgets>
+                                </section>
                             </container>
                         </container>
                     </decorator-section>
@@ -65,18 +84,41 @@
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <label style="head3" text="${uiLabelMap.PartyClassificationGroups}"/>
-                            </container>
-                            <container style="screenlet-body">
+                        <section>
+                            <widgets>
                                 <platform-specific>
                                     <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html>
                                 </platform-specific>
-                                <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
-                                <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
-                            </container>
-                        </container>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar">
+                                        <container style="head4">
+                                            <label text="${uiLabelMap.PartyClassificationGroups}"/>
+                                        </container>
+                                    </container>
+                                    <container style="screenlet-body">
+                                        <section>
+                                            <widgets>
+                                                <include-form name="ListPartyClassificationGroupParties" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                            </widgets>
+                                        </section>
+                                    </container>
+                                </container>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar">
+                                        <container style="head4">
+                                            <label text="${uiLabelMap.PartyClassificationGroups}"/>
+                                        </container>
+                                    </container>
+                                    <container style="screenlet-body">
+                                        <section>
+                                            <widgets>
+                                                <include-form name="AddPartyClassificationParty" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                            </widgets>
+                                        </section>
+                                    </container>
+                                </container>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
@@ -99,11 +141,19 @@
                     <decorator-section name="body">
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
-                                <label style="head3" text="${uiLabelMap.PartyClassificationGroups}"/>
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PartyClassificationGroups}"/>
+                                </container>
                             </container>
-                            <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"></link></container>
                             <container style="screenlet-body">
-                                <include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                <section>
+                                    <widgets>
+                                        <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"></link></container>
+                                        <container style="screenlet-body">
+                                            <include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                        </container>
+                                    </widgets>
+                                </section>
                             </container>
                         </container>
                     </decorator-section>
@@ -127,20 +177,30 @@
             <widgets>
                 <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <container style="screenlet">
-                            <container style="screenlet-title-bar">
-                                <label style="head3" text="${uiLabelMap.PartyClassificationGroup}"/>
-                            </container>
-                            <container style="screenlet-body">
+                        <section>
+                            <widgets>
                                 <platform-specific>
                                     <html><html-template location="component://party/webapp/partymgr/party/ClassificationTabBar.ftl"/></html>
                                 </platform-specific>
-                                <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
-                            </container>
-                        </container>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar">
+                                        <container style="head4">
+                                            <label text="${uiLabelMap.PartyClassificationGroup}"/>
+                                        </container>
+                                    </container>
+                                    <container style="screenlet-body">
+                                        <section>
+                                            <widgets>
+                                                <include-form name="EditPartyClassificationGroup" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
+                                            </widgets>
+                                        </section>
+                                    </container>
+                                </container>
+                            </widgets>
+                        </section>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
+</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyContactListScreens.xml Sat Jan 19 14:29:09 2008
@@ -37,10 +37,34 @@
                                 <if-has-permission action="_VIEW" permission="PARTYMGR"/>
                             </condition>
                             <widgets>
-                                <container><label style="head1" text="${uiLabelMap.PartyContactList}"/></container>
-                                <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListPartyContactLists"/>
-                                <container><label style="head1" text="${uiLabelMap.PartyContactListPartyCreate}"/></container>
-                                <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="AddPartyContactList"/>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar">
+                                        <container style="head4">
+                                            <label text="${uiLabelMap.PartyContactList}"/>
+                                        </container>
+                                    </container>
+                                    <container style="screenlet-body">
+                                        <section>
+                                            <widgets>
+                                                <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListPartyContactLists"/>
+                                            </widgets>
+                                        </section>
+                                    </container>
+                                </container>
+                                <container style="screenlet">
+                                    <container style="screenlet-title-bar">
+                                        <container style="head4">
+                                            <label text="${uiLabelMap.PartyContactListPartyCreate}"/>
+                                        </container>
+                                    </container>
+                                    <container style="screenlet-body">
+                                        <section>
+                                            <widgets>
+                                                <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="AddPartyContactList"/>
+                                            </widgets>
+                                        </section>
+                                    </container>
+                                </container>
                             </widgets>
                             <fail-widgets>
                                 <label style="head3">${uiLabelMap.PartyMgrViewPermissionError}</label>
@@ -54,7 +78,7 @@
    <screen name="ListLookupContactList">
         <section>
             <actions>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <set field="tabButtonItem" value="ContactList"/>
                 <set field="labelTitleProperty" value="${uiLabelMap.PageTitleListContactList}"/>
                 <set field="title" value="${uiLabelMap.PageTitleListContactList}"/>
@@ -66,11 +90,23 @@
             <widgets>
                 <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">
                     <decorator-section name="body">
-                        <container><label style="head1">${uiLabelMap.PageTitleListContactList}</label></container>
-                        <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListLookupContactList"/>
+                        <container style="screenlet">
+                            <container style="screenlet-title-bar">
+                                <container style="head4">
+                                    <label text="${uiLabelMap.PageTitleListContactList}"/>
+                                </container>
+                            </container>
+                            <container style="screenlet-body">
+                                <section>
+                                    <widgets>
+                                        <include-form location="component://party/webapp/partymgr/contactlist/PartyContactListForms.xml" name="ListLookupContactList"/>
+                                    </widgets>
+                                </section>
+                            </container>
+                        </container>
                     </decorator-section>
                 </decorator-screen>
             </widgets>
         </section>
     </screen>
-</screens>
+</screens>
\ No newline at end of file

Modified: ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml?rev=613473&r1=613472&r2=613473&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/SecurityForms.xml Sat Jan 19 14:29:09 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -22,19 +22,20 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="ListSecurityGroups" type="list" list-name="securityGroups"
-        paginate-target="FindSecurityGroup">
+        paginate-target="FindSecurityGroup" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="SecurityGroup">
                 <order-by field-name="description"/>
             </entity-condition>
         </actions>
-        <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}" widget-style="smallSubmit">
-            <hyperlink also-hidden="false" description="[${groupId}]" target="EditSecurityGroup?groupId=${groupId}"/>
+        <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${groupId}" target="EditSecurityGroup?groupId=${groupId}"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
     </form>
 
-    <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup">
+    <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="securityGroup==null" target="createSecurityGroup"/>
         <auto-fields-service service-name="updateSecurityGroup" map-name="securityGroup"/>
         <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}"  tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
@@ -45,7 +46,8 @@
     </form>
 
     <!-- SecurityGroupPermission -->
-    <form name="ListSecurityGroupPermissions" type="list" list-name="securityGroupPermissions">
+    <form name="ListSecurityGroupPermissions" type="list" list-name="securityGroupPermissions"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="SecurityGroupPermission">
                 <condition-expr field-name="groupId" env-name="groupId"/>
@@ -53,19 +55,20 @@
             </entity-condition>
         </actions>
         <field name="groupId"><hidden/></field>
-        <field name="permissionId" title="${uiLabelMap.PartyPermissionId}"><display-entity entity-name="SecurityPermission" description="[${permissionId}] ${description}"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+        <field name="permissionId" title="${uiLabelMap.PartyPermissionId}"><display-entity entity-name="SecurityPermission" description="${permissionId} ${description}"/></field>
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="removeSecurityPermissionFromSecurityGroup?permissionId=${permissionId}&amp;groupId=${groupId}"
                 description="${uiLabelMap.CommonRemove}" also-hidden="false"/>
         </field>
     </form>
 
-    <form name="AddSecurityGroupPermission" type="single" target="addSecurityPermissionToSecurityGroup">
+    <form name="AddSecurityGroupPermission" type="single" target="addSecurityPermissionToSecurityGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addSecurityPermissionToSecurityGroup"/>
         <field name="groupId"><hidden/></field>
         <field name="permissionId" title="${uiLabelMap.PartyPermissionId}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="SecurityPermission" description="[${permissionId}] ${description}">
+                <entity-options entity-name="SecurityPermission" description="${permissionId} ${description}">
                     <entity-order-by field-name="permissionId"/>
                 </entity-options>
             </drop-down>
@@ -73,7 +76,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 
-    <form name="AddSecurityGroupPermissionManual" type="single" target="addSecurityPermissionToSecurityGroup">
+    <form name="AddSecurityGroupPermissionManual" type="single" target="addSecurityPermissionToSecurityGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addSecurityPermissionToSecurityGroup"/>
         <field name="groupId"><hidden/></field>
         <field name="permissionId" title="${uiLabelMap.PartyPermissionId}"/>
@@ -81,7 +85,8 @@
     </form>
 
     <!-- SecurityGroupUserLogin -->    
-    <form name="ListSecurityGroupUserLogins" type="list" list-name="userLoginSecurityGroups" target="updateUserLoginToSecurityGroup">
+    <form name="ListSecurityGroupUserLogins" type="list" list-name="userLoginSecurityGroups" target="updateUserLoginToSecurityGroup"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="UserLoginAndSecurityGroup">
                 <condition-expr field-name="groupId" env-name="groupId"/>
@@ -94,16 +99,17 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="partyId" title="${uiLabelMap.PartyParty}">
             <display-entity entity-name="PartyNameView" also-hidden="false" description="${firstName} ${middleName} ${lastName} ${groupName}">
-                <sub-hyperlink target="viewprofile?partyId=${partyId}" description="[${partyId}]" link-style="smallSubmit"/>
+                <sub-hyperlink target="viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/>
             </display-entity>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonRemove}" target="removeUserLoginFromSecurityGroup?userLoginId=${userLoginId}&amp;groupId=${groupId}&amp;fromDate=${fromDate}" also-hidden="false"/>
         </field>
     </form>
 
-    <form name="AddSecurityGroupUserLogin" type="single" target="addUserLoginToSecurityGroup">
+    <form name="AddSecurityGroupUserLogin" type="single" target="addUserLoginToSecurityGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addUserLoginToSecurityGroup"/>
         <field name="groupId"><hidden/></field>
         <field name="userLoginId" title="${uiLabelMap.PartyUserLoginId}"><lookup target-form-name="LookupUserLoginAndPartyDetails" size="30"></lookup></field>
@@ -111,7 +117,8 @@
     </form>
     
     <form name="ListUserLoginSecurityGroups" type="list" extends="ListSecurityGroupUserLogins"
-            list-name="userLoginSecurityGroups" target="userLogin_updateUserLoginToSecurityGroup">
+        list-name="userLoginSecurityGroups" target="userLogin_updateUserLoginToSecurityGroup"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="UserLoginAndSecurityGroup">
                 <condition-expr field-name="userLoginId" env-name="userLoginId"/>
@@ -121,25 +128,26 @@
         <field name="partyId"><hidden value="${partyId}"/></field>
         <field name="groupId" title="${uiLabelMap.CommonGroup}">
             <display-entity entity-name="SecurityGroup">
-                <sub-hyperlink target="EditSecurityGroup?groupId=${groupId}" description="[${groupId}]" link-style="smallSubmit"/>
+                <sub-hyperlink target="EditSecurityGroup?groupId=${groupId}" description="${groupId}" link-style="buttontext"/>
             </display-entity>
         </field>
         <field name="userLoginId"><hidden/></field>
         <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
-        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+        <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink description="${uiLabelMap.CommonRemove}" target="userLogin_removeUserLoginFromSecurityGroup?partyId=${partyId}&amp;userLoginId=${userLoginId}&amp;groupId=${groupId}&amp;fromDate=${fromDate}" also-hidden="false"/>
         </field>
     </form>
 
-    <form name="AddUserLoginSecurityGroup" type="single" target="userLogin_addUserLoginToSecurityGroup">
+    <form name="AddUserLoginSecurityGroup" type="single" target="userLogin_addUserLoginToSecurityGroup"
+        header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="addUserLoginToSecurityGroup"/>
         <field name="partyId"><hidden value="${partyId}"/></field>
         <field name="userLoginId"><hidden/></field>
         <field name="groupId" title="${uiLabelMap.CommonGroup}">
             <drop-down allow-empty="false">
-                <entity-options entity-name="SecurityGroup" description="[${groupId}] ${description}">
+                <entity-options entity-name="SecurityGroup" description="${groupId} ${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>
             </drop-down>
@@ -147,7 +155,8 @@
         <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 
-    <form name="CertIssuerList" type="list" list-name="issuerProvisions">
+    <form name="CertIssuerList" type="list" list-name="issuerProvisions"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <actions>
             <entity-condition entity-name="X509IssuerProvision">
                 <order-by field-name="commonName"/>
@@ -156,10 +165,11 @@
         <auto-fields-entity entity-name="X509IssuerProvision" default-field-type="display"/>
     </form>
 
-    <form name="ViewCertificate" type="single" target="ViewCertificate">
+    <form name="ViewCertificate" type="single" target="ViewCertificate"
+        header-row-style="header-row" default-table-style="basic-table">
         <field name="certString">
             <textarea rows="10"/>
         </field>
         <field name="View Cert" title="${uiLabelMap.PartyViewCert}"><submit/></field>
     </form>
-</forms>
+</forms>
\ No newline at end of file