OFBiz › OFBiz - Commits

svn commit: r533790 - in /ofbiz/trunk: applications/party/webapp/partymgr/party/ framework/images/webapp/images/ framework/webtools/webapp/webtools/ framework/webtools/webapp/webtools/entity/ framework/webtools/webapp/webtools/period/ framework/webtool...

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

svn commit: r533790 - in /ofbiz/trunk: applications/party/webapp/partymgr/party/ framework/images/webapp/images/ framework/webtools/webapp/webtools/ framework/webtools/webapp/webtools/entity/ framework/webtools/webapp/webtools/period/ framework/webtool...

jacopoc
Author: jacopoc
Date: Mon Apr 30 09:35:15 2007
New Revision: 533790

URL: http://svn.apache.org/viewvc?view=rev&rev=533790
Log:
Layout improvements from Adrian Crum (OFBIZ-947).

Modified:
    ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
    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/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/framework/images/webapp/images/maincss.css
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl
    ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/EditPartyRelationships.ftl Mon Apr 30 09:35:15 2007
@@ -17,7 +17,6 @@
 under the License.
 -->
 
-<!-- begin EditPartyRelationships.ftl -->
 <br />
 <div class="screenlet">
   <div class="screenlet-title-bar">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/addressMatchMap.ftl Mon Apr 30 09:35:15 2007
@@ -17,11 +17,10 @@
 under the License.
 -->
 
-<!-- begin addressMatchMap.ftl -->
 <div id="address-match-map" class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PageTitleAddressMatchMap}</h3>
+      <li class="head3">${uiLabelMap.PageTitleAddressMatchMap}</li>
       <li><a href="<@ofbizUrl>findAddressMatch</@ofbizUrl>">${uiLabelMap.PageTitleFindMatches}</a></li>
     </ul>
     <br class="clear" />

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Mon Apr 30 09:35:15 2007
@@ -17,12 +17,11 @@
 under the License.
 -->
 
-<!-- begin editShoppingList.ftl -->
 <br />
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PartyShoppingLists}</h3>
+      <li class="head3">${uiLabelMap.PartyShoppingLists}</li>
       <li><a href="<@ofbizUrl>createEmptyShoppingList</@ofbizUrl>?partyId=${partyId?if_exists}">${uiLabelMap.CommonCreateNew}</a></li>
     </ul>
     <br class="clear" />
@@ -51,7 +50,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PartyShoppingListDetail} - ${shoppingList.listName}</h3>
+      <li class="head3">${uiLabelMap.PartyShoppingListDetail} - ${shoppingList.listName}</li>
       <li><a href="javascript:document.updateList.submit();">${uiLabelMap.CommonSave}</a></li>
       <li><a href="/ordermgr/control/createQuoteFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}&applyStorePromotions=N">${uiLabelMap.PartyCreateNewQuote}</a></li>
       <li><a href="/ordermgr/control/createCustRequestFromShoppingList?shoppingListId=${shoppingList.shoppingListId?if_exists}">${uiLabelMap.PartyCreateNewCustRequest}</a></li>
@@ -129,7 +128,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PartyChildShoppingList} - ${shoppingList.listName}</h3>
+      <li class="head3">${uiLabelMap.PartyChildShoppingList} - ${shoppingList.listName}</li>
       <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}&includeChild=yes</@ofbizUrl>">${uiLabelMap.PartyAddChildListsToCart}</a></li>
     </ul>
     <br class="clear" />
@@ -158,7 +157,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PartyListItems} - ${shoppingList.listName}</h3>
+      <li class="head3">${uiLabelMap.PartyListItems} - ${shoppingList.listName}</li>
         <#-- <li><a href="<@ofbizUrl>addListToCart?shoppingListId=${shoppingList.shoppingListId}</@ofbizUrl>">${uiLabelMap.PartyAddListToCart}</a></li> -->
     </ul>
     <br class="clear" />

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findMatches.ftl Mon Apr 30 09:35:15 2007
@@ -17,11 +17,10 @@
 under the License.
 -->
 
-<!-- begin findMatches.ftl -->
 <div id="address-match-map" class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PageTitleAddressMatches}</h3>
+      <li class="head3">${uiLabelMap.PageTitleAddressMatches}</li>
       <li><a href="<@ofbizUrl>addressMatchMap</@ofbizUrl>">${uiLabelMap.PageTitleAddressMatchMap}</a></li>
     </ul>
     <br class="clear" />
