Changeset 19633

Timestamp:

02/02/12 23:25:01 (4 months ago)

Author:

anp

Message:

mainview des task : ajout de @closed[true|false] sur viewWidget, commentWidget, description widget

Location:

trunk

Files:

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

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

@@ -49 +49 @@
                 <attribute se:id="att_position" se:name="position" se:bind="attribute" tooltiptext="Positions par défaut : creators(100), executors(200), followers(300), label(400), stage(500), deadline(600), description(700), comment(800).">
                         <wordsInput trim="true" validRegExp="^[0-9]+$" frenchPonct="false"/>
+                </attribute>
+                <attribute se:id="att_closed" se:name="closed" se:bind="attribute">
+                        <choiceInput>
+                                <ciItem label="true"/>
+                                <ciItem label="false"/>
+                        </choiceInput>
                 </attribute>
         </se:lib>
@@ -359 +365 @@
                                                                                                         <se:ref se:refid="att_position"/>
                                                                                                         <se:ref se:refid="att_display"/>
+                                                                                                        <se:ref se:refid="att_closed"/>
                                                                                                 </atts>
                                                                                                 <childs>
@@ -386 +393 @@
                                                                                                         </attribute>
                                                                                                         <se:ref se:refid="att_position"/>
+                                                                                                        <se:ref se:refid="att_closed"/>
                                                                                                 </atts>
                                                                                                 <childs>

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

@@ -326 +326 @@
                                                 <xsl:value-of select="chaineProtegeJs(si($pFormWidget[@name], $pFormWidget/@name, @name))"/>
                                                 <xsl:text>")</xsl:text>
+                                                <!-- @display -->
                                                 <xsl:choose>
                                                         <xsl:when test="$pFormWidget/@display='none'">.setVisible(false)</xsl:when>
                                                         <xsl:when test="$pFormWidget/@display='readOnly'">.setReadOnly(true)</xsl:when>
                                                 </xsl:choose>
+                                                <!-- @closed -->
+                                                <xsl:if test="$pFormWidget/@closed">.setClosed(<xsl:value-of select="$pFormWidget/@closed='true'"/>)</xsl:if>
+                                                <!-- sm:perms -->
                                                 <!-- TODO perms 
                                                 .addWritePermName()

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

@@ -211 +211 @@
     padding: 3px 3px 6px;
 }
+
+/* elements collapsables */
+*[closed] label[anonid=label]{
+        -moz-padding-start : 18px;
+        background-repeat: no-repeat;
+        -moz-user-select: element;
+}
+
+*[closed=true] label[anonid=label]{
+        background-image: url("chrome://scenariCore/content/widgets/jsForm/img/right-button.png");
+}
+*[closed=false] label[anonid=label]{
+        background-image: url("chrome://scenariCore/content/widgets/jsForm/img/down-button.png");
+}
+
+*[closed=true] .maskIfClosed{
+        visibility: collapse;
+}

trunk/Xul_Wsp/content/Collab/widgets/jsForm/taskInputs.jsm

@@ -68 +68 @@
 }
 taskInputs.DescriptionInputArea.prototype = {
-        __proto__ : wspJsForm.XedInputArea.prototype
+        __proto__ : wspJsForm.XedInputArea.prototype,
+        setClosed: function(pValue) {
+                this._closedStatus = pValue;
+                return this;
+        },
+        buildBody: function(pDomParentElt, pContext){
+                var vInput = wspJsForm.XedInputArea.prototype.buildBody.call(this, pDomParentElt, pContext);
+                if("_closedStatus" in this) vInput.setAttribute("closed", this._closedStatus);
+                return vInput;
+        }
 }
 
@@ -82 +91 @@
                 if(src.isNewSrcUri(pContext.shortDesc.srcUri)) return false;
                 return wspJsForm.XedInputArea.prototype.isVisible.call(this, pContext);
+        },
+        setClosed: function(pValue) {
+                this._closedStatus = pValue;
+                return this;
+        },
+        buildBody: function(pDomParentElt, pContext){
+                var vInput = wspJsForm.XedInputArea.prototype.buildBody.call(this, pDomParentElt, pContext);
+                if("_closedStatus" in this) vInput.setAttribute("closed", this._closedStatus);
+                return vInput;
         }
 }
@@ -98 +116 @@
                 return this;
         },
-
         isVisible : function(pContext) {
                 if(src.isNewSrcUri(pContext.shortDesc.srcUri)) return false;
                 return jsForm.InputArea.prototype.isVisible.call(this, pContext);
         },
-        
+        setClosed: function(pValue) {
+                this._closedStatus = pValue;
+                return this;
+        },
         buildBody: function(pDomParentElt, pContext){
                 var vInput = this.buildBaseBody(pDomParentElt, pContext);
                 vInput.setAttribute("genCd", this.fGenCd);
+                if("_closedStatus" in this) vInput.setAttribute("closed", this._closedStatus);
                 return vInput;
         }
-
 }
 

trunk/Xul_Wsp/content/Collab/widgets/jsForm/taskInputs.xbl.xml

