summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-06-14 01:14:42 +0200
committerLeif Johansson <leifj@sunet.se>2011-06-14 01:14:42 +0200
commit682ccd855f9c76455ff61da869a9db40d06922c6 (patch)
tree75e745dc5d5eb0cc6ae8ef317e209cef7e8e031d
parente4534a199d60c87e02a12bb1067361b6a3f4c108 (diff)
list style polish
-rw-r--r--site-media/css/style.css17
-rw-r--r--templates/apps/name/acls.html5
-rw-r--r--templates/apps/name/name.html30
-rw-r--r--templates/edit_fieldsets.html2
4 files changed, 27 insertions, 27 deletions
diff --git a/site-media/css/style.css b/site-media/css/style.css
index ae1ef8a..beeb481 100644
--- a/site-media/css/style.css
+++ b/site-media/css/style.css
@@ -16,14 +16,19 @@ 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 ul { list-style: none; margin: 0, padding 0; }
-.ilist li { display: inline-block; margin: 0, padding 0;}
+
+ul.ilist { list-style: none inside; margin: 0; padding 0; padding-left: 0px}
+.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; }
-.clist li { display: list-item; }
+
+ul.rlist { list-style: none inside; padding: 0; margin: 0; padding-left: 0px}
+.rlist li { float: right; display: inline; padding: 0; margin: 0; }
+
+ul.clist { list-style: none; padding: 0; margin: 0;}
+.clist li { display: list-item; padding: 0; margin: 0;}
+
.nlist ul { list-style: none; }
.nlist li { display: list-item; list-style: none; }
.square li { list-style: none inside none; }
diff --git a/templates/apps/name/acls.html b/templates/apps/name/acls.html
index 32c47c4..28a8f1c 100644
--- a/templates/apps/name/acls.html
+++ b/templates/apps/name/acls.html
@@ -24,13 +24,10 @@
</div>
{% endfor %}
</div>
-<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 class="button" 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 class="clear"></div>
-</div>
{% endblock %} \ No newline at end of file
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index 93b5fa7..eb57b58 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -16,16 +16,18 @@
});
{% endblock %}
{% block content %}
- {% if name.description or render.acl or render.edit or render.delete or render.invite or render.join %}
- <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel">
- {% if name.description %}
- {% autoescape off %}
- <p class="description">{{name.description|safe}}</p>
- {% endautoescape %}
- {% endif %}
- {% if name %}
- <div class="rlist">
- <ul>
+ {% if name %}
+ <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel">
+ {% if name.description %}
+ {% autoescape off %}
+ {{name.description|safe}}
+ {% endautoescape %}
+ {% else %}
+ <em>No description available...</em>
+ {% endif %}
+ </div>
+ {% if render.acl or render.edit or render.delete or render.invite or render.join %}
+ <ul class="ilist" style="margin-top: 10px;">
{% if render.acl %}
<li class="button"><a href="/name/{{name.id}}/acl/0">Modify Access</a></li>
{% endif %}
@@ -44,11 +46,8 @@
{% if render.join %}
<li class="button"><a href="/name/{{name.id}}/join/{{user.username}}">Join</a></li>
{% endif %}
- </ul>
- </div>
- {% endif %}
- <div class="clear"></div>
- </div>
+ </ul>
+ {% endif %}
{% endif %}
{% if memberships %}
<h3>Members</h3>
@@ -72,7 +71,6 @@
{% endif %}
</ul>
</div>
- <!-- div class="clear"></div-->
</div>
</div>
{% empty %}
diff --git a/templates/edit_fieldsets.html b/templates/edit_fieldsets.html
index c3eb01e..f0ab8cb 100644
--- a/templates/edit_fieldsets.html
+++ b/templates/edit_fieldsets.html
@@ -30,7 +30,7 @@
</ul>
</fieldset>
{% endfor %}
- <ul class="ilist" style="padding-bottom: 30px; padding-top: 5px;">
+ <ul class="ilist" style="padding-bottom: 30px; padding-top: 5px; padding-left: 0px;">
<li class="button left"><input type="reset" value="Back"/></li>
<li class="button left"><input type="submit" value="Finish"/></li>
{% if name %}