Changeset 19647

Timestamp:

02/03/12 15:45:01 (4 months ago)

Author:

anp

Message:

simpleTask : gestion de sm:help

Location:

trunk

Files:

• Wsp_Modeling/es/content/collab/simpleTask/xml.xed.xml (modified) (2 diffs)
• Wsp_Modeling/spaces/gen/modelBuilder/bs/sm_simpleTask.xml (modified) (1 diff)
• Xul_Core/content/Core/widgets/jsForm/jsForm.xbl.xml (modified) (1 diff)
• Xul_Wsp/content/Wsp/widgets/jsForm/wspJsForm.xbl.xml (modified) (1 diff)
• Xul_Wsp/content/WspAdmin/widgets/jsForm/jsForm.xbl.css (modified) (2 diffs)
• Xul_Wsp/content/WspAdmin/widgets/jsForm/jsForm.xbl.xml (modified) (2 diffs)

trunk/Wsp_Modeling/es/content/collab/simpleTask/xml.xed.xml

@@ -306 +306 @@
                                                                 <element se:name="sm:onCreate" se:bind="element" se:card="?" tooltiptext="Traitements à la création d'une task avant affichage des widgets. Permet d'affecter des valeurs par défaut.">
                                                                         <childs>
-                                                                                <se:choice se:id="script_choices" se:card="*" se:show="ifExist">
-                                                                                        <element se:name="sm:addCurrentUser" se:bind="element">
+                                                                                <insert4all se:bind="current">
+                                                                                        <element se:name="sm:addCurrentUser" se:bind="element" insert="collapsed">
                                                                                                 <atts>
                                                                                                         <attribute se:name="involvement" se:bind="attribute">
@@ -321 +321 @@
                                                                                                 </atts>
                                                                                         </element>
-                                                                                </se:choice>
-                                                                                <insert se:bind="current"/>
+                                                                                </insert4all>
                                                                         </childs>
                                                                 </element>

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs/sm_simpleTask.xml

@@ -333 +333 @@
                                                 <!-- @closed -->
                                                 <xsl:if test="$pFormWidget/@closed">.setClosed(<xsl:value-of select="$pFormWidget/@closed='true'"/>)</xsl:if>
+                                                <!-- sm:help -->
+                                                <xsl:if test="sm:help">.setDescription("<xsl:value-of select="sm:help/@quickHelp"/>")</xsl:if>
                                                 <!-- sm:perms -->
                                                 <!-- TODO perms 

trunk/Xul_Core/content/Core/widgets/jsForm/jsForm.xbl.xml

@@ -532 +532 @@
                 </resources>            
                 <content>
-                        <xul:hbox align="center" xbl:inherits="hidden" style="display:block;">
-                                <xul:label anonid="label" xbl:inherits="value=label"/>
-                                <xul:hbox align="top">
+                        <xul:hbox align="center" xbl:inherits="hidden,tooltiptext=description" style="display:block;">
+                                <xul:label anonid="label" xbl:inherits="value=label" />
+                                <xul:hbox align="top" xbl:inherits="tooltiptext=description">
                                         <xul:toolbarbutton anonid="clear" class="smallbutton" xbl:inherits="disabled,disabled=readonly" oncommand="document.getBindingParent(this)._DeleteValue()"/>
                                         <xul:datepicker anonid="input" isnull="true" xbl:inherits="disabled,readonly,required" type="popup"/>

trunk/Xul_Wsp/content/Wsp/widgets/jsForm/wspJsForm.xbl.xml

@@ -54 +54 @@
                                 <xul:xedToolBar anonid="toolBar" style="-moz-binding: url(chrome://scenariXedLib/content/libUiBase/widgets/xedUiBase.xbl.xml#xedToolBar);" />
                         </xul:hbox>
-                        <xul:editXedBox anonid="xedBox" class="maskIfClosed" hideStructBar="true" xmlErrorsAllowed="false" style="-moz-binding: url(chrome://scenariXedLib/content/core/xed.xbl.xml#xedBoxNoScroll);" xbl:inherits="hideStructBar,xmlErrorsAllowed"/>
+                        <xul:editXedBox anonid="xedBox" class="maskIfClosed" hideStructBar="true" xmlErrorsAllowed="false" style="-moz-binding: url(chrome://scenariXedLib/content/core/xed.xbl.xml#xedBoxNoScroll);" xbl:inherits="hideStructBar,xmlErrorsAllowed,tooltiptext=description"/>
                 </content>
                 <implementation>

trunk/Xul_Wsp/content/WspAdmin/widgets/jsForm/jsForm.xbl.css

@@ -75 +75 @@
         margin:0px !important;
         border:none !important;
+        background-color: transparent;
 }
 
@@ -100 +101 @@
 }
 groupbox[anonid=valuePreviewBox]{
-        /*min-height : 2em;*/
+        min-height : 2em;
 }
 
 groupbox[anonid=valuePreviewBox][error]  > .groupbox-body{
-        border : solid 1px Red;
+        box-shadow: 0 0 1.5px 1px red;
 }
 

trunk/Xul_Wsp/content/WspAdmin/widgets/jsForm/jsForm.xbl.xml

@@ -52 +52 @@
                 <content orient="horizontal" isMulti="false">
                         <xul:label anonid="label" xbl:inherits="value=label" />
-                        <xul:groupbox anonid="valuePreviewBox" flex="1" orient="horizontal" align="center" xbl:inherits="hidden,disabled=readonly">
+                        <xul:groupbox anonid="valuePreviewBox" flex="1" orient="horizontal" align="center" xbl:inherits="hidden,disabled=readonly,tooltiptext=description">
                                 <xul:hbox anonid="usersBox" flex="1" onclick="document.getBindingParent(this).doEdit(event)">
                                         <xul:label anonid="valuePreview" crop="center" value=""/>
@@ -81 +81 @@
                                 this.xRefreshUi();
                         </constructor>
-                        
                         <field name="fValuePreviewBlock">document.getAnonymousElementByAttribute(this, 'anonid', 'valuePreviewBox')</field>
                         <field name="fValueUserBlock">document.getAnonymousElementByAttribute(this, 'anonid', 'usersBox')</field>