OFBiz › OFBiz - Commits

svn commit: r1356888 [5/5] - in /ofbiz/branches/20120329_portletWidget: applications/accounting/ applications/commonext/ applications/content/ applications/content/data/ applications/content/template/survey/ applications/content/testdef/data/ applicati...

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

svn commit: r1356888 [5/5] - in /ofbiz/branches/20120329_portletWidget: applications/accounting/ applications/commonext/ applications/content/ applications/content/data/ applications/content/template/survey/ applications/content/testdef/data/ applicati...

erwan
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Tue Jul  3 19:42:32 2012
@@ -99,7 +99,7 @@ under the License.
             <a href="javascript:document.selectShoppingList.submit();" class="buttontext">${uiLabelMap.CommonEdit}</a>
           </form>
         <#else>
-          <div class="tabletext">${uiLabelMap.EcommerceNoShoppingListsCreate}.</div>
+          <div>${uiLabelMap.EcommerceNoShoppingListsCreate}.</div>
           <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a>
         </#if>
     </div>
@@ -321,7 +321,7 @@ under the License.
               <tr><td colspan="9"><hr /></td></tr>
               <tr>
                 <td align="right" colspan="9">
-                  <div class="tabletext">
+                  <div>
                     <a href="javascript:document.reorderinfo.submit();" class="buttontext">${uiLabelMap.CommonSave}</a>
                     <a href="<@ofbizUrl>editcontactmech?preContactMechTypeId=POSTAL_ADDRESS&amp;contactMechPurposeTypeId=SHIPPING_LOCATION&amp;DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.PartyAddNewAddress}</a>
                     <a href="<@ofbizUrl>editcreditcard?DONE_PAGE=editShoppingList</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceNewCreditCard}</a>
@@ -343,17 +343,17 @@ under the License.
                     <#if lastSlOrderDate?has_content>
                       <#assign lastOrderedString = Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(lastSlOrderDate)?if_exists>
                     </#if>
-                    <div class="tabletext">
+                    <div>
                       <table cellspacing="2" cellpadding="2" border="0">
                         <tr>
                           <td><div class="tableheadtext">${uiLabelMap.OrderLastOrderedDate}</div></td>
                           <td><div class="tableheadtext">:</div></td>
-                          <td><div class="tabletext">${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}</div></td>
+                          <td><div>${lastOrderedString?default("${uiLabelMap.OrderNotYetOrdered}")}</div></td>
                         </tr>
                         <tr>
                           <td><div class="tableheadtext">${uiLabelMap.EcommerceEstimateNextOrderDate}</div></td>
                           <td><div class="tableheadtext">:</div></td>
-                          <td><div class="tabletext">${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}</div></td>
+                          <td><div>${nextTimeString?default("${uiLabelMap.EcommerceNotYetKnown}")}</div></td>
                         </tr>
                       </table>
                     </div>
@@ -377,8 +377,8 @@ under the License.
     <div class="screenlet-body">
         <table width="100%" cellspacing="0" cellpadding="1" border="0">
           <tr>
-            <td><div class="tabletext"><b>${uiLabelMap.EcommerceListName}</b></div></td>
-            <td align="right"><div class="tabletext"><b>${uiLabelMap.EcommerceTotalPrice}</b></div></td>
+            <td><div><b>${uiLabelMap.EcommerceListName}</b></div></td>
+            <td align="right"><div><b>${uiLabelMap.EcommerceTotalPrice}</b></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
           </tr>
@@ -390,7 +390,7 @@ under the License.
                   <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${childShoppingList.listName?default(childShoppingList.shoppingListId)}</a>
                 </td>
                 <td nowrap="nowrap" align="right">
-                  <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div>
+                  <div><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div>
                 </td>
                 <td align="right">
                   <a href="<@ofbizUrl>editShoppingList?shoppingListId=${childShoppingList.shoppingListId}</@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceGoToList}</a>
@@ -401,11 +401,11 @@ under the License.
           </#list>
           <tr><td colspan="6"><hr /></td></tr>
           <tr>
