diff options
| author | Yoggzo <yogg@epsina.com> | 2016-02-08 17:10:24 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-02-08 17:10:24 +0100 |
| commit | f1585a13323d408b6917a514bed1920aec3780f0 (patch) | |
| tree | b98a23443d20af008cbb8eca16a7aff7c9aa823c /client/partials | |
| parent | 43b65e1dbb53300d076f5885b5393ff68e248dd1 (diff) | |
| parent | 1cd1ae92f414573942262f65dc1644e8ff9bb8f6 (diff) | |
Merge branch 'develop' into Evan
mise a jour
Diffstat (limited to 'client/partials')
| -rw-r--r-- | client/partials/login.html | 14 | ||||
| -rw-r--r-- | client/partials/nav.html | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/client/partials/login.html b/client/partials/login.html index 387b075..e0ce876 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -12,18 +12,18 @@ <div class="modal-body"> <div class="form-group"> - <label label-default="" for="inputUser">User</label> - <input class="form-control" id="inputUser" + <label label-default="" for="loginFormUsername">User</label> + <input class="form-control" id="loginFormUsername" 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"> + <label label-default="" for="loginFormProjectname">Project</label> + <input class="form-control" id="loginFormProjectname" + placeholder="Project Name" type="text" ng-model="identityFormData.project"> </div> <div class="form-group"> - <label label-default="" for="inputPassword">Password</label> - <input class="form-control" id="inputPassword" + <label label-default="" for="loginFormPassword">Password</label> + <input class="form-control" id="loginFormPassword" placeholder="Password" type="password" ng-model="identityFormData.password"> </div> diff --git a/client/partials/nav.html b/client/partials/nav.html index f412597..786c53b 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -18,8 +18,8 @@ <ul class="nav navbar-nav"> <li class="nav-divider"></li> - <li><a href="#">User : {{ username }}</a></li> - <li><a href="#">Project Name : {{ projectname }}</a></li> + <li><a href="#">User : {{ profile.username }}</a></li> + <li><a href="#">Project Name : {{ profile.projectname }}</a></li> <!--<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>--> |