From ffc73c98a94498d3832a6b7a251757908739c6c7 Mon Sep 17 00:00:00 2001
From: Olga Brani <olgabrani@grnet.gr>
Date: Thu, 30 Jun 2016 12:06:38 +0300
Subject: [PATCH] admin: Don't break hyphen in 'e-mail'

---
 .../synnefo_admin/admin/resources/ips/actions.py          | 4 ++--
 .../synnefo_admin/admin/resources/networks/actions.py     | 4 ++--
 .../synnefo_admin/admin/resources/projects/actions.py     | 4 ++--
 .../synnefo_admin/admin/resources/users/actions.py        | 4 ++--
 .../synnefo_admin/admin/resources/vms/actions.py          | 4 ++--
 .../synnefo_admin/admin/resources/volumes/actions.py      | 4 ++--
 .../admin/templates/admin/_action_modal.html              | 8 ++++----
 .../admin/templates/admin/_user_details.html              | 8 ++++----
 .../admin/templates/admin/action_list_horizontal.html     | 2 +-
 .../admin/templates/admin/action_list_vertical.html       | 2 +-
 .../synnefo_admin/admin/templatetags/admin_tags.py        | 2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/snf-admin-app/synnefo_admin/admin/resources/ips/actions.py b/snf-admin-app/synnefo_admin/admin/resources/ips/actions.py
index 13b234be2..ca497b0ae 100644
--- a/snf-admin-app/synnefo_admin/admin/resources/ips/actions.py
+++ b/snf-admin-app/synnefo_admin/admin/resources/ips/actions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014 GRNET S.A.
+# Copyright (C) 2010-2016 GRNET S.A.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ def generate_actions():
     actions['reassign'] = IPAction(name='Reassign to project', f=noop,
                                    karma='neutral', caution_level='dangerous',)
 
-    actions['contact'] = IPAction(name='Send e-mail', f=send_admin_email,)
+    actions['contact'] = IPAction(name='Send e&#8209;mail', f=send_admin_email,)
 
     update_actions_rbac(actions)
 
diff --git a/snf-admin-app/synnefo_admin/admin/resources/networks/actions.py b/snf-admin-app/synnefo_admin/admin/resources/networks/actions.py
index cf40bfb92..cda427f8d 100644
--- a/snf-admin-app/synnefo_admin/admin/resources/networks/actions.py
+++ b/snf-admin-app/synnefo_admin/admin/resources/networks/actions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014 GRNET S.A.
+# Copyright (C) 2010-2016 GRNET S.A.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -85,7 +85,7 @@ def generate_actions():
                                             karma='neutral',
                                             caution_level='dangerous',)
 
-    actions['contact'] = NetworkAction(name='Send e-mail', f=send_admin_email,
+    actions['contact'] = NetworkAction(name='Send e&#8209;mail', f=send_admin_email,
                                        c=check_network_action("CONTACT"),)
 
     update_actions_rbac(actions)
diff --git a/snf-admin-app/synnefo_admin/admin/resources/projects/actions.py b/snf-admin-app/synnefo_admin/admin/resources/projects/actions.py
index ae576ec74..c2c7e6896 100644
--- a/snf-admin-app/synnefo_admin/admin/resources/projects/actions.py
+++ b/snf-admin-app/synnefo_admin/admin/resources/projects/actions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014 GRNET S.A.
+# Copyright (C) 2010-2016 GRNET S.A.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -107,7 +107,7 @@ def generate_actions():
                                          karma='good',
                                          caution_level='warning',)
 
-    actions['contact'] = ProjectAction(name='Send e-mail', f=send_admin_email,)
+    actions['contact'] = ProjectAction(name='Send e&#8209;mail', f=send_admin_email,)
 
     update_actions_rbac(actions)
 
diff --git a/snf-admin-app/synnefo_admin/admin/resources/users/actions.py b/snf-admin-app/synnefo_admin/admin/resources/users/actions.py
index c32beaa15..b9798d100 100644
--- a/snf-admin-app/synnefo_admin/admin/resources/users/actions.py
+++ b/snf-admin-app/synnefo_admin/admin/resources/users/actions.py
@@ -81,9 +81,9 @@ def generate_actions():
         name='Resend verification', f=users.send_verification_mail,
         karma='good', c=check_user_action("SEND_VERIFICATION_MAIL"),)
 
