From 90ba0c9f3adccd02b62ec3ca6b4af849a7253d14 Mon Sep 17 00:00:00 2001 From: godofdream Date: Tue, 14 Aug 2012 22:37:58 +0200 Subject: first Design of Queue and Settings --- module/web/pyload_app.py | 10 +++ module/web/static/css/default/queue.css | 82 ++++++++++++++++++++++++ module/web/static/css/default/style.css | 3 +- module/web/static/img/default/arrow_refresh.png | Bin 0 -> 685 bytes module/web/static/img/default/delete.png | Bin 0 -> 715 bytes module/web/static/img/default/folder.png | Bin 0 -> 537 bytes module/web/static/img/default/icon_folder.png | Bin 0 -> 222 bytes module/web/static/img/default/pencil.png | Bin 0 -> 450 bytes module/web/templates/default/base.html | 5 +- module/web/templates/default/queue.html | 65 +++++++++++++++++++ module/web/templates/default/settings.html | 7 +- 11 files changed, 165 insertions(+), 7 deletions(-) create mode 100644 module/web/static/css/default/queue.css create mode 100644 module/web/static/img/default/arrow_refresh.png create mode 100644 module/web/static/img/default/delete.png create mode 100644 module/web/static/img/default/folder.png create mode 100644 module/web/static/img/default/icon_folder.png create mode 100644 module/web/static/img/default/pencil.png create mode 100644 module/web/templates/default/queue.html (limited to 'module/web') diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index afb97b361..843919b85 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -126,6 +126,16 @@ def logout(): s.delete() return render_to_response("logout.html", proc=[pre_processor]) +@route("/queue") +@login_required() +def index(api): + return render_to_response("queue.html", proc=[pre_processor]) + +@route("/settings") +@login_required() +def index(api): + return render_to_response("settings.html", proc=[pre_processor]) + @route("/") @login_required() def index(api): diff --git a/module/web/static/css/default/queue.css b/module/web/static/css/default/queue.css new file mode 100644 index 000000000..645beadae --- /dev/null +++ b/module/web/static/css/default/queue.css @@ -0,0 +1,82 @@ + +#queue-list { + list-style: none; + padding-left: 0; +} + +#page-actions{ + list-style: none; +} + +.pack{ + border: 2px solid #000000; + padding: 0; + -moz-border-radius: 10px; + border-radius: 10px; +} + +.pack_header{ + background: url("../../img/default/main-wrapper-bg.png") repeat-x; + cursor: pointer; + border: 2px solid #000000; + margin: 0px; + height: 23px; + -moz-border-radius-topleft: 10px; + -moz-border-radius-topright: 10px; + -webkit-border-top-left-radius: 10px; + -webkit-border-top-right-radius: 10px; + border-top-left-radius: 10px; + border-top-right-radius: 10px; +} + +.pack_icon{ + cursor: move; + height: 20px; + float: left; + margin-left: 5px; + padding-left: 25px; + background: url("../../img/default/icon_folder.png")no-repeat; +} + +.pack_name{ + vertical-align: middle; + color: #D5D5D5; +} + +.pack_progressbar{ + height: 8px; + margin: 8px 5px; +} + +.pack_toolbar{ + height: 24px; + float: left; + padding-left: 22px; +} + +.pack_toolbar div{ + height: 20px; + float: left; + padding-left: 22px; +} + +.pack_toolbar_delete { + background: url("../../img/default/delete.png")no-repeat; +} + +.pack_toolbar_restart { + background: url("../../img/default/arrow_refresh.png")no-repeat; +} + +.pack_toolbar_edit{ + background: url("../../img/default/pencil.png")no-repeat; +} + +.pack_children{ + display: none; +} + +.sort_children{ + list-style: none; + padding-left: 0; +} \ No newline at end of file diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index f882e4a43..90701b121 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -189,8 +189,9 @@ header .logo { border: 2px solid #000000; padding: 15px; font-size: 17px; - -moz-border-radius: 15px; border-radius: 15px; + -moz-border-radius: 15px; + -webkit-border-radius: 15px; } .login input, .login div{ diff --git a/module/web/static/img/default/arrow_refresh.png b/module/web/static/img/default/arrow_refresh.png new file mode 100644 index 000000000..0de26566d Binary files /dev/null and b/module/web/static/img/default/arrow_refresh.png differ diff --git a/module/web/static/img/default/delete.png b/module/web/static/img/default/delete.png new file mode 100644 index 000000000..08f249365 Binary files /dev/null and b/module/web/static/img/default/delete.png differ diff --git a/module/web/static/img/default/folder.png b/module/web/static/img/default/folder.png new file mode 100644 index 000000000..784e8fa48 Binary files /dev/null and b/module/web/static/img/default/folder.png differ diff --git a/module/web/static/img/default/icon_folder.png b/module/web/static/img/default/icon_folder.png new file mode 100644 index 000000000..31773520a Binary files /dev/null and b/module/web/static/img/default/icon_folder.png differ diff --git a/module/web/static/img/default/pencil.png b/module/web/static/img/default/pencil.png new file mode 100644 index 000000000..0bfecd50e Binary files /dev/null and b/module/web/static/img/default/pencil.png differ diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index d5d51d989..a2093a93a 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -17,10 +17,7 @@ - - {% block title %}pyLoad {{ _("Webinterface") }}{% endblock %} - {% block head %} {% endblock %} @@ -64,6 +61,8 @@
+ {% block pageactions %} + {% endblock pageactions %} DOM Element (hidden div)