fix style, make footer stick to bottom and desk_center dynamic

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index c7a57aafab9375a7d6f11066b946ae435f1e27c4..d6a5d58c8c5f95ab58a5ac758903e08a967e7ed1 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1425,7 +1425,7 @@ input,textarea{
     float: left;
     width: 50%;
     padding: 0em 3em 0em 2em;
-    max-height: 550px;
+    max-height: 575px;
     overflow-y: auto;
     }
 
@@ -1826,4 +1826,20 @@ form .exceed{
 
 #index p, ul {
     margin: 0.5em;
+}
+
+* {
+margin: 0;
+}
+html, body {
+height: 100%;
+}
+#layout {
+min-height: 100%;
+height: auto !important;
+height: 100%;
+margin: 0 auto -58px;
+}
+#footer {
+height: 30px;
 }
\ No newline at end of file

diff --git a/teleforma/static/teleforma/js/application.js b/teleforma/static/teleforma/js/application.js
index 6d1a9478b9834a49840ab0c3f538907ec6834101..99f355e8cb6d7193cbb9339a401ce296eb6cd7fb 100644 (file)
--- a/teleforma/static/teleforma/js/application.js
+++ b/teleforma/static/teleforma/js/application.js
@@ -29,3 +29,9 @@
 var rainbow = new Rainbow();
 rainbow.setSpectrum('#bb0000', '#e65911', '#f3ad17', 'green');
 
+
+$(window).ready(function() {
+       var pageHeight = $(window).height();
+       var navHeight = pageHeight - 140;
+       $('#desk_center').css({"max-height": navHeight + 'px'});
+});

diff --git a/teleforma/templates/teleforma/inc/question_list.html b/teleforma/templates/teleforma/inc/question_list.html
index bb505eed0ee9670c00d9614ed01edf063cef6266..bd0ef59bc9ec06cfd294628610f03f9f7bb58c3e 100644 (file)
--- a/teleforma/templates/teleforma/inc/question_list.html
+++ b/teleforma/templates/teleforma/inc/question_list.html
@@ -11,7 +11,7 @@
     <tbody>
         {% for question in questions.all %}
             <tr>
-            <td {% if forloop.first %}class="border-top"{% endif %} width="35%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }} n°{{ question.rank }}</a></td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="35%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }}{% if question.rank %} n°{{ question.rank }}{% endif %}</a></td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="60%">{% if question|submitted:user %}{% trans "submitted on" %} {{ question|submitted:user }}{% elif question|saved:user %}{% trans "saved on" %} {{ question|saved:user }}{% endif %} </td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center">{% if question|submitted:user and not question|validated:user %}<img src="{{ STATIC_URL }}teleforma/images/chronometer.png" style="vertical-align:middle" alt="" title="{% trans "Waiting for validation" %}" />{% elif question|submitted:user and question|validated:user %}<img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Validated" %}" />{% elif question|saved:user and not question|submitted:user %}<img src="{{ STATIC_URL }}telemeta/images/media-record.png" style="vertical-align:middle" alt="" title="{% trans "Saved" %}" />{% endif %}</td>
             </tr>

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index d759ab3bfe8e5b24aec80ba6c171a2b5979d1c25..bde78eb8e7239620b5b90b1cd61567dac8801877 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -28,7 +28,7 @@ $(function() {
 
 
 {% block course %}
-<div class="desk_center">
+<div class="desk_center" id="desk_center">
 
     <div class="course">
         
@@ -154,6 +154,7 @@ $(function() {
       </div>
 
 </div>
+
 {% endblock course %}
 
 
@@ -184,3 +185,4 @@ $(function() {
 </div>
 {% endif %}
 {% endblock index %}
+

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index 80363321af48a7e8bd0bec089d4f0ef05b392cc0..881e9d6306d7c3f0b608d8d4c07be8b96d24f392 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -160,6 +160,12 @@ alt="logo" />
 
 </div>
 
+</div>
+
+<div id="push"></div>
+
+{% endblock layout %}
+
 {% block footer %}
 <div id="footer">
  <hr />
@@ -186,8 +192,6 @@ alt="logo" />
 </div>
 {% endblock %}
 
-</div>
-{% endblock layout %}
 
 {% block analytics %}
 {% analytics_code %}

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index 033510f243ddee699c5e6a695309a4ed601cf2b5..b129519cd07cde8e52ad2159fc7f74998281d77a 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -12,33 +12,7 @@
 <div id="module-set-left" style="width: 20%">
 
 <div class="module">
-<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="Trainings" style="vertical-align:middle" />{% trans "Trainings" %}</h3>
-<div style="background: white;">
-<ul>
-{% block trainings %}
-{% for training in trainings %}
-<li><a href="{% url teleforma-training-users training.id %}">{{ training.code|lower|capfirst }}</a></li>
-{% endfor %}
-{% endblock trainings %}
-</ul>
-</div>
-</div>
-
-<div class="module">
-<h3><img src="{{ STATIC_URL }}telemeta/images/module_world.png" alt="IEJ" style="vertical-align:middle" /> {% trans "IEJ" %}</h3>
-<div style="background: white;">
-<ul>
-{% block iej %}
-{% for iej in iejs %}
-<li><a href="{% url teleforma-iej-users iej.id %}">{{ iej.name|lower|capfirst }}</a></li>
-{% endfor %}
-{% endblock iej %}
-</ul>
-</div>
-</div>
-
-<div class="module">
-<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="Courses" style="vertical-align:middle" />{% trans "Courses" %}</h3>
+<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="Courses" style="vertical-align:middle" />{% trans "Seminars" %}</h3>
 <div style="background: white;">
 <ul>
 {% block courses %}