Author: mbrohl
Date: Sat Feb 24 16:23:19 2018
New Revision: 1825261
URL: http://svn.apache.org/viewvc?rev=1825261&view=rev
Log:
Improved: Improve layout and structure of forms.
(OFBIZ-10221)
This includes the webtools templates.
Thanks Julian Leichert for reporting and providing the patch.
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityExportAll.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImport.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportDir.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportReaders.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl
ofbiz/ofbiz-framework/trunk/framework/webtools/template/log/FetchLogs.ftl
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/config/WebtoolsUiLabels.xml
Sat Feb 24 16:23:19 2018
@@ -5971,4 +5971,16 @@
<value xml:lang="zh">å建ä¸ä¸ªå®ä½ ${entityName} ï¼è¾å
¥å¼ï¼ç¶åç¹å»æ°å»º.</value>
<value xml:lang="zh-TW">æ°å»ºä¸åè³æå¯¦é« ${entityName} :輸å
¥å¼,ç¶å¾é»ææ°å»º.</value>
</property>
+ <property key="WebtoolsReaderImportNotice">
+ <value xml:lang="de">Eingabe Readers (Komma getrennt,keine
Leerzeichen; aus entityengine.xml und ofbiz-component.xml Dateien; common ones
include seed,ext,demo)</value>
+ <value xml:lang="en">Enter Readers (comma separated, no spaces; from
entityengine.xml and ofbiz-component.xml files; common ones include
seed,ext,demo)</value>
+ </property>
+ <property key="WebtoolsSearchLocName">
+ <value xml:lang="de">Ort/Namen Suchen</value>
+ <value xml:lang="en">Search Names/Locations</value>
+ </property>
+ <property key="WebtoolsType">
+ <value xml:lang="de">Typ</value>
+ <value xml:lang="en">Type</value>
+ </property>
</resource>
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/artifactinfo/ArtifactInfo.ftl
Sat Feb 24 16:23:19 2018
@@ -33,7 +33,14 @@ under the License.
<#-- add form here to specify artifact info name. -->
<div>
<form name="ArtifactInfoByName" method="post"
action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form">
- Search Names/Locations: <input type="text" name="name"
value="${parameters.name!}" size="40"/>
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsSearchLocName}</label>
+ </td>
+ <td>
+ <input type="text" name="name" value="${parameters.name!}"
size="40"/>
<select name="type">
<option></option>
<option>entity</option>
@@ -43,25 +50,62 @@ under the License.
<option>request</option>
<option>view</option>
</select>
- <input type="hidden" name="findType" value="search"/>
- <input type="submit" name="submitButton" value="Find"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label"></td>
+ <td colspan="4">
+ <input type="hidden" name="findType" value="search"/>
+ <input type="submit" name="submitButton" value="Find"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
</div>
<div>
<form name="ArtifactInfoByNameAndType" method="post"
action="<@ofbizUrl>ArtifactInfo</@ofbizUrl>" class="basic-form">
- <div>Name: <input type="text" name="name" value="${parameters.name!}"
size="40"/></div>
- <div>Location: <input type="text" name="location"
value="${parameters.location!}" size="60"/></div>
- <div>Type:
- <select name="type">
- <option>entity</option>
- <option>service</option>
- <option>form</option>
- <option>screen</option>
- <option>request</option>
- <option>view</option>
- </select>
- <input type="submit" name="submitButton" value="Lookup"/>
- </div>
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label>Name</label>
+ </td>
+ <td>
+ <input type="text" name="name" value="${parameters.name!}"
size="40"/></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsLocation}</label>
+ </td>
+ <td>
+ <input type="text" name="location"
value="${parameters.location!}" size="60"/></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsType}</label>
+ </td>
+ <td>
+ <select name="type">
+ <option>entity</option>
+ <option>service</option>
+ <option>form</option>
+ <option>screen</option>
+ <option>request</option>
+ <option>view</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label"></td>
+ <td colspan="4">
+ <input type="submit" name="submitButton" value="Lookup"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
</div>
@@ -126,7 +170,7 @@ under the License.
</#list>
</div>
- <#elseif "service" == artifactInfo.getType()/>
+ <#elseif "service" == artifactInfo.getType() >
<h2>Service Info</h2>
<div> Description: ${artifactInfo.modelService.description}</div>
<div> Run (${artifactInfo.modelService.engineName}):
${artifactInfo.modelService.location} ::
${artifactInfo.modelService.invoke}</div>
@@ -203,7 +247,7 @@ under the License.
</#list>
</div>
- <#elseif "form" == artifactInfo.getType()/>
+ <#elseif "form" == artifactInfo.getType() >
<div>
<h2>Form Extended by This Form</h2>
<#if artifactInfo.getFormThisFormExtends()??>
@@ -252,7 +296,7 @@ under the License.
</#list>
</div>
- <#elseif "screen" == artifactInfo.getType()/>
+ <#elseif "screen" == artifactInfo.getType() >
<div>
<h2>Entities Used in This Screen</h2>
<#list artifactInfo.getEntitiesUsedInScreen()! as entityArtifactInfo>
@@ -302,7 +346,7 @@ under the License.
</#list>
</div>
- <#elseif "request" == artifactInfo.getType()/>
+ <#elseif "request" == artifactInfo.getType() >
<#if artifactInfo.getServiceCalledByRequestEvent()??>
<div>
<h2>Service Called by Request Event</h2>
@@ -351,7 +395,7 @@ under the License.
</#list>
</div>
- <#elseif "view" == artifactInfo.getType()/>
+ <#elseif "view" == artifactInfo.getType() >
<div>
<h2>Requests That This View is a Responses To</h2>
<#list artifactInfo.getRequestsThatThisViewIsResponseTo()! as
controllerRequestArtifactInfo>
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/datafile/ViewDataFile.ftl
Sat Feb 24 16:23:19 2018
@@ -19,12 +19,12 @@ under the License.
<p>${uiLabelMap.WebtoolsDataFileMessage1}.</p>
<br />
<#if security.hasPermission("DATAFILE_MAINT", session)>
- <form method="post" action="<@ofbizUrl>viewdatafile</@ofbizUrl>">
+ <form class="basic-form" method="post"
action="<@ofbizUrl>viewdatafile</@ofbizUrl>">
<table class="basic-table" cellspacing="0">
<tr>
<td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
- <td><input name="DEFINITION_LOCATION" type="text" size="60"
value="${parameters.DEFINITION_LOCATION!}" /></td>
- <td><label><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox"
name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content>
checked="checked"</#if> /></label></td>
+ <td><input name="DEFINITION_LOCATION" type="text" size="60"
value="${parameters.DEFINITION_LOCATION!}" />
+ <input type="checkbox" name="DEFINITION_IS_URL"<#if
parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if> /><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td>
@@ -41,27 +41,23 @@ under the License.
<input name="DEFINITION_NAME" type="text" size="30"
value="${definitionName!}" />
</#if>
</td>
- <td> </td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
- <td><input name="DATAFILE_LOCATION" type="text" size="60"
value="${parameters.DATAFILE_LOCATION!}" /></td>
- <td><label><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox"
id="datafile_is_url" name="DATAFILE_IS_URL"<#if
parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if> /></label></td>
+ <td><input name="DATAFILE_LOCATION" type="text" size="60"
value="${parameters.DATAFILE_LOCATION!}" />
+ <input type="checkbox" id="datafile_is_url"
name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content>
checked="checked"</#if> /><span
class="label">${uiLabelMap.WebtoolsDataIsUrl}</span></td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>
<td><input name="DATAFILE_SAVE" type="text" size="60"
value="${parameters.DATAFILE_SAVE!}"/></td>
- <td> </td>
</tr>
<tr>
<td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td>
<td><input name="ENTITYXML_FILE_SAVE" type="text" size="60"
value="${parameters.ENTITYXML_FILE_SAVE!}" /></td>
- <td> </td>
</tr>
<tr>
- <td> </td>
- <td><input type="submit" value="${uiLabelMap.CommonRun}" /></td>
- <td> </td>
+ <td class="label"></td>
+ <td colspan="4"><input type="submit"
value="${uiLabelMap.CommonRun}" /></td>
</tr>
</table>
</form>
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/CheckDb.ftl
Sat Feb 24 16:23:19 2018
@@ -1,3 +1,5 @@
+
+
<#--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -6,9 +8,7 @@ regarding copyright ownership. The ASF
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
http://www.apache.org/licenses/LICENSE-2.0
-
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -16,105 +16,317 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
- <h3>${uiLabelMap.WebtoolsCheckUpdateDatabase}</h3>
- <form method="post" action="${encodeURLCheckDb}">
- <input type="hidden" name="option" value="checkupdatetables"/>
- ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName"
value="${groupName}" size="40"/>
- <label> <input type="checkbox" name="checkPks" value="true"
checked="checked"/> ${uiLabelMap.WebtoolsPks}</label>
- <label> <input type="checkbox" name="checkFks"
value="true"/> ${uiLabelMap.WebtoolsFks}</label>
- <label> <input type="checkbox" name="checkFkIdx"
value="true"/> ${uiLabelMap.WebtoolsFkIdx}</label>
- <label> <input type="checkbox" name="addMissing"
value="true"/> ${uiLabelMap.WebtoolsAddMissing}</label>
- <label> <input type="checkbox" name="repair"
value="true"/> ${uiLabelMap.WebtoolsRepairColumnSizes}</label>
- <input type="submit"
value="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
- </form>
- <p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</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" 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" 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" 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" 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" 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" 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" 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" name="groupName"
value="${groupName}" size="40"/>
- <input type="submit" value="${uiLabelMap.CommonRemove}"/>
- </form>
- <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeyIndices}</h3>
- <form method="post" action="${encodeURLCheckDb}">
- <input type="hidden" name="option" value="createfkidxs"/>
- ${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" name="groupName"
value="${groupName}" size="40"/>
- <input type="submit" value="${uiLabelMap.CommonRemove}"/>
- </form>
- <h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeys}</h3>
- <p>${uiLabelMap.WebtoolsNoteForeighKeysMayAlsoBeCreated}</p>
- <form method="post" action="${encodeURLCheckDb}">
- <input type="hidden" name="option" value="createfks"/>
- ${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" 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" name="groupName"
value="${groupName}" size="40"/>
- <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
- </form>
+<h3>${uiLabelMap.WebtoolsCheckUpdateDatabase}</h3>
+<form class="basic-form" class="basic-form" method="post"
action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td>
+ <input type="hidden" name="option" value="checkupdatetables"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}: </label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td>
+ <label> <input type="checkbox" name="checkPks"
value="true" checked="checked"/> ${uiLabelMap.WebtoolsPks}</label>
+ <label> <input type="checkbox" name="checkFks"
value="true"/> ${uiLabelMap.WebtoolsFks}</label>
+ <label> <input type="checkbox" name="checkFkIdx"
value="true"/> ${uiLabelMap.WebtoolsFkIdx}</label>
+ <label> <input type="checkbox" name="addMissing"
value="true"/> ${uiLabelMap.WebtoolsAddMissing}</label>
+ <label> <input type="checkbox" name="repair"
value="true"/> ${uiLabelMap.WebtoolsRepairColumnSizes}</label>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td>
+ <input type="submit"
value="${uiLabelMap.WebtoolsCheckUpdateDatabase}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<p>${uiLabelMap.WebtoolsNoteUseAtYourOwnRisk}</p>
+<script language="JavaScript" type="text/javascript">
+ function enableTablesRemove() {
+
document.forms["TablesRemoveForm"].elements["TablesRemoveButton"].disabled=false;
+ }
+</script>
+<h3>${uiLabelMap.WebtoolsRemoveAllTables}</h3>
+<form class="basic-form" class="basic-form" method="post"
action="${encodeURLCheckDb}" name="TablesRemoveForm">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="removetables"/>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <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();"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}"
name="TableRemoveForm">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="removetable"/>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="20"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsEntityName}:</label>
+ </td>
+ <td>
+ <input type="text" name="entityName" value="${entityName}"
size="20"/>
+ <input type="submit" value="${uiLabelMap.CommonRemove}"
name="TablesRemoveButton"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<h3>${uiLabelMap.WebtoolsCreateRemoveAllPrimaryKeys}</h3>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="createpks"/>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="removepks"/>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<h3>${uiLabelMap.WebtoolsCreateRemovePrimaryKey}</h3>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="createpk"/>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ </td>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsEntityName}:</label>
+ </td>
+ <td>
+ <input type="text" name="entityName" value="${entityName}"
size="20"/>
+ <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td>
+ <input type="hidden" name="option" value="removepk"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="20"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsEntityName}:</label>
+ </td>
+ <td>
+ <input type="text" name="entityName" value="${entityName}"
size="20"/>
+ <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<h3>${uiLabelMap.WebtoolsCreateRemoveAllDeclaredIndices}</h3>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="createidx"/>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="removeidx"/>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeyIndices}</h3>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="createfkidxs"/>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="removefkidxs"/>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<h3>${uiLabelMap.WebtoolsCreateRemoveAllForeignKeys}</h3>
+<p>${uiLabelMap.WebtoolsNoteForeighKeysMayAlsoBeCreated}</p>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="createfks"/>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonCreate}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="removefks"/>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonRemove}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+</form>
+<h3>${uiLabelMap.WebtoolsUpdateCharacterSetAndCollate}</h3>
+<form class="basic-form" method="post" action="${encodeURLCheckDb}">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <input type="hidden" name="option" value="updateCharsetCollate"/>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsGroupName}:</label>
+ </td>
+ <td>
+ <input type="text" name="groupName" value="${groupName}"
size="40"/>
+ <input type="submit" value="${uiLabelMap.CommonUpdate}"/>
+ </td
+ </tr>
+ </tbody>
+ </table>
+</form>
<#if miters?has_content>
- <hr />
- <ul>
- <#list miters as miter>
- <li>${miter}</li>
- </#list>
- </ul>
+<hr />
+<ul>
+ <#list miters as miter>
+ <li>${miter}</li>
+ </#list>
+</ul>
</#if>
+
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityExportAll.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityExportAll.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityExportAll.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityExportAll.ftl
Sat Feb 24 16:23:19 2018
@@ -27,10 +27,40 @@ under the License.
</#list>
</#if>
<hr />
-<form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
- ${uiLabelMap.WebtoolsOutputDirectory}: <input type="text" size="60"
name="outpath" value="${outpath!}" /><br />
- ${uiLabelMap.CommonFromDate}: <@htmlTemplate.renderDateTimeField
name="fromDate" event="" action="" className="" alert="" title="Format:
yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate"
dateType="date" shortDateInput=false timeDropdownParamName=""
defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName=""
classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour=""
ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/><br/>
- ${uiLabelMap.WebtoolsTimeoutSeconds}: <input type="text" size="6"
value="${txTimeout?default('7200')}" name="txTimeout"/><br />
- <br />
- <input type="submit" value="${uiLabelMap.WebtoolsExport}" />
+<form class="basic-form" method="post"
action="<@ofbizUrl>entityExportAll</@ofbizUrl>">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ </tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsOutputDirectory}</label>
+ </td>
+ <td>
+ <input type="text" size="25" name="outpath"
value="${outpath!}" />
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.CommonFromDate}</label>
+ </td>
+ <td>
+ <@htmlTemplate.renderDateTimeField name="fromDate"
event="" action="" className="" alert="" title="Format: yyyy-MM-dd
HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate" dateType="date"
shortDateInput=false timeDropdownParamName="" defaultDateTimeString=""
localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1=""
hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName=""
amSelected="" pmSelected="" compositeType="" formName=""/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ ${uiLabelMap.WebtoolsTimeoutSeconds}:
+ </td>
+ <td>
+ <input type="text" size="6"
value="${txTimeout?default('7200')}" name="txTimeout"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td colspan="4">
+ <input type="submit"
value="${uiLabelMap.WebtoolsExport}" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImport.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImport.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImport.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImport.ftl
Sat Feb 24 16:23:19 2018
@@ -21,23 +21,76 @@ under the License.
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
<hr />
- <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
- ${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}:<br />
- <input type="text" size="60" name="filename" value="${filename!}"/><br />
- ${uiLabelMap.WebtoolsAbsoluteFTLFilename}:<br />
- <input type="text" size="40" name="fmfilename" value="${fmfilename!}"/><br
/>
- <label><input type="checkbox" name="isUrl" <#if
isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}</label><br />
- <label><input type="checkbox" name="onlyInserts" <#if
onlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsOnlyInserts}</label><br
/>
- <label><input type="checkbox" name="maintainTimeStamps" <#if
keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</label><br
/>
- <label><input type="checkbox" name="createDummyFks" <#if
createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</label><br
/>
- <label><input type="checkbox" name="checkDataOnly" <#if
checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}</label><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 class="basic-form" method="post"
action="<@ofbizUrl>entityImport</@ofbizUrl>">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsAbsoluteFileNameOrUrl}</label>
+ </td>
+ <td>
+ <input type="text" size="60" name="filename"
value="${filename!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsAbsoluteFTLFilename}</label>
+ </td>
+ <td>
+ <input type="text" size="40" name="fmfilename"
value="${fmfilename!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td>
+ <label><input type="checkbox" name="isUrl" <#if
isUrl??>checked="checked"</#if>/>${uiLabelMap.WebtoolsIsURL}</label>
+ <label><input type="checkbox" name="onlyInserts" <#if
onlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsOnlyInserts}</label>
+ <label><input type="checkbox" name="maintainTimeStamps"
<#if
keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</label>
+ <label><input type="checkbox" name="createDummyFks" <#if
createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</label>
+ <label><input type="checkbox" name="checkDataOnly" <#if
checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}</label>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsTimeoutSeconds}</label>
+ </td>
+ <td>
+ <input type="text" size="6"
value="${txTimeoutStr?default("7200")}" name="txTimeout"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td colspan="4">
+ <input type="submit"
value="${uiLabelMap.WebtoolsImportFile}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
- <form method="post" action="<@ofbizUrl>entityImport</@ofbizUrl>">
- ${uiLabelMap.WebtoolsCompleteXMLDocument}:<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 class="basic-form" method="post"
action="<@ofbizUrl>entityImport</@ofbizUrl>">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsCompleteXMLDocument}</label>
+ </td>
+ <td>
+ <textarea rows="20" cols="85"
name="fulltext">${fulltext?default("<entity-engine-xml>\n</entity-engine-xml>")}</textarea>
+ </td>
+ </tr>
+ <tr>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td colspan="4">
+ <input type="submit"
value="${uiLabelMap.WebtoolsImportText}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
<#if messages??>
<hr />
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportDir.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportDir.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportDir.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportDir.ftl
Sat Feb 24 16:23:19 2018
@@ -21,17 +21,53 @@ under the License.
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
<hr />
- <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
- ${uiLabelMap.WebtoolsAbsolutePath}:<br />
- <input type="text" size="60" name="path" value="${path!}"/><br />
- <label><input type="checkbox" name="onlyInserts" <#if
onlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsOnlyInserts}</label><br
/>
- <label><input type="checkbox" name="maintainTimeStamps" <#if
keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</label><br
/>
- <label><input type="checkbox" name="createDummyFks" <#if
createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</label><br
/>
- <label><input type="checkbox" name="deleteFiles" <#if
(deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}</label><br
/>
- <label><input type="checkbox" name="checkDataOnly" <#if
checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}</label><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 class="basic-form" method="post"
action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsAbsolutePath}:</label>
+ </td>
+ <td>
+ <input type="text" size="60" name="path" value="${path!}"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td>
+ <label><input type="checkbox" name="onlyInserts" <#if
onlyInserts??>checked="checked"</#if>/>${uiLabelMap.WebtoolsOnlyInserts}</label>
+ <label><input type="checkbox" name="maintainTimeStamps"
<#if
keepStamps??>checked="checked"</#if>/>${uiLabelMap.WebtoolsMaintainTimestamps}</label>
+ <label><input type="checkbox" name="createDummyFks" <#if
createDummyFks??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCreateDummyFks}</label>
+ <label><input type="checkbox" name="deleteFiles" <#if
(deleteFiles??)>checked="checked"</#if>/>${uiLabelMap.WebtoolsDeleteFiles}</label>
+ <label><input type="checkbox" name="checkDataOnly" <#if
checkDataOnly??>checked="checked"</#if>/>${uiLabelMap.WebtoolsCheckDataOnly}</label>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsTimeoutSeconds}</label>
+ </td>
+ <td>
+ <input type="text" size="6"
value="${txTimeoutStr?default("7200")}" name="txTimeout"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsPause}</label>
+ </td>
+ <td>
+ <input type="text" size="6"
value="${filePauseStr?default("0")}" name="filePause"/><br />
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td colspan="4">
+ <input type="submit"
value="${uiLabelMap.WebtoolsImportFile}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
<#if messages??>
<hr />
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportReaders.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportReaders.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportReaders.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/EntityImportReaders.ftl
Sat Feb 24 16:23:19 2018
@@ -20,15 +20,43 @@ under the License.
<div
class="page-title"><span>${uiLabelMap.WebtoolsImportToDataSource}</span></div>
<p>${uiLabelMap.WebtoolsXMLImportInfo}</p>
<hr />
- <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
- Enter Readers (comma separated, no spaces; from entityengine.xml and
ofbiz-component.xml files; common ones include seed,ext,demo):<br />
- <input type="text" size="60" name="readers"
value="${readers?default("seed")}"/><br />
- <label><input type="checkbox" name="onlyInserts" <#if
onlyInserts??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsOnlyInserts}</label><br />
- <label><input type="checkbox" name="maintainTimeStamps" <#if
keepStamps??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}</label><br />
- <label><input type="checkbox" name="createDummyFks" <#if
createDummyFks??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}</label><br />
- <label><input type="checkbox" name="checkDataOnly" <#if
checkDataOnly??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}</label>R<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 class="basic-form" method="post"
action="<@ofbizUrl>entityImportReaders</@ofbizUrl>">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsReaderImportNotice}</label>
+ </td>
+ <td>
+ <input type="text" size="60" name="readers"
value="${readers?default("seed")}"/><br />
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ </td>
+ <td>
+ <label><input type="checkbox" name="onlyInserts" <#if
onlyInserts??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsOnlyInserts}</label>
+ <label><input type="checkbox" name="maintainTimeStamps"
<#if keepStamps??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsMaintainTimestamps}</label>
+ <label><input type="checkbox" name="createDummyFks" <#if
createDummyFks??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCreateDummyFks}</label>
+ <label><input type="checkbox" name="checkDataOnly" <#if
checkDataOnly??>checked="checked"</#if>
value="true"/>${uiLabelMap.WebtoolsCheckDataOnly}</label>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsTimeoutSeconds}<label>
+ </td>
+ <td>
+ <input type="text" size="6"
value="${txTimeoutStr?default("7200")}" name="txTimeout"/>
+ </td>
+ <tr>
+ <td class="label">
+ </td>
+ <td colspan="4">
+ <input type="submit" value="${uiLabelMap.WebtoolsImport}"/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</form>
<#if messages??>
<hr />
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/webtools/template/entity/XmlDsDump.ftl
Sat Feb 24 16:23:19 2018
@@ -85,13 +85,19 @@ under the License.
<td
class="label">${StringUtil.wrapString(uiLabelMap.WebtoolsOutToBrowser)}</td>
<td><input type="checkbox" name="tobrowser"<#if tobrowser?has_content>
checked="checked"</#if> /></td>
</tr>
- </table>
- <br />
- <@displayButtonBar/>
- <div>${uiLabelMap.WebtoolsEntitySyncDump}:
- <input type="text" name="entitySyncId" size="30"
value="${entitySyncId!}"/>
- </div>
- ${uiLabelMap.WebtoolsPreConfiguredSet}:
+ <tr>
+ <td class="label"></td>
+ <td><@displayButtonBar/></td>
+ </tr>
+ <tr>
+ <td
class="label"><label>${uiLabelMap.WebtoolsEntitySyncDump}</label></td>
+ <td><input type="text" name="entitySyncId" size="30"
value="${entitySyncId!}"/></td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label>${uiLabelMap.WebtoolsPreConfiguredSet}:<label>
+ </td>
+ <td>
<select name="preConfiguredSetName">
<option value="">${uiLabelMap.CommonNone}</option>
<option
value="CatalogExport">${uiLabelMap.WebtoolsPreConfiguredSet1}</option>
@@ -100,9 +106,12 @@ under the License.
<option
value="Product3">${uiLabelMap.WebtoolsPreConfiguredSet4}</option>
<option
value="Product4">${uiLabelMap.WebtoolsPreConfiguredSet5}</option>
</select>
+ </td>
+ </tr>
+ </table>
<br />
- <p>${uiLabelMap.WebtoolsEntityNames}:</p>
+ <h2>${uiLabelMap.WebtoolsEntityNames}:</h2>
<table>
<tr>
<#assign entCount = 0>
Modified:
ofbiz/ofbiz-framework/trunk/framework/webtools/template/log/FetchLogs.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/template/log/FetchLogs.ftl?rev=1825261&r1=1825260&r2=1825261&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webtools/template/log/FetchLogs.ftl
(original)
+++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/log/FetchLogs.ftl
Sat Feb 24 16:23:19 2018
@@ -19,28 +19,41 @@ under the License.
<div class="page-title"><span>${uiLabelMap.WebtoolsFetchLogs}</span></div>
<div>
- <form name="fetchLogs" method="post"
action="<@ofbizUrl>FetchLogs</@ofbizUrl>">
- <fieldset>
- <span>
- <label for="logFileName">${uiLabelMap.CommonSelectFile}: </label>
- <select name="logFileName">
- <option value="">${uiLabelMap.CommonSelectFile}</option>
- <#if parameters.logFileName?has_content>
- <option selected
value="${parameters.logFileName}">${parameters.logFileName}</option>
- </#if>
- <#if listLogFileNames?has_content>
- <#list listLogFileNames as logFileName>
- <option value="${logFileName}">${logFileName}</option>
- </#list>
- </#if>
- </select>
- </span>
- <span>
- <label for="searchString">${uiLabelMap.WebtoolsSearchString}: </label>
- <input name="searchString" class="required" type="text"
value="${parameters.searchString!}" />
- </span>
- </fieldset>
- <input type="submit" value="${uiLabelMap.CommonSubmit}" />
+ <form class="basic-form" name="fetchLogs" method="post"
action="<@ofbizUrl>FetchLogs</@ofbizUrl>">
+ <table class="basic-table" cellspacing="0">
+ <tbody>
+ <tr>
+ <td class="label">
+ <label for="logFileName">${uiLabelMap.CommonSelectFile}:
</label>
+ </td>
+ <td>
+ <select name="logFileName">
+ <option value="">${uiLabelMap.CommonSelectFile}</option>
+ <#if parameters.logFileName?has_content>
+ <option selected
value="${parameters.logFileName}">${parameters.logFileName}</option>
+ </#if>
+ <#if listLogFileNames?has_content>
+ <#list listLogFileNames as logFileName>
+ <option
value="${logFileName}">${logFileName}</option>
+ </#list>
+ </#if>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label
for="searchString">${uiLabelMap.WebtoolsSearchString}: </label>
+ </td>
+ <td>
+ <input name="searchString" class="required" type="text"
value="${parameters.searchString!}" />
+ </td>
+ </tr>
+ <tr>
+ <td class="label"></td>
+ <td colspan="4"><input type="submit"
value="${uiLabelMap.CommonSubmit}" /></td>
+ </tr>
+ </tbody>
+ </table>
</form>
</div>
<#if logLines?has_content>
