diff options
| -rw-r--r-- | site-media/css/style.css | 5 | ||||
| -rw-r--r-- | templates/apps/name/name.html | 20 | ||||
| -rw-r--r-- | templates/base.html | 12 | ||||
| -rw-r--r-- | templates/edit.html | 2 | ||||
| -rw-r--r-- | templates/tree.html | 4 |
5 files changed, 23 insertions, 20 deletions
diff --git a/site-media/css/style.css b/site-media/css/style.css index a297d8a..6cbd2a6 100644 --- a/site-media/css/style.css +++ b/site-media/css/style.css @@ -13,10 +13,11 @@ div#footer li { float: left; margin: 0 0.15em} .description { inherit: none; margin-bottom: 10px;} div#headline{ font: 300% "Trebuchet MS", sans-serif; margin-bottom: 20px;} .name { font: 100% "Trebuchet MS", sans-serif; margin-top: 5px;} -div.toolbar{ padding: 4px; float: right; margin-right: 10px; margin-top: 6px; margin-bottom: 20px;} +div.toolbar{ padding: 4px; float: right; margin-right: 50px; margin-top: 6px; margin-bottom: 20px;} div#left { float: left; width: 30%; padding-left: 5px; } -div#right { float: right; width: 65%; padding-left: 20px; border-left: 1px solid #CECECE; } +div#right { float: right; width: 65%; padding-left: 20px; height: 400px; } div#related { position: absolute; bottom: 30%;} +div#description { border-bottom: 1px solid #CECECE; } 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; } diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index d7be379..dce2028 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -18,12 +18,10 @@ <h1>This is the top of the namespace</h1> {% endif %} {% if name.description %} - <div class="ui-widget"> - <div class="ui-state-highlight ui-corner-all infopanel"> - {% autoescape off %} - <p class="description">{{name.description|safe}}</p> - {% endautoescape %} - </div> + <div id="description" class="ui-widget infopanel"> + {% autoescape off %} + <p class="description">{{name.description|safe}}</p> + {% endautoescape %} </div> {% endif %} {% if memberships and render.invite %} @@ -34,6 +32,8 @@ <h3 class="listheader">{{m.user|lastidentifier}}</h3> <div>{{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}}.</div> </div> + {% empty %} + <p>No members yet...</p> {% endfor %} </div> {% endif %} @@ -44,14 +44,14 @@ <div id="m{{m.id}}"> <h3 class="listheader">{{i.email}}</h3> <div> - <div class="navlist" style="margin-top: -10px;"> + <div>{{i.email}} was invited to {{i.name.shortname}} {{i.timecreated|datehumanize}} by {{i.inviter}}.</div> + <div class="navlist" style="margin-top: 10px;"> <ul> - <li style="float: right;"><a class="tip" title="Cancel invitation" href="/invitation/{{i.id}}/cancel"><span class="ui-icon ui-icon-trash"></span></a></li> - <li style="float: right;"><a class="tip" title="Resend invitation" href="/invitation/{{i.id}}/resend"><span class="ui-icon ui-icon-mail-closed"></span></a></li> + <li class="button"><a href="/invitation/{{i.id}}/cancel">Cancel</a></li> + <li class="button"><a href="/invitation/{{i.id}}/resend">Resend</a></li> </ul> </div> <div class="clear"></div> - <div>{{i.email}} was invited to {{i.name.shortname}} {{i.timecreated|datehumanize}} by {{i.inviter}}.</div> </div> </div> {% empty %} diff --git a/templates/base.html b/templates/base.html index 9716e8e..a212afb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -61,8 +61,10 @@ <div id="container"> <div id="header"> {% if name %} - <div style="float: left;" class="button toolbar"> - <a class="tip" title="This is the full name of the group. This is the name that will be exposed to applications." href="/name/id/{{name.id}}">{{ name }}</a> + <div style="float: left;" class="navlist toolbar"> + <ul> + <li class="button"><a class="tip" title="This is the full name of the group. This is the name that will be exposed to applications." href="/name/id/{{name.id}}">{{ name }}</a></li> + </ul> </div> {% endif %} {% if user.is_authenticated %} @@ -75,6 +77,9 @@ {% if name %} <div class="navlist toolbar"> <ul> + {% if render.add %} + <li class="button"><a href="/name/{{name.id}}/add">New Group</a></li> + {% endif %} {% if render.acl %} <li class="button"><a href="/name/{{name.id}}/link/0">Modify Access</a></li> {% endif %} @@ -84,9 +89,6 @@ {% if render.delete %} <li class="button"><a href="/name/{{name.id}}/delete">Delete</a></li> {% endif %} - {% if render.add %} - <li class="button"><a href="/name/{{name.id}}/add">New Group</a></li> - {% endif %} {% if render.invite %} <li class="button"><a href="/name/{{name.id}}/invite">Invite</a></li> {% endif %} diff --git a/templates/edit.html b/templates/edit.html index 404751a..f4fb52a 100644 --- a/templates/edit.html +++ b/templates/edit.html @@ -7,7 +7,7 @@ {% block beforeform %} {% endblock %} <form method="POST"> - <div class="ui-widget-content ui-corner-all infopanel"> + <div class="infopanel"> <h1>{{formtitle}}</h1> <table class="formtable"> {% for field in form %} diff --git a/templates/tree.html b/templates/tree.html index f7a18cb..8bcdfd9 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -41,7 +41,7 @@ $(function() { {% endif %} <div id="jstree"></div> </div> - <div id="related"> + <!-- div id="related"> {% if name and name.links %} <h3 style="float: left;">Related resources</h3> {% if render.edit %} @@ -58,7 +58,7 @@ $(function() { </ul> <div class="clear"></div> {% endif %} - </div> + </div --> </div> <div id="right"> {% block content %}{% endblock %} |