diff options
| -rw-r--r-- | coip/apps/name/views.py | 8 | ||||
| -rw-r--r-- | coip/multiresponse.py | 8 | ||||
| -rw-r--r-- | templates/apps/name/name.html | 23 | ||||
| -rw-r--r-- | templates/base.html | 27 | ||||
| -rw-r--r-- | templates/tree.html | 4 |
5 files changed, 37 insertions, 33 deletions
diff --git a/coip/apps/name/views.py b/coip/apps/name/views.py index f4eaf1d..de5c3af 100644 --- a/coip/apps/name/views.py +++ b/coip/apps/name/views.py @@ -118,13 +118,7 @@ def show(request,name): {'text/html': 'apps/name/name.html'}, {'name': name, 'memberships':memberships, - 'invitations':invitations, - 'render': {'delete': name.has_permission(request.user,'d'), - 'insert': name.has_permission(request.user,'i'), - 'edit': name.has_permission(request.user,'w'), - 'invite': name.has_permission(request.user,'i'), - 'up': name.parent and name.parent.has_permission(request.user,'r')} - }) + 'invitations':invitations}) else: return render403() diff --git a/coip/multiresponse.py b/coip/multiresponse.py index d3597ed..a67052c 100644 --- a/coip/multiresponse.py +++ b/coip/multiresponse.py @@ -30,6 +30,14 @@ def make_response_dict(request,d={}): d['user'] = request.user d['profile'] = user_profile(request) + if d.has_key('name'): + name = d['name'] + d['render'] = {'delete': name.has_permission(request.user,'d'), + 'insert': name.has_permission(request.user,'i'), + 'edit': name.has_permission(request.user,'w'), + 'invite': name.has_permission(request.user,'i'), + 'up': name.parent and name.parent.has_permission(request.user,'r')} + return d def json_response(data): diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index 6a5929a..c746e44 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -13,29 +13,6 @@ active: false }); {% endblock %} -{% block tools %} -<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" 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" 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 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 someone to join" href="/name/{{name.id}}/invite"><span class="ui-icon ui-icon-heart"></span></a></li> - {% endif %} - </ul> -</div> -</div> -{% endblock %} {% block content %} {% if name.description %} <div class="ui-widget"> diff --git a/templates/base.html b/templates/base.html index 88198ae..78af32d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -93,7 +93,32 @@ <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 %} + {% block tools %} +{% if name %} +<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" 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" 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 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 someone to join" href="/name/{{name.id}}/invite"><span class="ui-icon ui-icon-heart"></span></a></li> + {% endif %} + <li style="float: right;"><a class="tip" title="Refresh" href="/name/id/{{name.id}}"><span class="ui-icon ui-icon-refresh"></span></a></li> + </ul> +</div> +</div> +{% endif %} +{% endblock %} {% endif %} </div> <div class="clear"></div> diff --git a/templates/tree.html b/templates/tree.html index 0d2e6cd..38ecfac 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -43,14 +43,14 @@ $(function() { {% 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> + <a style="float: left; margin-top: 11px;" class="tip" title="Add Link" href="/name/{{name.id}}/addlink"><span class="ui-icon ui-icon-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> + <span style="margin-left: 1px;" class="ui-icon ui-icon-close"></span></a><div class="clear"></div></li> {% endfor %} </ul> <div class="clear"></div> |