fix message links, colors

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 01c0e0a1ed7693bc5ff339e14e4edd86b7c702e1..a25922b09159829d387eb14708ce77abd4630f6a 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1160,7 +1160,7 @@ a.image-link {
 
 #action_red {
 /*     background-color:  #bb1020; */
-    background-color: #d34836;
+    background-color: #bb0000;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
     }
@@ -1515,6 +1515,7 @@ input,textarea{
 
 .pm_body {
     padding: 0em 0em 0em 0em;
+    border: 1px solid #dfdfdf;
     }
 
 .pm_message {
@@ -1524,6 +1525,7 @@ input,textarea{
     border-radius: 8px 0px 8px 8px;
     padding: 0.5em 0.8em 0.8em 0.8em;
     margin: 0em 0em 1em 0em;
+    border: 1px solid #dfdfdf;
     }
 
 #pm_messages {
@@ -1536,6 +1538,7 @@ input,textarea{
     padding: 0.8em 0.8em 0.8em 1em;
     width: 100%;
     margin-top : 1em;
+    border: 1px solid #dfdfdf;
     }
 
 #pm_messages td {
@@ -1575,6 +1578,7 @@ input,textarea{
     -moz-border-radius: 8px 0px 8px 8px;
     -webkit-border-radius: 8px 0px 8px 8px;
     border-radius: 8px 0px 8px 8px;
+    border: 1px solid #dfdfdf;
     }
 
 #spacing td {

diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index 077e7ac4cd374cc2a1fd4b87e5a2e802abc67ebf..e51ce2ded4dac80b2a001fc52c9085a12fb2f553 100644 (file)
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -38,15 +38,18 @@
  <tbody>{% for message in pm_messages %}
   <tr>
    <td><input type="checkbox" {% if by_conversation and message.thread_id %}name="tpks" value="{{ message.thread_id }}"{% else %}name="pks" value="{{ message.pk }}"{% endif %} /></td>
-   {% block pm_sender_cell %}   <td>{% if message.is_new %}<strong>{% endif %}{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}</strong>{% endif %}</td>{% endblock %}
-{% block pm_recipient_cell %}   <td>{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}</td>{% endblock %}
+
+   {% block pm_sender_cell %}<td><a href="{% if by_conversation and message.thread_id %}{% url postman_view_conversation message.thread_id %}{% else %}{{message.get_absolute_url }}{% endif %}?next={{ current_url|urlencode }}">{% if message.is_new %}<strong>{% endif %}{{ message.obfuscated_sender|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}{% if message.is_new %}</strong>{% endif %}</a></td>{% endblock %}
+
+   {% block pm_recipient_cell %}<td><a href="{% if by_conversation and message.thread_id %}{% url postman_view_conversation message.thread_id %}{% else %}{{message.get_absolute_url }}{% endif %}?next={{ current_url|urlencode }}">{{ message.obfuscated_recipient|or_me:user }}{% if message.count %} ({{ message.count }}){% endif %}</a></td>{% endblock %}
+
    <td>{% if message.is_new %}<strong>{% endif %}{% if message.is_replied %}<em>{% endif %}
-{% block pm_subject %}
+   {% block pm_subject %}
     <a href="{% if by_conversation and message.thread_id %}{% url postman_view_conversation message.thread_id %}{% else %}{{message.get_absolute_url }}{% endif %}?next={{ current_url|urlencode }}">
     {% include "postman/inc_subject_ex.html" %}
-    </a>
-{% endblock %}
+    </a>{% endblock %}
    {% if message.is_replied %}</em>{% endif %}{% if message.is_new %}</strong>{% endif %}</td>
+
    <td>{{ message.sent_at|compact_date:_("g:i A,M j,n/j/y") }}</td>
   </tr>{% endfor %}
  </tbody>