diff options
Diffstat (limited to 'templates')
-rw-r--r-- | templates/apps/name/edit.html | 11 | ||||
-rw-r--r-- | templates/apps/name/name.html | 6 | ||||
-rw-r--r-- | templates/base.html | 2 |
3 files changed, 14 insertions, 5 deletions
diff --git a/templates/apps/name/edit.html b/templates/apps/name/edit.html index bb39478..d18cbec 100644 --- a/templates/apps/name/edit.html +++ b/templates/apps/name/edit.html @@ -28,14 +28,19 @@ $(function() { {% block title %}COIP{% if name %} - {{name.shortname}}{% endif %}{% endblock %} {% block main %} <div style="float: left; width: 30%;"> - {% if name and name.parent %} + {% if name %} + {% 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> </div> <div style="float: right; width: 60%; padding-left: 20px;"> <form method="POST"> - <div class="ui-widget-content ui-corner-all infopanel" + <div class="ui-widget-content ui-corner-all infopanel"> + <h3>{{formtitle}}</h3> <table> {% for field in form %} <tr> @@ -52,7 +57,7 @@ $(function() { </div> <br/> <div class="button"> - <input type="submit" value="Update" /> + <input type="submit" value="{{submitname}}" /> <input type="button" onClick="document.location='/name/id/{{name.id}}'" value="Cancel"/> </div> </form> diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index 6ef3e91..bc20cd6 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -28,8 +28,12 @@ $(function() { {% block title %}COIP{% if name %} - {{name.shortname}}{% endif %}{% endblock %} {% block main %} <div style="float: left; width: 30%;"> - {% if name and name.parent %} + {% if name %} + {% 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> </div> diff --git a/templates/base.html b/templates/base.html index 18172d3..164f67a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -89,7 +89,7 @@ <div style="float: right; margin-right: 50px;" class="button"><a id="logout" href="/auth/logout/">Logout</a></div> <div id="linklist"> <ul> - <li><a href="/user"><span class="ui-icon ui-icon-locked" style="float: left;"></span>{{ profile.display_name }}</a></li> + <li><a href="/user/home"><span class="ui-icon ui-icon-locked" style="float: left;"></span>{{ profile.display_name }}</a></li> </ul> </div> {% endif %} |