Merge remote-tracking branch 'origin/0.4.10' into 0.4.10

16 files changed, 404 insertions, 64 deletions

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/README.md b/README.md
index 7e436efb0..7fb70fa1c 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 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.
 
 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/>.
 
@@ -26,26 +53,31 @@ 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.
+> 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 are provided with all the software dependencies required to run pyLoad flawlessly on the referenced platform, Python included.
+Releases                                              | Download
+----------------------------------------------------- | -----------------------------------------------------
+Pre-build packages with changelog                     | <https://github.com/pyload/pyload/releases>
 
-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.
+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.
 
-> **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>.
+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:
+
+ - [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:
 
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)
+
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 835a2978b..3ce35bfe1 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/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: */*",
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("/")
diff --git a/pyload/webui/themes/Next/tml/queue.html b/pyload/webui/themes/Next/tml/queue.html
index 6f50d740c..265cdfbe1 100644
--- a/pyload/webui/themes/Next/tml/queue.html
+++ b/pyload/webui/themes/Next/tml/queue.html
@@ -52,16 +52,16 @@ 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>
     <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0">
diff --git a/pyload/webui/themes/Next/tml/settings.html b/pyload/webui/themes/Next/tml/settings.html
index 6d097f49d..805340057 100644
--- a/pyload/webui/themes/Next/tml/settings.html
+++ b/pyload/webui/themes/Next/tml/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>