Merge branch 'master' of https://github.com/ViderumGlobal/ckanext-req…

…uestdata
datopian · Jul 24, 2017 · c1c7cd8 · c1c7cd8
2 parents bfd4e8b + 5245540
commit c1c7cd8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git 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 += '<br><br> Go to your <a href="' + url + '">\
-                        My Requests</a> page to see the new request.'
+        email_body += '<br><br><strong> Please accept or decline the request\
+         as soon as you can by visiting the \
+         <a href="' + url + '">My Requests</a> page.</strong>'
 
     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 += """
-        <br><br>
-        <div style="text-align: center;">
-            <a href=" """ + site_url + """ ">""" + site_title + """</a><br><br>
+        <br/><br/>
+        <small>
+          <p>
+            <a href=" """ + site_url + """ ">""" + site_title + """</a>
+          </p>
+          <p>
             <a href=" """ + newsletter_url + """ ">\
-            Sign up for our newsletter</a><br><br>
-            <span>Follow us on <a href=" """ + twitter_url + """ ">Twitter</a>\
-            </span> | <span>Contact us <a href="mailto:""" + contact_email\
-                    + """ ">""" + contact_email + """</a></span>
-        </div>
+            Sign up for our newsletter</a> | \
+            <a href=" """ + twitter_url + """ ">Follow us on Twitter</a>\
+             | <a href="mailto:""" + contact_email + """ ">Contact us</a>
+          </p>
+        </small>
 
     """
 

diff --git a/ckanext/requestdata/emailer.py b/ckanext/requestdata/emailer.py
@@ -47,7 +47,7 @@ def send_email(content, to, subject, file=None):
         <html>
           <head></head>
           <body>
-            <p>""" + content + """</p>
+            <span>""" + content + """</span>
           </body>
         </html>
     """

diff --git 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%;
-}
+}
diff --git a/ckanext/requestdata/templates/requestdata/my_requested_data.html b/ckanext/requestdata/templates/requestdata/my_requested_data.html
@@ -25,7 +25,7 @@
   <div class="requests-main-container">
     {% 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 %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ def send_email(content, to, subject, file=None): @@
             <html>
               <head></head>
               <body>
-                <p>""" + content + """</p>
+                <span>""" + content + """</span>
               </body>
             </html>
         """
@@ Expand Down @@