From e7ba75c2e59fa7a9f86d4874efee33b5f9ec8d15 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 6 Feb 2018 09:56:46 +0000 Subject: [PATCH 1/4] Don't show pop-up when changing link sharing status --- .../web/app/views/project/editor/share.pug | 6 +- .../ShareProjectModalController.coffee | 59 +++---------------- 2 files changed, 11 insertions(+), 54 deletions(-) diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index 98568df122..d96c14ba0e 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -16,7 +16,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') |    a( href - ng-click="openMakeTokenBasedModal()" + ng-click="makeTokenBased()" ) #{translate('turn_on_link_sharing')} span    a( @@ -35,7 +35,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') |    a( href - ng-click="openMakePrivateModal()" + ng-click="makePrivate()" ) #{translate('turn_off_link_sharing')} span    a( @@ -62,7 +62,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') |    a( href - ng-click="openMakePrivateModal()" + ng-click="makePrivate()" ) #{translate("make_private")} .row.project-member diff --git a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee index 0c16dcbb39..ce3f00fa01 100644 --- a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee +++ b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee @@ -1,7 +1,7 @@ define [ "base" ], (App) -> - App.controller "ShareProjectModalController", ($scope, $modalInstance, $timeout, projectMembers, projectInvites, $modal, $http, ide, validateCaptcha) -> + App.controller "ShareProjectModalController", ($scope, $modalInstance, $timeout, projectMembers, projectInvites, $modal, $http, ide, validateCaptcha, settings, event_tracking) -> $scope.inputs = { privileges: "readAndWrite" contacts: [] @@ -180,19 +180,14 @@ define [ $scope.state.error = "Sorry, something went wrong resending the invite :(" event.target.blur() - $scope.openMakePrivateModal = () -> - $modal.open { - templateUrl: "makePrivateModalTemplate" - controller: "MakePrivateModalController" - scope: $scope - } + $scope.makeTokenBased = () -> + $scope.project.publicAccesLevel = "tokenBased" + settings.saveProjectAdminSettings({publicAccessLevel: "tokenBased"}) + event_tracking.sendMB 'project-make-token-based' - $scope.openMakeTokenBasedModal = () -> - $modal.open { - templateUrl: "makeTokenBasedModalTemplate" - controller: "MakeTokenBasedModalController" - scope: $scope - } + $scope.makePrivate = () -> + $scope.project.publicAccesLevel = "private" + settings.saveProjectAdminSettings({publicAccessLevel: "private"}) $scope.getReadAndWriteTokenLink = () -> if $scope?.project?.tokens?.readAndWrite? @@ -211,41 +206,3 @@ define [ $scope.cancel = () -> $modalInstance.dismiss() - - - - App.controller "MakePublicModalController", ["$scope", "$modalInstance", "settings", ($scope, $modalInstance, settings) -> - $scope.inputs = { - privileges: "readAndWrite" - } - - $scope.makePublic = () -> - $scope.project.publicAccesLevel = $scope.inputs.privileges - settings.saveProjectAdminSettings({publicAccessLevel: $scope.inputs.privileges}) - $modalInstance.close() - - $scope.cancel = () -> - $modalInstance.dismiss() - ] - - App.controller "MakeTokenBasedModalController", ["$scope", "$modalInstance", "settings", "event_tracking", ($scope, $modalInstance, settings, event_tracking) -> - - $scope.makeTokenBased = () -> - $scope.project.publicAccesLevel = "tokenBased" - settings.saveProjectAdminSettings({publicAccessLevel: "tokenBased"}) - event_tracking.sendMB 'project-make-token-based' - $modalInstance.close() - - $scope.cancel = () -> - $modalInstance.dismiss() - ] - - App.controller "MakePrivateModalController", ["$scope", "$modalInstance", "settings", ($scope, $modalInstance, settings) -> - $scope.makePrivate = () -> - $scope.project.publicAccesLevel = "private" - settings.saveProjectAdminSettings({publicAccessLevel: "private"}) - $modalInstance.close() - - $scope.cancel = () -> - $modalInstance.dismiss() - ] \ No newline at end of file From 37115b84089644feccb5b0e0bcc1c8f182c38d51 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 6 Feb 2018 10:00:59 +0000 Subject: [PATCH 2/4] Add loading indicator while server returns links --- services/web/app/views/project/editor/share.pug | 6 ++++-- .../ShareProjectModalController.coffee | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index d96c14ba0e..98513dc49b 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -49,10 +49,12 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .col-xs-12.access-token-display-area div.access-token-wrapper strong #{translate('anyone_with_link_can_edit')} - pre.access-token {{ getReadAndWriteTokenLink() }} + pre.access-token(ng-show="readAndWriteTokenLink") {{ readAndWriteTokenLink }} + pre.access-token(ng-hide="readAndWriteTokenLink") #{translate('loading')}... div.access-token-wrapper strong #{translate('anyone_with_link_can_view')} - pre.access-token {{ getReadOnlyTokenLink() }} + pre.access-token(ng-show="readOnlyTokenLink") {{ readOnlyTokenLink }} + pre.access-token(ng-hide="readOnlyTokenLink") #{translate('loading')}... //- legacy public-access .row.public-access-level(ng-show="project.publicAccesLevel == 'readAndWrite' || project.publicAccesLevel == 'readOnly'") diff --git a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee index ce3f00fa01..ed3382141d 100644 --- a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee +++ b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee @@ -189,17 +189,17 @@ define [ $scope.project.publicAccesLevel = "private" settings.saveProjectAdminSettings({publicAccessLevel: "private"}) - $scope.getReadAndWriteTokenLink = () -> - if $scope?.project?.tokens?.readAndWrite? - location.origin + "/" + $scope.project.tokens.readAndWrite + $scope.$watch "project.tokens.readAndWrite", (token) -> + if token? + $scope.readAndWriteTokenLink = "#{location.origin}/#{token}" else - '' + $scope.readAndWriteTokenLink = null - $scope.getReadOnlyTokenLink = () -> - if $scope?.project?.tokens?.readOnly? - location.origin + "/read/" + $scope.project.tokens.readOnly + $scope.$watch "project.tokens.readOnly", (token) -> + if token? + $scope.readOnlyTokenLink = "#{location.origin}/#{token}" else - '' + $scope.readOnlyTokenLink = null $scope.done = () -> $modalInstance.close() From 4f89506afcfd7de4c5b28bf04d9a85238d9a45a4 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 6 Feb 2018 10:06:32 +0000 Subject: [PATCH 3/4] Make link sharing more prominant --- services/web/app/views/project/editor/share.pug | 2 +- services/web/public/stylesheets/app/editor/share.less | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index 98513dc49b..f3c87c6eb7 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -12,7 +12,7 @@ script(type='text/ng-template', id='shareProjectModalTemplate') //- Private (with token-access available) .row.public-access-level(ng-show="project.publicAccesLevel == 'private'") .col-xs-12.text-center - | #{translate('link_sharing_is_off')}. + | #{translate('link_sharing_is_off')} |    a( href diff --git a/services/web/public/stylesheets/app/editor/share.less b/services/web/public/stylesheets/app/editor/share.less index ba1e79f4b1..13613af561 100644 --- a/services/web/public/stylesheets/app/editor/share.less +++ b/services/web/public/stylesheets/app/editor/share.less @@ -13,10 +13,9 @@ } .public-access-level { - color: @gray; padding-top: 0; - font-size: 12px; - padding-bottom: @line-height-computed/2; + font-size: 13px; + padding-bottom: @modal-inner-padding; .access-token-display-area { margin-top: @line-height-computed/4; .access-token-wrapper { From 6a1597560eaf6bf35547b9106beedd1386498470 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 6 Feb 2018 10:16:06 +0000 Subject: [PATCH 4/4] Remove unused modal templates --- .../web/app/views/project/editor/share.pug | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index f3c87c6eb7..679d36e358 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -198,64 +198,6 @@ script(type='text/ng-template', id='shareProjectModalTemplate') ng-click="done()" ) #{translate("close")} -script(type="text/ng-template", id="makeTokenBasedModalTemplate") - .modal-header - button.close( - type="button" - data-dismiss="modal" - ng-click="cancel()" - ) × - h3 Enable link-sharing? - .modal-body.modal-body-share - p #{translate('turn_on_link_sharing_consequences')} - a(href="/learn/Kb/what_is_link_sharing" target="blank") - | #{translate('learn_more_about_link_sharing')} - .modal-footer - button.btn.btn-default( - ng-click="cancel()" - ) #{translate("cancel")} - button.btn.btn-info( - ng-click="makeTokenBased()" - ) #{translate('turn_on_link_sharing')} - -script(type="text/ng-template", id="makePrivateModalTemplate") - //- Token - div(ng-if="project.publicAccesLevel == 'tokenBased'") - .modal-header - button.close( - type="button" - data-dismiss="modal" - ng-click="cancel()" - ) × - h3 #{translate("make_project_private")}? - .modal-body.modal-body-share - p #{translate('turn_off_link_sharing_consequences')} - .modal-footer - button.btn.btn-default( - ng-click="cancel()" - ) #{translate("cancel")} - button.btn.btn-info( - ng-click="makePrivate()" - ) #{translate("turn_off_link_sharing")} - //- Legacy public-access - div(ng-if="project.publicAccesLevel != 'tokenBased'") - .modal-header - button.close( - type="button" - data-dismiss="modal" - ng-click="cancel()" - ) × - h3 #{translate("make_project_private")}? - .modal-body.modal-body-share - p #{translate("make_project_private_consequences")} - .modal-footer - button.btn.btn-default( - ng-click="cancel()" - ) #{translate("cancel")} - button.btn.btn-info( - ng-click="makePrivate()" - ) #{translate("make_private")} - script(type="text/ng-template", id="shareTagTemplate") .tag-template span(ng-if="data.type")