style polish

3 files changed, 54 insertions, 61 deletions

diff --git a/site-media/css/style.css b/site-media/css/style.css
index 5432e6a..ae1ef8a 100644
--- a/site-media/css/style.css
+++ b/site-media/css/style.css
@@ -16,11 +16,10 @@ div#headline{ font-size: 300%; margin-bottom: 20px;}
 h3.listheader { padding-left: 20px; }
 .navlist ul { list-style: none; padding: 0; margin: 0; font-size: 90%; }
 .navlist li { float: right; display: inline;}
-.ilist { padding: 0px; margin: 0px; }
-.ilist ul { list-style: none; }
-.ilist li { display: inline-block; }
-.leftright ul { display: inline; list-style: none inside; padding: 0px; }
-.leftright li { display: inline-block; padding: 0px; vertical-align: top; }
+.ilist ul { list-style: none; margin: 0, padding 0; }
+.ilist li { display: inline-block; margin: 0, padding 0;}
+ul.leftright { padding: 0px; margin: 0px; }
+li.leftright { display: inline-block; list-style: none inside; 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; }
@@ -43,24 +42,25 @@ div.toolbar{ padding: 4px; float: right; margin-right: 30px; margin-bottom: 20px
 .code{font: 110% "Courier", fixed}
 .infopanel { padding: 1em 2.2em; }
 div .hidden {visibility:hidden;}
-form .ui-widget ul,ol { list-style: none inside; padding: 0; margin: 0; }
-form .ui-widget li { float: right; border-right: 1px solid #CECECE; padding-right: 5px; margin: 0; vertical-align: middle;}
+form fieldset ul,ol { list-style: none inside; padding: 0; margin: 0; }
 form fieldset legend { font-size: 120%; font-weight: bold; padding: 5px; }
 form fieldset { margin-left: 20px; }
 form fieldset input[type=text] { height: 25px; }
-form fieldset label {font-weight: bold; }
+form fieldset label { font-weight: bold;}
+.fieldinput ul { list-style: none inside; padding: 0; margin: 0; }
+.fieldinput li { padding: 0; margin: 0; display: inline; float: left; }
+ul.inputs { list-style: none inside; padding: 0; margin: 0; }
+li.inputs { padding: 0; margin: 0; margin-top: 10px;}
+
 .error { padding: 5px; }
 ul.links { list-style: none inside; padding: 0; margin: 0; }
 li.links { padding: 0; margin: 0; }
-form .ui-widget ul { list-style: none inside; padding: 0; margin: 0; }
-form .ui-widget li { float: right; border-right: 1px solid #CECECE; padding-right: 5px; margin: 0; vertical-align: middle;}
+#form .ui-widget ul { list-style: none inside; padding: 0; margin: 0; }
+#form .ui-widget li { float: right; border-right: 1px solid #CECECE; padding-right: 5px; margin: 0; vertical-align: middle;}
 .ui-icon { display: inline-block !important; }
 .minipanel { padding-top: 5px; padding-bottom: 5px; padding-left: 6px; padding-right: 6px; }
 .right  { float: right; }
 .left { float: left; }
-.fieldinput ul { list-style: none inside; padding: 0; margin: 0; }
-.fieldinput li { padding: 0; margin: 0; display: inline; float: left; }
-div .fieldinput { margin-top: 10px; }
 a, a:hover, a:visited {
 	color: #E37424;
 	text-decoration: none;
diff --git a/templates/edit_fieldsets.html b/templates/edit_fieldsets.html
index f35f055..c3eb01e 100644
--- a/templates/edit_fieldsets.html
+++ b/templates/edit_fieldsets.html
@@ -14,12 +14,12 @@
 				  {% if fieldset.description %}
 				  <p class="description">{{ fieldset.description }}</p>
 				  {% endif %}
-				  <ul class="links">
+				  <ul class="inputs">
 				  {% for field in fieldset %}
 				    {% if field.is_hidden %}
 				      {{ field }}
 				    {% else %}
-				      <li class="links {% if field.field.required %}required{% endif %}" {{ field.row_attrs }}>
+				      <li class="inputs {% if field.field.required %}required{% endif %}" {{ field.row_attrs }}>
 				        {{ field.errors }}
 				        <label for="id_{{ field.html_name }}" class="fieldlabel">{{ field.label }}
                         {% if field.field.required %}<b>*</b>{% endif %}</label>
@@ -30,15 +30,12 @@
 				  </ul>
 			  </fieldset>
 			{% endfor %}
-			<div class="ilist" style="padding-bottom: 30px; padding-top: 5px;">
-			   <ul>
-			      <li class="button left"><input type="reset" value="Back"/></li>
-			      <li class="button left"><input type="submit" value="Finish"/></li>
-			      {% if name %}
-			      <li class="button right"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
-			      {% endif %}
-			   </ul>
-		    </div>
-		    <div class="clear"></div>
+		   <ul class="ilist" style="padding-bottom: 30px; padding-top: 5px;">
+		      <li class="button left"><input type="reset" value="Back"/></li>
+		      <li class="button left"><input type="submit" value="Finish"/></li>
+		      {% if name %}
+		      <li class="button right"><input type="button" onClick="document.location='{{name.url}}'" value="Cancel"/></li>
+		      {% endif %}
+		   </ul>
 		</form>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/tree.html b/templates/tree.html
index f925165..9fab51b 100644
--- a/templates/tree.html
+++ b/templates/tree.html
@@ -26,12 +26,10 @@ $(function() {
 </script>
 {% endblock %}
 {% block main %}
-<div class="leftright">
-<ul>
-<li style="width: 35%">
-   <div id="tree">
-    	<div class="ilist">
-	    	<ul>
+<ul class="leftright">
+	<li class="leftright" style="width: 35%">
+	   <div class="ui-helper-reset" id="tree">
+	    	<ul class="ilist" style="padding-left: 0px;">
 		        <li><b>{{ prefix_url }}</b></li>
 				{% if name and render.up %}
 				{% if name.parent %}
@@ -41,36 +39,34 @@ $(function() {
 				{% endif %}
 				{% endif %}
 			</ul>
+			<div class="ui-helper-reset" id="jstree"></div>
+	   </div>
+	   <!-- div id="related">
+	   		{% if name and name.links %}
+	   		<h3 style="float: left;">Related resources</h3>
+	   		{% if render.edit %}
+	   		<a style="float: left; margin-top: 11px;" class="tip" title="Add Link" href="/name/{{name.id}}/addlink"><span class="ui-icon ui-icon-plus"></span></a>
+	   		{% endif %}
+	   		<div class="clear"></div>
+	   		<ul class="links"">
+	   		{% for link in name.links.all %}
+	   		   <li>
+	   		      <a class="tip" title="{{link.text}}" href="{{link.url}}">{{link.text}}</a>
+	   		      <a class="tip" title="Remove link" href="/link/{{link.id}}/remove"><span class="ui-icon ui-icon-close" style="float: right; clear: both;"></span></a>
+	   		   </li>
+	   		{% endfor %}
+	   		</ul>
+	   		<div class="clear"></div>
+	   		{% endif %}
+	   </div -->
+	</li>
+	<li class="leftright" style="margin-bottom: 80px; margin-left: 10px; width: 59%;">
+		<div id="headline">
+			<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/user/home{% endif %}">{% if name %}{{name.shortname}}{% else %}Dashboard{% endif %}</a>
 		</div>
-		<div class="clear"></div>
-		<div class="ui-helper-reset" id="jstree"></div>
-   </div>
-   <!-- div id="related">
-   		{% if name and name.links %}
-   		<h3 style="float: left;">Related resources</h3>
-   		{% if render.edit %}
-   		<a style="float: left; margin-top: 11px;" class="tip" title="Add Link" href="/name/{{name.id}}/addlink"><span class="ui-icon ui-icon-plus"></span></a>
-   		{% endif %}
-   		<div class="clear"></div>
-   		<ul class="links"">
-   		{% for link in name.links.all %}
-   		   <li>
-   		      <a class="tip" title="{{link.text}}" href="{{link.url}}">{{link.text}}</a>
-   		      <a class="tip" title="Remove link" href="/link/{{link.id}}/remove"><span class="ui-icon ui-icon-close" style="float: right; clear: both;"></span></a>
-   		   </li>
-   		{% endfor %}
-   		</ul>
-   		<div class="clear"></div>
-   		{% endif %}
-   </div -->
-</li>
-<li style="margin-bottom: 80px; margin-left: 10px; width: 59%;">
-	<div id="headline">
-		<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/user/home{% endif %}">{% if name %}{{name.shortname}}{% else %}Dashboard{% endif %}</a>
-	</div>
-	<div>
-    	{% block content %}{% endblock %}
-    </div>
-</li>
+		<div>
+	    	{% block content %}{% endblock %}
+	    </div>
+	</li>
 </ul>
 {% endblock %}
\ No newline at end of file