Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2771] trunk/openutils-mgnlmedia/src/main/resources
|
From: <die...@us...> - 2010-07-01 07:05:25
|
Revision: 2771
http://openutils.svn.sourceforge.net/openutils/?rev=2771&view=rev
Author: diego_schivo
Date: 2010-07-01 07:05:18 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
MEDIA-145 refactoring ftl
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2010-07-01 07:05:18 UTC (rev 2771)
@@ -12,16 +12,19 @@
</head>
<body>
<form action="${this.request.contextPath}/media/search" target="mediaFolderView">
- <#macro rendersFilter filters>
- <#list filters?keys as filterKey>
- <#if filters[filterKey].control?? & filters[filterKey].control?length gt 0>
- <#assign controlUrl>/search/freemarker/controls/${filters[filterKey].control}.ftl</#assign>
- <#assign filter=filters[filterKey] >
- <#include controlUrl />
- </#if>
- </#list>
- </#macro>
- <@rendersFilter filters=this.configuration.filters />
+ [#macro msgIfAvail key]
+ [#if !(this.msgs[key])?starts_with("???")]${this.msgs[key]}[#else]${key}[/#if]
+ [/#macro]
+ [#macro rendersFilter filters]
+ [#list filters?keys as filterKey]
+ [#if filters[filterKey].control?? & filters[filterKey].control?length gt 0]
+ [#assign controlUrl]/search/freemarker/controls/${filters[filterKey].control}.ftl[/#assign]
+ [#assign filter=filters[filterKey]]
+ [#include controlUrl /]
+ [/#if]
+ [/#list]
+ [/#macro]
+ [@rendersFilter filters=this.configuration.filters /]
<input type="hidden" name="selectMedia" value="${this.selectMedia?string('true', 'false')}" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl 2010-07-01 07:05:18 UTC (rev 2771)
@@ -1,24 +1,12 @@
<div class="row">
[#if filter.label??]
- <label for="${filterKey}">
- [#if !(this.msgs[filter.label])?starts_with("???")]
- ${this.msgs[filter.label]}
- [#else]
- ${filter.label}
- [/#if]
- </label>
+ <label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
[#list filter.options as option]
<div class="inner-row">
<input type="checkbox" name="${filterKey}" value="${option.value}" />
- <span>
- [#if !(this.msgs[option.label])?starts_with("???")]
- ${this.msgs[option.label]}
- [#else]
- ${option.label}
- [/#if]
- </span>
+ <span>[@msgIfAvail option.label /]</span>
</div>
[/#list]
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl 2010-07-01 07:05:18 UTC (rev 2771)
@@ -1,12 +1,6 @@
<div class="row">
[#if filter.label??]
- <label for="${filterKey}">
- [#if !(this.msgs[filter.label])?starts_with("???")]
- ${this.msgs[filter.label]}
- [#else]
- ${filter.label}
- [/#if]
- </label>
+ <label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
<input type="text" name="${filterKey}" id="${filterKey}" value="" class="input-date" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/empty.ftl 2010-07-01 07:05:18 UTC (rev 2771)
@@ -1,11 +1,5 @@
<div class="row">
[#if filter.label??]
- <label for="${filterKey}">
- [#if !(this.msgs[filter.label])?starts_with("???")]
- ${this.msgs[filter.label]}
- [#else]
- ${filter.label}
- [/#if]
- </label>
+ <label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if] NOT READY
</div>
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl 2010-07-01 07:05:18 UTC (rev 2771)
@@ -1,12 +1,6 @@
<div class="row">
[#if filter.label??]
- <label for="${filterKey}">
- [#if !(this.msgs[filter.label])?starts_with("???")]
- ${this.msgs[filter.label]}
- [#else]
- ${filter.label}
- [/#if]
- </label>
+ <label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
<input type="text" name="${filterKey}" value="" class="text" />
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl 2010-07-01 07:05:18 UTC (rev 2771)
@@ -1,28 +1,12 @@
<div class="row">
[#if filter.label??]
- <label for="${filterKey}">
- [#if !(this.msgs[filter.label])?starts_with("???")]
- ${this.msgs[filter.label]}
- [#else]
- ${filter.label}
- [/#if]
- </label>
+ <label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
[#list filter.options as option]
<div class="inner-row">
- [#if option.defaultValue?? & option.defaultValue]
- <input type="radio" name="${filterKey}" value="${option.value}" checked="checked" />
- [#else]
- <input type="radio" name="${filterKey}" value="${option.value}" />
- [/#if]
- <span>
- [#if !(this.msgs[option.label])?starts_with("???")]
- ${this.msgs[option.label]}
- [#else]
- ${option.label}
- [/#if]
- </span>
+ <input type="radio" name="${filterKey}" value="${option.value}" [#if option.defaultValue?? & option.defaultValue]checked="checked"[/#if] />
+ <span>[@msgIfAvail option.label /]</span>
</div>
[/#list]
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl 2010-07-01 06:53:55 UTC (rev 2770)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl 2010-07-01 07:05:18 UTC (rev 2771)
@@ -1,29 +1,11 @@
<div class="row">
[#if filter.label??]
- <label for="${filterKey}">
- [#if !(this.msgs[filter.label])?starts_with("???")]
- ${this.msgs[filter.label]}
- [#else]
- ${filter.label}
- [/#if]
- </label>
+ <label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
<select name="${filterKey}" id="${filterKey}">
[#list filter.options as option]
- [#if option.defaultValue?? & option.defaultValue]
- <option value="${option.value}" selected="selected">
- [#else]
- <option value="${option.value}">
- [/#if]
-
- [#if !(this.msgs[option.label])?starts_with("???")]
- ${this.msgs[option.label]}
- [#else]
- ${option.label}
- [/#if]
-
- </option>
+ <option value="${option.value}" [#if option.defaultValue?? & option.defaultValue]selected="selected"[/#if]>[@msgIfAvail option.label /]</option>
[/#list]
</select>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
