From d347b354b169044fabd0684f304f1777ae5b75d8 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sat, 7 Jan 2012 21:59:28 +0100
Subject: show empty packages

---
 module/web/templates/default/queue.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index c88fa3568..9403a8019 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -50,7 +50,11 @@ document.addEvent("domready", function(){
         <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/package_go.png" />
         </span>
     </div>
-    {% set progress = (package.linksdone * 100) / package.linkstotal %}
+    {% if package.linkstotal %}
+        {% set progress = (package.linksdone * 100) / package.linkstotal %}
+    {% else %}
+        {% set progress = 0 %}
+    {% endif %}
 
     <div id="progress" style="border-radius: 4px; border: 1px solid #AAAAAA; width: 50%; height: 1em">
         <div style="width: {{ progress }}%; height: 100%; background-color: #add8e6;"></div>
-- 
cgit v1.2.3


From a8f763fb85756f69899f7b3b71c01bb01461ee3c Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Fri, 10 Aug 2012 22:12:10 +0200
Subject: beginning new pyload web-ui from scratch

---
 module/web/templates/default/queue.html | 108 --------------------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 module/web/templates/default/queue.html

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
deleted file mode 100644
index 9403a8019..000000000
--- a/module/web/templates/default/queue.html
+++ /dev/null
@@ -1,108 +0,0 @@
-{% extends 'default/base.html' %}
-{% block head %}
-
-<script type="text/javascript" src="/media/js/package_ui.js"></script>
-
-<script type="text/javascript">
-
-document.addEvent("domready", function(){
-    var pUI = new PackageUI("url", {{ target }});
-});
-</script>
-{% endblock %}
-
-{% if target %}
-    {% set name = _("Queue") %}
-{% else %}
-    {% set name = _("Collector") %}
-{% endif %}
-
-{% block title %}{{name}} - {{super()}} {% endblock %}
-{% block subtitle %}{{name}}{% endblock %}
-
-{% block pageactions %}
-<ul id="page-actions-more">
-    <li id="del_finished"><a style="padding: 0; font-weight: bold;" href="#">{{_("Delete Finished")}}</a></li>
-    <li id="restart_failed"><a style="padding: 0; font-weight: bold;" href="#">{{_("Restart Failed")}}</a></li>
-</ul>
-{% endblock %}
-
-{% block content %}
-{% autoescape true %}
-
-<ul id="package-list" style="list-style: none; padding-left: 0; margin-top: -10px;">
-{% for package in content %}
-    <li>
-<div id="package_{{package.pid}}" class="package">
-    <div class="order" style="display: none;">{{ package.order }}</div>
-    
-    <div class="packagename" style="cursor: pointer">
-        <img class="package_drag" src="/media/default/img/folder.png" style="cursor: move; margin-bottom: -2px">
-        <span class="name">{{package.name}}</span>
-        &nbsp;&nbsp;
-        <span class="buttons" style="opacity:0">
-        <img title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/media/default/img/delete.png" />
-        &nbsp;&nbsp;
-        <img title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/arrow_refresh.png" />
-        &nbsp;&nbsp;
-        <img title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/pencil.png" />
-        &nbsp;&nbsp;
-        <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/package_go.png" />
-        </span>
-    </div>
-    {% if package.linkstotal %}
-        {% set progress = (package.linksdone * 100) / package.linkstotal %}
-    {% else %}
-        {% set progress = 0 %}
-    {% endif %}
-
-    <div id="progress" style="border-radius: 4px; border: 1px solid #AAAAAA; width: 50%; height: 1em">
-        <div style="width: {{ progress }}%; height: 100%; background-color: #add8e6;"></div>
-        <label style="font-size: 0.8em; font-weight: bold; padding-left: 5px; position: relative; top: -17px">
-        {{ package.sizedone|formatsize }} / {{ package.sizetotal|formatsize }}</label>
-        <label style="font-size: 0.8em; font-weight: bold; padding-right: 5px ;float: right; position: relative; top: -17px">
-        {{ package.linksdone }} / {{ package.linkstotal }}</label>
-        </div>
-    <div style="clear: both; margin-bottom: -10px"></div>
-
-    <div id="children_{{package.pid}}" style="display: none;" class="children">
-    <span class="child_secrow">{{_("Folder:")}} <span class="folder">{{package.folder}}</span> | {{_("Password:")}} <span class="password">{{package.password}}</span></span>
-    <ul id="sort_children_{{package.pid}}" style="list-style: none; padding-left: 0">
-    </ul>
-    </div>
-</div>
-    </li>
-{% endfor %}
-</ul>
-{% endautoescape %}
-{% endblock %}
-
-{% block hidden %}
-<div id="pack_box" class="window_box" style="z-index: 2">
-    <form id="pack_form" action="/json/edit_package" method="POST" enctype="multipart/form-data">
-    <h1>{{_("Edit Package")}}</h1>
-    <p>{{_("Edit the package detais below.")}}</p>
-    <input name="pack_id" id="pack_id" type="hidden" value=""/>
-    <label for="pack_name">{{_("Name")}}
-    <span class="small">{{_("The name of the package.")}}</span>
-    </label>
-    <input id="pack_name" name="pack_name" type="text" size="20" />
-
-    <label for="pack_folder">{{_("Folder")}}
-    <span class="small">{{_("Name of subfolder for these downloads.")}}</span>
-    </label>
-    <input id="pack_folder" name="pack_folder" type="text" size="20" />
-
-    <label for="pack_pws">{{_("Password")}}
-    <span class="small">{{_("List of passwords used for unrar.")}}</span>
-    </label>
-    <textarea rows="3" name="pack_pws" id="pack_pws"></textarea>
-
-    <button type="submit">{{_("Submit")}}</button>
-    <button id="pack_reset" style="margin-left: 0" type="reset" >{{_("Reset")}}</button>
-    <div class="spacer"></div>
-
-    </form>
-
-</div>
-{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 90ba0c9f3adccd02b62ec3ca6b4af849a7253d14 Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Tue, 14 Aug 2012 22:37:58 +0200
Subject: first Design of Queue and Settings

---
 module/web/templates/default/queue.html | 65 +++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 module/web/templates/default/queue.html

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
new file mode 100644
index 000000000..50d1d3418
--- /dev/null
+++ b/module/web/templates/default/queue.html
@@ -0,0 +1,65 @@
+{% extends 'default/base.html' %}
+{% block head %}
+
+<link href="static/css/default/queue.css" rel="stylesheet" type="text/css" media="screen"/>
+<script type="text/javascript" src="/media/js/package_ui.js"></script>
+
+<script type="text/javascript">
+document.addEvent("domready", function(){
+    var pUI = new PackageUI("url", {{ target }});
+});
+</script>
+{% endblock %}
+
+{% block title %}{{name}} - {{super()}} {% endblock %}
+{% block subtitle %}{{name}}{% endblock %}
+
+{% block pageactions %}
+<ul id="page-actions">
+    <li id="del_finished"><a href="#">{{_("Delete Finished")}}</a></li>
+    <li id="restart_failed"><a  href="#">{{_("Restart Failed")}}</a></li>
+</ul>
+{% endblock %}
+
+{% block content %}
+
+<ul id="queue-list">
+
+
+
+	<script>
+	$(function() {
+		$( "#pack_progress_1" ).progressbar({
+			value: 59
+		});
+	});
+	</script>
+
+
+
+
+<li>
+	<div id="package_1" class="pack">
+		<div class="pack_header">
+			<div class="pack_icon"></div>
+			<span class="pack_name">TestPackage</span>
+			
+			<div class="pack_toolbar">
+				<div class="pack_toolbar_delete" title='{{_("Delete Package")}}'></div>
+				<div class="pack_toolbar_restart" title='{{_("Restart Package")}}'></div>
+				<div class="pack_toolbar_edit" title='{{_("Edit Package")}}'></div>
+			</div>
+		</div>
+		<div id="pack_progress_1" class="pack_progressbar"></div>
+		
+		<div id="children_1" class="pack_children">
+			<span class="child_secrow">{{_("Folder:")}} <span class="folder">TestPackage/</span> | {{_("Password:")}} <span class="password">trololo</span></span>
+			<ul id="sort_children_1" class="sort_children">
+			</ul>
+		</div>
+	</div>
+</li>
+
+
+</ul>
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 315192a0ab42b80ec2b83d8450dc91ef7c3ad68e Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Tue, 14 Aug 2012 23:18:20 +0200
Subject: improved QueueLayout

---
 module/web/templates/default/queue.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 50d1d3418..d13cca776 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -43,14 +43,15 @@ document.addEvent("domready", function(){
 		<div class="pack_header">
 			<div class="pack_icon"></div>
 			<span class="pack_name">TestPackage</span>
-			
+			<div class="pack_progressbar_wrapper">
+				<div id="pack_progress_1" class="pack_progressbar"></div>
+			</div>
 			<div class="pack_toolbar">
 				<div class="pack_toolbar_delete" title='{{_("Delete Package")}}'></div>
 				<div class="pack_toolbar_restart" title='{{_("Restart Package")}}'></div>
 				<div class="pack_toolbar_edit" title='{{_("Edit Package")}}'></div>
 			</div>
 		</div>
-		<div id="pack_progress_1" class="pack_progressbar"></div>
 		
 		<div id="children_1" class="pack_children">
 			<span class="child_secrow">{{_("Folder:")}} <span class="folder">TestPackage/</span> | {{_("Password:")}} <span class="password">trololo</span></span>
-- 
cgit v1.2.3


From d8119f648e63a4728433e67e79d2a99296a8c2c1 Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Thu, 16 Aug 2012 17:48:39 +0200
Subject: Added Mobile WebIf, some Layouting

---
 module/web/templates/default/queue.html | 51 +++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 6 deletions(-)

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index d13cca776..455916763 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -46,16 +46,55 @@ document.addEvent("domready", function(){
 			<div class="pack_progressbar_wrapper">
 				<div id="pack_progress_1" class="pack_progressbar"></div>
 			</div>
-			<div class="pack_toolbar">
-				<div class="pack_toolbar_delete" title='{{_("Delete Package")}}'></div>
-				<div class="pack_toolbar_restart" title='{{_("Restart Package")}}'></div>
-				<div class="pack_toolbar_edit" title='{{_("Edit Package")}}'></div>
-			</div>
 		</div>
 		
 		<div id="children_1" class="pack_children">
-			<span class="child_secrow">{{_("Folder:")}} <span class="folder">TestPackage/</span> | {{_("Password:")}} <span class="password">trololo</span></span>
+
 			<ul id="sort_children_1" class="sort_children">
+			
+			
+			
+			
+			
+			
+			
+				<li>
+					<div id="package_2" class="pack">
+						<div class="pack_header">
+							<div class="pack_icon"></div>
+							<span class="pack_name">TestPackage2</span>
+							<div class="pack_progressbar_wrapper">
+								<div id="pack_progress_2" class="pack_progressbar"></div>
+							</div>
+						</div>
+						
+						<div id="children_2" class="pack_children">
+
+							<ul id="sort_children_2" class="sort_children">
+							
+							
+							
+							
+							
+							
+							
+							</ul>
+						</div>
+					</div>
+				</li>
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
+			
 			</ul>
 		</div>
 	</div>
-- 
cgit v1.2.3


From 68f1510f5a6ab632db19fc63f29c0475de9feb9d Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 15:46:42 +0200
Subject: nav + search bar for dashboard

---
 module/web/templates/default/queue.html | 105 --------------------------------
 1 file changed, 105 deletions(-)
 delete mode 100644 module/web/templates/default/queue.html

(limited to 'module/web/templates/default/queue.html')

diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
deleted file mode 100644
index 455916763..000000000
--- a/module/web/templates/default/queue.html
+++ /dev/null
@@ -1,105 +0,0 @@
-{% extends 'default/base.html' %}
-{% block head %}
-
-<link href="static/css/default/queue.css" rel="stylesheet" type="text/css" media="screen"/>
-<script type="text/javascript" src="/media/js/package_ui.js"></script>
-
-<script type="text/javascript">
-document.addEvent("domready", function(){
-    var pUI = new PackageUI("url", {{ target }});
-});
-</script>
-{% endblock %}
-
-{% block title %}{{name}} - {{super()}} {% endblock %}
-{% block subtitle %}{{name}}{% endblock %}
-
-{% block pageactions %}
-<ul id="page-actions">
-    <li id="del_finished"><a href="#">{{_("Delete Finished")}}</a></li>
-    <li id="restart_failed"><a  href="#">{{_("Restart Failed")}}</a></li>
-</ul>
-{% endblock %}
-
-{% block content %}
-
-<ul id="queue-list">
-
-
-
-	<script>
-	$(function() {
-		$( "#pack_progress_1" ).progressbar({
-			value: 59
-		});
-	});
-	</script>
-
-
-
-
-<li>
-	<div id="package_1" class="pack">
-		<div class="pack_header">
-			<div class="pack_icon"></div>
-			<span class="pack_name">TestPackage</span>
-			<div class="pack_progressbar_wrapper">
-				<div id="pack_progress_1" class="pack_progressbar"></div>
-			</div>
-		</div>
-		
-		<div id="children_1" class="pack_children">
-
-			<ul id="sort_children_1" class="sort_children">
-			
-			
-			
-			
-			
-			
-			
-				<li>
-					<div id="package_2" class="pack">
-						<div class="pack_header">
-							<div class="pack_icon"></div>
-							<span class="pack_name">TestPackage2</span>
-							<div class="pack_progressbar_wrapper">
-								<div id="pack_progress_2" class="pack_progressbar"></div>
-							</div>
-						</div>
-						
-						<div id="children_2" class="pack_children">
-
-							<ul id="sort_children_2" class="sort_children">
-							
-							
-							
-							
-							
-							
-							
-							</ul>
-						</div>
-					</div>
-				</li>
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			</ul>
-		</div>
-	</div>
-</li>
-
-
-</ul>
-{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3