From f2d387f8a2915d7be11fe8741fe3b45a0252aa9d Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 6 Jan 2010 15:58:35 +0100 Subject: webinterface fix --- module/web/templates/default/base.html | 42 +++++-------------------- module/web/templates/default/home.html | 54 +++++++++++++++++++++++++++----- module/web/templates/default/queue.html | 13 ++++++++ module/web/templates/default/window.html | 14 ++++----- 4 files changed, 73 insertions(+), 50 deletions(-) (limited to 'module/web') diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 98858b9df..ecaec98f2 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -12,14 +12,12 @@ -{% block head %} -{% endblock %} + {% block title %}pyLoad Webinterface{% endblock %} - + + +{% block head %} +{% endblock %} @@ -106,8 +79,6 @@ function LinksToContent(data)
  • Queue
    • -
  • - Add
  • Downloads
  • @@ -169,5 +140,6 @@ function LinksToContent(data) - + +{% include "default/window.html" %} diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 16526341e..12fa55539 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -1,11 +1,55 @@ {% extends 'default/base.html' %} +{% block head %} + + + +{% endblock %} + {% block subtitle %} Active Downloads {% endblock %} - - {% block content %} @@ -32,10 +76,6 @@ Active Downloads {% endfor %} - -
    -{% endblock %} - -{% include "default/window.html" %} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 3995d0390..b4f1cb278 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -1,3 +1,16 @@ {% extends 'default/base.html' %} {% block title %}Queue - {{block.super}} {% endblock %} + +{% block menu %} +
  • + Home +
    • +
  • + Queue
    • +
  • + Downloads
    • +
  • + Logs +
    • +{% endblock %} \ No newline at end of file diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html index f364f2338..602622719 100644 --- a/module/web/templates/default/window.html +++ b/module/web/templates/default/window.html @@ -1,19 +1,18 @@ -{% block content %} -