From 990884137befca8b6d2fd67f46ddf482533b4dcf Mon Sep 17 00:00:00 2001 From: jendib Date: Thu, 8 Aug 2013 20:17:16 +0200 Subject: [PATCH] Users viewing --- docs-web/src/main/webapp/index.html | 2 ++ docs-web/src/main/webapp/js/app.js | 18 +++++++++++++ .../main/webapp/js/controller/SettingsUser.js | 18 +++++++++++++ .../webapp/js/controller/SettingsUserEdit.js | 8 ++++++ .../src/main/webapp/partial/settings.html | 1 + .../webapp/partial/settings.user.edit.html | 13 ++++++++++ .../main/webapp/partial/settings.user.html | 26 +++++++++++++++++++ 7 files changed, 86 insertions(+) create mode 100644 docs-web/src/main/webapp/js/controller/SettingsUser.js create mode 100644 docs-web/src/main/webapp/js/controller/SettingsUserEdit.js create mode 100644 docs-web/src/main/webapp/partial/settings.user.edit.html create mode 100644 docs-web/src/main/webapp/partial/settings.user.html diff --git a/docs-web/src/main/webapp/index.html b/docs-web/src/main/webapp/index.html index 80036a4c..08afcd3e 100644 --- a/docs-web/src/main/webapp/index.html +++ b/docs-web/src/main/webapp/index.html @@ -45,6 +45,8 @@ + + diff --git a/docs-web/src/main/webapp/js/app.js b/docs-web/src/main/webapp/js/app.js index e8414734..956ff881 100644 --- a/docs-web/src/main/webapp/js/app.js +++ b/docs-web/src/main/webapp/js/app.js @@ -75,6 +75,24 @@ var App = angular.module('docs', ['ui.state', 'ui.bootstrap', 'ui.route', 'ui.ke } } }) + .state('settings.user', { + url: '/user', + views: { + 'settings': { + templateUrl: 'partial/settings.user.html', + controller: 'SettingsUser' + } + } + }) + .state('settings.user.edit', { + url: '/:username', + views: { + 'user': { + templateUrl: 'partial/settings.user.edit.html', + controller: 'SettingsUserEdit' + } + } + }) .state('document', { url: '/document', abstract: true, diff --git a/docs-web/src/main/webapp/js/controller/SettingsUser.js b/docs-web/src/main/webapp/js/controller/SettingsUser.js new file mode 100644 index 00000000..9fb033dc --- /dev/null +++ b/docs-web/src/main/webapp/js/controller/SettingsUser.js @@ -0,0 +1,18 @@ +'use strict'; + +/** + * Settings user page controller. + */ +App.controller('SettingsUser', function($scope, $state, Restangular) { + // Load users from server + Restangular.one('user/list').get({ limit: 100 }).then(function(data) { + $scope.users = data.users; + }); + + /** + * Edit a user. + */ + $scope.editUser = function(user) { + $state.transitionTo('settings.user.edit', { username: user.username }); + }; +}); \ No newline at end of file diff --git a/docs-web/src/main/webapp/js/controller/SettingsUserEdit.js b/docs-web/src/main/webapp/js/controller/SettingsUserEdit.js new file mode 100644 index 00000000..d8320a27 --- /dev/null +++ b/docs-web/src/main/webapp/js/controller/SettingsUserEdit.js @@ -0,0 +1,8 @@ +'use strict'; + +/** + * Settings user edition page controller. + */ +App.controller('SettingsUserEdit', function($scope, $stateParams, Restangular) { + $scope.user = Restangular.one('user', $stateParams.username).get(); +}); \ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/settings.html b/docs-web/src/main/webapp/partial/settings.html index 19424a39..a55214d7 100644 --- a/docs-web/src/main/webapp/partial/settings.html +++ b/docs-web/src/main/webapp/partial/settings.html @@ -7,6 +7,7 @@
  • Opened sessions
  • +
  • Users
  • Server logs
  • diff --git a/docs-web/src/main/webapp/partial/settings.user.edit.html b/docs-web/src/main/webapp/partial/settings.user.edit.html new file mode 100644 index 00000000..efce7395 --- /dev/null +++ b/docs-web/src/main/webapp/partial/settings.user.edit.html @@ -0,0 +1,13 @@ +

    {{ user.username }}

    +
    +
    E-mail
    +
    {{ user.email }}
    +
    +
    +
    Theme
    +
    {{ user.theme }}
    +
    +
    +
    Locale
    +
    {{ user.locale }}
    +
    \ No newline at end of file diff --git a/docs-web/src/main/webapp/partial/settings.user.html b/docs-web/src/main/webapp/partial/settings.user.html new file mode 100644 index 00000000..90a82d1c --- /dev/null +++ b/docs-web/src/main/webapp/partial/settings.user.html @@ -0,0 +1,26 @@ +

    Users management

    + +
    +
    +
    + + + + + + + + + + + + + +
    UsernameCreate date
    {{ user.username }}{{ user.create_date | date: 'yyyy-MM-dd' }}
    +
    + +
    +
    +
    +
    +
    \ No newline at end of file