refactor(bs3): working login modals, had to readd bootstrap origin javascript plugins

This commit is contained in:
Matteo Pagliazzi 2014-01-29 18:37:51 +01:00
parent 4c9da6883f
commit 3f3869ea28
3 changed files with 5 additions and 2 deletions

View file

@ -81,7 +81,8 @@ angular.module('authCtrl', [])
window.location.href = '/#/tasks';
} else {
$modal.open({
templateUrl: 'modals/login.html'
templateUrl: 'modals/login.html',
scope: $scope
});
}
}

View file

@ -23,6 +23,7 @@
"bower_components/angular-bootstrap/ui-bootstrap.js",
"bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
"bower_components/bootstrap/dist/js/bootstrap.js",
"bower_components/jquery-ui/ui/minified/jquery.ui.core.min.js",
"bower_components/jquery-ui/ui/minified/jquery.ui.widget.min.js",
@ -74,6 +75,7 @@
"bower_components/angular-bootstrap/ui-bootstrap.js",
"bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
"bower_components/bootstrap/dist/js/bootstrap.js",
"bower_components/angular-loading-bar/build/loading-bar.js",
"js/static.js",

View file

@ -1,6 +1,6 @@
script(id='modals/login.html', type="text/ng-template")
.modal-header
button.close(type='button') ×
button.close(type='button', ng-click='$close()') ×
h4.modal-title=env.t('loginAndReg')
.modal-body
a(href='/auth/facebook')