OFBiz › OFBiz - Commits

svn commit: r1751469 [2/2] - in /ofbiz/trunk/framework/common/template: ./ includes/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

pranayp

svn commit: r1751469 [2/2] - in /ofbiz/trunk/framework/common/template: ./ includes/

Modified: ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJs.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJs.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJs.ftl Tue Jul 5 13:41:14 2016
@@ -18,45 +18,48 @@ under the License.
-->
<#if asm_multipleSelect??> <#-- we check only this var and suppose the others are also present -->
<script type="text/javascript">
-jQuery(document).ready(function() {
- multiple = jQuery("#${asm_multipleSelect!}");
+ jQuery(document).ready(function () {
+ multiple = jQuery("#${asm_multipleSelect!}");

- <#if asm_title??>
- // set the dropdown "title" if??
- multiple.attr('title', '${asm_title}');
- </#if>
-
- // use asmSelect in Widget Forms
- multiple.asmSelect({
- addItemTarget: 'top',
- sortable: ${asm_sortable!'false'},
- removeLabel: '${uiLabelMap.CommonRemove!'Remove'}'
- //, debugMode: true
- });
-
- <#if asm_relatedField??> <#-- can be used without related field -->
- // track possible relatedField changes
- // on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values.
- typeValue = jQuery('#${asm_typeField}').val();
- jQuery("#${asm_relatedField}").one('focus', function() {
- selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');
- });
- jQuery("#${asm_relatedField}").change(function() {
- selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');
+ <#if asm_title??>
+ // set the dropdown "title" if??
+ multiple.attr('title', '${asm_title}');
+ </#if>
+
+ // use asmSelect in Widget Forms
+ multiple.asmSelect({
+ addItemTarget: 'top',
+ sortable: ${asm_sortable!'false'},
+ removeLabel: '${uiLabelMap.CommonRemove!'Remove'}'
+ //, debugMode: true
+ });
+
+ <#if asm_relatedField??> <#-- can be used without related field -->
+ // track possible relatedField changes
+ // on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values.
+ typeValue = jQuery('#${asm_typeField}').val();
+ jQuery("#${asm_relatedField}").one('focus', function () {
+ selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');
+ });
+ jQuery("#${asm_relatedField}").change(function () {
+ selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');
+ });
+ selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');
+ </#if>
});
- selectMultipleRelatedValues('${asm_requestName}', '${asm_paramKey}', '${asm_relatedField}', '${asm_multipleSelect}', '${asm_type}', typeValue, '${asm_responseName}');
- </#if>
- });
</script>

<style type="text/css">
-#${asm_multipleSelectForm} {
- width: ${asm_formSize!700}px;
- position: relative;
-}
+ #${asm_multipleSelectForm}
+ {
+ width: ${asm_formSize!700}px
+ ;
+ position: relative
+ ;
+ }

-.asmListItem {
- width: ${asm_asmListItemPercentOfForm!95}%;
-}
+ .asmListItem {
+ width: ${asm_asmListItemPercentOfForm!95}%;
+ }
</style>
</#if>

Modified: ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJsList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJsList.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJsList.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/SetMultipleSelectJsList.ftl Tue Jul 5 13:41:14 2016
@@ -17,50 +17,52 @@ specific language governing permissions
under the License.
-->
<#if asm_listField??> <#-- we check only this var and suppose the others are also present -->
- <#list asm_listField as row>
- <#if row.asm_multipleSelect??>
- <script type="text/javascript">
- jQuery(document).ready(function() {
- multiple = jQuery("#${row.asm_multipleSelect!}");
-
- <#if row.asm_title??>
- // set the dropdown "title" if??
- multiple.attr('title', '${row.asm_title}');
- </#if>
-
- // use asmSelect in Widget Forms
- multiple.asmSelect({
- addItemTarget: 'top',
- sortable: ${row.asm_sortable!'false'},
- removeLabel: '${uiLabelMap.CommonRemove!'Remove'}'
- //, debugMode: true
- });
-
- <#if row.asm_relatedField??> <#-- can be used without related field -->
- // track possible relatedField changes
- // on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values.
- typeValue = jQuery('#${row.asm_typeField}').val();
- jQuery("#${row.asm_relatedField}").one('focus', function() {
- selectMultipleRelatedValues('${row.asm_requestName}', '${row.asm_paramKey}', '${row.asm_relatedField}', '${row.asm_multipleSelect}', '${row.asm_type}', typeValue, '${row.asm_responseName}');
- });
- jQuery("#${row.asm_relatedField}").change(function() {
- selectMultipleRelatedValues('${row.asm_requestName}', '${row.asm_paramKey}', '${row.asm_relatedField}', '${row.asm_multipleSelect}', '${row.asm_type}', typeValue, '${row.asm_responseName}');
- });
- selectMultipleRelatedValues('${row.asm_requestName}', '${row.asm_paramKey}', '${row.asm_relatedField}', '${row.asm_multipleSelect}', '${row.asm_type}', typeValue, '${row.asm_responseName}');
- </#if>
- });
- </script>
-
- </#if>
- </#list>
- <style type="text/css">
- #${asm_multipleSelectForm} {
- width: ${asm_formSize!700}px;
- position: relative;
- }
-
- .asmListItem {
- width: ${asm_asmListItemPercentOfForm!95}%;
- }
- </style>
+ <#list asm_listField as row>
+ <#if row.asm_multipleSelect??>
+ <script type="text/javascript">
+ jQuery(document).ready(function () {
+ multiple = jQuery("#${row.asm_multipleSelect!}");
+
+ <#if row.asm_title??>
+ // set the dropdown "title" if??
+ multiple.attr('title', '${row.asm_title}');
+ </#if>
+
+ // use asmSelect in Widget Forms
+ multiple.asmSelect({
+ addItemTarget: 'top',
+ sortable: ${row.asm_sortable!'false'},
+ removeLabel: '${uiLabelMap.CommonRemove!'Remove'}'
+ //, debugMode: true
+ });
+
+ <#if row.asm_relatedField??> <#-- can be used without related field -->
+ // track possible relatedField changes
+ // on initial focus (focus-field-name must be asm_relatedField) or if the field value changes, select related multi values.
+ typeValue = jQuery('#${row.asm_typeField}').val();
+ jQuery("#${row.asm_relatedField}").one('focus', function () {
+ selectMultipleRelatedValues('${row.asm_requestName}', '${row.asm_paramKey}', '${row.asm_relatedField}', '${row.asm_multipleSelect}', '${row.asm_type}', typeValue, '${row.asm_responseName}');
+ });
+ jQuery("#${row.asm_relatedField}").change(function () {
+ selectMultipleRelatedValues('${row.asm_requestName}', '${row.asm_paramKey}', '${row.asm_relatedField}', '${row.asm_multipleSelect}', '${row.asm_type}', typeValue, '${row.asm_responseName}');
+ });
+ selectMultipleRelatedValues('${row.asm_requestName}', '${row.asm_paramKey}', '${row.asm_relatedField}', '${row.asm_multipleSelect}', '${row.asm_type}', typeValue, '${row.asm_responseName}');
+ </#if>
+ });
+ </script>
+ </#if>
+ </#list>
+ <style type="text/css">
+ #${asm_multipleSelectForm}
+ {
+ width: ${asm_formSize!700}px
+ ;
+ position: relative
+ ;
+ }
+
+ .asmListItem {
+ width: ${asm_asmListItemPercentOfForm!95}%;
+ }
+</style>
</#if>

