[webui] Improve and fix 2

8 files changed, 46 insertions, 46 deletions

diff --git a/module/webui/themes/dark/tml/admin.html b/module/webui/themes/dark/tml/admin.html
index a5fc16b86..1bbfad5c4 100644
--- a/module/webui/themes/dark/tml/admin.html
+++ b/module/webui/themes/dark/tml/admin.html
@@ -1,7 +1,7 @@
 {% extends '/dark/tml/base.html' %}
 
 {% block head %}
-    <script type="text/javascript" src="/default/js/admin.min.js"></script>
+    <script type="text/javascript" src="/dark/js/render/admin.min.js"></script>
 {% endblock %}
 
 
diff --git a/module/webui/themes/dark/tml/base.html b/module/webui/themes/dark/tml/base.html
index 76a0c4322..a832dc79f 100644
--- a/module/webui/themes/dark/tml/base.html
+++ b/module/webui/themes/dark/tml/base.html
@@ -7,15 +7,15 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 <link rel="stylesheet" type="text/css" href="/dark/css/default.min.css"/>
 <link rel="stylesheet" type="text/css" href="/dark/css/window.min.css"/>
-<link rel="stylesheet" type="text/css" href="/dark/css/MooDialog/MooDialog.min.css"/>
+<link rel="stylesheet" type="text/css" href="/dark/css/MooDialog.min.css"/>
 
-<script type="text/javascript" src="/default/js/static/mootools-core.min.js"></script>
-<script type="text/javascript" src="/default/js/static/mootools-more.min.js"></script>
-<script type="text/javascript" src="/default/js/static/MooDialog.min.js"></script>
-<script type="text/javascript" src="/default/js/static/purr.min.js"></script>
+<script type="text/javascript" src="/dark/js/static/mootools-core.min.js"></script>
+<script type="text/javascript" src="/dark/js/static/mootools-more.min.js"></script>
+<script type="text/javascript" src="/dark/js/static/MooDialog.min.js"></script>
+<script type="text/javascript" src="/dark/js/static/purr.min.js"></script>
 
 
-<script type="text/javascript" src="/default/js/base.min.js"></script>
+<script type="text/javascript" src="/dark/js/render/base.min.js"></script>
 
 <title>{% block title %}pyLoad {{_("Webinterface")}}{% endblock %}</title>
 
@@ -48,11 +48,11 @@
 {% endif %}
 
 <span id="cap_info" style="display: {% if captcha %}inline{%else%}none{% endif %}">
-<img src="/dark/img/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
+<img src="/dark/img/default/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
 <span style="font-weight: bold; cursor: pointer; margin-right: 2px;">{{_("Captcha waiting")}}</span>
 </span>
 
-    <img src="/dark/img/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
+    <img src="/dark/img/default/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
   <ul id="user-actions">
     <li><a href="/logout"  class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
     {% if user.is_admin %}
@@ -81,25 +81,25 @@
 
     {% block menu %}
     <li>
-        <a href="/" title=""><img src="/dark/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+        <a href="/" title=""><img src="/dark/img/default/head-menu-home.png" alt="" /> {{_("Home")}}</a>
     </li>
     <li {{ selected('queue') }}>
-        <a href="/queue/" title=""><img src="/dark/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+        <a href="/queue/" title=""><img src="/dark/img/default/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
     </li>
     <li {{ selected('collector') }}>
-        <a href="/collector/" title=""><img src="/dark/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+        <a href="/collector/" title=""><img src="/dark/img/default/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
     </li>
     <li {{ selected('downloads') }}>
