You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2012/10/20 10:53:28 UTC
svn commit: r1400392 - in /ofbiz/trunk/specialpurpose/hhfacility:
webapp/hhfacility/WEB-INF/web.xml webapp/hhfacility/facilities.ftl
webapp/hhfacility/includes/header.ftl webapp/hhfacility/login.ftl
widget/hhfacility/FacilityScreens.xml
Author: adrianc
Date: Sat Oct 20 08:53:27 2012
New Revision: 1400392
URL: http://svn.apache.org/viewvc?rev=1400392&view=rev
Log:
Fixed broken UI in hhfacility component.
Modified:
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1400392&r1=1400391&r2=1400392&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Sat Oct 20 08:53:27 2012
@@ -38,6 +38,18 @@ under the License.
<param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
</context-param>
+ <!-- This parameter should be set to true for production. -->
+ <context-param>
+ <param-name>compressHTML</param-name>
+ <param-value>false</param-value>
+ <description>Remove unnecessary whitespace from HTML output.</description>
+ </context-param>
+ <!-- This parameter should be set to false for production. -->
+ <context-param>
+ <param-name>widgetVerbose</param-name>
+ <param-value>true</param-value>
+ <description>Enable widget boundary comments.</description>
+ </context-param>
<filter>
<filter-name>ContextFilter</filter-name>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl?rev=1400392&r1=1400391&r2=1400392&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/facilities.ftl Sat Oct 20 08:53:27 2012
@@ -30,4 +30,5 @@ under the License.
</li>
</#list>
</ul>
+</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl?rev=1400392&r1=1400391&r2=1400392&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl Sat Oct 20 08:53:27 2012
@@ -16,17 +16,30 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-
-
-<!DOCTYPE html>
-<html>
+<#assign docLangAttr = locale.toString()?replace("_", "-")>
+<#assign langDir = "ltr">
+<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
+ <#assign langDir = "rtl">
+</#if>
+<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${applicationTitle?if_exists}</title>
- <link rel="stylesheet" href="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.css" />
- <script src="/images/jquery/jquery-1.8.2.min.js" type="text/javascript"></script>
- <script src="/images/jquery/jquery.mobile-1.1.0-rc.1/jquery.mobile-1.1.0-rc.1.js" type="text/javascript"></script>
- <meta name="viewport" content="width=device-width, initial-scale=1">
+ <#if layoutSettings.javaScripts?has_content>
+ <#assign javaScriptsSet = Static["org.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/>
+ <#list layoutSettings.javaScripts as javaScript>
+ <#if javaScriptsSet.contains(javaScript)>
+ <#assign nothing = javaScriptsSet.remove(javaScript)/>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#if>
+ </#list>
+ </#if>
+ <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content>
+ <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript>
+ <script src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ </#list>
+ </#if>
</head>
<body>
<div data-role="header">
Modified: ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=1400392&r1=1400391&r2=1400392&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Sat Oct 20 08:53:27 2012
@@ -18,21 +18,35 @@ under the License.
-->
<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")>
<#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))>
+<#if username != "">
+ <#assign focusName = false>
+<#else>
+ <#assign focusName = true>
+</#if>
<form method="post" action="<@o...@ofbizUrl>" name="loginform" data-ajax="false">
<div data-role="fieldcontainer">
- <label for="USERNAME">Username</label>
+ <label for="USERNAME">${uiLabelMap.CommonUsername}</label>
<input type="text" id="USERNAME" name="USERNAME" value="${username}" size="20"/>
</div>
<div data-role="fieldcontainer">
- <label for="PASSWORD">Password</label>
+ <label for="PASSWORD">${uiLabelMap.CommonPassword}</label>
<input type="password" id="PASSWORD" name="PASSWORD" value="" size="20" />
</div>
<#if ("Y" == useMultitenant)>
<div data-role="fieldcontainer">
- <label for="tenantId">TenantId</label>
+ <label for="tenantId">${uiLabelMap.CommonTenantId}</label>
<input type="text" id="tenantId" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/>
</div>
</#if>
- <input type="submit" value="Login" class="loginButton" />
+ <input type="submit" value="${uiLabelMap.CommonLogin}" class="loginButton" />
</form>
+
+<script language="JavaScript" type="text/javascript">
+ document.loginform.JavaScriptEnabled.value = "Y";
+ <#if focusName>
+ document.loginform.USERNAME.focus();
+ <#else>
+ document.loginform.PASSWORD.focus();
+ </#if>
+</script>
Modified: ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml?rev=1400392&r1=1400391&r2=1400392&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/widget/hhfacility/FacilityScreens.xml Sat Oct 20 08:53:27 2012
@@ -20,13 +20,32 @@ under the License.
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
+
<screen name="GlobalDecorator">
<section>
- <widgets>
- <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/includes/header.ftl"/></html></platform-specific>
- <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/includes/messages.ftl"/></html></platform-specific>
- <decorator-section-include name="body"/>
- <platform-specific><html><html-template location="component://hhfacility/webapp/hhfacility/includes/footer.ftl"/></html></platform-specific>
+ <actions>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true" />
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true" />
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true" />
+ </actions>
+ <widgets>
+ <include-screen name="GlobalActions" location="component://common/widget/CommonScreens.xml" />
+ <platform-specific>
+ <html>
+ <html-template location="component://hhfacility/webapp/hhfacility/includes/header.ftl" />
+ </html>
+ </platform-specific>
+ <platform-specific>
+ <html>
+ <html-template location="component://hhfacility/webapp/hhfacility/includes/messages.ftl" />
+ </html>
+ </platform-specific>
+ <decorator-section-include name="body" />
+ <platform-specific>
+ <html>
+ <html-template location="component://hhfacility/webapp/hhfacility/includes/footer.ftl" />
+ </html>
+ </platform-specific>
</widgets>
</section>
</screen>