From 6707b7459567365f2885c9c89fbd47fae147e882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Solard?= <mael.solard@laposte.net>
Date: Thu, 24 Jul 2014 17:09:50 +0200
Subject: [PATCH] Change html tags and css rules related to the left side bar
 in "Statics" page

---
 .../stats/templates/stats/index.html          | 88 ++++++++++---------
 modoboa/static/css/custom.css                 |  3 +-
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html
index 25cfa2041..b795ce20b 100644
--- a/modoboa/extensions/stats/templates/stats/index.html
+++ b/modoboa/extensions/stats/templates/stats/index.html
@@ -27,49 +27,51 @@ $(document).ready(function() {
 {% block leftcol %}
 <div id="periods" class="well sidebar-nav">
   <ul class="nav nav-list">
-    <li class="nav-header">
-      {% trans "Filter" %}
-    </li>
-    <li>
-      <div class="input-prepend input-append">
-        <span class="add-on"><i class="icon-search"></i></span>
-        <input class="span10" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
-      </div>
-    </li>
-    <li class="nav-header">
-      {% trans "Predefined time ranges" %}
-    </li>
-    {% for p in periods %}<li class="period">
-      <a href="#" class="period_selector" data-period="{{ p.name }}">{% trans p.label %}</a>
-    </li>
-    {% endfor %}
-    <li class="nav-header">
-      {% trans "Custom time range" %}
-    </li>
-    <li>
-      <form class="form-inline">
-        <span id="custom-period">
-          <div class="input-prepend">
-            <span class="add-on"><i class="icon-indent-left"></i></span>
-            <input id="id_from" class="span10" name="date_from" value="{{ start }}" type="text" readonly="readonly" />
-          </div>
-          <div class="input-prepend">
-            <span class="add-on"><i class="icon-indent-right"></i></span>
-            <input id="id_to" class="span10" name="date_to" value="{{ end }}" type="text" readonly="readonly" />
-          </div>
-          <button class="btn" id="customsend">{% trans "Apply" %}</button>
-        </span>
-      </form>
-    </li>
-  </ul>
-</div>
-{% endblock %}
-{% block apparea %}
-<div id="graphs" class="tabbable">
-  <ul class="nav nav-tabs">{% for id, gset in graph_sets.items %}
-    <li {% if forloop.first %}class="active"{% endif %}>
-      <a href="#graphs_{{ gset.html_id }}" data-toggle="tab">{{ gset.title }}</a>
-    </li>
+      <div class="side-bar-responsive">
+            <li class="nav-header">
+              {% trans "Filter" %}
+            </li>
+            <li>
+              <div class="input-group">
+                <span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span>
+                <input class="col-lg-10 form-control" id="searchquery" type="text" value="{% trans 'Search a domain' %}">
+              </div>
+            </li>
+            <li class="nav-header">
+              {% trans "Predefined time ranges" %}
+            </li>
+            {% for p in periods %}<li class="period">
+              <a href="#" class="period_selector" data-period="{{ p.name }}">{% trans p.label %}</a>
+            </li>
+            {% endfor %}
+            <li class="nav-header">
+              {% trans "Custom time range" %}
+            </li>
+            <li>
+              <form class="form-inline">
+                <span id="custom-period">
+                  <div class="input-group input-group-sm">
+                    <span class="input-group-addon"><i class="glyphicon glyphicon-indent-left"></i></span>
+                    <input id="id_from" class="col-lg-10 form-control" name="date_from" value="{{ start }}" type="text" readonly="readonly" />
+                  </div>
+                  <div class="input-group input-group-sm">
+                    <span class="input-group-addon"><i class="glyphicon glyphicon-indent-right"></i></span>
+                    <input id="id_to" class="col-lg-10 form-control" name="date_to" value="{{ end }}" type="text" readonly="readonly" />
+                  </div>
+                  <button class="btn btn-primary" id="customsend">{% trans "Apply" %}</button>
+                </span>
+              </form>
+            </li>
+        </div>
+      </ul>
+    </div>
+    {% endblock %}
+    {% block apparea %}
+    <div id="graphs" class="tabbable">
+      <ul class="nav nav-tabs">{% for id, gset in graph_sets.items %}
+        <li {% if forloop.first %}class="active"{% endif %}>
+          <a href="#graphs_{{ gset.html_id }}" data-toggle="tab">{{ gset.title }}</a>
+        </li>
   </ul>{% endfor %}
   <div class="tab-content">{% for id, gset in graph_sets.items %}
     <div class="tab-pane {% if forloop.first %}active{% endif %}" id="graphs_{{ gset.html_id }}">
diff --git a/modoboa/static/css/custom.css b/modoboa/static/css/custom.css
index af5bc4d67..41225b7e0 100644
--- a/modoboa/static/css/custom.css
+++ b/modoboa/static/css/custom.css
@@ -281,8 +281,7 @@ div.container-fluid .row-fluid .well ul.nav div.side-bar-responsive li a i.glyph
 .btn-group{
     margin-left: 20px;
 }
- html body div.navbar div.container-fluid div#bs-example-navbar-collapse-1.collapse ul.nav li.dropdown a.dropdown-toggle,
- html body div.navbar div.container-fluid div#bs-example-navbar-collapse-1.collapse ul.nav li.active a{
+ html body div.navbar div.container-fluid div#bs-example-navbar-collapse-1.collapse ul.nav li.dropdown a.dropdown-toggle{
     background-color: black;
     color: white;
 }