merge hotfixes in

2 files changed, 24 insertions, 24 deletions

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index a4443025a..be320970b 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -102,18 +102,18 @@
 
 
                             {% for account in conf.accs %}
-                                {% set plugin = account.type %}
+                                {% set plugin = account.__name__ %}
                                        <tr>
                                             <td>
                                                 <span style="padding:5px">{{ plugin }}</span>
                                             </td>
                                        
-                                           <td><label for="{{plugin}}|password;{{account.login}}"
-                                                      style="color:#424242;">{{ account.login }}</label></td>
+                                           <td><label for="{{plugin}}|password;{{account.loginname}}"
+                                                      style="color:#424242;">{{ account.loginname }}</label></td>
                                            <td>
-                                               <input id="{{plugin}}|password;{{account.login}}"
-                                                      name="{{plugin}}|password;{{account.login}}"
-                                                      type="password" value="{{account.password}}" size="12"/>
+                                               <input id="{{plugin}}|password;{{account.loginname}}"
+                                                      name="{{plugin}}|password;{{account.loginname}}"
+                                                      type="password" value="" size="12"/>
                                            </td>
                                            <td>
                                                {% if account.valid %}
@@ -137,27 +137,27 @@
                                            </td>
                                            <td>
                                    <span style="font-weight: bold;">
-                                   {{ account.validuntil }}
+                                   {{ account._validuntil }}
                                    </span>
                                            </td>
                                            <td>
                                    <span style="font-weight: bold;">
-                                   {{ account.trafficleft }}
+                                   {{ account._trafficleft }}
                                    </span>
                                            </td>
                                            <td>
-                                               <input id="{{plugin}}|time;{{account.login}}"
-                                                      name="{{plugin}}|time;{{account.login}}" type="text"
-                                                      size="7" value="{{account.time}}"/>
+                                               <input id="{{plugin}}|time;{{account.loginname}}"
+                                                      name="{{plugin}}|time;{{account.loginname}}" type="text"
+                                                      size="7" value="{{account.options.time}}"/>
                                            </td>
                                            <td>
-                                               <input id="{{plugin}}|limitdl;{{account.login}}"
-                                                      name="{{plugin}}|limitdl;{{account.login}}" type="text"
-                                                      size="2" value="{{account.limitdl}}"/>
+                                               <input id="{{plugin}}|limitdl;{{account.loginname}}"
+                                                      name="{{plugin}}|limitdl;{{account.loginname}}" type="text"
+                                                      size="2" value="{{account.options.limitdl}}"/>
                                            </td>
                                            <td>
-                                               <input id="{{plugin}}|delete;{{account.login}}"
-                                                      name="{{plugin}}|delete;{{account.login}}" type="checkbox"
+                                               <input id="{{plugin}}|delete;{{account.loginname}}"
+                                                      name="{{plugin}}|delete;{{account.loginname}}" type="checkbox"
                                                       value="True"/>
                                            </td>
                                        </tr>
diff --git a/module/web/templates/default/settings_item.html b/module/web/templates/default/settings_item.html
index 813383343..b3d7fe334 100644
--- a/module/web/templates/default/settings_item.html
+++ b/module/web/templates/default/settings_item.html
@@ -1,12 +1,13 @@
 <table class="settable">
-    {% if section.outline %}
-    <tr><th colspan="2">{{ section.outline }}</th></tr>
+    {% if section.description %}
+    <tr><th colspan="2">{{ section.description }}</th></tr>
     {% endif %}
-    {% for okey, option in section.iteritems() %}
-        {% if okey not in ("desc","outline") %}
+    {% for option in section.items %}
+        {% set okey = option.name %}
+        {% set skey = section.name %}
             <tr>
-                <td><label for="{{skey}}|{{okey}}"
-                           style="color:#424242;">{{ option.desc }}:</label></td>
+                <td><label for="{{section.name}}|{{option.name}}"
+                           style="color:#424242;">{{ option.long_name }}:</label></td>
                 <td>
                     {% if option.type == "bool" %}
                         <select id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}">
@@ -17,7 +18,7 @@
                         </select>
                         {% elif ";" in option.type %}
                         <select id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}">
-                            {% for entry in option.list %}
+                            {% for entry in option.type.split(";") %}
                                 <option {% if option.value == entry %}
                                         selected="selected" {% endif %}>{{ entry }}</option>
                             {% endfor %}
@@ -43,6 +44,5 @@
                     {% endif %}
                 </td>
             </tr>
-        {% endif %}
     {% endfor %}
 </table>
\ No newline at end of file