Changeset 1167

Timestamp:

08/31/10 18:03:01 (18 months ago)

Author:

zeank

Message:

show input for adding comment also when comments are collapsed (refs #203)

Location:

HelpIM3/htdocs

Files:

• functions.js (modified) (8 diffs)
• xslt/HelpIM_html_UI_BSL.xslt (modified) (2 diffs)

HelpIM3/htdocs/functions.js

@@ -432 +432 @@
     },
 
-    expandAll: function() {
-        var elements = document.getElementsByClassName("comment_row");
-        for(i=0; i < elements.length; i++) {
-                                        elements[i].style.display = '';
-        }
-        return;
+    expandAll: function(className) {
+        document.getElementsByClassName(className).forEach(HIM.el.show);
     },
 
-    colapseAll: function() {
-        var elements = document.getElementsByClassName("comment_row");
-        for(i=0; i < elements.length; i++) {
-                                        elements[i].style.display = 'none';
-        }
-        return;
+    colapseAll: function(className) {
+        document.getElementsByClassName(className).forEach(HIM.el.hide);
     },
 
     el: {
+        byId: function(id) {
+            return document.getElementById(id);
+        },
+
         hide: function(el) {
             if (typeof el == 'string') // asume id given
-                el = document.getElementById(el);
+                el = HIM.el.byId(el);
             el.style.display = 'none';
         },
@@ -457 +453 @@
         show: function(el) {
             if (typeof el == 'string') // asume id given
-                el = document.getElementById(el);
+                el = HIM.el.byId(el);
             el.style.display = '';
         },
@@ -463 +459 @@
         toggle: function(el, activateFun, deactivateFun) {
             if (typeof el == 'string') // asume id given
-                el = document.getElementById(el);
+                el = HIM.el.byId(el);
             if (el.style.display == 'none') {
                 this.show(el);
@@ -486 +482 @@
 
         _sibling: function(dir, element, nodeName) {
+            if (typeof element == 'string')
+                element = HIM.el.byId(element);
+            if (!element)
+                return;
             dir = (dir == 'next')?'nextSibling':'previousSibling';
             var sibling = element[dir];
@@ -501 +501 @@
 
         firstChild: function(element, nodeName) {
+            if (typeof element == 'string')
+                element = HIM.el.byId(element);
+            if (!element)
+                return;
             for (var i=0; i<element.childNodes.length; i++) {
                 if (element.childNodes.item(i).nodeName &&
@@ -506 +510 @@
                     return element.childNodes.item(i);
             }
-            return;
         },
 
         parentNode: function(element, nodeName) {
+            if (typeof element == 'string')
+                element = HIM.el.byId(element);
+            if (!element)
+                return;
             var parent = element.parentNode;
             while (parent.nodeName.toLowerCase() != nodeName.toLowerCase() &&
@@ -529 +536 @@
         var header = document.createElement('th')
         var linkp = document.createElement('a');
-        linkp.setAttribute('href', 'javascript:HIM.expandAll()');
+        linkp.setAttribute('href', 'javascript:HIM.expandAll("comment_row")');
         linkp.appendChild(document.createTextNode('+'));
         var linkm = document.createElement('a');
-        linkm.setAttribute('href', 'javascript:HIM.colapseAll()');
+        linkm.setAttribute('href', 'javascript:HIM.colapseAll("comment_row")');
         linkm.appendChild(document.createTextNode('-'));
         header.appendChild(linkp);
@@ -544 +551 @@
     comments.forEach(
         function(comment) {
-            var logMessage = HIM.el.prev(comment, 'tr');
+            var logMessage = HIM.el.prev(HIM.el.prev(comment, 'tr'), 'tr');
             if (!logMessage)
                 return;
+
+            var comment_input_form = 
+                HIM.el.firstChild(
+                    HIM.el.firstChild(
+                        'input_'+comment.id,
+                        'td'),
+                    'form');
+
+            logMessage.onmouseover = function() {
+                unhideCommentInput(comment_input_form.id);
+            }
+           
             // create new td with text
             var td = logMessage.appendChild(document.createElement('td'));

HelpIM3/htdocs/xslt/HelpIM_html_UI_BSL.xslt

@@ -1075 +1075 @@
                 <xsl:param name="rowData" />
                 <xsl:param name="tableDef" />
-                <tr class="comment_row" id="comment_row_{$rowData/@conv_msg_id}">
-                        <td colspan="{count($tableDef/table_column)}">
+                <tr class="comment_input_row" id="input_comment_row_{$rowData/@conv_msg_id}">
+                        <td colspan="{count($tableDef/table_column)+1}" nowrap="nowrap">
                                 <!-- Form to add comment directly on chatline -->
-                                <div class="comment" onMouseOver="unhideCommentInput('cl_comment_{$rowData/@conv_msg_id}')">
-                                <hr class="comment"/>
-                                </div>
                                 <form action="{$tableDef/@location}" method="post" class="comment" id="cl_comment_{$rowData/@conv_msg_id}">
                                         <input type="hidden" name="action" value="addComment"/>
@@ -1086 +1083 @@
                                         <input type="text" name="comment_text"  class="comment" style="width: 80%;"/><input type="submit" value="{$tableDef/@submitText}" class="comment"/>
                                 </form>
+                        </td>
+                </tr>
+                <tr class="comment_row" id="comment_row_{$rowData/@conv_msg_id}">
+                        <td colspan="{count($tableDef/table_column)+1}">
+                                <!-- Form to add comment directly on chatline -->
                                 <!-- comment on first level -->
                                 <xsl:if test="$rowData/ConvMessageComment">