Template/Update (Part 46 - I)
* account management rework: Base * create proper account settings page - modelviewer preferences - show ids in lists - announcement purge - public description * fix broken FKs between aowow_user_ratings and aowow_account
This commit is contained in:
Sarjuuk
parent
ab27976132
commit
155bf1e4a3
28 changed files with 1735 additions and 804 deletions
|
|
@ -502,6 +502,15 @@ a.premium-user-badge {
|
|||
border-radius: 6px;
|
||||
}
|
||||
|
||||
/* aowow - imported for account page */
|
||||
.box {
|
||||
padding: 15px;
|
||||
background: #282828;
|
||||
border-radius: 6px;
|
||||
display: table;
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
.reputation-negative-amount span { /* The whole text has the class; the number is spanned */
|
||||
color: red;
|
||||
font-weight: bold;
|
||||
|
|
@ -3202,7 +3211,7 @@ td.screenshot-cell:hover img {
|
|||
|
||||
.text h1 {
|
||||
color: white;
|
||||
font-size: 19px;
|
||||
font-size: 19px !important;
|
||||
font-weight: normal;
|
||||
border-bottom: 1px solid #505050;
|
||||
padding: 0 0 5px 0;
|
||||
|
|
|
|||
462
static/js/account.js
Normal file
462
static/js/account.js
Normal file
|
|
@ -0,0 +1,462 @@
|
|||
function pm() {
|
||||
var pass1 = $('#newpass').val();
|
||||
var pass2 = $('#confirmpass').val();
|
||||
var
|
||||
bracket = '',
|
||||
buff = '';
|
||||
|
||||
if (pass1 != '' && $WH.trim(pass1).length < 6)
|
||||
buff = '<span class="q10">' + LANG.message_passwordmin + '</span>';
|
||||
|
||||
if (pass1 != '' && pass2 != '') {
|
||||
if (buff != '')
|
||||
buff += '<br />';
|
||||
|
||||
if (pass1 == pass2)
|
||||
buff += '<span class="q2">' + LANG.myaccount_passmatch + '</span>';
|
||||
else
|
||||
buff += '<span class="q10">' + LANG.myaccount_passdontmatch + '</span>';
|
||||
}
|
||||
|
||||
if (buff != '')
|
||||
bracket = '}';
|
||||
|
||||
$WH.ge('pm1').innerHTML = bracket;
|
||||
$WH.ge('pm2').innerHTML = buff;
|
||||
}
|
||||
|
||||
function spd(form) {
|
||||
var desc = form.elements.desc;
|
||||
if (desc.value.length == 0)
|
||||
return true;
|
||||
|
||||
if (desc.value.length < 10) {
|
||||
alert(LANG.message_descriptiontooshort);
|
||||
return false;
|
||||
}
|
||||
|
||||
var charLimit = Listview.funcBox.coGetCharLimit(2);
|
||||
if (desc.value.length > charLimit)
|
||||
if (!confirm($WH.sprintf(LANG.confirm_descriptiontoolong, charLimit, desc.value.substring(charLimit - 30, charLimit))))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function sfs(form) {
|
||||
var sig = form.elements.sig;
|
||||
sig.value = $WH.trim(sig.value);
|
||||
if (sig.value.length == 0)
|
||||
return true;
|
||||
|
||||
var charLimit = Listview.funcBox.coGetCharLimit(4);
|
||||
if (sig.value.length > charLimit)
|
||||
if (!confirm($WH.sprintf(LANG.confirm_signaturetoolong, charLimit, sig.value.substring(charLimit - 30, charLimit))))
|
||||
return false;
|
||||
|
||||
var nLines;
|
||||
if ((nLines = sig.value.indexOf("\n")) != -1 && (nLines = sig.value.indexOf("\n", nLines + 1)) != -1 && (nLines = sig.value.indexOf("\n", nLines + 1)) != -1)
|
||||
if (!confirm($WH.sprintf(LANG.confirm_signaturetoomanylines, 3)))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
$('form#change-password').submit(function () {
|
||||
var curPass = $('input[name=currentPassword]');
|
||||
var newPass = $('input[name=newPassword]');
|
||||
var checkPass = $('input[name=confirmPassword]');
|
||||
|
||||
if (!curPass.val() && !newPass.val() && !checkPass.val()) {
|
||||
alert(LANG.message_enteremailorpass);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (newPass.val() || checkPass.val()) {
|
||||
if (!curPass.val()) {
|
||||
alert(LANG.message_enterpassword);
|
||||
curPass[0].focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($WH.trim(newPass.val()).length < 6) {
|
||||
alert(LANG.message_passwordmin);
|
||||
newPass[0].focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($WH.trim(newPass.val()) === $WH.trim(curPass.val())) {
|
||||
alert(LANG.message_newpassdifferent);
|
||||
newPass[0].focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (newPass.val() !== checkPass.val()) {
|
||||
alert(LANG.message_passwordsdonotmatch);
|
||||
newPass[0].focus();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
$('form#change-email').submit(function () {
|
||||
var curMail = $('input[name=current-email]');
|
||||
var newMail = $('input[name=newemail]');
|
||||
|
||||
if (!newMail.val()) {
|
||||
alert(LANG.message_enteremailorpass);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (newMail.val()) {
|
||||
if (newMail.val() == curMail.val()) {
|
||||
alert(LANG.message_newemaildifferent);
|
||||
newMail[0].focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!g_isEmailValid(newMail.val())) {
|
||||
alert(LANG.message_emailnotvalid);
|
||||
newMail[0].focus();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
$('form#change-username').submit(function () {
|
||||
var curName = $('input[name=current-username]');
|
||||
var newName = $('input[name=newUsername]');
|
||||
|
||||
if (!newName.val()) {
|
||||
alert(LANG.message_enterusername);
|
||||
newName[0].focus();
|
||||
return false;
|
||||
}
|
||||
if ($WH.trim(newName.val()).length < 4) {
|
||||
alert(LANG.message_usernamemin);
|
||||
newName[0].focus();
|
||||
return false;
|
||||
}
|
||||
if (!g_isUsernameValid(newName.val())) {
|
||||
alert(LANG.message_usernamenotvalid);
|
||||
newName[0].focus();
|
||||
return false;
|
||||
}
|
||||
if (newName.val() == curName.val()) {
|
||||
alert(LANG.message_newnamedifferent);
|
||||
newName[0].focus();
|
||||
return false;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function fa_validateForm(form) {
|
||||
if (form.elements.avatar[2].checked && form.elements.customicon.selectedIndex == 0) {
|
||||
form.action = '?upload=image-crop';
|
||||
form.enctype = 'multipart/form-data';
|
||||
}
|
||||
else {
|
||||
form.action = '?account=forum-avatar';
|
||||
form.enctype = 'application/x-www-form-urlencoded';
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function faChange(mode) {
|
||||
$WH.ge('avaSel1').style.display = (mode == 1 ? '': 'none');
|
||||
$WH.ge('avaSel2').style.display = (mode == 2 ? '': 'none');
|
||||
}
|
||||
|
||||
function spawi() {
|
||||
var inp = $WH.ge('wowicon');
|
||||
inp.value = $WH.trim(inp.value);
|
||||
|
||||
var preview = $WH.ge('avaPre1');
|
||||
while (preview.firstChild)
|
||||
$WH.de(preview.firstChild);
|
||||
|
||||
$WH.ae(preview, Icon.createUser(1, inp.value, 2, null, ((g_user.roles & U_GROUP_PREMIUM) ? g_user.settings.premiumborder : Icon.STANDARD_BORDER)));
|
||||
}
|
||||
|
||||
function spawj() {
|
||||
var avSelect = $WH.ge('customicon');
|
||||
var preview = $WH.ge('avaPre2');
|
||||
while (preview.firstChild)
|
||||
$WH.de(preview.firstChild);
|
||||
|
||||
if (avSelect.selectedIndex != 0) {
|
||||
$WH.ge('iconbrowse').style.display = 'none';
|
||||
iconId = avSelect.options[avSelect.selectedIndex].value;
|
||||
$WH.ae(preview, Icon.createUser(2, iconId, 2, null, ((g_user.roles & U_GROUP_PREMIUM) ? g_user.settings.premiumborder : Icon.STANDARD_BORDER)));
|
||||
preview.style.display = '';
|
||||
}
|
||||
else {
|
||||
preview.style.display = 'none';
|
||||
$WH.ge('iconbrowse').style.display = '';
|
||||
}
|
||||
}
|
||||
|
||||
var imageDetailDialog = new Dialog();
|
||||
Listview.templates.avatar = {
|
||||
sort: [4],
|
||||
nItemsPerPage: -1,
|
||||
mode: 1,
|
||||
poundable: 0,
|
||||
columns: [{
|
||||
id: 'name',
|
||||
name: LANG.name,
|
||||
type: 'text',
|
||||
value: 'name',
|
||||
align: 'left',
|
||||
compute: function (data, td, tr) {
|
||||
tr.onclick = imageDetailDialog.show.bind(null, 'imageupload', {
|
||||
data: data,
|
||||
onSubmit: this.template.updateImageInfo.bind(this, data)
|
||||
});
|
||||
var avIcon = Icon.createUser(2, data.id, 0, null, (g_user.roles & U_GROUP_PREMIUM) ? g_user.settings.premiumborder : Icon.STANDARD_BORDER);
|
||||
avIcon.style.cssFloat = avIcon.style.styleFloat = 'left';
|
||||
td.style.position = 'relative';
|
||||
$WH.ae(td, avIcon);
|
||||
$WH.ae(td, $WH.ce('span', { style: { paddingLeft: '7px', lineHeight: '1.8em' }, innerHTML: data.name }));
|
||||
if (data.current) {
|
||||
$WH.ae(td, $WH.ce('span', {
|
||||
style: {
|
||||
fontStyle: 'italic',
|
||||
cssFloat: 'right',
|
||||
styleFloat: 'right',
|
||||
marginTop: '3px'
|
||||
},
|
||||
className: 'small',
|
||||
innerHTML: 'Current'
|
||||
}));
|
||||
}
|
||||
},
|
||||
getVisibleText: function (a) {
|
||||
return a.caption;
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'size',
|
||||
name: 'Size',
|
||||
type: 'number',
|
||||
value: 'size',
|
||||
width: '125px',
|
||||
compute: function (a, b) {
|
||||
return Listview.funcBox.coFormatFileSize(a.size)
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'status',
|
||||
name: 'Status',
|
||||
type: 'text',
|
||||
value: 'status',
|
||||
width: '100px',
|
||||
compute: function (a, b) {
|
||||
if (a.status == 2)
|
||||
$WH.ae(b, $WH.ce('span', { className: 'q10', innerHTML: 'Rejected' }))
|
||||
else
|
||||
return 'Ready';
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'when',
|
||||
name: 'When',
|
||||
type: 'date',
|
||||
value: 'when',
|
||||
width: '150px',
|
||||
compute: function (b, d) {
|
||||
var c = $WH.ce('span');
|
||||
var a = new Date(b.when);
|
||||
g_formatDate(c, (g_serverTime - a) / 1000, a);
|
||||
$WH.ae(d, c)
|
||||
}
|
||||
}],
|
||||
onBeforeCreate: function () {
|
||||
for (i in this.data)
|
||||
this.data[i].pos = i;
|
||||
},
|
||||
createCbControls: function (e, d) {
|
||||
if (!d && this.data.length < 15)
|
||||
return;
|
||||
|
||||
var c = $WH.ce('input'),
|
||||
b = $WH.ce('input'),
|
||||
a = $WH.ce('input');
|
||||
|
||||
c.type = b.type = a.type = 'button';
|
||||
|
||||
c.value = 'Delete';
|
||||
b.value = 'Set as avatar';
|
||||
a.value = 'Upload new one';
|
||||
|
||||
c.onclick = this.template.deleteFiles.bind(this);
|
||||
b.onclick = this.template.useAvatar.bind(this);
|
||||
a.onclick = this.template.jumpToUpload.bind(this);
|
||||
|
||||
$WH.ae(e, b);
|
||||
$WH.ae(e, c);
|
||||
$WH.ae(e, a);
|
||||
},
|
||||
updateImageInfo: function (b, a) {
|
||||
if (b.name != a.name) {
|
||||
$.post('?account=rename-icon', {
|
||||
id: a.id,
|
||||
name: a.name
|
||||
});
|
||||
this.setRow(a);
|
||||
}
|
||||
},
|
||||
deleteFiles: function () {
|
||||
var rows = this.getCheckedRows();
|
||||
if (!rows.length)
|
||||
return;
|
||||
|
||||
var ids = '',
|
||||
first = true;
|
||||
$WH.array_walk(rows, function (x) {
|
||||
if (first)
|
||||
first = false;
|
||||
else
|
||||
ids += ',';
|
||||
|
||||
ids += x.id;
|
||||
});
|
||||
|
||||
var _ = confirm('Are you sure you want to delete these icons?');
|
||||
if (_ == false)
|
||||
return;
|
||||
|
||||
$.post('?account=delete-icon', { id: ids });
|
||||
|
||||
this.deleteRows(rows);
|
||||
this.resetCheckedRows();
|
||||
this.refreshRows();
|
||||
},
|
||||
useAvatar: function () {
|
||||
var rows = this.getCheckedRows();
|
||||
if (!rows.length)
|
||||
return;
|
||||
|
||||
if (rows.length > 1) {
|
||||
alert('Please select only 1 image to use as your avatar.');
|
||||
return;
|
||||
}
|
||||
|
||||
var row = rows[0];
|
||||
$WH.array_walk(this.data, function (x) {
|
||||
x.current = 0;
|
||||
x.__tr = null
|
||||
});
|
||||
row.current = 1;
|
||||
|
||||
new Ajax('?account=forum-avatar&avatar=2&customicon=' + row.id);
|
||||
this.refreshRows()
|
||||
},
|
||||
jumpToUpload: function () {
|
||||
// aowow - community is not on idx:2 for extAuth cases
|
||||
// _.show(2);
|
||||
_.show(_.tabs.findIndex((x) => x.id == 'community'));
|
||||
location.href = '?account#community';
|
||||
|
||||
var a = $WH.ac(document.fa);
|
||||
window.scrollTo(0, a.y);
|
||||
|
||||
document.fa.avatar[2].click();
|
||||
document.fa.customicon.selectedIndex = 0;
|
||||
|
||||
spawj();
|
||||
},
|
||||
onNoData: function (lv) {
|
||||
var sp = $WH.ce('span');
|
||||
var a = $WH.ce('a');
|
||||
|
||||
a.onclick = this.template.jumpToUpload.bind(this);
|
||||
a.href = 'javascript:;';
|
||||
$WH.ae(a, $WH.ct('Upload'));
|
||||
|
||||
$WH.ae(sp, $WH.ct("You havn't uploaded any custom avatars yet. "));
|
||||
$WH.ae(sp, a);
|
||||
$WH.ae(sp, $WH.ct(' one now!'));
|
||||
|
||||
$WH.ae(lv, sp);
|
||||
}
|
||||
};
|
||||
|
||||
Dialog.templates.imageupload = {
|
||||
title: LANG.dialog_imagedetails,
|
||||
// aowow - adapted to existing css - buttons: [['check', LANG.ok], ['x', LANG.cancel]],
|
||||
buttons: [['okay', LANG.ok], ['cancel', LANG.cancel]],
|
||||
fields: [
|
||||
{
|
||||
id: 'id',
|
||||
type: 'hidden',
|
||||
label: ' ',
|
||||
size: 30,
|
||||
required: 0,
|
||||
compute: function (field, value, form, td, tr) {
|
||||
var div = $WH.ce('div');
|
||||
div.style.position = 'relative';
|
||||
|
||||
var div2 = $WH.ce('div');
|
||||
div2.style.position = 'relative';
|
||||
|
||||
var img = $WH.ce('img');
|
||||
switch (this.data.type) {
|
||||
case 1:
|
||||
img = Icon.createUser(2, null, 2, null, (g_user.roles & U_GROUP_PREMIUM) ? g_user.settings.premiumborder : Icon.STANDARD_BORDER);
|
||||
break;
|
||||
}
|
||||
|
||||
$WH.ae(div2, img);
|
||||
this.icon = img;
|
||||
|
||||
$WH.ae(div, field);
|
||||
$WH.ae(div, div2);
|
||||
|
||||
$WH.ae(td, div);
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'name',
|
||||
type: 'text',
|
||||
label: LANG.dialog_imagename,
|
||||
size: 20,
|
||||
required: 1,
|
||||
submitOnEnter: 1,
|
||||
validate: function (newValue, data) {
|
||||
if (newValue.match(/^[a-zA-Z][a-zA-Z0-9 ]{0,19}$/))
|
||||
return true;
|
||||
else {
|
||||
alert(LANG.message_invalidname);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
},
|
||||
],
|
||||
onBeforeShow: function () {
|
||||
switch (this.data.type) {
|
||||
case 1:
|
||||
this.template.width = 300;
|
||||
break;
|
||||
}
|
||||
},
|
||||
onShow: function (form) {
|
||||
switch (this.data.type) {
|
||||
case 1:
|
||||
var url = g_staticUrl + '/uploads/avatars/' + this.data.id + '.jpg';
|
||||
Icon.setTexture(this.icon, 2, url);
|
||||
break;
|
||||
}
|
||||
setTimeout(function () {
|
||||
var inp = form.elements.name;
|
||||
inp.focus();
|
||||
inp.select();
|
||||
}, 1);
|
||||
}
|
||||
};
|
||||
|
|
@ -2965,6 +2965,7 @@ var LANG = {
|
|||
message_invalidname: "Bildname ist ungültig. Muss alphanumerisch sein, maximal 20 Zeichen haben und mit einem Buchstaben anfangen.",
|
||||
message_newemaildifferent: "Eure neue E-Mail-Adresse muss sich von eurer alten E-Mail-Adresse unterscheiden.",
|
||||
message_newpassdifferent: "Euer neues Kennwort muss sich von eurem alten Kennwort unterscheiden.",
|
||||
message_newnamedifferent: "Euer neuer Benutzername muss sich von eurem alten Benutzernamen unterscheiden.",
|
||||
message_noscreenshot: "Wählt bitte den Screenshot aus, den Ihr hochladen möchtet.",
|
||||
message_novideo: "Bitte gebt gültige Videoinformationen ein.",
|
||||
message_nothingtoviewin3d: "Es wurden keine Gegenstände ausgewählt, die in 3D angezeigt werden können.",
|
||||
|
|
|
|||
|
|
@ -3014,6 +3014,7 @@ var LANG = {
|
|||
message_invalidname: "Image name is invalid. Must be alphanumeric, 20 characters max, and start with a letter.",
|
||||
message_newemaildifferent: "Your new email address must be different than your previous one.",
|
||||
message_newpassdifferent: "Your new password must be different than your previous one.",
|
||||
message_newnamedifferent: "Your new username must be different than your previous one.",
|
||||
message_noscreenshot: "Please select the screenshot to upload.",
|
||||
message_novideo: "Please enter valid video information.",
|
||||
message_nothingtoviewin3d: "No items were selected that can be viewed in 3D.",
|
||||
|
|
|
|||
|
|
@ -2965,6 +2965,7 @@ var LANG = {
|
|||
message_invalidname: "El nombre de la imagen es inválido. Debe ser alfanumérico con un máx de 20 caracteres y debe empezar por una letra.",
|
||||
message_newemaildifferent: "Su nueva dirección de correo electrónico tiene que ser diferente a tu dirección de correo electrónico anterior.",
|
||||
message_newpassdifferent: "Su nueva contraseña tiene que ser diferente a Su contraseña anterior.",
|
||||
message_newnamedifferent: "Su nuevo nombre de usuario tiene que ser diferente a su nombre de usuario anterior.",
|
||||
message_noscreenshot: "Por favor seleccione la captura de pantalla para subir.",
|
||||
message_novideo: "Por favor, introduce información válida del vídeo.",
|
||||
message_nothingtoviewin3d: "No se han seleccionado objetos que se puedan ver en 3D.",
|
||||
|
|
|
|||
|
|
@ -2966,6 +2966,7 @@ var LANG = {
|
|||
message_invalidname: "Le nom de l'image est invalide. Doit être alphanumérique, 20 caractères maximum et doit commencer par une lettre.",
|
||||
message_newemaildifferent: "Votre nouvelle adresse courriel doit être différente de l'ancienne.",
|
||||
message_newpassdifferent: "Votre nouveau mot de passe doit être différent de l'ancien.",
|
||||
message_newnamedifferent: "Votre nouveau nom d'utilisateur doit être différent de l'ancien.",
|
||||
message_noscreenshot: "Veuillez sélectionner la capture d'écran à envoyer.",
|
||||
message_novideo: "Veuillez entrer des informations valide pour le vidéo.",
|
||||
message_nothingtoviewin3d: "Aucun objets qui ont été sélectionnés ne peuvent être vus en 3D.",
|
||||
|
|
|
|||
|
|
@ -2966,6 +2966,7 @@ var LANG = {
|
|||
message_invalidname: "Название изображения некорректно. Должно содержать только латинские буквы и цифры, начинаться с буквы, и быть не более 20 символов в длину.",
|
||||
message_newemaildifferent: "Прежний и новый e-mail адреса не должны совпадать.",
|
||||
message_newpassdifferent: "Прежний и новый пароли не должны совпадать.",
|
||||
message_newnamedifferent: "Прежнее и новое имя пользователя не должны совпадать.",
|
||||
message_noscreenshot: "Выберите изображение для загрузки.",
|
||||
message_novideo: "Введите корректную информацию о видео.",
|
||||
message_nothingtoviewin3d: "Вы не выбрали предметы, которые можно просмотреть в 3D.",
|
||||
|
|
|
|||
|
|
@ -3013,6 +3013,7 @@ var LANG = {
|
|||
message_invalidname: "图片名无效。必须使用字母和数字，最多20个字符，以字母开头。",
|
||||
message_newemaildifferent: "您的新邮箱地址必须不同于旧地址。",
|
||||
message_newpassdifferent: "您的新密码必须不同于旧密码。",
|
||||
message_newnamedifferent: "您的新用户名必须不同于旧用户名。",
|
||||
message_noscreenshot: "请选择要上传的截屏。",
|
||||
message_novideo: "请输入有效的视频信息。",
|
||||
message_nothingtoviewin3d: "没有选中可以3D浏览的物品。",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue