Merge pull request #9 from ardi69/0.4.10

sorted config in webui ("Activated" always on top)

2 files changed, 9 insertions, 9 deletions

diff --git a/pyload/webui/themes/Next/css/log.css b/pyload/webui/themes/Next/css/log.css
index 71ba01edb..30e026821 100644
--- a/pyload/webui/themes/Next/css/log.css
+++ b/pyload/webui/themes/Next/css/log.css
@@ -51,41 +51,41 @@ td.loglevel
 {
     text-align:right;
 }
-td.mixedDEBUG, td.lineDEBUG, td.loglevellineDEBUG
+td.MixedDEBUG, td.LineDEBUG, td.loglevelLineDEBUG
 {
     color: darkcyan;
 }
-td.mixedWARNING, td.lineWARNING, td.loglevellineWARNING
+td.MixedWARNING, td.LineWARNING, td.loglevelLineWARNING
 {
     color: #660;
 }
-td.mixedERROR, td.lineERROR, td.loglevellineERROR
+td.MixedERROR, td.LineERROR, td.loglevelLineERROR
 {
     color: red;
 }
-td.mixedCRITICAL, td.lineCRITICAL, td.loglevellineCRITICAL
+td.MixedCRITICAL, td.LineCRITICAL, td.loglevelLineCRITICAL
 {
     color: purple;
 }
-td.loglevelmixedDEBUG span, td.loglevellabelDEBUG span
+td.loglevelMixedDEBUG span, td.loglevelLabelDEBUG span
 {
     font-weight: bold;
     color: white;
     background-color: darkcyan;
 }
-td.loglevelmixedWARNING span, td.loglevellabelWARNING span
+td.loglevelMixedWARNING span, td.loglevelLabelWARNING span
 {
     font-weight: bold;
     color: white;
     background-color: #660;
 }
-td.loglevelmixedERROR span, td.loglevellabelERROR span
+td.loglevelMixedERROR span, td.loglevelLabelERROR span
 {
     font-weight: bold;
     color: white;
     background-color: red;
 }
-td.loglevelmixedCRITICAL span, td.loglevellabelCRITICAL span
+td.loglevelMixedCRITICAL span, td.loglevelLabelCRITICAL span
 {
     font-weight: bold;
     color: white;
diff --git a/pyload/webui/themes/Next/tml/settings_item.html b/pyload/webui/themes/Next/tml/settings_item.html
index 4d07eddb4..72566950f 100644
--- a/pyload/webui/themes/Next/tml/settings_item.html
+++ b/pyload/webui/themes/Next/tml/settings_item.html
@@ -3,7 +3,7 @@
     {% if section.outline %}
     <tr><th colspan="2">{{ section.outline }}</th></tr>
     {% endif %}
-    {% for okey, option in section.iteritems() %}
+    {% for okey, option in sorted_conf(section) %}
         {% if okey not in ("desc","outline") %}
             <tr>
                 <td><label for="{{skey}}|{{okey}}"