You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/03/31 10:36:59 UTC
svn commit: r1583265 [2/2] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/script/org/ofbiz/accounting/test/
applications/accounting/src/org/ofbiz/a...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1583265&r1=1583264&r2=1583265&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Mar 31 08:36:58 2014
@@ -29,9 +29,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.WeakHashMap;
-import java.util.Map.Entry;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -1273,6 +1273,9 @@ public class MacroFormRenderer implement
sr.append("\" id=\"");
sr.append(id);
sr.append("_title");
+ // Render "for"
+ sr.append("\" for=\"");
+ sr.append(id);
}
sr.append("\" />");
executeMacro(writer, sr.toString());
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1583265&r1=1583264&r2=1583265&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Mar 31 08:36:58 2014
@@ -313,10 +313,10 @@ under the License.
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style title id fieldHelpText="">
- <span<#if fieldHelpText?has_content> title="${fieldHelpText}"</#if><#if style?has_content> class="${style}"</#if><#if id?has_content> id="${id}"</#if>><#t/>
+<#macro renderFieldTitle style title id fieldHelpText="" for="">
+ <label <#if for?has_content>for="${for}"</#if> <#if fieldHelpText?has_content> title="${fieldHelpText}"</#if><#if style?has_content> class="${style}"</#if><#if id?has_content> id="${id}"</#if>><#t/>
${title}<#t/>
- </span><#t/>
+ </label><#t/>
</#macro>
<#macro renderSingleFormFieldTitle></#macro>
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/scriptlib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 31 08:36:58 2014
@@ -0,0 +1 @@
+.GITplaceholder
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/attachments/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 31 08:36:58 2014
@@ -0,0 +1 @@
+.GITplaceholder
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml?rev=1583265&r1=1583264&r2=1583265&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/build.xml Mon Mar 31 08:36:58 2014
@@ -40,5 +40,4 @@
scrum/build.xml,
webpos/build.xml
"/>
- <!-- crowd/build.xml, -->
</project>
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/exampleext/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 31 08:36:58 2014
@@ -0,0 +1 @@
+.GITplaceholder
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml?rev=1583265&r1=1583264&r2=1583265&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/script/org/ofbiz/scrum/ScrumEvents.xml Mon Mar 31 08:36:58 2014
@@ -2617,7 +2617,6 @@
<set field="createCustRequestInMap.custRequestTypeId" value="RF_PARENT_BACKLOG"/>
<set field="createCustRequestInMap.statusId" value="CRQ_DRAFT"/>
<set field="createCustRequestInMap.fromPartyId" value="_NA_"/>
- <set field="createCustRequestInMap.requesterId" value="_NA_"/>
<set field="createCustRequestInMap.userLogin" from-field="userlogin"/>
<call-service service-name="createCustRequest" in-map-name="createCustRequestInMap">
<result-to-field result-name="custRequestId"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl?rev=1583265&r1=1583264&r2=1583265&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl Mon Mar 31 08:36:58 2014
@@ -25,7 +25,6 @@ under the License.
<p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p>
<p>Your Customer Request <b>${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] </b> <#if informationMap.workEffortId?has_content>in sprint <b>${informationMap.workEffortName?if_exists} [${informationMap.workEffortId?if_exists}]</b></#if>
<#if informationMap.productId?has_content>of the product <b>${informationMap.internalName?if_exists} [${informationMap.productId?if_exists}]</#if></b> has been CANCELLED.
- <p>Your Reference: ${custRequest.requesterId?if_exists}</p>
<p>Reason for Cancellation: ${custRequest.reason?if_exists}</p>
<br />
<br />