From 9802beaf7b46de44bef333bb72facc64d7c83735 Mon Sep 17 00:00:00 2001 From: jendib Date: Sat, 11 Jan 2014 20:39:00 +0100 Subject: [PATCH] Migration of /tags and /settings views --- .../webapp/app/docs/controller/Settings.js | 4 +- .../webapp/app/docs/directive/InlineEdit.js | 2 +- docs-web/src/main/webapp/index.html | 59 +++++++------ .../webapp/partial/docs/document.edit.html | 4 +- .../webapp/partial/docs/document.view.html | 2 +- .../webapp/partial/docs/settings.account.html | 40 +++++---- .../main/webapp/partial/docs/settings.html | 32 +++---- .../webapp/partial/docs/settings.session.html | 2 +- .../partial/docs/settings.user.edit.html | 83 +++++++++++-------- .../webapp/partial/docs/settings.user.html | 42 +++++----- .../src/main/webapp/partial/docs/tag.html | 57 ++++++------- 11 files changed, 180 insertions(+), 147 deletions(-) diff --git a/docs-web/src/main/webapp/app/docs/controller/Settings.js b/docs-web/src/main/webapp/app/docs/controller/Settings.js index dfd6fbb1..269f11e6 100644 --- a/docs-web/src/main/webapp/app/docs/controller/Settings.js +++ b/docs-web/src/main/webapp/app/docs/controller/Settings.js @@ -5,7 +5,5 @@ */ App.controller('Settings', function($scope, Restangular) { // Flag if the user is admin - $scope.userInfo.then(function (data) { - $scope.isAdmin = data.base_functions.indexOf('ADMIN') != -1; - }); + $scope.isAdmin = $scope.userInfo.base_functions.indexOf('ADMIN') != -1; }); \ No newline at end of file diff --git a/docs-web/src/main/webapp/app/docs/directive/InlineEdit.js b/docs-web/src/main/webapp/app/docs/directive/InlineEdit.js index 04e71eeb..649074ab 100644 --- a/docs-web/src/main/webapp/app/docs/directive/InlineEdit.js +++ b/docs-web/src/main/webapp/app/docs/directive/InlineEdit.js @@ -11,7 +11,7 @@ App.directive('inlineEdit', function() { value: '=', editCallback: '&onEdit' }, - template: '', + template: '', link: function (scope, element, attrs) { // Let's get a reference to the input element, as we'll want to reference it. var inputElement = angular.element(element.children()[1]); diff --git a/docs-web/src/main/webapp/index.html b/docs-web/src/main/webapp/index.html index 02bed066..98c78755 100644 --- a/docs-web/src/main/webapp/index.html +++ b/docs-web/src/main/webapp/index.html @@ -59,38 +59,49 @@
diff --git a/docs-web/src/main/webapp/partial/docs/document.edit.html b/docs-web/src/main/webapp/partial/docs/document.edit.html index b3f3caf8..51b3d951 100644 --- a/docs-web/src/main/webapp/partial/docs/document.edit.html +++ b/docs-web/src/main/webapp/partial/docs/document.edit.html @@ -2,7 +2,7 @@
-
+
-
+