-            <td><div class="tabletext">&nbsp;</div></td>
+            <td><div>&nbsp;</div></td>
             <td nowrap="nowrap" align="right">
               <div class="tableheadtext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div>
             </td>
-            <td><div class="tabletext">&nbsp;</div></td>
+            <td><div>&nbsp;</div></td>
           </tr>
         </table>
     </div>
@@ -425,11 +425,11 @@ under the License.
             <@paginationControls/>
             <table width="100%" cellspacing="0" cellpadding="1" border="0">
               <tr>
-                <td><div class="tabletext"><b>${uiLabelMap.OrderProduct}</b></div></td>
-                <td><table><tr><td class="tabletext" nowrap="nowrap" align="center"><b>- ${uiLabelMap.EcommerceStartdate} -</b></td><td class="tabletext" nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td class="tabletext" nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td class="tabletext" nowrap="nowrap" align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td>
-                <#-- <td nowrap="nowrap" align="center"><div class="tabletext"><b>Purchased</b></div></td> -->
-                <td align="right"><div class="tabletext"><b>${uiLabelMap.EcommercePrice}</b></div></td>
-                <td align="right"><div class="tabletext"><b>${uiLabelMap.OrderTotal}</b></div></td>
+                <td><div><b>${uiLabelMap.OrderProduct}</b></div></td>
+                <td><table><tr><td nowrap="nowrap" align="center"><b>- ${uiLabelMap.EcommerceStartdate} -</b></td><td nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfDays} -</b></td></tr><tr><td nowrap="nowrap"><b>- ${uiLabelMap.EcommerceNbrOfPersons} -</b></td><td nowrap="nowrap" align="center"><b>- ${uiLabelMap.CommonQuantity} -</b></td></tr></table></td>
+                <#-- <td nowrap="nowrap" align="center"><div><b>Purchased</b></div></td> -->
+                <td align="right"><div><b>${uiLabelMap.EcommercePrice}</b></div></td>
+                <td align="right"><div><b>${uiLabelMap.OrderTotal}</b></div></td>
                 <td>&nbsp;</td>
               </tr>
               <#list shoppingListItemDatas[lowIndex-1..highIndex-1] as shoppingListItemData>
@@ -442,7 +442,7 @@ under the License.
                 <#assign isVirtual = product.isVirtual?exists && product.isVirtual.equals("Y")/>
                   <tr>
                     <td>
-                      <div class="tabletext">
+                      <div>
                          <a href="<@ofbizUrl>product?product_id=${shoppingListItem.productId}</@ofbizUrl>" class="buttontext">${shoppingListItem.productId} -
                          ${productContentWrapper.get("PRODUCT_NAME")?default("No Name")}</a> : ${productContentWrapper.get("DESCRIPTION")?if_exists}
                       </div>
@@ -452,7 +452,7 @@ under the License.
                         <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"/>
                         <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"/>
                         <input type="hidden" name="reservStart"/>
-                        <div class="tabletext">
+                        <div>
                            <#if product.productTypeId == "ASSET_USAGE" || product.productTypeId == "ASSET_USAGE_OUT_IN">
                            <table border="0" width="100%">
                                 <tr>
@@ -468,7 +468,7 @@ under the License.
                                     <td>&nbsp;</td>
                                     <td>&nbsp;</td>
                                 </#if>
-                                    <td class="tabletext">
+                                    <td>
                            <#else>
                                 <table width="100%">
                                     <tr>
@@ -477,7 +477,7 @@ under the License.
                                     </tr>
                                     <tr>
                                         <td align="center">--</td>
-                                        <td class="tabletext"><input type="hidden" name="reservStartStr" value=""/>
+                                        <td><input type="hidden" name="reservStartStr" value=""/>
                            </#if>
                         <input size="6" class="inputBox" type="text" name="quantity" value="${shoppingListItem.quantity?string.number}"/>
                         </td></tr></table>
@@ -486,14 +486,14 @@ under the License.
                     </td>
                     <#--
                     <td nowrap="nowrap" align="center">
