From 9e06719452ea67e9dfb431d68a7c7a827bedbaa2 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sat, 11 Aug 2012 19:07:24 +0200
Subject: fixed layout

---
 module/web/static/css/default/style.css |  7 +++++++
 module/web/templates/default/base.html  | 28 ++++++++--------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css
index 9b2d1768c..2757501e2 100644
--- a/module/web/static/css/default/style.css
+++ b/module/web/static/css/default/style.css
@@ -114,11 +114,18 @@ header img.logo {
     width: 120px;
 }
 
+.header_block {
+    float: right;
+    margin-top: 12px;
+    margin-right: 12px;
+}
+
 #speedgraph {
     float: right;
     height: 45px;
     width: 300px;
     margin-top: 12px;
+    font-family: sans-serif
 }
 
 /*
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 2c9693491..dc715bcbd 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -12,18 +12,8 @@
     <script type="text/javascript" src="static/js/libs/jquery-1.8.0.min.js"></script>
     <script type="text/javascript" src="static/js/libs/jquery.flot.min.js"></script>
     <script type="text/javascript" src="static/js/libs/jquery-ui-1.8.22.custom.min.js"></script>
+
     <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title>
-	
-	
-	<script>
-		$(function() {
-			$( "#reconnecting_check" ).button();
-			$( "#downloading_check" ).button();
-			//$( "a", ".demo" ).click(function() { return false; });
-		});
-	</script>
-	
-	
 
     {% block head %}
     {% endblock %}
@@ -34,15 +24,13 @@
         <div class="center">
             <img class="logo" alt="" src="static/img/default/logo.png" width="120px" height="120px">
             <span class="title">pyLoad</span>
-			<div id="header_block_1" class="header_block">
-				<div id="speedmeter"></div>
-				<div id="downloads"></div>
-				<div id="reconnecting_div"><input type="checkbox" id="reconnecting_check" class="header_button" /><label for="reconnecting_check">{{ _("Reconnect") }}</label></div>
-				<div id="downloading_div"><input type="checkbox" id="downloading_check" class="header_button" /><label for="downloading_check">{{ _("Download") }}</label></div>
-			</div>
-			<div id="header_block_2" class="header_block">
-				<div id="speedgraph"></div>
-			</div>	
+			<div id="speedgraph"></div>
+            <div class="header_block">
+                <div id="speedmeter"></div>
+                <div id="downloads"></div>
+                <div id="reconnecting_div"><input type="checkbox" id="reconnecting_check" class="header_button" /><label for="reconnecting_check">{{ _("Reconnect") }}</label></div>
+                <div id="downloading_div"><input type="checkbox" id="downloading_check" class="header_button" /><label for="downloading_check">{{ _("Download") }}</label></div>
+            </div>
         </div>
     </header>
     <div id="push"></div>
-- 
cgit v1.2.3