diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/apps/name/name.html | 25 | ||||
| -rw-r--r-- | templates/base.html | 14 | ||||
| -rw-r--r-- | templates/tree.html | 27 |
3 files changed, 30 insertions, 36 deletions
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index eea1796..93b5fa7 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -16,9 +16,7 @@ }); {% endblock %} {% block content %} - {% if not name %} - <h1>This is the top of the namespace</h1> - {% endif %} + {% if name.description or render.acl or render.edit or render.delete or render.invite or render.join %} <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel"> {% if name.description %} {% autoescape off %} @@ -45,37 +43,36 @@ {% endif %} {% if render.join %} <li class="button"><a href="/name/{{name.id}}/join/{{user.username}}">Join</a></li> - {% endif %} - + {% endif %} </ul> </div> + {% endif %} <div class="clear"></div> </div> - {% endif %} - {% if memberships and render.invite %} + {% if memberships %} <h3>Members</h3> <div id="memberships"> {% for m in memberships.all %} <div id="m{{m.id}}" class="{{m.status}}"> - <h3 class="listheader">{{m.user|lastidentifier}}</h3> + <h3 class="listheader">{{m|memberdisplay}}</h3> <div> <div> - {{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}} + {{m|memberdisplay}} became a member of {{name.shortname}} {{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> - {% if render.edit %} + {% if render.edit and m.user %} <!-- only allow roles for users right now --> <li><a href="/tag/membership/{{m.id}}/modify">Modify Roles</a></li> {% endif %} - {% if render.kick %} + {% if render.kick and m.user %} <!-- only allow removing members for users right now --> <li><a href="/name/{{name.id}}/leave/{{m.user.username}}">{% if m.user == user %}Leave{% else %}Remove from{% endif %} Group</a></li> {% endif %} </ul> </div> - <div class="clear"></div> + <!-- div class="clear"></div--> </div> </div> {% empty %} @@ -97,7 +94,7 @@ <li class="button"><a href="/invitation/{{i.id}}/resend">Resend</a></li> </ul> </div> - <div class="clear"></div> + <!-- div class="clear"></div --> </div> </div> {% empty %} diff --git a/templates/base.html b/templates/base.html index 64024e4..f9ea8fb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -25,7 +25,7 @@ <script type="text/javascript" src="/site-media/js/jquery.form.wizard-3.0.4.js"></script> <script type="text/javascript" src="/site-media/js/tag-it.js"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>{% block title %}{% endblock %}</title> + <title>COIP{% if name %} - {{name.shortname}}{% else %} - top{% endif %}</title> <script type="text/javascript"> $(function() { $("input:submit, input:reset, input:button, a",".button").button(); @@ -63,7 +63,7 @@ <div id="container"> <div id="header"> {% if name %} - <div style="float: left;" class="navlist toolbar"> + <div style="float: left;" class="navlist"> <ul> {% if render.add %} <li class="button"><a href="/name/{{name.id}}/add">Add Group</a></li> @@ -73,14 +73,14 @@ </div> {% endif %} {% if user.is_authenticated %} - <div class="navlist toolbar"> + <div class="navlist"> <ul> <li class="button"><a id="logout" href="/accounts/logout">Logout</a></li> </ul> </div> {% endif %} {% if noname %} - <div class="navlist toolbar"> + <div class="navlist"> <ul> {% if render.acl %} <li class="button"><a href="/name/{{name.id}}/link/0">Modify Access</a></li> @@ -100,11 +100,7 @@ <div class="clear"></div> </div> <div id="content"> - <div id="headline">{% block headline %}{% endblock %}</div> - <div id="main"> - {% block main %}{% endblock %} - </div> - <div class="clear"></div> + {% block main %}{% endblock %} </div> <div id="footer"> <ul> diff --git a/templates/tree.html b/templates/tree.html index 8e4dddc..144a668 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -25,12 +25,10 @@ $(function() { }); </script> {% endblock %} -{% block headline %} -<!-- a style="text-decoration: none" href="{% if name %}/name/id/{{name.id}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}Top{% endif %}</a--> -{% endblock %} -{% block title %}COIP{% if name %} - {{name.shortname}}{% else %} - top{% endif %}{% endblock %} {% block main %} -<div id="left"> +<div class="leftright"> +<ul> +<li style="width: 35%"> <div id="tree"> <div class="ilist"> <ul> @@ -45,7 +43,7 @@ $(function() { </ul> </div> <div class="clear"></div> - <div id="jstree"></div> + <div class="ui-helper-reset" id="jstree"></div> </div> <!-- div id="related"> {% if name and name.links %} @@ -65,11 +63,14 @@ $(function() { <div class="clear"></div> {% endif %} </div --> -</div> -<div id="right"> -<div id="headline"> -<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}{% endif %}</a> -</div> -{% block content %}{% endblock %} -</div> +</li> +<li style="margin-left: 10px; width: 59%;"> + <div id="headline"> + <a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}Top of the namespace{% endif %}</a> + </div> + <div> + {% block content %}{% endblock %} + </div> +</li> +</ul> {% endblock %}
\ No newline at end of file |