Webinterface

3 files changed, 36 insertions, 45 deletions

diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index bd2955038..16526341e 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -36,4 +36,6 @@ Active Downloads
   

   <tbody>

 </table>

-{% endblock %}
\ No newline at end of file
+{% endblock %}

+

+{% include "default/window.html" %}
\ No newline at end of file
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 8c582c5d0..3995d0390 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -1,16 +1,3 @@
-{% extends 'default/base.html' %}
-
-{% block title %}Queue - {{block.super}} {% endblock %}
-
-{% block menu %}
-<li>
-    <a href="{% url home %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-home.png" alt="" /> Home</a>
-</li>
-<li class="selected">
-    <a href="{% url queue %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-download.png" alt="" /> Queue</a></li>
-<li>
-    <a href="{% url downloads %}" title=""><img src="{{ MEDIA_URL }}img/head-menu-development.png" alt="" /> Downloads</a></li>
-<li class="right">
-    <a href="{% url logs %}"  class="action index" accesskey="x" rel="nofollow"><img src="{{ MEDIA_URL }}img/head-menu-index.png" alt="" />Logs</a>
-</li>
-{% endblock %}
\ No newline at end of file
+{% extends 'default/base.html' %}

+

+{% block title %}Queue - {{block.super}} {% endblock %}

diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html
index f756c4352..f364f2338 100644
--- a/module/web/templates/default/window.html
+++ b/module/web/templates/default/window.html
@@ -1,28 +1,30 @@
-<div id="{{id}}" class="StickyWinInstance SWclearfix" style="overflow: visible;visibility: visible;display: none; position: absolute; z-index: 10000; opacity: 1; left: 0px; top: 0px;">
-<div class="DefaultStickyWin" style="width: {{width}}px;">
-
-<div class="top">
-<div class="top_ul"></div>
-<div class="top_ur"><h1 class="caption dragHandle">{{caption}}</h1>
-</div></div>
-
-<div class="middle">
-<div class="body">{{body}}
-</div></div>
-
-<div class="closeBody">
-<div class="closeButtons">
-<a class="closeSticky button" id="bt{{button}}">{{button}}</a><a class="closeSticky button">Close</a>
-</div>
-</div>
-
-<div class="bottom">
-<div class="bottom_ll">
-</div>
-
-<div class="bottom_lr"></div>
-</div>
-<div class="closeButton closeSticky"></div>
-
-</div>
-</div>
\ No newline at end of file
+{% block content %}

+<div id="{{id}}" class="StickyWinInstance SWclearfix" style="overflow: visible;visibility: visible;display: none; position: absolute; z-index: 10000; opacity: 1; left: 0px; top: 0px;">

+<div class="DefaultStickyWin" style="width: {{width}}px;">

+

+<div class="top">

+<div class="top_ul"></div>

+<div class="top_ur"><h1 class="caption dragHandle">{{caption}}</h1>

+</div></div>

+

+<div class="middle">

+<div class="body">{{body}}

+</div></div>

+

+<div class="closeBody">

+<div class="closeButtons">

+<a class="closeSticky button" id="bt{{button}}">{{button}}</a><a class="closeSticky button">Close</a>

+</div>

+</div>

+

+<div class="bottom">

+<div class="bottom_ll">

+</div>

+

+<div class="bottom_lr"></div>

+</div>

+<div class="closeButton closeSticky"></div>

+

+</div>

+</div>

+{% block content %}
\ No newline at end of file