From 05b0ac955170fd8708bf4d72bc6dedd024156f5f Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Sat, 23 Jan 2016 18:12:18 +0100
Subject: [PATCH] Change grid

---
 client/index.php            | 37 +++++++++++++++--------
 client/partials/header.html |  1 -
 client/partials/menu.html   |  7 +++++
 client/partials/nav.html    | 59 ++++++++++++++++++++++++++++++++-----
 4 files changed, 84 insertions(+), 20 deletions(-)
 delete mode 100644 client/partials/header.html
 create mode 100644 client/partials/menu.html

diff --git a/client/index.php b/client/index.php
index f52eaa2..a32c5d2 100644
--- a/client/index.php
+++ b/client/index.php
@@ -26,25 +26,38 @@
         <div class="container-lg" ng-app="MainApp">
             
             <div class="row">
-                <div class="col-lg-2 col-lg-push-1">
-                    <!-- LOGO -->
-                    <nav ng-include="'./partials/favicon.html'"></nav>
-
+                <div class="col-lg-12">
                     <!-- Nav -->
-                    <nav ng-include="'./partials/nav.html'"></nav>
+                    <div ng-include="'./partials/nav.html'"></div>
+                </div>
+            </div>
+            
+            <div class="row">
+                
+                
+                <div class="col-lg-2 col-lg-push-1">
+                    <!-- Logo -->
+                    <div ng-include="'./partials/favicon.html'"></div>
+
+                    <!-- Left Menu -->
+                    <div ng-include="'./partials/menu.html'"></div>
                 </div>
                  
                 
+                
+                
                 <div class="col-lg-8 col-lg-push-1">
                     <div class="container-lg" >
+                        
+                       
                         <div class="row">
-                            <div class="col-lg-12"  style="background-color: #e7e7e7;">
-                                <header ng-include="'./partials/header.html'"></header>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-lg-12" style="background-color: #245580;">
-                                <p style="text-align:center;"> MAIN CONTENT !</p>
+                            <div class="col-lg-12">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">Content test</div>
+                                    <div class="panel-body">
+                                      Main content test
+                                    </div>
+                                </div>
                             </div>
                         </div>                   
                     </div>
diff --git a/client/partials/header.html b/client/partials/header.html
deleted file mode 100644
index 900a6f1..0000000
--- a/client/partials/header.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Header Content</p>
\ No newline at end of file
diff --git a/client/partials/menu.html b/client/partials/menu.html
new file mode 100644
index 0000000..04f4f68
--- /dev/null
+++ b/client/partials/menu.html
@@ -0,0 +1,7 @@
+<div class="list-group">
+  <button type="button" class="list-group-item">Entry 1</button>
+  <button type="button" class="list-group-item">Entry 2</button>
+  <button type="button" class="list-group-item">Entry 3</button>
+  <button type="button" class="list-group-item">Entry 4</button>
+  <button type="button" class="list-group-item">Entry 5</button>
+</div>
\ No newline at end of file
diff --git a/client/partials/nav.html b/client/partials/nav.html
index 8211f2d..866302d 100644
--- a/client/partials/nav.html
+++ b/client/partials/nav.html
@@ -1,8 +1,53 @@
-<div class="list-group">
-  <button type="button" class="list-group-item">Entry 1</button>
-  <button type="button" class="list-group-item">Entry 2</button>
-  <button type="button" class="list-group-item">Entry 3</button>
-  <button type="button" class="list-group-item">Entry 4</button>
-  <button type="button" class="list-group-item">Entry 5</button>
+<nav class="navbar navbar-default">
+  <div class="container-fluid">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#">Brand</a>
+    </div>
 
-</div>
\ No newline at end of file
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+      <ul class="nav navbar-nav">
+        <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
+        <li><a href="#">Link</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li role="separator" class="divider"></li>
+            <li><a href="#">Separated link</a></li>
+            <li role="separator" class="divider"></li>
+            <li><a href="#">One more separated link</a></li>
+          </ul>
+        </li>
+      </ul>
+      <form class="navbar-form navbar-left" role="search">
+        <div class="form-group">
+          <input type="text" class="form-control" placeholder="Search">
+        </div>
+        <button type="submit" class="btn btn-default">Submit</button>
+      </form>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="#">Link</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="#">Action</a></li>
+            <li><a href="#">Another action</a></li>
+            <li><a href="#">Something else here</a></li>
+            <li role="separator" class="divider"></li>
+            <li><a href="#">Separated link</a></li>
+          </ul>
+        </li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
\ No newline at end of file