Little bits to settings design

2 files changed, 55 insertions, 66 deletions

diff --git a/module/web/media/default/css/default.css b/module/web/media/default/css/default.css
index 1c0040b12..7ac088d39 100644
--- a/module/web/media/default/css/default.css
+++ b/module/web/media/default/css/default.css
@@ -1563,17 +1563,9 @@ div.codearea pre span.Preprc {
 {

     display: table-cell;

 }

-

-#toptabsback

+#toptabs

 {

-    background-color: #eaeaea;

-    margin: 0px;

-    padding: 11px 4px 4px 4px;

-    display: table-cell;

-    border-top-right-radius: 30px;

-    border-top-left-radius: 3px;

-    -moz-border-radius-topright: 30px;

-    -moz-border-radius-topleft: 3px;

+    float:right;

 }

 #toptabs li a

 {

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 542be0974..c863fd501 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -71,68 +71,65 @@
 <b>{{message}}</b><br>
 {% endfor %}
 
-<div class="setfield">
     
-        <ul id="toptabs" class="tabs">
-            {% for configname, config in conf.iteritems  %}
-                {% if config|length > 0 %}
-                    <li><a href="#{{configname}}">{{configname}}</a></li>
-                {% endif %}
-            {% endfor %}
-        </ul>
-    
-    
-
-    <div id="tabsback">
-        <ul id="tabs" class="tabs">
-            {% for configname, config in conf.iteritems  %}
-                <span id="g_{{configname}}">
-                    {% for skey, section in config.iteritems  %}
-                        <li><a href="#{{configname}}{{skey}}">{{section.desc}}</a></li>
-                    {% endfor %}
-                </span>
-            {% endfor %}
-        </ul>
-    </div>
-    <form id="horizontalForm" action="" method="POST">
+<ul id="toptabs" class="tabs">
     {% for configname, config in conf.iteritems  %}
-        {% for skey, section in config.iteritems  %}
-
-            <div class="tabContent" id="{{configname}}{{skey}}">
-                <table class="settable">
-                    {% for okey, option in section.items %}
-                        {% ifnotequal okey "desc" %}
-                            <tr>
-                                <td><label for="{{configname}}|{{skey}}|{{okey}}" style="color:#424242;">{{option.desc}}:</label></td>
-                                <td>
-                                    {% ifequal option.type "bool" %}
+        {% if config|length > 0 %}
+            <li><a href="#{{configname}}">{{configname}}</a></li>
+        {% endif %}
+    {% endfor %}
+</ul>
+<div style="clear:both;"></div>
+<div id="tabsback">
+    <ul id="tabs" class="tabs">
+        {% for configname, config in conf.iteritems  %}
+            <span id="g_{{configname}}">
+                {% for skey, section in config.iteritems  %}
+                    <li><a href="#{{configname}}{{skey}}">{{section.desc}}</a></li>
+                {% endfor %}
+            </span>
+        {% endfor %}
+    </ul>
+</div>
+<form id="horizontalForm" action="" method="POST">
+{% for configname, config in conf.iteritems  %}
+    {% for skey, section in config.iteritems  %}
+
+        <div class="tabContent" id="{{configname}}{{skey}}">
+            <table class="settable">
+                {% for okey, option in section.items %}
+                    {% ifnotequal okey "desc" %}
+                        <tr>
+                            <td><label for="{{configname}}|{{skey}}|{{okey}}" style="color:#424242;">{{option.desc}}:</label></td>
+                            <td>
+                                {% ifequal option.type "bool" %}
+                                    <select id="{{skey}}|{{okey}}" name="{{configname}}|{{skey}}|{{okey}}">
+                                        <option {% if option.value %} selected="selected" {% endif %}value="True">{% trans "on" %}</option>
+                                        <option {% if not option.value %} selected="selected" {% endif %}value="False">{% trans "off" %}</option>
+                                    </select>
+                                {% else %}
+                                    {% if option.type|contains:";" %}
                                         <select id="{{skey}}|{{okey}}" name="{{configname}}|{{skey}}|{{okey}}">
-                                            <option {% if option.value %} selected="selected" {% endif %}value="True">{% trans "on" %}</option>
-                                            <option {% if not option.value %} selected="selected" {% endif %}value="False">{% trans "off" %}</option>
+                                            {% for entry in option.list %}
+                                                <option {% ifequal option.value entry %} selected="selected" {% endifequal %}>{{entry}}</option>
+                                            {% endfor %}
                                         </select>
                                     {% else %}
-                                        {% if option.type|contains:";" %}
-                                            <select id="{{skey}}|{{okey}}" name="{{configname}}|{{skey}}|{{okey}}">
-                                                {% for entry in option.list %}
-                                                    <option {% ifequal option.value entry %} selected="selected" {% endifequal %}>{{entry}}</option>
-                                                {% endfor %}
-                                            </select>
-                                        {% else %}
-                                            <input id="{{skey}}|{{okey}}" name="{{configname}}|{{skey}}|{{okey}}" type="text" value="{{option.value}}"/>
-                                        {% endif %}
-                                    {% endifequal %}
-                                </td>
-                            </tr>
-                        {% endifnotequal %}
-                    {% endfor %}
-                </table>
-            </div>
-        {% endfor %}
+                                        <input id="{{skey}}|{{okey}}" name="{{configname}}|{{skey}}|{{okey}}" type="text" value="{{option.value}}"/>
+                                    {% endif %}
+                                {% endifequal %}
+                            </td>
+                        </tr>
+                    {% endifnotequal %}
+                {% endfor %}
+            </table>
+        </div>
     {% endfor %}
-    {% if conf %}
-    <input class="submit" type="submit" value="{% trans "Submit" %}" />
-    </form>
-</div>
+{% endfor %}
+{% if conf %}
+<input class="submit" type="submit" value="{% trans "Submit" %}" />
+</form>
+
 {% endif %}
 
 {% endblock %}