-        <a href="/downloads/" title=""><img src="/dark/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+        <a href="/downloads/" title=""><img src="/dark/img/default/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
     </li>
 {#    <li {{ selected('filemanager') }}>#}
-{#        <a href="/filemanager/" title=""><img src="/dark/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
+{#        <a href="/filemanager/" title=""><img src="/dark/img/default/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
 {#    </li>#}
     <li {{ selected('logs', True) }}>
-        <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+        <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/default/head-menu-index.png" alt="" />{{_("Logs")}}</a>
     </li>
     <li {{ selected('settings', True) }}>
-        <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
+        <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/default/head-menu-config.png" alt="" />{{_("Config")}}</a>
     </li>
     {% endblock %}
     
@@ -153,7 +153,7 @@
 {% endfor %}
 
 <div id="load-indicator" style="opacity: 0; float: right; margin-top: -10px;">
-    <img src="/dark/img/ajax-loader.gif" alt="" style="padding-right: 5px"/>
+    <img src="/dark/img/default/ajax-loader.gif" alt="" style="padding-right: 5px"/>
     {{_("loading")}}
 </div>
 
@@ -162,7 +162,7 @@
 
   <hr style="clear: both;" />
 
-<div id="foot">&copy; 2008-2011 pyLoad Team
+<div id="foot">&copy; 2008-2014 pyLoad Team
 <a href="#top" class="action top" accesskey="x"><span>{{_("Back to top")}}</span></a><br />
 <!--<div class="breadcrumbs"></div>-->
 
diff --git a/module/webui/themes/dark/tml/filemanager.html b/module/webui/themes/dark/tml/filemanager.html
index fc3a1fcd3..21e45ff62 100644
--- a/module/webui/themes/dark/tml/filemanager.html
+++ b/module/webui/themes/dark/tml/filemanager.html
@@ -2,7 +2,7 @@
 
 {% block head %}
 
-<script type="text/javascript" src="/default/js/filemanager.min.js"></script>
+<script type="text/javascript" src="/dark/js/render/filemanager.min.js"></script>
 
 <script type="text/javascript">
 
@@ -26,9 +26,9 @@ document.addEvent("domready", function(){
     <span>
       <b>{{ file.name }}</b>
       <span class="buttons" style="opacity:0">
-      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+      <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/default/pencil.png" />
       &nbsp;&nbsp;
-      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+      <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/default/delete.png" />
       </span>
     </span>
   </li>
@@ -41,11 +41,11 @@ document.addEvent("domready", function(){
       <span>
   <b>{{ fld.name }}</b>
   <span class="buttons" style="opacity:0">
-        <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+        <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/default/pencil.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+        <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/default/delete.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/add_folder.png" />
+        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/default/add_folder.png" />
   </span>
       </span>
       {% if (fld.folders|length + fld.files|length) > 0 %}
diff --git a/module/webui/themes/dark/tml/folder.html b/module/webui/themes/dark/tml/folder.html
index 81758b544..05176d51e 100644
--- a/module/webui/themes/dark/tml/folder.html
+++ b/module/webui/themes/dark/tml/folder.html
@@ -4,11 +4,11 @@
   <span>
     <b>{{ name }}</b>
     <span class="buttons" style="opacity:0">
-    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+    <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/dark/img/default/pencil.png" />
     &nbsp;&nbsp;
-    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+    <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/default/delete.png" />
     &nbsp;&nbsp;
-    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/add_folder.png" />
+    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/dark/img/default/add_folder.png" />
     </span>
   </span>
   <div style="display:none">{{ _("Folder is empty") }}</div>
diff --git a/module/webui/themes/dark/tml/home.html b/module/webui/themes/dark/tml/home.html
index 340a905cf..2314d0def 100644
--- a/module/webui/themes/dark/tml/home.html
+++ b/module/webui/themes/dark/tml/home.html
@@ -129,7 +129,7 @@ var LinkEntry = new Class({
                 'html': item.percent+ '% / '+ humanFileSize(item.size-item.bleft)
                 }),
                 remove: new Element('img',{
-                'src': '/dark/img/control_cancel.png',
+                'src': '/dark/img/default/control_cancel.png',
                 'styles':{
                     'vertical-align': 'middle',
                     'margin-right': '-20px',
@@ -208,25 +208,25 @@ var LinkEntry = new Class({
 
 {% block menu %}
 <li class="selected">
-    <a href="/" title=""><img src="/dark/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+    <a href="/" title=""><img src="/dark/img/default/head-menu-home.png" alt="" /> {{_("Home")}}</a>
 </li>
 <li>
-    <a href="/queue/" title=""><img src="/dark/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+    <a href="/queue/" title=""><img src="/dark/img/default/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
 </li>
 <li>
-    <a href="/collector/" title=""><img src="/dark/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+    <a href="/collector/" title=""><img src="/dark/img/default/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
 </li>
 <li>
-    <a href="/downloads/" title=""><img src="/dark/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+    <a href="/downloads/" title=""><img src="/dark/img/default/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
 </li>
 {#<li>#}
-{#    <a href="/filemanager/" title=""><img src="/dark/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
+{#    <a href="/filemanager/" title=""><img src="/dark/img/default/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
 {#</li>#}
 <li class="right">
-    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+    <a href="/logs/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/default/head-menu-index.png" alt="" />{{_("Logs")}}</a>
 </li>
 <li class="right">
-    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
+    <a href="/settings/"  class="action index" accesskey="x" rel="nofollow"><img src="/dark/img/default/head-menu-config.png" alt="" />{{_("Config")}}</a>
 </li>
 {% endblock %}
 
@@ -251,7 +251,7 @@ var LinkEntry = new Class({
     <td id="link_{{ link.id }}_bleft">{{ link.format_size }}</td>
     <td>
         <span id="link_{{ link.id }}_percent">{{ link.percent }}% /{{ link.bleft }}</span>
-        <img id="link_{{ link.id }}_remove" style="vertical-align: middle; margin-right: -20px; margin-left: 5px; margin-top: -2px; cursor:pointer;" src="/dark/img/control_cancel.png"/>
+        <img id="link_{{ link.id }}_remove" style="vertical-align: middle; margin-right: -20px; margin-left: 5px; margin-top: -2px; cursor:pointer;" src="/dark/img/default/control_cancel.png"/>
     </td>
   </tr>
   <tr id="link_{{ link.id }}_pgb_tr">
diff --git a/module/webui/themes/dark/tml/queue.html b/module/webui/themes/dark/tml/queue.html
index 5159ba5f5..f68079106 100644
--- a/module/webui/themes/dark/tml/queue.html
+++ b/module/webui/themes/dark/tml/queue.html
@@ -1,7 +1,7 @@
 {% extends '/dark/tml/base.html' %}
 {% block head %}
 
-<script type="text/javascript" src="/default/js/package.min.js"></script>
+<script type="text/javascript" src="/dark/js/render/package.min.js"></script>
 
 <script type="text/javascript">
 
@@ -37,17 +37,17 @@ document.addEvent("domready", function(){
     <div class="order" style="display: none;">{{ package.order }}</div>
 
     <div class="packagename" style="cursor: pointer">
-        <img class="package_drag" src="/dark/img/folder.png" style="cursor: move; margin-bottom: -2px">
+        <img class="package_drag" src="/dark/img/default/folder.png" style="cursor: move; margin-bottom: -2px">
         <span class="name">{{package.name}}</span>
         &nbsp;&nbsp;
         <span class="buttons" style="opacity:0">
-        <img title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/dark/img/delete.png" />
+        <img title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/dark/img/default/delete.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/dark/img/arrow_refresh.png" />
+        <img title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/dark/img/default/arrow_refresh.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/dark/img/pencil.png" />
+        <img title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/dark/img/default/pencil.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/dark/img/package_go.png" />
+        <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/dark/img/default/package_go.png" />
         </span>
     </div>
     {% set progress = (package.linksdone * 100) / package.linkstotal %}
diff --git a/module/webui/themes/dark/tml/settings.html b/module/webui/themes/dark/tml/settings.html
index d606f45ef..c9c0bed8a 100644
--- a/module/webui/themes/dark/tml/settings.html
+++ b/module/webui/themes/dark/tml/settings.html
@@ -4,9 +4,9 @@
 {% block subtitle %}{{ _("Config") }}{% endblock %}
 
 {% block head %}
-    <script type="text/javascript" src="/default/js/static/tinytab.min.js"></script>
-    <script type="text/javascript" src="/default/js/static/MooDropMenu.min.js"></script>
-    <script type="text/javascript" src="/default/js/settings.min.js"></script>
+    <script type="text/javascript" src="/dark/js/static/tinytab.min.js"></script>
+    <script type="text/javascript" src="/dark/js/static/MooDropMenu.min.js"></script>
+    <script type="text/javascript" src="/dark/js/render/settings.min.js"></script>
 
 {% endblock %}
 
diff --git a/module/webui/themes/dark/tml/window.html b/module/webui/themes/dark/tml/window.html
index 82481fb27..0b4f5362b 100644
--- a/module/webui/themes/dark/tml/window.html
+++ b/module/webui/themes/dark/tml/window.html
@@ -12,7 +12,7 @@
 <label for="add_links">{{_("Links")}}
 <span class="small">{{_("Paste your links here or any text and press the filter button.")}}</span>
 <span class="small"> {{ _("Filter urls") }}
-<img alt="URIParsing" Title="Parse Uri" src="/dark/img/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
+<img alt="URIParsing" Title="Parse Uri" src="/dark/img/default/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
 </span>
 
 </label>