-                      <div class="tabletext">${shoppingListItem.quantityPurchased?default(0)?string.number}</div>
+                      <div>${shoppingListItem.quantityPurchased?default(0)?string.number}</div>
                     </td>
                     -->
                     <td nowrap="nowrap" align="right">
-                      <div class="tabletext"><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></div>
+                      <div><@ofbizCurrency amount=unitPrice isoCode=currencyUomId/></div>
                     </td>
                     <td nowrap="nowrap" align="right">
-                      <div class="tabletext"><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div>
+                      <div><@ofbizCurrency amount=totalPrice isoCode=currencyUomId/></div>
                     </td>
                     <td align="right">
                         <a href="#" onclick="javascript:TimestampSubmit(listform_${shoppingListItem.shoppingListItemSeqId});" class="buttontext">${uiLabelMap.CommonUpdate}</a>
@@ -528,14 +528,14 @@ under the License.
               </#list>
               <tr><td colspan="6"><hr /></td></tr>
               <tr>
-                <td><div class="tabletext">&nbsp;</div></td>
-                <td><div class="tabletext">&nbsp;</div></td>
-                <#--<td><div class="tabletext">&nbsp;</div></td>-->
-                <td><div class="tabletext">&nbsp;</div></td>
+                <td><div>&nbsp;</div></td>
+                <td><div>&nbsp;</div></td>
+                <#--<td><div>&nbsp;</div></td>-->
+                <td><div>&nbsp;</div></td>
                 <td nowrap="nowrap" align="right">
                   <div class="tableheadtext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div>
                 </td>
-                <td><div class="tabletext">&nbsp;</div></td>
+                <td><div>&nbsp;</div></td>
               </tr>
             </table>
         <#else>
@@ -552,21 +552,21 @@ under the License.
       <table width="100%" border="0" cellspacing="1" cellpadding="1">
         <tr>
           <td width="5%" nowrap="nowrap">
-              <div class="tabletext">${uiLabelMap.EcommerceChildListTotalPrice}</div>
+              <div>${uiLabelMap.EcommerceChildListTotalPrice}</div>
           </td>
           <td align="right" width="5%" nowrap="nowrap">
-              <div class="tabletext"><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div>
+              <div><@ofbizCurrency amount=shoppingListChildTotal isoCode=currencyUomId/></div>
           </td>
-          <td width="90%"><div class="tabletext">&nbsp;</div></td>
+          <td width="90%"><div>&nbsp;</div></td>
         </tr>
         <tr>
           <td nowrap="nowrap">
-              <div class="tabletext">${uiLabelMap.EcommerceListItemsTotalPrice}&nbsp;</div>
+              <div>${uiLabelMap.EcommerceListItemsTotalPrice}&nbsp;</div>
           </td>
           <td align="right" nowrap="nowrap">
-              <div class="tabletext"><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div>
+              <div><@ofbizCurrency amount=shoppingListItemTotal isoCode=currencyUomId/></div>
           </td>
-          <td><div class="tabletext">&nbsp;</div></td>
+          <td><div>&nbsp;</div></td>
         </tr>
         <tr>
           <td nowrap="nowrap">
@@ -575,7 +575,7 @@ under the License.
           <td align="right" nowrap="nowrap">
               <div class="tableheadtext"><@ofbizCurrency amount=shoppingListTotalPrice isoCode=currencyUomId/></div>
           </td>
-          <td><div class="tabletext">&nbsp;</div></td>
+          <td><div>&nbsp;</div></td>
         </tr>
       </table>
     </div>
@@ -589,7 +589,7 @@ under the License.
         <form name="addToShoppingList" method="post" action="<@ofbizUrl>addItemToShoppingList<#if requestAttributes._CURRENT_VIEW_?exists>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>">
           <input type="hidden" name="shoppingListId" value="${shoppingList.shoppingListId}"/>
           <input type="text" class="inputBox" name="productId" value="${requestParameters.add_product_id?if_exists}"/>
