fix paginations

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index a0e2b716003f00bf150e903a1aa7a59545072438..f20a018ed94576da7f8f23137626f9eedf4c7707 100644 (file)
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -767,7 +767,7 @@ dl.dublincore dd.caption {
     padding: .3em 0;
     font-size: 1em;
     background-color: transparent;
-    border-bottom: 1px solid #aaa;
+    border-bottom: 0px solid #aaa;
     color: #333;
     font-weight: bold;
 }
@@ -1360,8 +1360,7 @@ input,textarea{
         color: #0000 ;
         font-weight: normal;
         max-height: 250px;
-        overflow-y: scroll;
-
+        overflow-y: auto;
         }
 
 #module-set-left .module a {
@@ -1381,8 +1380,6 @@ input,textarea{
     float: left;
     width:75%;
     padding: 0em 1.8em 0em 1em;
-    max-height: 550px;
-    overflow-y: scroll;
     }
 
 .desk_course {
@@ -1531,3 +1528,8 @@ input,textarea{
     font-size: 0.9125em;
     font-weight: normal;
     }
+
+#paginate_fix {
+    padding: 1em 0em 0em 0em;
+    margin: 0em 0em -0.8em 0em;
+    }
\ No newline at end of file

diff --git a/teleforma/templates/postman/base_folder.html b/teleforma/templates/postman/base_folder.html
index fe343c7cb5405500555d6284efb5555a1c6a6e40..3dc016c2aa405d30402115e738fe4301760f0924 100644 (file)
--- a/teleforma/templates/postman/base_folder.html
+++ b/teleforma/templates/postman/base_folder.html
@@ -3,22 +3,26 @@
 
 {% block content %}
 
-<div id="postman" class="desk_media">
+<div id="postman" class="desk_large">
 <h1>{% block pm_folder_title %}{% endblock %}</h1>
-{% autopaginate pm_messages %}
 {% if invalid_page %}
 <p>{% trans "Sorry, this page number is invalid." %}</p>
 {% else %}
 
 {% if pm_messages %}
 
-{% block pm_by_modes %}<div id="pm_by_modes" style="float: right;">
+{% block pm_by_modes %}
+<div id="pm_by_modes" style="float: right;">
 <a href="{{ by_conversation_url }}" class="component_icon button icon_filter">{% trans "by conversation" %}</a>
 <a href="{{ by_message_url }}" class="component_icon button icon_filter">{% trans "by message" %}</a>
-</div>{% endblock pm_by_modes %}
-{% paginate %}
-<form id="_messageForm" action="{% block pm_form_action %}{% endblock %}" method="post">{% csrf_token %}
+</div>
+{% endblock pm_by_modes %}
 
+<div id="paginate_fix">
+{% autopaginate pm_messages %}{% paginate %}
+</div>
+
+<form id="_messageForm" action="{% block pm_form_action %}{% endblock %}" method="post">{% csrf_token %}
 <table id="pm_messages" class="listing" >
  <thead>
   <tr>

diff --git a/teleforma/templates/postman/view.html b/teleforma/templates/postman/view.html
index d726be28d94604a958c66f6ceadaefbd879c0f4a..6e2d04546e5938daa777416e2be9c808cb6df4e1 100644 (file)
--- a/teleforma/templates/postman/view.html
+++ b/teleforma/templates/postman/view.html
@@ -4,7 +4,7 @@
 {% load postman_tags %}
 
 {% block content %}
-<div id="postman" class="desk_media">
+<div id="postman" class="desk_large">
 <h1>{% if pm_messages|length > 1 %}{% trans "Conversation" %}{% else %}{% trans "Message" %}{% endif %}</h1>
 <br /><br />
 {% for message in pm_messages %}

diff --git a/teleforma/templates/telemeta/inc/user_list.html b/teleforma/templates/telemeta/inc/user_list.html
index da7410766c52e78f34335d75d9da5bfad3f808cb..90e556ede1d089de17303c619e8211b3c88ac219 100644 (file)
--- a/teleforma/templates/telemeta/inc/user_list.html
+++ b/teleforma/templates/telemeta/inc/user_list.html
@@ -4,16 +4,7 @@
 {% load pagination_tags %}
 
 {% if is_paginated %}
-<div class="pagination" id="user_pagination">
-{% if page_obj.has_previous %}
-<a href="{% url teleforma-users %}?page={{ page_obj.previous_page_number }}">< {% trans "Previous" %}</a>
-{% endif %}
-{% trans "Page" %} {{ page_obj.number }} {%trans "of" %} {{ page_obj.paginator.num_pages }}.
-{% if page_obj.has_next %}
-<a href="{% url teleforma-users %}?page={{ page_obj.next_page_number }}">{% trans "Next" %} ></a>
-{% endif %}
-</span>
-</div>
+{% paginate %}
 {% endif %}
 
 <div id="users">