css fix, try fix menu icon

diff --git a/teleforma/models.py b/teleforma/models.py
index 6674ae1859f736d7a66f63243184f9ad0571cda2..483b5af30be5c883010c088daa88d696f0bfe901 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -420,7 +420,7 @@ class Training(Model):
                                         verbose_name=_('oral 1'),
                                         blank=True, null=True)
     oral_2          = ManyToManyField('CourseType', related_name="training_oral_2",
-                                        verbose_name=_('oral 1'),
+                                        verbose_name=_('oral 2'),
                                         blank=True, null=True)
     options         = ManyToManyField('CourseType', related_name="training_options",
                                         verbose_name=_('options'),

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 62ebdc013e0df4567b7894b51e8447de3d766064..f803ce3d5d06b4a0a0422dcd5a17fa26667ce786 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -455,7 +455,6 @@ form.login .submit {
 
 #menu a, #menu a:visited{
     display:inline-block;
-    color: #fff;
     text-decoration:none;
     border-bottom-width:.5em;
     border-bottom-style: solid;
@@ -470,11 +469,13 @@ form.login .submit {
     font-size: 14px;
     padding: .5em 1em;
 }
+
 #menu a:hover, #menu a.active{
     background-color: #FFF;
     color: #000000;
 }
 
+
 #menu .darkblue { border-bottom-color: #0f3179; }
 /* #menu .blue { border-bottom-color:  #357ae8; } */
 #menu .blue { border-bottom-color: #4f628a; }

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index be5c3d29ba07599dbcd6ed99ce8327f1f4302b02..14b44e602be1e67235be5d1c282b55b62e089beb 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -97,7 +97,8 @@ alt="logo" />
  <li><a href="{% url telemeta-admin-general %}" class="blue">{% trans "Admin" %}</a></li>
  {% endif %}
 
- <li><a href="#accounts#" class="blue"><img src="{% url telemeta-images "user_tr.png" %}" alt="user" style="vertical-align:middle" width="13px" />{% if user.first_name and user.last_name %}
+ <li style="a.active{background-image:{{ STATIC_URL }}telemeta/images/user_tr_bk.png; background-repeat: no-repeat;
+    background-position: 1ex .5ex;}"><a href="#accounts#" class="blue">{% if user.first_name and user.last_name %}
  {{ user.first_name }} {{ user.last_name }}
  {% else %}
  {{ user.username }}