new linkgrabber

5 files changed, 78 insertions, 56 deletions

diff --git a/pyload/web/app/templates/default/dialogs/linkgrabber.html b/pyload/web/app/templates/default/dialogs/linkgrabber.html
deleted file mode 100755
index 8d90131ac..000000000
--- a/pyload/web/app/templates/default/dialogs/linkgrabber.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-    <h3>
-        AddPackage
-        <small>paste&add links to pyLoad</small>
-    </h3>
-</div>
-
-<div class="modal-body">
-    <div class="alert alert-error hidden">
-        Upload files container failed. Please try again.
-    </div>
-    <form class="form-horizontal">
-        <div class="control-group">
-            <label class="control-label" for="inputPackageName">Package name</label>
-
-            <div class="controls">
-                <input type="text" class="span4" id="inputPackageName" placeholder="Name of your package">
-            </div>
-        </div>
-        <div class="control-group">
-            <label class="control-label" for="inputLinks">Links</label>
-
-            <div class="controls">
-                <textarea id="inputLinks" class="span4" rows="10" placeholder="Paste your links here..."></textarea>
-            </div>
-        </div>
-        <div class="control-group">
-            <label class="control-label" for="inputPassword">Password</label>
-
-            <div class="controls">
-                <input type="text" id="inputPassword" class="span4" placeholder="Password for .rar files">
-            </div>
-        </div>
-        <div class="control-group">
-            <label class="control-label" for="inputContainer">Upload links container</label>
-
-            <div class="controls controls-row">
-                <input type="text" id="inputContainer" class="span3" placeholder="Path to your container">
-                <button id="inputContainer-btn" class="btn span1" type="button">Browse&hellip;</button>
-            </div>
-        </div>
-    </form>
-</div>
-
-<div class="modal-footer">
-    <a class="btn btn-success"><i class="icon-plus icon-white"></i> {{_ "Add"}}</a>
-    <a class="btn btn-close">{{_ "Close"}}</a>
-</div>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/linkgrabber/modal.html b/pyload/web/app/templates/default/linkgrabber/modal.html
new file mode 100755
index 000000000..67e2e4fe3
--- /dev/null
+++ b/pyload/web/app/templates/default/linkgrabber/modal.html
@@ -0,0 +1,41 @@
+<div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>
+        {{_ "Add links" }}
+        <small>{{_ "paste & add links to pyLoad" }}</small>
+    </h3>
+</div>
+
+<div class="modal-body">
+    <div class="alert alert-error hidden">
+        {{_ "Upload files container failed. Please try again." }}
+    </div>
+    <form class="form-horizontal">
+        <div class="control-group">
+            <label class="control-label" for="inputLinks">{{ _ "Links" }}</label>
+
+            <div class="controls">
+                <textarea id="inputLinks" class="span4" rows="2" placeholder="{{_ " Paste your links here..."}}"></textarea>
+            </div>
+        </div>
+        <div class="control-group">
+            <label class="control-label" for="inputContainer">{{_ "Upload container file" }}</label>
+            <div class="controls controls-row">
+                <input type="text" id="inputContainer" class="span3" readonly>
+                <button id="inputContainer-btn" class="btn span1" type="button">{{_ "Browse" }}&hellip;</button>
+            </div>
+        </div>
+
+        <legend>
+            {{_ "Packages" }}
+        </legend>
+        <div class="container-fluid prepared-packages">
+
+        </div>
+    </form>
+</div>
+
+<div class="modal-footer">
+    <!--<a class="btn btn-success"><i class="icon-plus icon-white"></i> {{_ "Add"}}</a>-->
+    <a class="btn btn-close">{{_ "Close"}}</a>
+</div>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/linkgrabber/package.html b/pyload/web/app/templates/default/linkgrabber/package.html
new file mode 100644
index 000000000..54f6f4ad1
--- /dev/null
+++ b/pyload/web/app/templates/default/linkgrabber/package.html
@@ -0,0 +1,30 @@
+<strong>{{ name }}</strong> - <button class="btn btn-small btn-blue btn-expand"><i class="icon-arrow-down"></i> </button> <button class="btn btn-small btn-success btn-add"><i class="icon-plus"></i> </button> <button class="btn btn-small btn-danger btn-delete"><i class="icon-trash"></i> </button> <br>
+<table class="table table-condensed" {{#unless expanded}}style="display: none"{{/unless}}>
+    <tbody>
+    {{#each links}}
+    <tr>
+        <td>{{ name }}</td>
+        <td><img src="{{ pluginIcon plugin }}"> {{ plugin }}</td>
+        <td>{{ linkStatus status }}</td>
+        <td><button class="btn btn-danger btn-mini" data-index={{@index}}><i class="icon-trash"></i></button></td>
+    </tr>
+    {{/each}}
+    </tbody>
+</table>
+<hr>
+{{ ngettext "%d link" "%d links" length }}:
+{{#if online}}
+<span class="text-success">
+    {{ online }} {{_ "online" }}
+</span>
+{{/if}}
+{{#if offline}}
+<span class="text-error">
+    {{ offline }} {{_ "offline" }}
+</span>
+{{/if}}
+{{#if unknown}}
+<span class="text-info">
+    {{ unknown }} {{_ "unknown" }}
+</span>
+{{/if}}
diff --git a/pyload/web/app/templates/default/settings/actionbar.html b/pyload/web/app/templates/default/settings/actionbar.html
index 25b10d463..647d0af99 100644
--- a/pyload/web/app/templates/default/settings/actionbar.html
+++ b/pyload/web/app/templates/default/settings/actionbar.html
@@ -1,5 +1,5 @@
-<div class="span2 offset1">
-</div>
-<span class="span9">
-    <button class="btn btn-small btn-blue btn-add">Add Plugin</button>
-</span>
\ No newline at end of file
+<ul class="actionbar nav span8 offset3">
+    <li>
+        <button class="btn btn-small btn-blue btn-add">Add Plugin</button>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/pyload/web/app/templates/default/settings/layout.html b/pyload/web/app/templates/default/settings/layout.html
index 39f1a2ec9..143d0caad 100644
--- a/pyload/web/app/templates/default/settings/layout.html
+++ b/pyload/web/app/templates/default/settings/layout.html
@@ -1,8 +1,8 @@
-<div class="span2">
+<div class="span3">
     <ul class="nav nav-list well settings-menu">
     </ul>
 </div>
-<div class="span10">
+<div class="span9">
     <div class="well setting-box">
         <form class="form-horizontal" action="#">
             <h1>Please choose a config section</h1>