diff --git a/ckanext/requestdata/controllers/request_data.py b/ckanext/requestdata/controllers/request_data.py index 40fe431..8fca39a 100644 --- a/ckanext/requestdata/controllers/request_data.py +++ b/ckanext/requestdata/controllers/request_data.py @@ -102,8 +102,9 @@ def _get_email_configuration( url = \ toolkit.url_for('requestdata_my_requests', id=data_owner, qualified=True) - email_body += '

Go to your \ - My Requests page to see the new request.' + email_body += '

Please accept or decline the request\ + as soon as you can by visiting the \ + My Requests page.' organizations =\ _get_action('organization_list_for_user', {'id': data_owner}) @@ -128,15 +129,18 @@ def _get_email_configuration( contact_email = config.get('ckanext.requestdata.contact_email', '') email_footer += """ -

-
- """ + site_title + """

+

+ +

+ """ + site_title + """ +

+

\ - Sign up for our newsletter

- Follow us on Twitter\ - | Contact us """ + contact_email + """ -

+ Sign up for our newsletter | \ + Follow us on Twitter\ + | Contact us +

+
""" diff --git a/ckanext/requestdata/emailer.py b/ckanext/requestdata/emailer.py index 9b1cbda..dc964a1 100644 --- a/ckanext/requestdata/emailer.py +++ b/ckanext/requestdata/emailer.py @@ -47,7 +47,7 @@ def send_email(content, to, subject, file=None): -

""" + content + """

+ """ + content + """ """ diff --git a/ckanext/requestdata/fanstatic/css/main.css b/ckanext/requestdata/fanstatic/css/main.css index 84ae02b..0b59994 100644 --- a/ckanext/requestdata/fanstatic/css/main.css +++ b/ckanext/requestdata/fanstatic/css/main.css @@ -427,7 +427,7 @@ h3 { .requested-data-container__content-item--requested-by-message { color: #757575; - word-break: break-word; + word-wrap: break-word; width: 125%; } @@ -489,4 +489,4 @@ h3 { .requested-data-container__header--requested { position: absolute; left: 32%; -} \ No newline at end of file +} diff --git a/ckanext/requestdata/templates/requestdata/my_requested_data.html b/ckanext/requestdata/templates/requestdata/my_requested_data.html index 4745714..6565c7e 100644 --- a/ckanext/requestdata/templates/requestdata/my_requested_data.html +++ b/ckanext/requestdata/templates/requestdata/my_requested_data.html @@ -25,7 +25,7 @@
{% snippet 'requestdata/snippets/requests_header.html', title='My Requests', total_requests=total_requests %} - {% snippet 'requestdata/snippets/section_base.html', state='new', title='New requests', requests=requests_new, template_type='user' %} + {% snippet 'requestdata/snippets/section_base.html', state='new', title='New', requests=requests_new, template_type='user' %} {% snippet 'requestdata/snippets/section_base.html', state='open', title='Open', requests=requests_open, template_type='user' %} {% if requests_archive %}