Merge lp:~methanal-developers/methanal/dependency-styling into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/View.js'
--- methanal/js/Methanal/View.js	2010-03-09 08:57:31 +0000
+++ methanal/js/Methanal/View.js	2010-07-06 14:35:37 +0000
@@ -421,7 +421,6 @@
         for (var name in self._depCache._inputToHandlers) {
             var node = self.getControl(name).widgetParent.node;
             Methanal.Util.addElementClass(node, 'dependancy-parent');
-            node.title = 'Other fields depend on this field';
         }
         self.refresh();
     },
@@ -946,6 +945,29 @@
 
 
 /**
+ * Set a widget as active.
+ *
+ * The widget's visibility is determined by whether it is active or not,
+ * inactive widgets are not visible and their values are not used in form
+ * submission.
+ *
+ * @type active: C{boolean}
+ */
+Methanal.View._setActive = function _setActive(widget, active) {
+    widget.active = active;
+    if (active) {
+        Methanal.Util.removeElementClass(widget.node, 'hidden');
+    } else {
+        Methanal.Util.addElementClass(widget.node, 'hidden');
+    }
+    if (widget.widgetParent.checkActive) {
+        widget.widgetParent.checkActive();
+    }
+};
+
+
+
+/**
  * A generic container for form inputs.
  */
 Nevow.Athena.Widget.subclass(Methanal.View, 'InputContainer').methods(
@@ -1010,12 +1032,7 @@
      * @type active: C{boolean}
      */
     function setActive(self, active) {
-        self.active = active;
-        self.node.style.display = active ? 'block' : 'none';
-        Methanal.Util.addElementClass(self.node, 'dependancy-child');
-        if (self.widgetParent.checkActive) {
-            self.widgetParent.checkActive();
-        }
+        Methanal.View._setActive(self, active);
     },
 
 
@@ -1056,6 +1073,12 @@
     function clearError(self) {
         Methanal.View.FormRow.upcall(self, 'clearError');
         Methanal.Util.replaceNodeText(self._errorTextNode, '');
+    },
+
+
+    function setActive(self, active) {
+        Methanal.View.FormRow.upcall(self, 'setActive', active);
+        Methanal.Util.addElementClass(self.node, 'dependancy-child');
     });
 
 
@@ -1294,9 +1317,7 @@
      * @type active: C{boolean}
      */
     function setActive(self, active) {
-        self.active = active;
-        self.node.style.display = active ? 'block' : 'none';
-        self.widgetParent.checkActive();
+        Methanal.View._setActive(self, active);
         self.getForm().validate(self);
     },
 

=== added file 'methanal/static/images/icons/dependency_parent.gif'
Binary files methanal/static/images/icons/dependency_parent.gif	1970-01-01 00:00:00 +0000 and methanal/static/images/icons/dependency_parent.gif	2010-07-06 14:35:37 +0000 differ
=== modified file 'methanal/static/styles/methanal-ie.css'
--- methanal/static/styles/methanal-ie.css	2010-03-14 01:23:56 +0000
+++ methanal/static/styles/methanal-ie.css	2010-07-06 14:35:37 +0000
@@ -67,3 +67,7 @@
     margin-bottom: -0.5em;
     padding: 0.25em;
 }
+
+.dependancy-parent {
+    background-position: 3px center;
+}

=== modified file 'methanal/static/styles/methanal.css'
--- methanal/static/styles/methanal.css	2010-03-14 01:24:31 +0000
+++ methanal/static/styles/methanal.css	2010-07-06 14:35:37 +0000
@@ -557,3 +557,16 @@
 .hidden {
     display: none !important;
 }
+
+.dependancy-parent {
+    border-left: 3px solid #6094a4;
+    margin-left: -3px;
+    background-image: url("/static/Methanal/images/icons/dependency_parent.gif");
+    background-repeat: no-repeat;
+    background-position: left center;
+}
+
+.dependancy-child {
+    border-left: 3px solid #9fc4cf;
+    margin-left: -3px;
+}