ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1613 from emanuelschuetze/user-profile

Browse Source 
User settings profile view
This commit is contained in:
Oskar Hahn 2015-09-05 18:19:17 +02:00
commit c54b00c5f4
4 changed files with 78 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/core/static/js/core/core.js
View File

@ -229,12 +229,12 @@ angular.module('OpenSlidesApp.core.site', [
// Replaces any folowing points though a - // Replaces any folowing points though a -
templateUrl = 'static/templates/' + appName.replace(/\./g, '-') + '.html'; templateUrl = 'static/templates/' + appName.replace(/\./g, '-') + '.html';
} }
config.templateUrl = config.templateUrl || templateUrl; config.templateUrl = state.templateUrl || templateUrl;
// controller // controller
if (patterns.length >= 3) { if (patterns.length >= 3) {
controller = _.capitalize(patterns[1]) + defaultControllers[_.last(patterns)]; controller = _.capitalize(patterns[1]) + defaultControllers[_.last(patterns)];
config.controller = config.controller || controller; config.controller = state.controller || controller;
} }
result[name] = config; result[name] = config;
}); });

32
openslides/core/static/templates/index.html
View File

@ -1,8 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 7]> <html lang="en" ng-app="myApp" class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> <html lang="en" class="no-js"> <!-- TODO: make lang dynamic -->
<!--[if IE 7]> <html lang="en" ng-app="myApp" class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html lang="en" ng-app="myApp" class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html lang="en" class="no-js"> <!--<![endif]-->
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<base href="/"> <base href="/">
@ -34,19 +31,22 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu pull-right" role="menu"> <ul class="dropdown-menu pull-right" role="menu">
<li><a href="{% url 'user_settings' %}"> <li>
<i class="fa fa-cog"></i> <a ui-sref="users.user.detail.profile({ id: operator.user.id })">
<translate>Edit profile</translate> <i class="fa fa-cog"></i>
</a> <translate>Edit profile</translate>
<li><a href="{% url 'password_change' %}"> </a>
<i class="fa fa-key"></i> <li>
<translate>Change password</translate> <a href="#TODO">
</a> <i class="fa fa-key"></i>
<translate>Change password</translate>
</a>
<li class="divider"> <li class="divider">
<li><a ng-click="logout()" href=""> <li>
<i class="fa fa-sign-out"></i> <a ng-click="logout()" href="">
<translate>Logout</translate> <i class="fa fa-sign-out"></i>
</a> <translate>Logout</translate>
</a>
</ul> </ul>
</div> </div>
</div> </div>

19
openslides/users/static/js/users/users.js
View File

@ -122,6 +122,13 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
} }
} }
}) })
.state('users.user.detail.profile', {
views: {
'@users.user': {},
},
url: '/profile',
controller: 'UserProfileCtrl',
})
.state('users.user.import', { .state('users.user.import', {
url: '/import', url: '/import',
controller: 'UserImportCtrl', controller: 'UserImportCtrl',
@ -336,6 +343,18 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
}; };
}) })
.controller('UserProfileCtrl', function($scope, $state, User, user) {
$scope.user = user; // autoupdate is not activated
$scope.save = function (user) {
User.save(user).then(
function(success) {
// TODO: show success message
console.log("profile saved");
}
);
};
})
.controller('UserImportCtrl', function($scope, $state, User) { .controller('UserImportCtrl', function($scope, $state, User) {
// import from textarea // import from textarea
$scope.importByLine = function () { $scope.importByLine = function () {

41
openslides/users/static/templates/users/user-detail-profile.html Normal file
View File

@ -0,0 +1,41 @@
<h1>Edit profil</h1>
<form name="userForm" >
<div class="form-group">
<label for="inputUsername" translate>Username</label>
<input type="text"
ng-model="user.username"
class="form-control"
name="inputUsername"
required>
</div>
<div class="form-group row">
<div class="col-xs-2">
<label for="inputTitle" translate-comment="academic degree" translate>Title</label>
<input type="text" ng-model="user.title" class="form-control" name="inputTitle">
</div>
<div class="col-xs-5">
<label for="inputFirstName" translate>First name</label>
<input type="text" ng-model="user.first_name" class="form-control" name="inputFirstName">
</div>
<div class="col-xs-5">
<label for="inputLastName" translate>Last name</label>
<input type="text" ng-model="user.last_name" class="form-control" name="inputLastName">
</div>
</div>
<div class="form-group">
<label for="inputStructureLevel" translate>Structure level</label>
<input type="text" ng-model="user.structure_level" class="form-control" name="inputStructureLevel">
</div>
<div class="form-group">
<label for="textAbout" translate>About me</label>
<textarea ng-model="user.about_me" class="form-control" name="textAbout" />
</div>
<button type="submit" ng-click="save(user)" class="btn btn-primary" translate>
Save
</button>
<button ui-sref="users.user.list" class="btn btn-default" translate>
Cancel
</button>
</form>