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

Show info text in login form (Fixes #1754)

Browse Source
This commit is contained in:
Emanuel Schuetze 2016-01-09 14:22:32 +01:00
parent 622dadd4ef
commit 363c928517
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/core/static/templates/config-form-field.html
View File

@ -6,6 +6,7 @@
type="{{ type }}" class="form-control"> type="{{ type }}" class="form-control">
<textarea ng-if="type == 'textarea'" ng-model="value" ng-change="save(configOption.key, value)" id="{{ key }}" class="form-control"> <textarea ng-if="type == 'textarea'" ng-model="value" ng-change="save(configOption.key, value)" id="{{ key }}" class="form-control">
</textarea>
<select ng-if="type == 'choice'" ng-model="value" ng-change="save(configOption.key, value)" id="{{ key }}" <select ng-if="type == 'choice'" ng-model="value" ng-change="save(configOption.key, value)" id="{{ key }}"
class="form-control" ng-options="option.value as option.display_name for option in choices"> class="form-control" ng-options="option.value as option.display_name for option in choices">

10
openslides/users/static/js/users/site.js
View File

@ -821,13 +821,15 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
function ($scope, $http, $stateParams, operator, gettextCatalog, Config) { function ($scope, $http, $stateParams, operator, gettextCatalog, Config) {
$scope.alerts = []; $scope.alerts = [];
// TODO: add welcome message only on first time (or if admin password not changed) // get login info-text from server
$http.get('/users/login/').success(function(data) {
if(data.info_text) {
$scope.alerts.push({ $scope.alerts.push({
type: 'success', type: 'success',
msg: gettextCatalog.getString("Installation was successfully.") + "<br>" + msg: data.info_text
gettextCatalog.getString("Use <strong>admin</strong> and <strong>admin</strong> for first login.") + "<br>" +
gettextCatalog.getString("Important: Please change your password!")
}); });
}
})
// close alert function // close alert function
$scope.closeAlert = function(index) { $scope.closeAlert = function(index) {
$scope.alerts.splice(index, 1); $scope.alerts.splice(index, 1);