You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2020/04/24 12:35:52 UTC
[myfaces-tobago] branch master updated: fix image path in
tc:selectManyCheckbox and tc:selectOneRadio
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new a703b30 fix image path in tc:selectManyCheckbox and tc:selectOneRadio
a703b30 is described below
commit a703b305d74781987d1316a7ff53b1cf2277996f
Author: Jasmin Kroeger <ja...@irian.eu>
AuthorDate: Fri Apr 24 10:59:51 2020 +0200
fix image path in tc:selectManyCheckbox and tc:selectOneRadio
* change images location from resources/META-INF/resources.data to webapp/image
* change path in Radio.xhtml and Multi_Checkbox.xhtml
---
.../20-component/030-select/30-selectOneRadio/Radio.xhtml | 2 +-
.../030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml | 2 +-
.../META-INF/resources/data => webapp/image}/EUR-14.png | Bin
.../META-INF/resources/data => webapp/image}/EUR.png | Bin
.../META-INF/resources/data => webapp/image}/JPY-14.png | Bin
.../META-INF/resources/data => webapp/image}/JPY.png | Bin
.../META-INF/resources/data => webapp/image}/TTD-14.png | Bin
.../META-INF/resources/data => webapp/image}/TTD.png | Bin
.../META-INF/resources/data => webapp/image}/USD-14.png | Bin
.../META-INF/resources/data => webapp/image}/USD.png | Bin
.../data => webapp/image}/sun-behind-mountains.jpg | Bin
11 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
index 9ab6de0..156d98c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
@@ -75,7 +75,7 @@
<tc:selectOneRadio>
<tc:selectItems value="#{demoController.currencyItems}"
var="currency" itemValue="#{currency.currencyCode}" itemLabel="#{currency.displayName}"
- itemImage="#{request.contextPath}/data/#{currency.currencyCode}-14.png"/>
+ itemImage="#{request.contextPath}/image/#{currency.currencyCode}-14.png"/>
</tc:selectOneRadio>
</tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
index 2de2a7c..2fbf719 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
@@ -69,7 +69,7 @@
<tc:selectManyCheckbox>
<tc:selectItems value="#{demoController.currencyItems}"
var="currency" itemValue="#{currency.currencyCode}" itemLabel="#{currency.displayName}"
- itemImage="#{request.contextPath}/data/#{currency.currencyCode}-14.png"/>
+ itemImage="#{request.contextPath}/image/#{currency.currencyCode}-14.png"/>
</tc:selectManyCheckbox>
</tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/EUR-14.png b/tobago-example/tobago-example-demo/src/main/webapp/image/EUR-14.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/EUR-14.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/EUR-14.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/EUR.png b/tobago-example/tobago-example-demo/src/main/webapp/image/EUR.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/EUR.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/EUR.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/JPY-14.png b/tobago-example/tobago-example-demo/src/main/webapp/image/JPY-14.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/JPY-14.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/JPY-14.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/JPY.png b/tobago-example/tobago-example-demo/src/main/webapp/image/JPY.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/JPY.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/JPY.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/TTD-14.png b/tobago-example/tobago-example-demo/src/main/webapp/image/TTD-14.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/TTD-14.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/TTD-14.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/TTD.png b/tobago-example/tobago-example-demo/src/main/webapp/image/TTD.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/TTD.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/TTD.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/USD-14.png b/tobago-example/tobago-example-demo/src/main/webapp/image/USD-14.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/USD-14.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/USD-14.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/USD.png b/tobago-example/tobago-example-demo/src/main/webapp/image/USD.png
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/USD.png
rename to tobago-example/tobago-example-demo/src/main/webapp/image/USD.png
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/sun-behind-mountains.jpg b/tobago-example/tobago-example-demo/src/main/webapp/image/sun-behind-mountains.jpg
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/resources/META-INF/resources/data/sun-behind-mountains.jpg
rename to tobago-example/tobago-example-demo/src/main/webapp/image/sun-behind-mountains.jpg