From 69200db3473588f6df334836c6f249f489575888 Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Sat, 3 Jan 2015 07:12:50 +0100
Subject: Completely new Design v1

Some bugs heve to be fexed next days
---
 module/web/templates/default/settings.html | 50 ++++++++++++++++++------------
 1 file changed, 30 insertions(+), 20 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..cd9b835da 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,9 +172,10 @@
                                        </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>
-- 
cgit v1.2.3


From 4c9b6f2fa02d1d8cc8fcb6b3d2acc94e89fe8836 Mon Sep 17 00:00:00 2001
From: mariusbaumann <baumann.marius@gmail.com>
Date: Sat, 3 Jan 2015 20:42:17 +0100
Subject: Some style and bug fixes

+ Drag and drop sort fetature on queue fixed
+ Capcha overlay redesigned
+ Add premium account window restyled
+ Alert messages restyled
+ Some other details changed
---
 module/web/templates/default/settings.html | 39 ++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 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 cd9b835da..7b06caa97 100644
--- a/module/web/templates/default/settings.html
+++ b/module/web/templates/default/settings.html
@@ -181,31 +181,34 @@
         </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>
-- 
cgit v1.2.3