From a08a1f509e5118f0dab647f20854c581ffdce5c7 Mon Sep 17 00:00:00 2001 From: Johan Berggren Date: Wed, 19 Sep 2012 15:53:13 +0200 Subject: New UI --- templates/apps/name/name.html | 15 ++-- templates/apps/userprofile/home.html | 132 +++++++++++++++++++++-------------- templates/base.html | 75 ++++++++++++-------- templates/tree.html | 58 ++++++--------- 4 files changed, 153 insertions(+), 127 deletions(-) (limited to 'templates') diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html index e366dc1..5dccb60 100644 --- a/templates/apps/name/name.html +++ b/templates/apps/name/name.html @@ -17,6 +17,7 @@ {% endblock %} {% block content %} {% if name %} +

{{ name.short }}

{% if name.description %} {% autoescape off %} @@ -29,25 +30,25 @@ {% if render.acl or render.edit or render.delete or render.invite or render.join %} {% endif %} diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html index 2690f4d..6d4228f 100644 --- a/templates/apps/userprofile/home.html +++ b/templates/apps/userprofile/home.html @@ -4,61 +4,85 @@ {% load tagging_tags %} {% block widgets %} $("#gravatar").append($.gravatar($('#email').text())); - $("#names").accordion({ - header: 'h3', - collapsible: true, - active: false, - autoHeight: false - }); - $("#memberships").accordion({ - header: 'h3', - collapsible: true, - active: false, - autoHeight: false - }); {% endblock %} -{% block content %} - {% if memberships %} -

Memberships

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

{{m.name.shortname}}

-
-
- You became a member of {{m.name.shortname}} {{m.timecreated|datehumanize}} - {% if m.tags %}

Role{{m.tags|pluralize}}

-
    {% for tag in m.tags %}
  • {{ tag|escape }}
    • {%endfor%}
{%endif%} -
-
- -
-
-
- {% empty %} -

No members yet...

- {% endfor %} -
- {% endif %} -

Groups

-
- {% for n,p in names %} -
-

{{n.shortname}}

-
- {{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 %} -

You do not have control over any groups yet...

- {% endfor %} +{% block main %} + + +
+
+ +
+

{{ profile.display_name }}

+ You are the owner of {{ names|length }} group{{ names|pluralize }} and member of {{ memberships|length }} group{{ memberships|pluralize }}
+ +
+
+ + +
+
+ {% if memberships %} +
+ {% for m in memberships.all %} +
+

{{ m.name.shortname }}

 + You became member {{m.timecreated|datehumanize}} + {% if m.tags %} +

Role{{m.tags|pluralize}}

+
    {% for tag in m.tags %}
  • {{ tag|escape }}
    • {%endfor%}
+ {%endif%} + + +
+ {% empty %} +

No members yet...

+ {% endfor %} +
+ {% endif %} +
+
+
+ {% for n,p in names %} +
+

{{ n.shortname }}

 + Created {{n.timecreated|datehumanize}} + +
+ {% empty %} +

You do not have control over any groups yet...

+ {% endfor %} +
+
+
{% endblock %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 2c32c79..0986936 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,15 +2,20 @@ - + - - + + + + + + + @@ -66,34 +71,41 @@ {% block js %}{% endblock %} -
- -
- {% block main %}{% endblock %} -
-
+ + + +
+
+
+ {% block main %}{% endblock %} +
+ +
+
+ + diff --git a/templates/tree.html b/templates/tree.html index 585fc42..670acb0 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -34,38 +34,26 @@ $(function() { {% endblock %} {% block main %} - - -{% endblock %} \ No newline at end of file + {% if user.is_authenticated %} + + + {% endif %} + + + + + {% block content %}{% endblock %} +{% endblock %} -- cgit v1.1