From ef460a9942086b90cb2b137dd71d01db6f7da698 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 9 Mar 2011 13:13:33 +0100
Subject: UI polish

---
 site-media/css/style.css        | 12 +++++++-----
 templates/apps/name/acls.html   |  9 +++++----
 templates/apps/name/delete.html |  2 +-
 templates/base.html             |  2 +-
 templates/edit.html             |  8 ++++----
 templates/edit_fieldsets.html   | 11 ++++++-----
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/site-media/css/style.css b/site-media/css/style.css
index 15b8fb5..320f192 100644
--- a/site-media/css/style.css
+++ b/site-media/css/style.css
@@ -9,10 +9,10 @@ div#footer ul { margin-right: 50px; list-style: none; padding: 0; margin: 0; }
 div#footer li { float: left; margin: 0 0.15em}
 .navlist ul { list-style: none; padding: 0; margin: 0; }
 .navlist li { float: right; display: inline;}
-.ilist ul { list-style: none inside; padding: inherit; }
-.ilist li { float: left; display: inline; padding: inherit; }
-.leftright ul { display: inline; list-style: none inside; padding: inherit; }
-.leftright li { display: inline-block; padding: inherit; vertical-align: top; }
+.ilist ul { list-style: none inside; padding: 0px; margin: 0px; }
+.ilist li { display: inline-block; padding: 0px; margin: 0px; }
+.leftright ul { display: inline; list-style: none inside; padding: 0px; }
+.leftright li { display: inline-block; padding: 0px; vertical-align: top; }
 .rlist ul { list-style: none inside; padding: inherit; }
 .rlist li { float: right; display: inline; padding: inherit; }
 .clist ul { list-style: none; }
@@ -47,4 +47,6 @@ div#content { padding-bottom: 5px; }
 div .hidden {visibility:hidden;}
 .listheader { padding-left: 20px; }
 .button {  }
-legend {  font-size: 120%; font-weight: bold;  }
\ No newline at end of file
+legend {  font-size: 120%; font-weight: bold;  }
+.right  { float: right; }
+.left { float: left; }
\ No newline at end of file
diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index a514b91..32c47c4 100644
--- a/templates/apps/name/acls.html
+++ b/templates/apps/name/acls.html
@@ -24,12 +24,13 @@
 	</div>
 {% endfor %}
 </div>
-<div class="ilist button">
-   <ul>
-      <li><a href="/name/{{name.id}}/acl/0/add">Add Permission</a></li>
+<div class="ui-helper-reset ui-widget ui-widget-content ui-corner-all infopanel">
+   <ul class="ilist">
+      <li class="button"><a href="/name/{{name.id}}/acl/0/add">Add Permission</a></li>
       {% if name %}
-      <li style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
+      <li class="button" style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
 	  {% endif %}
    </ul>
+   <div class="clear"></div>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/apps/name/delete.html b/templates/apps/name/delete.html
index e9074b0..8174aea 100644
--- a/templates/apps/name/delete.html
+++ b/templates/apps/name/delete.html
@@ -1,6 +1,6 @@
 {% extends "edit_fieldsets.html" %}
 {% block widgets %}
-    $('#form').formwizard({
+    $('#wizard').formwizard({
     	validationEnabled: true,
     	focusFirstInput: true,
     	textSubmit: "Finish"
diff --git a/templates/base.html b/templates/base.html
index f9ea8fb..de8d0fd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -63,7 +63,7 @@
 <div id="container">
 	<div id="header">
 	   {% if name %}
-	   <div style="float: left;" class="navlist">
+	   <div class="navlist left">
 	       <ul>
 	       	  {% if render.add %}
 			  <li class="button"><a href="/name/{{name.id}}/add">Add Group</a></li>
diff --git a/templates/edit.html b/templates/edit.html
index 0a17922..2dd732e 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% block beforeform %}{% endblock %}
 <div>
-	<form method="POST" class="bbq ui-helper-reset ui-widget ui-widget-content ui-corner-all formpadding">
+	<form method="POST" class="bbq ui-helper-reset ui-widget ui-widget-content ui-corner-all infopanel">
 	    <h1>{{formtitle}}</h1>
 		<table class="formtable">
 	      {% for field in form %}
@@ -23,11 +23,11 @@
 	        </tr>
 	      {% endfor %}
 	    </table>
-		<div class="ilist button" style="padding-bottom: 10px;">
+		<div class="ilist" style="padding-bottom: 10px;">
 		   <ul>
-		      <li><input type="submit" value="{{submitname}}" /></li>
+		      <li class="button left"><input type="submit" value="{{submitname}}" /></li>
 		      {% if name %}
-		      <li style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Done"/></li>
+		      <li class="button right"><input type="button" onClick="document.location='{{name.url}}'" value="Done"/></li>
 		      {% endif %} 
 		   </ul>
 	    </div>
diff --git a/templates/edit_fieldsets.html b/templates/edit_fieldsets.html
index 6a07a26..f35f055 100644
--- a/templates/edit_fieldsets.html
+++ b/templates/edit_fieldsets.html
@@ -3,7 +3,7 @@
 {% block content %}
     {% block beforeform %}
     {% endblock %}
-		<form method="POST" id="wizard" class="bbq formpadding">
+		<form method="POST" id="wizard" class="bbq infopanel">
 		    <h1>{{formtitle}}</h1>
 		    {% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %}
 			{% for fieldset in form.fieldsets %}
@@ -30,14 +30,15 @@
 				  </ul>
 			  </fieldset>
 			{% endfor %}
-			<div class="ilist button" style="padding-bottom: 30px; padding-top: 5px;">
+			<div class="ilist" style="padding-bottom: 30px; padding-top: 5px;">
 			   <ul>
-			      <li><input type="reset" value="Back"/></li>
-			      <li><input type="submit" value="Finish"/></li>
+			      <li class="button left"><input type="reset" value="Back"/></li>
+			      <li class="button left"><input type="submit" value="Finish"/></li>
 			      {% if name %}
-			      <li style="float: right;"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
+			      <li class="button right"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
 			      {% endif %}
 			   </ul>
 		    </div>
+		    <div class="clear"></div>
 		</form>
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.1