svn commit: r1827077 - in /ofbiz/ofbiz-framework/trunk/applications: content/template/cms/ content/template/content/ content/template/contentsetup/ product/template/imagemanagement/

[mbrohl]

Author: mbrohl
Date: Sat Mar 17 11:54:28 2018
New Revision: 1827077

URL: http://svn.apache.org/viewvc?rev=1827077&view=rev
Log:
Improved: Improve layout and structure of forms.
(OFBIZ-10221)

Thanks Julian Leichert for reporting and providing the patch.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/template/cms/AddSubSite.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/AddMultipleImages.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/cms/AddSubSite.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/cms/AddSubSite.ftl?rev=1827077&r1=1827076&r2=1827077&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/cms/AddSubSite.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/cms/AddSubSite.ftl Sat Mar 17 11:54:28 2018
@@ -26,18 +26,18 @@ function win_cancel() {
 }
 </script>
 
-<form name="addSubSite" method="post" action="<@ofbizUrl>postNewSubSite?rootForumId=${requestParameters.rootForumId}</@ofbizUrl>">
-<table cellspacing="8">
+<form class="basic-form" name="addSubSite" method="post" action="<@ofbizUrl>postNewSubSite?rootForumId=${requestParameters.rootForumId}</@ofbizUrl>">
+<table>
   <tr>
-    <td align="right">Site Name:</td>
+    <td class="label"><label>Site Name:</label>/td>
     <td><input type="text" size="20" name="contentName"/></td>
   </tr>
   <tr>
-    <td align="right">Site Description:</td>
+    <td class="label"><label>Site Description:</label></td>
     <td><input type="text" size="40" name="description"/></td>
   </tr>
   <tr>
-    <td align="right">Posted Msg Default Status:</td>
+    <td class="label"><label>Posted Msg Default Status:</label></td>
     <td>
       <select name="statusId">
         <option value="CTNT_IN_PROGRESS">Draft - not attached to any site</option>
@@ -47,7 +47,8 @@ function win_cancel() {
     </td>
   </tr>
   <tr>
-    <td colspan="2"><input type="submit" name="submitBtn" value="Create"/></td>
+    <td class="label"/>
+    <td><input type="submit" name="submitBtn" value="Create"/></td>
   </tr>
 </table>
 <input type="hidden" name="contentIdTo" value="${requestParameters.parentForumId}" />

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl?rev=1827077&r1=1827076&r2=1827077&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl Sat Mar 17 11:54:28 2018
@@ -21,7 +21,7 @@ under the License.
     <h3>${uiLabelMap.CommonAdvancedSearch}</h3>
   </div>
   <div class="screenlet-body">
-    <form name="advToKeyWordSearchForm" method="post" action="<@ofbizUrl>ContentSearchResults</@ofbizUrl>" style="margin: 0;">
+    <form class="basic-form" name="advToKeyWordSearchForm" method="post" action="<@ofbizUrl>ContentSearchResults</@ofbizUrl>" style="margin: 0;">
       <input type="hidden" name="VIEW_SIZE" value="25"/>
       <table class="basic-table" cellspacing="0">
         <tr>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl?rev=1827077&r1=1827076&r2=1827077&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/contentsetup/UserPermissions.ftl Sat Mar 17 11:54:28 2018
@@ -54,7 +54,7 @@ function call_fieldlookup3(view_name) {
 
 <#-- ============================================================= -->
 <br />
-<table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'>
+<table border="0" width='100%' cellspacing='0' cellpadding='0' class="form-table">
   <tr>
     <td width='100%'>
       <form name="userform" method="post" action="<@ofbizUrl>UserPermissions</@ofbizUrl>" >
@@ -79,8 +79,9 @@ function call_fieldlookup3(view_name) {
   <tr>
     <td width='100%'>
       <form name="siteRoleForm" method="post" action="<@ofbizUrl>updateSiteRoles</@ofbizUrl>">
-      <table width='100%' border='0' cellspacing='0' cellpadding='4' class='boxoutside'>
+      <table width='100%' border='0' cellspacing='0' cellpadding='4' >
         <tr>
+            <td class="label"/>
             <td class="">${uiLabelMap.ContentWebSite}</td>
             <#list blogRoleIdList as roleTypeId>
               <td class="">${roleTypeId}</td>
@@ -103,6 +104,7 @@ function call_fieldlookup3(view_name) {
           <#assign rowCount=rowCount + 1/>
         </#list>
           <tr>
+            <td class="label"/>
             <td>
               <div class="smallSubmit" ><a href="javascript:submitRows('${rowCount!}')">${uiLabelMap.CommonUpdate}</a></div>
             </td>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/AddMultipleImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/AddMultipleImages.ftl?rev=1827077&r1=1827076&r2=1827077&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/AddMultipleImages.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/imagemanagement/AddMultipleImages.ftl Sat Mar 17 11:54:28 2018
@@ -17,14 +17,15 @@ specific language governing permissions
 under the License.
 -->
 
-<form id="addMultipleImagesForm" name="addMultipleImagesForm" method="post" action="<@ofbizUrl>addImageForProduct</@ofbizUrl>" enctype="multipart/form-data">
-<br/>
-<div class="label">${uiLabelMap.ProductProductId} <@htmlTemplate.lookupField name="productId" id="productId" formName="addMultipleImagesForm" fieldFormName="LookupProduct"/></div>
-<br/>
-<br/>
+<form class="basic-form" id="addMultipleImagesForm" name="addMultipleImagesForm" method="post" action="<@ofbizUrl>addImageForProduct</@ofbizUrl>" enctype="multipart/form-data">
   <table>
     <tbody>
       <tr>
+    <td class="label"><label>${uiLabelMap.ProductProductId}</label></td>
+    <td><@htmlTemplate.lookupField name="productId" id="productId" formName="addMultipleImagesForm" fieldFormName="LookupProduct"/></td>
+    </tr>
+      <tr>
+        <td class="label"/>
         <td>
             <select name="imageResize" >
                 <#list productFeatures as productFeature>
@@ -35,36 +36,47 @@ under the License.
         </td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageOne"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageTwo"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageThree"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageFour"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageFive"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageSix"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageSeven"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageEight"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageNine"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="file" size="20" name="additionalImageTen"/></td>
       </tr>
       <tr>
+        <td class="label"/>
         <td><input type="submit" value='${uiLabelMap.CommonUpload}'/></td>
       </tr>
     </tbody>