From: yomguy <yomguy@parisson.com>
Date: Thu, 19 Apr 2012 09:35:23 +0000 (+0200)
Subject: fix some colors and buttons
X-Git-Tag: 0.2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b3d950f6b1659859fbbe592681642ea567182657;p=teleforma.git

fix some colors and buttons
---

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index 6bfab122..57c3c43a 100644
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -1147,7 +1147,8 @@ a.image-link {
     }
 
 #action_red {
-    background-color:  #bb1020;
+/*     background-color:  #bb1020; */
+    background-color: #d34836;
     color: #FFF;
     padding:0.8em 0.8em 0.8em 0.8em;
     }
diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index e77cf6bb..b6a20bd4 100644
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -32,7 +32,7 @@
 <dl class="listing">
 <dt>{% trans "Title" %}</dt><dd>{{ conference.course.title }}</dd>
 <dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
-<dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail conference.professor.user.username %}">{{ conference.professor }}</a></dd>
+<dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a></dd>
 <dt>{% trans "Begin" %}</dt><dd>{{ conference.date_begin }}</dd>
 <dt>{% trans "End" %}</dt><dd>{{ conference.date_end }}</dd>
 <dt>{% trans "Live" %}</dt><dd>{{ conference.streaming }}</dd>
diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index 58a882de..11c4902c 100644
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -69,7 +69,7 @@
         <td></td>
         <td></td>
     {%  endif %}
-    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_orange">{% trans "Message" %}</a></td>
+    <td><a href="{% url postman_write user.username %}" class="component_icon button" id="action_red">{% trans "Message" %}</a></td>
     </tr>
     {% endfor %}
     </tbody>
diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index 15188644..0d497a7c 100644
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -12,22 +12,16 @@
   {% block modules %}
 
     {% block module_searches %}
-    {% with searches as searches and "My searches" as title %}
+    {% with searches as searches and "Searches" as title %}
     {% include "telemeta/inc/module_searches.html" %}
     {% endwith %}
     {% endblock %}
 
-    {% block module_all_revisions %}
-    {% with revisions as revisions and "All last changes" as title %}
-    {% include "telemeta/inc/module_revisions.html" %}
-    {% endwith %}
-    {% endblock %}
-
   {% endblock %}
 
-  {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
+  {% if user.is_authenticated %}
    <div class="module_action">
-    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button" id="action_blue">{% trans "Modify profile" %}</a>
+    <a href="{% url postman_write user.username %}" class="component_icon button" id="action_red">{% trans "Send a message" %}</a>
    </div>
   {%  endif %}
 
@@ -39,8 +33,9 @@
     <h1>{% trans "User profile" %} : {{ usr.username }}
     </h1>
 
-    {% if user.is_authenticated and user.username == usr.username %}
+    {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
     <div id="password" style="float: right;">
+    <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
     <a href="{% url telemeta-password-change %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
     </div>
     {%  endif %}