From e26668e5eb6e3a412e0f56c1ffbf55b13b3014b5 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Thu, 6 Apr 2017 21:17:47 -0300
Subject: [PATCH 1/3] Add tabs to account_read

---
 kfet/templates/kfet/account_read.html | 75 +++++++++++++--------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/kfet/templates/kfet/account_read.html b/kfet/templates/kfet/account_read.html
index 3c2ccbcd..e55c18b2 100644
--- a/kfet/templates/kfet/account_read.html
+++ b/kfet/templates/kfet/account_read.html
@@ -56,45 +56,44 @@ $(document).ready(function() {
   <div class="col-sm-8 col-md-9 col-content-right">
     {% include "kfet/base_messages.html" %}
     <div class="content-right">
-      {% if addcosts %}
-        <div class="content-right-block">
-          <h2>Gagné des majorations</h2>
-          <div>
-            <ul>
-              {% for addcost in addcosts %}
-                <li>{{ addcost.date|date:'l j F' }}: +{{ addcost.sum_addcosts }}€</li>
-              {% endfor %}
-            </ul>
-          </div>
-        </div>
-      {% endif %}
-      {% if account.user == request.user %}
-      <div class="content-right-block content-right-block-transparent">
-        <h2>Statistiques</h2>
-        <div class="row">
-          <div class="col-sm-12 nopadding">
-            <div class="panel-md-margin">
-              <h3>Ma balance</h3>
-              <div id="stat_balance"></div>
-            </div>
-          </div>
-        </div><!-- /row -->
-        <div class="row">
-          <div class="col-sm-12 nopadding">
-            <div class="panel-md-margin">
-              <h3>Ma consommation</h3>
-              <div id="stat_last"></div>
-            </div>
-          </div>
-        </div><!-- /row -->
-      </div>
-      {% endif %}
       <div class="content-right-block">
-        <h2>Historique</h2>
-        <div id="history">
-        </div>
-      </div>
-    </div>
+        <div class="col-sm-12 nopadding">
+          {% if account.user == request.user %}
+          <ul class="nav nav-tabs">
+            <li class="active"><a data-toggle="tab" href="#tab_stats">Statistiques</a></li>
+            <li><a data-toggle="tab" href="#tab_history">Historique</a></li>
+          </ul>
+          <div class='tab-content'>
+            <div class="tab-pane fade in active" id="tab_stats">
+              <h2>Statistiques</h2>
+              <div class="panel-md-margin">
+                <h3>Ma balance</h3>
+                  <div id="stat_balance"></div>
+                <h3>Ma consommation</h3>
+                  <div id="stat_last"></div>
+              </div>
+            </div>
+            <div class="tab-pane fade" id="tab_history">
+          {% endif %}
+            {% if addcosts %}
+              <h2>Gagné des majorations</h2>
+              <div>
+                <ul>
+                  {% for addcost in addcosts %}
+                    <li>{{ addcost.date|date:'l j F' }}: +{{ addcost.sum_addcosts }}€</li>
+                  {% endfor %}
+                </ul>
+              </div>
+            {% endif %}
+              <h2>Historique</h2>
+              <div id="history"></div>
+            {% if account.user == request.user %}
+            </div>
+          </div><!-- tab-content -->
+        {% endif %}
+        </div><!-- col-sm-12 -->
+      </div><!-- content-right-block -->
+    </div><!-- content-right-->
   </div>
 </div>
 

From 052e7b2b6e1e69dc500eb147b366fe259d5dde1d Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Fri, 7 Apr 2017 12:17:36 -0300
Subject: [PATCH 2/3] Move navigation to content-left

---
 kfet/static/kfet/css/index.css        | 8 ++++++++
 kfet/templates/kfet/account_read.html | 4 ----
 kfet/templates/kfet/left_account.html | 6 ++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index f21fdaba..103b74b7 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -86,6 +86,14 @@ textarea {
     color:#FFF;
 }
 
+.buttons .nav-pills > li > a {
+    border-radius:0;
+}
+
+.buttons .nav-pills > li.active > a {
+    background-color:rgba(200,16,46,0.9);
+}
+
 .row-page-header {
     background-color:rgba(200,16,46,1);
     color:#FFF;
diff --git a/kfet/templates/kfet/account_read.html b/kfet/templates/kfet/account_read.html
index e55c18b2..1af7f277 100644
--- a/kfet/templates/kfet/account_read.html
+++ b/kfet/templates/kfet/account_read.html
@@ -59,10 +59,6 @@ $(document).ready(function() {
       <div class="content-right-block">
         <div class="col-sm-12 nopadding">
           {% if account.user == request.user %}
-          <ul class="nav nav-tabs">
-            <li class="active"><a data-toggle="tab" href="#tab_stats">Statistiques</a></li>
-            <li><a data-toggle="tab" href="#tab_history">Historique</a></li>
-          </ul>
           <div class='tab-content'>
             <div class="tab-pane fade in active" id="tab_stats">
               <h2>Statistiques</h2>
diff --git a/kfet/templates/kfet/left_account.html b/kfet/templates/kfet/left_account.html
index 19352728..06c3da8e 100644
--- a/kfet/templates/kfet/left_account.html
+++ b/kfet/templates/kfet/left_account.html
@@ -40,4 +40,10 @@
     Modifier
   </a>
   <a class="btn btn-primary btn-lg" disabled>Recharger par CB</a>
+  {% if account.user == request.user %}
+  <ul class='nav nav-pills nav-justified'>
+    <li class="active"><a data-toggle="pill" href="#tab_stats">Statistiques</a></li>
+    <li><a data-toggle="pill" href="#tab_history">Historique</a></li>
+  </ul>
+  {% endif %}
 </div>

From 4a6bfd5e3de6cae1c46bf4466708a799f4563d5d Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <ludovic.stephan@ens.fr>
Date: Fri, 7 Apr 2017 12:58:03 -0300
Subject: [PATCH 3/3] Better button distinction

---
 kfet/static/kfet/css/index.css        | 2 ++
 kfet/templates/kfet/left_account.html | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css
index 103b74b7..0244a57b 100644
--- a/kfet/static/kfet/css/index.css
+++ b/kfet/static/kfet/css/index.css
@@ -88,10 +88,12 @@ textarea {
 
 .buttons .nav-pills > li > a {
     border-radius:0;
+    border:1px solid rgba(200,16,46,0.9);
 }
 
 .buttons .nav-pills > li.active > a {
     background-color:rgba(200,16,46,0.9);
+    background-clip:padding-box;
 }
 
 .row-page-header {
diff --git a/kfet/templates/kfet/left_account.html b/kfet/templates/kfet/left_account.html
index 06c3da8e..5607cbc2 100644
--- a/kfet/templates/kfet/left_account.html
+++ b/kfet/templates/kfet/left_account.html
@@ -36,14 +36,14 @@
   </div>
 </div>
 <div class="buttons">
-  <a class="btn btn-primary btn-lg" href="{% url 'kfet.account.update' account.trigramme %}">
-    Modifier
-  </a>
-  <a class="btn btn-primary btn-lg" disabled>Recharger par CB</a>
   {% if account.user == request.user %}
   <ul class='nav nav-pills nav-justified'>
     <li class="active"><a data-toggle="pill" href="#tab_stats">Statistiques</a></li>
     <li><a data-toggle="pill" href="#tab_history">Historique</a></li>
   </ul>
   {% endif %}
+  <a class="btn btn-primary btn-lg" href="{% url 'kfet.account.update' account.trigramme %}">
+    Modifier
+  </a>
+  <a class="btn btn-primary btn-lg" disabled>Recharger par CB</a>
 </div>