From 00dfcf66c6ae3a47779261ccd89949d1913b4a63 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Mon, 25 Jun 2018 13:44:43 +0100 Subject: [PATCH] More styling adjustments. --- services/web/app/views/user/settings.pug | 10 +++++----- .../controllers/UserAffiliationsController.coffee | 3 +++ .../factories/UserAffiliationsDataService.coffee | 1 - .../web/public/stylesheets/app/account-settings.less | 7 +++++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index 0daff32865..69401b9569 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -13,7 +13,7 @@ block content .alert.alert-success(ng-show="settingsForm.response.success") | #{translate("thanks_settings_updated")} form-messages(for="changePasswordForm") - .container-fluid + div form.row( ng-controller="UserAffiliationsController" name="affiliationsForm" @@ -79,7 +79,7 @@ block content input-required="true" ) td - div( + .affiliations-table-label( ng-if="newAffiliation.university && !ui.showManualUniversitySelectionUI" ) | {{ newAffiliation.university.name }} ( @@ -88,10 +88,10 @@ block content ng-click="selectUniversityManually();" ) change | ) - div( + .affiliations-table-label( ng-if="!newAffiliation.university && !ui.isValidEmail && !ui.showManualUniversitySelectionUI" ) Start by adding your email address. - div( + .affiliations-table-label( ng-if="!newAffiliation.university && ui.isValidEmail && !ui.isBlacklistedEmail && !ui.showManualUniversitySelectionUI" ) | Is your email affiliated with an institution? @@ -102,7 +102,7 @@ block content ) Let us know div( ng-if="ui.showManualUniversitySelectionUI" - ss) + ) .affiliations-form-group ui-select( ng-model="newAffiliation.country" diff --git a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee index c130b6068a..b8b867d411 100644 --- a/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee +++ b/services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee @@ -85,11 +85,14 @@ define [ _getUserEmails() $scope.setDefaultUserEmail = (email) -> + $scope.ui.isLoadingEmails = true UserAffiliationsDataService .setDefaultUserEmail email .then () -> _getUserEmails() + .catch () -> console.log "fodeu" $scope.removeUserEmail = (email) -> + $scope.ui.isLoadingEmails = true UserAffiliationsDataService .removeUserEmail email .then () -> _getUserEmails() diff --git a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee index 48547565c4..7ee1323f4e 100644 --- a/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee +++ b/services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee @@ -74,7 +74,6 @@ define [ setDefaultUserEmail = (email) -> $http.post "/user/emails/default", { - email, _csrf: window.csrfToken } diff --git a/services/web/public/stylesheets/app/account-settings.less b/services/web/public/stylesheets/app/account-settings.less index f89d0a5a2b..424ab84995 100644 --- a/services/web/public/stylesheets/app/account-settings.less +++ b/services/web/public/stylesheets/app/account-settings.less @@ -29,7 +29,10 @@ .affiliations-form-group { margin-bottom: @table-cell-padding; - :last-of-type { + &:last-of-type { margin-bottom: 0; } - } \ No newline at end of file + } + .affiliations-table-label { + padding-top: 4px; + }