Author: pranayp
Date: Tue Jul 5 13:20:07 2016 New Revision: 1751464 URL: http://svn.apache.org/viewvc?rev=1751464&view=rev Log: [OFBIZ-7678] No functional change. BI component FTL reformatting for better readability. Thanks Vaibhav Jain for the contribution. Modified: ofbiz/trunk/specialpurpose/bi/template/Main.ftl ofbiz/trunk/specialpurpose/bi/template/reportbuilder/RenderStarSchemaReport.ftl ofbiz/trunk/specialpurpose/bi/template/reportbuilder/SelectStarSchemaFields.ftl Modified: ofbiz/trunk/specialpurpose/bi/template/Main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/template/Main.ftl?rev=1751464&r1=1751463&r2=1751464&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/template/Main.ftl (original) +++ ofbiz/trunk/specialpurpose/bi/template/Main.ftl Tue Jul 5 13:20:07 2016 @@ -19,38 +19,38 @@ under the License. <h1>${uiLabelMap.BusinessIntelligenceIntegratedFramework}</h1> <p> - ${uiLabelMap.BusinessIntelligenceNote1} - ${uiLabelMap.BusinessIntelligenceNote2} - ${uiLabelMap.BusinessIntelligenceNote3} - ${uiLabelMap.BusinessIntelligenceNote4} - ${uiLabelMap.BusinessIntelligenceNote5} - ${uiLabelMap.BusinessIntelligenceNote6} - ${uiLabelMap.BusinessIntelligenceNote7} - ${uiLabelMap.BusinessIntelligenceNote8} - ${uiLabelMap.BusinessIntelligenceNote9} - ${uiLabelMap.BusinessIntelligenceNote10} - ${uiLabelMap.BusinessIntelligenceNote11} - ${uiLabelMap.BusinessIntelligenceNote12} + ${uiLabelMap.BusinessIntelligenceNote1} + ${uiLabelMap.BusinessIntelligenceNote2} + ${uiLabelMap.BusinessIntelligenceNote3} + ${uiLabelMap.BusinessIntelligenceNote4} + ${uiLabelMap.BusinessIntelligenceNote5} + ${uiLabelMap.BusinessIntelligenceNote6} + ${uiLabelMap.BusinessIntelligenceNote7} + ${uiLabelMap.BusinessIntelligenceNote8} + ${uiLabelMap.BusinessIntelligenceNote9} + ${uiLabelMap.BusinessIntelligenceNote10} + ${uiLabelMap.BusinessIntelligenceNote11} + ${uiLabelMap.BusinessIntelligenceNote12} </p> <h2>${uiLabelMap.BusinessIntelligenceCurrentStatus}</h2> <p> - ${uiLabelMap.BusinessIntelligenceNote13} - ${uiLabelMap.BusinessIntelligenceNote14} - ${uiLabelMap.BusinessIntelligenceNote15} - ${uiLabelMap.BusinessIntelligenceNote16} - ${uiLabelMap.BusinessIntelligenceNote17} - ${uiLabelMap.BusinessIntelligenceNote18} + ${uiLabelMap.BusinessIntelligenceNote13} + ${uiLabelMap.BusinessIntelligenceNote14} + ${uiLabelMap.BusinessIntelligenceNote15} + ${uiLabelMap.BusinessIntelligenceNote16} + ${uiLabelMap.BusinessIntelligenceNote17} + ${uiLabelMap.BusinessIntelligenceNote18} </p> <h2>${uiLabelMap.BusinessIntelligenceQuickStartGuide}</h2> <p> - ${uiLabelMap.BusinessIntelligenceNote19} - ${uiLabelMap.BusinessIntelligenceNote20} - ${uiLabelMap.BusinessIntelligenceNote21} - ${uiLabelMap.BusinessIntelligenceNote22} - ${uiLabelMap.BusinessIntelligenceNote23} - ${uiLabelMap.BusinessIntelligenceNote24} - ${uiLabelMap.BusinessIntelligenceNote25} - ${uiLabelMap.BusinessIntelligenceNote26} - ${uiLabelMap.BusinessIntelligenceNote27} - ${uiLabelMap.BusinessIntelligenceNote28} + ${uiLabelMap.BusinessIntelligenceNote19} + ${uiLabelMap.BusinessIntelligenceNote20} + ${uiLabelMap.BusinessIntelligenceNote21} + ${uiLabelMap.BusinessIntelligenceNote22} + ${uiLabelMap.BusinessIntelligenceNote23} + ${uiLabelMap.BusinessIntelligenceNote24} + ${uiLabelMap.BusinessIntelligenceNote25} + ${uiLabelMap.BusinessIntelligenceNote26} + ${uiLabelMap.BusinessIntelligenceNote27} + ${uiLabelMap.BusinessIntelligenceNote28} </p> Modified: ofbiz/trunk/specialpurpose/bi/template/reportbuilder/RenderStarSchemaReport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/template/reportbuilder/RenderStarSchemaReport.ftl?rev=1751464&r1=1751463&r2=1751464&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/template/reportbuilder/RenderStarSchemaReport.ftl (original) +++ ofbiz/trunk/specialpurpose/bi/template/reportbuilder/RenderStarSchemaReport.ftl Tue Jul 5 13:20:07 2016 @@ -18,25 +18,25 @@ under the License. --> <table cellspacing="0" class="basic-table hover-bar"> - <tr class="header-row"> - <#assign firstRecord = records[0]!/> - <#list columnNames as columnName> - <td<#if firstRecord?? && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>> - ${columnName} - </td> - </#list> - </tr> - <#assign alt_row = false> - <#list records as record> + <tr class="header-row"> + <#assign firstRecord = records[0]!/> + <#list columnNames as columnName> + <td<#if firstRecord?? && firstRecord[columnName]?default("")?is_number> class="align-text"</#if>> + ${columnName} + </td> + </#list> + </tr> + <#assign alt_row = false> + <#list records as record> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <#list columnNames as columnName> + <#list columnNames as columnName> <#assign columnValue = record[columnName]?default("")> <td<#if columnValue?is_number> class="align-text"</#if>> - ${columnValue} + ${columnValue} </td> - </#list> + </#list> </tr> <#-- toggle the row color --> <#assign alt_row = !alt_row> - </#list> + </#list> </table> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/bi/template/reportbuilder/SelectStarSchemaFields.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/template/reportbuilder/SelectStarSchemaFields.ftl?rev=1751464&r1=1751463&r2=1751464&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/bi/template/reportbuilder/SelectStarSchemaFields.ftl (original) +++ ofbiz/trunk/specialpurpose/bi/template/reportbuilder/SelectStarSchemaFields.ftl Tue Jul 5 13:20:07 2016 @@ -18,40 +18,30 @@ under the License. --> <form action="<@ofbizUrl>ReportBuilderRenderStarSchemaReport</@ofbizUrl>"> - <input type="hidden" name="starSchemaName" value="${starSchemaName}"/> - <table cellspacing="0" class="basic-table hover-bar"> - <tr class="header-row"> - <td> - ${uiLabelMap.CommonSelect} - </td> - <td> - ${uiLabelMap.BusinessIntelligenceFieldName} - </td> - <td> - ${uiLabelMap.BusinessIntelligenceFieldDescription} - </td> - </tr> - <#assign alt_row = false> - <#list starSchemaFields as starSchemaField> - <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> - <td> - <input name="selectedFieldName_o_${starSchemaField_index}" value="${starSchemaField.name}" type="hidden"/> - <input name="_rowSubmit_o_${starSchemaField_index}" value="Y" type="checkbox"/> - </td> - <td> - ${starSchemaField.name} - </td> - <td> - ${starSchemaField.description?default("")} - </td> - </tr> - <#-- toggle the row color --> - <#assign alt_row = !alt_row> - </#list> - <tr> - <td colspan="3"> - <input name="submitButton" type="submit" value="${uiLabelMap.BusinessIntelligenceRenderTheReport}"/> - </td> - </tr> - </table> + <input type="hidden" name="starSchemaName" value="${starSchemaName}"/> + <table cellspacing="0" class="basic-table hover-bar"> + <tr class="header-row"> + <td>${uiLabelMap.CommonSelect}</td> + <td>${uiLabelMap.BusinessIntelligenceFieldName}</td> + <td>${uiLabelMap.BusinessIntelligenceFieldDescription}</td> + </tr> + <#assign alt_row = false> + <#list starSchemaFields as starSchemaField> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td> + <input name="selectedFieldName_o_${starSchemaField_index}" value="${starSchemaField.name}" type="hidden"/> + <input name="_rowSubmit_o_${starSchemaField_index}" value="Y" type="checkbox"/> + </td> + <td>${starSchemaField.name}</td> + <td>${starSchemaField.description?default("")}</td> + </tr> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <tr> + <td colspan="3"> + <input name="submitButton" type="submit" value="${uiLabelMap.BusinessIntelligenceRenderTheReport}"/> + </td> + </tr> + </table> </form> \ No newline at end of file |
Free forum by Nabble | Edit this page |