@@ -117,5 +116,3 @@
       </#if>
     </table>
   </div>
- </div>
-<!-- end findMatches.ftl -->

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Mon Apr 30 09:35:15 2007
@@ -19,11 +19,10 @@
 
 <#assign extInfo = parameters.extInfo?default("N")>
 
-<!-- begin findParty.ftl -->
 <div id="findPartyParameters" class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.PartyFindParty}</h3>
+      <li class="head3">${uiLabelMap.PartyFindParty}</li>
       <#if parameters.hideFields?default("N") == "Y">
         <li><a href="<@ofbizUrl>findparty?hideFields=N${paramList}</@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li>
       <#else>
@@ -163,7 +162,7 @@
   <div id="findPartyResults" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.PartyPartiesFound}</h3>
+        <li class="head3">${uiLabelMap.PartyPartiesFound}</li>
           <#if (partyListSize > 0)>
             <#if (partyListSize > highIndex)>
               <li><a class="nav-next" href="<@ofbizUrl>findparty?VIEW_SIZE=${viewSize}&amp;VIEW_INDEX=${viewIndex+1}&amp;hideFields=${parameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.CommonNext}</a></li>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Mon Apr 30 09:35:15 2007
@@ -21,7 +21,6 @@
 <#assign partyId = requestParameters.partyId?if_exists>
 <#assign partyIdTo = requestParameters.partyIdTo?if_exists>
 
-<!-- begin linkparty.ftl -->
 <br/>
 <#if hasUpdatePermission>
   <div id="linkParty" class="screenlet">

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl Mon Apr 30 09:35:15 2007
@@ -17,7 +17,6 @@
 under the License.
 -->
 
-<!-- begin viewProfile.ftl -->
 <#if party?has_content>
   <div class="align-float">
     <#if showOld>
@@ -32,14 +31,14 @@
     <div class="screenlet-title-bar">
       <ul>
         <#if lookupPerson?has_content>
-          <h3>${uiLabelMap.PartyPersonalInformation}</h3>
+          <li class="head3">${uiLabelMap.PartyPersonalInformation}</li>
           <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
             <li><a href="<@ofbizUrl>editperson?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a></li>
           </#if>
         </#if>
         <#if lookupGroup?has_content>
           <#assign lookupPartyType = party.getRelatedOneCache("PartyType")>
-          <h3>${uiLabelMap.PartyPartyGroupInformation}</h3>
+          <li class="head3">${uiLabelMap.PartyPartyGroupInformation}</li>
           <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
             <li><a href="<@ofbizUrl>editpartygroup?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.CommonUpdate}</a></li>
           </#if>
@@ -133,7 +132,7 @@
   <div id="partyContactInfo" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.PartyContactInformation}</h3>
+        <li class="head3">${uiLabelMap.PartyContactInformation}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
           <li><a href="<@ofbizUrl>editcontactmech?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
         </#if>
@@ -260,7 +259,7 @@
   <div id="partyPaymentMethod" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.PartyPaymentMethodInformation}</h3>
+        <li class="head3">${uiLabelMap.PartyPaymentMethodInformation}</li>
         <#if security.hasEntityPermission("PAY_INFO", "_CREATE", session)>
           <li><a href="<@ofbizUrl>editeftaccount?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewEftAccount}</a></li>
           <li><a href="<@ofbizUrl>editgiftcard?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.AccountingCreateNewGiftCard}</a></li>
@@ -413,7 +412,7 @@
   <div id="partyUserLogins" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.PartyUserName}</h3>
+        <li class="head3">${uiLabelMap.PartyUserName}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
           <li><a href="<@ofbizUrl>createnewlogin?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
         </#if>
@@ -460,7 +459,7 @@
   <div id="partyAttributes" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.PartyAttributes}</h3>
+        <li class="head3">${uiLabelMap.PartyAttributes}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_CREATE", session)>
           <li><a href="<@ofbizUrl>editPartyAttribute?partyId=${party.partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
         </#if>
@@ -494,7 +493,7 @@
   <div id="partyVisits" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.PartyLastVisit}</h3>
+        <li class="head3">${uiLabelMap.PartyLastVisit}</li>
         <li><a href="<@ofbizUrl>showvisits?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonListAll}</a></li>
       </ul>
       <br class="clear" />