Modified: ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/Simple.fo.ftl Tue Jul 5 13:41:14 2016
@@ -19,87 +19,90 @@ under the License.
<#escape x as x?xml>
<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
<#-- inheritance -->
- <#if defaultFontFamily?has_content>font-family="${defaultFontFamily}"</#if>
->
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simple-portrait"
- page-width="8.5in" page-height="11in"
- margin-top="0.3in" margin-bottom="0.3in"
- margin-left="0.4in" margin-right="0.3in">
- <fo:region-body margin-top="1in" margin-bottom="0.5in"/>
- <fo:region-before extent="1in"/>
- <fo:region-after extent="0.5in" />
- </fo:simple-page-master>
- <fo:simple-page-master master-name="simple-landscape"
- page-width="11in" page-height="8.5in"
- margin-top="0.3in" margin-bottom="0.3in"
- margin-left="0.4in" margin-right="0.3in">
- <fo:region-body margin-top="1in" margin-bottom="0.5in"/>
- <fo:region-before extent="1in"/>
- <fo:region-after extent="0.5in" />
- </fo:simple-page-master>
- </fo:layout-master-set>
+ <#if defaultFontFamily?has_content>font-family="${defaultFontFamily}"</#if>>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple-portrait"
+ page-width="8.5in" page-height="11in"
+ margin-top="0.3in" margin-bottom="0.3in"
+ margin-left="0.4in" margin-right="0.3in">
+ <fo:region-body margin-top="1in" margin-bottom="0.5in"/>
+ <fo:region-before extent="1in"/>
+ <fo:region-after extent="0.5in"/>
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="simple-landscape"
+ page-width="11in" page-height="8.5in"
+ margin-top="0.3in" margin-bottom="0.3in"
+ margin-left="0.4in" margin-right="0.3in">
+ <fo:region-body margin-top="1in" margin-bottom="0.5in"/>
+ <fo:region-before extent="1in"/>
+ <fo:region-after extent="0.5in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>

- <fo:page-sequence master-reference="${pageLayoutName?default("simple-portrait")}" font-size="8pt">
- <#-- Header -->
- <#-- The elements it it are positioned using a table composed by one row
- composed by two cells (each 50% of the total table that is 100% of the page):
- in the left side cell we put the logo
- in the right side cell we put the title, username and date
- -->
- <fo:static-content flow-name="xsl-region-before" font-size="${headerFontSize?default("8pt")}">
- <fo:table table-layout="fixed">
- <fo:table-column column-number="1" column-width="proportional-column-width(50)"/>
- <fo:table-column column-number="2" column-width="proportional-column-width(50)"/>
- <fo:table-body>
- <fo:table-row>
- <fo:table-cell>
- <fo:block>
- <#if logoImageUrl??>
- <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px" content-height="scale-to-fit"/>
- </#if>
- </fo:block>
- </fo:table-cell>
- <fo:table-cell>
- <#-- The title of the report -->
- <fo:block font-weight="bold" text-decoration="underline" space-after="0.03in">
- <#if titleProperty??>${uiLabelMap.get(titleProperty)}<#else>${title!}</#if>
- </fo:block>
- <#-- Username and date -->
- <fo:list-block provisional-distance-between-starts="1in">
- <fo:list-item>
- <fo:list-item-label>
- <fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
- </fo:list-item-body>
- </fo:list-item>
- <fo:list-item>
- <fo:list-item-label>
- <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
- </fo:list-item-label>
- <fo:list-item-body start-indent="body-start()">
- <fo:block>${nowTimestamp!}</fo:block>
- </fo:list-item-body>
- </fo:list-item>
- </fo:list-block>
- </fo:table-cell>
- </fo:table-row>
- </fo:table-body>
- </fo:table>
- </fo:static-content>
+ <fo:page-sequence master-reference="${pageLayoutName?default("simple-portrait")}" font-size="8pt">
+ <#-- Header -->
+ <#-- The elements it it are positioned using a table composed by one row
+ composed by two cells (each 50% of the total table that is 100% of the page):
+ in the left side cell we put the logo
+ in the right side cell we put the title, username and date
+ -->
+ <fo:static-content flow-name="xsl-region-before" font-size="${headerFontSize?default("8pt")}">
+ <fo:table table-layout="fixed">
+ <fo:table-column column-number="1" column-width="proportional-column-width(50)"/>
+ <fo:table-column column-number="2" column-width="proportional-column-width(50)"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>
+ <#if logoImageUrl??>
+ <fo:external-graphic src="${logoImageUrl}" overflow="hidden" height="40px"
+ content-height="scale-to-fit"/>
+ </#if>
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <#-- The title of the report -->
+ <fo:block font-weight="bold" text-decoration="underline" space-after="0.03in">
+ <#if titleProperty??>${uiLabelMap.get(titleProperty)}<#else>${title!}</#if>
+ </fo:block>
+ <#-- Username and date -->
+ <fo:list-block provisional-distance-between-starts="1in">
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block font-weight="bold">${uiLabelMap.CommonUsername}</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block><#if userLogin??>${userLogin.userLoginId!}</#if></fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label>
+ <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>${nowTimestamp!}</fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:static-content>

