Skip to content

GitLab

Commit bc584210 authored by Henning Leutz's avatar Henning Leutz 🥋
Browse files

Merge branch 'dev'

parents 969152f1 ac7af93b
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 16 deletions
admin/template/users/details.html
View file @ bc584210
......@@ -134,6 +134,16 @@
</thead>
<tbody>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{locale group="quiqqer/quiqqer" var="user.panel.created"}
</span>
<input type="text" name="regdate" disabled="disabled" class="field-container-field"/>
</label>
</td>
</tr>
<tr>
<td>
<label class="field-container">
......
bin/QUI/controls/users/Login.js
View file @ bc584210
/**
* @module controls/users/Login
*
* @event onLoad
* @event onAuthBegin
* @event onAuthNext
* @event onSuccess
......@@ -85,9 +86,13 @@ define('controls/users/Login', [
this.Loader.show();
}
var self = this;
QUIAjax.get('ajax_users_loginControl', function (result) {
this.$buildAuthenticator(result);
}.bind(this), {
self.$buildAuthenticator(result).then(function () {
self.fireEvent('load', [self]);
});
}, {
isAdminLogin : typeof QUIQQER_IS_ADMIN_LOGIN !== 'undefined' ? 1 : 0,
authenticators: JSON.encode(this.getAttribute('authenticators'))
});
......@@ -105,6 +110,7 @@ define('controls/users/Login', [
}
this.$refreshForm();
this.fireEvent('load', [this]);
},
/**
......@@ -152,6 +158,7 @@ define('controls/users/Login', [
* Build the authenticator from the ajax html
*
* @param {String} html
* @return {Promise}
*/
$buildAuthenticator: function (html) {
var Container = new Element('div', {
......@@ -169,7 +176,8 @@ define('controls/users/Login', [
QUIAjax.post('ajax_user_logout', function () {
window.location.reload();
});
return;
return Promise.resolve();
}
forms.setStyle('opacity', 0);
......@@ -189,7 +197,7 @@ define('controls/users/Login', [
Child.inject(forms[0]);
});
QUI.parse(forms).then(function () {
return QUI.parse(forms).then(function () {
this.Loader.hide();
forms.setStyle('top', 20);
......
bin/QUI/controls/users/User.js
View file @ bc584210
......@@ -316,8 +316,10 @@ define('controls/users/User', [
return ControlUtils.parse(self.getBody());
}).then(function () {
var LastEdit = self.getBody().getElement('[name="lastedit"]');
var LastVisit = self.getBody().getElement('[name="lastvisit"]');
var Created = self.getBody().getElement('[name="regdate"]');
var LastEdit = self.getBody().getElement('[name="lastedit"]');
var LastVisit = self.getBody().getElement('[name="lastvisit"]');
var dateOptions = {
year : 'numeric',
month : 'numeric',
......@@ -328,6 +330,18 @@ define('controls/users/User', [
hour12: false
};
if (Created && Created.value !== '' && parseInt(Created.value) !== 0) {
try {
Created.value = QUILocale.getDateTimeFormatter(dateOptions).format(
new Date(Created.value * 1000)
);
} catch (e) {
console.error(e);
}
} else if (Created) {
Created.value = '---';
}
if (LastEdit && LastEdit.value !== '' && parseInt(LastEdit.value) !== 0) {
try {
LastEdit.value = QUILocale.getDateTimeFormatter(dateOptions).format(
......@@ -418,10 +432,10 @@ define('controls/users/User', [
if (!self.getUser().getAttribute('hasPassword')) {
new Element('tr', {
html: '<td colspan="2">' +
' <div class="content-message-error">' +
QUILocale.get('quiqqer/quiqqer', 'message.user.has.no.password') +
' </div>' +
'</td>'
' <div class="content-message-error">' +
QUILocale.get('quiqqer/quiqqer', 'message.user.has.no.password') +
' </div>' +
'</td>'
}).inject(Body.getElement('tbody'));
}
}
......@@ -800,7 +814,7 @@ define('controls/users/User', [
this.Loader.hide();
return;
}
console.log(User.isActive());
console.log(User.isActive());
if (User.isActive()) {
Button.on();
Button.setAttribute('text', QUILocale.get('quiqqer/quiqqer', 'isActivate'));
......@@ -816,7 +830,7 @@ console.log(User.isActive());
this.Loader.hide();
return;
}
console.log(User.isActive());
console.log(User.isActive());
if (User.isActive()) {
Button.setSilentOn();
Button.setAttribute('text', QUILocale.get('quiqqer/quiqqer', 'isActivate'));
......
lib/locale/de.xml
View file @ bc584210
......@@ -334,6 +334,9 @@
<locale name="user.panel.userlanguage">
<de><![CDATA[Benutzersprache]]></de>
</locale>
<locale name="user.panel.created">
<de><![CDATA[Erstellt am]]></de>
</locale>
<locale name="user.panel.lastChanged">
<de><![CDATA[Zuletzte geändert am]]></de>
</locale>
......@@ -840,10 +843,12 @@
</de>
</locale>
<locale name="message.online.update.RAM.insufficient.vcs">
<de><![CDATA[Es steht PHP nicht genug Arbeitsspeicher zur Verfügung, um Pakete mit angeschaltetem VCS Updateserver zu aktualisieren oder zu installieren.]]></de>
<de>
<![CDATA[Es steht PHP nicht genug Arbeitsspeicher zur Verfügung, um Pakete mit angeschaltetem VCS Updateserver zu aktualisieren oder zu installieren.]]></de>
</locale>
<locale name="message.online.update.RAM.insufficient.vcs.lock">
<de><![CDATA[Der Lockserver kann nicht verwendet werden, wenn ein VCS Updateserver aktiviert ist und PHP steht nicht genug Arbeitsspeicher zur Verfügung, um die Operation lokal auszuführen.]]></de>
<de>
<![CDATA[Der Lockserver kann nicht verwendet werden, wenn ein VCS Updateserver aktiviert ist und PHP steht nicht genug Arbeitsspeicher zur Verfügung, um die Operation lokal auszuführen.]]></de>
</locale>
<locale name="exception.console.execute.only.in.cli">
<de><![CDATA[System Tools können nur in der CLI ausgeführt werden.]]></de>
......@@ -5406,7 +5411,8 @@
]]></de>
</locale>
<locale name="templates.mail.body.footer.text" html="true">
<de><![CDATA[<p style="padding: 0; margin: 0;">&copy; [year]<br/><a href="https://www.quiqqer.de">QUIQQER</a> Website besuchen</p>]]></de>
<de>
<![CDATA[<p style="padding: 0; margin: 0;">&copy; [year]<br/><a href="https://www.quiqqer.de">QUIQQER</a> Website besuchen</p>]]></de>
</locale>
<locale name="templates.mail.body.footer.social" html="true">
<de><![CDATA[
......
lib/locale/en.xml
View file @ bc584210
......@@ -333,8 +333,11 @@
<locale name="user.panel.userlanguage">
<en><![CDATA[User language]]></en>
</locale>
<locale name="user.panel.created">
<en><![CDATA[Created on]]></en>
</locale>
<locale name="user.panel.lastChanged">
<en><![CDATA[Last changed at]]></en>
<en><![CDATA[Last modified on]]></en>
</locale>
<locale name="user.panel.lastLogin">
<en><![CDATA[Last login]]></en>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment