From 509ca6072290b96a772cd0515bd9e1afcbe45937 Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Wed, 11 Mar 2015 02:29:02 +0100
Subject: Drag and drop fix

Now the drag and drop feature in queue is matched to the title of the
package. The move button now works again as expected (to move betwen
collector and queue)
---
 module/web/templates/default/queue.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 29e1a2927..62d0be777 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -38,7 +38,7 @@ document.addEvent("domready", function(){
     
     <div class="packagename" style="float:left; width: 50%; cursor: pointer">
         <span class="glyphicon glyphicon-folder-close"></span>
-        <span class="name" style="font-size: 16px; font-weight: bold;">{{package.name }}</span>
+        <span class="name" style="font-size: 16px; font-weight: bold;"><em class="package_drag" style="font-style:normal">{{package.name }}</em></span>
         &nbsp;&nbsp;
         <span class="buttons" style="opacity:0">
         <span class="glyphicon glyphicon-trash" title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/media/default/img/delete.png" /></span>
@@ -47,7 +47,7 @@ document.addEvent("domready", function(){
         &nbsp;&nbsp;
          <span class="glyphicon glyphicon-pencil" title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/pencil.png" /></span>
         &nbsp;&nbsp;
-         <span class="glyphicon glyphicon-transfer package_drag" title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/package_go.png" /></span>
+         <span class="glyphicon glyphicon-transfer" title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/package_go.png" /></span>
         </span>
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
-- 
cgit v1.2.3


From c935df368a60ddec7030975fa07ab9d434f6ce8b Mon Sep 17 00:00:00 2001
From: m4xcube <m4xcube@users.noreply.github.com>
Date: Sat, 4 Apr 2015 11:55:16 +0200
Subject: Scrollable Plugin-List

---
 module/web/templates/default/settings.html | 43 +++++++++++++-----------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 7b06caa97..5be7be516 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -28,17 +28,14 @@
                 <ul class="nav tabs" style="width: 20%; float:left;">
                     <li class>
                         <div class="panel panel-default" >
-                          <div class="panel-body"  style="overlow-y: scroll; ">
-                           
-                          
-                        <ul id="general-menu" style=" float: left;">
-                            {% for entry,name in conf.general %}
-                                <nobr>
-                                    <li style="list-style-type: none;" id="general|{{ entry }}">{{ name }}</li>
-                                </nobr>
-                                <br>
-                            {% endfor %}
-                        </ul>
+                          <div class="panel-body">
+                            <ul id="general-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
+                                {% for entry,name in conf.general %}
+                                    <nobr>
+                                        <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="general|{{ entry }}">{{ name }}</li>
+                                    </nobr>
+                                {% endfor %}
+                            </ul>
                           </div>
                         </div>
                     </li>
@@ -59,18 +56,16 @@
             <span id="plugins" class="tabContent">
                 <ul class="nav tabs" style="width: 20%; float:left; hight:300px;">
                     <li class>
-                            <div class="panel panel-default" style="overflow-y: scroll; ">
-                              <div class="panel-body"  >
-                    
-                        <ul id="plugin-menu" style=" float: left;">
-                            {% for entry,name in conf.plugin %}
-                                <nobr>
-                                    <li style="list-style-type: none;" id="plugin|{{ entry }}">{{ name }}</li>
-                                </nobr>
-                                <br>
-                            {% endfor %}
-                        </ul>
-                        <div>
+                        <div class="panel panel-default">
+                            <div class="panel-body">
+                                <ul id="plugin-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
+                                    {% for entry,name in conf.plugin %}
+                                        <nobr>
+                                            <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="plugin|{{ entry }}">{{ name }}</li>
+                                        </nobr>
+                                    {% endfor %}
+                                </ul>
+                            <div>
                         </div>
                     </li>
                 </ul>
@@ -214,4 +209,4 @@
 </form>
 
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit v1.2.3


From 8a5d15799505340d80754dc1b9638a8244705087 Mon Sep 17 00:00:00 2001
From: m4xcube <m4xcube@users.noreply.github.com>
Date: Sat, 4 Apr 2015 21:03:41 +0200
Subject: Word Break

Word break for to long Packagenames
---
 module/web/templates/default/queue.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 62d0be777..6d71fb6e9 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -38,7 +38,7 @@ document.addEvent("domready", function(){
     
     <div class="packagename" style="float:left; width: 50%; cursor: pointer">
         <span class="glyphicon glyphicon-folder-close"></span>
-        <span class="name" style="font-size: 16px; font-weight: bold;"><em class="package_drag" style="font-style:normal">{{package.name }}</em></span>
+        <span class="name" style="font-size: 16px; font-weight: bold;"><em class="package_drag" style="font-style:normal word-wrap: break-word;">{{package.name }}</em></span>
         &nbsp;&nbsp;
         <span class="buttons" style="opacity:0">
         <span class="glyphicon glyphicon-trash" title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/media/default/img/delete.png" /></span>
@@ -106,4 +106,4 @@ document.addEvent("domready", function(){
     </form>
 
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit v1.2.3


From 04e352a7a0196ef8c75e4cdf44a6c9c2f552d563 Mon Sep 17 00:00:00 2001
From: m4xcube <m4xcube@users.noreply.github.com>
Date: Sat, 4 Apr 2015 21:55:59 +0200
Subject: Cleanup & Design improvement

Removed nobr for better html code with "white-space: nowrap;"

Changed height to max-heigt for better visual
---
 module/web/templates/default/settings.html | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 5be7be516..c9b852c0a 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -29,11 +29,9 @@
                     <li class>
                         <div class="panel panel-default" >
                           <div class="panel-body">
-                            <ul id="general-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
+                            <ul id="general-menu" style="float: left; max-height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
                                 {% for entry,name in conf.general %}
-                                    <nobr>
-                                        <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="general|{{ entry }}">{{ name }}</li>
-                                    </nobr>
+                                <li style="list-style-type: none; cursor: pointer; margin-top: 10px; white-space: nowrap;" id="general|{{ entry }}">{{ name }}</li>
                                 {% endfor %}
                             </ul>
                           </div>
@@ -58,11 +56,9 @@
                     <li class>
                         <div class="panel panel-default">
                             <div class="panel-body">
-                                <ul id="plugin-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
+                                <ul id="plugin-menu" style="float: left; max-height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
                                     {% for entry,name in conf.plugin %}
-                                        <nobr>
-                                            <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="plugin|{{ entry }}">{{ name }}</li>
-                                        </nobr>
+                                    <li style="list-style-type: none; cursor: pointer; margin-top: 10px; white-space: nowrap;" id="plugin|{{ entry }}">{{ name }}</li>
                                     {% endfor %}
                                 </ul>
                             <div>
-- 
cgit v1.2.3


From e866110d32727a4268700324c56a25955e9ced3a Mon Sep 17 00:00:00 2001
From: m4xcube <m4xcube@users.noreply.github.com>
Date: Sat, 4 Apr 2015 22:01:55 +0200
Subject: Better readability of HTML

---
 module/web/templates/default/settings.html | 66 +++++++++++++++---------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index c9b852c0a..1841fe485 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -13,9 +13,9 @@
 {% block content %}
 
     <ul id="toptabs" class="nav nav-tabs">
-            <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li>
-            <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li>
-            <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li>
+        <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li>
+        <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li>
+        <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li>
     </ul>
 
     <div id="tabsback" style="height: 20px; padding-left: 150px; color: white; font-weight: bold;">
@@ -173,36 +173,34 @@
 {% endblock %}
 {% block hidden %}
 <div id="account_box" style="z-index: 2">
-<form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data">
-<h3>{{_("Add Account")}}</h3>
-<p>{{_("Enter your account data to use premium features.")}}</p>
-
-<div class="form-group">
-<label for="account_login">{{_("Login")}}</label>
-<input class="form-control" id="account_login" name="account_login" type="text" />
-<p >{{_("Your username.")}}</p>
-</div>
-<div class="form-group">
-<label for="account_password">{{_("Password")}}</label>
-<input class="form-control" id="account_password" name="account_password" type="password" size="20" />
-<p >{{_("The password for this account.")}}</p>
-</div>
-<div class="form-group">
-<label for="account_type">{{_("Type")}}</label>
-<p>{{_("Choose the hoster for your account.")}}</p>
-</div>
-<div class="form-group">
-    <select name=account_type id="account_type">
-        {% for type in types|sort %}
-            <option value="{{ type }}">{{ type }}</option>
-        {% endfor %}
-    </select>
-</div>
-<button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button>
-<button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button>
-<div class="spacer"></div>
-
-</form>
-
+    <form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data">
+        <h3>{{_("Add Account")}}</h3>
+        <p>{{_("Enter your account data to use premium features.")}}</p>
+
+        <div class="form-group">
+            <label for="account_login">{{_("Login")}}</label>
+            <input class="form-control" id="account_login" name="account_login" type="text" />
+            <p >{{_("Your username.")}}</p>
+        </div>
+        <div class="form-group">
+            <label for="account_password">{{_("Password")}}</label>
+            <input class="form-control" id="account_password" name="account_password" type="password" size="20" />
+            <p >{{_("The password for this account.")}}</p>
+        </div>
+        <div class="form-group">
+            <label for="account_type">{{_("Type")}}</label>
+            <p>{{_("Choose the hoster for your account.")}}</p>
+        </div>
+        <div class="form-group">
+            <select name=account_type id="account_type">
+                {% for type in types|sort %}
+                <option value="{{ type }}">{{ type }}</option>
+                {% endfor %}
+            </select>
+        </div>
+        <button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button>
+        <button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button>
+        <div class="spacer"></div>
+    </form>
 </div>
 {% endblock %}
-- 
cgit v1.2.3


From 0088e6da59ca374f4d1eab2b70d6d3dba46367f6 Mon Sep 17 00:00:00 2001
From: m4xcube <m4xcube@users.noreply.github.com>
Date: Sat, 4 Apr 2015 23:26:32 +0200
Subject: Allways show Package Size

---
 module/web/templates/default/queue.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 6d71fb6e9..9aa864381 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -53,19 +53,17 @@ document.addEvent("domready", function(){
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
 
     <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;">
-        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%;">
-                <label>
-                {{ package.linksdone }} / {{ package.linkstotal }}</label>
+        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%; position: relative; z-index: 1;">
+            <label>{{ package.linksdone }} / {{ package.linkstotal }}</label>
         </div>
-        <label style="padding-right: 5px ;float: right;">
-        {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
+        <label style="right: 30px; position: absolute; z-index: 2;">
+            {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
         </div>
     <div style="clear: both; margin-bottom: -10px"></div>
 
     <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children">
-    <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
-    <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0">
-    </ul>
+        <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
+        <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0"></ul>
     </div>
 </div>
     </li>
-- 
cgit v1.2.3


From 84c01924ab40afb591c19d2bd29cd1f15209e46e Mon Sep 17 00:00:00 2001
From: m4xcube <maxcube@gmx.net>
Date: Sat, 4 Apr 2015 23:59:48 +0200
Subject: Revert "Word Break"

This reverts commit 8a5d15799505340d80754dc1b9638a8244705087.
---
 module/web/templates/default/queue.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 9aa864381..28386354c 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -38,7 +38,7 @@ document.addEvent("domready", function(){
     
     <div class="packagename" style="float:left; width: 50%; cursor: pointer">
         <span class="glyphicon glyphicon-folder-close"></span>
-        <span class="name" style="font-size: 16px; font-weight: bold;"><em class="package_drag" style="font-style:normal word-wrap: break-word;">{{package.name }}</em></span>
+        <span class="name" style="font-size: 16px; font-weight: bold;"><em class="package_drag" style="font-style:normal">{{package.name }}</em></span>
         &nbsp;&nbsp;
         <span class="buttons" style="opacity:0">
         <span class="glyphicon glyphicon-trash" title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/media/default/img/delete.png" /></span>
-- 
cgit v1.2.3


From 3ab9d775122a5aebbdd6eefdac9725131f5f86e5 Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Sun, 5 Apr 2015 03:17:29 +0200
Subject: text changed to withe and little font fixes

---
 module/web/templates/default/queue.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 28386354c..fbda48f7a 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -52,11 +52,11 @@ document.addEvent("domready", function(){
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
 
-    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;">
+    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px; color:#fff; font-weight: 700; font-size:12px;">
         <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%; position: relative; z-index: 1;">
             <label>{{ package.linksdone }} / {{ package.linkstotal }}</label>
         </div>
-        <label style="right: 30px; position: absolute; z-index: 2;">
+        <label style="right: 30px; position: absolute; z-index: 2; color:#fff;">
             {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
         </div>
     <div style="clear: both; margin-bottom: -10px"></div>
-- 
cgit v1.2.3


From bd976506276a5e85530e53878e72f6535300acee Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Sun, 5 Apr 2015 14:10:43 +0200
Subject: Revert "Merge branch 'pr/2' into stable"

This reverts commit 7c21c6f9417bb19ba240f1f4bbde9ace7dc0f6ef, reversing
changes made to 10b65f5319c679bac3a596eb30946fd2e89a3da7.
---
 module/web/templates/default/queue.html    | 18 ++++---
 module/web/templates/default/settings.html | 78 ++++++++++++++++--------------
 2 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index fbda48f7a..62d0be777 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -52,18 +52,20 @@ document.addEvent("domready", function(){
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
 
-    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px; color:#fff; font-weight: 700; font-size:12px;">
-        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%; position: relative; z-index: 1;">
-            <label>{{ package.linksdone }} / {{ package.linkstotal }}</label>
+    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;">
+        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%;">
+                <label>
+                {{ package.linksdone }} / {{ package.linkstotal }}</label>
         </div>
-        <label style="right: 30px; position: absolute; z-index: 2; color:#fff;">
-            {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
+        <label style="padding-right: 5px ;float: right;">
+        {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
         </div>
     <div style="clear: both; margin-bottom: -10px"></div>
 
     <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children">
-        <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
-        <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0"></ul>
+    <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
+    <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0">
+    </ul>
     </div>
 </div>
     </li>
@@ -104,4 +106,4 @@ document.addEvent("domready", function(){
     </form>
 
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 1841fe485..5be7be516 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -13,9 +13,9 @@
 {% block content %}
 
     <ul id="toptabs" class="nav nav-tabs">
-        <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li>
-        <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li>
-        <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li>
+            <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li>
+            <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li>
+            <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li>
     </ul>
 
     <div id="tabsback" style="height: 20px; padding-left: 150px; color: white; font-weight: bold;">
@@ -29,9 +29,11 @@
                     <li class>
                         <div class="panel panel-default" >
                           <div class="panel-body">
-                            <ul id="general-menu" style="float: left; max-height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
+                            <ul id="general-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
                                 {% for entry,name in conf.general %}
-                                <li style="list-style-type: none; cursor: pointer; margin-top: 10px; white-space: nowrap;" id="general|{{ entry }}">{{ name }}</li>
+                                    <nobr>
+                                        <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="general|{{ entry }}">{{ name }}</li>
+                                    </nobr>
                                 {% endfor %}
                             </ul>
                           </div>
@@ -56,9 +58,11 @@
                     <li class>
                         <div class="panel panel-default">
                             <div class="panel-body">
-                                <ul id="plugin-menu" style="float: left; max-height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
+                                <ul id="plugin-menu" style="float: left; height: 600px; overflow: auto; overflow-x: hidden; width: 100%">
                                     {% for entry,name in conf.plugin %}
-                                    <li style="list-style-type: none; cursor: pointer; margin-top: 10px; white-space: nowrap;" id="plugin|{{ entry }}">{{ name }}</li>
+                                        <nobr>
+                                            <li style="list-style-type: none; cursor: pointer; margin-top: 10px;" id="plugin|{{ entry }}">{{ name }}</li>
+                                        </nobr>
                                     {% endfor %}
                                 </ul>
                             <div>
@@ -173,34 +177,36 @@
 {% endblock %}
 {% block hidden %}
 <div id="account_box" style="z-index: 2">
-    <form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data">
-        <h3>{{_("Add Account")}}</h3>
-        <p>{{_("Enter your account data to use premium features.")}}</p>
-
-        <div class="form-group">
-            <label for="account_login">{{_("Login")}}</label>
-            <input class="form-control" id="account_login" name="account_login" type="text" />
-            <p >{{_("Your username.")}}</p>
-        </div>
-        <div class="form-group">
-            <label for="account_password">{{_("Password")}}</label>
-            <input class="form-control" id="account_password" name="account_password" type="password" size="20" />
-            <p >{{_("The password for this account.")}}</p>
-        </div>
-        <div class="form-group">
-            <label for="account_type">{{_("Type")}}</label>
-            <p>{{_("Choose the hoster for your account.")}}</p>
-        </div>
-        <div class="form-group">
-            <select name=account_type id="account_type">
-                {% for type in types|sort %}
-                <option value="{{ type }}">{{ type }}</option>
-                {% endfor %}
-            </select>
-        </div>
-        <button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button>
-        <button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button>
-        <div class="spacer"></div>
-    </form>
+<form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data">
+<h3>{{_("Add Account")}}</h3>
+<p>{{_("Enter your account data to use premium features.")}}</p>
+
+<div class="form-group">
+<label for="account_login">{{_("Login")}}</label>
+<input class="form-control" id="account_login" name="account_login" type="text" />
+<p >{{_("Your username.")}}</p>
+</div>
+<div class="form-group">
+<label for="account_password">{{_("Password")}}</label>
+<input class="form-control" id="account_password" name="account_password" type="password" size="20" />
+<p >{{_("The password for this account.")}}</p>
+</div>
+<div class="form-group">
+<label for="account_type">{{_("Type")}}</label>
+<p>{{_("Choose the hoster for your account.")}}</p>
+</div>
+<div class="form-group">
+    <select name=account_type id="account_type">
+        {% for type in types|sort %}
+            <option value="{{ type }}">{{ type }}</option>
+        {% endfor %}
+    </select>
+</div>
+<button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button>
+<button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button>
+<div class="spacer"></div>
+
+</form>
+
 </div>
 {% endblock %}
-- 
cgit v1.2.3


From fe9f074bffb1b03378ba5a52c689524edfb2121a Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Sun, 5 Apr 2015 14:36:56 +0200
Subject: Recreated the chhanges of pr/2 m4xcube

because of a git-merging problem, i have manualy changed the things of
pr/2 from m4xcube. The changes now be clean at stable of pullrequest
#1006
---
 module/web/templates/default/queue.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 62d0be777..90648d4f5 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -52,15 +52,15 @@ document.addEvent("domready", function(){
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
 
-    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;">
-        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%;">
-                <label>
-                {{ package.linksdone }} / {{ package.linkstotal }}</label>
+    <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px; color:#fff; font-weight: 700; font-size:12px;">
+        <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%; position: relative; z-index: 1;">
+            <label>{{ package.linksdone }} / {{ package.linkstotal }}</label>
         </div>
-        <label style="padding-right: 5px ;float: right;">
-        {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
+        <label style="right: 30px; position: absolute; z-index: 2; color:#fff;">
+            {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
         </div>
     <div style="clear: both; margin-bottom: -10px"></div>
+    
 
     <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children">
     <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
-- 
cgit v1.2.3


From 6120747c2e124a529cc85d3261fc343ad7d54ddf Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 18:34:37 +0200
Subject: Update user-agent

---
 pyload/network/HTTPRequest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyload/network/HTTPRequest.py b/pyload/network/HTTPRequest.py
index b1352bd6b..49d1d042e 100644
--- a/pyload/network/HTTPRequest.py
+++ b/pyload/network/HTTPRequest.py
@@ -74,7 +74,8 @@ class HTTPRequest(object):
         #self.c.setopt(pycurl.VERBOSE, 1)
 
         self.c.setopt(pycurl.USERAGENT,
-            "Mozilla/5.0 (Windows NT 6.1; Win64; x64;en; rv:5.0) Gecko/20110619 Firefox/5.0")
+                      "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:37.0) Gecko/20100101 Firefox/37.0")
+
         if pycurl.version_info()[7]:
             self.c.setopt(pycurl.ENCODING, "gzip, deflate")
         self.c.setopt(pycurl.HTTPHEADER, ["Accept: */*",
-- 
cgit v1.2.3


From e1b69331e5cf306aad85e6b267c7dfbe5880bd0b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 22:35:54 +0200
Subject: [Lib] send2trash

---
 .gitignore                   |   1 -
 lib/send2trash/__init__.py   |  19 +++++
 lib/send2trash/compat.py     |  13 ++++
 lib/send2trash/plat_gio.py   |  14 ++++
 lib/send2trash/plat_osx.py   |  48 +++++++++++++
 lib/send2trash/plat_other.py | 160 +++++++++++++++++++++++++++++++++++++++++++
 lib/send2trash/plat_win.py   |  59 ++++++++++++++++
 7 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 lib/send2trash/__init__.py
 create mode 100644 lib/send2trash/compat.py
 create mode 100644 lib/send2trash/plat_gio.py
 create mode 100644 lib/send2trash/plat_osx.py
 create mode 100644 lib/send2trash/plat_other.py
 create mode 100644 lib/send2trash/plat_win.py

diff --git a/.gitignore b/.gitignore
index cd447b151..9e7a8c7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ bin/
 build/
 dist/
 env/
-/lib/
 lib64/
 parts/
 sdist/
diff --git a/lib/send2trash/__init__.py b/lib/send2trash/__init__.py
new file mode 100644
index 000000000..8a059a058
--- /dev/null
+++ b/lib/send2trash/__init__.py
@@ -0,0 +1,19 @@
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
+
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+import sys
+
+if sys.platform == 'darwin':
+    from .plat_osx import send2trash
+elif sys.platform == 'win32':
+    from .plat_win import send2trash
+else:
+    try:
+        # If we can use gio, let's use it
+        from .plat_gio import send2trash
+    except ImportError:
+        # Oh well, let's fallback to our own Freedesktop trash implementation
+        from .plat_other import send2trash
diff --git a/lib/send2trash/compat.py b/lib/send2trash/compat.py
new file mode 100644
index 000000000..0f3a48972
--- /dev/null
+++ b/lib/send2trash/compat.py
@@ -0,0 +1,13 @@
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
+
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+import sys
+if sys.version < '3':
+    text_type = unicode
+    binary_type = str
+else:
+    text_type = str
+    binary_type = bytes
diff --git a/lib/send2trash/plat_gio.py b/lib/send2trash/plat_gio.py
new file mode 100644
index 000000000..9282d90a3
--- /dev/null
+++ b/lib/send2trash/plat_gio.py
@@ -0,0 +1,14 @@
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
+
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+from gi.repository import GObject, Gio
+
+def send2trash(path):
+    try:
+        f = Gio.File.new_for_path(path)
+        f.trash(cancellable=None)
+    except GObject.GError as e:
+        raise OSError(e.message)
diff --git a/lib/send2trash/plat_osx.py b/lib/send2trash/plat_osx.py
new file mode 100644
index 000000000..fa2c2c85c
--- /dev/null
+++ b/lib/send2trash/plat_osx.py
@@ -0,0 +1,48 @@
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
+
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+from __future__ import unicode_literals
+
+from ctypes import cdll, byref, Structure, c_char, c_char_p
+from ctypes.util import find_library
+
+from .compat import binary_type
+
+Foundation = cdll.LoadLibrary(find_library('Foundation'))
+CoreServices = cdll.LoadLibrary(find_library('CoreServices'))
+
+GetMacOSStatusCommentString = Foundation.GetMacOSStatusCommentString
+GetMacOSStatusCommentString.restype = c_char_p
+FSPathMakeRefWithOptions = CoreServices.FSPathMakeRefWithOptions
+FSMoveObjectToTrashSync = CoreServices.FSMoveObjectToTrashSync
+
+kFSPathMakeRefDefaultOptions = 0
+kFSPathMakeRefDoNotFollowLeafSymlink = 0x01
+
+kFSFileOperationDefaultOptions = 0
+kFSFileOperationOverwrite = 0x01
+kFSFileOperationSkipSourcePermissionErrors = 0x02
+kFSFileOperationDoNotMoveAcrossVolumes = 0x04
+kFSFileOperationSkipPreflight = 0x08
+
+class FSRef(Structure):
+    _fields_ = [('hidden', c_char * 80)]
+
+def check_op_result(op_result):
+    if op_result:
+        msg = GetMacOSStatusCommentString(op_result).decode('utf-8')
+        raise OSError(msg)
+
+def send2trash(path):
+    if not isinstance(path, binary_type):
+        path = path.encode('utf-8')
+    fp = FSRef()
+    opts = kFSPathMakeRefDoNotFollowLeafSymlink
+    op_result = FSPathMakeRefWithOptions(path, opts, byref(fp), None)
+    check_op_result(op_result)
+    opts = kFSFileOperationDefaultOptions
+    op_result = FSMoveObjectToTrashSync(byref(fp), None, opts)
+    check_op_result(op_result)
diff --git a/lib/send2trash/plat_other.py b/lib/send2trash/plat_other.py
new file mode 100644
index 000000000..59000eca9
--- /dev/null
+++ b/lib/send2trash/plat_other.py
@@ -0,0 +1,160 @@
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
+
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+# This is a reimplementation of plat_other.py with reference to the
+# freedesktop.org trash specification:
+#   [1] http://www.freedesktop.org/wiki/Specifications/trash-spec
+#   [2] http://www.ramendik.ru/docs/trashspec.html
+# See also:
+#   [3] http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+#
+# For external volumes this implementation will raise an exception if it can't
+# find or create the user's trash directory.
+
+from __future__ import unicode_literals
+
+import sys
+import os
+import os.path as op
+from datetime import datetime
+import stat
+try:
+    from urllib.parse import quote
+except ImportError:
+    # Python 2
+    from urllib import quote
+
+FILES_DIR = 'files'
+INFO_DIR = 'info'
+INFO_SUFFIX = '.trashinfo'
+
+# Default of ~/.local/share [3]
+XDG_DATA_HOME = op.expanduser(os.environ.get('XDG_DATA_HOME', '~/.local/share'))
+HOMETRASH = op.join(XDG_DATA_HOME, 'Trash')
+
+uid = os.getuid()
+TOPDIR_TRASH = '.Trash'
+TOPDIR_FALLBACK = '.Trash-' + str(uid)
+
+def is_parent(parent, path):
+    path = op.realpath(path) # In case it's a symlink
+    parent = op.realpath(parent)
+    return path.startswith(parent)
+
+def format_date(date):
+    return date.strftime("%Y-%m-%dT%H:%M:%S")
+
+def info_for(src, topdir):
+    # ...it MUST not include a ".."" directory, and for files not "under" that
+    # directory, absolute pathnames must be used. [2]
+    if topdir is None or not is_parent(topdir, src):
+        src = op.abspath(src)
+    else:
+        src = op.relpath(src, topdir)
+
+    info  = "[Trash Info]\n"
+    info += "Path=" + quote(src) + "\n"
+    info += "DeletionDate=" + format_date(datetime.now()) + "\n"
+    return info
+
+def check_create(dir):
+    # use 0700 for paths [3]
+    if not op.exists(dir):
+        os.makedirs(dir, 0o700)
+
+def trash_move(src, dst, topdir=None):
+    filename = op.basename(src)
+    filespath = op.join(dst, FILES_DIR)
+    infopath = op.join(dst, INFO_DIR)
+    base_name, ext = op.splitext(filename)
+
+    counter = 0
+    destname = filename
+    while op.exists(op.join(filespath, destname)) or op.exists(op.join(infopath, destname + INFO_SUFFIX)):
+        counter += 1
+        destname = '%s %s%s' % (base_name, counter, ext)
+    
+    check_create(filespath)
+    check_create(infopath)
+    
+    os.rename(src, op.join(filespath, destname))
+    f = open(op.join(infopath, destname + INFO_SUFFIX), 'w')
+    f.write(info_for(src, topdir))
+    f.close()
+
+def find_mount_point(path):
+    # Even if something's wrong, "/" is a mount point, so the loop will exit.
+    # Use realpath in case it's a symlink
+    path = op.realpath(path) # Required to avoid infinite loop
+    while not op.ismount(path):
+        path = op.split(path)[0]
+    return path
+
+def find_ext_volume_global_trash(volume_root):
+    # from [2] Trash directories (1) check for a .Trash dir with the right
+    # permissions set.
+    trash_dir = op.join(volume_root, TOPDIR_TRASH)
+    if not op.exists(trash_dir):
+        return None
+    
+    mode = os.lstat(trash_dir).st_mode
+    # vol/.Trash must be a directory, cannot be a symlink, and must have the
+    # sticky bit set.
+    if not op.isdir(trash_dir) or op.islink(trash_dir) or not (mode & stat.S_ISVTX):
+        return None
+
+    trash_dir = op.join(trash_dir, str(uid))
+    try:
+        check_create(trash_dir)
+    except OSError:
+        return None
+    return trash_dir
+
+def find_ext_volume_fallback_trash(volume_root):
+    # from [2] Trash directories (1) create a .Trash-$uid dir.
+    trash_dir = op.join(volume_root, TOPDIR_FALLBACK)
+    # Try to make the directory, if we can't the OSError exception will escape
+    # be thrown out of send2trash.
+    check_create(trash_dir)
+    return trash_dir
+
+def find_ext_volume_trash(volume_root):
+    trash_dir = find_ext_volume_global_trash(volume_root)
+    if trash_dir is None:
+        trash_dir = find_ext_volume_fallback_trash(volume_root)
+    return trash_dir
+
+# Pull this out so it's easy to stub (to avoid stubbing lstat itself)
+def get_dev(path):
+    return os.lstat(path).st_dev
+
+def send2trash(path):
+    if not isinstance(path, str):
+        path = str(path, sys.getfilesystemencoding())
+    if not op.exists(path):
+        raise OSError("File not found: %s" % path)
+    # ...should check whether the user has the necessary permissions to delete
+    # it, before starting the trashing operation itself. [2]
+    if not os.access(path, os.W_OK):
+        raise OSError("Permission denied: %s" % path)
+    # if the file to be trashed is on the same device as HOMETRASH we
+    # want to move it there.
+    path_dev = get_dev(path)
+    
+    # If XDG_DATA_HOME or HOMETRASH do not yet exist we need to stat the
+    # home directory, and these paths will be created further on if needed.
+    trash_dev = get_dev(op.expanduser('~'))
+
+    if path_dev == trash_dev:
+        topdir = XDG_DATA_HOME
+        dest_trash = HOMETRASH
+    else:
+        topdir = find_mount_point(path)
+        trash_dev = get_dev(topdir)
+        if trash_dev != path_dev:
+            raise OSError("Couldn't find mount point for %s" % path)
+        dest_trash = find_ext_volume_trash(topdir)
+    trash_move(path, dest_trash, topdir)
diff --git a/lib/send2trash/plat_win.py b/lib/send2trash/plat_win.py
new file mode 100644
index 000000000..3a55b9d3b
--- /dev/null
+++ b/lib/send2trash/plat_win.py
@@ -0,0 +1,59 @@
+# Copyright 2013 Hardcoded Software (http://www.hardcoded.net)
+
+# This software is licensed under the "BSD" License as described in the "LICENSE" file, 
+# which should be included with this package. The terms are also available at 
+# http://www.hardcoded.net/licenses/bsd_license
+
+from __future__ import unicode_literals
+
+from ctypes import windll, Structure, byref, c_uint
+from ctypes.wintypes import HWND, UINT, LPCWSTR, BOOL
+import os.path as op
+
+from .compat import text_type
+
+shell32 = windll.shell32
+SHFileOperationW = shell32.SHFileOperationW
+
+class SHFILEOPSTRUCTW(Structure):
+    _fields_ = [
+        ("hwnd", HWND),
+        ("wFunc", UINT),
+        ("pFrom", LPCWSTR),
+        ("pTo", LPCWSTR),
+        ("fFlags", c_uint),
+        ("fAnyOperationsAborted", BOOL),
+        ("hNameMappings", c_uint),
+        ("lpszProgressTitle", LPCWSTR),
+        ]
+
+FO_MOVE = 1
+FO_COPY = 2
+FO_DELETE = 3
+FO_RENAME = 4
+
+FOF_MULTIDESTFILES = 1
+FOF_SILENT = 4
+FOF_NOCONFIRMATION = 16
+FOF_ALLOWUNDO = 64
+FOF_NOERRORUI = 1024
+
+def send2trash(path):
+    if not isinstance(path, text_type):
+        path = text_type(path, 'mbcs')
+    if not op.isabs(path):
+        path = op.abspath(path)
+    fileop = SHFILEOPSTRUCTW()
+    fileop.hwnd = 0
+    fileop.wFunc = FO_DELETE
+    fileop.pFrom = LPCWSTR(path + '\0')
+    fileop.pTo = None
+    fileop.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT
+    fileop.fAnyOperationsAborted = 0
+    fileop.hNameMappings = 0
+    fileop.lpszProgressTitle = None
+    result = SHFileOperationW(byref(fileop))
+    if result:
+        msg = "Couldn't perform operation. Error code: %d" % result
+        raise OSError(msg)
+
-- 
cgit v1.2.3


From 9ae5fdae96c776fa3bc88c9ea659b9f9d3318813 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Tue, 7 Apr 2015 22:36:39 +0200
Subject: [config] webinterface -> webui

---
 pyload/Core.py                  |  4 ++--
 pyload/config/Setup.py          |  8 ++++----
 pyload/config/default.conf      |  2 +-
 pyload/manager/thread/Server.py | 10 +++++-----
 pyload/webui/__init__.py        |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pyload/Core.py b/pyload/Core.py
index 9588c9485..0cc10df6e 100755
--- a/pyload/Core.py
+++ b/pyload/Core.py
@@ -444,7 +444,7 @@ class Core(object):
         self.db.manager = self.files #ugly?
 
     def init_webserver(self):
-        if self.config['webinterface']['activated']:
+        if self.config['webui']['activated']:
             self.webserver = WebServer(self)
             self.webserver.start()
 
@@ -547,7 +547,7 @@ class Core(object):
     def shutdown(self):
         self.log.info(_("shutting down..."))
         try:
-            if self.config['webinterface']['activated'] and hasattr(self, "webserver"):
+            if self.config['webui']['activated'] and hasattr(self, "webserver"):
                 self.webserver.quit()
 
             for thread in list(self.threadManager.threads):
diff --git a/pyload/config/Setup.py b/pyload/config/Setup.py
index 081184652..7f5c0b0ed 100644
--- a/pyload/config/Setup.py
+++ b/pyload/config/Setup.py
@@ -326,8 +326,8 @@ class SetupAssistant(object):
 
         print
         print _("Listen address, if you use 127.0.0.1 or localhost, the webinterface will only accessible locally.")
-        self.config.set("webinterface", "host", self.ask(_("Address"), "0.0.0.0"))
-        self.config.set("webinterface", "port", self.ask(_("Port"), "8000"))
+        self.config.set("webui", "host", self.ask(_("Address"), "0.0.0.0"))
+        self.config.set("webui", "port", self.ask(_("Port"), "8000"))
         print
         print _("pyLoad offers several server backends, now following a short explanation.")
         print "- auto:", _("Automatically choose the best webserver for your platform.")
@@ -347,7 +347,7 @@ class SetupAssistant(object):
         else:
             servers = ["auto", "builtin", "threaded", "fastcgi", "lightweight"]
 
-        self.config.set("webinterface", "server", self.ask(_("Choose webserver"), "auto", servers))
+        self.config.set("webui", "server", self.ask(_("Choose webserver"), "auto", servers))
 
 
     def conf_ssl(self):
@@ -363,7 +363,7 @@ class SetupAssistant(object):
 
         ssl = self.ask(_("Activate SSL?"), self.yes, bool=True)
         self.config.set("remote", "ssl", ssl)
-        self.config.set("webinterface", "ssl", ssl)
+        self.config.set("webui", "ssl", ssl)
 
 
     def set_user(self):
diff --git a/pyload/config/default.conf b/pyload/config/default.conf
index cfbd25968..d4b3fd493 100644
--- a/pyload/config/default.conf
+++ b/pyload/config/default.conf
@@ -9,7 +9,7 @@ ssl - "SSL":
     bool activated : "Activated"= False
     file cert : "SSL Certificate" = ssl.crt
     file key : "SSL Key" = ssl.key
-webinterface - "Web UI":
+webui - "Web UI":
     bool activated : "Activated" = True
     builtin;threaded;fastcgi;lightweight server : "Server" = builtin
     bool https : "Use HTTPS" = False
diff --git a/pyload/manager/thread/Server.py b/pyload/manager/thread/Server.py
index 76b9efda8..5962981e8 100644
--- a/pyload/manager/thread/Server.py
+++ b/pyload/manager/thread/Server.py
@@ -20,12 +20,12 @@ class WebServer(threading.Thread):
         self.core = pycore
         core = pycore
         self.running = True
-        self.server = pycore.config['webinterface']['server']
-        self.https = pycore.config['webinterface']['https']
+        self.server = pycore.config['webui']['server']
+        self.https = pycore.config['webui']['https']
         self.cert = pycore.config["ssl"]["cert"]
         self.key = pycore.config["ssl"]["key"]
-        self.host = pycore.config['webinterface']['host']
-        self.port = pycore.config['webinterface']['port']
+        self.host = pycore.config['webui']['host']
+        self.port = pycore.config['webui']['port']
 
         self.setDaemon(True)
 
@@ -66,7 +66,7 @@ class WebServer(threading.Thread):
                     self.server = "builtin"
             else:
                 self.core.log.info(_("Server set to threaded, due to known performance problems on windows."))
-                self.core.config['webinterface']['server'] = "threaded"
+                self.core.config['webui']['server'] = "threaded"
                 self.server = "threaded"
 
         if self.server == "threaded":
diff --git a/pyload/webui/__init__.py b/pyload/webui/__init__.py
index 1310c629d..d965db3a0 100644
--- a/pyload/webui/__init__.py
+++ b/pyload/webui/__init__.py
@@ -39,10 +39,10 @@ else:
     config = Server.core.config
     JS = JsEngine(Server.core)
 
-THEME = config.get('webinterface', 'theme')
+THEME = config.get('webui', 'theme')
 DL_ROOT = config.get('general', 'download_folder')
 LOG_ROOT = config.get('log', 'log_folder')
-PREFIX = config.get('webinterface', 'prefix')
+PREFIX = config.get('webui', 'prefix')
 
 if PREFIX:
     PREFIX = PREFIX.rstrip("/")
-- 
cgit v1.2.3


From 8cb76afacfe051b3961820494b789dc8d11f006a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 02:43:52 +0200
Subject: [README] Update

---
 README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 7e436efb0..6657a193d 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,48 @@
-[![pyLoad](/docs/resources/banner.png "pyLoad")](http://pyload.org/)
-====================================================================
+<p align="center"><a href="http://pyload.org/"><img src="/docs/resources/banner.png" alt="pyLoad" /></a></p>
 
 [![Translation Status](http://translate.pyload.org/badges/pyload/localized.png "Translation Status")](http://translate.pyload.org/project/pyload/)
 
 **pyLoad** is a Free and Open Source download manager written in Python and designed to be extremely lightweight.
 
-Its friendly Web User Interface allows full managing and easily remote access from anywhere!
 
-pyLoad was developed to run on NAS, next-gen routers and headless home servers, whatever device able to connect to internet
-and supporting the Python programming language, so it's available for all kind of operating systems and a wide range of hardware platforms;
-you can even install on your PC or Mac if you want and control it entirely by web in the same way.
+Table of contents
+-----------------
+
+ - [Description](#description)
+ - [Download](#download)
+ - [Installation](#installation)
+ - [Dependencies](#dependencies)
+   - [Required](#required)
+   - [Optional](#optional)
+ - [Usage](#usage)
+   - [First Start](#first-start)
+   - [Web User Interface](#web-user-interface)
+   - [Command Line Interface](#command-line-interface)
+ - [Development](#development)
+ - [Translations](#translations)
+   - [Send a tip for translators](#send-a-tip-for-translators)
+   - [Update templates](#update-templates)
+   - [Retrieve PO files](#retrieve-po-files)
+   - [Compile PO files](#compile-po-files)
+ - [Licensing](#licensing)
+   - [Main program](#main-program)
+   - [Plugins](#plugins)
+ - [Plugin policy](#plugin-policy)
+ - [Credits](#credits)
+
+
+Description
+-----------
+
+**pyLoad** was developed to run on any device able to connect to internet and supporting the Python programming language.
+That's mean it's available for a really wide range of hardware platforms and operating systems.
+You can control it entirely by web on its friendly Web User Interface.
 
 All common video-sites, one-click-hosters, container formats and well known web standards are supported to allow you to download your files.
 Additionaly, pyLoad has a great variety of plugins to automate common tasks and make unattended running possible.
 
 pyLoad has a fully featured and well documented Application Programming Interface, easily extendable and accessible by external tools, cross-platform apps or other softwares.
-Just take a look to the [Development section](https://github.com/pyload/pyload/tree/master#development) for more info about that.
+Just take a look to the [Development section](#development) for more info about that.
 
 For news, wiki, forum and further info visit the pyLoad website: <http://pyload.org/>.
 
@@ -25,27 +52,29 @@ Or joining us at `#pyload` on `irc.freenode.net`.
 Download
 --------
 
-> **Note:**
-> You need **at least Python 2.5** or **at most Python 2.7** to run pyLoad and its required software dependencies.
->> **Python 3** and **PyPy** are not yet supported.
-
-Pre-build packages are provided with all the software dependencies required to run pyLoad flawlessly on the referenced platform, Python included.
-
-But you can even get the source code here and manually install the required packages afterwards.
-Please refer to the [Dependencies section](https://github.com/pyload/pyload/tree/master#dependencies) for more info about that.
-
 > **Note:**
 > If you wanna use pyLoad on Windows, it's hightly recommented to install the latest **official** pre-build package for that platform.
 
- - **Pre-build packages**: <https://github.com/pyload/pyload/releases>.
- - **Latest stable version** (source code): <https://github.com/pyload/pyload/archive/stable.zip>.
- - **Latest development version** (source code): <https://github.com/pyload/pyload/archive/master.zip>.
+Release                                      | Download
+-------------------------------------------- | -----------------------------------------------------
+Pre-build packages                           | <https://github.com/pyload/pyload/releases>
+Latest stable version (source code)          | <https://github.com/pyload/pyload/archive/stable.zip>
+Latest development version (source code)     | <https://github.com/pyload/pyload/archive/master.zip>
+
+Pre-build packages are provided with all the software dependencies required to run pyLoad flawlessly on the referenced platform.
+If you choose a source code, at least you need to have the proper Python version installed on your platform before launch pyLoad.
 
 
 Installation
 ------------
 
-...
+pyLoad currently works under:
+
+ - [ ] PyPy
+ - [x] **Python 2.5**
+ - [x] **Python 2.6**
+ - [x] **Python 2.7**
+ - [ ] Python 3
 
 You can install any missing software package from the *Python Package Index* typing:
 
-- 
cgit v1.2.3


From 2e16ec21f778c135f0e97f8444a3b307700b7001 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 03:09:50 +0200
Subject: The single whitespace cleanup O.O

---
 pyload/webui/themes/Next/tml/queue.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyload/webui/themes/Next/tml/queue.html b/pyload/webui/themes/Next/tml/queue.html
index 1706c7567..265cdfbe1 100644
--- a/pyload/webui/themes/Next/tml/queue.html
+++ b/pyload/webui/themes/Next/tml/queue.html
@@ -60,7 +60,7 @@ document.addEvent("domready", function(){
             {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
         </div>
     <div style="clear: both; margin-bottom: -10px"></div>
-    
+
 
     <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children">
     <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
-- 
cgit v1.2.3


From 3724412ee9d40363c85f50f4f6af9eb14f2e646d Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 8 Apr 2015 14:04:14 +0200
Subject: [README] Update (2)

---
 README.md | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 6657a193d..7fb70fa1c 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ Description
 
 **pyLoad** was developed to run on any device able to connect to internet and supporting the Python programming language.
 That's mean it's available for a really wide range of hardware platforms and operating systems.
-You can control it entirely by web on its friendly Web User Interface.
+You can control it entirely by web using its friendly Web User Interface.
 
 All common video-sites, one-click-hosters, container formats and well known web standards are supported to allow you to download your files.
 Additionaly, pyLoad has a great variety of plugins to automate common tasks and make unattended running possible.
@@ -55,26 +55,29 @@ Download
 > **Note:**
 > If you wanna use pyLoad on Windows, it's hightly recommented to install the latest **official** pre-build package for that platform.
 
-Release                                      | Download
--------------------------------------------- | -----------------------------------------------------
-Pre-build packages                           | <https://github.com/pyload/pyload/releases>
-Latest stable version (source code)          | <https://github.com/pyload/pyload/archive/stable.zip>
-Latest development version (source code)     | <https://github.com/pyload/pyload/archive/master.zip>
+Releases                                              | Download
+----------------------------------------------------- | -----------------------------------------------------
+Pre-build packages with changelog                     | <https://github.com/pyload/pyload/releases>
 
 Pre-build packages are provided with all the software dependencies required to run pyLoad flawlessly on the referenced platform.
 If you choose a source code, at least you need to have the proper Python version installed on your platform before launch pyLoad.
 
+Source code                                           | Download
+----------------------------------------------------- | -----------------------------------------------------
+Latest stable version                                 | <https://github.com/pyload/pyload/archive/stable.zip>
+Latest development version                            | <https://github.com/pyload/pyload/archive/master.zip>
+
 
 Installation
 ------------
 
 pyLoad currently works under:
 
- - [ ] PyPy
  - [x] **Python 2.5**
  - [x] **Python 2.6**
  - [x] **Python 2.7**
  - [ ] Python 3
+ - [ ] PyPy
 
 You can install any missing software package from the *Python Package Index* typing:
 
-- 
cgit v1.2.3