From b10344545b42c19c1e2df035ffc20042b78cc442 Mon Sep 17 00:00:00 2001
From: Safihre <Safihre@users.noreply.github.com>
Date: Fri, 11 Sep 2015 16:17:42 +0200
Subject: [PATCH 1/2] Style fixes for Config

---
 interfaces/Config/templates/config_rss.tmpl         | 2 +-
 interfaces/Config/templates/config_server.tmpl      | 4 ++--
 interfaces/Config/templates/staticcfg/css/style.css | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/interfaces/Config/templates/config_rss.tmpl b/interfaces/Config/templates/config_rss.tmpl
index c5190d1..7617fd3 100644
--- a/interfaces/Config/templates/config_rss.tmpl
+++ b/interfaces/Config/templates/config_rss.tmpl
@@ -55,7 +55,7 @@
                             <!-- <input type="text" name="newfeed" value="$feed_item" size="25" readonly="readonly" class="readonly" /> -->
                         </td>
                         <td class="controls">
-                            <button type="button" class="btn btn-default testFeed" rel="$feed_item"><span class="glyphicon glyphicon-sort"></span> $T('Read')</button>
+                            <button type="button" class="btn btn-default testFeed" rel="$feed_item"><span class="glyphicon glyphicon-sort"></span> $T('button-preFeed')</button>
                             <input type="hidden" name="uri" value="$rss[$feed_item]['uri']" size="75" />
                             <button type="button" class="btn btn-default editFeed" rel="$feed_item"><span class="glyphicon glyphicon-pencil"></span> $T('Edit')</button>
                             <button type="button" class="btn btn-default delFeed" rel="$feed_item"><span class="glyphicon glyphicon-trash"></span></button>                            
diff --git a/interfaces/Config/templates/config_server.tmpl b/interfaces/Config/templates/config_server.tmpl
index 370eb15..a178243 100644
--- a/interfaces/Config/templates/config_server.tmpl
+++ b/interfaces/Config/templates/config_server.tmpl
@@ -125,8 +125,8 @@
               <td><label for="enable_$server">&nbsp;$T('enabled')</label></td>
             </tr></table>
             
-            <button type="button" class="btn btn-default clrServer">$T('button-clrServer')</button>
-            <button type="button" class="btn btn-default showserver">$T('showDetails')</button>
+            <button type="button" class="btn btn-default showserver"><span class="glyphicon glyphicon-pencil"></span> $T('showDetails')</button>
+            <button type="button" class="btn btn-default clrServer"><span class="glyphicon glyphicon-remove"></span> $T('button-clrServer')</button>  
         </div><!-- /col2 -->
             <div class="col1"  style="display:none;">
             <fieldset>
diff --git a/interfaces/Config/templates/staticcfg/css/style.css b/interfaces/Config/templates/staticcfg/css/style.css
index 4afd1c6..9049538 100644
--- a/interfaces/Config/templates/staticcfg/css/style.css
+++ b/interfaces/Config/templates/staticcfg/css/style.css
@@ -2128,6 +2128,10 @@ input[type="checkbox"] {
     cursor: pointer;
 }
 
+.Servers .col2 button:first-of-type {
+    margin-bottom: 8px;
+}
+
 .Special .glyphicon-asterisk {
     margin-left: 8px;
     top: 3px;

From fa49a26ca60a924b86c6c8ea259f5ccaa84143e3 Mon Sep 17 00:00:00 2001
From: Safihre <Safihre@users.noreply.github.com>
Date: Fri, 11 Sep 2015 18:28:38 +0200
Subject: [PATCH 2/2] Fixing load-balancing setting in Config

---
 interfaces/Config/templates/config_switches.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interfaces/Config/templates/config_switches.tmpl b/interfaces/Config/templates/config_switches.tmpl
index 18d5ba2..7dbba0a 100644
--- a/interfaces/Config/templates/config_switches.tmpl
+++ b/interfaces/Config/templates/config_switches.tmpl
@@ -54,7 +54,7 @@
                 </div>
                 <div class="field-pair alt">
                     <label class="config" for="load_balancing">$T('opt-load_balancing')</label>
-                      <select name="randomize_server_ip" id="randomize_server_ip">
+                      <select name="load_balancing" id="load_balancing">
                           <option value="0" <!--#if $load_balancing == 0 then 'selected="selected" class="selected"' else ""#--> >$T('no-load-balancing')</option>
                           <option value="1" <!--#if $load_balancing == 1 then 'selected="selected" class="selected"' else ""#--> >$T('load-balancing')</option>
                           <option value="2" <!--#if $load_balancing == 2 then 'selected="selected" class="selected"' else ""#--> >$T('load-balancing-happy-eyeballs')</option>