-          <#if reservStart?exists></td><td class="tabletext">${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td class="tabletext"> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td class="tabletext">${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td class="tabletext" nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td>
+          <#if reservStart?exists></td><td>${uiLabelMap.EcommerceStartDate}</td><td><input type="text" class="inputBox" size="10" name="reservStart" value="${requestParameters.reservStart?default("")}" /></td><td> ${uiLabelMap.EcommerceLength}:</td><td><input type="text" class="inputBox" size="2" name="reservLength" value="${requestParameters.reservLength?default("")}" /></td></tr><tr><td>&nbsp;</td><td>&nbsp;</td><td>${uiLabelMap.OrderNbrPersons}:</td><td><input type="text" class="inputBox" size="3" name="reservPersons" value="${requestParameters.reservPersons?default("1")}" /></td><td nowrap="nowrap"></#if> ${uiLabelMap.CommonQuantity} :</td><td><input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" /></td><td>
           <!-- <input type="text" class="inputBox" size="5" name="quantity" value="${requestParameters.quantity?default("1")}" />-->
           <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/>
         </form>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ContentForms.xml Tue Jul  3 19:42:32 2012
@@ -21,13 +21,13 @@ under the License.
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
     <form name="searchQuery" target="AdminSearch" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="queryLine" title="${uiLabelMap.EcommerceEnterQueryParameters}"><text size="60"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
 
     </form>
     <form name="searchList" type="list" target="" list-name="queryResults"
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
+        default-title-style="tableheadtext" default-widget-style="inputBox"
         paginate-target="/AdminSearch">
         <field name="editContent" title=" ">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit">

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/ForumForms.xml Tue Jul  3 19:42:32 2012
@@ -39,7 +39,7 @@ under the License.
     </form>
 
     <form name="EditCombo" target="uploadContentAndImage" title="" type="upload"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="imageData" >
             <file />
         </field>
@@ -146,7 +146,7 @@ under the License.
         </field>
     </form>
     <form name="ViewComboResponse" target="" title="" type="single" extends="EditCombo"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
        <field name="summaryData" >
                 <ignored/>
         </field>
@@ -173,7 +173,7 @@ under the License.
     </form>
 
     <form name="findContent" default-entity-name="ContentAssocDataResourceViewFrom" target="FindContent" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="caContentIdTo" title="${uiLabelMap.ContentPublishToContent}"><text-find/></field>
         <field name="caMapKey"><text-find/></field>
         <field name="caContentAssocTypeId" title="${uiLabelMap.FormFieldTitle_contentAssocTypeId}" ><text-find/></field>
@@ -191,7 +191,7 @@ under the License.
     </form>
 
     <form name="listFindContent" type="list" target=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
+        default-title-style="tableheadtext" default-widget-style="inputBox"
         paginate-target="/FindContent">
         <field name="editContent" title=" ">
             <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditContent">
@@ -221,7 +221,7 @@ under the License.
     </form>
 
     <form name="EditContent" target="uploadContentAndImage" title="" type="upload"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="imageData" >
             <file />
         </field>
@@ -329,7 +329,7 @@ under the License.
     </form>
 
     <form name="EditContentInfo" target="updateContent" title="" type="single" default-map-name="currentValue"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <auto-fields-entity entity-name="Content"/>
         <field name="contentId"><display/></field>
         <field name="contentTypeId">
@@ -384,7 +384,7 @@ under the License.
     </form>
 
     <form name="DataResourceMaster" target="createDataResource" title="" type="single" default-map-name="currentValue"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <auto-fields-entity entity-name="DataResource" default-field-type="edit"/>
         <field name="dataResourceId"></field>
         <field name="dataResourceTypeId">
@@ -428,7 +428,7 @@ under the License.
         <field name="lastModifiedByUserLogin"><display/></field>
     </form>
     <form name="EditDataResourceText" target="updateDataResourceText" title="" type="single" extends="DataResourceMaster"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="dataResourceId"><display/></field>
         <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
         <field name="dataResourceTypeIdDisplay" title="${uiLabelMap.CommonType}" field-name="dataResourceTypeId" >