-    actions['contact'] = UserAction(name='Send e-mail', f=send_admin_email,)
+    actions['contact'] = UserAction(name='Send e&#8209;mail', f=send_admin_email,)
 
-    actions['modify_email'] = UserAction(name='Change e-mail',
+    actions['modify_email'] = UserAction(name='Change e&#8209;mail',
                                          f=change_user_email, karma='bad',
                                          caution_level='dangerous',)
 
diff --git a/snf-admin-app/synnefo_admin/admin/resources/vms/actions.py b/snf-admin-app/synnefo_admin/admin/resources/vms/actions.py
index 296ef52fd..06ea2d650 100644
--- a/snf-admin-app/synnefo_admin/admin/resources/vms/actions.py
+++ b/snf-admin-app/synnefo_admin/admin/resources/vms/actions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014 GRNET S.A.
+# Copyright (C) 2010-2016 GRNET S.A.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -114,7 +114,7 @@ def generate_actions():
                                        karma='neutral',
                                        caution_level='dangerous',)
 
-    actions['contact'] = VMAction(name='Send e-mail', f=send_admin_email,)
+    actions['contact'] = VMAction(name='Send e&#8209;mail', f=send_admin_email,)
 
     update_actions_rbac(actions)
 
diff --git a/snf-admin-app/synnefo_admin/admin/resources/volumes/actions.py b/snf-admin-app/synnefo_admin/admin/resources/volumes/actions.py
index 01a07f6cd..6dc2493c1 100644
--- a/snf-admin-app/synnefo_admin/admin/resources/volumes/actions.py
+++ b/snf-admin-app/synnefo_admin/admin/resources/volumes/actions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2014 GRNET S.A.
+# Copyright (C) 2010-2016 GRNET S.A.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ def generate_actions():
     """Create a list of actions on volumes."""
     actions = OrderedDict()
 
-    actions['contact'] = VolumeAction(name='Send e-mail', f=send_admin_email,)
+    actions['contact'] = VolumeAction(name='Send e&#8209;mail', f=send_admin_email,)
 
     update_actions_rbac(actions)
 
diff --git a/snf-admin-app/synnefo_admin/admin/templates/admin/_action_modal.html b/snf-admin-app/synnefo_admin/admin/templates/admin/_action_modal.html
index 6c81d5c7d..4884afd66 100644
--- a/snf-admin-app/synnefo_admin/admin/templates/admin/_action_modal.html
+++ b/snf-admin-app/synnefo_admin/admin/templates/admin/_action_modal.html
@@ -5,7 +5,7 @@
         <div class="modal-content area">
             <div class="modal-header">
                 <a class="close cancel" data-dismiss="modal">×</a>
-                <h3 class="elem">{{ action.name }}</h3>
+                <h3 class="elem">{{ action.name|safe }}</h3>
             </div>
             <div class="modal-body">
                 {% if op == "contact" %}
@@ -26,7 +26,7 @@
                     <div class="form-body form-area">
                         <label>Body:</label>
                         <textarea name="text" form="contactForm" class="email-content body">{{ mail.body }}</textarea>
-                        <a data-error="empty-body"  data-toggle="popover" data-trigger="hover" class="error-sign snf-exclamation-sign" href="#" rel="tooltip" data-content="Missing the body of the e-mail."></a>
+                        <a data-error="empty-body"  data-toggle="popover" data-trigger="hover" class="error-sign snf-exclamation-sign" href="#" rel="tooltip" data-content="Missing the body of the e&#8209;mail."></a>
                         <div class="extra-info">
                             <a href="" class="snf-info instructions-icon" data-container="#{{action.target}}-{{ op }}" data-toggle="popover" data-html="true" data-placement="right" data-content="
                             <h2>Legend</h2>
