Revision ad956265

b/snf-astakos-app/Changelog
25 25
  Logging level controlled by ASTAKOS_LOGGING_LEVEL setting.
26 26
- Email change mechanism
27 27
  Enabled using ASTAKOS_EMAILCHANGE_ENABLED setting (disabled by default)
28
- Additional user notification settings
29
  ASTAKOS_SIGNUP_MESSAGES, ASTAKOS_PROFILE_MESSAGES, ASTAKOS_GLOBAL_MESSAGES
28 30

  
29 31

  
30 32
v0.5.1
b/snf-astakos-app/astakos/im/context_processors.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, IM_STATIC_URL, \
35
        COOKIE_NAME, LOGIN_MESSAGES, PROFILE_EXTRA_LINKS
35
        COOKIE_NAME, LOGIN_MESSAGES, SIGNUP_MESSAGES, PROFILE_MESSAGES, \
36
        GLOBAL_MESSAGES, PROFILE_EXTRA_LINKS
36 37
from astakos.im.api.admin import get_menu
37 38
from astakos.im.util import get_query
38 39

  
......
57 58

  
58 59
def custom_messages(request):
59 60
    return {
61
            'GLOBAL_MESSAGES' : GLOBAL_MESSAGES,
62
            'SIGNUP_MESSAGES' : SIGNUP_MESSAGES,
60 63
            'LOGIN_MESSAGES' : LOGIN_MESSAGES,
64
            'PROFILE_MESSAGES' : PROFILE_MESSAGES,
61 65
            'PROFILE_EXTRA_LINKS' : PROFILE_EXTRA_LINKS
62 66
           }
63 67

  
b/snf-astakos-app/astakos/im/settings.py
70 70
# e.g. {'warning': 'This warning message will be displayed on the top of login page'}
71 71
LOGIN_MESSAGES = getattr(settings, 'ASTAKOS_LOGIN_MESSAGES', {})
72 72

  
73
# Messages to display on login page header
74
# e.g. {'warning': 'This warning message will be displayed on the top of signup page'}
75
SIGNUP_MESSAGES = getattr(settings, 'ASTAKOS_SIGNUP_MESSAGES', {})
76

  
77
# Messages to display on login page header
78
# e.g. {'warning': 'This warning message will be displayed on the top of profile page'}
79
PROFILE_MESSAGES = getattr(settings, 'ASTAKOS_PROFILE_MESSAGES', {})
80

  
81
# Messages to display on all pages
82
# e.g. {'warning': 'This warning message will be displayed on the top of every page'}
83
GLOBAL_MESSAGES = getattr(settings, 'ASTAKOS_GLOBAL_MESSAGES', {})
84

  
73 85
# messages to display as extra actions in account forms
74 86
# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'}
75 87
PROFILE_EXTRA_LINKS = getattr(settings, 'ASTAKOS_PROFILE_EXTRA_LINKS', {})
......
85 97

  
86 98
# Set the astakos main functions logging severity (None to disable)
87 99
from logging import INFO
88
LOGGING_LEVEL = getattr(settings, 'ASTAKOS_LOGGING_LEVEL', INFO)
100
LOGGING_LEVEL = getattr(settings, 'ASTAKOS_LOGGING_LEVEL', INFO)
b/snf-astakos-app/astakos/im/static/im/css/custom.css
1
ul.messages li { margin-bottom: 5px }
2
ul.messages { background-color: transparent; }
b/snf-astakos-app/astakos/im/templates/im/account_base.html
1 1
{% extends "im/base_two_cols.html" %}
2 2

  
3
{% block extra_messages %}
4
    {% if not messages %}
5
        {% for msg_type, msg in GLOBAL_MESSAGES.items %}
6
            <li class="{{ msg_type }}">{{ msg|safe }}</li>
7
        {% endfor %}
8
        {% for msg_type, msg in PROFILE_MESSAGES.items %}
9
            <li class="{{ msg_type }}">{{ msg|safe }}</li>
10
        {% endfor %}
11
    {% endif %}
12
{% endblock %}
13

  
3 14
{% load filters %}
4 15

  
5 16
{% block page.title %}Profile{% endblock %}
b/snf-astakos-app/astakos/im/templates/im/login_base.html
2 2

  
3 3
{% block extra_messages %}
4 4
    {% if not messages %}
5
        {% for msg_type, msg in GLOBAL_MESSAGES.items %}
6
            <li class="{{ msg_type }}">{{ msg|safe }}</li>
7
        {% endfor %}
5 8
        {% for msg_type, msg in LOGIN_MESSAGES.items %}
6 9
            <li class="{{ msg_type }}">{{ msg|safe }}</li>
7 10
        {% endfor %}
b/snf-astakos-app/astakos/im/templates/im/signup.html
1 1
{% extends 'im/base_two_cols.html' %}
2 2

  
3
{% block extra_messages %}
4
    {% if not messages %}
5
        {% for msg_type, msg in GLOBAL_MESSAGES.items %}
6
            <li class="{{ msg_type }}">{{ msg|safe }}</li>
7
        {% endfor %}
8
        {% for msg_type, msg in SIGNUP_MESSAGES.items %}
9
            <li class="{{ msg_type }}">{{ msg|safe }}</li>
10
        {% endfor %}
11
    {% endif %}
12
{% endblock %}
3 13

  
4 14
{% block page.title %}
5 15
    Signup
b/snf-astakos-app/conf/20-snf-astakos-app-settings.conf
71 71
# e.g. {'warning': 'This warning message will be displayed on the top of login page'}
72 72
#ASTAKOS_LOGIN_MESSAGES = {}
73 73

  
74
# Messages to display on signup page header
75
# e.g. {'warning': 'This warning message will be displayed on the top of signup page'}
76
#ASTAKOS_SIGNUP_MESSAGES = {}
77

  
78
# Messages to display on profile page header
79
# e.g. {'warning': 'This warning message will be displayed on the top of profile pages'}
80
#ASTAKOS_PROFILE_MESSAGES = {}
81

  
82
# Messages to display on global page header
83
# e.g. {'warning': 'This warning message will be displayed on the top of all pages'}
84
#ASTAKOS_GLOBAL_MESSAGES = {}
85

  
74 86
# messages to display as extra actions in account forms
75 87
# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'}
76 88
#ASTAKOS_PROFILE_EXTRA_LINKS = {}

Also available in: Unified diff