Webinterface - Queue style update

3 files changed, 41 insertions, 44 deletions

diff --git a/module/web/media/default/css/default.css b/module/web/media/default/css/default.css
index 2d10c569b..392d828f1 100644
--- a/module/web/media/default/css/default.css
+++ b/module/web/media/default/css/default.css
@@ -1465,13 +1465,22 @@ div.codearea pre span.Preprc {
 	float:left;

 	padding-right: 8px;

 }

-.queue {

-	

-	border: none;

+.package {

+	margin-bottom: 20px;

+}

+.packagename {

+	background: url(/media/default/img/folder.png) no-repeat;

+	padding-left: 20px;

+	font-weight: bold;

+	text-transform: uppercase;

+}

+.child {

+	margin-left: 20px;

 }

-.queue tr td {

-	border: none;

+.child_status {

+	width: 20px;

 }

+

 .header, .header th {

 	text-align: left;

 	font-weight: normal;

diff --git a/module/web/media/default/img/folder.png b/module/web/media/default/img/folder.png
new file mode 100644
index 000000000..784e8fa48
--- /dev/null
+++ b/module/web/media/default/img/folder.png
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index bc306730e..299452bc1 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -3,42 +3,30 @@
 {% 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 %}
-
-{% block content %}
-<ul id="queue">
-    {% for package in content %}
-    <li class="package">
-        <span class="packagename">{{ package.package_name }}</span>
-        <ul class="children">
-            {% for child in package.children %}
-            <li class="child">{{ child.filename }}</li>
-            {% endfor %}
-        </ul>
-    </li>
-    {% endfor %}
-<ul>
-    
-    
-<table >
-  <tr>
-    <td width=50%><h1>!Paketname!</h1></td>
-      </tr>
-  <tr>
-    <td width=100%><h2>test.png</h2></td>
-    <td width=100%>loading</td>
-    <td width=100%><a href="/"><img id="button" src="/img/button-delete.gif" alt="delete" /></a><a href="/"><img id="button" src="/img/button-unpause.gif" alt="unpause" /></a></td>
-  </tr>
-</table>    
-
-{% endblock %}
+<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 %}

+

+{% block content %}

+{% for package in content %}

+<div class="package"> <div class="packagename" onclick="javascript: PackegeShower();">{{ package.package_name }}</div>

+  <div class="children">

+    {% for child in package.children %}

+    <div class="child"><span class="child_status">&nbsp;{{ child.status }}</span>{{ child.filename }}</div>

+    {% endfor %}

+  </div>

+</div>

+{% endfor %}

+<!--table >

+  <tr>

+    <td colspan="3"><h1>!Paketname!</h1></td>

+  </tr>

+  <tr>

+    <td><h2>test.png</h2></td>

+    <td>loading</td>

+    <td><a href="/"><img id="button" src="/img/button-delete.gif" alt="delete" /></a><a href="/"><img id="button" src="/img/button-unpause.gif" alt="unpause" /></a></td>

+  </tr>

+</table-->

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