@@ -438,7 +438,7 @@ under the License.
         <field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="ImageUpload" target="uploadImage" title="" type="upload"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="dataResourceId" >
             <display description="${currentValue.dataResourceId}"/>
         </field>
@@ -453,7 +453,7 @@ under the License.
         </field>
     </form>
     <form name="AddContent" target="uploadArticleAndImage" title="" type="upload"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="imageData" >
             <file />
         </field>
@@ -512,7 +512,7 @@ under the License.
         </field>
     </form>
     <form name="AddResponse" target="uploadResponse" title="" type="single" extends="AddContent"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="contentIdTo" title="${uiLabelMap.EcommerceInResponseTo}">
             <display description="${contentIdTo}"/>
         </field>
@@ -558,7 +558,7 @@ under the License.
     </form>
 
     <form name="EditResponse" target="uploadResponse" title="" type="upload" extends="AddContent"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="contentIdTo" title="${uiLabelMap.EcommerceInResponseTo}">
             <display description="${contentIdTo}"/>
         </field>
@@ -590,7 +590,7 @@ under the License.
     </form>
 
     <form name="EditAddContentMaster" target="" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="dataResourceId" map-name="currentValue">
             <hidden/>
         </field>
@@ -662,7 +662,7 @@ under the License.
 -->
 
     <form name="EditAddImageMaster" target="" title="" type="upload"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="dataResourceId" map-name="currentValue">
             <hidden/>
         </field>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/OrderScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/OrderScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/OrderScreens.xml Tue Jul  3 19:42:32 2012
@@ -311,7 +311,7 @@ under the License.
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleSplitItemsForShipping"/>
-                <script location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/order/SplitShip.groovy"/>
+                <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/SplitShip.groovy"/>
             </actions>
             <widgets>
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogForms.xml Tue Jul  3 19:42:32 2012
@@ -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="findBlogContent" default-entity-name="ContentAssocDataResourceViewFrom" target="CMSContentFind" title="" type="single"
-        default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="tableheadtext" default-widget-style="inputBox">
         <field name="caContentIdTo" title="${uiLabelMap.ContentPublishToContent}">
             <drop-down>
                 <option key="OFBIZBLOGROOT" description="${uiLabelMap.ContentBlogs}"/>
@@ -57,7 +57,7 @@
     </form>
 
     <form name="listFindBlogContent" type="list" target=""
-        default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext"
+        default-title-style="tableheadtext" default-widget-style="inputBox"
         paginate-target="/CMSContentFind" view-size="20">
         <actions>
             <service service-name="performFind" result-map-list="listIt">
@@ -87,7 +87,7 @@
     </form>
 
     <form name="AddBlogResponse" target="createBlogResponse" title="" type="single"
-        default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="treeHeader" default-widget-style="inputBox">
         <auto-fields-entity entity-name="ContentAssocDataResourceViewTo" default-field-type="hidden" map-name="rsp"/>
         <field name="contentName" entry-name="contentName" map-name="rsp">
             <text size="40"/>
@@ -147,7 +147,7 @@
     </form>
 
     <form name="EditBlogResponse" target="updateBlogResponse" title="" type="single"
-        default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="treeHeader" default-widget-style="inputBox">
         <auto-fields-entity entity-name="Content" default-field-type="hidden" map-name="content"/>
         <auto-fields-entity entity-name="DataResource" default-field-type="hidden" map-name="dataResource"/>
         <field name="contentName" entry-name="contentName" map-name="rsp">
@@ -197,14 +197,14 @@
     </form>
 
     <form name="editFormSubmit" target="" title="" type="single" skip-start="true" skip-end="true"
-        default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="treeHeader" default-widget-style="inputBox">
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
     </form>
 
     <form name="editFormEnd" target="" title="" type="single" skip-start="true"
-        default-title-style="treeHeader" default-tooltip-style="tabletext" default-widget-style="inputBox">
+        default-title-style="treeHeader" default-widget-style="inputBox">
     </form>
 
 </forms>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogMenus.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogMenus.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/widget/blog/BlogMenus.xml Tue Jul  3 19:42:32 2012
