Author: jleroux
Date: Fri Apr 17 15:49:13 2009
New Revision: 766063
URL: http://svn.apache.org/viewvc?rev=766063&view=rev
Log:
Applied fix from trunk for revision: 766015
Modified:
ofbiz/branches/release09.04/ (props changed)
ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml
Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 17 15:49:13 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933
+/ofbiz/trunk:765933,766011,766015
Modified:
ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=766063&r1=766062&r2=766063&view=diff
==============================================================================
---
ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl
(original)
+++
ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl
Fri Apr 17 15:49:13 2009
@@ -149,7 +149,7 @@
<#macro renderHiddenField name value><input type="hidden" name="${name}"<#if
value?has_content> value="${value}"</#if>/></#macro>
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style title><#if style?has_content><span
class="${style}></#if>${title}<#if style?has_content></span></#if></#macro>
+<#macro renderFieldTitle style title><#if style?has_content><span
class="${style}"></#if>${title}<#if style?has_content></span></#if></#macro>
<#macro renderSingleFormFieldTitle></#macro>
<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name useRowSubmit><form method="post"
action="${linkUrl}"<#if formType=="upload">
enctype="multipart/form-data"</#if><#if targetWindow?has_content>
target="${targetWindow}"</#if><#if containerId?has_content>
id="${containerId}"</#if> class=<#if
containerStyle?has_content>"${containerStyle}"<#else>"basic-form"</#if>
onSubmit="javascript:submitFormDisableSubmits(this)"<#if
autocomplete?has_content> autocomplete="${autocomplete}"</#if> name="${name}"
><#if useRowSubmit?has_content && useRowSubmit><input type="hidden"
name="_useRowSubmit" value="Y"/></#if></#macro>
Modified:
ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml?rev=766063&r1=766062&r2=766063&view=diff
==============================================================================
---
ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml
(original)
+++
ofbiz/branches/release09.04/specialpurpose/projectmgr/data/ProjectMgrDemoPasswordData.xml
Fri Apr 17 15:49:13 2009
@@ -1,9 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+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
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<entity-engine-xml>
- <UserLogin userLoginId="DemoCustomer1"
currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoCustomer1"/>
- <UserLogin userLoginId="DemoCustomer2"
currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoCustomer2"/>
- <UserLogin userLoginId="DemoEmployee"
currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee"/>
- <UserLogin userLoginId="DemoEmployee1"
currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee1"/>
- <UserLogin userLoginId="DemoEmployee2"
currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee2"/>
- <UserLogin userLoginId="DemoEmployee3"
currentPassword="47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee3"/>
-</entity-engine-xml>
\ No newline at end of file
+ <UserLogin userLoginId="DemoCustomer1"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoCustomer1"/>
+ <UserLogin userLoginId="DemoCustomer2"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoCustomer2"/>
+ <UserLogin userLoginId="DemoEmployee"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee"/>
+ <UserLogin userLoginId="DemoEmployee1"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee1"/>
+ <UserLogin userLoginId="DemoEmployee2"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee2"/>
+ <UserLogin userLoginId="DemoEmployee3"
currentPassword="{SHA}47ca69ebb4bdc9ae0adec130880165d2cc05db1a" passwordHint=""
partyId="DemoEmployee3"/>
+</entity-engine-xml>
