From 40b05174b69de8b0f8366b49d43a3cbc97563fda Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 30 Jan 2013 22:11:10 +0100 Subject: added actionbar, two-column dashboard --- docs/resources/pyload_logo.svg | 66 ++++++++++++- module/web/static/css/default/admin.less | 2 +- module/web/static/css/default/common.less | 67 +++++++++++++ module/web/static/css/default/dashboard.less | 4 +- module/web/static/css/default/settings.less | 5 +- module/web/static/css/default/style.less | 136 +++++++++++---------------- module/web/templates/default/base.html | 9 ++ module/web/templates/default/dashboard.html | 120 +++++++++++++---------- 8 files changed, 265 insertions(+), 144 deletions(-) create mode 100644 module/web/static/css/default/common.less diff --git a/docs/resources/pyload_logo.svg b/docs/resources/pyload_logo.svg index a6217e79a..9346f09ad 100644 --- a/docs/resources/pyload_logo.svg +++ b/docs/resources/pyload_logo.svg @@ -29,7 +29,16 @@ id="title3794">pyLoad Logoimage/svg+xmlpyLoad LogopyLoad LogopyLoad Teampyload logoOfficial pyLoad logo with some optional filters li > a { + margin-top: 4px; +} + +#actionbar .breadcrumb { + margin: 0; + padding-top: 10px; + padding-bottom: 0; + + .active { + color: @grey; + } + +} + +#actionbar form { + margin-top: 8px; + margin-bottom: 0; +} + +#actionbar input, #actionbar button { + padding-top: 2px; + padding-bottom: 2px; +} + +#actionbar .dropdown-menu i { + margin-top: 4px; + padding-right: 5px; +} + /* Login */ diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 3b6cfd07b..bb03eaf81 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -129,6 +129,15 @@ {% endif %} +
+
+
+
Notifcations or something
+
+ {% block actionbar %} + {% endblock %} +
+
{% for msg in messages %}

{{ msg }}

diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html index 875178931..2400d9bde 100644 --- a/module/web/templates/default/dashboard.html +++ b/module/web/templates/default/dashboard.html @@ -72,60 +72,76 @@ {% endblock %} -{% block content %} -