[geeklog-cvs] geeklog: Fix regression in rev 8236 (no highlight), related to b...

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Fri Apr 22 08:26:21 EDT 2011


changeset 8239:33b56551ec80
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/33b56551ec80
user: Rouslan Placella <rouslan at placella.com>
date: Fri Apr 22 13:25:35 2011 +0100
description:
Fix regression in rev 8236 (no highlight), related to bug #0001318.

diffstat:

 public_html/javascript/admin.configuration.js                     |   5 +-
 public_html/layout/professional/admin/config/config_element.thtml |  18 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diffs (96 lines):

diff -r ff0cdbf54be0 -r 33b56551ec80 public_html/javascript/admin.configuration.js
--- a/public_html/javascript/admin.configuration.js	Wed Apr 20 16:24:43 2011 -0400
+++ b/public_html/javascript/admin.configuration.js	Fri Apr 22 13:25:35 2011 +0100
@@ -353,7 +353,8 @@
     }
     
     function selectConf(confName) {
-        var conf = $j( document.getElementById(confName.substr(1)) );
+        confName = "config_" + confName.substr(1).replace('[', '_').replace(']', '');
+        var conf = $j( document.getElementById(confName) );
         
         conf.addClass('active-config');
     }
@@ -717,4 +718,4 @@
             return child;
         }
     }
-}
\ No newline at end of file
+}
diff -r ff0cdbf54be0 -r 33b56551ec80 public_html/layout/professional/admin/config/config_element.thtml
--- a/public_html/layout/professional/admin/config/config_element.thtml	Wed Apr 20 16:24:43 2011 -0400
+++ b/public_html/layout/professional/admin/config/config_element.thtml	Fri Apr 22 13:25:35 2011 +0100
@@ -7,7 +7,7 @@
 <!-- END delete-button -->
 
 <!-- BEGIN text-element -->
-<tr id="text_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link} {unset_link}</td>
+<tr id="config_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link} {unset_link}</td>
 <td>
 <input type="text" class="opt{error_class}" name="{name}" style="width:300px" value="{value}"{xhtml}>
 {delete}{error_block}
@@ -15,7 +15,7 @@
 <!-- END text-element -->
 
 <!-- BEGIN text-area -->
-<tr id="textarea_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link} {unset_link}</td>
+<tr id="config_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link} {unset_link}</td>
 <td>
 <textarea class="opt{error_class}" name="{name}" style="width:300px" cols="3" rows="3">{value}</textarea>
 {delete}{error_block}
@@ -23,14 +23,14 @@
 <!-- END text-area -->
 
 <!-- BEGIN placeholder-element -->
-<tr id="placeholder_{id_name}" class="config_name"><td class="alignright">{display_name}</td><td>
+<tr id="config_{id_name}" class="config_name"><td class="alignright">{display_name}</td><td>
 <input type="hidden" name="{name}" value="{value}"{xhtml}>
 {delete}
 </td></tr>
 <!-- END placeholder-element -->
 
 <!-- BEGIN select-element -->
-<tr{hide_row} id="select_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link} {unset_link}</td>
+<tr{hide_row} id="config_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link} {unset_link}</td>
 <td>
 <select name="{name}" class="opt{error_class}">
   <!-- BEGIN select-options -->
@@ -42,7 +42,7 @@
 <!-- END select-element -->
 
 <!-- BEGIN unset-param -->
-<tr id="unset_param_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link}</td>
+<tr id="config_{id_name}" class="config_name"><td class="alignright">{display_name} {doc_link}</td>
 <td><a href="#{name}" class="restore_param">{lang_enable}</a></td>
 </tr>
 <!-- END unset-param -->
@@ -50,10 +50,10 @@
 <!-- BEGIN list-element -->
 <tr id="{name}" class="config_name"><td class="alignright" style="vertical-align:top">{display_name} {doc_link} {unset_link}</td>
 <td>
-<input type="button" value="+" onclick="hide_show_tbl(selectChildByID(this.parentNode, 'arr_table_{id_name}'), this);"{xhtml}>
+<input type="button" value="+" onclick="hide_show_tbl(selectChildByID(this.parentNode, 'config_{id_name}'), this);"{xhtml}>
 {delete}
 <input type="hidden" value="true" name="{name}[placeholder]"{xhtml}>
-<table style="display:none" id="arr_table_{id_name}" class="{arr_table_class_list}">
+<table style="display:none" id="config_{id_name}" class="{arr_table_class_list}">
 <col width="100">
 <col width="100%">
 {my_elements}
@@ -63,13 +63,13 @@
 <!-- END list-element -->
 
 <!-- BEGIN keyed-add-button -->
-<tr id="keyed_button_{id_name}" class="config_name"><td colspan="2">
+<tr id="config_{id_name}" class="config_name"><td colspan="2">
 <input type="button" value="{lang_add_element}" class="add_ele_input" onclick="handleAdd(this, '{array_type}', '{arr_name}')"{xhtml}><input style="width: 65px"{xhtml}>
 </td></tr>
 <!-- END keyed-add-button -->
 
 <!-- BEGIN unkeyed-add-button -->
-<tr id="unkeyed_button_{id_name}" class="config_name"><td colspan="2">
+<tr id="config_{id_name}" class="config_name"><td colspan="2">
 <input type="button" value="{lang_add_element}" class="add_ele_input" onclick="handleAdd(this, '{array_type}', '{arr_name}')"{xhtml}>
 </td></tr>
 <!-- END unkeyed-add-button -->



More information about the geeklog-cvs mailing list