summaryrefslogtreecommitdiffstats
path: root/module/web/templates/default
diff options
context:
space:
mode:
Diffstat (limited to 'module/web/templates/default')
-rw-r--r--module/web/templates/default/admin.html78
-rw-r--r--module/web/templates/default/base.html119
-rw-r--r--module/web/templates/default/captcha.html32
-rw-r--r--module/web/templates/default/downloads.html10
-rw-r--r--module/web/templates/default/home.html125
-rw-r--r--module/web/templates/default/info.html20
-rw-r--r--module/web/templates/default/logs.html6
-rw-r--r--module/web/templates/default/queue.html89
-rw-r--r--module/web/templates/default/settings.html89
-rw-r--r--module/web/templates/default/settings_item.html16
-rw-r--r--module/web/templates/default/window.html76
11 files changed, 355 insertions, 305 deletions
diff --git a/module/web/templates/default/admin.html b/module/web/templates/default/admin.html
index b049411fd..be624f555 100644
--- a/module/web/templates/default/admin.html
+++ b/module/web/templates/default/admin.html
@@ -9,18 +9,20 @@
{% block subtitle %}{{ _("Administrate") }}{% endblock %}
{% block content %}
-
- <a href="#" id="quit-pyload" style="font-size: large; font-weight: bold;">{{_("Quit pyLoad")}}</a> |
- <a href="#" id="restart-pyload" style="font-size: large; font-weight: bold;">{{_("Restart pyLoad")}}</a>
+ <div class="btn-group">
+ <a href="#" id="quit-pyload" class="btn btn-default"><span class="glyphicon glyphicon-off"></span> {{_("Quit pyLoad")}}</a>
+ <a href="#" id="restart-pyload" class="btn btn-default"><span class="glyphicon glyphicon-repeat"></span> {{_("Restart pyLoad")}}</a>
+</div>
<br>
<br>
{{ _("To add user or change passwords use:") }} <b>python pyLoadCore.py -u</b><br>
{{ _("Important: Admin user have always all permissions!") }}
-
- <form action="" method="POST">
- <table class="settable wide">
- <thead style="font-size: 11px">
+<br>
+<br>
+ <form action="" method="POST" >
+ <table class="settable table" style="width:50%;">
+ <thead>
<th>
{{ _("Name") }}
</th>
@@ -38,9 +40,8 @@
{% for name, data in users.iteritems() %}
<tr>
<td>{{ name }}</td>
- <td><a class="change_password" href="#" id="change_pw|{{name}}">{{ _("change") }}</a></td>
- <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %}
- checked="True" {% endif %}"></td>
+ <td><a class="change_password btn btn-default btn-xs" href="#" id="change_pw|{{name}}"><span class="glyphicon glyphicon-pencil"></span> {{ _("change") }}</a></td>
+ <td><input name="{{ name }}|admin" type="checkbox" {% if data.perms.admin %} checked="True" {% endif %}></td>
<td>
<select multiple="multiple" size="{{ permlist|length }}" name="{{ name }}|perms">
{% for perm in permlist %}
@@ -58,40 +59,41 @@
</table>
- <button class="styled_button" type="submit">{{ _("Submit") }}</button>
+ <button class="btn btn-primary" type="submit">{{ _("Submit") }}</button>
</form>
{% endblock %}
{% block hidden %}
- <div id="password_box" class="window_box" style="z-index: 2">
- <form id="password_form" action="/json/change_password" method="POST" enctype="multipart/form-data">
- <h1>{{ _("Change Password") }}</h1>
-
+ <div id="password_box" style="z-index: 2">
+ <form id="password_form" class="from-group" action="/json/change_password" method="POST" enctype="multipart/form-data">
+ <h3>{{ _("Change Password") }}</h3>
<p>{{ _("Enter your current and desired Password.") }}</p>
- <label for="user_login">{{ _("User") }}
- <span class="small">{{ _("Your username.") }}</span>
- </label>
- <input id="user_login" name="user_login" type="text" size="20"/>
-
- <label for="login_current_password">{{ _("Current password") }}
- <span class="small">{{ _("The password for this account.") }}</span>
- </label>
- <input id="login_current_password" name="login_current_password" type="password" size="20"/>
-
- <label for="login_new_password">{{ _("New password") }}
- <span class="small">{{ _("The new password.") }}</span>
- </label>
- <input id="login_new_password" name="login_new_password" type="password" size="20"/>
- <label for="login_new_password2">{{ _("New password (repeat)") }}
- <span class="small">{{ _("Please repeat the new password.") }}</span>
- </label>
- <input id="login_new_password2" name="login_new_password2" type="password" size="20"/>
-
-
- <button id="login_password_button" type="submit">{{ _("Submit") }}</button>
- <button id="login_password_reset" style="margin-left: 0" type="reset">{{ _("Reset") }}</button>
+<div class="form-group">
+ <label for="user_login">{{ _("User") }}</label>
+ <input class="form-control" id="user_login" name="user_login" type="text"/>
+ <p class="help-block">{{ _("Your username.") }}</p>
+ </div>
+ <div class="form-group">
+ <label for="login_current_password">{{ _("Current password") }}</label>
+ <input class="form-control" id="login_current_password" name="login_current_password" type="password"/>
+ <p class="help-block">{{ _("The password for this account.") }}</p>
+ </div>
+ <div class="form-group">
+ <label for="login_new_password">{{ _("New password") }}</label>
+ <input class="form-control" id="login_new_password" name="login_new_password" type="password"/>
+ <p class="help-block">{{ _("The new password.") }}</p>
+ </div>
+ <div class="form-group">
+ <label for="login_new_password2">{{ _("New password (repeat)") }}</label>
+ <input class="form-control" id="login_new_password2" name="login_new_password2" type="password" />
+ <p class="help-block">{{ _("Please repeat the new password.") }}</p>
+ </div>
+
+
+
+ <button class="btn btn-primary" id="login_password_button" type="submit" style="float: right">{{ _("Submit") }}</button>
+ <button class="btn btn-default" id="login_password_reset" style="margin-right: 5px; float: right" type="reset">{{ _("Reset") }}</button>
<div class="spacer"></div>
-
</form>
</div>
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 147c08a37..b8622494b 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -5,9 +5,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<link rel="stylesheet" type="text/css" href="/media/default/css/default.css"/>
+
<link rel="stylesheet" type="text/css" href="/media/default/css/window.css"/>
<link rel="stylesheet" type="text/css" href="/media/default/css/MooDialog.css"/>
+<link rel="stylesheet" href="/media/default/css/bootstrap/bootstrap.min.css">
<script type="text/javascript" src="/media/js/mootools-core-1.4.1.js"></script>
<script type="text/javascript" src="/media/js/mootools-more-1.4.0.1.js"></script>
@@ -17,6 +18,8 @@
<script type="text/javascript" src="/media/js/base.js"></script>
+
+
<title>{% block title %}pyLoad {{_("Webinterface")}}{% endblock %}</title>
{% block head %}
@@ -47,18 +50,9 @@
</span>
{% endif %}
-<span id="cap_info" style="display: {% if captcha %}inline{%else%}none{% endif %}">
-<img src="/media/default/img/images.png" alt="Captcha:" style="vertical-align:middle; margin:2px" />
-<span style="font-weight: bold; cursor: pointer; margin-right: 2px;">{{_("Captcha waiting")}}</span>
-</span>
- <img src="/media/default/img/head-login.png" alt="User:" style="vertical-align:middle; margin:2px" /><span style="padding-right: 2px;">{{user.name}}</span>
- <ul id="user-actions">
- <li><a href="/logout" class="action logout" rel="nofollow">{{_("Logout")}}</a></li>
- {% if user.is_admin %}
- <li><a href="/admin" class="action profile" rel="nofollow">{{_("Administrate")}}</a></li>
- {% endif %}
- <li><a href="/info" class="action info" rel="nofollow">{{_("Info")}}</a></li>
+
+
</ul>
{% else %}
@@ -68,11 +62,24 @@
{% endblock %}
</div>
- <a href="/"><img id="head-logo" src="/media/default/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" /></a>
-
- <div id="head-menu">
- <ul>
-
+ <nav class="navbar navbar-default">
+ <div class="container-fluid">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="#"><img id="head-logo" src="/media/default/img/pyload-logo-edited3.5-new-font-small.png" alt="pyLoad" style="height:30px;"/></a>
+ </div>
+
+ <a href="/"></a>
+
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav">
+
{% macro selected(name, right=False) -%}
{% if name in url -%}class="{% if right -%}right {% endif %}selected"{%- endif %}
{% if not name in url and right -%}class="right"{%- endif %}
@@ -81,51 +88,70 @@
{% block menu %}
<li>
- <a href="/" title=""><img src="/media/default/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
+ <a href="/" title=""><span class="glyphicon glyphicon-home"></span> {{_("Home")}}</a>
</li>
<li {{ selected('queue') }}>
- <a href="/queue/" title=""><img src="/media/default/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
+ <a href="/queue/" title=""><span class="glyphicon glyphicon-tasks"></span> {{_("Queue")}}</a>
</li>
<li {{ selected('collector') }}>
- <a href="/collector/" title=""><img src="/media/default/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
+ <a href="/collector/" title=""><span class="glyphicon glyphicon-magnet"></span> {{_("Collector")}}</a>
</li>
<li {{ selected('downloads') }}>
- <a href="/downloads/" title=""><img src="/media/default/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
+ <a href="/downloads/" title=""> <span class="glyphicon glyphicon-download"></span> {{_("Downloads")}}</a>
</li>
{# <li {{ selected('filemanager') }}>#}
-{# <a href="/filemanager/" title=""><img src="/media/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
+{# <a href="/filemanager/" title=""><span class="glyphicon glyphicon-magnet"></span> {{_("FileManager")}}</a>#}
{# </li>#}
<li {{ selected('logs', True) }}>
- <a href="/logs/" class="action index" accesskey="x" rel="nofollow"><img src="/media/default/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
+ <a href="/logs/" class="action index" accesskey="x" rel="nofollow"><span class="glyphicon glyphicon-list"></span> {{_("Logs")}}</a>
</li>
<li {{ selected('settings', True) }}>
- <a href="/settings/" class="action index" accesskey="x" rel="nofollow"><img src="/media/default/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
+ <a href="/settings/" class="action index" accesskey="x" rel="nofollow"><span class="glyphicon glyphicon-wrench"></span> {{_("Config")}}</a>
</li>
{% endblock %}
+
+
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ <li><a href="/info" class="action info" rel="nofollow"><span class="glyphicon glyphicon-user"></span> {{user.name}}</a></li>
+ {% if user.is_admin %}
+ <li><a href="/admin" class="action profile" rel="nofollow"><span class="glyphicon glyphicon-cog"></span></a></li>
+ {% endif %}
+ <li><a href="/info" class="action info" rel="nofollow"><span class="glyphicon glyphicon-info-sign"></span></a></li>
+
+ </ul>
+ </div><!-- /.navbar-collapse -->
+ </div><!-- /.container-fluid -->
- </ul>
</div>
-
+</nav>
<div style="clear:both;"></div>
</div>
{% if perms.STATUS %}
-<ul id="page-actions2">
- <li id="action_play"><a href="#" class="action play" accesskey="o" rel="nofollow">{{_("Start")}}</a></li>
- <li id="action_stop"><a href="#" class="action stop" accesskey="o" rel="nofollow">{{_("Stop")}}</a></li>
- <li id="action_cancel"><a href="#" class="action cancel" accesskey="o" rel="nofollow">{{_("Cancel")}}</a></li>
- <li id="action_add"><a href="#" class="action add" accesskey="o" rel="nofollow" >{{_("Add")}}</a></li>
-</ul>
+<div class="btn-group btn-group-sm" role="group" aria-label="..." style="margin-left:10px;">
+ <button id="action_play" class="btn btn-default" href="#"><span class="glyphicon glyphicon-play"></span>&nbsp;</button>
+ <button id="action_stop" type="button" class="btn btn-default"><span class="glyphicon glyphicon-stop"></span>&nbsp;</button>
+ <button id="action_cancel" type="button" class="btn btn-default"><span class="glyphicon glyphicon-remove"></span>&nbsp;</button>
+ <button id="action_add" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span>&nbsp;</button>
+</div>
+
+
{% endif %}
+<span id="cap_info" style="display: {% if captcha %}inline{%else%}none{% endif %}">
+<button id="action_add" type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-barcode"></span><span> {{_("Captcha waiting")}}</span></button>
+</span>
+
{% if perms.LIST %}
-<ul id="page-actions">
- <li><span class="time">{{_("Download:")}}</span><a id="time" style=" background-color: {% if status.download %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.download %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
- <li><span class="reconnect">{{_("Reconnect:")}}</span><a id="reconnect" style=" background-color: {% if status.reconnect %}#8ffc25{% else %} #fc6e26{% endif %}; padding-left: 0cm; padding-right: 0.1cm; "> {% if status.reconnect %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</a></li>
- <li><a class="action backlink">{{_("Speed:")}} <b id="speed">{{ status.speed }}</b></a></li>
- <li><a class="action cog">{{_("Active:")}} <b id="aktiv" title="{{_("Active")}}">{{ status.active }}</b> / <b id="aktiv_from" title="{{_("Queued")}}">{{ status.queue }}</b> / <b id="aktiv_total" title="{{_("Total")}}">{{ status.total }}</b></a></li>
- <li><a href="" class="action revisions" accesskey="o" rel="nofollow">{{_("Reload page")}}</a></li>
-</ul>
+
+<div class="btn-group btn-group-sm" role="group" aria-label="..." style="margin-right:10px; float:right;">
+ <button id="action_play" class="btn btn-default"><span >{{_("Download:")}}</span>&nbsp;<span class="label label-{% if status.download %}success{% else %}danger{% endif %}">{% if status.download %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</span></button>
+ <button id="action_stop" type="button" class="btn btn-default"><span>{{_("Reconnect:")}}</span>&nbsp;<span class="label label-{% if status.reconnect %}success{% else %}danger{% endif %}">{% if status.reconnect %}{{_("on")}}{% else %}{{_("off")}}{% endif %}</span></button>
+ <button id="action_cancel" type="button" class="btn btn-default"><span class="action backlink">{{_("Speed:")}} <b id="speed">{{ status.speed }}</b></span></button>
+ <button id="action_add" type="button" class="btn btn-default"><span class="action cog">{{_("Active:")}} <b id="aktiv" title="{{_("Active")}}">{{ status.active }}</b> / <b id="aktiv_from" title="{{_("Queued")}}">{{ status.queue }}</b> / <b id="aktiv_total" title="{{_("Total")}}">{{ status.total }}</b></span></button>
+</div>
+
{% endif %}
{% block pageactions %}
@@ -134,20 +160,12 @@
<div id="body-wrapper" class="dokuwiki">
-<div id="content" lang="en" dir="ltr">
+<div id="content" style="width: 98%; margin-left:10px; margin-rigth:10px;" lang="en" dir="ltr">
-<h1>{% block subtitle %}pyLoad - {{_("Webinterface")}}{% endblock %}</h1>
+<h3>{% block subtitle %}pyLoad - {{_("Webinterface")}}{% endblock %}</h3>
{% block statusbar %}
{% endblock %}
-
-
-<br/>
-
-<div class="level1" style="clear:both">
-</div>
-<noscript><h1>Enable JavaScript to use the webinterface.</h1></noscript>
-
{% for message in messages %}
<b><p>{{message}}</p></b>
{% endfor %}
@@ -162,7 +180,7 @@
<hr style="clear: both;" />
-<div id="foot">&copy; 2008-2011 pyLoad Team
+<div id="foot" style="with: 98%; margin-left: 10px; margin-right:10px">&copy; 2008-2011 pyLoad Team
<a href="#top" class="action top" accesskey="x"><span>{{_("Back to top")}}</span></a><br />
<!--<div class="breadcrumbs"></div>-->
@@ -176,5 +194,6 @@
{% block hidden %}
{% endblock %}
</div>
+<noscript><h1>Enable JavaScript to use the webinterface.</h1></noscript>
</body>
</html>
diff --git a/module/web/templates/default/captcha.html b/module/web/templates/default/captcha.html
index 288375b76..b3bfb282b 100644
--- a/module/web/templates/default/captcha.html
+++ b/module/web/templates/default/captcha.html
@@ -1,27 +1,25 @@
<!-- Captcha box -->
-<div id="cap_box" class="window_box">
+<div id="cap_box" >
- <form id="cap_form" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
+ <form id="cap_form" class="form-group" action="/json/set_captcha" method="POST" enctype="multipart/form-data" onsubmit="return false;">
- <h1>{{_("Captcha reading")}}</h1>
+ <h3>{{_("Captcha reading")}}</h3>
<p id="cap_title">{{_("Please read the text on the captcha.")}}</p>
<div id="cap_textual">
<input id="cap_id" name="cap_id" type="hidden" value="" />
-
- <label>{{_("Captcha")}}
- <span class="small">{{_("The captcha.")}}</span>
- </label>
- <span class="cont">
- <img id="cap_textual_img" src="">
+
+ <div class="form-group">
+ <label>{{_("Captcha")}}</label>
+ <span ></br>
+ <img id="cap_textual_img" style="border: 1px solid #bbb; padding: 3px 3px 3px 3px;" src="">
</span>
-
- <label>{{_("Text")}}
- <span class="small">{{_("Input the text on the captcha.")}}</span>
- </label>
- <input id="cap_result" name="cap_result" type="text" size="20" />
-
+ </div>
+ <div class="form-group">
+ <label>{{_("Text")}}</label>
+ <input class="form-control" id="cap_result" name="cap_result" type="text" size="20" />
+ <p class="small">{{_("Input the text on the captcha.")}}</p>
</div>
<div id="cap_positional" style="text-align: center">
@@ -30,8 +28,8 @@
<div id="button_bar" style="text-align: center">
<span>
- <button id="cap_submit" type="submit" style="margin-left: 0">{{_("Submit")}}</button>
- <button id="cap_reset" type="reset" style="margin-left: 0">{{_("Close")}}</button>
+ <button class="btn btn-primary" id="cap_submit" type="submit" style="float: right; margin-left: 5px;">{{_("Submit")}}</button>
+ <button class="btn btn-default" id="cap_reset" type="reset" style="float: right">{{_("Close")}}</button>
</span>
</div>
diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html
index 450b8a102..d19fe969a 100644
--- a/module/web/templates/default/downloads.html
+++ b/module/web/templates/default/downloads.html
@@ -8,20 +8,20 @@
{% block content %}
-<ul>
+<ul style="list-style-type: none;">
{% for folder in files.folder %}
- <li>
- {{ folder.name }}
+ <li style="list-style-type: none;">
+ <span style="margin-right: 5px" class="glyphicon glyphicon-folder-close"></span>{{ folder.name }}
<ul>
{% for file in folder.files %}
- <li><a href='get/{{ folder.path|escape }}/{{ file|escape }}'>{{file}}</a></li>
+ <li style="list-style-type: none;"><span style="margin-right: 5px" class="glyphicon glyphicon-file"></span><a href='get/{{ folder.path|escape }}/{{ file|escape }}'>{{file}}</a></li>
{% endfor %}
</ul>
</li>
{% endfor %}
{% for file in files.files %}
- <li> <a href='get/{{ file|escape }}'>{{ file }}</a></li>
+ <li style="list-style-type: none;"> <span style="margin-right: 5px" class="glyphicon glyphicon-file"></span><a href='get/{{ file|escape }}'>{{ file }}</a></li>
{% endfor %}
</ul>
diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html
index 7359e326c..0cbbca280 100644
--- a/module/web/templates/default/home.html
+++ b/module/web/templates/default/home.html
@@ -77,6 +77,7 @@ var EntryManager = new Class({
}
}, this)
+
}catch(e){
//alert(e)
}
@@ -105,20 +106,29 @@ var LinkEntry = new Class({
},
insert: function(item){
try{
+
+
this.elements = {
tr: new Element('tr', {
'html': '',
'styles':{
- 'opacity': 0
+ 'opacity': 0,
}
}),
+ status: new Element('td', {
+ 'html': '&nbsp;',
+ }),
+ statusspan: new Element('span', {
+ 'html': item.statusmsg,
+ 'class': 'label label-default',
+ 'styles':{
+
+ }
+ }),
name: new Element('td', {
'html': item.name
}),
- status: new Element('td', {
- 'html': item.statusmsg
- }),
info: new Element('td', {
'html': item.info
}),
@@ -128,31 +138,43 @@ var LinkEntry = new Class({
percent: new Element('span', {
'html': item.percent+ '% / '+ humanFileSize(item.size-item.bleft)
}),
- remove: new Element('img',{
- 'src': 'media/default/img/control_cancel.png',
- 'styles':{
- 'vertical-align': 'middle',
- 'margin-right': '-20px',
- 'margin-left': '5px',
- 'margin-top': '-2px',
- 'cursor': 'pointer'
- }
+ remove: new Element('span',{
+ 'html': '',
+ 'class': 'glyphicon glyphicon-remove',
+ 'styles':{
+ 'margin-left': '3px',
+ }
}),
pgbTr: new Element('tr', {
- 'html':''
+ 'html':'',
+ 'styles':{
+ 'border-top-color': '#fff',
+ }
+ }),
+ progress: new Element('div', {
+ 'html':'',
+ 'class':'progress',
+ 'styles':{
+ 'margin-bottom': '0px',
+ }
}),
pgb: new Element('div', {
- 'html': '&nbsp;',
+ 'html':'',
+ 'class':'progress-bar progress-bar-striped active',
+ 'role':'progress',
'styles':{
- 'height': '4px',
'width': item.percent+'%',
'background-color': '#ddd'
}
})
+
};
- this.elements.tr.adopt(this.elements.name,this.elements.status,this.elements.info,this.elements.bleft,new Element('td').adopt(this.elements.percent,this.elements.remove));
- this.elements.pgbTr.adopt(new Element('td',{'colspan':5}).adopt(this.elements.pgb));
+
+ this.elements.status.adopt(this.elements.statusspan);
+ this.elements.progress.adopt(this.elements.pgb);
+ this.elements.tr.adopt(this.elements.status,this.elements.name,this.elements.info,this.elements.bleft,new Element('td').adopt(this.elements.percent,this.elements.remove));
+ this.elements.pgbTr.adopt(new Element('td',{'colspan':5}).adopt(this.elements.progress));
this.initEffects();
}catch(e){
alert(e)
@@ -171,15 +193,27 @@ var LinkEntry = new Class({
},
update: function(item){
this.elements.name.set('text', item.name);
- this.elements.status.set('text', item.statusmsg);
+ this.elements.statusspan.set('text', item.statusmsg);
this.elements.info.set('text', item.info);
this.elements.bleft.set('text', item.format_size);
this.elements.percent.set('text', item.percent+ '% / '+ humanFileSize(item.size-item.bleft));
+ if (item.statusmsg == "waiting") {
+ this.elements.statusspan.set('class', 'label label-warning')
+ } else if (item.statusmsg == "starting") {
+ this.elements.statusspan.set('class', 'label label-info')
+ } else if (item.statusmsg == "downloading") {
+ this.elements.statusspan.set('class', 'label label-success')
+ } else if (item.stausmsg == "extracting") {
+ this.elements.statusspan.set('class', 'label label-primary')
+ } else {
+ this.elements.statusspan.set('class', 'label label-default')
+ }
if(!operafix)
{
+
this.bar.start({
'width': item.percent,
- 'background-color': [Math.round(120/100*item.percent),100,100].hsbToRgb().rgbToHex()
+ 'background-color': [Math.round(120/100*item.percent),80,70].hsbToRgb().rgbToHex()
});
}
else
@@ -188,9 +222,10 @@ var LinkEntry = new Class({
'styles', {
'height': '4px',
'width': item.percent+'%',
- 'background-color': [Math.round(120/100*item.percent),100,100].hsbToRgb().rgbToHex(),
+ 'background-color': [Math.round(50/200*item.percent),0,200].hsbToRgb().rgbToHex(),
});
}
+
},
remove: function(){
this.fade.start('opacity',0).chain(function(){this.elements.tr.dispose();}.bind(this));
@@ -198,57 +233,32 @@ var LinkEntry = new Class({
}
});
+
+
</script>
-
-{% endblock %}
-
-{% block subtitle %}
-{{_("Active Downloads")}}
-{% endblock %}
-
-{% block menu %}
-<li class="selected">
- <a href="/" title=""><img src="/media/default/img/head-menu-home.png" alt="" /> {{_("Home")}}</a>
-</li>
-<li>
- <a href="/queue/" title=""><img src="/media/default/img/head-menu-queue.png" alt="" /> {{_("Queue")}}</a>
-</li>
-<li>
- <a href="/collector/" title=""><img src="/media/default/img/head-menu-collector.png" alt="" /> {{_("Collector")}}</a>
-</li>
-<li>
- <a href="/downloads/" title=""><img src="/media/default/img/head-menu-development.png" alt="" /> {{_("Downloads")}}</a>
-</li>
-{#<li>#}
-{# <a href="/filemanager/" title=""><img src="/media/default/img/head-menu-download.png" alt="" /> {{_("FileManager")}}</a>#}
-{#</li>#}
-<li class="right">
- <a href="/logs/" class="action index" accesskey="x" rel="nofollow"><img src="/media/default/img/head-menu-index.png" alt="" />{{_("Logs")}}</a>
-</li>
-<li class="right">
- <a href="/settings/" class="action index" accesskey="x" rel="nofollow"><img src="/media/default/img/head-menu-config.png" alt="" />{{_("Config")}}</a>
-</li>
{% endblock %}
+{% block subtitle %}{{_("Active Downloads")}}{% endblock %}
{% block content %}
-<table width="100%" class="queue">
+<table class="table" style="width:100%;">
<thead>
<tr class="header">
- <th>{{_("Name")}}</th>
<th>{{_("Status")}}</th>
+ <th>{{_("Name")}}</th>
<th>{{_("Information")}}</th>
<th>{{_("Size")}}</th>
<th>{{_("Progress")}}</th>
</tr>
</thead>
+</br>
<tbody id="LinksAktiv">
{% for link in content %}
<tr id="link_{{ link.id }}">
- <td id="link_{{ link.id }}_name">{{ link.name }}</td>
- <td id="link_{{ link.id }}_status">{{ link.status }}</td>
- <td id="link_{{ link.id }}_info">{{ link.info }}</td>
- <td id="link_{{ link.id }}_bleft">{{ link.format_size }}</td>
+ <td id="link_{{ link.id }}_status"><span class="label label-{% if link.status == 'downloading' %}success{% endif %}{% if link.status == 'extracting' %}primary{% endif %}{% if link.status == 'starting' %}warning{% else %}default{% endif %}">{{ link.status }}</span></td>
+ <td id="link_{{ link.id }}_name">{{ link.name }}</td>
+ <td id="link_{{ link.id }}_info">{{ link.info }}</td>
+ <td id="link_{{ link.id }}_bleft">{{ link.format_size }}</td>
<td>
<span id="link_{{ link.id }}_percent">{{ link.percent }}% /{{ link.bleft }}</span>
<img id="link_{{ link.id }}_remove" style="vertical-align: middle; margin-right: -20px; margin-left: 5px; margin-top: -2px; cursor:pointer;" src="media/default/img/control_cancel.png"/>
@@ -263,4 +273,5 @@ var LinkEntry = new Class({
</tbody>
</table>
-{% endblock %} \ No newline at end of file
+</div>
+{% endblock %}
diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html
index 77ae57376..792490329 100644
--- a/module/web/templates/default/info.html
+++ b/module/web/templates/default/info.html
@@ -37,43 +37,43 @@
<h3>{{ _("System") }}</h3>
<table class="system">
<tr>
- <td>{{ _("Python:") }}</td>
+ <td><b>{{ _("Python:") }}</b></td>
<td>{{ python }}</td>
</tr>
<tr>
- <td>{{ _("OS:") }}</td>
+ <td><b>{{ _("OS:") }}</b></td>
<td>{{ os }}</td>
</tr>
<tr>
- <td>{{ _("pyLoad version:") }}</td>
+ <td><b>{{ _("pyLoad version:") }}</b></td>
<td>{{ version }}</td>
</tr>
<tr>
- <td>{{ _("Installation Folder:") }}</td>
+ <td><b>{{ _("Installation Folder:") }}</b></td>
<td>{{ folder }}</td>
</tr>
<tr>
- <td>{{ _("Config Folder:") }}</td>
+ <td><b>{{ _("Config Folder:") }}</b></td>
<td>{{ config }}</td>
</tr>
<tr>
- <td>{{ _("Download Folder:") }}</td>
+ <td><b>{{ _("Download Folder:") }}</b></td>
<td>{{ download }}</td>
</tr>
<tr>
- <td>{{ _("Free Space:") }}</td>
+ <td><b>{{ _("Free Space:") }}</b></td>
<td>{{ freespace }}</td>
</tr>
<tr>
- <td>{{ _("Language:") }}</td>
+ <td><b>{{ _("Language:") }}</b></td>
<td>{{ language }}</td>
</tr>
<tr>
- <td>{{ _("Webinterface Port:") }}</td>
+ <td><b>{{ _("Webinterface Port:") }}</b></td>
<td>{{ webif }}</td>
</tr>
<tr>
- <td>{{ _("Remote Interface Port:") }}</td>
+ <td><b>{{ _("Remote Interface Port:") }}</b></td>
<td>{{ remote }}</td>
</tr>
</table>
diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html
index d6288df0e..f5444d94e 100644
--- a/module/web/templates/default/logs.html
+++ b/module/web/templates/default/logs.html
@@ -9,7 +9,7 @@
{% block content %}
<div style="clear: both;"></div>
-<div class="logpaginator"><a href="{{ "/logs/1" }}">&lt;&lt; {{_("Start")}}</a> <a href="{{ "/logs/" + iprev|string }}">&lt; {{_("prev")}}</a> <a href="{{ "/logs/" + inext|string }}">{{_("next")}} &gt;</a> <a href="/logs/">{{_("End")}} &gt;&gt;</a></div>
+<div class="logpaginator"><a href="{{ "/logs/1" }}"><span class="glyphicon glyphicon-fast-backward"></span></a> <a href="{{ "/logs/" + iprev|string }}"><span class="glyphicon glyphicon-step-backward"></span></a> <a href="{{ "/logs/" + inext|string }}"><span class="glyphicon glyphicon-step-forward"></span></a> <a href="/logs/"><span class="glyphicon glyphicon-fast-forward"></span></a></div>
<div class="logperpage">
<form id="logform1" action="" method="POST">
<label for="reversed">Reversed:</label>
@@ -33,8 +33,8 @@
</div>
<div class="logform">
<form id="logform2" action="" method="POST">
- <label for="from">Jump to time:</label><input type="text" name="from" size="15" value="{{from}}"/>
- <input type="submit" value="ok" />
+ <label for="from">Jump to time:</label><input style="float:left; width:80%;" class="form-control" type="text" name="from" size="15" value="{{from}}"/>
+ <input style="float:left; width:19%; margin-left: 1%;" class="btn btn-primary" type="submit" value="ok" />
</form>
</div>
<div style="clear: both; height: 10px;">&nbsp; </div>
diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html
index 046abbe49..29e1a2927 100644
--- a/module/web/templates/default/queue.html
+++ b/module/web/templates/default/queue.html
@@ -17,52 +17,53 @@ document.addEvent("domready", function(){
{% 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>
+<div class="btn-group btn-group-sm" role="group" aria-label="..." style="margin-left:10px;">
+ <button id="del_finished" class="btn btn-default"><span>{{_("Delete Finished")}}</span></button>
+ <button id="restart_failed" class="btn btn-default"><span>{{_("Restart Failed")}}</span></button>
+</div>
{% endblock %}
+{% block title %}{{name}} - {{super()}} {% endblock %}
+{% block subtitle %}{{name}}{% 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 id="package_{{package.pid}}" >
<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>
+ <div class="packagename" style="float:left; width: 50%; cursor: pointer">
+ <span class="glyphicon glyphicon-folder-close"></span>
+ <span class="name" style="font-size: 16px; font-weight: bold;">{{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" />
+ <span class="glyphicon glyphicon-trash" title="{{_("Delete Package")}}" style="cursor: pointer" width="12px" height="12px" src="/media/default/img/delete.png" /></span>
&nbsp;&nbsp;
- <img title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/arrow_refresh.png" />
+ <span class="glyphicon glyphicon-repeat" title="{{_("Restart Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/arrow_refresh.png" /></span>
&nbsp;&nbsp;
- <img title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/pencil.png" />
+ <span class="glyphicon glyphicon-pencil" title="{{_("Edit Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/pencil.png" /></span>
&nbsp;&nbsp;
- <img title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/package_go.png" />
+ <span class="glyphicon glyphicon-transfer package_drag" title="{{_("Move Package")}}" style="margin-left: -10px; cursor: pointer" height="12px" src="/media/default/img/package_go.png" /></span>
</span>
</div>
{% set progress = (package.linksdone * 100) / package.linkstotal %}
- <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">
+ <div id="progress" class="progress" style="float:left; width: 50%; margin-top: -5px;">
+ <div class="progress-bar" role="progressbar" style="width: {{ progress }}%; height: 100%;">
+ <label>
+ {{ package.linksdone }} / {{ package.linkstotal }}</label>
+ </div>
+ <label style="padding-right: 5px ;float: right;">
{{ 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>
+ <div id="children_{{package.pid}}" style="display: none; margin-bottom: 15px;" class="children">
+ <span class="child_secrow" style="margin-bottom: 30px; margin-top: 5px;">{{_("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>
@@ -74,28 +75,32 @@ document.addEvent("domready", function(){
{% 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>
+<div id="pack_box" style="z-index: 2">
+ <form id="pack_form" class="from-group" action="/json/edit_package" method="POST" enctype="multipart/form-data">
+ <h3>{{_("Edit Package")}}</h3>
<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="form-group">
+ <label for="pack_name">{{_("Name")}}</label>
+ <input class="form-control" id="pack_name" name="pack_name" type="text" />
+ <p class="help-block">{{_("The name of the package.")}}</p>
+ </div>
+ <div class="form-group">
+ <label for="pack_folder">{{_("Folder")}}</label>
+ <input class="form-control" id="pack_folder" name="pack_folder" type="text" />
+ <p class="help-block">{{_("Name of subfolder for these downloads.")}}</p>
+ </div>
+ <div class="form-group">
+ <label for="pack_pws">{{_("Password")}}</label>
+ <textarea class="form-control" style=" width: 100%;" rows="3" name="pack_pws" id="pack_pws"></textarea>
+ <p class="help-block">{{_("List of passwords used for unrar.")}}</p>
+ </div>
+ <button class="btn btn-primary" style="float: right; margin-left: 5px;" type="submit">{{_("Submit")}}</button>
+ <button class="btn btn-default" id="pack_reset" style="float: right;" type="reset" >{{_("Reset")}}</button>
+
+
<div class="spacer"></div>
</form>
diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html
index a4443025a..7b06caa97 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -12,10 +12,10 @@
{% 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 id="toptabs" class="nav nav-tabs">
+ <li role="presentation" class"active"><a href="#">{{ _("General") }}</a></li>
+ <li role="presentation"><a href="#">{{ _("Plugins") }}</a></li>
+ <li role="presentation"><a href="#">{{ _("Accounts") }}</a></li>
</ul>
<div id="tabsback" style="height: 20px; padding-left: 150px; color: white; font-weight: bold;">
@@ -25,56 +25,65 @@
<span id="tabs-body">
<!-- General -->
<span id="general" class="active tabContent">
- <ul class="nav tabs">
+ <ul class="nav tabs" style="width: 20%; float:left;">
<li class>
- <a>Menu</a>
- <ul id="general-menu">
+ <div class="panel panel-default" >
+ <div class="panel-body" style="overlow-y: scroll; ">
+
+
+ <ul id="general-menu" style=" float: left;">
{% for entry,name in conf.general %}
<nobr>
- <li id="general|{{ entry }}">{{ name }}</li>
+ <li style="list-style-type: none;" id="general|{{ entry }}">{{ name }}</li>
</nobr>
<br>
{% endfor %}
</ul>
+ </div>
+ </div>
</li>
</ul>
- <form id="general_form" action="" method="POST" autocomplete="off">
+ <form style="float: left; width:40%; margin-left: 20%; diplay:block; position: fixed; overflow: auto;" 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")}}"/>
+ <input class="btn btn-primary" style="float:right; margin-right: 10px;" id="general|submit" type="submit" value="{{_("Submit")}}"/>
</form>
</span>
<!-- Plugins -->
<span id="plugins" class="tabContent">
- <ul class="nav tabs">
+ <ul class="nav tabs" style="width: 20%; float:left; hight:300px;">
<li class>
- <a>Menu</a>
- <ul id="plugin-menu">
+ <div class="panel panel-default" style="overflow-y: scroll; ">
+ <div class="panel-body" >
+
+ <ul id="plugin-menu" style=" float: left;">
{% for entry,name in conf.plugin %}
<nobr>
- <li id="plugin|{{ entry }}">{{ name }}</li>
+ <li style="list-style-type: none;" id="plugin|{{ entry }}">{{ name }}</li>
</nobr>
<br>
{% endfor %}
</ul>
+ <div>
+ </div>
</li>
</ul>
- <form id="plugin_form" action="" method="POST" autocomplete="off">
+ <form style="float: left; width:40%; margin-left: 10px;" id="plugin_form" action="" method="POST" autocomplete="off">
- <span id="plugin_form_content">
+ <span id="plugin_form_content" style:"position: static;">
<br>
<h3>&nbsp;&nbsp; {{ _("Choose a section from the menu") }}</h3>
<br>
</span>
- <input id="plugin|submit" class="styled_button" type="submit" value="{{_("Submit")}}"/>
+ <input class="btn btn-primary" style="float:right; margin-right: 10px;" id="plugin|submit" class="styled_button" type="submit" value="{{_("Submit")}}"/>
</form>
</span>
@@ -83,7 +92,7 @@
<span id="accounts" class="tabContent">
<form id="account_form" action="/json/update_accounts" method="POST">
- <table class="settable wide">
+ <table class="settable wide table">
<thead>
<tr>
@@ -163,39 +172,43 @@
</tr>
{% endfor %}
</table>
+ <button id="account_add" style="margin-left: 5px;" type="submit" class="btn btn-default">&nbsp;<span class="glyphicon glyphicon-plus"></button>
- <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>
+ <button id="account_submit" type="submit" class="btn btn-primary" >{{_("Submit")}}</button>
+
</form>
</span>
</span>
{% endblock %}
{% block hidden %}
-<div id="account_box" class="window_box" style="z-index: 2">
+<div id="account_box" style="z-index: 2">
<form id="add_account_form" action="/json/add_account" method="POST" enctype="multipart/form-data">
-<h1>{{_("Add Account")}}</h1>
+<h3>{{_("Add Account")}}</h3>
<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>
+
+<div class="form-group">
+<label for="account_login">{{_("Login")}}</label>
+<input class="form-control" id="account_login" name="account_login" type="text" />
+<p >{{_("Your username.")}}</p>
+</div>
+<div class="form-group">
+<label for="account_password">{{_("Password")}}</label>
+<input class="form-control" id="account_password" name="account_password" type="password" size="20" />
+<p >{{_("The password for this account.")}}</p>
+</div>
+<div class="form-group">
+<label for="account_type">{{_("Type")}}</label>
+<p>{{_("Choose the hoster for your account.")}}</p>
+</div>
+<div class="form-group">
<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>
+<button class="btn btn-primary" style="float: right; margin-left: 5px;" id="account_add_button" type="submit">{{_("Add")}}</button>
+<button class="btn btn-default" style="float: right;" id="account_reset" style="margin-left: 0" type="reset">{{_("Reset")}}</button>
<div class="spacer"></div>
</form>
diff --git a/module/web/templates/default/settings_item.html b/module/web/templates/default/settings_item.html
index 813383343..b760aaa02 100644
--- a/module/web/templates/default/settings_item.html
+++ b/module/web/templates/default/settings_item.html
@@ -1,4 +1,5 @@
-<table class="settable">
+<table class="settable table">
+
{% if section.outline %}
<tr><th colspan="2">{{ section.outline }}</th></tr>
{% endif %}
@@ -23,26 +24,27 @@
{% endfor %}
</select>
{% elif option.type == "folder" %}
- <input name="{{skey}}|{{okey}}" type="text"
+ <input style="float: right; margin-bottom: 5px;" class="form-control" name="{{skey}}|{{okey}}" type="text"
id="{{skey}}|{{okey}}" value="{{option.value}}"/>
- <input name="browsebutton" type="button"
+ <input style="float: right;" class="form-control btn btn-primary" name="browsebutton" type="button"
onclick="ifield = document.getElementById('{{skey}}|{{okey}}'); pathchooser = window.open('{% if option.value %}{{ "/pathchooser/" + option.value|quotepath }}{% else %}{{ pathroot }}{% endif %}', 'pathchooser', 'scrollbars=yes,toolbar=no,menubar=no,statusbar=no,width=650,height=300'); pathchooser.ifield = ifield; window.ifield = ifield;"
value="{{_("Browse")}}"/>
{% elif option.type == "file" %}
- <input name="{{skey}}|{{okey}}" type="text"
+ <input style="float: right; margin-bottom: 5px;" class="form-control" name="{{skey}}|{{okey}}" type="text"
id="{{skey}}|{{okey}}" value="{{option.value}}"/>
- <input name="browsebutton" type="button"
+ <input style="float: right;" class="form-control btn btn-primary" name="browsebutton" type="button"
onclick="ifield = document.getElementById('{{skey}}|{{okey}}'); filechooser = window.open('{% if option.value %}{{ "/filechooser/" + option.value|quotepath }}{% else %}{{ fileroot }}{% endif %}', 'filechooser', 'scrollbars=yes,toolbar=no,menubar=no,statusbar=no,width=650,height=300'); filechooser.ifield = ifield; window.ifield = ifield;"
value="{{_("Browse")}}"/>
{% elif option.type == "password" %}
- <input id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
+ <input style="float: right;" class="form-control" id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
type="password" value="{{option.value}}"/>
{% else %}
- <input id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
+ <input style="float: right;" class="form-control" id="{{skey}}|{{okey}}" name="{{skey}}|{{okey}}"
type="text" value="{{option.value}}"/>
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %}
+
</table> \ No newline at end of file
diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html
index a11323fe0..290d40be6 100644
--- a/module/web/templates/default/window.html
+++ b/module/web/templates/default/window.html
@@ -1,46 +1,46 @@
<iframe id="upload_target" name="upload_target" src="" style="display: none; width:0;height:0"></iframe>
-<div id="add_box" class="window_box">
+<div id="add_box" class="from-group">
<form id="add_form" action="/json/add_package" method="POST" enctype="multipart/form-data">
-<h1>{{_("Add Package")}}</h1>
+<h3>{{_("Add Package")}}</h3>
<p>{{_("Paste your links or upload a container.")}}</p>
-<label for="add_name">{{_("Name")}}
-<span class="small">{{_("The name of the new package.")}}</span>
-</label>
-<input id="add_name" name="add_name" type="text" size="20" />
-
-<label for="add_links">{{_("Links")}}
-<span class="small">{{_("Paste your links here or any text and press the filter button.")}}</span>
-<span class="small"> {{ _("Filter urls") }}
-<img alt="URIParsing" Title="Parse Uri" src="/media/default/img/parseUri.png" style="cursor:pointer; vertical-align: text-bottom;" onclick="parseUri()"/>
-</span>
-
-</label>
-<textarea rows="5" name="add_links" id="add_links"></textarea>
-
-<label for="add_password">{{_("Password")}}
- <span class="small">{{_("Password for RAR-Archive")}}</span>
-</label>
-<input id="add_password" name="add_password" type="text" size="20">
-
-<label>{{_("File")}}
-<span class="small">{{_("Upload a container.")}}</span>
-</label>
-<input type="file" name="add_file" id="add_file"/>
-
-<label for="add_dest">{{_("Destination")}}
-</label>
-<span class="cont">
- {{_("Queue")}}
- <input type="radio" name="add_dest" id="add_dest" value="1" checked="checked"/>
- {{_("Collector")}}
- <input type="radio" name="add_dest" id="add_dest2" value="0"/>
-</span>
+<div class="form-group">
+ <label for="add_name">{{_("Name")}}</label>
+ <input id="add_name" class="form-control" name="add_name" type="text" />
+ <p class="help-block">{{_("The name of the new package.")}}</p>
+ </div>
+ <div class="form-group">
+ <label for="add_links">{{_("Links")}}</label>
+ </div>
+ <div>
+ <textarea class="form-control" rows="5" style="width: 100%" name="add_links" id="add_links"></textarea>
+</div>
+<div class="form-group">
+ <p class="help-block">{{_("The name of the new package.")}} {{ _("Filter urls") }} <span class=" glyphicon glyphicon-filter" onclick="parseUri()"></span></p>
+ </div>
+ <div class="form-group">
+ <label for="add_password">{{_("Password")}}</label>
+ <input id="add_password" class="form-control" name="add_password" type="text">
+ <p class="help-block">{{_("Password for RAR-Archive")}}</p>
+ </div>
+ <div class="form-group">
+ <label>{{_("File")}}</label>
+ <input type="file" name="add_file" id="add_file"/>
+ <p class="help-block">{{_("Upload a container.")}}</p>
+ </div>
+ <div class="form-group">
+ <label for="add_dest">{{_("Destination")}}</label>
+ <span class="cont">
+ {{_("Queue")}}
+ <input type="radio" name="add_dest" id="add_dest" value="1" checked="checked"/>
+ {{_("Collector")}}
+ <input type="radio" name="add_dest" id="add_dest2" value="0"/>
+ </span>
+ </div>
+ <button type="submit" class="btn btn-primary" style="float: right; margin-right: 5px;">{{_("Add Package")}}</button>
+ <button id="add_reset" class="btn btn-default" style="float: right; margin-right: 5px;" type="reset">{{_("Reset")}}</button>
+</form>
-<button type="submit">{{_("Add Package")}}</button>
-<button id="add_reset" style="margin-left:0;" type="reset">{{_("Reset")}}</button>
-<div class="spacer"></div>
-</form>
</div> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 18:18:20 +0100