@@ -41,7 +41,7 @@
                 {% endif %}
                 {# If we are in a details view, then the number of items is just one, so we can get rid of the plural #}
                 <div class="summary">
-                    <p>You have chosen to <em class="elem lowercase">{{ action.name }}</em> 
+                    <p>You have chosen to <em class="elem lowercase">{{ action.name|safe }}</em>
                     {% if op == "contact" %}
                         to 
                     {% elif op == "modify_email" %}
@@ -61,7 +61,7 @@
             </div>
             <div class="modal-footer">
                 <a href="#" class="custom-btn cancel" data-dismiss="modal"><span>Cancel</span></a>
-                <a  href="#" data-url={% url admin-actions %} data-op={{ op }} data-ids="" data-target={{ action.target }} class="custom-btn apply-action" data-karma={{ action.karma }} data-caution={{ action.caution_level }} data-dismiss="modal"><span>{{ action.name }}</span></a>
+                <a  href="#" data-url={% url admin-actions %} data-op={{ op }} data-ids="" data-target={{ action.target }} class="custom-btn apply-action" data-karma={{ action.karma }} data-caution={{ action.caution_level }} data-dismiss="modal"><span>{{ action.name|safe }}</span></a>
             </div>
         </div>
     </div>
diff --git a/snf-admin-app/synnefo_admin/admin/templates/admin/_user_details.html b/snf-admin-app/synnefo_admin/admin/templates/admin/_user_details.html
index 060d041c1..27ff51247 100644
--- a/snf-admin-app/synnefo_admin/admin/templates/admin/_user_details.html
+++ b/snf-admin-app/synnefo_admin/admin/templates/admin/_user_details.html
@@ -27,14 +27,14 @@
                     <dt>ID</dt><dd>{{ user.id }}</dd>
                     <dt>UUID</dt><dd>{{ user.uuid }}</dd>
                     <dt>Name</dt><dd>{{ user.realname }}</dd>
-                    <dt>E-mail</dt><dd>{{ user.email }}</dd>
+                    <dt>E&#8209;mail</dt><dd>{{ user.email }}</dd>
                     {% if user.accepted_email and user.email != user.accepted_email %}
-                        <dt>Initially accepted e-mail</dt><dd>{{ user.accepted_email }}</dd>
+                        <dt>Initially accepted e&#8209;mail</dt><dd>{{ user.accepted_email }}</dd>
                     {% endif %}
                     {% if user.email_change_is_pending %}
-                        <dt>E-mail pending verification</dt>
+                        <dt>E&#8209;mail pending verification</dt>
                         <dd>{{ user.emailchanges.all.0.new_email_address }}
-                        <dt>E-mail change requested at</dt>
+                        <dt>E&#8209;mail change requested at</dt>
                         <dd>{{ user.emailchanges.all.0.requested_at }}
                     {% endif %}
                     <dt>Status</dt><dd>{{ user.status_display|upper }}</dd>
diff --git a/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_horizontal.html b/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_horizontal.html
index ac63e1f7b..7c67ff978 100644
--- a/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_horizontal.html
+++ b/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_horizontal.html
@@ -3,7 +3,7 @@
     {% for op, action in action_dict.items %}
     {% if action|can_apply:item %}
     <a href="" data-target="#{{action.target}}-{{ op }}" data-action="{{ op }}" data-toggle="modal" data-karma="{{ action.karma }}" data-caution="{{ action.caution_level }}" class="custom-btn">
-        <span>{{ action.name }}</span>
+        <span>{{ action.name|safe }}</span>
     </a>
     {% endif %}
     {% endfor %}
diff --git a/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_vertical.html b/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_vertical.html
index a5b27ec24..af533ab5c 100644
--- a/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_vertical.html
+++ b/snf-admin-app/synnefo_admin/admin/templates/admin/action_list_vertical.html
@@ -4,7 +4,7 @@
         <div class="btn-group-vertical">
         {% for op, action in action_dict.items %}
         <a href="" data-target="#{{action.target}}-{{ op }}" data-action="{{ op }}" data-toggle="modal" data-karma={{ action.karma }} data-caution="{{ action.caution_level }}" class="disabled custom-btn">
-                <span>{{ action.name }}</span>
+                <span>{{ action.name|safe }}</span>
             </a>
         {% endfor %}
         </div>
diff --git a/snf-admin-app/synnefo_admin/admin/templatetags/admin_tags.py b/snf-admin-app/synnefo_admin/admin/templatetags/admin_tags.py
index b71855cbb..730b67b02 100644
--- a/snf-admin-app/synnefo_admin/admin/templatetags/admin_tags.py
+++ b/snf-admin-app/synnefo_admin/admin/templatetags/admin_tags.py
@@ -417,7 +417,7 @@ def show_auth_providers(user, category):
 @register.filter
 def can_apply(action, item):
     """Return if action can apply on item."""
-    if action.name == "Send e-mail" and action.target != 'user':
+    if action.name == "Send e&#8209;mail" and action.target != 'user':
         return False
     return action.can_apply(item)
 
-- 
GitLab