diff options
author | Walter Purcaro <vuolter@gmail.com> | 2014-08-30 19:21:27 +0200 |
---|---|---|
committer | Walter Purcaro <vuolter@gmail.com> | 2014-08-30 19:21:27 +0200 |
commit | 5297f54d11ef29b938a077e3acf9c5b557c62677 (patch) | |
tree | 8c11ba278bd4779bda00aecb5f58699a811bf72a /module/webui/themes/flat/tml | |
parent | Fix resume and progress column for some FTP files (diff) | |
download | pyload-5297f54d11ef29b938a077e3acf9c5b557c62677.tar.xz |
[webui] Improve and fix 3
Diffstat (limited to 'module/webui/themes/flat/tml')
-rw-r--r-- | module/webui/themes/flat/tml/admin.html | 2 | ||||
-rw-r--r-- | module/webui/themes/flat/tml/base.html | 9 | ||||
-rw-r--r-- | module/webui/themes/flat/tml/filemanager.html | 78 | ||||
-rw-r--r-- | module/webui/themes/flat/tml/home.html | 7 | ||||
-rw-r--r-- | module/webui/themes/flat/tml/login.html | 2 |
5 files changed, 7 insertions, 91 deletions
diff --git a/module/webui/themes/flat/tml/admin.html b/module/webui/themes/flat/tml/admin.html index 855a2a627..c7bdd7894 100644 --- a/module/webui/themes/flat/tml/admin.html +++ b/module/webui/themes/flat/tml/admin.html @@ -15,7 +15,7 @@ <br> <br> - {{ _("To add user or change passwords use:") }} <b>python pyLoadCore.py -u</b><br> + {{ _("To add user or change passwords use:") }} <b>python pyload.py -u</b><br> {{ _("Important: Admin user have always all permissions!") }} <form action="" method="POST"> diff --git a/module/webui/themes/flat/tml/base.html b/module/webui/themes/flat/tml/base.html index 18a380463..17349c5f1 100644 --- a/module/webui/themes/flat/tml/base.html +++ b/module/webui/themes/flat/tml/base.html @@ -5,7 +5,7 @@ <head> <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/flat.min.css"/> <link rel="stylesheet" type="text/css" href="/flat/css/window.min.css"/> <link rel="stylesheet" type="text/css" href="/flat/css/MooDialog.min.css"/> @@ -92,14 +92,11 @@ <li {{ selected('downloads') }}> <a href="/downloads/" title=""><img src="/flat/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a> </li> -{# <li {{ selected('filemanager') }}>#} -{# <a href="/filemanager/" title=""><img src="/flat/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#} -{# </li>#} <li {{ selected('logs', True) }}> - <a href="/logs/" class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-index.png" alt="" />{{_("Logs")}}</a> + <a href="/logs/" title=""><img src="/flat/img/head-menu-index.png" alt="" />{{_("Logs")}}</a> </li> <li {{ selected('settings', True) }}> - <a href="/settings/" class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a> + <a href="/settings/" title=""><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a> </li> {% endblock %} diff --git a/module/webui/themes/flat/tml/filemanager.html b/module/webui/themes/flat/tml/filemanager.html deleted file mode 100644 index 9c49e6dba..000000000 --- a/module/webui/themes/flat/tml/filemanager.html +++ /dev/null @@ -1,78 +0,0 @@ -{% extends '/flat/tml/base.html' %} - -{% block head %} - -<script type="text/javascript" src="/flat/js/render/filemanager.min.js"></script> - -<script type="text/javascript"> - -document.addEvent("domready", function(){ - var fmUI = new FilemanagerUI("url",1); -}); -</script> -{% endblock %} - -{% block title %}Downloads - {{super()}} {% endblock %} - - -{% block subtitle %} -{{_("FileManager")}} -{% endblock %} - -{% macro display_file(file) %} - <li class="file"> - <input type="hidden" name="path" class="path" value="{{ file.path }}" /> - <input type="hidden" name="name" class="name" value="{{ file.name }}" /> - <span> - <b>{{ file.name }}</b> - <span class="buttons" style="opacity:0"> - <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" /> - - <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.png" /> - </span> - </span> - </li> -{%- endmacro %} - -{% macro display_folder(fld, open = false) -%} - <li class="folder"> - <input type="hidden" name="path" class="path" value="{{ fld.path }}" /> - <input type="hidden" name="name" class="name" value="{{ fld.name }}" /> - <span> - <b>{{ fld.name }}</b> - <span class="buttons" style="opacity:0"> - <img title="{{_("Rename Directory")}}" class="rename" style="cursor: pointer" height="12px" src="/flat/img/pencil.png" /> - - <img title="{{_("Delete Directory")}}" class="delete" style="margin-left: -10px; cursor: pointer" width="12px" height="12px" src="/flat/img/delete.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 %} - {% if open %} - <ul> - {% else %} - <ul style="display:none"> - {% endif %} - {% for child in fld.folders %} - {{ display_folder(child) }} - {% endfor %} - {% for child in fld.files %} - {{ display_file(child) }} - {% endfor %} - </ul> - {% else %} - <div style="display:none">{{ _("Folder is empty") }}</div> - {% endif %} - </li> -{%- endmacro %} - -{% block content %} - -<div style="clear:both"><!-- --></div> - -<ul id="directories-list"> -{{ display_folder(root, true) }} -</ul> - -{% endblock %} diff --git a/module/webui/themes/flat/tml/home.html b/module/webui/themes/flat/tml/home.html index 052e0daca..838a351ad 100644 --- a/module/webui/themes/flat/tml/home.html +++ b/module/webui/themes/flat/tml/home.html @@ -219,14 +219,11 @@ var LinkEntry = new Class({ <li> <a href="/downloads/" title=""><img src="/flat/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a> </li> -{#<li>#} -{# <a href="/filemanager/" title=""><img src="/flat/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#} -{#</li>#} <li class="right"> - <a href="/logs/" class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-index.png" alt="" />{{_("Logs")}}</a> + <a href="/logs/" title=""><img src="/flat/img/head-menu-index.png" alt="" />{{_("Logs")}}</a> </li> <li class="right"> - <a href="/settings/" class="action index" accesskey="x" rel="nofollow"><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a> + <a href="/settings/" title=""><img src="/flat/img/head-menu-config.png" alt="" />{{_("Config")}}</a> </li> {% endblock %} diff --git a/module/webui/themes/flat/tml/login.html b/module/webui/themes/flat/tml/login.html index a7ef3c7c4..76365a79c 100644 --- a/module/webui/themes/flat/tml/login.html +++ b/module/webui/themes/flat/tml/login.html @@ -27,7 +27,7 @@ {% if errors %} <p>{{_("Your username and password didn't match. Please try again.")}}</p> - {{ _("To reset your login data or add an user run:") }} <b> python pyLoadCore.py -u</b> + {{ _("To reset your login data or add an user run:") }} <b> python pyload.py -u</b> {% endif %} </div> |