From 958bf611f5d9d117f19f824990ec6fd6b537e967 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Thu, 22 Dec 2011 23:45:38 +0100
Subject: accountmanager v2, delete your accounts.conf and re-enter them in
 pyload, new nice debug functions, try core.shell() and core.breakpoint()

---
 module/web/templates/default/settings.html | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index a4443025a..be320970b 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -102,18 +102,18 @@
 
 
                             {% for account in conf.accs %}
-                                {% set plugin = account.type %}
+                                {% set plugin = account.__name__ %}
                                        <tr>
                                             <td>
                                                 <span style="padding:5px">{{ plugin }}</span>
                                             </td>
                                        
-                                           <td><label for="{{plugin}}|password;{{account.login}}"
-                                                      style="color:#424242;">{{ account.login }}</label></td>
+                                           <td><label for="{{plugin}}|password;{{account.loginname}}"
+                                                      style="color:#424242;">{{ account.loginname }}</label></td>
                                            <td>
-                                               <input id="{{plugin}}|password;{{account.login}}"
-                                                      name="{{plugin}}|password;{{account.login}}"
-                                                      type="password" value="{{account.password}}" size="12"/>
+                                               <input id="{{plugin}}|password;{{account.loginname}}"
+                                                      name="{{plugin}}|password;{{account.loginname}}"
+                                                      type="password" value="" size="12"/>
                                            </td>
                                            <td>
                                                {% if account.valid %}
@@ -137,27 +137,27 @@
                                            </td>
                                            <td>
                                    <span style="font-weight: bold;">
-                                   {{ account.validuntil }}
+                                   {{ account._validuntil }}
                                    </span>
                                            </td>
                                            <td>
                                    <span style="font-weight: bold;">
-                                   {{ account.trafficleft }}
+                                   {{ account._trafficleft }}
                                    </span>
                                            </td>
                                            <td>
-                                               <input id="{{plugin}}|time;{{account.login}}"
-                                                      name="{{plugin}}|time;{{account.login}}" type="text"
-                                                      size="7" value="{{account.time}}"/>
+                                               <input id="{{plugin}}|time;{{account.loginname}}"
+                                                      name="{{plugin}}|time;{{account.loginname}}" type="text"
+                                                      size="7" value="{{account.options.time}}"/>
                                            </td>
                                            <td>
-                                               <input id="{{plugin}}|limitdl;{{account.login}}"
-                                                      name="{{plugin}}|limitdl;{{account.login}}" type="text"
-                                                      size="2" value="{{account.limitdl}}"/>
+                                               <input id="{{plugin}}|limitdl;{{account.loginname}}"
+                                                      name="{{plugin}}|limitdl;{{account.loginname}}" type="text"
+                                                      size="2" value="{{account.options.limitdl}}"/>
                                            </td>
                                            <td>
-                                               <input id="{{plugin}}|delete;{{account.login}}"
-                                                      name="{{plugin}}|delete;{{account.login}}" type="checkbox"
+                                               <input id="{{plugin}}|delete;{{account.loginname}}"
+                                                      name="{{plugin}}|delete;{{account.loginname}}" type="checkbox"
                                                       value="True"/>
                                            </td>
                                        </tr>
