mirror of
https://github.com/Sarjuuk/aowow.git
synced 2025-11-29 15:58:16 +08:00
- added not-equal-operator (!=) to numeric fields in filters
- fixed styles for embedded talent calculator
This commit is contained in:
@@ -851,6 +851,7 @@ abstract class Filter
|
|||||||
case 3: $op = '='; return true;
|
case 3: $op = '='; return true;
|
||||||
case 4: $op = '<='; return true;
|
case 4: $op = '<='; return true;
|
||||||
case 5: $op = '<'; return true;
|
case 5: $op = '<'; return true;
|
||||||
|
case 6: $op = '!='; return true;
|
||||||
default: return false;
|
default: return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class ProfilePage extends GenericPage
|
|||||||
protected $gDataKey = true;
|
protected $gDataKey = true;
|
||||||
protected $js = ['filters.js', 'TalentCalc.js', 'swfobject.js', 'profile_all.js', 'profile.js', 'Profiler.js'];
|
protected $js = ['filters.js', 'TalentCalc.js', 'swfobject.js', 'profile_all.js', 'profile.js', 'Profiler.js'];
|
||||||
protected $css = array(
|
protected $css = array(
|
||||||
['path' => 'TalentCalc.css'],
|
['path' => 'talentcalc.css'],
|
||||||
['path' => 'Profiler.css']
|
['path' => 'Profiler.css']
|
||||||
);
|
);
|
||||||
protected $profileId = 0;
|
protected $profileId = 0;
|
||||||
|
|||||||
@@ -3255,7 +3255,7 @@ var LANG = {
|
|||||||
|
|
||||||
fidropdowns: {
|
fidropdowns: {
|
||||||
yn: [ [1, "Ja"], [2, "Nein"] ],
|
yn: [ [1, "Ja"], [2, "Nein"] ],
|
||||||
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"] ],
|
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"], [6, "!="]],
|
||||||
side: [ [1, "Ja"], [2, "Allianz"], [3, "Horde"], [4, "Beide"], [5, "Nein"] ],
|
side: [ [1, "Ja"], [2, "Allianz"], [3, "Horde"], [4, "Beide"], [5, "Nein"] ],
|
||||||
faction: [
|
faction: [
|
||||||
[469, "Allianz"], [529, "Argentumdämmerung"], [1106, "Argentumkreuzzug"], [21, "Beutebucht"], [87, "Blutsegelbukaniere"],
|
[469, "Allianz"], [529, "Argentumdämmerung"], [1106, "Argentumkreuzzug"], [21, "Beutebucht"], [87, "Blutsegelbukaniere"],
|
||||||
|
|||||||
@@ -3302,7 +3302,7 @@ var LANG = {
|
|||||||
|
|
||||||
fidropdowns: {
|
fidropdowns: {
|
||||||
yn: [ [1, "Yes"], [2, "No"] ],
|
yn: [ [1, "Yes"], [2, "No"] ],
|
||||||
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"] ],
|
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"], [6, "!="]],
|
||||||
side: [ [1, "Yes"], [2, "Alliance"], [3, "Horde"], [4, "Both"], [5, "No"] ],
|
side: [ [1, "Yes"], [2, "Alliance"], [3, "Horde"], [4, "Both"], [5, "No"] ],
|
||||||
faction: [
|
faction: [
|
||||||
[469, "Alliance"], [1037, "Alliance Vanguard"], [1106, "Argent Crusade"], [529, "Argent Dawn"], [1012, "Ashtongue Deathsworn"],
|
[469, "Alliance"], [1037, "Alliance Vanguard"], [1106, "Argent Crusade"], [529, "Argent Dawn"], [1012, "Ashtongue Deathsworn"],
|
||||||
|
|||||||
@@ -3257,7 +3257,7 @@ var LANG = {
|
|||||||
|
|
||||||
fidropdowns:{
|
fidropdowns:{
|
||||||
yn: [ [1, "Sí"], [2, "No"] ],
|
yn: [ [1, "Sí"], [2, "No"] ],
|
||||||
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"] ],
|
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"], [6, "!="]], ],
|
||||||
side: [ [1, "Sí"], [2, "Alianza"], [3, "Horda"], [4, "Ambos"], [5, "No"] ],
|
side: [ [1, "Sí"], [2, "Alianza"], [3, "Horda"], [4, "Ambos"], [5, "No"] ],
|
||||||
faction: [
|
faction: [
|
||||||
[1015, "Ala Abisal"], [469, "Alianza"], [21, "Bahía del Botín"], [1011, "Bajo Arrabal"], [946, "Bastión del Honor"],
|
[1015, "Ala Abisal"], [469, "Alianza"], [21, "Bahía del Botín"], [1011, "Bajo Arrabal"], [946, "Bastión del Honor"],
|
||||||
|
|||||||
@@ -3245,7 +3245,7 @@ var LANG = {
|
|||||||
|
|
||||||
fidropdowns: {
|
fidropdowns: {
|
||||||
yn: [ [1, "Oui"], [2, "Non"] ],
|
yn: [ [1, "Oui"], [2, "Non"] ],
|
||||||
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"] ],
|
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"], [6, "!="]],
|
||||||
side: [ [1, "Oui"], [2, "Alliance"], [3, "Horde"], [4, "Les deux"], [5, "Non"] ],
|
side: [ [1, "Oui"], [2, "Alliance"], [3, "Horde"], [4, "Les deux"], [5, "Non"] ],
|
||||||
faction: [
|
faction: [
|
||||||
[1015, "Aile-du-Néant"], [469, "Alliance"], [529, "Aube d'argent"], [1037, "Avant-garde de l'Alliance"], [21, "Baie-du-Butin"],
|
[1015, "Aile-du-Néant"], [469, "Alliance"], [529, "Aube d'argent"], [1037, "Avant-garde de l'Alliance"], [21, "Baie-du-Butin"],
|
||||||
|
|||||||
@@ -3245,7 +3245,7 @@ var LANG = {
|
|||||||
|
|
||||||
fidropdowns: {
|
fidropdowns: {
|
||||||
yn: [ [1, "Да"], [2, "Нет"] ],
|
yn: [ [1, "Да"], [2, "Нет"] ],
|
||||||
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"] ],
|
num: [ [1, ">"], [2, ">="], [3, "="], [4, "<="], [5, "<"], [6, "!="]],
|
||||||
side: [ [1, "Да"], [2, "Альянс"], [3, "Орда"], [4, "Обе"], [5, "Нет"] ],
|
side: [ [1, "Да"], [2, "Альянс"], [3, "Орда"], [4, "Обе"], [5, "Нет"] ],
|
||||||
faction: [
|
faction: [
|
||||||
[1037, "Авангард Альянса"], [932, "Алдоры"], [469, "Альянс"], [967, "Аметистовое Око"], [1085, "Армия Песни Войны"],
|
[1037, "Авангард Альянса"], [932, "Алдоры"], [469, "Альянс"], [967, "Аметистовое Око"], [1085, "Армия Песни Войны"],
|
||||||
|
|||||||
Reference in New Issue
Block a user