diff options
| author | Yoggzo <yogg@epsina.com> | 2016-02-24 13:23:47 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-02-24 13:23:47 +0100 |
| commit | fafb5eeaa4676823680c828ac57adf2e855b7afd (patch) | |
| tree | 58c914ba9b277252daf53c27e878f262cb4579ad /client/partials | |
| parent | 16e0328884f318d97ac991ee8e70f43ee1c14b38 (diff) | |
| parent | d2f5ae5c83ef5bc41cf430ace79769459b4acbf8 (diff) | |
Merge branch 'develop' into Evan
Diffstat (limited to 'client/partials')
| -rw-r--r-- | client/partials/login.html | 2 | ||||
| -rw-r--r-- | client/partials/nav.html | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/client/partials/login.html b/client/partials/login.html index cd7d9ec..7519a83 100644 --- a/client/partials/login.html +++ b/client/partials/login.html @@ -34,7 +34,7 @@ <!--<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"><b>Failed to login</b></b><br />{{ failReason }}</div> - <a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="processForm()">Login</a> + <a href="#" class="btn btn-lg btn-primary btn-block" id="loginButton" ng-click="loginAction()">Login</a> </div> </div> </div> diff --git a/client/partials/nav.html b/client/partials/nav.html index 7c34174..3c72844 100644 --- a/client/partials/nav.html +++ b/client/partials/nav.html @@ -32,8 +32,7 @@ <li><a href="#">Informations</a></li> <li><a href="#">Settings</a></li> <li role="separator" class="divider"></li> - <li><a href="#myModal" data-toggle="modal">Logout</a> - </li> + <li><a href="#" ng-click="logout()">Logout</a></li> </ul> </li> </ul> |