- <#-- Footer -->
- <fo:static-content flow-name="xsl-region-after" font-size="${footerFontSize?default("8pt")}">
- <fo:block text-align="center" border-top="thin solid black" padding="3pt">${uiLabelMap.CommonPage} <fo:page-number/> ${uiLabelMap.CommonOf} <fo:page-number-citation ref-id="theEnd"/></fo:block>
- </fo:static-content>
+ <#-- Footer -->
+ <fo:static-content flow-name="xsl-region-after" font-size="${footerFontSize?default("8pt")}">
+ <fo:block text-align="center" border-top="thin solid black" padding="3pt">${uiLabelMap.CommonPage}
+ <fo:page-number/> ${uiLabelMap.CommonOf}
+ <fo:page-number-citation ref-id="theEnd"/>
+ </fo:block>
+ </fo:static-content>

- <#-- Body -->
- <fo:flow flow-name="xsl-region-body" font-size="${bodyFontSize?default("8pt")}">
-${sections.render("body")}
- <fo:block id="theEnd"/>
- </fo:flow>
- </fo:page-sequence>
+ <#-- Body -->
+ <fo:flow flow-name="xsl-region-body" font-size="${bodyFontSize?default("8pt")}">
+ ${sections.render("body")}
+ <fo:block id="theEnd"/>
+ </fo:flow>
+ </fo:page-sequence>
</fo:root>
</#escape>

Modified: ofbiz/trunk/framework/common/template/includes/Simple.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/Simple.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/Simple.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/Simple.ftl Tue Jul 5 13:41:14 2016
@@ -20,43 +20,44 @@ under the License.
<#assign docLangAttr = locale.toString()?replace("_", "-")>
<#assign langDir = "ltr">
<#if "ar.iw"?contains(docLangAttr?substring(0, 2))>
- <#assign langDir = "rtl">
+ <#assign langDir = "rtl">
</#if>

<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml">
-<head>
+ <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>${layoutSettings.companyName!}: <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
+ <title>${layoutSettings.companyName!}
+ : <#if (page.titleProperty)?has_content>${uiLabelMap[page.titleProperty]}<#else>${(page.title)!}</#if></title>
<#if layoutSettings.shortcutIcon?has_content>
- <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>" />
+ <link rel="shortcut icon" href="<@ofbizContentUrl>${layoutSettings.shortcutIcon}</@ofbizContentUrl>"/>
</#if>
<#if layoutSettings.javaScripts?has_content>
- <#--layoutSettings.javaScripts is a list of java scripts. -->
- <#list layoutSettings.javaScripts as javaScript>
- <script language="javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
- </#list>
+ <#--layoutSettings.javaScripts is a list of java scripts. -->
+ <#list layoutSettings.javaScripts as javaScript>
+ <script language="javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
+ </#list>
</#if>
<#if layoutSettings.styleSheets?has_content>
- <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
- <#list layoutSettings.styleSheets as styleSheet>
- <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
- </#list>
+ <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.-->
+ <#list layoutSettings.styleSheets as styleSheet>
+ <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+ </#list>
<#else>
- <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
+ <link rel="stylesheet" href="<@ofbizContentUrl>/images/maincss.css</@ofbizContentUrl>" type="text/css"/>
</#if>
<#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl">
- <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
- <#list layoutSettings.rtlStyleSheets as styleSheet>
- <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
- </#list>
+ <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.-->
+ <#list layoutSettings.rtlStyleSheets as styleSheet>
+ <link rel="stylesheet" href="<@ofbizContentUrl>${styleSheet}</@ofbizContentUrl>" type="text/css"/>
+ </#list>
</#if>
-</head>
+ </head>

-<body id="column-container" style="background: white;">
-<form name="printPage">
-<input type="button" value="${uiLabelMap.CommonPrint}" onclick="window.print()" class="smallSubmit"/>
-</form>
-<br />
-${sections.render("body")}
-</body>
+ <body id="column-container" style="background: white;">
+ <form name="printPage">
+ <input type="button" value="${uiLabelMap.CommonPrint}" onclick="window.print()" class="smallSubmit"/>
+ </form>
+ <br/>
+ ${sections.render("body")}
+ </body>
</html>

