From 4612984d4bd929f814a56118620faa02cbf74577 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 14 Jul 2011 19:42:27 +0200
Subject: fixed config on webif + show description

---
 module/web/json_app.py                          | 14 ++--
 module/web/templates/default/settings_item.html | 87 +++++++++++++------------
 2 files changed, 53 insertions(+), 48 deletions(-)

(limited to 'module/web')

diff --git a/module/web/json_app.py b/module/web/json_app.py
index bc95b5ffd..91c33c622 100644
--- a/module/web/json_app.py
+++ b/module/web/json_app.py
@@ -356,15 +356,17 @@ def restart_failed():
 def load_config(category, section):
     conf = None
     if category == "general":
-        conf = PYLOAD.getConfig()
+        conf = PYLOAD.getConfigDict()
     elif category == "plugin":
-        conf = PYLOAD.getPluginConfig()
+        conf = PYLOAD.getPluginConfigDict()
 
-    for option in conf[section].items:
-        if ";" in option.type:
-            option.type = option.type.split(";")
+    for key, option in conf[section].iteritems():
+        if key in ("desc","outline"): continue
 
-        option.value = decode(option.value)
+        if ";" in option["type"]:
+            option["list"] = option["type"].split(";")
+
+        option["value"] = decode(option["value"])
 
     return render_to_response("settings_item.html", {"skey": section, "section": conf[section]})
 
diff --git a/module/web/templates/default/settings_item.html b/module/web/templates/default/settings_item.html
index 92223557d..813383343 100644
--- a/module/web/templates/default/settings_item.html
+++ b/module/web/templates/default/settings_item.html
@@ -1,45 +1,48 @@
 <table class="settable">
-    {% set skey = section.name %}
-    {% for option in section.items %}
-        {% set okey = option.name %}
-        <tr>
-            <td><label for="{{skey}}|{{okey}}"
-                       style="color:#424242;">{{ option.description }}:</label></td>
-            <td>
-                {% if option.type == "bool" %}
-                    <select id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}">
-                        <option {% if option.value %} selected="selected"
-                                                      {% endif %}value="True">{{ _("on") }}</option>
-                        <option {% if not option.value %} selected="selected"
-                                                          {% endif %}value="False">{{ _("off") }}</option>
-                    </select>
-                    {% elif option.type|type == "<type 'list'>" %}
-                    <select id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}">
-                        {% for entry in option.type %}
-                            <option {% if option.value == entry %}
-                                    selected="selected" {% endif %}>{{ entry }}</option>
-                        {% endfor %}
-                    </select>
-                    {% elif option.type == "folder" %}
-                    <input name="{{skey}}|{{okey}}" type="text"
-                           id="{{skey}}|{{okey}}" value="{{option.value}}"/>
-                    <input name="browsebutton" type="button"
-                           onclick="ifield = document.getElementById('{{skey}}|{{okey}}'); pathchooser = window.open('{% if option.value %}{{ "/pathchooser/" + option.value|quotepath }}{% else %}{{ pathroot }}{% endif %}', 'pathchooser', 'scrollbars=yes,toolbar=no,menubar=no,statusbar=no,width=650,height=300'); pathchooser.ifield = ifield; window.ifield = ifield;"
-                           value="{{_("Browse")}}"/>
-                    {% elif option.type == "file" %}
-                    <input name="{{skey}}|{{okey}}" type="text"
-                           id="{{skey}}|{{okey}}" value="{{option.value}}"/>
-                    <input name="browsebutton" type="button"
-                           onclick="ifield = document.getElementById('{{skey}}|{{okey}}'); filechooser = window.open('{% if option.value %}{{ "/filechooser/" + option.value|quotepath }}{% else %}{{ fileroot }}{% endif %}', 'filechooser', 'scrollbars=yes,toolbar=no,menubar=no,statusbar=no,width=650,height=300'); filechooser.ifield = ifield; window.ifield = ifield;"
-                           value="{{_("Browse")}}"/>
-                    {% elif option.type == "password" %}
-                    <input id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
-                           type="password" value="{{option.value}}"/>
-                {% else %}
-                    <input id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
-                           type="text" value="{{option.value}}"/>
-                {% endif %}
-            </td>
-        </tr>
+    {% if section.outline %}
+    <tr><th colspan="2">{{ section.outline }}</th></tr>
+    {% endif %}
+    {% for okey, option in section.iteritems() %}
+        {% if okey not in ("desc","outline") %}
+            <tr>
+                <td><label for="{{skey}}|{{okey}}"
+                           style="color:#424242;">{{ option.desc }}:</label></td>
+                <td>
+                    {% if option.type == "bool" %}
+                        <select id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}">
+                            <option {% if option.value %} selected="selected"
+                                                          {% endif %}value="True">{{ _("on") }}</option>
+                            <option {% if not option.value %} selected="selected"
+                                                              {% endif %}value="False">{{ _("off") }}</option>
+                        </select>
+                        {% elif ";" in option.type %}
+                        <select id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}">
+                            {% for entry in option.list %}
+                                <option {% if option.value == entry %}
+                                        selected="selected" {% endif %}>{{ entry }}</option>
+                            {% endfor %}
+                        </select>
+                        {% elif option.type == "folder" %}
+                        <input name="{{skey}}|{{okey}}" type="text"
+                               id="{{skey}}|{{okey}}" value="{{option.value}}"/>
+                        <input name="browsebutton" type="button"
+                               onclick="ifield = document.getElementById('{{skey}}|{{okey}}'); pathchooser = window.open('{% if option.value %}{{ "/pathchooser/" + option.value|quotepath }}{% else %}{{ pathroot }}{% endif %}', 'pathchooser', 'scrollbars=yes,toolbar=no,menubar=no,statusbar=no,width=650,height=300'); pathchooser.ifield = ifield; window.ifield = ifield;"
+                               value="{{_("Browse")}}"/>
+                        {% elif option.type == "file" %}
+                        <input name="{{skey}}|{{okey}}" type="text"
+                               id="{{skey}}|{{okey}}" value="{{option.value}}"/>
+                        <input name="browsebutton" type="button"
+                               onclick="ifield = document.getElementById('{{skey}}|{{okey}}'); filechooser = window.open('{% if option.value %}{{ "/filechooser/" + option.value|quotepath }}{% else %}{{ fileroot }}{% endif %}', 'filechooser', 'scrollbars=yes,toolbar=no,menubar=no,statusbar=no,width=650,height=300'); filechooser.ifield = ifield; window.ifield = ifield;"
+                               value="{{_("Browse")}}"/>
+                        {% elif option.type == "password" %}
+                        <input id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
+                               type="password" value="{{option.value}}"/>
+                    {% else %}
+                        <input id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
+                               type="text" value="{{option.value}}"/>
+                    {% endif %}
+                </td>
+            </tr>
+        {% endif %}
     {% endfor %}
 </table>
\ No newline at end of file
-- 
cgit v1.2.3