You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2007/04/23 11:28:50 UTC
svn commit: r531396 - in /ofbiz/trunk/framework/webtools: config/
webapp/webtools/ webapp/webtools/WEB-INF/actions/datafile/
webapp/webtools/cache/ webapp/webtools/cert/ webapp/webtools/component/
webapp/webtools/datafile/
Author: jacopoc
Date: Mon Apr 23 02:28:44 2007
New Revision: 531396
URL: http://svn.apache.org/viewvc?view=rev&rev=531396
Log:
Webtools UI improvements (layout and 118n) by Adrian Crum: OFBIZ-914
Modified:
ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
Modified: ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties (original)
+++ ofbiz/trunk/framework/webtools/config/WebtoolsUiLabels.properties Mon Apr 23 02:28:44 2007
@@ -60,6 +60,11 @@
WebtoolsCacheMaintenance=Cache Maintenance
WebtoolsCancelJob=Cancel Job
WebtoolsCacheName=Cache Name
+WebtoolsCertsCert=Cert
+WebtoolsCertsNotFound=No client certifications found
+WebtoolsCertsRequiresSSL=Request can only obtain certifications when called through SSL
+WebtoolsCertsSerialNum=Serial Number
+WebtoolsCertsX509=x.509 Certificates
WebtoolsCheckUpdateDatabase=Check/Update Database
WebtoolsClearAllCaches=Clear All Caches
WebtoolsClearExpiredFromAll=Clear Expired From All
@@ -75,7 +80,21 @@
WebtoolsCreateRemoveAllForeignKeyIndices=Create/Remove All Foreign Key Indices
WebtoolsCreateRemoveAllPrimaryKeys=Create/Remove All Primary Keys
WebtoolsCreateRemovePrimaryKey=Create/Remove Primary Key
+WebtoolsComponentsLoaded=Loaded Components
+WebtoolsComponentsNoComponents=No components loaded
+WebtoolsComponentsPath=Path
+WebtoolsComponentsWebApps=WebApps (Name, Mount, Path)
WebtoolsDataFileTools=Data File Tools
+WebtoolsDataFileMainTitle=Work With Data Files
+WebtoolsDataFileSavedTo=Data File saved to:
+WebtoolsDataEntityFileSavedTo=Entity File saved to:
+WebtoolsDataFileMessage1=This page is used to view and export data from data files parsed by the configurable data file parser
+WebtoolsDataDefinitionFileName=Definition Filename or URL
+WebtoolsDataDefinitionName=Data File Definition Name
+WebtoolsDataIsUrl=Is URL?
+WebtoolsDataFileName=Data File Name or URL
+WebtoolsDataSaveToFile=Save to File
+WebtoolsDataSaveToXml=Save to Entity XML File
WebtoolsDbName=DB Name
WebtoolsDebuggingLevelFormDescription=This form allows you to change application debugging levels.
WebtoolsDefaultEntityName=Default Entity Name
@@ -178,7 +197,7 @@
WebtoolsMessage11=Step 1: Service And Recurrence Information
WebtoolsMessage12=Step 2: Service Parameters
WebtoolsMessage13=This application is primarily intended for developers and system administrators
-WebtoolsMessage14=For something interesting make sure you are logged in, try username:admin, password:ofbiz
+WebtoolsMessage14=For something interesting make sure you are logged in, try username: admin, password: ofbiz
WebtoolsMessage15=You may create an Entity
WebtoolsMessage16=by entering the values you want, and clicking Create
WebtoolsMessage17=You do not have permission to create a entity
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh Mon Apr 23 02:28:44 2007
@@ -80,7 +80,7 @@
if (dataFile != null && dataFileSave != null && dataFileSave.length() > 0) {
try {
dataFile.writeDataFile(dataFileSave);
- messages.add("Data File saved to: " + dataFileSave);
+ messages.add(uiLabelMap.get("WebtoolsDataFileSavedTo") + dataFileSave);
}
catch (Exception e) {
messages.add(e.getMessage());
@@ -91,7 +91,7 @@
try {
//dataFile.writeDataFile(entityXmlFileSave);
DataFile2EntityXml.writeToEntityXml(entityXmlFileSave, dataFile);
- messages.add("Entity File saved to: " + entityXmlFileSave);
+ messages.add(uiLabelMap.get("WebtoolsDataEntityFileSavedTo") + entityXmlFileSave);
}
catch (Exception e) {
messages.add(e.getMessage());
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl Mon Apr 23 02:28:44 2007
@@ -54,9 +54,9 @@
<td align="center">${uiLabelMap.WebtoolsUseFileStore}</td>
<td align="center">${uiLabelMap.WebtoolsAdministration}</td>
</tr>
- <#assign alternateRow = false>
+ <#assign alt_row = false>
<#list cacheList as cache>
- <tr<#if alternateRow> class="alternate-row"</#if>>
+ <tr<#if alt_row> class="alternate-row"</#if>>
<td>${cache.cacheName?if_exists}</td>
<td>${cache.cacheSize?if_exists}</td>
<td>${cache.hitCount?if_exists}</td>
@@ -76,11 +76,7 @@
</#if>
</td>
</tr>
- <#if alternateRow == false>
- <#assign alternateRow = true>
- <#else>
- <#assign alternateRow = false>
- </#if>
+ <#assign alt_row = !alt_row>
</#list>
</table>
<#else>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl Mon Apr 23 02:28:44 2007
@@ -43,23 +43,19 @@
<td>${uiLabelMap.WebtoolsBytes}</td>
<td> </td>
</tr>
- <#assign alternateRow = false>
+ <#assign alt_row = false>
<#list cacheElementsList as cacheElement>
- <tr<#if alternateRow> class="alternate-row"</#if>>
+ <tr<#if alt_row> class="alternate-row"</#if>>
<td>${cacheElement.elementKey?if_exists}</td>
<td nowrap="nowrap">${cacheElement.expireTime?if_exists}</td>
<td>${cacheElement.lineSize?if_exists}</td>
- <td align="center">
+ <td class="button-col">
<#if hasUtilCacheEdit>
- <a href="<@o...@ofbizUrl>" class="smallSubmit">${uiLabelMap.CommonRemove}</a>
+ <a href="<@o...@ofbizUrl>">${uiLabelMap.CommonRemove}</a>
</#if>
</td>
</tr>
- <#if alternateRow == false>
- <#assign alternateRow = true>
- <#else>
- <#assign alternateRow = false>
- </#if>
+ <#assign alt_row = !alt_row>
</#list>
</table>
<#else>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/cert/viewbrowsercerts.ftl Mon Apr 23 02:28:44 2007
@@ -23,30 +23,44 @@
<#assign clientCerts = request.getAttribute("javax.net.ssl.peer_certificates")?if_exists/>
</#if>
-<#if (isSecure)>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <h3>${uiLabelMap.WebtoolsCertsX509}</h3>
+ </div>
+ <#if (isSecure)>
<#if (clientCerts?has_content)>
+ <table class="basic-table">
<#list clientCerts as cert>
- <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)?if_exists>
- <#if (certString?has_content)>
- <div style="width: 60%">
- <div><b>Cert: ${cert.getType()} : ${cert.getSubjectX500Principal()}</b></div>
- <div><b>Serial Number: ${cert.getSerialNumber().toString(16)}</b></div>
-
- <textarea class="textBox" rows="4" cols="130">
+ <#assign certString = Static["org.ofbiz.base.util.KeyStoreUtil"].certToString(cert)?if_exists>
+ <#if (certString?has_content)>
+ <tr>
+ <td class="label">${uiLabelMap.WebtoolsCertsCert}:</td>
+ <td>${cert.getType()} : ${cert.getSubjectX500Principal()}</td>
+ </tr>
+ <tr>
+ <td class="label">${uiLabelMap.WebtoolsCertsSerialNum}:</td>
+ <td>${cert.getSerialNumber().toString(16)}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <textarea rows="4" cols="130">
${certString}
-----BEGIN PUBLIC KEY HEX-----
${Static["org.ofbiz.base.util.KeyStoreUtil"].pemToPkHex(certString)}
-----END PUBLIC KEY HEX-----
- </textarea>
- </div>
- <br>
- </#if>
+ </textarea>
+ </td>
+ </tr>
+ </#if>
</#list>
+ </table>
<#else>
- <p>No client certifications found.</p>
+ <div class="screenlet-body">${uiLabelMap.WebtoolsCertsNotFound}.</div>
</#if>
-<#else>
- <p>request can only obtain certifications when calls through SSL</p>
-</#if>
\ No newline at end of file
+ <#else>
+ <div class="screenlet-body">${uiLabelMap.WebtoolsCertsRequiresSSL}.</div>
+ </#if>
+</div>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl Mon Apr 23 02:28:44 2007
@@ -20,27 +20,27 @@
<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()?if_exists/>
<div id="stats-bins-history" class="screenlet">
<div class="screenlet-title-bar">
- <h3>Loaded Components</h3>
+ <h3>${uiLabelMap.WebtoolsComponentsLoaded}</h3>
</div>
<#if (components?has_content)>
<table class="basic-table" cellspacing="0">
<tr class="header-row">
- <td>Name</td>
- <td>Path</td>
- <td>Enabled</td>
- <td colspan="3">WebApps (Name, Mount, Path)</td>
+ <td>${uiLabelMap.CommonName}</td>
+ <td>${uiLabelMap.WebtoolsComponentsPath}</td>
+ <td>${uiLabelMap.CommonEnabled}</td>
+ <td colspan="3">${uiLabelMap.WebtoolsComponentsWebApps}</td>
</tr>
<#list components as component>
<#assign webinfos = component.getWebappInfos()?if_exists/>
- <#assign firstRow = "true">
+ <#assign firstRow = true>
<tr>
<td>${component.getComponentName()?if_exists}</td>
<td>${component.getRootLocation()?if_exists}</td>
<td>${component.enabled()?string?if_exists}</td>
<#if (webinfos?has_content)>
<#list webinfos as webinfo>
- <#if firstRow = "true">
- <#assign firstRow = "false">
+ <#if firstRow>
+ <#assign firstRow = false>
<#else>
<tr>
<td> </td>
@@ -61,6 +61,6 @@
</#list>
</table>
<#else>
- <div class="screenlet-body">No components loaded.</div>
+ <div class="screenlet-body">${uiLabelMap.WebtoolsComponentsNoComponents}.</div>
</#if>
</div>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Mon Apr 23 02:28:44 2007
@@ -17,20 +17,20 @@
under the License.
-->
-<h1>Work With Data Files</h1>
+<h1>${uiLabelMap.WebtoolsDataFileMainTitle}</h1>
<br />
-<p>This page is used to view and export data from data files parsed by the configurable data file parser.</p>
+<p>${uiLabelMap.WebtoolsDataFileMessage1}.</p>
<hr/>
<#if security.hasPermission("DATAFILE_MAINT", session)>
<form method="post" action="<@o...@ofbizUrl>">
<table class="basic-table form-widget-table">
<tr>
- <td class="label">Definition Filename or URL</td>
+ <td class="label">${uiLabelMap.WebtoolsDataDefinitionFileName}</td>
<td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION?if_exists}"></td>
- <td><span class="label">Is URL?</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if>></td>
+ <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if>></td>
</tr>
<tr>
- <td class="label">Data File Definition Name</td>
+ <td class="label">${uiLabelMap.WebtoolsDataDefinitionName}</td>
<td>
<#if definitionNames?has_content>
<select name="DEFINITION_NAME">
@@ -47,23 +47,23 @@
<td> </td>
</tr>
<tr>
- <td class="label">Data Filename or URL</td>
+ <td class="label">${uiLabelMap.WebtoolsDataFileName}</td>
<td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION?if_exists}"></td>
- <td><span class="label">Is URL?</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if>></td>
+ <td><span class="label">${uiLabelMap.WebtoolsDataIsUrl}</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if>></td>
</tr>
<tr>
- <td class="label">Save to file</td>
+ <td class="label">${uiLabelMap.WebtoolsDataSaveToFile}</td>
<td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE?if_exists}"/></td>
<td> </td>
</tr>
<tr>
- <td class="label">Save to entity xml file</td>
+ <td class="label">${uiLabelMap.WebtoolsDataSaveToXml}</td>
<td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE?if_exists}"></td>
<td> </td>
</tr>
<tr>
<td> </td>
- <td><input type="submit" value="Run"></td>
+ <td><input type="submit" value="${uiLabelMap.CommonRun}"></td>
<td> </td>
</tr>
</table>
@@ -71,7 +71,7 @@
<#if messages?has_content>
<hr/>
- <h1>The following occurred:</h1>
+ <h1>${uiLabelMap.CommonFollowingOccurred}:</h1>
<div>
<#list messages as message>
<p>${message}</p>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl?view=diff&rev=531396&r1=531395&r2=531396
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/main.ftl Mon Apr 23 02:28:44 2007
@@ -17,18 +17,18 @@
under the License.
-->
-<!-- begin main.ftl -->
<#-- TODO: Remove embedded style during UI refactor -->
<style type="text/css">
.webToolList {
list-style-type: none;
-padding: 1em;
+margin-left: 1em;
}
.webToolList li {
padding: 0 1em 0 1em;
}
.webToolList h3 {
-padding: 1em 1em 0 0;
+padding: 1em 0 0 0;
+margin-left: -1em;
}
.webToolList li a {
color: #000099;
@@ -41,22 +41,24 @@
</style>
<div class="screenlet">
- <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxtop'>
- <tr>
- <td><div class='boxhead'>${uiLabelMap.WebtoolsMainPage}</div></td>
- <td align='right' class="lightbuttontextdisabled">${delegator.getDelegatorName()}</td>
- </tr>
- </table>
+ <div class="screenlet-title-bar">
+ <ul>
+ <h3>${uiLabelMap.WebtoolsMainPage}</h3>
+ <li class="disabled">${delegator.getDelegatorName()}</li>
+ </ul>
+ <br class="clear"/>
+ </div>
<div class="screenlet-body">
<#if !userLogin?has_content>
<div>${uiLabelMap.WebtoolsMessage14}.</div>
<br />
+ <div>${uiLabelMap.WebtoolsNote1}</div>
</#if>
- <div>${uiLabelMap.WebtoolsTitle1} ${uiLabelMap.WebtoolsTitle2} ${uiLabelMap.WebtoolsTitle3} ${uiLabelMap.WebtoolsTitle4} ${uiLabelMap.WebtoolsTitle5} ${uiLabelMap.WebtoolsTitle6}.
- <br /><br />
- ${uiLabelMap.WebtoolsMessage13}.
- </div>
<#if userLogin?has_content>
+ <div>${uiLabelMap.WebtoolsTitle1} ${uiLabelMap.WebtoolsTitle2} ${uiLabelMap.WebtoolsTitle3} ${uiLabelMap.WebtoolsTitle4} ${uiLabelMap.WebtoolsTitle5} ${uiLabelMap.WebtoolsTitle6}.
+ <br /><br />
+ ${uiLabelMap.WebtoolsMessage13}.
+ </div>
<ul class="webToolList">
<li><h3>${uiLabelMap.WebtoolsCacheDebugTools}</h3></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsCacheMaintenance}</a></li>
@@ -125,12 +127,10 @@
<li><h3>${uiLabelMap.WebtoolsServerHitStatisticsTools}</h3></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsStatsSinceServerStart}</a></li>
</#if>
- <li><h3>x.509 Certificates</h3></li>
+ <li><h3>${uiLabelMap.WebtoolsCertsX509}</h3></li>
<li><a href="<@o...@ofbizUrl>">${uiLabelMap.WebtoolsMyCertificates}</a></li>
</ul>
</#if>
- <br />
- <div>${uiLabelMap.WebtoolsNote1}</div>
</div>
</div>
<!-- end main.ftl -->