-- 
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/settings.html | 204 -----------------------------
 1 file changed, 204 deletions(-)
 delete mode 100644 module/web/templates/default/settings.html

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

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
deleted file mode 100644
index be320970b..000000000
--- a/module/web/templates/default/settings.html
+++ /dev/null
@@ -1,204 +0,0 @@
-{% extends 'default/base.html' %}
-
-{% block title %}{{ _("Config") }} - {{ super() }} {% endblock %}
-{% block subtitle %}{{ _("Config") }}{% endblock %}
-
-{% block head %}
-    <script type="text/javascript" src="/media/js/tinytab_static.js"></script>
-    <script type="text/javascript" src="/media/js/MooDropMenu_static.js"></script>
-    <script type="text/javascript" src="/media/js/settings.js"></script>
-
-{% endblock %}
-
-{% block content %}
-
-    <ul id="toptabs" class="tabs">
-            <li><a class="selected" href="#">{{ _("General") }}</a></li>
-            <li><a href="#">{{ _("Plugins") }}</a></li>
-            <li><a href="#">{{ _("Accounts") }}</a></li>
-    </ul>
-
-    <div id="tabsback" style="height: 20px; padding-left: 150px; color: white; font-weight: bold;">
-
-    </div>
-
-        <span id="tabs-body">
-            <!-- General -->
-            <span id="general" class="active tabContent">
-                <ul class="nav tabs">
-                    <li class>
-                        <a>Menu</a>
-                        <ul id="general-menu">
-                            {% for entry,name in conf.general %}
-                                <nobr>
-                                    <li id="general|{{ entry }}">{{ name }}</li>
-                                </nobr>
-                                <br>
-                            {% endfor %}
-                        </ul>
-                    </li>
-                </ul>
-
-                <form id="general_form" action="" method="POST" autocomplete="off">
-                    <span id="general_form_content">
-                    <br>
-                    <h3>&nbsp;&nbsp; {{ _("Choose a section from the menu") }}</h3>
-                    <br>
-                    </span>
-
-                  <input id="general|submit" class="styled_button" type="submit" value="{{_("Submit")}}"/>
-                </form>
-            </span>
-
-            <!-- Plugins -->
-            <span id="plugins" class="tabContent">
-                <ul class="nav tabs">
-                    <li class>
-                        <a>Menu</a>
-                        <ul id="plugin-menu">
-                            {% for entry,name in conf.plugin %}
-                                <nobr>
-                                    <li id="plugin|{{ entry }}">{{ name }}</li>
-                                </nobr>
-                                <br>
-                            {% endfor %}
-                        </ul>
-                    </li>
-                </ul>
-
-
-                 <form id="plugin_form" action="" method="POST" autocomplete="off">
-
-                     <span id="plugin_form_content">
-                    <br>
-                    <h3>&nbsp;&nbsp; {{ _("Choose a section from the menu") }}</h3>
-                    <br>
-                         </span>
-                     <input id="plugin|submit" class="styled_button" type="submit" value="{{_("Submit")}}"/>
-                </form>
-
-            </span>
-
-            <!-- Accounts -->
-            <span id="accounts" class="tabContent">
-            <form id="account_form" action="/json/update_accounts" method="POST">
-
-                        <table class="settable wide">
-
-                        <thead>
-                        <tr>
-                            <th>{{ _("Plugin") }}</th>
-                            <th>{{ _("Name") }}</th>
-                            <th>{{ _("Password") }}</th>
-                            <th>{{ _("Status") }}</th>
-                            <th>{{ _("Premium") }}</th>
-                            <th>{{ _("Valid until") }}</th>
-                            <th>{{ _("Traffic left") }}</th>
-                            <th>{{ _("Time") }}</th>
-                            <th>{{ _("Max Parallel") }}</th>
-                            <th>{{ _("Delete?") }}</th>
-                        </tr>
-                        </thead>
-
-
-                            {% for account in conf.accs %}
-                                {% set plugin = account.__name__ %}
-                                       <tr>
-                                            <td>
-                                                <span style="padding:5px">{{ plugin }}</span>
-                                            </td>
-                                       
-                                           <td><label for="{{plugin}}|password;{{account.loginname}}"
-                                                      style="color:#424242;">{{ account.loginname }}</label></td>
-                                           <td>
-                                               <input id="{{plugin}}|password;{{account.loginname}}"
-                                                      name="{{plugin}}|password;{{account.loginname}}"
-                                                      type="password" value="" size="12"/>
-                                           </td>
-                                           <td>
-                                               {% if account.valid %}
-                                                   <span style="font-weight: bold; color: #006400;">
-                                                   {{ _("valid") }}
-                                               {% else %}
-                                                   <span style="font-weight: bold; color: #8b0000;">
-                                                   {{ _("not valid") }}
-                                               {% endif %}
-                                               </span>
-                                           </td>
-                                          <td>
-                                               {% if account.premium %}
-                                                   <span style="font-weight: bold; color: #006400;">
-                                                   {{ _("yes") }}
-                                               {% else %}
-                                                   <span style="font-weight: bold; color: #8b0000;">
-                                                   {{ _("no") }}
-                                               {% endif %}
-                                               </span>
-                                           </td>
-                                           <td>
-                                   <span style="font-weight: bold;">
-                                   {{ account._validuntil }}
-                                   </span>
-                                           </td>
-                                           <td>
-                                   <span style="font-weight: bold;">
-                                   {{ account._trafficleft }}
-                                   </span>
-                                           </td>
-                                           <td>
-                                               <input id="{{plugin}}|time;{{account.loginname}}"
-                                                      name="{{plugin}}|time;{{account.loginname}}" type="text"
-                                                      size="7" value="{{account.options.time}}"/>
-                                           </td>
-                                           <td>
-                                               <input id="{{plugin}}|limitdl;{{account.loginname}}"
-                                                      name="{{plugin}}|limitdl;{{account.loginname}}" type="text"
-                                                      size="2" value="{{account.options.limitdl}}"/>
-                                           </td>
-                                           <td>
-                                               <input id="{{plugin}}|delete;{{account.loginname}}"
-                                                      name="{{plugin}}|delete;{{account.loginname}}" type="checkbox"
-                                                      value="True"/>
-                                           </td>
-                                       </tr>
-                                {% endfor %}
-                            </table>
-
-            <button id="account_submit" type="submit" class="styled_button">{{_("Submit")}}</button>
-            <button id="account_add" style="margin-left: 0" type="submit" class="styled_button">{{_("Add")}}</button>
-            </form>
-            </span>
-        </span>
-{% endblock %}
-{% block hidden %}
-<div id="account_box" class="window_box" style="z-index: 2">
-<form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data">
-<h1>{{_("Add Account")}}</h1>
-<p>{{_("Enter your account data to use premium features.")}}</p>
-<label for="account_login">{{_("Login")}}
-<span class="small">{{_("Your username.")}}</span>
-</label>
-<input id="account_login" name="account_login" type="text" size="20" />
-
-<label for="account_password">{{_("Password")}}
-<span class="small">{{_("The password for this account.")}}</span>
-</label>
-<input id="account_password" name="account_password" type="password" size="20" />
-
-<label for="account_type">{{_("Type")}}
-<span class="small">{{_("Choose the hoster for your account.")}}</span>
-</label>
-    <select name=account_type id="account_type">
-        {% for type in types|sort %}
-            <option value="{{ type }}">{{ type }}</option>
-        {% endfor %}
-    </select>
-
-<button id="account_add_button" type="submit">{{_("Add")}}</button>
-<button id="account_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 c4c5cf3316ffdcf31c47e386381eb2efdaaeb348 Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Tue, 14 Aug 2012 14:20:53 +0200
Subject: Adding settings.html

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

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

diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
new file mode 100644
index 000000000..23396e3e2
--- /dev/null
+++ b/module/web/templates/default/settings.html
@@ -0,0 +1,35 @@
+{% extends 'default/base.html' %}
+
+{% block title %}{{ _("Config") }} - {{ super() }} {% endblock %}
+{% block subtitle %}{{ _("Config") }}{% endblock %}
+
+{% block head %}
+	<script>
+	$(function() {
+		$( "#toptabs" ).tabs({
+			ajaxOptions: {
+				error: function( xhr, status, index, anchor ) {
+					$( anchor.hash ).html(
+						"Couldn't load this tab." );
+				}
+			}
+		});
+	});
+	</script>
+{% endblock %}
+
+{% block content %}
+
+<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>
+	</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>
+	</div>
+</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/settings.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

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>
-- 
cgit v1.2.3