@@ -19,7 +19,7 @@
   -->
 
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
-    <menu name="view_edit" default-title-style="tabButton" default-selected-style="tabButtonSelected" default-menu-item-name="all" orientation="horizontal" menu-width="100%" default-tooltip-style="tabletext" default-widget-style="tabButton" menu-container-style="blogmenuwrapper" title="" type="simple">
+    <menu name="view_edit" default-title-style="tabButton" default-selected-style="tabButtonSelected" default-menu-item-name="all" orientation="horizontal" menu-width="100%" default-widget-style="tabButton" menu-container-style="blogmenuwrapper" title="" type="simple">
         <menu-item name="edit" title="${uiLabelMap.CommonEdit}">
             <condition>
                 <or>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -36,7 +36,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_view.xml"/>
     <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ExampleSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortletData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExamplePortalSeedData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ExampleHelpData.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlebase/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -27,7 +27,8 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleBaseSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/GoogleBaseSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleBaseData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/googlecheckout/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -28,7 +28,8 @@
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/GoogleCheckoutSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/GoogleCheckoutSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/DemoGoogleCheckoutData.xml"/>
     
     <service-resource type="model" loader="main" location="servicedef/services_request.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -24,7 +24,8 @@ under the License.
     <resource-loader name="main" type="component"/>
     <classpath type="jar" location="build/lib/*"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/HhFacilitySecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/HhFacilitySecurityGroupDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services_hhfacility.xml"/>
 

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/widget/hhfacility/FacilityForms.xml Tue Jul  3 19:42:32 2012
@@ -22,7 +22,7 @@ under the License.
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
 
     <form name="ListFacilities" type="list" list-name="facilities" paginate-target="main"
-             default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+             default-title-style="tableheadtext">
         <field name="facilityId" widget-style="buttontext">
             <hyperlink also-hidden="false" description="${facilityId}" target="menu">
                 <parameter param-name="facilityId"/>
@@ -34,7 +34,7 @@ under the License.
 
     <!-- this form posts to "polinereceipt" (see controller.xml) -->
     <form name="POEnter" type="single" target="polinereceipt"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            default-title-style="tableheadtext">
         <field name="facilityId"><hidden/></field>
         <field name="OrderId" title="${uiLabelMap.OrderPONumber}"><text size="10"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
@@ -42,7 +42,7 @@ under the License.
 
     <!-- this form posts to "productqtyreceipt" (see controller.xml) -->
     <form name="ProductEnter" type="single" target="productqtyreceipt"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            default-title-style="tableheadtext">
         <field name="facilityId"><hidden/></field>
         <field name="productId"><text size="10" default-value=""/></field>
         <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
@@ -50,7 +50,7 @@ under the License.
 
     <!-- this form posts to "receiveproductqty" (see controller.xml) -->
     <form name="ProductQtyEnter" type="single" target="receiveproductqty"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            default-title-style="tableheadtext">
         <field name="facilityId"><hidden/></field>
         <field name="productId"><hidden/></field>
         <field name="productId" entry-name="product.productId" ><display/></field>
@@ -62,14 +62,14 @@ under the License.
 
     <!-- this form posts to "findstocktake" (see controller.xml) -->
     <form name="FindProductStock" type="single" target="findstocktake"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            default-title-style="tableheadtext">
         <field name="facilityId"><hidden/></field>
         <field name="idValue"><text size="10" default-value=""/></field>
         <field name="submitButton" title="${uiLabelMap.CommonNext}" widget-style="standardSubmit"><submit button-type="button"/></field>
     </form>
 
     <form name="ProductStocktake" type="single" target="updateproductstocktake"
-            default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+            default-title-style="tableheadtext">
         <field name="facilityId"><hidden/></field>
         <field name="productId"><display/></field>
         <field name="productName" entry-name="product.productName"><display/></field>
