From bc0b2364b1a22ecc9662ddfce1a4bd314f38f79b Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 20 Sep 2011 11:01:05 +0200 Subject: removed entity model, celery --- templates/apps/membership/edit.html | 10 +++++----- templates/apps/name/name.html | 12 +++++++----- templates/apps/userprofile/addalias.html | 18 ++++++++++++++++++ templates/apps/userprofile/cert.html | 13 +++++++++++++ templates/apps/userprofile/home.html | 2 +- templates/apps/userprofile/sshkey.html | 13 +++++++++++++ templates/base.html | 4 ++-- templates/edit_fieldsets.html | 6 ++---- templates/tree.html | 1 + 9 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 templates/apps/userprofile/addalias.html create mode 100644 templates/apps/userprofile/cert.html create mode 100644 templates/apps/userprofile/sshkey.html (limited to 'templates') 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 %} -

Summary

{% if name %}
{% if name.description %} @@ -47,6 +46,9 @@ {% if render.join %}
  • Join
    • {% endif %} + {% if render.alias %} +
  • Add Alias
    • + {% endif %} {% endif %} {% endif %} @@ -54,7 +56,7 @@

    Members

    {% for m in memberships.all %} -
    +

    {{m|memberdisplay}}

    @@ -62,13 +64,13 @@ {% if m.tags %}

    Role{{m.tags|pluralize}}

      {% for tag in m.tags %}
    • {{ tag|escape }}
      • {%endfor%}
    {%endif%}
    -
    +
    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 %} +

    Add Alias

    +
    +
    +

    + 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. +

    + +
    +{% 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 @@

    {{n.shortname}}

    - {{n.shortname}} was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}} and has {{n.memberships|length}} member{{n.memberships|pluralize}}. + {{n.shortname}} was created by {{n.creator|userdisplay}} {{n.timecreated|datehumanize}}{% if n.count_members %}and has {{n.count_members}} member{{n.count_members|pluralize}}{%endif%}.
    {% 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 diff --git a/templates/base.html b/templates/base.html index 110d7b8..22b479b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,8 +9,8 @@ - - + + diff --git a/templates/edit_fieldsets.html b/templates/edit_fieldsets.html index 54ab744..9aaf000 100644 --- a/templates/edit_fieldsets.html +++ b/templates/edit_fieldsets.html @@ -9,7 +9,7 @@ {% for fieldset in form.fieldsets %}
    {% if fieldset.legend %} - {{ fieldset.legend }} + {{ fieldset.legend }} {% endif %} {% if fieldset.description %}

    {{ fieldset.description }}

    @@ -33,9 +33,7 @@
      • - {% if name %} -
      • - {% endif %} +
      • {% endblock %} \ No newline at end of file diff --git a/templates/tree.html b/templates/tree.html index 78fc0e2..585fc42 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -48,6 +48,7 @@ $(function() { {% else %}
    • Create New Group
      • {% endif %} +
    • Add Alias
      -- cgit v1.1