Merge branch 'develop' into Evan

mise a jour de la branche

5 files changed, 52 insertions, 11 deletions

diff --git a/client/partials/favicon.html b/client/partials/favicon.html
index d49c651..b341f9b 100644
--- a/client/partials/favicon.html
+++ b/client/partials/favicon.html
@@ -1,3 +1,3 @@
 <a href="#" class="thumbnail">
-    <img class="media-object" src='./images/logo.gif' />
+    <img class="media-object" src='./images/logo.png' />
 </a>
diff --git a/client/partials/network.html b/client/partials/home/main.html
index a520a88..7a5045a 100644
--- a/client/partials/network.html
+++ b/client/partials/home/main.html
@@ -1,9 +1,8 @@
  <div class="panel panel-default">
     <div class="panel-heading">
-        {{ test }}
+        Home 
     </div>
     <div class="panel-body">
         Main Content
     </div>
-</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/client/partials/login.html b/client/partials/login.html
new file mode 100644
index 0000000..387b075
--- /dev/null
+++ b/client/partials/login.html
@@ -0,0 +1,41 @@
+<div class="modal fade" id="loginModal" ng-controller="loginCtrl">
+    <div class="modal-dialog">
+        <div class="modal-content"></div>
+    </div>
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <!--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>-->
+                 <h4 class="modal-title">Login</h4>
+
+            </div>
+            <div class="modal-body">
+
+                <div class="form-group">
+                    <label label-default="" for="inputUser">User</label>
+                    <input class="form-control" id="inputUser"
+                    placeholder="Email" type="text" ng-model="identityFormData.user">
+                </div>
+                <div class="form-group">
+                    <label label-default="" for="inputProject">Project</label>
+                    <input class="form-control" id="inputProject"
+                    placeholder="Project Name" type="password" ng-model="identityFormData.project">
+                </div>
+                <div class="form-group">
+                    <label label-default="" for="inputPassword">Password</label>
+                    <input class="form-control" id="inputPassword"
+                    placeholder="Password" type="password" ng-model="identityFormData.password">
+                </div>
+                
+                <!--<p class="text-right"><a href="#">Forgot password?</a>
+                </p>-->
+            </div>
+            <div class="modal-footer"> 
+                <!--<a href="#" data-dismiss="modal" class="btn btn-default">Close</a>-->
+                <button class="btn btn-lg btn-warning btn-block" id="loadingLoginButton"><span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span> Loading...</button>
+                <div class="alert alert-danger text-center" role="alert" id="failedToLoginAlert">Failed to login</div>
+                <a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="processForm()">Login</a>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/partials/nav.html b/client/partials/nav.html
index a765daa..f412597 100644
--- a/client/partials/nav.html
+++ b/client/partials/nav.html
@@ -17,10 +17,11 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 
       <ul class="nav navbar-nav">
-          <li class="nav-divider"></li>
-          <li><a href="#">User : {{ username }}</a></li>
-        <li><a href="#">Last Connection : {{ lastconnection }}</a></li>
-        <li><a href="#">Connection : {{ connection }}</a></li>
+        <li class="nav-divider"></li>
+        <li><a href="#">User : {{ username }}</a></li>
+        <li><a href="#">Project Name : {{ projectname }}</a></li>
+
+        <!--<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>-->
 
       </ul>
     
@@ -31,7 +32,8 @@
             <li><a href="#">Informations</a></li>
             <li><a href="#">Settings</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="#">Logout</a></li>
+            <li><a href="#myModal" data-toggle="modal">Logout</a>
+            </li>
           </ul>
         </li>
       </ul>
diff --git a/client/partials/home.html b/client/partials/network/main.html
index b00113a..8b779be 100644
--- a/client/partials/home.html
+++ b/client/partials/network/main.html
@@ -1,9 +1,8 @@
  <div class="panel panel-default">
     <div class="panel-heading">
-        {{ test }}
+        Network
     </div>
     <div class="panel-body">
         Main Content
     </div>
 </div>
-</div>
\ No newline at end of file