From 591aa1fd35bbb6e36af004bda64f56f36280817c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Solard?= <mael.solard@laposte.net>
Date: Tue, 12 Aug 2014 16:19:18 +0200
Subject: [PATCH] Change the displaying of pagination pages and rules
 "display-*-1198"

---
 .../webmail/static/webmail/css/webmail.css    | 14 ++----
 modoboa/static/css/custom.css                 | 49 +++++++++++--------
 modoboa/templates/nlayout.html                |  8 ++-
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/modoboa/extensions/webmail/static/webmail/css/webmail.css b/modoboa/extensions/webmail/static/webmail/css/webmail.css
index 3ee2630bf..e83cdbb14 100644
--- a/modoboa/extensions/webmail/static/webmail/css/webmail.css
+++ b/modoboa/extensions/webmail/static/webmail/css/webmail.css
@@ -32,9 +32,6 @@
         text-overflow: ellipsis;
         white-space: nowrap;
     }
-    .navbar .display-less-1198{
-        display: inherit;
-    }
     th#withatts,
     td[name="withatts"],
     th#drag,
@@ -44,9 +41,12 @@
     #leftcol.leftcol-display-none{
         display: none;
     }
-    .display-up-1198{
+    .display-up-1198-webmail{
         display: none;
     }
+    .display-less-1198{
+        display: inherit;
+    }
 
 }
 
@@ -138,12 +138,6 @@ td[name="date"] {
 .navbar-header{
     display: inline-block;
 }
-.navbar .btn-link:hover,
-.navbar .btn-link:focus{
-    text-decoration: none;
-}
-
-
 
 /*
  *listing
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index 5d5d1c36d..4420b4e3d 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -9,6 +9,12 @@
 }
 
  @media (max-width: 768px) {
+
+     .navbar .navbar-header,
+     .navbar #pagination-responsive{
+         display: inline-block;
+     }
+
      tr th#tags,
      tr.muted td[name="tags"]{
          display: none;
@@ -23,13 +29,20 @@
          margin-right: 0;
      }
  }
-@media (max-width: 1200px){
-    .dropdown{
-        margin:0px;
-    }
-    .btn-group{
-        margin:0px;
-    }
+
+ @media (max-width: 1198px) {
+     #pagination-responsive .display-less-1198{
+         display: inherit;
+     }
+     .display-up-1198{
+         display: none;
+     }
+     .dropdown{
+         margin:0px;
+     }
+     .btn-group{
+         margin:0px;
+     }
 }
 
  /* --------- general --------- */
@@ -47,6 +60,11 @@
      background-color: #222222;
  }
 
+ .navbar .btn-link:hover,
+ .navbar .btn-link:focus{
+     text-decoration: none;
+ }
+
  /* links */
  a{
      color: #0088CC;
@@ -153,11 +171,6 @@ label{
     display: none;
 }
 
-.help-block {
-    color: #999999;
-    font-style: italic;
-}
-
 .label a {
     color: #FFFFFF;
     text-decoration: none;
@@ -201,6 +214,10 @@ label{
      color: white;
  }
 
+ #pagination-responsive #pagination_bar{
+     display: none;
+ }
+
  /*left navSideBar */
 
 div.container-fluid div.well{
@@ -263,10 +280,6 @@ div.container-fluid div.row-fluid .well  div.side-bar-responsive li:hover a{
      margin-top: 80px;
  }
 
-.navbar-fixed-bottom {
-    position: fixed;
-}
-
 #bottom-bar-middle {
     text-align: center;
 }
@@ -324,10 +337,6 @@ div.container-fluid div.row-fluid .well  div.side-bar-responsive li:hover a{
      margin: 11px 0 0;
  }
 
- .modal-body .form-group span.help-inline{
-    margin-top: 8px;
- }
-
  /* settings */
 
  .container-fluid #uprefs_content .form-horizontal .form-actions{
diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html
index 3317644ce..e467cd529 100644
--- a/modoboa/templates/nlayout.html
+++ b/modoboa/templates/nlayout.html
@@ -35,7 +35,11 @@
                     <span class="">Mailbox</span>
                 </button>
             </div>
-            {% block pagination_responsive %}{% endblock %}
+
+            <div id="pagination-responsive" class="pull-right">
+
+            </div>
+
             <div id="navigate-navbar-collapse" class="collapse navbar-collapse">
                 <ul class="nav navbar-nav display-less-1198">
                     <li class="droppable active ui-droppable" name="INBOX">
@@ -69,7 +73,7 @@
                         </a>
                     </li>
                 </ul>
-                <ul class="nav navbar-nav display-up-1198">{% if selection %}
+                <ul class="nav navbar-nav display-up-1198-webmail">{% if selection %}
                   {% extensions_menu selection user %}{% core_menu selection user %}
                   {% else %}{% extensions_menu "" user %}{% core_menu "" user %}{% endif %}
                   {% load_optionalmenu user %}