first Design of Queue and Settings

11 files changed, 165 insertions, 7 deletions

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
--- /dev/null
+++ b/module/web/static/img/default/arrow_refresh.png
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
--- /dev/null
+++ b/module/web/static/img/default/delete.png
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
--- /dev/null
+++ b/module/web/static/img/default/folder.png
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
--- /dev/null
+++ b/module/web/static/img/default/icon_folder.png
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
--- /dev/null
+++ b/module/web/static/img/default/pencil.png
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 @@
 

     <script type="text/javascript" src="static/js/libs/underscore-min.js"></script>

     <script type="text/javascript" src="static/js/libs/backbone-min.js"></script>

-

-

     <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title>

-

     {% block head %}

     {% endblock %}

 </head>

@@ -64,6 +61,8 @@
     </header>

     <div id="push"></div>

     <div id="content">

+        {% block pageactions %}

+        {% endblock pageactions %}

         <a href="#test" class="nyroModal">DOM Element (hidden div)</a>

         <div id="test" style="display: none; width: 600px;">

             <a href="demoSent.php" class="nyroModal">Open a new modal</a><br />

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
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index 23396e3e2..b7cdb7cb5 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -22,9 +22,10 @@
 
 <div id="toptabs">
 	<ul>
-		<li><a href="#tabs-1">Preloaded</a></li>
-		<li><a href="ajax/content1.html">Tab 1</a></li>
-		<li><a href="ajax/content1.html">Tab 1</a></li>
+		<li><a href="#tabs-1">{{ _("Admin")}}</a></li>
+		<li><a href="ajax/content1.html">{{ _("Addons")}}</a></li>
+		<li><a href="ajax/content1.html">{{ _("Accounts")}}</a></li>
+		<li><a href="ajax/content1.html">{{ _("User")}}</a></li>
 	</ul>
 	<div id="tabs-1">
 		<p>Proin elit arcu, rutrum commodo, vehicula tempus, commodo a, risus. Curabitur nec arcu. Donec sollicitudin mi sit amet mauris. Nam elementum quam ullamcorper ante. Etiam aliquet massa et lorem. Mauris dapibus lacus auctor risus. Aenean tempor ullamcorper leo. Vivamus sed magna quis ligula eleifend adipiscing. Duis orci. Aliquam sodales tortor vitae ipsum. Aliquam nulla. Duis aliquam molestie erat. Ut et mauris vel pede varius sollicitudin. Sed ut dolor nec orci tincidunt interdum. Phasellus ipsum. Nunc tristique tempus lectus.</p>