[elvystrac] r1743 - 'label' component upgraded
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Tue, 16 Feb 2010 18:35:39 +0100
Author: DavidK
Date: 2010-02-16 18:35:39 +0100 (Tue, 16 Feb 2010)
New Revision: 1743
Added:
trunk/server/webServer2/WebContent/secured/components/label.xhtml
Removed:
trunk/server/webServer2/WebContent/secured/components/labelWithTooltip.xhtml
Modified:
trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml
trunk/server/webServer2/WebContent/secured/categrel/editCatDefForm.xhtml
trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml
trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml
Log:
'label' component upgraded
Modified: trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml
===================================================================
--- trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml 2010-02-16
15:41:02 UTC (rev 1742)
+++ trunk/server/webServer2/WebContent/WEB-INF/elvystags.xml 2010-02-16
17:35:39 UTC (rev 1743)
@@ -15,8 +15,8 @@
<source>../secured/components/layoutPreviewModalComponent.xhtml</source>
</tag>
<tag>
- <tag-name>labelWithTooltip</tag-name>
- <source>../secured/components/labelWithTooltip.xhtml</source>
+ <tag-name>label</tag-name>
+ <source>../secured/components/label.xhtml</source>
</tag>
<tag>
<tag-name>inputText</tag-name>
@@ -35,10 +35,18 @@
<source>../secured/components/user/userLabelComponent.xhtml</source>
</tag>
<tag>
- <tag-name>fileListComponent</tag-name>
+ <tag-name>fileListComponentOld</tag-name>
<source>../secured/plug/file-choose.xhtml</source>
</tag>
<tag>
+ <tag-name>fileListComponent</tag-name>
+
<source>../secured/components/file/fileListComponent.xhtml</source>
+ </tag>
+ <tag>
+ <tag-name>fileListInitTagHandler</tag-name>
+
<handler-class>cz.elvys.webServer.beans.filerel.FileListInitTagHandler</handler-class>
+ </tag>
+ <tag>
<tag-name>layoutListComponent</tag-name>
<source>../secured/components/layoutListComponent.xhtml</source>
</tag>
Modified:
trunk/server/webServer2/WebContent/secured/categrel/editCatDefForm.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/categrel/editCatDefForm.xhtml
2010-02-16 15:41:02 UTC (rev 1742)
+++ trunk/server/webServer2/WebContent/secured/categrel/editCatDefForm.xhtml
2010-02-16 17:35:39 UTC (rev 1743)
@@ -29,7 +29,7 @@
value="#{catDefEditBean.name}"
tooltip="#{lbl['catdef.edit.form.name.tooltip']}"/>
- <elvys:labelWithTooltip
id="CatDefEditLayoutField"
+ <elvys:label id="CatDefEditLayoutField"
label="#{lbl['catdef.edit.form.layout']}"
tooltip="#{lbl['catdef.edit.form.layout.tooltip']}" />
<h:message id="CatDefEditLayoutField_error"
for="CatDefEditLayoutField_label" styleClass="error"/>
Copied: trunk/server/webServer2/WebContent/secured/components/label.xhtml (from
rev 1462,
trunk/server/webServer2/WebContent/secured/components/labelWithTooltip.xhtml)
===================================================================
--- trunk/server/webServer2/WebContent/secured/components/label.xhtml
(rev 0)
+++ trunk/server/webServer2/WebContent/secured/components/label.xhtml
2010-02-16 17:35:39 UTC (rev 1743)
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<ui:component xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:h="http://java.sun.com/jsf/html";
+ xmlns:f="http://java.sun.com/jsf/core";
+ xmlns:ui="http://java.sun.com/jsf/facelets";
+ xmlns:a4j="http://richfaces.org/a4j";
+ xmlns:rich="http://richfaces.org/rich";>
+
+<!--
+CONTRACT:
+id = "string"
+label = "string" | null
+tooltip = "string" | null
+
+
+
+
+
+EXTEND POINTS:
+labelPre
+labelPost
+tooltipPre
+ inTooltipPre
+ inTooltipPost
+tooltipPost
+inputPart
+ -->
+
+ <h:panelGroup>
+ <!-- label -->
+ <ui:insert name="labelPre"/>
+ <h:outputLabel id="#{id}_label" value="#{label}: " />
+ <ui:insert name="labelPost"/>
+ </h:panelGroup>
+ <h:panelGroup>
+ <!-- tooltip -->
+ <ui:insert name="tooltipPre"/>
+ <h:graphicImage id="#{id}_image"
+ alt="hint"
+ rendered="#{!empty tooltip}"
+ url="/images/icons/comments.png"
+ style="cursor: help;" />
+ <rich:toolTip for="#{id}_image" rendered="#{!empty tooltip}">
+ <ui:insert name="inTooltipPre"/>
+ <h:outputLabel id="#{id}_tooltip" value="#{tooltip}" />
+ <ui:insert name="inTooltipPost"/>
+ </rich:toolTip>
+ <ui:insert name="tooltipPost"/>
+ </h:panelGroup>
+ <h:panelGroup>
+ <ui:insert name="inputPart"/>
+ </h:panelGroup>
+
+</ui:component>
\ No newline at end of file
Deleted:
trunk/server/webServer2/WebContent/secured/components/labelWithTooltip.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/labelWithTooltip.xhtml
2010-02-16 15:41:02 UTC (rev 1742)
+++
trunk/server/webServer2/WebContent/secured/components/labelWithTooltip.xhtml
2010-02-16 17:35:39 UTC (rev 1743)
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<ui:component xmlns="http://www.w3.org/1999/xhtml";
- xmlns:h="http://java.sun.com/jsf/html";
- xmlns:f="http://java.sun.com/jsf/core";
- xmlns:ui="http://java.sun.com/jsf/facelets";
- xmlns:a4j="http://richfaces.org/a4j";
- xmlns:rich="http://richfaces.org/rich";>
-
-<!--
-CONTRACT:
-id = "string"
-label = "string" | null
-tooltip = "string" | null
-
-
-
-
-
-EXTEND POINTS:
-labelPre
-labelPost
-tooltipPre
- inTooltipPre
- inTooltipPost
-tooltipPost
-inputPart
- -->
-
- <h:panelGroup>
- <!-- label -->
- <ui:insert name="labelPre"/>
- <h:outputLabel id="#{id}_label" value="#{label}: " />
- <ui:insert name="labelPost"/>
- </h:panelGroup>
- <h:panelGroup>
- <!-- tooltip -->
- <ui:insert name="tooltipPre"/>
- <h:graphicImage id="#{id}_image"
- alt="hint"
- rendered="#{!empty tooltip}"
- url="/images/icons/comments.png"
- style="cursor: help;" />
- <rich:toolTip for="#{id}_image" rendered="#{!empty tooltip}">
- <ui:insert name="inTooltipPre"/>
- <h:outputLabel id="#{id}_tooltip" value="#{tooltip}" />
- <ui:insert name="inTooltipPost"/>
- </rich:toolTip>
- <ui:insert name="tooltipPost"/>
- </h:panelGroup>
- <h:panelGroup>
- <ui:insert name="inputPart"/>
- </h:panelGroup>
-
-</ui:component>
\ No newline at end of file
Modified:
trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml
2010-02-16 15:41:02 UTC (rev 1742)
+++ trunk/server/webServer2/WebContent/secured/plug/planningModalDynamic.xhtml
2010-02-16 17:35:39 UTC (rev 1743)
@@ -22,7 +22,7 @@
<br/>
<!-- dynamic text size -->
- <elvys:labelWithTooltip id="DynamicPlanningTextSize"
+ <elvys:label id="DynamicPlanningTextSize"
label="#{lbl['elvys.plan.modal.form.chosendynamicsize']}"
tooltip="#{lbl['elvys.plan.modal.form.chosendynamicsize.tooltip']}"/>
<rich:inputNumberSlider id="DynamicPlanningTextSize_input"
Modified:
trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml
===================================================================
--- trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml
2010-02-16 15:41:02 UTC (rev 1742)
+++ trunk/server/webServer2/WebContent/secured/plug/planningModalText.xhtml
2010-02-16 17:35:39 UTC (rev 1743)
@@ -20,7 +20,7 @@
<br/>
<!-- text font size -->
- <elvys:labelWithTooltip id="TextPlanningTextSize"
+ <elvys:label id="TextPlanningTextSize"
label="#{lbl['elvys.plan.modal.form.chosentextsize']}"
tooltip="#{lbl['elvys.plan.modal.form.chosentextsize.tooltip']}" />
<rich:inputNumberSlider id="TextPlanningTextSize_input"
Other related posts:
- » [elvystrac] r1743 - 'label' component upgraded - elvys