@@ -79,7 +79,7 @@ under the License.
     </form>
     <form name="UpdateProductStocktake" type="list"
             target="updateproductstocktake" title="" list-name="productQtyByLocations"
-            default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
+            default-title-style="tableheadtext" default-widget-style="inputBox">
     <!--    <auto-fields-service service-name="updateproductstocktake"/>  -->
         <field name="productId"><hidden/></field>
         <field name="facilityId"><hidden/></field>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/myportal/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -24,8 +24,9 @@
     <resource-loader name="main" type="component"/>
     <classpath type="dir" location="config"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalTypeData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/MyPortalSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalSecurityGroupDemoData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalPageDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/MyPortalDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/oagis/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -28,7 +28,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/OagisSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/OagisSecurityGroupDemoData.xml"/>
 
     <service-resource type="model" loader="main" location="servicedef/services.xml"/>
     <!-- Uncomment To activate automatic messaging to the partner

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -29,7 +29,8 @@ under the License.
 
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrHelpData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrPortletData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoPasswordData.xml"/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -35,7 +35,8 @@ under the License.
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
     <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> -->
     <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumTypeData.xml"/>
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumHelpData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumDemoData.xml"/>
 

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml Tue Jul  3 19:42:32 2012
@@ -1140,7 +1140,7 @@ under the License.
                 <parameter param-name="productId"/>
             </hyperlink>
         </field>
-        <field name="description" position="1" title="${uiLabelMap.ScrumProductBacklogItem}" widget-style="tabletext">
+        <field name="description" position="1" title="${uiLabelMap.ScrumProductBacklogItem}">
             <display description="${product}">
                 <in-place-editor url="updateCustRequest" cancel-control="button" saving-text="Updating..." text-between-controls=" ">
                     <simple-editor/>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl Tue Jul  3 19:42:32 2012
@@ -38,19 +38,19 @@ under the License.
           (${uiLabelMap.CommonNot}&nbsp;${autoUserLogin.userLoginId}?&nbsp;<a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)
         </div>
       </#if>
-      <div class="tabletext">
+      <div>
         ${uiLabelMap.CommonPassword}:&nbsp;
         <input type="password" name="PASSWORD" value="" size="20"/>
       </div>
-      <div class="tabletext">
+      <div>
         ${uiLabelMap.CommonNewPassword}:&nbsp;
         <input type="password" name="newPassword" value="" size="20"/>
       </div>
-      <div class="tabletext">
+      <div>
         ${uiLabelMap.CommonNewPasswordVerify}:&nbsp;
         <input type="password" name="newPasswordVerify" value="" size="20"/>
       </div>
-      <div class="tabletext">
+      <div>
         <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonLogin}"/>
       </div>
     </form>

Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml Tue Jul  3 19:42:32 2012
@@ -28,7 +28,8 @@ under the License.
 
     <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/>
 
-    <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityData.xml"/>
+    <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityPermissionSeedData.xml"/>
+    <entity-resource type="data" reader-name="demo" loader="main" location="data/WorkFlowSecurityGroupDemoData.xml"/>
     <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowTypeData.xml"/>
     <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderProcessWorkflow.xml"/>
 

Modified: ofbiz/branches/20120329_portletWidget/themes/multiflex/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/multiflex/includes/footer.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/multiflex/includes/footer.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/themes/multiflex/includes/footer.ftl Tue Jul  3 19:42:32 2012
@@ -21,7 +21,7 @@ under the License.
 
 <div class="footer">
   <p align="center">
-    <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></p>
+    <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a></p>
     <p>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
   </p>
   <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>

Modified: ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/20120329_portletWidget/themes/tomahawk/webapp/tomahawk/css/style.css Tue Jul  3 19:42:32 2012
@@ -1266,7 +1266,7 @@ display: inline; /* IE Fix */
 }
 
 .screenlet-title-bar ul li {
-/*border-left: 0.1em solid #BBBBBB;*/
+border-left: 0.1em solid #BBBBBB;
 color: #ffffff;
 float: right;
 font-size: 1em;


Free forum by Nabble Edit this page