svn commit: r524378 [1/2] - in /ofbiz/trunk/framework: images/webapp/images/ webtools/config/ webtools/webapp/webtools/entit
Locked
svn commit: r524378 [1/2] - in /ofbiz/trunk/framework: images/webapp/images/ webtools/config/ webtools/webapp/webtools/entit
 
|
Author: jacopoc
Date: Fri Mar 30 23:51:14 2007 New Revision: 524378 URL: http://svn.apache.org/viewvc?view=rev&rev=524378 Log: Applied patch from Adrian Crum (OFBIZ-858) with layout enhancements for the Webtools application: eliminated table-based layout; removed deprecated CSS styles; removed embedded HTML styles. Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/availableservices.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/jobs.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl ofbiz/trunk/framework/webtools/webapp/webtools/service/setServiceParameter.ftl ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatBinsHistory.ftl ofbiz/trunk/framework/webtools/webapp/webtools/stats/StatsSinceStart.ftl ofbiz/trunk/framework/webtools/widget/EntitySyncForms.xml ofbiz/trunk/framework/webtools/widget/LogScreens.xml ofbiz/trunk/framework/webtools/widget/WebToolsMenus.xml 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=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/maincss.css (original) +++ ofbiz/trunk/framework/images/webapp/images/maincss.css Fri Mar 30 23:51:14 2007 @@ -1239,6 +1239,7 @@ /* placeholder */ } +#masthead ul .opposed, #masthead ul .control-area { float: right; text-align: right; @@ -1489,10 +1490,8 @@ white-space: nowrap; } -.button-bar ul a:hover, -.tabContainer ul a:hover, -.button-bar a { -text-decoration: none; +.button-bar ul a:hover { +color: #0000ff; } /* ===== Button style decorator ===== */ @@ -1528,6 +1527,7 @@ .tabContainer ul a:hover { background-color: #000099; color: #ffffff; +text-decoration: none; } /* ===== Button style decorator ===== */ @@ -1556,6 +1556,7 @@ a.button-style-2:hover { background-color: #000099; color: #ffffff; +text-decoration: none; } /* ===== Button bar decorators ===== */ @@ -1600,6 +1601,7 @@ .tab-bar ul a:hover { background-color: #ffffff; color: #000099; +text-decoration: none; } .tab-bar ul .disabled { Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original) +++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Fri Mar 30 23:51:14 2007 @@ -87,8 +87,10 @@ WebtoolsEnable=Enable WebtoolsEngineName=Engine Name WebtoolsEntity=ENTITY +WebtoolsEntityCurrentValue=Entity Current Value WebtoolsEntityDataMaintenance=Entity Data Maintenance WebtoolsEntityDisplayed=Displayed +WebtoolsEntityEditValue=Edit Value WebtoolsEntityEngine=Entity Engine WebtoolsEntityEngineTools=Entity Engine Tools WebtoolsEntityName=Entity Name Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl Fri Mar 30 23:51:14 2007 @@ -20,7 +20,7 @@ <h3>${uiLabelMap.WebtoolsCheckUpdateDatabase}</h3> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="checkupdatetables"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="checkbox" name="checkPks" value="true" checked="checked"/> ${uiLabelMap.WebtoolsPks} <input type="checkbox" name="checkFks" value="true"/> ${uiLabelMap.WebtoolsFks} <input type="checkbox" name="checkFkIdx" value="true"/> ${uiLabelMap.WebtoolsFkIdx} @@ -30,86 +30,84 @@ </form> <p>${uiLabelMap.WebtoolsNote2}</p> <script language="JavaScript" type="text/javascript"> - <!-- function enableTablesRemove() { document.forms["TablesRemoveForm"].elements["TablesRemoveButton"].disabled=false; } - //--> </script> <h3>${uiLabelMap.WebtoolsRemoveAllTables}</h3> <form method="post" action="${encodeURLCheckDb}" name="TablesRemoveForm"> <input type="hidden" name="option" value="removetables"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonRemove}" name="TablesRemoveButton" disabled="disabled"/> <input type="button" value="${uiLabelMap.WebtoolsEnable}" onClick="enableTablesRemove();"/> </form> <form method="post" action="${encodeURLCheckDb}" name="TableRemoveForm"> <input type="hidden" name="option" value="removetable"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="20"/> - ${uiLabelMap.WebtoolsEntityName}: <input type="text" class="inputBox" name="entityName" value="${entityName}" size="20"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/> + ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/> <input type="submit" value="${uiLabelMap.CommonRemove}" name="TablesRemoveButton"/> </form> <h3>${uiLabelMap.WebtoolsCreateRemoveAllPrimaryKeys}</h3> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="createpks"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonCreate}"/> </form> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="removepks"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonRemove}"/> </form> <h3>${uiLabelMap.WebtoolsCreateRemovePrimaryKey}</h3> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="createpk"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="20"/> - ${uiLabelMap.WebtoolsEntityName}: <input type="text" class="inputBox" name="entityName" value="${entityName}" size="20"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/> + ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/> <input type="submit" value="${uiLabelMap.CommonCreate}"/> </form> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="removepk"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="20"/> - ${uiLabelMap.WebtoolsEntityName}: <input type="text" class="inputBox" name="entityName" value="${entityName}" size="20"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="20"/> + ${uiLabelMap.WebtoolsEntityName}: <input type="text" name="entityName" value="${entityName}" size="20"/> <input type="submit" value="${uiLabelMap.CommonRemove}"/> </form> <h3>${uiLabelMap.WebtoolsCreateRemoveAllDeclaredIndices}</h3> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="createidx"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonCreate}"/> </form> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="removeidx"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonRemove}"/> <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeyIndices}</h3> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="createfkidxs"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonCreate}"/> </form> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="removefkidxs"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonRemove}"/> </form> <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeys}</h3> <p>${uiLabelMap.WebtoolsNote3}</p> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="createfks"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonCreate}"/> </form> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="removefks"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonRemove}"/> </form> <h3>${uiLabelMap.WebtoolsUpdateCharacterSetAndCollate}</h3> <form method="post" action="${encodeURLCheckDb}"> <input type="hidden" name="option" value="updateCharsetCollate"/> - ${uiLabelMap.WebtoolsGroupName}: <input type="text" class="inputBox" name="groupName" value="${groupName}" size="40"/> + ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> </form> <hr/> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl Fri Mar 30 23:51:14 2007 @@ -17,28 +17,27 @@ under the License. --> -<div class="head1">${uiLabelMap.WebtoolsExportFromDataSource}</div> -<div class="tabletext"> +<h1>${uiLabelMap.WebtoolsExportFromDataSource}</h1> +<br /> +<p> ${uiLabelMap.WebtoolsMessage1}. ${uiLabelMap.WebtoolsMessage2}. ${uiLabelMap.WebtoolsMessage3}. -</div> -<hr/> - -<div class="head2">${uiLabelMap.WebtoolsResults}:</div> - +</p> <#if results?has_content> + <hr/> + <h2>${uiLabelMap.WebtoolsResults}:</h2> <#list results as result> - <div class="tabletext">${result}</div> + <p>${result}</p> </#list> </#if> <hr/> -<div class="head2">${uiLabelMap.WebtoolsExport}:</div> +<h2>${uiLabelMap.WebtoolsExport}:</h2> <form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>"> - <div class="tabletext">${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" class="inputBox" size="60" name="outpath" value="${outpath?if_exists}"></div> - <div class="tabletext">${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6" value="${txTimeout?default('7200')}" name="txTimeout"/></div> - <br/> + ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60" name="outpath" value="${outpath?if_exists}"><br /> + ${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6" value="${txTimeout?default('7200')}" name="txTimeout"/><br /> + <br /> <input type="submit" value="${uiLabelMap.WebtoolsExport}"> </form> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl Fri Mar 30 23:51:14 2007 @@ -17,33 +17,34 @@ under the License. --> -<div class="head1">${uiLabelMap.WebtoolsImportToDataSource}</div> -<div>${uiLabelMap.WebtoolsMessage5}.</div> +<h1>${uiLabelMap.WebtoolsImportToDataSource}</h1> +<br /> +<p>${uiLabelMap.WebtoolsMessage5}.</p> <hr/> - <div class="head2">${uiLabelMap.WebtoolsImport}:</div> +<h2>${uiLabelMap.WebtoolsImport}:</h2> +<br /> <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>"> - <div class="tabletext">${uiLabelMap.WebtoolsMessage6}:</div> - <div><input type="text" class="inputBox" size="60" name="fmfilename" value="${fmfilename?if_exists}"/></div> - <div class="tabletext">${uiLabelMap.WebtoolsMessage7}:</div> - <div><input type="text" class="inputBox" size="60" name="filename" value="${filename?if_exists}"/></div> - <div class="tabletext"><input type="checkbox" name="isUrl" <#if isUrl?exists>"checked"</#if>/>${uiLabelMap.WebtoolsIsURL}</div> - <div class="tabletext"><input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</div> - <div class="tabletext"><input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</div> - <div class="tabletext"><input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</div> - <div class="tabletext">${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/></div> - <div><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div> + ${uiLabelMap.WebtoolsMessage6}:<br /> + <input type="text" size="60" name="fmfilename" value="${fmfilename?if_exists}"/><br /> + ${uiLabelMap.WebtoolsMessage7}:<br /> + <input type="text" size="60" name="filename" value="${filename?if_exists}"/><br /> + <input type="checkbox" name="isUrl" <#if isUrl?exists>"checked"</#if>/>${uiLabelMap.WebtoolsIsURL}<br /> + <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br /> + <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br /> + <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br /> + ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br /> + <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div> </form> <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>"> - <div class="tabletext">${uiLabelMap.WebtoolsMessage4}:</div> - <textarea class="textAreaBox" rows="20" cols="85" name="fulltext">${fulltext?default("<entity-engine-xml> -</entity-engine-xml>")}</textarea> - <br/><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/> + ${uiLabelMap.WebtoolsMessage4}:<br /> + <textarea rows="20" cols="85" name="fulltext">${fulltext?default("<entity-engine-xml>\n</entity-engine-xml>")}</textarea> + <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/></div> </form> - <hr/> <#if messages?exists> + <hr/> <h3>${uiLabelMap.WebtoolsResults}:</h3> <#list messages as message> - <div class="tabletext">${message}</div> + <p>${message}</p> </#list> </#if> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl Fri Mar 30 23:51:14 2007 @@ -17,26 +17,27 @@ under the License. --> -<div class="head1">${uiLabelMap.WebtoolsImportToDataSource}</div> -<div class="tabletext">${uiLabelMap.WebtoolsMessage5}.</div> +<h1>${uiLabelMap.WebtoolsImportToDataSource}</h1> +<br /> +<p>${uiLabelMap.WebtoolsMessage5}.</p> <hr/> - <div class="head2">${uiLabelMap.WebtoolsImport}:</div> +<h2>${uiLabelMap.WebtoolsImport}:</h2> <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>"> - <div class="tabletext">${uiLabelMap.WebtoolsAbsolutePath}:</div> - <div><input type="text" class="inputBox" size="60" name="path" value="${path?if_exists}"/></div> - <div class="tabletext"><input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</div> - <div class="tabletext"><input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</div> - <div class="tabletext"><input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</div> - <div class="tabletext"><input type="checkbox" name="deleteFiles" <#if (deleteFiles?exists)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}</div> - <div class="tabletext">${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/></div> - <div class="tabletext">${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/></div> - <div><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div> + ${uiLabelMap.WebtoolsAbsolutePath}:<br /> + <input type="text" size="60" name="path" value="${path?if_exists}"/><br /> + <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br /> + <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br /> + <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br /> + <input type="checkbox" name="deleteFiles" <#if (deleteFiles?exists)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}<br /> + ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br /> + ${uiLabelMap.WebtoolsPause}:<input type="text" size="6" value="${filePauseStr?default("0")}" name="filePause"/><br /> + <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div> </form> - <hr/> <#if messages?exists> - <div class="head1">${uiLabelMap.WebtoolsResults}:</div> + <hr/> + <h1>${uiLabelMap.WebtoolsResults}:</h1> <#list messages as message> - <div class="tabletext">${message}</div> + <p>${message}</p> </#list> </#if> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl Fri Mar 30 23:51:14 2007 @@ -17,24 +17,25 @@ under the License. --> -<div class="head1">${uiLabelMap.WebtoolsImportToDataSource}</div> -<div>${uiLabelMap.WebtoolsMessage5}.</div> +<h1>${uiLabelMap.WebtoolsImportToDataSource}</h1> +<br /> +<p>${uiLabelMap.WebtoolsMessage5}.</p> <hr/> - <div class="head2">${uiLabelMap.WebtoolsImport}:</div> + <h2>${uiLabelMap.WebtoolsImport}:</h2> <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>"> - <div class="tabletext">Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):</div> - <div><input type="text" class="inputBox" size="60" name="readers" value="${readers?default("seed")}"/></div> - <div class="tabletext"><input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}</div> - <div class="tabletext"><input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</div> - <div class="tabletext"><input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</div> - <div class="tabletext">${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/></div> - <div><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div> + Enter Readers (comma separated, no spaces; from entityengine.xml and ofbiz-component.xml files; common ones include seed,ext,demo):</div> + <input type="text" size="60" name="readers" value="${readers?default("seed")}"/><br /> + <input type="checkbox" name="mostlyInserts" <#if mostlyInserts?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMostlyInserts}<br /> + <input type="checkbox" name="maintainTimeStamps" <#if keepStamps?exists>"checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}<br /> + <input type="checkbox" name="createDummyFks" <#if createDummyFks?exists>"checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}<br /> + ${uiLabelMap.WebtoolsTimeoutSeconds}:<input type="text" size="6" value="${txTimeoutStr?default("7200")}" name="txTimeout"/><br /> + <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div> </form> - <hr/> <#if messages?exists> + <hr/> <h3>${uiLabelMap.WebtoolsResults}:</h3> <#list messages as message> - <div class="tabletext">${message}</div> + <p>${message}</p> </#list> </#if> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Fri Mar 30 23:51:14 2007 @@ -51,13 +51,12 @@ <#if right_col> <td> </td><td> </td></tr> <#assign right_col = false> - <#if alt_row> - <#assign alt_row = false> - <#else> - <#assign alt_row = true> - </#if> + <#assign alt_row = !alt_row> + </#if> + <#if firstChar != "*"> + <tr<#if alt_row> class="alternate-row"</#if>><td colspan="4"> </td></tr> + <#assign alt_row = !alt_row> </#if> - <#if firstChar != "*"><tr class="header-row"><td colspan="4"> </td></tr></#if> <#assign firstChar = entity.entityName?substring(0, 1)> <#assign anchor="id=\"Entity_${firstChar}\""> </#if> @@ -87,15 +86,9 @@ </td> <#if right_col> </tr> - <#if alt_row> - <#assign alt_row = false> - <#else> - <#assign alt_row = true> - </#if> - <#assign right_col = false> - <#else> - <#assign right_col = true> + <#assign alt_row = !alt_row> </#if> + <#assign right_col = !right_col> </#list> <#if right_col> <td> </td><td> </td></tr> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntitySQLProcessor.ftl Fri Mar 30 23:51:14 2007 @@ -81,11 +81,7 @@ <td>${field?if_exists}</td> </#list> </tr> - <#if alt_row> - <#assign alt_row = false> - <#else> - <#assign alt_row = true> - </#if> + <#assign alt_row = !alt_row> </#list> </#if> </table> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/FindGeneric.ftl Fri Mar 30 23:51:14 2007 @@ -48,77 +48,68 @@ <td>${field.javaType}, ${field.sqlType}</td> <td><input type="text" name="${field.name}" value="${field.param}" size="40"></td> </tr> - <#if alt_row> - <#assign alt_row = false> - <#else> - <#assign alt_row = true> - </#if> + <#assign alt_row = !alt_row> </#list> <tr> - <td align="center" colspan="4"><input type="submit" value="${uiLabelMap.CommonFind}"></td> + <td colspan="3"> </td> + <td><input type="submit" value="${uiLabelMap.CommonFind}"></td> </tr> </table> </form> <br /> -<div class="button-bar"> + <#if hasCreatePermission == 'Y'> - <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonCreateNew} ${entityName}</a> + <div class="button-bar"> + <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonCreateNew} ${entityName}</a> + </div> </#if> -</div> -<table border="0" width="100%" cellpadding="2"> - <#if (arraySize > 0)> - <tr> - <td align="left"> - <span class="tableheadtext"> - <#if (viewIndex > 0)> - <a href='<@ofbizUrl>FindGeneric?${curFindString}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndexPrevious}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonPrevious}</a> | - </#if> - <#if (arraySize > 0)> - ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${arraySize} - </#if> - <#if (arraySize > highIndex)> - | <a href='<@ofbizUrl>FindGeneric?${curFindString}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndexNext}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonNext}</a> - </#if> - </span> - </td> - </tr> - </#if> -</table> -<table border="1" cellpadding="2" cellspacing="0" class="calendarTable"> - <tr class="viewOneTR1"> + +<#macro tableNav> + <div class="button-bar"> + <ul> + <#if (viewIndex > 0)> + <li><a href='<@ofbizUrl>FindGeneric?${curFindString}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndexPrevious}</@ofbizUrl>' class="nav-previous">${uiLabelMap.CommonPrevious}</a></li> + <li>|</li> + </#if> + <#if (arraySize > 0)> + <li>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${arraySize}</li> + </#if> + <#if (arraySize > highIndex)> + <li>|</li> + <li><a href='<@ofbizUrl>FindGeneric?${curFindString}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndexNext}</@ofbizUrl>' class="nav-next">${uiLabelMap.CommonNext}</a></li> + </#if> + </ul> + <br class="clear"/> + </div> +</#macro> +<#if (arraySize > 0)> + <@tableNav/> +</#if> + +<table class="basic-table light-grid hover-bar" cellspacing="0"> + <tr class="header-row"> <td> </td> - <#if hasDeletePermission == 'Y'> - <td> </td> - </#if> <#list fieldList as field> - <td nowrap><span class="tableheadtext">${field.name}</span></td> + <td>${field.name}</td> </#list> </tr> <#if resultPartialList?has_content> - <#assign rowClass = 'viewManyTR1'> + <#assign alt_row = false> <#list records as record> - <tr class='${rowClass}'> - <td> - <a href='<@ofbizUrl>ViewGeneric?${record.findString}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonView}</a> - </td> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="button-col"> + <a href='<@ofbizUrl>ViewGeneric?${record.findString}</@ofbizUrl>'>${uiLabelMap.CommonView}</a> <#if hasDeletePermission == 'Y'> - <td> - <a href='<@ofbizUrl>UpdateGeneric?${record.findString}&UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonDelete}</a> - </td> + <a href='<@ofbizUrl>UpdateGeneric?${record.findString}&UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>'>${uiLabelMap.CommonDelete}</a> </#if> + </td> <#list record.fields as field> <td> - <div class="tabletext"> - ${field} - </div> + ${field} </td> </#list> </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> + <#assign alt_row = !alt_row> </#list> <#else> <tr> @@ -128,27 +119,13 @@ </tr> </#if> </table> -<table border="0" width="100%" cellpadding="2"> - <#if (arraySize > 0)> - <tr> - <td align="left"> - <span class="tableheadtext"> - <#if (viewIndex > 0)> - <a href='<@ofbizUrl>FindGeneric?${curFindString}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndexPrevious}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonPrevious}</a> | - </#if> - <#if (arraySize > 0)> - ${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${arraySize} - </#if> - <#if (arraySize > highIndex)> - | <a href='<@ofbizUrl>FindGeneric?${curFindString}&VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndexNext}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonNext}</a> - </#if> - </span> - </td> - </tr> - </#if> -</table> + +<#if (arraySize > 0)> + <@tableNav/> +</#if> + <#if hasCreatePermission == 'Y'> - <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonCreateNew} ${entityName}</a> + <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonCreateNew} ${entityName}</a> <#else> - <div class="head2">${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</div> + <h2>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}.</h2> </#if> 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=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewGeneric.ftl Fri Mar 30 23:51:14 2007 @@ -16,273 +16,233 @@ specific language governing permissions and limitations under the License. --> -<STYLE> - .topouter { overflow: hidden; border-style: none; height: 900px;} - .topcontainer { POSITION: absolute; VISIBILITY: visible; width: 90%; border-style: none; } - .topcontainerhidden { POSITION: absolute; VISIBILITY: hidden; } -</STYLE> -<script language="JavaScript" type="text/javascript"> - var numTabs=${relSize}; - function ShowTab(lname) { - for(inc=1; inc <= numTabs; inc++) { - document.getElementById('area' + inc).className = (lname == 'tab' + inc) ? 'topcontainer' : 'topcontainerhidden'; - } - } -</script> -<div class="topouter"> - <div class="head1">${uiLabelMap.WebtoolsViewValue}</div> - <div class="head2">${uiLabelMap.WebtoolsForEntity}: ${entityName}</div> - <div class="head2">${uiLabelMap.WebtoolsWithPk}: ${findByPk}</div> - <div> </div> - <div> - <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="buttontext">${uiLabelMap.WebtoolsBackToFindScreen}</a> - </div> - <div> - <#if hasCreatePermission> - <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}</@ofbizUrl>' class="buttontext">${uiLabelMap.CommonCreateNew}</a> - <a href='javascript:ShowTab("tab2")' class="buttontext">${uiLabelMap.CommonEdit}</a> - </#if> - <#if value?has_content> - <#if hasDeletePermission> - <a href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>' class="buttontext">${uiLabelMap.WebtoolsDeleteThisValue}</a> - </#if> - </#if> - </div> - <div> </div> + +<#assign enableEdit = parameters.enableEdit?default("false")> + +<h1>${uiLabelMap.WebtoolsViewValue}</h1> +<br /> +<h2>${uiLabelMap.WebtoolsForEntity}: ${entityName}</h2> +<h2>${uiLabelMap.WebtoolsWithPk}: ${findByPk}</h2> +<br /> + +<div class="button-bar"> + <a href='<@ofbizUrl>FindGeneric?entityName=${entityName}&find=true&VIEW_SIZE=50&VIEW_INDEX=0</@ofbizUrl>' class="smallSubmit">${uiLabelMap.WebtoolsBackToFindScreen}</a> + <#if enableEdit = "false"> + <#if hasCreatePermission> + <a href='<@ofbizUrl>ViewGeneric?entityName=${entityName}&enableEdit=true</@ofbizUrl>' class="smallSubmit">${uiLabelMap.CommonCreateNew}</a> + <a href=<@ofbizUrl>ViewGeneric?${curFindString}&enableEdit=true</@ofbizUrl> class="smallSubmit">${uiLabelMap.CommonEdit}</a> + </#if> <#if value?has_content> - <form name="relationForm"> - <table cellpadding='0' cellspacing='0'> - <tr> - <td class="tableheadtext">${uiLabelMap.CommonView}:</td> - </tr> - <tr> + <#if hasDeletePermission> + <a href='<@ofbizUrl>UpdateGeneric?UPDATE_MODE=DELETE&${curFindString}</@ofbizUrl>' class="smallSubmit">${uiLabelMap.WebtoolsDeleteThisValue}</a> + </#if> + </#if> + </#if> +</div> +<br /> + +<#if value?has_content> + <form name="relationForm" action='<@ofbizUrl>ViewGeneric?entityName=${entityName}&contactMechId=${parameters.contactMechId?if_exists}</@ofbizUrl>' method="POST"> + <p>${uiLabelMap.CommonView}:</p> + <select name="viewRelated" onchange='javascript:document.relationForm.submit();'> + <option value="void">${entityName}</option> + <#list relations as relation> + <option value="${relation.tab}"<#if relation.tab = parameters.viewRelated?default("void")> selected="selected"</#if>>${relation.title}${relation.relEntityName} (${relation.type})</option> + </#list> + </select> + </form> + <br /> +</#if> + +<div class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsEntityCurrentValue}</h3> + </div> + <#if value?has_content> + <#assign alt_row = false> + <table class="basic-table" cellspacing="0"> + <#list fields as field> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="label">${field.name}</td> + <td>${field.value}</td> + </tr> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.WebtoolsSpecifiedEntity1} ${entityName} ${uiLabelMap.WebtoolsSpecifiedEntity2}. + </#if> +</div> + +<#if enableEdit = "true"> + <#if hasUpdatePermission || hasCreatePermission> + <br /> + <#assign alt_row = false> + <div id="area2" class="screenlet"> + <div class="screenlet-title-bar"> + <h3>${uiLabelMap.WebtoolsEntityEditValue}</h3> + </div> + <#if pkNotFound> + <p>${uiLabelMap.WebtoolsEntityName} ${entityName} ${uiLabelMap.WebtoolsWithPk} ${findByPk} ${uiLabelMap.WebtoolsSpecifiedEntity2}.</p> + </#if> + <form action='<@ofbizUrl>UpdateGeneric?entityName=${entityName}</@ofbizUrl>' method="POST" name="updateForm"> + <#assign showFields = true> + <#assign alt_row = false> + <table class="basic-table" cellspacing="0"> + <#if value?has_content> + <#if hasUpdatePermission> + <#if newFieldPkList?has_content> + <input type="hidden" name="UPDATE_MODE" value="UPDATE"/> + <#list newFieldPkList as field> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="label">${field.name}</td> <td> - <select name="relations" onchange='javascript:ShowTab(this.options[this.selectedIndex].value)' class="selectBox"> - <option value="tab1"><b>${entityName}</b></option> - <#list relations as relation> - <option value="${relation.tab}">${relation.title}${relation.relEntityName} (${relation.type})</option> - </#list> - </select> + <input type="hidden" name="${field.name}" value="${field.value}"/> + ${field.value} </td> - </tr> - </table> - </form> - </#if> - <#assign rowClass = "viewOneTR1"> - <div id='area1' class='topcontainer' width="1%"> - <table border="1" cellpadding="2" cellspacing="0" class="calendarTable"> - <#if value?has_content> - <#assign rowClass = 'viewManyTR1'> - <#list fields as field> - <tr class="${rowClass}"> - <td valign="top"><div class="tabletext"><b>${field.name}</b></div></td> - <td valign="top"> - <div class="tabletext"> - ${field.value} - - </div> + </tr> + <#assign alt_row = !alt_row> + </#list> + </#if> + <#else> + ${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18} + <#assign showFields = false> + </#if> + <#else> + <#if hasCreatePermission> + <#if newFieldPkList?has_content> + <p>${uiLabelMap.WebtoolsMessage15} ${entityName} ${uiLabelMap.WebtoolsMessage16}.</p> + <input type="hidden" name="UPDATE_MODE" value="CREATE"/> + <#list newFieldPkList as field> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="label">${field.name}</td> + <td> + <#if field.fieldType == 'DateTime'> + DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text" name="${field.name}" size="24" value="${field.value}"> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <#elseif field.fieldType == 'Date'> + Date(YYYY-MM-DD):<input type="text" name="${field.name}" size="11" value="${field.value}"> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <#elseif field.fieldType == 'Time'> + Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Integer'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Long'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Double'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Float'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'StringOneRow'> + <input type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'String'> + <input type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Textarea'> + <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea> + </#if> </td> + </tr> + <#assign alt_row = !alt_row> + </#list> + </#if> + <#else> + <p>${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18}</p> + <#assign showFields = false> + </#if> + </#if> + <#if showFields> + <#if newFieldNoPkList?has_content> + <#assign alt_row = false> + <#list newFieldNoPkList as field> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="label">${field.name}</td> + <td> + <#if field.fieldType == 'DateTime'> + DateTime(YYYY-MM-DD HH:mm:SS.sss):<input type="text" name="${field.name}" size="24" value="${field.value}"> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <#elseif field.fieldType == 'Date'> + Date(YYYY-MM-DD):<input type="text" name="${field.name}" size="11" value="${field.value}"> + <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> + <#elseif field.fieldType == 'Time'> + Time(HH:mm:SS.sss):<input type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Integer'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Long'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Double'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Float'> + <input type="text" size="20" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'StringOneRow'> + <input type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'String'> + <input type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> + <#elseif field.fieldType == 'Textarea'> + <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea> + </#if> + </td> </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> - <#else> - <tr class="${rowClass}"> - <td> - <h3>${uiLabelMap.WebtoolsSpecifiedEntity1} ${entityName} ${uiLabelMap.WebtoolsSpecifiedEntity2}.</h3> - </td> - </tr> - </#if> + <#assign alt_row = !alt_row> + </#list> + <#if value?has_content> + <#assign button = "${uiLabelMap.CommonUpdate}"> + <#else> + <#assign button = "${uiLabelMap.CommonCreate}"> + </#if> + <tr<#if alt_row> class="alternate-row"</#if>> + <td> </td> + <td> + <input type="submit" name="Update" value="${button}"> + <a href=<@ofbizUrl>ViewGeneric?${curFindString}</@ofbizUrl> class="smallSubmit">${uiLabelMap.CommonCancel}</a> + </td> + </tr> + </#if> + </#if> </table> + </form> </div> - <#if hasUpdatePermission || hasCreatePermission> - <div id='area2' class='topcontainerhidden' width="1%"> - <#if pkNotFound> - <div class="tabletext">${uiLabelMap.WebtoolsEntityName} ${entityName} ${uiLabelMap.WebtoolsWithPk} ${findByPk} ${uiLabelMap.WebtoolsSpecifiedEntity2}.</div> - </#if> - <form action='<@ofbizUrl>UpdateGeneric?entityName=${entityName}</@ofbizUrl>' method="POST" name="updateForm"> - <table border="1" cellpadding="2" cellspacing="0" class="calendarTable"> - <#assign showFields = true> - <#assign rowClass = 'viewManyTR1'> - <#if value?has_content> - <#if hasUpdatePermission> - <#if newFieldPkList?has_content> - <input type="hidden" name="UPDATE_MODE" value="UPDATE"/> - <#assign rowClass = 'viewManyTR1'> - <#list newFieldPkList as field> - <tr class="${rowClass}"> - <td valign="top"><div class="tabletext"><b>${field.name}</b></div></td> - <td valign="top"> - <div class="tabletext"> - <input type="hidden" name="${field.name}" value="${field.value}"> - ${field.value} - - </div> - </td> - </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> - </#if> - <#else> - ${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18} - <#assign showFields = false> - </#if> + </#if> +</#if> + +<#if relationFieldList?has_content> + <#assign viewRelated = parameters.viewRelated?default("void")> + <#list relationFieldList as relation> + <#assign tabName = "tab" + relation.relIndex> + <#if tabName = viewRelated> + <br /> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <h3>${relation.title} ${uiLabelMap.WebtoolsRelatedEntity}: ${relation.relatedTable}</h3> + <#if relation.valueRelated?has_content> + <li><a href='<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}</@ofbizUrl>'>${uiLabelMap.CommonView}</a></li> <#else> - <#if hasCreatePermission> - <#if newFieldPkList?has_content> - <div class="tabletext">${uiLabelMap.WebtoolsMessage15} ${entityName} ${uiLabelMap.WebtoolsMessage16}.</div> - <input type="hidden" name="UPDATE_MODE" value="CREATE"/> - <#list newFieldPkList as field> - <tr class="${rowClass}"> - <td valign="top"><div class="tabletext"><b>${field.name}</b></div></td> - <td valign="top"> - <div class="tabletext"> - <#if field.fieldType == 'DateTime'> - DateTime(YYYY-MM-DD HH:mm:SS.sss):<input class='editInputBox' type="text" name="${field.name}" size="24" value="${field.value}"> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> - <#elseif field.fieldType == 'Date'> - Date(YYYY-MM-DD):<input class='editInputBox' type="text" name="${field.name}" size="11" value="${field.value}"> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> - <#elseif field.fieldType == 'Time'> - Time(HH:mm:SS.sss):<input class='editInputBox' type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Integer'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Long'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Double'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Float'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'StringOneRow'> - <input class='editInputBox' type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'String'> - <input class='editInputBox' type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Textarea'> - <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea> - </#if> - - </div> - </td> - </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> - </#if> - <#else> - ${uiLabelMap.WebtoolsMesseage17} ${entityName} ${plainTableName} ${uiLabelMap.WebtoolsMesseage18} - <#assign showFields = false> - </#if> - </#if> - <#if showFields> - <#if newFieldNoPkList?has_content> - <#list newFieldNoPkList as field> - <tr class="${rowClass}"> - <td valign="top"><div class="tabletext"><b>${field.name}</b></div></td> - <td valign="top"> - <div class="tabletext"> - <#if field.fieldType == 'DateTime'> - DateTime(YYYY-MM-DD HH:mm:SS.sss):<input class='editInputBox' type="text" name="${field.name}" size="24" value="${field.value}"> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> - <#elseif field.fieldType == 'Date'> - Date(YYYY-MM-DD):<input class='editInputBox' type="text" name="${field.name}" size="11" value="${field.value}"> - <a href="javascript:call_cal(document.updateForm.${field.name}, '${field.value}');" onmouseover="window.status='Date Picker';return true;" onmouseout="window.status='';return true;"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> - <#elseif field.fieldType == 'Time'> - Time(HH:mm:SS.sss):<input class='editInputBox' type="text" size="6" maxlength="10" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Integer'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Long'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Double'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Float'> - <input class='editInputBox' type="text" size="20" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'StringOneRow'> - <input class='editInputBox' type="text" size="${field.stringLength}" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'String'> - <input class='editInputBox' type="text" size="80" maxlength="${field.stringLength}" name="${field.name}" value="${field.value}"> - <#elseif field.fieldType == 'Textarea'> - <textarea cols="60" rows="3" maxlength="${field.stringLength}" name="${field.name}">${field.value}</textarea> - </#if> - - </div> - </td> - </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> - <#if value?has_content> - <#assign button = "${uiLabelMap.CommonUpdate}"> - <#else> - <#assign button = "${uiLabelMap.CommonCreate}"> - </#if> - <tr class="${rowClass}" align="center"> - <td colspan="2"><input type="submit" name="Update" value="${button}"></td> - </tr> - </#if> - </#if> - </table> - </form> + <#if hasAllCreate || relCreate> + <li><a href='<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}&enableEdit=true</@ofbizUrl>'>${uiLabelMap.CommonCreate}</a></li> + </#if> + </#if> + </ul> + <br class="clear"/> </div> + <#if relation.valueRelated?has_content> + <table class="basic-table" cellspacing="0"> + <#assign alt_row = false> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="label">${uiLabelMap.WebtoolsPk}</td> + <td>${relation.valueRelatedPk}</td> + </tr> + <#list relation.relatedFieldsList as relatedField> + <tr<#if alt_row> class="alternate-row"</#if>> + <td class="label">${relatedField.name}</td> + <td>${relatedField.value}</td> + </tr> + <#assign alt_row = !alt_row> + </#list> + </table> + <#else> + ${uiLabelMap.WebtoolsSpecifiedEntity1} ${relation.relatedTable} ${uiLabelMap.WebtoolsSpecifiedEntity2}. + </#if> + </div> </#if> - <#if relationFieldList?has_content> - <#list relationFieldList as relation> - <div id="area${relation.relIndex}" class='topcontainerhidden' width="100%"> - <div class='areaheader'> - <b>${relation.title}</b> ${uiLabelMap.WebtoolsRelatedEntity}: <b>${relation.relatedTable}</b> - ${uiLabelMap.WebtoolsWithPk}: <#if relation.valueRelated?has_content>${relation.valueRelatedPk?if_exists}<#else>"${uiLabelMap.WebtoolsSpecifiedEntity1} ${uiLabelMap.WebtoolsSpecifiedEntity2}!"</#if> - </div> - <#if relation.valueRelated?has_content> - <a href='<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonView} ${relation.relatedTable}]</a> - <#else> - <#if hasAllCreate || relCreate> - <a href='<@ofbizUrl>ViewGeneric?${relation.encodeRelatedEntityFindString}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonCreate} ${relation.relatedTable}]</a> - </#if> - </#if> - <div style='width: 100%; overflow: visible; border-style: none;'> - <table border="1" cellpadding="2" cellspacing="0" class="calendarTable"> - <#assign rowClass = 'viewManyTR1'> - <#if relation.valueRelated?has_content> - <#if relation.relatedFieldsList?has_content> - <#list relation.relatedFieldsList as relatedField> - <tr class="${rowClass}"> - <td valign="top"><div class="tabletext"><b>${relatedField.name}</b></div></td> - <td valign="top"> - <div class="tabletext"> - ${relatedField.value} - </div> - </td> - </tr> - <#if rowClass == 'viewManyTR1'> - <#assign rowClass = 'viewManyTR2'> - <#else> - <#assign rowClass = 'viewManyTR1'> - </#if> - </#list> - </#if> - <#else> - <tr class="${rowClass}"><td><b>${uiLabelMap.WebtoolsSpecifiedEntity1} ${relation.relatedTable} ${uiLabelMap.WebtoolsSpecifiedEntity2}.</b></td></tr> - </#if> - </table> - </div> - </div> - </#list> - </#if> -</div> -<#if (hasUpdatePermission || hasCreatePermission) && !useValue> - <script language="JavaScript" type="text/javascript"> - ShowTab("tab2"); - </script> + </#list> </#if> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl?view=diff&rev=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ViewRelations.ftl Fri Mar 30 23:51:14 2007 @@ -46,11 +46,7 @@ </#list> </td> </tr> - <#if alt_row> - <#assign alt_row = false> - <#else> - <#assign alt_row = true> - </#if> + <#assign alt_row = !alt_row> </#list> </table> <#else> 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=524378&r1=524377&r2=524378 ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/period/EditCustomTimePeriod.ftl Fri Mar 30 23:51:14 2007 @@ -179,7 +179,7 @@ </#list> </select> </td> - <td><input type="text" class='inputBox' size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId?if_exists}"></td> + <td><input type="text" size='12' name="organizationPartyId" value="${customTimePeriod.organizationPartyId?if_exists}"></td> <td> <select name="periodTypeId"> <#list periodTypes as periodType> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |