Author: jleroux
Date: Sat Feb 6 21:33:01 2010
New Revision: 907310
URL: http://svn.apache.org/viewvc?rev=907310&view=rev
Log:
While working at layering lookups I found that some of them are inappropriately
named lookups and are actually lists (at least for now, locales, timezones and
themes)
In this commit I rename them List (instead of Lookup) to avoid future
confusion. If this has too much impact we may revert it of course...
Modified:
ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/trunk/framework/common/widget/LookupScreens.xml
ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
ofbiz/trunk/themes/flatgrey/includes/footer.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
(original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/common-controller.xml Sat
Feb 6 21:33:01 2010
@@ -106,14 +106,14 @@
</request-map>
<!-- Common Mappings used for locales and timezones -->
- <request-map uri="LookupLocales"><security https="true"
auth="false"/><response name="success" type="view" value="LookupLocales"
save-last-view="true"/></request-map>
+ <request-map uri="ListLocales"><security https="true"
auth="false"/><response name="success" type="view" value="ListLocales"
save-last-view="true"/></request-map>
<request-map uri="setSessionLocale">
<security https="true" auth="false"/>
<event type="java" path="org.ofbiz.common.CommonEvents"
invoke="setSessionLocale"/>
<response name="success" type="view-last" value="main"/>
<response name="error" type="request" value="main"/>
</request-map>
- <request-map uri="LookupTimezones"><security https="true"
auth="false"/><response name="success" type="view" value="LookupTimezones"
save-last-view="true"/></request-map>
+ <request-map uri="ListTimezones"><security https="true"
auth="false"/><response name="success" type="view" value="ListTimezones"
save-last-view="true"/></request-map>
<request-map uri="setSessionTimeZone">
<security https="true" auth="false"/>
<event type="java" path="org.ofbiz.common.CommonEvents"
invoke="setSessionTimeZone"/>
@@ -147,9 +147,9 @@
</request-map>
<!-- Visual theme mapping -->
- <request-map uri="LookupVisualThemes">
+ <request-map uri="ListVisualThemes">
<security https="true" auth="true"/>
- <response name="success" type="view" value="LookupVisualThemes"/>
+ <response name="success" type="view" value="ListVisualThemes"/>
</request-map>
<request-map uri="main">
@@ -199,10 +199,10 @@
<view-map name="forgotPassword" type="screen"
page="component://common/widget/CommonScreens.xml#forgotPassword"/>
<view-map name="EventMessages" type="screen"
page="component://common/widget/CommonScreens.xml#EventMessages"/>
- <view-map name="LookupLocales" type="screen"
page="component://common/widget/LookupScreens.xml#LookupLocales"/>
+ <view-map name="ListLocales" type="screen"
page="component://common/widget/LookupScreens.xml#ListLocales"/>
<view-map name="LookupTimeDuration" type="screen"
page="component://common/widget/LookupScreens.xml#TimeDuration"/>
- <view-map name="LookupTimezones" type="screen"
page="component://common/widget/LookupScreens.xml#LookupTimezones"/>
- <view-map name="LookupVisualThemes" type="screen"
page="component://common/widget/LookupScreens.xml#LookupVisualThemes"/>
+ <view-map name="ListTimezones" type="screen"
page="component://common/widget/LookupScreens.xml#ListTimezones"/>
+ <view-map name="ListVisualThemes" type="screen"
page="component://common/widget/LookupScreens.xml#ListVisualThemes"/>
<view-map name="ajaxAutocompleteOptions" type="screen"
page="component://common/widget/CommonScreens.xml#ajaxAutocompleteOptions"/>
Modified: ofbiz/trunk/framework/common/widget/LookupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/LookupScreens.xml?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/LookupScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/LookupScreens.xml Sat Feb 6 21:33:01
2010
@@ -47,7 +47,7 @@
</screen>
<!-- Locales Lookup Screen -->
- <screen name="LookupLocales">
+ <screen name="ListLocales">
<section>
<actions>
<set field="title" value="${uiLabelMap.CommonChooseLanguage}"/>
@@ -67,7 +67,7 @@
</screen>
<!-- Timezones Lookup Screen -->
- <screen name="LookupTimezones">
+ <screen name="ListTimezones">
<section>
<actions>
<set field="title" value="${uiLabelMap.CommonTime}"/>
@@ -87,7 +87,7 @@
</screen>
<!-- Visual Themes Lookup Screen -->
- <screen name="LookupVisualThemes">
+ <screen name="ListVisualThemes">
<section>
<actions>
<set field="title" value="${uiLabelMap.CommonVisualThemes}"/>
Modified: ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/shark/webapp/shark/WEB-INF/controller.xml Sat
Feb 6 21:33:01 2010
@@ -84,13 +84,13 @@
<response name="success" type="request" value="main"/>
<response name="error" type="request" value="main"/>
</request-map>
- <request-map uri="LookupLocales">
+ <request-map uri="ListLocales">
<security https="true" auth="false"/>
- <response name="success" type="view" value="LookupLocales"/>
+ <response name="success" type="view" value="ListLocales"/>
</request-map>
- <request-map uri="LookupTimezones">
+ <request-map uri="ListTimezones">
<security https="true" auth="false"/>
- <response name="success" type="view" value="LookupTimezones"/>
+ <response name="success" type="view" value="ListTimezones"/>
</request-map>
<!-- Request Mappings -->
@@ -140,8 +140,8 @@
<view-map name="main" type="screen"
page="component://shark/widget/CommonScreens.xml#main"/>
<view-map name="login" type="screen"
page="component://shark/widget/CommonScreens.xml#login"/>
<view-map name="requirePasswordChange" type="screen"
page="component://shark/widget/CommonScreens.xml#requirePasswordChange"/>
- <view-map name="LookupLocales" type="screen"
page="component://common/widget/LookupScreens.xml#LookupLocales"/>
- <view-map name="LookupTimezones" type="screen"
page="component://common/widget/LookupScreens.xml#LookupTimezones"/>
+ <view-map name="ListLocales" type="screen"
page="component://common/widget/LookupScreens.xml#ListLocales"/>
+ <view-map name="ListTimezones" type="screen"
page="component://common/widget/LookupScreens.xml#ListTimezones"/>
<view-map name="repository" type="screen"
page="component://shark/widget/RepositoryScreens.xml#showRepository"/>
<view-map name="processList" type="screen"
page="component://shark/widget/ProcessScreens.xml#processList"/>
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Sat Feb 6 21:33:01 2010
@@ -109,9 +109,9 @@
<span id="prefBtn">
<a href="#"
class="contracted">${uiLabelMap.CommonPreferences}</a>
<div id="preferences" style="display:none">
- <a href="<@ofbizUrl>LookupLocales</@ofbizUrl>"
id="language">${uiLabelMap.CommonLanguageTitle} -
${locale.getDisplayName(locale)}</a>
- <a href="<@ofbizUrl>LookupTimezones</@ofbizUrl>"
id="timezone">${nowTimestamp?datetime?string.short} -
${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
- <a href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>"
id="theme">${uiLabelMap.CommonVisualThemes}</a>
+ <a href="<@ofbizUrl>ListLocales</@ofbizUrl>"
id="language">${uiLabelMap.CommonLanguageTitle} -
${locale.getDisplayName(locale)}</a>
+ <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>"
id="timezone">${nowTimestamp?datetime?string.short} -
${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
+ <a href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>"
id="theme">${uiLabelMap.CommonVisualThemes}</a>
</div>
</span>
<span>
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Sat Feb 6 21:33:01 2010
@@ -142,9 +142,9 @@
<li class="org">${orgName}</li>
</#if>
</#if>
- <li class="first"><a
href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
+ <li class="first"><a
href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
<#if userLogin?exists>
- <li><a
href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
+ <li><a
href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
<li><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
<#else>
<li><a
href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl Sat Feb 6 21:33:01
2010
@@ -21,7 +21,7 @@
<div id="footer">
<p>${nowTimestamp?datetime?string.short} -
- <a
href="<@ofbizUrl>LookupTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
+ <a
href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
</p>
<p><a href="http://jigsaw.w3.org/css-validator/";><img
src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid
CSS!"/></a>
<a href="http://validator.w3.org/check?uri=referer";><img
src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid
XHTML 1.0!"/></a></p>
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Sat Feb 6 21:33:01
2010
@@ -142,9 +142,9 @@
</#if>
<li class="control-area">
<ul id="preferences-menu">
- <li class="first"><a
href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
+ <li class="first"><a
href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
<#if userLogin?exists>
- <li><a
href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
+ <li><a
href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
<li><a
href="<@ofbizUrl>logout</@ofbizUrl>">${uiLabelMap.CommonLogout}</a></li>
<#else>
<li><a
href="<@ofbizUrl>${checkLoginUrl}</@ofbizUrl>">${uiLabelMap.CommonLogin}</a></li>
Modified: ofbiz/trunk/themes/flatgrey/includes/footer.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/footer.ftl?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/footer.ftl Sat Feb 6 21:33:01 2010
@@ -56,7 +56,7 @@
<div id="footer">
<p>${nowTimestamp?datetime?string.short} -
- <a
href="<@ofbizUrl>LookupTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
+ <a
href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(),
Static["java.util.TimeZone"].LONG, locale)}</a>
</p>
<p><a href="http://jigsaw.w3.org/css-validator/";><img
src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid
CSS!"/></a>
<a href="http://validator.w3.org/check?uri=referer";><img
src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid
XHTML 1.0!"/></a></p>
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=907310&r1=907309&r2=907310&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Sat Feb 6 21:33:01 2010
@@ -176,9 +176,9 @@
</#if>
<ul id="preferences-menu">
<!-- <li class="first"><a
href="<@ofbizUrl>Preferences</@ofbizUrl>">${uiLabelMap.CommonPreferences}</a></li>
-->
- <li class="first"><a
href="<@ofbizUrl>LookupLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
+ <li class="first"><a
href="<@ofbizUrl>ListLocales</@ofbizUrl>">${uiLabelMap.CommonLanguageTitle} :
${locale.getDisplayName(locale)}</a></li>
<#if userLogin?exists>
- <li><a
href="<@ofbizUrl>LookupVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
+ <li><a
href="<@ofbizUrl>ListVisualThemes</@ofbizUrl>">${uiLabelMap.CommonVisualThemes}</a></li>
</#if>
<#if webSiteId?exists && requestAttributes._CURRENT_VIEW_?exists>
<#include "component://common/webcommon/includes/helplink.ftl" />