Modified: ofbiz/trunk/framework/common/template/includes/Simple.xls.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/Simple.xls.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/Simple.xls.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/Simple.xls.ftl Tue Jul 5 13:41:14 2016
@@ -22,19 +22,36 @@ under the License.
<#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>
+ <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
+ </head>

-<body>
+ <body>
<style>
- .txf {mso-number-format:\@} <#-- Text format-->
- .cf {mso-number-format:"\#\#0.00"} <#-- currency format-->
- .nf {mso-number-format:"0.00"} <#-- number format-->
- .tf {mso-number-format:"HH:mm:ss"} <#-- time format-->
- .df {mso-number-format:"yyyy-MM-dd"} <#-- date format-->
- .dtf {mso-number-format:"yyyy-MM-dd HH:mm:ss"} <#-- date-time format-->
+ .txf {
+ mso-number-format: \@
+ } <#-- Text format-->
+
+ .cf {
+ mso-number-format: "\#\#0.00"
+ } <#-- currency format-->
+
+ .nf {
+ mso-number-format: "0.00"
+ } <#-- number format-->
+
+ .tf {
+ mso-number-format: "HH:mm:ss"
+ } <#-- time format-->
+
+ .df {
+ mso-number-format: "yyyy-MM-dd"
+ } <#-- date format-->
+
+ .dtf {
+ mso-number-format: "yyyy-MM-dd HH:mm:ss"
+ } <#-- date-time format-->
</style>
-${sections.render("body")}
-</body>
+ ${sections.render("body")}
+ </body>
</html>

Modified: ofbiz/trunk/framework/common/template/includes/States.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/States.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/States.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/States.ftl Tue Jul 5 13:41:14 2016
@@ -18,12 +18,13 @@ under the License.
-->
<#assign states = Static["org.ofbiz.common.CommonWorkers"].getStateList(delegator)>
<#list states as state>
- <option value='${state.geoId}'>${state.geoName?default(state.geoId)}</option>
+ <option value='${state.geoId}'>${state.geoName?default(state.geoId)}</option>
</#list>

<#-- Here is some alternate code to get states limited to a region
<#if requestParameters.CUSTOMER_COUNTRY??>
- <#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,requestParameters.CUSTOMER_COUNTRY)>
+ <#assign stateAssocs = Static[
+ "org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,requestParameters.CUSTOMER_COUNTRY)>
<#else>
<#assign stateAssocs = Static["org.ofbiz.common.CommonWorkers"].getAssociatedStateList(delegator,null)>
</#if>

Modified: ofbiz/trunk/framework/common/template/includes/TimeDuration.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/TimeDuration.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/TimeDuration.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/TimeDuration.ftl Tue Jul 5 13:41:14 2016
@@ -17,24 +17,24 @@ specific language governing permissions
under the License.
-->
<script language="JavaScript" type="text/javascript">
- function setTimeDuration() {
- var years = window.document.getElementsByName("years")[0].value;
- var weeks = window.document.getElementsByName("weeks")[0].value;
- var days = window.document.getElementsByName("days")[0].value;
- var hours = window.document.getElementsByName("hours")[0].value;
- var minutes = window.document.getElementsByName("minutes")[0].value;
- var seconds = window.document.getElementsByName("seconds")[0].value;
- var millis = window.document.getElementsByName("millis")[0].value;
- var duration = 0;
- duration += years == null ? 0 : years * 31536000000;
- duration += weeks == null ? 0 : weeks * 604800000;
- duration += days == null ? 0 : days * 86400000;
- duration += hours == null ? 0 : hours * 3600000;
- duration += minutes == null ? 0 : minutes * 60000;
- duration += seconds == null ? 0 : seconds * 1000;
- duration += millis == null ? 0 : millis;
- set_duration_value(duration);
- }
+ function setTimeDuration() {
+ var years = window.document.getElementsByName("years")[0].value;
+ var weeks = window.document.getElementsByName("weeks")[0].value;
+ var days = window.document.getElementsByName("days")[0].value;
+ var hours = window.document.getElementsByName("hours")[0].value;
+ var minutes = window.document.getElementsByName("minutes")[0].value;
+ var seconds = window.document.getElementsByName("seconds")[0].value;
+ var millis = window.document.getElementsByName("millis")[0].value;
+ var duration = 0;
+ duration += years == null ? 0 : years * 31536000000;
+ duration += weeks == null ? 0 : weeks * 604800000;
+ duration += days == null ? 0 : days * 86400000;
+ duration += hours == null ? 0 : hours * 3600000;
+ duration += minutes == null ? 0 : minutes * 60000;
+ duration += seconds == null ? 0 : seconds * 1000;
+ duration += millis == null ? 0 : millis;
+ set_duration_value(duration);
+ }
</script>
<form name="TimeDuration" action="javascript:setTimeDuration()">
<table cellspacing="0" class="basic-table">

