diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/apps/name/name.html | 36 | ||||
| -rw-r--r-- | templates/apps/userprofile/home.html | 10 | ||||
| -rw-r--r-- | templates/base.html | 4 |
3 files changed, 27 insertions, 23 deletions
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index 5dccb60..0e9eeb2 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -17,8 +17,18 @@ {% endblock %} {% block content %} {% if name %} - <h1>{{ name.short }}</h1> - <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel"> + <div class="list-widget"> + <h1 class="pull-left">{{ name.short }}</h1> + {% if render.delete %} + <a class="btn btn-danger pull-right" style="margin-top:5px;margin-left:5px;" href="/name/{{name.id}}/delete"><i class="icon-trash icon-white"></i> Delete group</a> + {% endif %} + +{% if render.edit %} + <a class="btn pull-right" style="margin-top:5px;" href="/name/{{name.id}}/edit"><i class="icon-edit"></i> Edit group</a> + {% endif %} + + <br><br><br> + <p> {% if name.description %} {% autoescape off %} {{name.description|safe}} @@ -26,33 +36,27 @@ {% else %} <em>No description available...</em> {% endif %} - </div> + </p> {% 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><a class="btn" href="/name/{{name.id}}/acl/0">Modify Access</a></li> - {% endif %} - {% if render.edit %} - <li class="btn"><a href="/name/{{name.id}}/edit">Modify</a></li> - {% endif %} - {% if render.delete %} - <li class="btn"><a href="/name/{{name.id}}/delete">Delete</a></li> + <a class="btn" href="/name/{{name.id}}/acl/0">Modify Access</a> {% endif %} {% if render.invite %} - <li class="btn"><a href="/name/{{name.id}}/invite">Invite</a></li> + <a class="btn" href="/name/{{name.id}}/invite">Invite</a> {% endif %} {% if render.invite %} - <li class="btn"><a href="/name/{{name.id}}/join">Add Member</a></li> + <a class="btn" href="/name/{{name.id}}/join">Add Member</a> {% endif %} {% if render.join %} - <li class="btn"><a href="/name/{{name.id}}/join/{{user.username}}">Join</a></li> + <a class="btn" href="/name/{{name.id}}/join/{{user.username}}">Join</a> {% endif %} {% if render.alias %} - <li class="btn"><a href="/user/alias">Add Alias</a></li> + <a class="btn" href="/user/alias">Add Alias</a> {% endif %} - </ul> + {% endif %} {% endif %} + </div> {% if memberships %} <h3>Members</h3> <div id="memberships"> diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html index 6d4228f..7780bb9 100644 --- a/templates/apps/userprofile/home.html +++ b/templates/apps/userprofile/home.html @@ -13,18 +13,18 @@ }) </script> -<div class="hero-unit profile"> +<div class="list-widget"> <div class="left" style="margin-right:30px;"> <a class="gravatar" href="#" title="{{ user.email }}"></a> </div> <h2>{{ profile.display_name }}</h2> <span class="quiet">You are the owner of {{ names|length }} group{{ names|pluralize }} and member of {{ memberships|length }} group{{ memberships|pluralize }}</span><br> <!-- <a href="/user/alias"><i class="icon-user"></i> Add an alias </a> to your identity --> - <br> - + <br><br> </div> +<br><br> <ul class="nav nav-tabs" id="tab"> - <a class="btn right" style="margin-left:30px;margin-right:10px;" href="/name/{{profile.home.id}}/add"><i class="icon-plus"></i> New group</a> + <a class="btn btn-success pull-right" style="margin-left:30px;" href="/name/{{profile.home.id}}/add"><i class="icon-plus icon-white"></i> New group</a> <li class="active"> <a href="#memberships-tab" data-toggle="tab">Memberships</a> </li> @@ -37,7 +37,7 @@ <div id="memberships"> {% for m in memberships.all %} <div class="well group"> - <a href="{{ m.name.url }}"><h3>{{ m.name.shortname }}</h3></a> + <a href="{{ m.name.url }}"><img class="pull-left" style="margin-right:10px" src="/site-media/img/group.png"><h3>{{ m.name.shortname }}</h3></a> <span class="quiet">You became member {{m.timecreated|datehumanize}}</span> {% if m.tags %} <h4>Role{{m.tags|pluralize}}</h4> diff --git a/templates/base.html b/templates/base.html index 0986936..fd490e6 100644 --- a/templates/base.html +++ b/templates/base.html @@ -79,8 +79,8 @@ <a href="/" class="pull-left logo">SUNET Groups</a> {% if user.is_authenticated %} <div class="login pull-right"> - <a class="white-link" href="/user/home">{{user|userdisplay}}</a> - <a class="white-link" href="/accounts/logout">Logout</a> + <a style="margin-right:10px;" class="white-link" href="/user/home">{{user|userdisplay}}</a> + <a class="btn btn-mini" href="/accounts/logout"><i class="icon-off"></i> Logout</a> </div> {% else %} <div class="login pull-right"> |