@@ -537,7 +536,7 @@
     <div id="partyShoppingCart" class="screenlet">
       <div class="screenlet-title-bar">
         <ul>
-          <h3>${uiLabelMap.PartyCurrentShoppingCart}</h3>
+          <li class="head3">${uiLabelMap.PartyCurrentShoppingCart}</li>
           <#if security.hasEntityPermission("PARTYMGR", "_UPDATE", session)>
             <#if savedCartListId?has_content>
               <#assign listParam = "&shoppingListId=" + savedCartListId>
@@ -637,7 +636,7 @@
   <div id="partyNotes" class="screenlet">
     <div class="screenlet-title-bar">
       <ul>
-        <h3>${uiLabelMap.CommonNotes}</h3>
+        <li class="head3">${uiLabelMap.CommonNotes}</li>
         <#if security.hasEntityPermission("PARTYMGR", "_NOTE", session)>
           <li><a href="<@ofbizUrl>AddPartyNote?partyId=${partyId}</@ofbizUrl>">${uiLabelMap.CommonCreateNew}</a></li>
         </#if>

Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewroles.ftl Mon Apr 30 09:35:15 2007
@@ -18,7 +18,6 @@
 -->
 
 <#-- Party Roles -->
-<!-- begin viewroles.ftl -->
 <br/>
 <div id="partyRoles" class="screenlet">
   <div class="screenlet-title-bar">

Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Mon Apr 30 09:35:15 2007
@@ -1422,7 +1422,11 @@
 
 .screenlet-title-bar ul h1,
 .screenlet-title-bar ul h2,
-.screenlet-title-bar ul h3 {
+.screenlet-title-bar ul h3,
+.screenlet-title-bar ul .head1,
+.screenlet-title-bar ul .head2,
+.screenlet-title-bar ul .head3 {
+/* h1 - h3 deprecated, fails validation */
 background-color: #000099;
 border-left: none;
 float: left;

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Mon Apr 30 09:35:15 2007
@@ -213,7 +213,7 @@
       <div class="screenlet">
         <div class="screenlet-title-bar">
           <ul>
-            <h3>${relation.title} ${uiLabelMap.WebtoolsRelatedEntity}: ${relation.relatedTable}</h3>
+            <li class="head3">${relation.title} ${uiLabelMap.WebtoolsRelatedEntity}: ${relation.relatedTable}</li>
             <#if relation.valueRelated?has_content>
               <li><a href='<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}</@ofbizUrl>'>${uiLabelMap.CommonView}</a></li>
             <#else>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Mon Apr 30 09:35:15 2007
@@ -43,7 +43,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <h3>${uiLabelMap.WebtoolsMainPage}</h3>
+      <li class="head3">${uiLabelMap.WebtoolsMainPage}</li>
       <li class="disabled">${delegator.getDelegatorName()}</li>
     </ul>
     <br class="clear"/>

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl Mon Apr 30 09:35:15 2007
@@ -34,7 +34,7 @@
     <div class="screenlet-title-bar">
       <#if currentCustomTimePeriod?has_content>
         <ul>
-          <h3>Current Custom Time Period</h3>
+          <li class="head3">Current Custom Time Period</li>
           <li><a href="<@ofbizUrl>EditCustomTimePeriod?findOrganizationPartyId=${findOrganizationPartyId?if_exists}</@ofbizUrl>">Clear Current</a></li>
         </ul>
         <br class="clear" />

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl?view=diff&rev=533790&r1=533789&r2=533790
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl Mon Apr 30 09:35:15 2007
@@ -39,7 +39,7 @@
     <div class="screenlet">
       <div class="screenlet-title-bar">
         <ul>
-          <h3>${uiLabelMap.WebtoolsService}: ${selectedServiceMap.serviceName}</h3>
+          <li class="head3">${uiLabelMap.WebtoolsService}: ${selectedServiceMap.serviceName}</li>
           <li><a href='<@ofbizUrl>${url}</@ofbizUrl>'>${uiLabelMap.CommonListAll}</a></li>
           <li><a href='<@ofbizUrl>/scheduleJob?SERVICE_NAME=${selectedServiceMap.serviceName}</@ofbizUrl>'>${uiLabelMap.WebtoolsSchedule}</a></li>
         </ul>


Free forum by Nabble Edit this page