From 9dc049cb0aa67f2827e9895ed84349df29a2f405 Mon Sep 17 00:00:00 2001 From: Kostas Papadimitriou Date: Tue, 12 Jun 2012 17:37:41 +0300 Subject: [PATCH] Fix user notification display also improved styling of "notice" message types --- snf-astakos-app/Changelog | 6 ++++++ snf-astakos-app/astakos/im/context_processors.py | 5 ++++- snf-astakos-app/astakos/im/static/im/css/custom.css | 8 ++++++++ snf-astakos-app/astakos/im/templates/im/base.html | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/snf-astakos-app/Changelog b/snf-astakos-app/Changelog index c5d6fcc..b1a1bff 100644 --- a/snf-astakos-app/Changelog +++ b/snf-astakos-app/Changelog @@ -1,10 +1,16 @@ Changelog --------- +v0.6.2 +^^^^^^ +- fixed signup/profile/global user notifications display + + v0.6.1 ^^^^^^ - skip csrf on login requests + v0.6 ^^^^ - Fixed default values in cloudbar sample conf file diff --git a/snf-astakos-app/astakos/im/context_processors.py b/snf-astakos-app/astakos/im/context_processors.py index 5f636a2..4291884 100644 --- a/snf-astakos-app/astakos/im/context_processors.py +++ b/snf-astakos-app/astakos/im/context_processors.py @@ -57,12 +57,15 @@ def media(request): return {'IM_STATIC_URL' : IM_STATIC_URL} def custom_messages(request): + EXTRA_MESSAGES_SET = bool(GLOBAL_MESSAGES or SIGNUP_MESSAGES or \ + LOGIN_MESSAGES or PROFILE_MESSAGES) return { 'GLOBAL_MESSAGES' : GLOBAL_MESSAGES, 'SIGNUP_MESSAGES' : SIGNUP_MESSAGES, 'LOGIN_MESSAGES' : LOGIN_MESSAGES, 'PROFILE_MESSAGES' : PROFILE_MESSAGES, - 'PROFILE_EXTRA_LINKS' : PROFILE_EXTRA_LINKS + 'PROFILE_EXTRA_LINKS' : PROFILE_EXTRA_LINKS, + 'EXTRA_MESSAGES_SET' : PROFILE_EXTRA_LINKS, } def menu(request): diff --git a/snf-astakos-app/astakos/im/static/im/css/custom.css b/snf-astakos-app/astakos/im/static/im/css/custom.css index c1d3519..59b44be 100644 --- a/snf-astakos-app/astakos/im/static/im/css/custom.css +++ b/snf-astakos-app/astakos/im/static/im/css/custom.css @@ -1,2 +1,10 @@ ul.messages li { margin-bottom: 5px } ul.messages { background-color: transparent; } +ul.messages li a { font-weight: normal !important } +ul.messages li.notice { background-color: #284A5E } +ul.messages li.notice { color: #FFF } +ul.messages li.notice a { color: #FFF } +ul.messages li.notice2 { background-color: #F54500 } +ul.messages li.notice2 { color: #FFF } +ul.messages li.notice2 { background-color: #F54500 } +ul.messages li.notice2 a { color: #FFF } diff --git a/snf-astakos-app/astakos/im/templates/im/base.html b/snf-astakos-app/astakos/im/templates/im/base.html index ba5f5b1..8e4a26c 100644 --- a/snf-astakos-app/astakos/im/templates/im/base.html +++ b/snf-astakos-app/astakos/im/templates/im/base.html @@ -93,7 +93,7 @@ {% endblock %} - {% if messages or LOGIN_MESSAGES %} + {% if messages or EXTRA_MESSAGES_SET %}