diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/apps/link/edit.html | 1 | ||||
| -rw-r--r-- | templates/apps/name/name.html | 11 | ||||
| -rw-r--r-- | templates/base.html | 11 | ||||
| -rw-r--r-- | templates/tree.html | 35 |
4 files changed, 40 insertions, 18 deletions
diff --git a/templates/apps/link/edit.html b/templates/apps/link/edit.html new file mode 100644 index 0000000..ab833ad --- /dev/null +++ b/templates/apps/link/edit.html @@ -0,0 +1 @@ +{% extends "edit.html" %}
\ No newline at end of file diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index 3711d17..6a5929a 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -17,17 +17,20 @@ <div class="ui-widget ui-state-default ui-corner-all" style="padding: 4px; float: left; margin-left: 10px; margin-top: 6px; margin-bottom: 20px;"> <div class="navlist"> <ul> + {% if render.edit %} + <li style="float: right;"><a class="tip" title="Modify access rights" href="/name/{{name.id}}/editacl"><span class="ui-icon ui-icon-unlocked"></span></a></li> + {% endif %} {% if render.edit %} - <li style="float: right;"><a class="tip" title="Modify this name" href="/name/{{name.id}}/edit"><span class="ui-icon ui-icon-wrench"></span></a></li> + <li style="float: right;"><a class="tip" title="Modify" href="/name/{{name.id}}/edit"><span class="ui-icon ui-icon-wrench"></span></a></li> {% endif %} {% if render.delete %} - <li style="float: right;"><a class="tip" title="Permanently remove this name" href="/name/{{name.id}}/delete"><span class="ui-icon ui-icon-trash"></span></a></li> + <li style="float: right;"><a class="tip" title="Permanently remove this" href="/name/{{name.id}}/delete"><span class="ui-icon ui-icon-trash"></span></a></li> {% endif %} {% if render.insert %} - <li style="float: right;"><a class="tip" title="Create a new name below this one" href="/name/{{name.id}}/add"><span class="ui-icon ui-icon-plusthick"></span></a></li> + <li style="float: right;"><a class="tip" title="Create child" href="/name/{{name.id}}/add"><span class="ui-icon ui-icon-plusthick"></span></a></li> {% endif %} {% if render.invite %} - <li style="float: right;"><a class="tip" title="Invite user" href="/name/{{name.id}}/invite"><span class="ui-icon ui-icon-heart"></span></a></li> + <li style="float: right;"><a class="tip" title="Invite someone to join" href="/name/{{name.id}}/invite"><span class="ui-icon ui-icon-heart"></span></a></li> {% endif %} </ul> </div> diff --git a/templates/base.html b/templates/base.html index ab645b3..88198ae 100644 --- a/templates/base.html +++ b/templates/base.html @@ -90,11 +90,8 @@ <div id="header"> <div id="headline">{% block headline %}{% endblock %}</div> {% if user.is_authenticated %} - <div style="float: right; margin-right: 50px;" class="button"><a id="logout" href="/auth/logout/">Logout</a></div> - <div id="linklist"> - <ul> - <li style="margin-top: 5px;"><a href="/user/home"><span class="ui-icon ui-icon-locked" style="float: left;"></span>{{ profile.display_name }}</a></li> - </ul> + <div class="ui-widget ui-state-default ui-corner-all" style="padding: 4px; float: right; margin-right: 10px; margin-top: 6px; margin-bottom: 20px;"> + <a title="Logout" class="tip" id="logout" href="/auth/logout/"><span class="ui-icon ui-icon-power"></span></a> </div> {% block tools %}{% endblock %} {% endif %} @@ -110,7 +107,9 @@ <ul> <li><a href="#about">About COIP</a></li> <li><a href="#about">Terms Of Use</a></li> - <li><a href="#about">System Status</a></li> + </ul> + <ul style="float: right;"> + <li><a href="/user/home">Logged in as {{ profile.display_name }} ({{ profile.identifier }})</a></li> </ul> </div> </body> diff --git a/templates/tree.html b/templates/tree.html index d1bf05d..0d2e6cd 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -29,14 +29,33 @@ $(function() { {% block main %} {% if name %} <div style="float: left; width: 30%;"> - {% if name and render.up %} - {% if name.parent %} - <a href="/name/id/{{name.parent.id}}">.. (up one level)</a> - {% else %} - <a href="/name">.. (up one level)</a> - {% endif %} - {% endif %} - <div style="height: 100%;" id="tree"></div> + <span> + {% if name and render.up %} + {% if name.parent %} + <a href="/name/id/{{name.parent.id}}">.. (up one level)</a> + {% else %} + <a href="/name">.. (up one level)</a> + {% endif %} + {% endif %} + <div id="tree"></div> + </span> + <span> + {% 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-circle-plus"></span></a> + {% endif %} + <div class="clear"></div> + <ul style="list-style: none;"> + {% for link in name.links.all %} + <li><a class="tip" style="float:left; margin-right: 5px;" title="{{link.text}}" href="{{link.url}}">{{link.text}}</a> + <a class="tip" style="float:left;" title="Remove link" href="/link/{{link.id}}/remove"> + <span style="margin-left: 1px;" class="ui-icon ui-icon-circle-minus"></span></a><div class="clear"></div></li> + {% endfor %} + </ul> + <div class="clear"></div> + {% endif %} + </span> </div> {% endif %} <div style="float: right; width: 65%; padding-left: 10px;"> |