From 81de1c4b127e116c8ca3e5df620b5c0a56a087bc Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 29 Aug 2014 12:12:23 +0200
Subject: [webui] Improve and fix 2

---
 module/webui/themes/flat/tml/admin.html       |  2 +-
 module/webui/themes/flat/tml/base.html        | 21 +++++++++++----------
 module/webui/themes/flat/tml/filemanager.html |  4 ++--
 module/webui/themes/flat/tml/folder.html      |  2 +-
 module/webui/themes/flat/tml/queue.html       |  2 +-
 module/webui/themes/flat/tml/settings.html    |  6 +++---
 module/webui/themes/flat/tml/window.html      |  2 +-
 7 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'module/webui/themes/flat/tml')

diff --git a/module/webui/themes/flat/tml/admin.html b/module/webui/themes/flat/tml/admin.html
index 8548cac3f..855a2a627 100644
--- a/module/webui/themes/flat/tml/admin.html
+++ b/module/webui/themes/flat/tml/admin.html
@@ -1,7 +1,7 @@
 {% extends '/flat/tml/base.html' %}
 
 {% block head %}
-    <script type="text/javascript" src="/default/js/admin.min.js"></script>
+    <script type="text/javascript" src="/flat/js/render/admin.min.js"></script>
 {% endblock %}
 
 
diff --git a/module/webui/themes/flat/tml/base.html b/module/webui/themes/flat/tml/base.html
index 5dc601b88..18a380463 100644
--- a/module/webui/themes/flat/tml/base.html
+++ b/module/webui/themes/flat/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="/flat/css/default.min.css"/>
 <link rel="stylesheet" type="text/css" href="/flat/css/window.min.css"/>
-<link rel="stylesheet" type="text/css" href="/flat/css/MooDialog/MooDialog.min.css"/>
+<link rel="stylesheet" type="text/css" href="/flat/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="/flat/js/static/mootools-core.min.js"></script>
+<script type="text/javascript" src="/flat/js/static/mootools-more.min.js"></script>
+<script type="text/javascript" src="/flat/js/static/MooDialog.min.js"></script>
+<script type="text/javascript" src="/flat/js/static/purr.min.js"></script>
 
 
-<script type="text/javascript" src="/default/js/base.min.js"></script>
+<script type="text/javascript" src="/flat/js/render/base.min.js"></script>
 
 <title>{% block title %}pyLoad {{_("Webinterface")}}{% endblock %}</title>
 
@@ -48,7 +48,7 @@
 {% endif %}
 
 <span id="cap_info" style="display: {% if captcha %}inline{%else%}none{% endif %}">
-<img src="/flat/img/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
+<img src="/flat/img/default/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
 <span style="font-weight: 300; cursor: pointer; margin-right: 2px;">{{_("Captcha waiting")}}</span>
 </span>
 
@@ -68,7 +68,7 @@
     {% endblock %}
   </div>
 
-  <a href="/"><img id="head-logo" src="/flat/img/pyload-logo.png" alt="pyLoad" /></a>
+  <a href="/"><img id="head-logo" src="/flat/img/default/pyload-logo.png" alt="pyLoad" /></a>
 
   <div id="head-menu">
     <ul>
@@ -121,6 +121,7 @@
 {% if perms.LIST %}
 <ul id="page-actions">
     <li><span class="time">{{_("Download:")}}</span><a id="time" style=" background-color: {% if status.download %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.download %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
+    <li><span class="reconnect">{{_("Reconnect:")}}</span><a id="reconnect" style=" background-color: {% if status.reconnect %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm;color:black; "> {% if status.reconnect %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
     <li><a class="action backlink">{{_("Speed:")}} <b id="speed">{{ status.speed }}</b></a></li>
     <li><a class="action cog">{{_("Active:")}} <b id="aktiv" title="{{_("Active")}}">{{ status.active }}</b> / <b id="aktiv_from" title="{{_("Queued")}}">{{ status.queue }}</b> / <b id="aktiv_total" title="{{_("Total")}}">{{ status.total }}</b></a></li>
     <li><a href=""  class="action revisions" accesskey="o" rel="nofollow">{{_("Reload page")}}</a></li>
@@ -152,7 +153,7 @@
 {% endfor %}
 
 <div id="load-indicator" style="opacity: 0; float: right; margin-top: -10px;">
-    <img src="/flat/img/ajax-loader.gif" alt="" style="padding-right: 5px"/>
+    <img src="/flat/img/default/ajax-loader.gif" alt="" style="padding-right: 5px"/>
     {{_("loading")}}
 </div>
 
@@ -161,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/flat/tml/filemanager.html b/module/webui/themes/flat/tml/filemanager.html
index 75e862c51..9c49e6dba 100644
--- a/module/webui/themes/flat/tml/filemanager.html
+++ b/module/webui/themes/flat/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="/flat/js/render/filemanager.min.js"></script>
 
 <script type="text/javascript">
 
@@ -45,7 +45,7 @@ document.addEvent("domready", function(){
         &nbsp;&nbsp;
         <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
         &nbsp;&nbsp;
-        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/add_folder.png" />
+        <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/default/add_folder.png" />
   </span>
       </span>
       {% if (fld.folders|length + fld.files|length) > 0 %}
diff --git a/module/webui/themes/flat/tml/folder.html b/module/webui/themes/flat/tml/folder.html
index 0c4dacd63..89b84e7bb 100644
--- a/module/webui/themes/flat/tml/folder.html
+++ b/module/webui/themes/flat/tml/folder.html
@@ -8,7 +8,7 @@
     &nbsp;&nbsp;
     <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" />
     &nbsp;&nbsp;
-    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/add_folder.png" />
+    <img title="{{_("Add subdirectory")}}" class="mkdir" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/default/add_folder.png" />
     </span>
   </span>
   <div style="display:none">{{ _("Folder is empty") }}</div>
diff --git a/module/webui/themes/flat/tml/queue.html b/module/webui/themes/flat/tml/queue.html
index d7af22314..0d3022ddd 100644
--- a/module/webui/themes/flat/tml/queue.html
+++ b/module/webui/themes/flat/tml/queue.html
@@ -1,7 +1,7 @@
 {% extends '/flat/tml/base.html' %}
 {% block head %}
 
-<script type="text/javascript" src="/default/js/package.min.js"></script>
+<script type="text/javascript" src="/flat/js/render/package.min.js"></script>
 
 <script type="text/javascript">
 
diff --git a/module/webui/themes/flat/tml/settings.html b/module/webui/themes/flat/tml/settings.html
index 15615e9f0..1bd0d1e17 100644
--- a/module/webui/themes/flat/tml/settings.html
+++ b/module/webui/themes/flat/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="/flat/js/static/tinytab.min.js"></script>
+    <script type="text/javascript" src="/flat/js/static/MooDropMenu.min.js"></script>
+    <script type="text/javascript" src="/flat/js/render/settings.min.js"></script>
 
 {% endblock %}
 
diff --git a/module/webui/themes/flat/tml/window.html b/module/webui/themes/flat/tml/window.html
index 96afe4146..8f57843c6 100644
--- a/module/webui/themes/flat/tml/window.html
+++ b/module/webui/themes/flat/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="/flat/img/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
+<img alt="URIParsing" Title="Parse Uri" src="/flat/img/default/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
 </span>
 
 </label>
-- 
cgit v1.2.3