[geeklog-cvs] geeklog: Merging with Rouslan's latest changes
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Fri Apr 22 09:29:32 EDT 2011
changeset 8242:19cfe45762e0
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/19cfe45762e0
user: Dirk Haun <dirk at haun-online.de>
date: Fri Apr 22 15:29:04 2011 +0200
description:
Merging with Rouslan's latest changes
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 48b635b65c7d -r 19cfe45762e0 public_html/javascript/admin.configuration.js
--- a/public_html/javascript/admin.configuration.js Fri Apr 22 15:28:33 2011 +0200
+++ b/public_html/javascript/admin.configuration.js Fri Apr 22 15:29:04 2011 +0200
@@ -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 48b635b65c7d -r 19cfe45762e0 public_html/layout/professional/admin/config/config_element.thtml
--- a/public_html/layout/professional/admin/config/config_element.thtml Fri Apr 22 15:28:33 2011 +0200
+++ b/public_html/layout/professional/admin/config/config_element.thtml Fri Apr 22 15:29:04 2011 +0200
@@ -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