Modified: ofbiz/trunk/framework/common/template/includes/ViewCertificate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/template/includes/ViewCertificate.ftl?rev=1751469&r1=1751468&r2=1751469&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/template/includes/ViewCertificate.ftl (original)
+++ ofbiz/trunk/framework/common/template/includes/ViewCertificate.ftl Tue Jul 5 13:41:14 2016
@@ -19,7 +19,7 @@ under the License.

<#assign components = Static["org.ofbiz.base.component.ComponentConfig"].getAllComponents()!/>
<#if (requestParameters.certString?has_content)>
- <#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
+ <#assign cert = Static["org.ofbiz.base.util.KeyStoreUtil"].pemToCert(requestParameters.certString)/>
</#if>
<div class="screenlet">
<div class="screenlet-title-bar">
@@ -27,11 +27,11 @@ under the License.
</div>
<div class="screenlet-body">
<#if (cert?has_content)>
- <span class="label">${uiLabelMap.CertType}</span> ${cert.getType()} : ${cert.getSubjectX500Principal()}
- <span class="label">${uiLabelMap.CertName}</span> ${cert.getSubjectX500Principal().getName()}
- <span class="label">${uiLabelMap.CertSerialNumber}</span> ${cert.getSerialNumber().toString(16)}
+ <span class="label">${uiLabelMap.CertType}</span> ${cert.getType()} : ${cert.getSubjectX500Principal()}
+ <span class="label">${uiLabelMap.CertName}</span> ${cert.getSubjectX500Principal().getName()}
+ <span class="label">${uiLabelMap.CertSerialNumber}</span> ${cert.getSerialNumber().toString(16)}
<#else>
- <h3>${uiLabelMap.CertInvalid}</h3>
+ <h3>${uiLabelMap.CertInvalid}</h3>
</#if>
</div>
</div>
@@ -50,23 +50,23 @@ under the License.
</tr>
<#list components as component>
<#assign keystores = component.getKeystoreInfos()!/>
- <#list keystores as store>
- <#if (store.isTrustStore())>
- <tr>
- <form method="post" action="<@ofbizUrl>/importIssuerProvision</@ofbizUrl>">
- <input type="hidden" name="componentName" value="${component.getComponentName()}"/>
- <input type="hidden" name="keystoreName" value="${store.getName()}"/>
- <input type="hidden" name="certString" value="${requestParameters.certString}"/>
- <td>${component.getComponentName()}</td>
- <td>${store.getName()}</td>
- <td align="center"><input type="checkbox" name="importIssuer" value="Y"/>
- <td><input type="text" name="alias" size="20"/>
- <td align="right"><input type="submit" value="${uiLabelMap.CommonSave}"/>
- </form>
- </tr>
- </#if>
- </#list>
+ <#list keystores as store>
+ <#if (store.isTrustStore())>
+ <tr>
+ <form method="post" action="<@ofbizUrl>/importIssuerProvision</@ofbizUrl>">
+ <input type="hidden" name="componentName" value="${component.getComponentName()}"/>
+ <input type="hidden" name="keystoreName" value="${store.getName()}"/>
+ <input type="hidden" name="certString" value="${requestParameters.certString}"/>
+ <td>${component.getComponentName()}</td>
+ <td>${store.getName()}</td>
+ <td align="center"><input type="checkbox" name="importIssuer" value="Y"/>
+ <td><input type="text" name="alias" size="20"/>
+ <td align="right"><input type="submit" value="${uiLabelMap.CommonSave}"/>
+ </form>
+ </tr>
+ </#if>
+ </#list>
</#list>
</table>
</div>
-</div>
\ No newline at end of file
+</div>