From 03976160bf4488c7be5ab91ab5b9189cfb14323f Mon Sep 17 00:00:00 2001 From: jendib Date: Sat, 11 Jan 2014 21:39:26 +0100 Subject: [PATCH] Migration of /share.html --- .../app/docs/controller/DocumentView.js | 2 +- docs-web/src/main/webapp/app/share/app.js | 2 +- .../webapp/app/share/controller/FileView.js | 35 ++++++++++--------- .../webapp/partial/docs/document.share.html | 2 +- .../webapp/partial/docs/settings.log.html | 2 +- .../src/main/webapp/partial/share/403.html | 2 +- .../main/webapp/partial/share/file.view.html | 20 ++++++----- .../src/main/webapp/partial/share/main.html | 2 +- .../src/main/webapp/partial/share/share.html | 14 ++++---- docs-web/src/main/webapp/share.html | 12 +++---- 10 files changed, 48 insertions(+), 45 deletions(-) diff --git a/docs-web/src/main/webapp/app/docs/controller/DocumentView.js b/docs-web/src/main/webapp/app/docs/controller/DocumentView.js index d28b1214..cf7e801e 100644 --- a/docs-web/src/main/webapp/app/docs/controller/DocumentView.js +++ b/docs-web/src/main/webapp/app/docs/controller/DocumentView.js @@ -129,7 +129,7 @@ App.controller('DocumentView', function ($scope, $state, $stateParams, $location var title = 'Shared document'; var msg = 'You can share this document by giving this link. ' + 'Note that everyone having this link can see the document.
' + - ''; + ''; var btns = [ {result: 'unshare', label: 'Unshare', cssClass: 'btn-danger'}, {result: 'close', label: 'Close'} diff --git a/docs-web/src/main/webapp/app/share/app.js b/docs-web/src/main/webapp/app/share/app.js index 3a407e3e..19bc7d57 100644 --- a/docs-web/src/main/webapp/app/share/app.js +++ b/docs-web/src/main/webapp/app/share/app.js @@ -5,7 +5,7 @@ */ var App = angular.module('share', // Dependencies - ['ui.state', 'ui.bootstrap', 'restangular', 'ngSanitize', 'ngMobile'] + ['ui.router', 'ui.bootstrap', 'restangular', 'ngSanitize', 'ngTouch'] ) /** diff --git a/docs-web/src/main/webapp/app/share/controller/FileView.js b/docs-web/src/main/webapp/app/share/controller/FileView.js index 44633d1b..542f7897 100644 --- a/docs-web/src/main/webapp/app/share/controller/FileView.js +++ b/docs-web/src/main/webapp/app/share/controller/FileView.js @@ -3,12 +3,11 @@ /** * File view controller. */ -App.controller('FileView', function($dialog, $state, $stateParams) { - var dialog = $dialog.dialog({ - keyboard: true, - dialogClass: 'modal modal-fileview', +App.controller('FileView', function($modal, $state, $stateParams) { + var modal = $modal.open({ + windowClass: 'modal modal-fileview', templateUrl: 'partial/share/file.view.html', - controller: function($scope, $state, $stateParams, Restangular, dialog) { + controller: function($rootScope, $scope, $state, $stateParams, Restangular) { // Load files Restangular.one('file').getList('list', { id: $stateParams.documentId, share: $stateParams.shareId }).then(function(data) { $scope.files = data.files; @@ -29,7 +28,6 @@ App.controller('FileView', function($dialog, $state, $stateParams) { if (value.id == $stateParams.fileId) { var next = $scope.files[key + 1]; if (next) { - dialog.close({}); $state.transitionTo('share.file', { documentId: $stateParams.documentId, shareId: $stateParams.shareId, fileId: next.id }); } } @@ -44,7 +42,6 @@ App.controller('FileView', function($dialog, $state, $stateParams) { if (value.id == $stateParams.fileId) { var previous = $scope.files[key - 1]; if (previous) { - dialog.close({}); $state.transitionTo('share.file', { documentId: $stateParams.documentId, shareId: $stateParams.shareId, fileId: previous.id }); } } @@ -62,13 +59,17 @@ App.controller('FileView', function($dialog, $state, $stateParams) { * Close the file preview. */ $scope.closeFile = function () { - dialog.close(); + modal.dismiss(); }; - // Close the dialog when the user exits this state - var off = $scope.$on('$stateChangeStart', function(event, toState){ - if (dialog.isOpen()) { - dialog.close(toState.name == 'share.file' ? {} : null); + // Close the modal when the user exits this state + var off = $rootScope.$on('$stateChangeStart', function(event, toState){ + if (!modal.closed) { + if (toState.name == 'share.file') { + modal.close(); + } else { + modal.dismiss(); + } } off(); }); @@ -76,9 +77,11 @@ App.controller('FileView', function($dialog, $state, $stateParams) { }); // Returns to share view on file close - dialog.open().then(function(result) { - if (result == null) { - $state.transitionTo('share', { documentId: $stateParams.documentId, shareId: $stateParams.shareId }); - } + modal.closed = false; + modal.result.then(function() { + modal.closed = true; + },function(result) { + modal.closed = true; + $state.transitionTo('share', { documentId: $stateParams.documentId, shareId: $stateParams.shareId }); }); }); \ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/docs/document.share.html b/docs-web/src/main/webapp/partial/docs/document.share.html index 006e5938..48bdbfad 100644 --- a/docs-web/src/main/webapp/partial/docs/document.share.html +++ b/docs-web/src/main/webapp/partial/docs/document.share.html @@ -4,7 +4,7 @@

- +

diff --git a/docs-web/src/main/webapp/partial/docs/settings.log.html b/docs-web/src/main/webapp/partial/docs/settings.log.html index b66ef248..32769daa 100644 --- a/docs-web/src/main/webapp/partial/docs/settings.log.html +++ b/docs-web/src/main/webapp/partial/docs/settings.log.html @@ -9,7 +9,7 @@ + ng-class="{ info: log.level == 'INFO' || log.level == 'DEBUG', warning: log.level == 'WARN', danger: log.level == 'ERROR' || log.level == 'FATAL' }"> {{ log.date | date: 'yyyy-MM-dd HH:mm' }} {{ log.tag }} {{ log.message }} diff --git a/docs-web/src/main/webapp/partial/share/403.html b/docs-web/src/main/webapp/partial/share/403.html index 1a7013d3..5c87df40 100644 --- a/docs-web/src/main/webapp/partial/share/403.html +++ b/docs-web/src/main/webapp/partial/share/403.html @@ -1,4 +1,4 @@ -
+

Not authorized

The document you are trying to view is not shared anymore

\ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/share/file.view.html b/docs-web/src/main/webapp/partial/share/file.view.html index 0fbb368e..009df8cb 100644 --- a/docs-web/src/main/webapp/partial/share/file.view.html +++ b/docs-web/src/main/webapp/partial/share/file.view.html @@ -1,21 +1,23 @@
- +
- - + +
- +
- +
- - -
+
-
+
\ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/share/main.html b/docs-web/src/main/webapp/partial/share/main.html index 454aef3e..9b09c1ea 100644 --- a/docs-web/src/main/webapp/partial/share/main.html +++ b/docs-web/src/main/webapp/partial/share/main.html @@ -1,4 +1,4 @@ -
+

Sismics Docs

Ask a shared document link to access it

\ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/share/share.html b/docs-web/src/main/webapp/partial/share/share.html index e2a1bb37..3fc83599 100644 --- a/docs-web/src/main/webapp/partial/share/share.html +++ b/docs-web/src/main/webapp/partial/share/share.html @@ -1,23 +1,23 @@ -
-
+
+

{{ document.title }} {{ document.create_date | date: 'yyyy-MM-dd' }}

-
    +
    • {{ tag.name }}

-
    -
  • +
    +
    -
    • -
+
+
diff --git a/docs-web/src/main/webapp/share.html b/docs-web/src/main/webapp/share.html index 2860e105..ab390594 100644 --- a/docs-web/src/main/webapp/share.html +++ b/docs-web/src/main/webapp/share.html @@ -33,15 +33,13 @@ -
-
-
- Sismics Docs -
+ -
-
+
+
\ No newline at end of file