changeset 9:71c2dd718293 draft

Fixed the Homepage to turn it into XHTML 1.0 Fixed the styles a little bit more
author marga
date Wed, 11 Jul 2007 01:03:53 +0000
parents a0a5c28b8cf8
children df0211fc246b
files bts_webui/amancay/static/amancay.css bts_webui/amancay/static/amancay_interface.js bts_webui/amancay/templates/base.html bts_webui/amancay/templates/toolbox.html
diffstat 4 files changed, 45 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/bts_webui/amancay/static/amancay.css
+++ b/bts_webui/amancay/static/amancay.css
@@ -7,9 +7,10 @@
 	top: 0.1em;
 	left: 12em;
 	height: 1em;
-	bottom-margin: 0.5em;
-	right-margin: 0;
+	margin-bottom: 0.5em;
+	margin-right: 0;
 	border-bottom:dotted 1px #ccc;
+	background-color: #ffffff;
 }
 
 div.appname
@@ -20,11 +21,11 @@
 	width: 7em;
 	top: 0.3em;
 	left: 0.5em;
-	background-color: #ffffff;
 	text-align: center;
 	font-family: sans-serif;
 	font-size: x-large;
 	font-weight: bold;
+	background-color: #ffffff;
 	color: #d70751;
 }
 
@@ -32,7 +33,7 @@
 {
 	float: right;
 	font-size: small;
-	font-color: #000000;
+	color: #000000;
 	margin-right: 1em;
 }
 
@@ -203,11 +204,11 @@
 	background-image: url(../images/delete.png);
 }
 
-span.toolbox_message {
+div.toolbox_message {
 	background-color: white;
 	text-align: center;
 	font-size: small;
-	width: 97%;
+	width: 96%;
 	padding: 0.2em;
 	margin-bottom: 0.2em;
 	display: block;
@@ -217,14 +218,21 @@
 	margin-bottom: 0.25em;
 }
 
+div.toolbox_txt {
+	display: inline;
+}
 input.toolbox_txt {
 	width: 7em;
 }
-
+div.toolbox_add {
+	text-align: right;
+	width: 100%;
+	display: inline;
+}
 input.toolbox_add {
+	width: 2.8em;
 }
 
-
 div.main { 
 	position: absolute;
 /*	float: right;
--- a/bts_webui/amancay/static/amancay_interface.js
+++ b/bts_webui/amancay/static/amancay_interface.js
@@ -9,7 +9,7 @@
 	var item_list = MochiKit.Async.evalJSONRequest(request)["item_list"];
 	if (item_list.length == 0) {
 		var dom_form = document.getElementById("item_selection");
-		new_span = SPAN({'class': 'toolbox_message'}, "No items selected");
+		new_span = DIV({'class': 'toolbox_message'}, "No items selected");
 		replaceChildNodes(dom_form, new_span);
 	} else {
 		var cells = new Array(item_list.length);
--- a/bts_webui/amancay/templates/base.html
+++ b/bts_webui/amancay/templates/base.html
@@ -1,4 +1,5 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang="en">
 <head>
     <title>{% block title %}{% endblock %}</title>
@@ -12,17 +13,24 @@
 	<div class="topnav">
 		{% if current_user.is_authenticated %}
 		<ul>
-			<li>Logged in as {{ current_user }}</li> |
-			<li><a id="home_link" href="/index">Home</a></li> |
-			<li><a id="settings_link"href="/accounts/settings">Settings</a></li> |
-			<li><a id="help_link" href="/help">Help</a></li> |
+			<li>Logged in as {{ current_user }}</li>
+			<li style="list-style: none">|</li>
+			<li><a id="home_link" href="/index">Home</a></li>
+			<li style="list-style: none">|</li>
+			<li><a id="settings_link"href="/accounts/settings">Settings</a></li>
+			<li style="list-style: none">|</li>
+			<li><a id="help_link" href="/help">Help</a></li>
+			<li style="list-style: none">|</li>
 			<li><a id="logout_link" href="/accounts/logout">Logout</a></li>
 		</ul>
 		{% else %}
 		<ul>
-			<li>Not logged in</li> |
-			<li><a id="home_link" href="/index">Home</a></li> |
-			<li><a id="login_link" href="/accounts/login">Login</a></li> |
+			<li>Not logged in</li>
+			<li style="list-style: none">|</li>
+			<li><a id="home_link" href="/index">Home</a></li> 
+			<li style="list-style: none">|</li>
+			<li><a id="login_link" href="/accounts/login">Login</a></li>
+			<li style="list-style: none">|</li>
 			<li><a id="help_link" href="/help">Help</a></li>
 		</ul>
 		{% endif %}
@@ -34,7 +42,7 @@
 	<div class="body">
 		<div class="sidebar">
 		{% block sidebar %}
-		<H3 class="sidebar_title">Bugs</H3>
+		<h3 class="sidebar_title">Bugs</h3>
 		<ul>
 			<li><a id="selected_bugs_link" href="/selected_bugs">Selected</a></li>
 			<li><a id="tagged_bugs_link" href="/tagged_bugs">Tagged</a></li>
@@ -54,7 +62,7 @@
 		{% block main_content %}{% endblock %}
 		</div>
 
-		<div class="loading" id="loading" />
+		<div class="loading" id="loading"></div>
 	</div>
 </body>
 </html>
--- a/bts_webui/amancay/templates/toolbox.html
+++ b/bts_webui/amancay/templates/toolbox.html
@@ -1,6 +1,6 @@
-<H3 class="toolbox_title">{{ toolbox.title }}</H3>
+<h3 class="toolbox_title">{{ toolbox.title }}</h3>
 <div class="toolbox_itemlist">
-<form name="item_selection" id="item_selection" method="POST">
+<form id="item_selection" method="post" action=".">
 {% if toolbox.item_list %}
 <table id="item_list">
     {% for item in toolbox.item_list %}
@@ -17,14 +17,18 @@
 		<input class="toolbox_remove" type="submit" value="Remove" />
 </div>
 {% else %}
-    <span class="toolbox_message">No items selected</span>
+    <div class="toolbox_message">No items selected</div>
 {% endif %}
 </form>
 </div>
 <div class="toolbox_add_item">
-<form name="add_item" id="add_item" method="POST" >
-	<input class="toolbox_txt" type="text" name="{{ toolbox.item_type }}" 
+<form id="add_item" method="post" action=".">
+	<div class="toolbox_txt">
+		<input class="toolbox_txt" type="text" name="{{ toolbox.item_type }}" 
 	id="item" value="" />
-	<input class="toolbox_add" id="toolbox_add" type="submit" value="Add" />
+	</div>
+	<div class="toolbox_add">
+		<input class="toolbox_add" id="toolbox_add" type="submit" value="Add" />
+	</div>
 </form>
 </div>