diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js
index 1cd700ab..a39a40ab 100755
--- a/app/models/user.server.model.js
+++ b/app/models/user.server.model.js
@@ -46,19 +46,19 @@ var UserSchema = new Schema({
type: String,
trim: true,
default: '',
- validate: {
+ /*validate: {
validator: validateLocalStrategyProperty,
message: 'Please fill in your first name'
- }
+ }*/
},
lastName: {
type: String,
trim: true,
default: '',
- validate: {
+ /*validate: {
validator: validateLocalStrategyProperty,
message: 'Please fill in your last name'
- }
+ }*/
},
email: {
type: String,
diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html
index c9ec3f89..20061dcf 100755
--- a/app/views/layout.server.view.html
+++ b/app/views/layout.server.view.html
@@ -34,6 +34,8 @@
+
+
{% for bowerCssFile in bowerCssFiles %}
@@ -66,7 +68,6 @@
Fork me on GitHub
-->
-
{% block content %}{% endblock %}
diff --git a/config/strategies/local.js b/config/strategies/local.js
index ad560524..cfafa966 100755
--- a/config/strategies/local.js
+++ b/config/strategies/local.js
@@ -15,7 +15,10 @@ module.exports = function() {
},
function(username, password, done) {
User.findOne({
- username: username
+ $or: [
+ { "username": username},
+ { "email": username}
+ ]
}, function(err, user) {
if (err) {
return done(err);
diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js
index 22e70bc4..e3aa98b0 100755
--- a/public/modules/core/controllers/header.client.controller.js
+++ b/public/modules/core/controllers/header.client.controller.js
@@ -30,9 +30,12 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', '
Auth.ensureHasCurrentUser(User);
$scope.user = $rootScope.user = null;
$state.go('listForms');
+
+ //Refresh view
+ $state.reload();
},
function(reason) {
- console.log('Logout Failed: ' + reason);
+ console.error('Logout Failed: ' + reason);
});
};
diff --git a/public/modules/core/css/core.css b/public/modules/core/css/core.css
index 6bf68c22..3957f97b 100755
--- a/public/modules/core/css/core.css
+++ b/public/modules/core/css/core.css
@@ -1,67 +1,47 @@
body {
overflow-x: hidden;
+ font-family: 'Source Sans Pro', sans-serif;
+ font-size: 16px;
}
-section.content {
- padding-top: 5em;
+.vcenter {
+ display: inline-block;
+ vertical-align: middle;
+ float: none;
}
/*Navbar Custom CSS*/
+.navbar {
+ min-height: 60px;
+}
.navbar-inverse {
background-color:#588EB4;
border: 0;
+ color: white!important;
}
-.navbar .navbar-brand {
- font-size: 1.6em;
- font-weight: 900;
+.navbar li > * {
+ border-bottom: 4px solid white;
color: white;
}
-.navbar .navbar-brand:hover, .navbar .navbar-brand:visited {
- color: #ddd;
+.navbar li:hover > * {
+ border-bottom: 2px solid #ddd;
+}
+
+.navbar-inverse .navbar-nav>li>a {
+ color: white;
}
.navbar li.dropdown a.dropdown-toggle:hover > *{
color: #f9f9f9;
}
-.navbar li.dropdown a.dropdown-toggle > *{
- color: #ddd;
-}
-
-.navbar .navbar-brand span {
- text-decoration: underline;
-}
-.nav.navbar-nav.navbar-right li {
- padding-right: 20px;
-}
-
-.navbar-inverse .navbar-nav>li>a, .navbar li.dropdown a.dropdown-toggle > * {
- color: #ddd;
-}
-.navbar-inverse .navbar-nav .active > a, .navbar li.dropdown.open a.dropdown-toggle > *, .navbar-inverse .navbar-nav>.open>a, .navbar-inverse .navbar-nav>.open>a, .navbar-inverse .navbar-nav>.open>a:focus, .navbar-inverse .navbar-nav>.open>a:hover {
- background-color: #6450A0;
- color: #ddd;
-}
.navbar-inverse .navbar-toggle {
- background-color: #ddd;
border:none;
}
-.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
- color: white;
-}
-.navbar-inverse .navbar-collapse{
- border: none;
-}
-
.undecorated-link:hover {
text-decoration: none;
}
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
display: none !important;
}
-.browsehappy.jumbotron.hide,
-body.ng-cloak
-{
- display: block;
-}
/*Hero Section CSS (for /home)*/
section.hero-section {
diff --git a/public/modules/core/css/equal-height.css b/public/modules/core/css/equal-height.css
deleted file mode 100644
index bafa16e7..00000000
--- a/public/modules/core/css/equal-height.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* columns of same height styles */
-
-.row-height {
- display: table;
- table-layout: fixed;
- height: 100%;
- width: 100%;
-}
-.col-height {
- display: table-cell;
- float: none;
- height: 100%;
-}
-.col-top {
- vertical-align: top;
-}
-.col-middle {
- vertical-align: middle;
-}
-.col-bottom {
- vertical-align: bottom;
-}
-
-@media (min-width: 480px) {
- .row-xs-height {
- display: table;
- table-layout: fixed;
- height: 100%;
- width: 100%;
- }
- .col-xs-height {
- display: table-cell;
- float: none;
- height: 100%;
- }
- .col-xs-top {
- vertical-align: top;
- }
- .col-xs-middle {
- vertical-align: middle;
- }
- .col-xs-bottom {
- vertical-align: bottom;
- }
-}
-
-@media (min-width: 768px) {
- .row-sm-height {
- display: table;
- table-layout: fixed;
- height: 100%;
- width: 100%;
- }
- .col-sm-height {
- display: table-cell;
- float: none;
- height: 100%;
- }
- .col-sm-top {
- vertical-align: top;
- }
- .col-sm-middle {
- vertical-align: middle;
- }
- .col-sm-bottom {
- vertical-align: bottom;
- }
-}
-
-@media (min-width: 992px) {
- .row-md-height {
- display: table;
- table-layout: fixed;
- height: 100%;
- width: 100%;
- }
- .col-md-height {
- display: table-cell;
- float: none;
- height: 100%;
- }
- .col-md-top {
- vertical-align: top;
- }
- .col-md-middle {
- vertical-align: middle;
- }
- .col-md-bottom {
- vertical-align: bottom;
- }
-}
-
-@media (min-width: 1200px) {
- .row-lg-height {
- display: table;
- table-layout: fixed;
- height: 100%;
- width: 100%;
- }
- .col-lg-height {
- display: table-cell;
- float: none;
- height: 100%;
- }
- .col-lg-top {
- vertical-align: top;
- }
- .col-lg-middle {
- vertical-align: middle;
- }
- .col-lg-bottom {
- vertical-align: bottom;
- }
-}
\ No newline at end of file
diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html
index 1f137028..c7b2b842 100755
--- a/public/modules/core/views/header.client.view.html
+++ b/public/modules/core/views/header.client.view.html
@@ -49,8 +49,8 @@
-
- {{ 'SIGNOUT_TAB' | translate }}
+
+ {{ 'SIGNOUT_TAB' | translate }}
diff --git a/public/modules/forms/admin/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html
index e2d674db..74d9e5a3 100644
--- a/public/modules/forms/admin/views/admin-form.client.view.html
+++ b/public/modules/forms/admin/views/admin-form.client.view.html
@@ -1,3 +1,5 @@
+
+