From a08a1f509e5118f0dab647f20854c581ffdce5c7 Mon Sep 17 00:00:00 2001 From: Johan Berggren Date: Wed, 19 Sep 2012 15:53:13 +0200 Subject: New UI --- coip/apps/userprofile/views.py | 4 +- coip/settings.py | 5 +- dev-django-admin.sh | 3 +- site-media/css/style2.css | 55 +++++++++++++-- templates/apps/name/name.html | 15 ++-- templates/apps/userprofile/home.html | 132 +++++++++++++++++++++-------------- templates/base.html | 75 ++++++++++++-------- templates/tree.html | 58 ++++++--------- 8 files changed, 208 insertions(+), 139 deletions(-) diff --git a/coip/apps/userprofile/views.py b/coip/apps/userprofile/views.py index b1be4c1..4153b85 100644 --- a/coip/apps/userprofile/views.py +++ b/coip/apps/userprofile/views.py @@ -96,7 +96,7 @@ def home_name(user,short=None,autocreate=False): def home(request): memberships = [] try: - memberships = Membership.objects.filter(user=request.user,hidden=False) + memberships = Membership.objects.filter(user=request.user,hidden=False).order_by('-timecreated') except ObjectDoesNotExist: pass @@ -108,7 +108,7 @@ def home(request): cn = user.username profile.home = home_name(user, short=cn, autocreate=True) - names = [(link.src,link.data) for link in NameLink.objects.filter(dst__memberships__user=request.user,type=NameLink.access_control,data__contains='i').all()] + names = [(link.src,link.data) for link in NameLink.objects.filter(dst__memberships__user=request.user,type=NameLink.access_control,data__contains='i').all().order_by('-timecreated')] return respond_to(request, {'text/html': 'apps/userprofile/home.html'},{'memberships': memberships,'names': names}) diff --git a/coip/settings.py b/coip/settings.py index b1aacc4..d367308 100644 --- a/coip/settings.py +++ b/coip/settings.py @@ -66,7 +66,7 @@ ADMIN_MEDIA_PREFIX = '/admin-media/' # Make this unique, and don't share it with anybody. SECRET_KEY = '!=ren*@$dklhfm$3#$h=a2g4r3)ra#+al)9kwi4&rpylr$3xnf' -SESSION_ENGINE = "django.contrib.sessions.backends.cache" +#SESSION_ENGINE = "django.contrib.sessions.backends.cache" # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( @@ -83,7 +83,8 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.RemoteUserMiddleware', - #'django.middleware.cache.FetchFromCacheMiddleware' + #'django.middleware.cache.FetchFromCacheMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', ) AUTHENTICATION_BACKENDS = ( diff --git a/dev-django-admin.sh b/dev-django-admin.sh index 2350dd1..e2fc631 100755 --- a/dev-django-admin.sh +++ b/dev-django-admin.sh @@ -1 +1,2 @@ -env PYTHONPATH=`pwd`:$PHTHONPATH DJANGO_SETTINGS_MODULE=coip.settings django-admin.py $* +#env PYTHONPATH=`pwd`:$PHTHONPATH DJANGO_SETTINGS_MODULE=coip.settings django-admin.py $* +env PYTHONPATH = `pwd`:$PHTHONPATH DJANGO_SETTINGS_MODULE=coip.settings django-admin.py $* diff --git a/site-media/css/style2.css b/site-media/css/style2.css index f641cf6..4c9450d 100644 --- a/site-media/css/style2.css +++ b/site-media/css/style2.css @@ -1,12 +1,56 @@ body { + background-color: #fff; color: #333; } #header { - background: #333; - height:45px; - padding-top:15px; - border-bottom: 5px solid #333; + width:100%; + height: 60px; + background-image: -ms-linear-gradient(top, #4B80AA 0%, #245783 100%); + background-image: -moz-linear-gradient(top, #4B80AA 0%, #245783 100%); + background-image: -o-linear-gradient(top, #4B80AA 0%, #245783 100%); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #4B80AA), color-stop(1, #245783)); + background-image: -webkit-linear-gradient(top, #4B80AA 0%, #245783 100%); + background-image: linear-gradient(to bottom, #4B80AA 0%, #245783 100%); + margin-bottom: 20px; +} + +.content { + background: #fff; +} + +.login { + margin-top:20px; +} + +.logo { + color: #f5f5f5; + font-weight: 200; + line-height: 1; + font-family: "Arial Rounded MT Bold",Arial,sans-serif; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; + margin-top:10px; + font-size: 25px; + text-decoration: none; +} + +.logo:hover { + color: #f5f5f5; + text-decoration: none; +} + + +.content { + padding:20px; +} + + +.shadow { + -moz-box-shadow: 10px 10px 50px #333; + -webkit-box-shadow: 10px 10px 50px #333; + box-shadow: 1px 1px 20px #333; } .hero-unit.profile { @@ -47,9 +91,6 @@ textarea { color:#999; } -.shadow { - box-shadow: 1px 1px 3px #888; -} .well.comment { background:#fff; 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