diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/apps/userprofile/home.html | 4 | ||||
| -rw-r--r-- | templates/base.html | 42 | ||||
| -rw-r--r-- | templates/tree.html | 6 |
3 files changed, 34 insertions, 18 deletions
diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html index 147632b..3ac26b6 100644 --- a/templates/apps/userprofile/home.html +++ b/templates/apps/userprofile/home.html @@ -28,7 +28,7 @@ <div> You became a member of <a href="{{m.name.url}}">{{m.name.shortname}}</a> {{m.timecreated|datehumanize}} {% if m.tags %}<h4>Role{{m.tags|pluralize}}</h4> - <ul class="clist">{% for tag in m.tags %}<li>{{ tag|escape }}</li>{%endfor%}</ul>{%endif%} + <ul class="clist">{% for tag in m.tags %}<li>{{ tag|escape }}</li>{%endfor%}</ul>{%endif%} </div> <div class="rlist button"> <ul> @@ -55,7 +55,7 @@ <div id="n{{n.id}}"> <h3 class="listheader">{{n.shortname}}</h3> <div> - <a href="/name/id/{{n.id}}">{{n.shortname}}</a> was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}}. + <a href="/name/{{n.url}}">{{n.shortname}}</a> was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}} and has {{n.memberships|length}} member{{n.memberships|pluralize}}. </div> </div> {% empty %} diff --git a/templates/base.html b/templates/base.html index 5440afc..8a413f0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,15 +1,15 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> - <link type="text/css" href="/site-media/css/flick/jquery-ui-1.8.10.custom.css" rel="stylesheet" /> + <link type="text/css" href="/site-media/css/ui-lightness/jquery-ui-1.8.13.custom.css" rel="stylesheet" /> <!-- link type="text/css" href="/site-media/css/jquery.jnotify.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/jquery.tooltip.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/jquery.multiselect2side.css" rel="stylesheet" /--> <link type="text/css" href="/site-media/css/jquery.ui.autocomplete.custom.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/jquery.wysiwyg.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/style.css" rel="stylesheet"/> - <script type="text/javascript" src="/site-media/js/jquery-1.4.4.min.js"></script> - <script type="text/javascript" src="/site-media/js/jquery-ui-1.8.10.custom.min.js"></script> + <script type="text/javascript" src="/site-media/js/jquery-1.5.1.min.js"></script> + <script type="text/javascript" src="/site-media/js/jquery-ui-1.8.13.custom.min.js"></script> <script type="text/javascript" src="/site-media/js/jquery.tooltip.pack.js"></script> <script type="text/javascript" src="/site-media/js/jquery.gravatar.js"></script> <script type="text/javascript" src="/site-media/js/md5.js"></script> @@ -59,14 +59,13 @@ {% block js %}{% endblock %} </head> <body> -<div id="notification"></div> <div id="container"> <div id="header"> {% if name %} <div class="navlist left"> <ul> {% if render.add %} - <li class="button"><a href="/name/{{name.id}}/add">Add Group</a></li> + <li class="button"><a href="/name/{{name.id}}/add">Create New Group</a></li> {% endif %} <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.url}}">{{ name }}</a></li> </ul> @@ -78,7 +77,7 @@ <li class="button"><a id="logout" href="/accounts/logout">Logout</a></li> </ul> <ul> - <li class="button"><a id="dashboard" href="/user/home">Dashboard</a></li> + <li class="button"><a id="dashboard" href="/user/home">My Dashboard</a></li> </ul> </div> {% endif %} @@ -104,15 +103,32 @@ </div> <div id="content"> {% block main %}{% endblock %} + <div class="clear"></div> </div> <div id="footer"> - <ul> - <li><a href="#about">About COIP</a></li> - <li><a href="#about">Terms Of Use</a></li> - </ul> - <ul style="float: right;"> - <li><a href="/user/home">Logged in as {{ profile.display_name }} ({{ profile.identifier }})</a></li> - </ul> + <ul> + <li> + <ul> + <li><h3>Users</h3></li> + <li><a href="/user/home">Logged in as {{ profile.display_name }} ({{ profile.identifier }})</a></li> + <li><a class="tip" title="Logout" id="logout" href="/accounts/logout/">Logout</a></li> + </ul> + </li> + <li> + <ul> + <li><h3>Support</h3></li> + <li><a class="tip" title="SUNET" href="http://www.sunet.se">SUNET</a></li> + <li><a class="tip" title="SUNET Community Support" href="http://community.sunet.se">SUNET Community Support</a></li> + <li><a href="#about">About COIP</a></li> + <li><a href="#about">Terms Of Use</a></li> + </ul> + </li> + <li> + <ul> + <li><h3>Developers</h3></li> + </ul> + </li> + </ul> </div> </div> </body> diff --git a/templates/tree.html b/templates/tree.html index bc8b5fd..f925165 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -35,9 +35,9 @@ $(function() { <li><b>{{ prefix_url }}</b></li> {% if name and render.up %} {% if name.parent %} - <li><a href="{{name.parent.url}}"><div class="ui-icon ui-icon-arrowreturnthick-1-w"></div></a></li> + <li><a class="tip" title="Up one level" href="{{name.parent.url}}"><span style="vertical-align: bottom;" class="ui-icon ui-icon-arrowthick-1-n"></span></a></li> {% else %} - <li><a href="/name"><div class="ui-icon ui-icon-arrowreturnthick-1-w"></div></a></li> + <li><a class="tip" title="Up one level" href="/name"><span style="vertical-align: bottom;" class="ui-icon ui-icon-arrowthickstop-1-n"></span></a></li> {% endif %} {% endif %} </ul> @@ -64,7 +64,7 @@ $(function() { {% endif %} </div --> </li> -<li style="margin-left: 10px; width: 59%;"> +<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> |