@@ -298 +298 @@
         -->
         <binding id="generatorView">
+                <resources>
+                        <stylesheet src="chrome://scenariCore/content/widgets/jsForm/jsForm.xbl.css"/>
+                </resources>
                 <content orient="vertical">
-                                <xul:label anonid="label" xbl:inherits="value=label"/>
-                                <xul:iframe anonid="genView" flex="1"/>
+                        <xul:label anonid="label" xbl:inherits="value=label" onclick="document.getBindingParent(this).toggleOpenState()"/>
+                        <xul:iframe anonid="genView" class="maskIfClosed" flex="1"/>
                 </content>
                 <implementation>
@@ -310 +313 @@
                                                 var vUrl = "/u/itemDynGen/"+ encodeURIComponent(vUriObject.getWspCd()) + "/" + this.getAttribute("genCd") + "/refUri'" + encodeURIComponent(pContext.shortDesc.srcId) + "'/co";
                                                 var vIframe = document.getAnonymousElementByAttribute(this, "anonid", "genView");
+                                                vIframe.addEventListener("underflow", function(pEvent) {
+                                                        vIframe.style.height = pEvent.target.scrollHeight + 'px';
+                                                }.bind(this), true);
                                                 vIframe.setAttribute("src", vUriObject.getWsp().getDataProvider().getServiceUrl(vUrl));
                                                 //window.setTimeout(function(){log.info("log::::::::::::::\n"+log.getXml(vIframe.contentDocument));}, 2000);
@@ -315 +321 @@
                                                 this.hidden = true;
                                         }
+                                ]]></body> 
+                        </method>
+                        
+                        <method name="toggleOpenState">
+                                <body><![CDATA[
+                                        if(this.hasAttribute("closed")) this.setAttribute("closed", this.getAttribute("closed")!='true');
                                 ]]></body>
                         </method>

trunk/Xul_Wsp/content/Collab/widgets/taskBox/taskBox.css

@@ -43 +43 @@
 .startBox{
         background-color : #d4dbed;
-        width : 30px;
+        width : 35px;
         box-shadow: 0px 0px 5px 0px #777777;
         margin-right : 5px;
@@ -53 +53 @@
         width : 2px;
         box-shadow: 0px 0px 3px #777777;
-        margin-left : 10px;*/
+        margin-left : 10px;
+        */
 }
 

trunk/Xul_Wsp/content/Collab/widgets/taskBox/taskBox.xbl.xml

@@ -222 +222 @@
                                         this.fCancelBtn.disabled = true;
                                         this.fReloadBtn.disabled = false;
-                                        if(this._NeedSave) {
+                                        if(window.fNeedSave) {
                                                 var vEvent = document.createEvent("Events");
                                                 vEvent.initEvent("XEDStatusNotDirty", true, false);
                                                 this.fJsForm.dispatchEvent(vEvent);
-                                                this._NeedSave = false;
+                                                window.fNeedSave = false;
                                         }
                         ]]></body>
@@ -241 +241 @@
                                                 vEvent.initEvent("XEDStatusDirty", true, false);
                                                 this.fJsForm.dispatchEvent(vEvent);
-                                                this._NeedSave = true;
+                                                window.fNeedSave = true;
                                         }
                         ]]></body>

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

@@ -43 +43 @@
         <!--
         Input embarquant un XED.
+                @closed
         -->
         <binding id="xedInput" extends="chrome://scenariCore/content/widgets/jsForm/jsForm.xbl.xml#baseInput">
+                <resources>
+                        <stylesheet src="chrome://scenariWsp/content/widgets/jsForm/wspJsForm.xbl.css"/>
+                </resources>
                 <content orient="vertical">
-                                <xul:hbox minheight="25" align="center">
-                                        <xul:label anonid="label" xbl:inherits="value=label"/>
-                                        <xul:xedToolBar anonid="toolBar" style="-moz-binding: url(chrome://scenariXedLib/content/libUiBase/widgets/xedUiBase.xbl.xml#xedToolBar);" />
-                                </xul:hbox>
-                                <xul:editXedBox anonid="xedBox" hideStructBar="true" xmlErrorsAllowed="false" style="-moz-binding: url(chrome://scenariXedLib/content/core/xed.xbl.xml#xedBoxNoScroll);" xbl:inherits="hideStructBar,xmlErrorsAllowed"/>
+                        <xul:hbox minheight="25" align="center">
+                                <xul:label anonid="label" xbl:inherits="value=label" onclick="document.getBindingParent(this).toggleOpenState()"/>
+                                <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"/>
                 </content>
                 <implementation>
@@ -78 +82 @@
                                 ]]></body>
                         </method>
+                        
+                        <!-- 
+                                ouvre/ferme l'élément
+                        -->
+                        <method name="toggleOpenState">
+                                <body><![CDATA[
+                                        if(this.hasAttribute("closed")) this.setAttribute("closed", this.getAttribute("closed")!='true');
+                                ]]></body>
+                        </method>
                 </implementation>
                 <handlers>