diff options
Diffstat (limited to 'templates/apps')
| -rw-r--r-- | templates/apps/membership/edit.html | 10 | ||||
| -rw-r--r-- | templates/apps/name/name.html | 12 | ||||
| -rw-r--r-- | templates/apps/userprofile/addalias.html | 18 | ||||
| -rw-r--r-- | templates/apps/userprofile/cert.html | 13 | ||||
| -rw-r--r-- | templates/apps/userprofile/home.html | 2 | ||||
| -rw-r--r-- | templates/apps/userprofile/sshkey.html | 13 |
6 files changed, 57 insertions, 11 deletions
diff --git a/templates/apps/membership/edit.html b/templates/apps/membership/edit.html index 06d033b..f77cd7f 100644 --- a/templates/apps/membership/edit.html +++ b/templates/apps/membership/edit.html @@ -4,11 +4,11 @@ validationEnabled: true, focusFirstInput: true, textSubmit: "Finish", - validationOptions: { - rules: { - username: 'validUser' - } - } + //validationOptions: { + // rules: { + // username: 'validUser' + // } + //} }); $('#id_username').autocomplete({ source: "/user/search.json", diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index cf3e7ee..e366dc1 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -16,7 +16,6 @@ }); {% endblock %} {% block content %} - <h2>Summary</h2> {% if name %} <div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel"> {% if name.description %} @@ -47,6 +46,9 @@ {% if render.join %} <li class="button"><a href="/name/{{name.id}}/join/{{user.username}}">Join</a></li> {% endif %} + {% if render.alias %} + <li class="button"><a href="/user/alias">Add Alias</a></li> + {% endif %} </ul> {% endif %} {% endif %} @@ -54,7 +56,7 @@ <h3>Members</h3> <div id="memberships"> {% for m in memberships.all %} - <div id="m{{m.id}}" class="{{m.status}}"> + <div id="m{{m.id}}" class="{{m.status}} {{m.type}}"> <h3 class="listheader">{{m|memberdisplay}}</h3> <div> <div> @@ -62,13 +64,13 @@ {% if m.tags %}<h4>Role{{m.tags|pluralize}}</h4> <ul class="ilist">{% for tag in m.tags %}<li style="padding: 2px;">{{ tag|escape }}</li>{%endfor%}</ul>{%endif%} </div> - <div class="rlist button"> + <div class="ilist" style="margin-top: 10px;" class="{{m.type}}"> <ul> {% 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> + <li class="button right"><a href="/tag/membership/{{m.id}}/modify">Modify Roles</a></li> {% endif %} {% 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> + <li class="button right"><a href="/name/{{name.id}}/leave/{{m.user.username}}">{% if m.user == user %}Leave{% else %}Remove from{% endif %} Group</a></li> {% endif %} </ul> </div> diff --git a/templates/apps/userprofile/addalias.html b/templates/apps/userprofile/addalias.html new file mode 100644 index 0000000..108b3cf --- /dev/null +++ b/templates/apps/userprofile/addalias.html @@ -0,0 +1,18 @@ +{% extends "tree.html" %} +{% block content %} +<h2>Add Alias</h2> +<div class="ui-widget" style="margin-bottom: 20px;"> + <div class="ui-state-default ui-corner-all" style="padding: 0 .7em;"> + <p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span> + By adding an alias to your identity you provide information about alternative identities to + services. For instance by adding an SSH key alias a service can use this information to give + you access to compute resources and by adding an eScience Certificate you provide information + about your eScience Certificate to connected GRID services. + </div> + <ul class="ilist" style="margin-top: 10px;"> + <li class="button"><a href="/user/alias/sshkey">Add SSH Key</a></li> + <li class="button"><a href="/user/alias/cert">Add eScience Certificate</a></li> + <li class="button"><a href="/name/{{profile.home.id}}/join">Add Other Identity</a></li> + </ul> +</div> +{% endblock %}
\ No newline at end of file diff --git a/templates/apps/userprofile/cert.html b/templates/apps/userprofile/cert.html new file mode 100644 index 0000000..89b4510 --- /dev/null +++ b/templates/apps/userprofile/cert.html @@ -0,0 +1,13 @@ +{% extends "edit_fieldsets.html" %} +{% block widgets %} + $('#wizard').formwizard({ + validationEnabled: true, + focusFirstInput: true, + textSubmit: "Submit", + validationOptions: { + rules: { + certificate: 'required' + } + } + }); +{% endblock %}
\ No newline at end of file diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html index 7c875f3..2690f4d 100644 --- a/templates/apps/userprofile/home.html +++ b/templates/apps/userprofile/home.html @@ -54,7 +54,7 @@ <div id="n{{n.id}}"> <h3 class="listheader">{{n.shortname}}</h3> <div> - <a href="{{n.url}}">{{n.shortname}}</a> was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}} and has {{n.memberships|length}} member{{n.memberships|pluralize}}. + <a href="{{n.url}}">{{n.shortname}}</a> was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}}{% if n.count_members %}and has {{n.count_members}} member{{n.count_members|pluralize}}{%endif%}. </div> </div> {% empty %} diff --git a/templates/apps/userprofile/sshkey.html b/templates/apps/userprofile/sshkey.html new file mode 100644 index 0000000..b2c1fca --- /dev/null +++ b/templates/apps/userprofile/sshkey.html @@ -0,0 +1,13 @@ +{% extends "edit_fieldsets.html" %} +{% block widgets %} + $('#wizard').formwizard({ + validationEnabled: true, + focusFirstInput: true, + textSubmit: "Submit", + validationOptions: { + rules: { + sshkey: 'required' + } + } + }); +{% endblock %}
\ No newline at end of file |