coa/aowow
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Javascript:

Browse source 
- reviewed and used objects PageTemplate and Locale
- removed associated workarounds
- replaced ~12k tabs with ~48k spaces
- fixed some localization errors
- whoops, forgot to update some Util::$pageTemplate calls to $this
This commit is contained in:
Sarjuuk 2014-07-24 17:43:57 +02:00
parent fc589c5ebe
commit 6acee41e3d
89 changed files with 6564 additions and 6193 deletions
Download patch file Download diff file Expand all files Collapse all files

5
index.php
View file

@ -58,6 +58,7 @@ switch ($pageCall)
$altClass = 'talent';
case 'profile': // character profiler [nyi]
case 'profiles': // character profile listing [nyi]
case 'profiler': // character profiler main page
case 'quest':
case 'quests':
case 'race':
@ -142,8 +143,8 @@ switch ($pageCall)
default: // unk parameter given -> ErrorPage
if (isset($_GET['power']))
die('$WowheadPower.register(0, '.User::$localeId.', {})');
else // in conjunction with a propper rewriteRule in .htaccess...
(new GenericPage)->error();
else // in conjunction with a proper rewriteRule in .htaccess...
(new GenericPage($pageCall))->error();
break;
}

2
localization/locale_dede.php
View file

@ -884,7 +884,7 @@ $lang = array(
)),
10 => "Währung",
12 => "Quest",
13 => "schlüssel",
13 => "Schlüssel",
),
'statType' => array(
"Erhöht Euer Mana um %d.",

2
localization/locale_ruru.php
View file

@ -94,7 +94,7 @@ $lang = array(
'cappedHint' => 'Подсказка: <a href="javascript:;" onclick="fi_presetDetails();">Удалите</a> характеристики с капом (например, меткость).',
'groupBy' => "Группировать",
'gb' => array(
['Нет", "none'], ['Слот", "slot'], ['Уровень", "level'], ['Источник", "source']
['Нет', 'none'], ['Слот', 'slot'], ['Уровень', 'level'], ['Источник', 'source']
),
'compareTool' => "Инструмент сравнения предметов",
'talentCalc' => "Расчёт талантов",

4
pages/achievement.php
View file

@ -32,9 +32,9 @@ class AchievementPage extends GenericPage
protected $tabId = 0;
protected $mode = CACHETYPE_PAGE;
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
// temp locale
if ($this->mode == CACHETYPE_TOOLTIP && isset($_GET['domain']))

2
pages/achievements.php
View file

@ -45,7 +45,7 @@ class AchievementsPage extends GenericPage
$this->filterObj = new AchievementListFilter();
$this->getCategoryFromUrl($pageParam);
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['achievements']);
$this->subCat = $pageParam ? '='.$pageParam : '';

4
pages/class.php
View file

@ -18,9 +18,9 @@ class ClassPage extends GenericPage
protected $mode = CACHETYPE_PAGE;
protected $js = ['swfobject.js'];
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

4
pages/classes.php
View file

@ -16,9 +16,9 @@ class ClassesPage extends GenericPage
protected $tabId = 0;
protected $mode = CACHETYPE_PAGE;
public function __construct()
public function __construct($pageCall, $pageParam)
{
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['classes']);
}

5
pages/compare.php
View file

@ -9,6 +9,7 @@ class ComparePage extends GenericPage
{
protected $tpl = 'compare';
protected $tabId = 1;
protected $path = [1, 3];
protected $mode = CACHETYPE_NONE;
protected $js = array(
'profile.js',
@ -27,9 +28,9 @@ class ComparePage extends GenericPage
private $compareString = '';
public function __construct()
public function __construct($pageCall, $__)
{
parent::__construct();
parent::__construct($pageCall, $__);
// prefer $_GET over $_COOKIE
if (!empty($_GET['compare']))

2
pages/currencies.php
View file

@ -21,7 +21,7 @@ class CurrenciesPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['currencies']);
}

4
pages/currency.php
View file

@ -17,9 +17,9 @@ class CurrencyPage extends GenericPage
protected $tabId = 0;
protected $mode = CACHETYPE_PAGE;
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

4
pages/event.php
View file

@ -20,9 +20,9 @@ class EventPage extends GenericPage
private $hId = 0;
private $eId = 0;
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

2
pages/events.php
View file

@ -21,7 +21,7 @@ class EventsPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['events']);
}

4
pages/faction.php
View file

@ -17,9 +17,9 @@ class FactionPage extends GenericPage
protected $tabId = 0;
protected $mode = CACHETYPE_PAGE;
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

2
pages/factions.php
View file

@ -26,7 +26,7 @@ class FactionsPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['factions']);
}

25
pages/genericPage.class.php
View file

@ -61,7 +61,7 @@ class GenericPage
protected $lvData = [];
protected $title = [CFG_NAME]; // for title-Element
protected $name = ''; // for h1-Element
protected $tabId = 0;
protected $tabId = null;
protected $gDataKey = false; // adds the dataKey to the user vars
protected $js = [];
protected $css = [];
@ -71,12 +71,12 @@ class GenericPage
private $isCached = false;
private $cacheDir = 'cache/template/';
private $jsgBuffer = [];
private $gLocale = [];
private $gPageInfo = [];
private $gUser = [];
private $pageTemplate = [];
private $community = ['co' => [], 'sc' => [], 'vi' => []];
public function __construct()
public function __construct($pageCall/*, $pageParam */)
{
$this->time = microtime(true);
@ -92,10 +92,10 @@ class GenericPage
else
{
$this->gUser = User::getUserGlobals();
$this->gLocale = array(
'id' => User::$localeId,
'name' => User::$localeString
);
$this->pageTemplate['pageName'] = strtolower($pageCall);
if (isset($this->tabId))
$this->pageTemplate['activeTab'] = $this->tabId;
if (!$this->isValidPage() || !$this->tpl)
$this->error();
@ -177,6 +177,12 @@ class GenericPage
'name' => $this->name
);
if (!empty($this->path))
$this->pageTemplate['breadcrumb'] = $this->path;
if (!empty($this->filter))
$this->pageTemplate['filter'] = empty($this->filter['query']) ? 0 : 1;
if (method_exists($this, 'postCache')) // e.g. update dates for events and such
$this->postCache();
@ -326,8 +332,9 @@ class GenericPage
public function notFound($typeStr) // unknown ID
{
$this->typeStr = $typeStr;
$this->mysql = DB::Aowow()->getStatistics();
$this->typeStr = $typeStr;
$this->mysql = DB::Aowow()->getStatistics();
$this->hasComContent = false;
$this->display('text-page-generic');
exit();

6
pages/item.php
View file

@ -23,9 +23,9 @@ class ItemPage extends genericPage
'filters.js' // lolwut?
);
public function __construct($__, $param)
public function __construct($pageCall, $param)
{
parent::__construct();
parent::__construct($pageCall, $param);
$conditions = [['i.id', intVal($param)]];
@ -777,7 +777,7 @@ class ItemPage extends genericPage
if (count($extraCols) == 3)
$extraCols[] = 'Listview.extraCols.condition';
Util::$pageTemplate->extendGlobalIds(TYPE_WORLDEVENT, $e);
$this->extendGlobalIds(TYPE_WORLDEVENT, $e);
$row['condition'][] = array(
'type' => TYPE_WORLDEVENT,
'typeId' => -$e,

2
pages/items.php
View file

@ -84,7 +84,7 @@ class ItemsPage extends GenericPage
$this->filterObj = new ItemListFilter();
$this->getCategoryFromUrl($pageParam);
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['items']);
$this->subCat = $pageParam ? '='.$pageParam : '';

4
pages/itemset.php
View file

@ -21,9 +21,9 @@ class ItemsetPage extends GenericPage
'Summary.js'
);
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

2
pages/itemsets.php
View file

@ -22,7 +22,7 @@ class ItemsetsPage extends GenericPage
$this->filterObj = new ItemsetListFilter();
$this->getCategoryFromUrl($pageParam);
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['itemsets']);
}

2
pages/main.php
View file

@ -17,6 +17,8 @@ class MainPage extends GenericPage
protected function generateContent()
{
parent::__construct('home');
// load news
$rows = DB::Aowow()->select('SELECT * FROM ?_news ORDER BY time DESC, id DESC LIMIT 5');
foreach ($rows as $i => $row)

5
pages/maps.php
View file

@ -9,6 +9,7 @@ class MapsPage extends GenericPage
{
protected $tpl = 'maps';
protected $tabId = 1;
protected $path = [1, 1];
protected $mode = CACHETYPE_NONE;
protected $js = array(
'maps.js',
@ -20,9 +21,9 @@ class MapsPage extends GenericPage
['path' => 'Mapper_ie6.css', 'ieCond' => 'lte IE 6']
);
public function __construct()
public function __construct($pageCall, $__)
{
parent::__construct();
parent::__construct($pageCall, $__);
$this->name = Lang::$maps['maps'];
}

8
pages/more.php
View file

@ -27,12 +27,12 @@ class MorePage extends GenericPage
'help' => [-13, null, '']
);
public function __construct($page, $subPage)
public function __construct($pageCall, $subPage)
{
parent::__construct();
parent::__construct($pageCall, $subPage);
// chack if page is valid
if ($_ = @$this->validPages[$page])
if ($_ = @$this->validPages[$pageCall])
{
// check if subpage is valid
if (!isset($_[1]))
@ -40,7 +40,7 @@ class MorePage extends GenericPage
if (($_[1] = array_search($subPage, $this->subPages[$_[0]])) === false)
$this->error();
if ($page == 'help') // ye.. hack .. class definitions only allow static values
if ($pageCall == 'help') // ye.. hack .. class definitions only allow static values
$_[2] = Lang::$main['helpTopics'][$_[1]];
}
$this->type = $_[0];

6
pages/npc.php
View file

@ -25,9 +25,9 @@ class NpcPage extends GenericPage
// ['path' => 'Mapper_ie6.css', 'ieCond' => 'lte IE 6']
);
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
// temp locale
if ($this->mode == CACHETYPE_TOOLTIP && isset($_GET['domain']))
@ -100,7 +100,7 @@ class NpcPage extends GenericPage
{
if ($h = $_['holidayId'])
{
Util::$pageTemplate->extendGlobalIds(TYPE_WORLDEVENT, $_['id']);
$this->extendGlobalIds(TYPE_WORLDEVENT, $_['id']);
$infobox[] = Util::ucFirst(Lang::$game['eventShort']).Lang::$main['colon'].'[event='.$h.']';
}
}

2
pages/npcs.php
View file

@ -23,7 +23,7 @@ class NpcsPage extends GenericPage
$this->filterObj = new CreatureListFilter();
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['npcs']);
$this->subCat = $pageParam ? '='.$pageParam : '';

12
pages/object.php
View file

@ -32,9 +32,9 @@ class ObjectPage extends GenericPage
all of this has to be done manually
*/
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
// temp locale
if ($this->mode == CACHETYPE_TOOLTIP && isset($_GET['domain']))
@ -72,7 +72,7 @@ class ObjectPage extends GenericPage
{
if ($h = $_['holidayId'])
{
Util::$pageTemplate->extendGlobalIds(TYPE_WORLDEVENT, $_['id']);
$this->extendGlobalIds(TYPE_WORLDEVENT, $_['id']);
$infobox[] = Util::ucFirst(Lang::$game['eventShort']).Lang::$main['colon'].'[event='.$h.']';
}
}
@ -107,7 +107,7 @@ class ObjectPage extends GenericPage
if ($idx < 0)
continue;
Util::$pageTemplate->extendGlobalIds(TYPE_ITEM, $idx);
$this->extendGlobalIds(TYPE_ITEM, $idx);
$l = Lang::$gameObject['key'].Lang::$main['colon'].'[item='.$idx.']';
}
@ -120,7 +120,7 @@ class ObjectPage extends GenericPage
// linked trap
if ($_ = $this->subject->getField('linkedTrap'))
{
Util::$pageTemplate->extendGlobalIds(TYPE_OBJECT, $_);
$this->extendGlobalIds(TYPE_OBJECT, $_);
$infobox[] = Lang::$gameObject['trap'].Lang::$main['colon'].'[object='.$_.']';
}
@ -152,7 +152,7 @@ class ObjectPage extends GenericPage
{
if ($_ = $this->subject->getField('mStone'))
{
Util::$pageTemplate->extendGlobalIds(TYPE_ZONE, $_[2]);
$this->extendGlobalIds(TYPE_ZONE, $_[2]);
$m = Lang::$game['meetingStone'].Lang::$main['colon'].'[zone='.$_[2].']';
$l = $_[0];

2
pages/objects.php
View file

@ -23,7 +23,7 @@ class ObjectsPage extends GenericPage
$this->filterObj = new GameObjectListFilter();
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['gameObjects']);
$this->subCat = $pageParam ? '='.$pageParam : '';

4
pages/pet.php
View file

@ -18,9 +18,9 @@ class PetPage extends GenericPage
protected $mode = CACHETYPE_PAGE;
protected $js = ['swfobject.js'];
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

2
pages/pets.php
View file

@ -21,7 +21,7 @@ class PetsPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['pets']);
}

4
pages/profile.php
View file

@ -47,8 +47,8 @@ class ProfilePage extends GenericPage
}
else if (count($_) == 3)
{
if ($_ = DB::Aowow()->selectCell('SELECT 2161862')) // some query to validate existence of char
$this->profileId = $_;
if ($foo = DB::Aowow()->selectCell('SELECT 2161862')) // some query to validate existence of char
$this->profileId = $foo;
else
$this->notFound(Util::ucFirst(Lang::$game['profile']));

4
pages/quest.php
View file

@ -23,9 +23,9 @@ class QuestPage extends GenericPage
['path' => 'Mapper_ie6.css', 'ieCond' => 'lte IE 6']
);
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
// temp locale
if ($this->mode == CACHETYPE_TOOLTIP && isset($_GET['domain']))

2
pages/quests.php
View file

@ -24,7 +24,7 @@ class QuestsPage extends GenericPage
$this->filterObj = new QuestListFilter();
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['quests']);
$this->subCat = $pageParam ? '='.$pageParam : '';

4
pages/race.php
View file

@ -18,9 +18,9 @@ class RacePage extends GenericPage
protected $mode = CACHETYPE_PAGE;
protected $js = ['swfobject.js'];
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

4
pages/races.php
View file

@ -16,9 +16,9 @@ class RacesPage extends GenericPage
protected $tabId = 0;
protected $mode = CACHETYPE_PAGE;
public function __construct()
public function __construct($pageCall, $pageParam)
{
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['races']);
}

4
pages/search.php
View file

@ -54,7 +54,7 @@ class SearchPage extends GenericPage
['_searchFaction'], ['_searchSkill'], ['_searchPet'], ['_searchCreatureAbility'], ['_searchSpell'],
);
public function __construct($__, $pageParam)
public function __construct($pageCall, $pageParam)
{
$this->search = urlDecode(trim($pageParam));
$this->query = strtr($this->search, '?*', '_%');
@ -109,7 +109,7 @@ class SearchPage extends GenericPage
$this->notFound();
}
parent::__construct($__, $pageParam); // just to set g_user and g_locale
parent::__construct($pageCall, $pageParam); // just to set g_user and g_locale
}
private function tokenizeQuery()

4
pages/skill.php
View file

@ -19,9 +19,9 @@ class SkillPage extends GenericPage
private $cat = 0;
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);

2
pages/skills.php
View file

@ -21,7 +21,7 @@ class SkillsPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['skills']);
}

4
pages/spell.php
View file

@ -21,9 +21,9 @@ class SpellPage extends GenericPage
private $difficulties = [];
private $firstRank = 0;
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
// temp locale
if ($this->mode == CACHETYPE_TOOLTIP && isset($_GET['domain']))

2
pages/spells.php
View file

@ -88,7 +88,7 @@ class SpellsPage extends GenericPage
$this->filterObj = new SpellListFilter();
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['spells']);
$this->subCat = $pageParam ? '='.$pageParam : '';

10
pages/talent.php
View file

@ -9,6 +9,7 @@ class TalentPage extends GenericPage
{
protected $tpl = 'talent';
protected $tabId = 1;
protected $path = [1];
protected $mode = CACHETYPE_NONE;
protected $gDataKey = true;
protected $js = ['TalentCalc.js'];
@ -21,9 +22,9 @@ class TalentPage extends GenericPage
private $isPetCalc = false;
public function __construct($pageCall)
public function __construct($pageCall, $__)
{
parent::__construct();
parent::__construct($pageCall, $__);
$this->isPetCalc = $pageCall == 'petcalc';
$this->name = $this->isPetCalc ? Lang::$main['petCalc'] : Lang::$main['talentCalc'];
@ -47,7 +48,10 @@ class TalentPage extends GenericPage
array_unshift($this->title, $this->name);
}
protected function generatePath() {}
protected function generatePath()
{
$this->path[] = $this->isPetCalc ? 2 : 0;
}
}
?>

6
pages/title.php
View file

@ -24,9 +24,9 @@ class TitlePage extends GenericPage
private $nameFixed = '';
public function __construct($__, $id)
public function __construct($pageCall, $id)
{
parent::__construct();
parent::__construct($pageCall, $id);
$this->typeId = intVal($id);
@ -40,7 +40,7 @@ class TitlePage extends GenericPage
protected function generatePath()
{
$this->path[] = $this->subject->getField('typeCat');
$this->path[] = $this->subject->getField('category');
}
protected function generateTitle()

2
pages/titles.php
View file

@ -21,7 +21,7 @@ class TitlesPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['titles']);
}

2
pages/zones.php
View file

@ -29,7 +29,7 @@ class ZonesPage extends GenericPage
{
$this->getCategoryFromUrl($pageParam);;
parent::__construct();
parent::__construct($pageCall, $pageParam);
$this->name = Util::ucFirst(Lang::$game['zones']);
}

30
static/css/global.css
View file

@ -405,7 +405,7 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h1 a.icontiny span, h2 a.icontiny span, h3 a.icont
overflow: hidden;
}
a#toptabs-menu-language
a#toplinks-language
{
padding-left: 21px;
background: url(../images/icons/language.gif) left center no-repeat;
@ -536,7 +536,7 @@ a#toptabs-menu-language
#main-precontents
{
background: #141414;
padding: 10px;
padding: 5px;
border-left: 1px solid #101010;
border-right: 1px solid #101010;
}
@ -580,15 +580,7 @@ span.breadcrumb-ellipsis {
float: right;
font-size: 14px;
margin-right: 4px;
}
.path
{
cursor: default;
font-size: 15px;
/*padding: 0 0 10px 20px; */
padding-left: 20px;
background: url(../images/icons/favicon.gif) left 1px no-repeat;
padding: 5px 0 5px 0px;
}
#footer
@ -994,20 +986,6 @@ span.menu-buttons span.hassubmenu {
background: url(../images/Menu/arrow-down.gif) right center no-repeat;
}
/* start note: remove with breadcrumbs */
.menuarrow
{
padding-right: 16px;
background: url(../images/Menu/arrow-right.gif) right center no-repeat;
}
.menuarrowd
{
padding-right: 11px;
background: url(../images/Menu/arrow-down.gif) right center no-repeat;
}
/* end note */
.tabs, .text ul.tabs, ul.tabs
{
margin: 0;
@ -3575,7 +3553,7 @@ a:hover, a.open, .infobox li div, .text b
color: #E5CC80;
}
.text ul li, .comment-body ul li
.text ul, .comment-body ul
{
/* color: #c3030b; */
list-style-type: square;

138
static/js/Book.js
View file

@ -1,99 +1,99 @@
function Book(opt) {
if (!opt.parent || !opt.pages || opt.pages.length == 0) {
return;
}
if (!opt.parent || !opt.pages || opt.pages.length == 0) {
return;
}
opt.parent = $WH.ge(opt.parent);
opt.parent = $WH.ge(opt.parent);
var
var
d,
a,
_;
this.nPages = opt.pages.length;
this.nPages = opt.pages.length;
this.parent = $WH.ge(opt.parent);
this.parent.className += ' book';
this.parent = $WH.ge(opt.parent);
this.parent.className += ' book';
d = $WH.ce('div');
d.className = 'paging';
if (this.nPages == 1) {
d.style.display = 'none';
}
$WH.ns(d);
d = $WH.ce('div');
d.className = 'paging';
if (this.nPages == 1) {
d.style.display = 'none';
}
$WH.ns(d);
_ = $WH.ce('div');
_.style.visibility = 'hidden';
_.className = 'previous';
a = $WH.ce('a');
a.appendChild($WH.ct(String.fromCharCode(8249) + LANG.lvpage_previous));
a.href = 'javascript:;';
a.onclick = this.previous.bind(this);
_.appendChild(a);
d.appendChild(_);
_ = $WH.ce('div');
_.style.visibility = 'hidden';
_.className = 'previous';
a = $WH.ce('a');
a.appendChild($WH.ct(String.fromCharCode(8249) + LANG.lvpage_previous));
a.href = 'javascript:;';
a.onclick = this.previous.bind(this);
_.appendChild(a);
d.appendChild(_);
_ = $WH.ce('div');
_.style.visibility = 'hidden';
_.className = 'next';
a = $WH.ce('a');
a.appendChild($WH.ct(LANG.lvpage_next + String.fromCharCode(8250)));
a.href = 'javascript:;';
a.onclick = this.next.bind(this);
_.appendChild(a);
d.appendChild(_);
_ = $WH.ce('div');
_.style.visibility = 'hidden';
_.className = 'next';
a = $WH.ce('a');
a.appendChild($WH.ct(LANG.lvpage_next + String.fromCharCode(8250)));
a.href = 'javascript:;';
a.onclick = this.next.bind(this);
_.appendChild(a);
d.appendChild(_);
_ = $WH.ce('b');
_.appendChild($WH.ct('1'));
d.appendChild(_);
_ = $WH.ce('b');
_.appendChild($WH.ct('1'));
d.appendChild(_);
d.appendChild($WH.ct(LANG.lvpage_of));
d.appendChild($WH.ct(LANG.lvpage_of));
_ = $WH.ce('b');
_.appendChild($WH.ct(this.nPages));
d.appendChild(_);
_ = $WH.ce('b');
_.appendChild($WH.ct(this.nPages));
d.appendChild(_);
opt.parent.appendChild(d);
opt.parent.appendChild(d);
for (var i = 0; i < this.nPages; ++i) {
d = $WH.ce('div');
d.className = 'page';
d.style.display = 'none';
for (var i = 0; i < this.nPages; ++i) {
d = $WH.ce('div');
d.className = 'page';
d.style.display = 'none';
d.innerHTML = opt.pages[i];
d.innerHTML = opt.pages[i];
opt.parent.appendChild(d);
}
opt.parent.appendChild(d);
}
this.page = 1;
this.changePage(opt.page || 1);
this.page = 1;
this.changePage(opt.page || 1);
}
Book.prototype = {
changePage: function(page) {
if (page < 1) {
page = 1;
}
changePage: function(page) {
if (page < 1) {
page = 1;
}
else if (page > this.nPages) {
page = this.nPages;
}
}
var _ = this.parent.childNodes;
_[this.page].style.display = 'none';
_[page].style.display = '';
this.page = page;
var _ = this.parent.childNodes;
_[this.page].style.display = 'none';
_[page].style.display = '';
this.page = page;
_ = _[0].childNodes;
_[0].style.visibility = (page == 1) ? 'hidden': 'visible';
_[1].style.visibility = (page == this.nPages) ? 'hidden': 'visible';
_ = _[0].childNodes;
_[0].style.visibility = (page == 1) ? 'hidden': 'visible';
_[1].style.visibility = (page == this.nPages) ? 'hidden': 'visible';
_[2].innerHTML = page;
},
_[2].innerHTML = page;
},
next: function() {
this.changePage(this.page + 1);
},
next: function() {
this.changePage(this.page + 1);
},
previous: function() {
this.changePage(this.page - 1);
}
previous: function() {
this.changePage(this.page - 1);
}
};

2
static/js/Mapper.js
View file

@ -346,7 +346,7 @@ Mapper.prototype = {
this.level = level;
}
var type = g_locale.name;
var type = Locale.getName();
if($WH.isset('g_ptr') && g_ptr)
type = 'ptr';

8112
static/js/Markup.js
View file

File diff suppressed because it is too large Load diff

10
static/js/Profiler.js
View file

@ -981,12 +981,10 @@ function Profiler() {
// Breadcrumb
if (_isArmoryProfile(_profile.genuine)) {
// PageTemplate.set({ breadcrumb: [1, 5, 0, _profile.region[0], _profile.battlegroup[0], _profile.realm[0]] });
g_initPath([1, 5, 0, _profile.region[0], _profile.battlegroup[0], _profile.realm[0]]);
PageTemplate.set({ breadcrumb: [1, 5, 0, _profile.region[0], _profile.battlegroup[0], _profile.realm[0]] });
}
else {
// PageTemplate.set({ breadcrumb: [1, 5, 1] });
g_initPath([1, 5, 1]);
PageTemplate.set({ breadcrumb: [1, 5, 1] });
}
// ************************
@ -7455,7 +7453,7 @@ function ProfilerCompletion(_parent) {
}
if (_opt.onDemand && !_loading && !_loaded) {
$WH.g_ajaxIshRequest(g_host + '?data=' + _opt.onDemand + (_opt.dataArgs ? _opt.dataArgs(_profile) : '') + '&locale=' + g_locale.id + '&t=' + g_dataKey + '&callback=$WowheadProfiler.loadOnDemand&' + (new Date().getTime()));
$WH.g_ajaxIshRequest(g_host + '?data=' + _opt.onDemand + (_opt.dataArgs ? _opt.dataArgs(_profile) : '') + '&locale=' + Locale.getId() + '&t=' + g_dataKey + '&callback=$WowheadProfiler.loadOnDemand&' + (new Date().getTime()));
_imgLoading.style.display = 'block';
_divTipQuests.style.display = 'none';
_loading = this;
@ -8382,7 +8380,7 @@ function ProfilerCompletion(_parent) {
if (_category !== null) {
if (_opt.onDemand && _opt.partial && !_loaded[_category] && !_loading) {
$WH.g_ajaxIshRequest(g_host + '?data=' + _opt.onDemand + '&locale=' + g_locale.id + '&catg=' + _category + '&t=' + g_dataKey + '&callback=$WowheadProfiler.loadOnDemand&' + (new Date().getTime()));
$WH.g_ajaxIshRequest(g_host + '?data=' + _opt.onDemand + '&locale=' + Locale.getId() + '&catg=' + _category + '&t=' + g_dataKey + '&callback=$WowheadProfiler.loadOnDemand&' + (new Date().getTime()));
_imgLoading.style.display = 'block';
_divTipQuests.style.display = 'none';
_loading = this;

8
static/js/Summary.js
View file

@ -3245,7 +3245,7 @@ Summary.prototype = {
for (var i = 0, len = a[1].length; i < len; ++i) {
var row = {};
row.id = a[1][i].id;
row.name = row['name_' + g_locale.name] = a[1][i].name.substring(1);
row.name = row['name_' + Locale.getName()] = a[1][i].name.substring(1);
row.quality = 7 - a[1][i].name.charAt(0);
row.icon = a[1][i].icon;
row.level = a[1][i].level;
@ -3266,7 +3266,7 @@ Summary.prototype = {
for (var i = 0, len = a[2].length; i < len; ++i) {
var row = {};
row.id = a[2][i].id;
row.name = row['name_' + g_locale.name] = a[2][i].name.substring(1);
row.name = row['name_' + Locale.getName()] = a[2][i].name.substring(1);
row.quality = 7 - a[2][i].name.charAt(0);
row.minlevel = a[2][i].minlevel;
row.maxlevel = a[2][i].maxlevel;
@ -3687,7 +3687,7 @@ Summary.groupOver = function(group, e) {
buff += '<tr>';
buff += '<td style="text-align: right">x' + count[itemId] + '</td>';
buff += '<td><div class="indent q' + g_items[itemId].quality + '">';
buff += '<span class="icontiny" style="background: url(' + g_staticUrl + '/images/wow/icons/tiny/' + g_items[itemId].icon.toLowerCase() + '.gif) left center no-repeat">' + g_items[itemId]['name_' + g_locale.name] + '</span>';
buff += '<span class="icontiny" style="background: url(' + g_staticUrl + '/images/wow/icons/tiny/' + g_items[itemId].icon.toLowerCase() + '.gif) left center no-repeat">' + g_items[itemId]['name_' + Locale.getName()] + '</span>';
buff += '</div></td>';
buff += '<td><div class="indent q1"><small><em>' + LANG.level + ' ' + g_items[itemId].jsonequip.level + '</em></small></div></td>';
buff += '</tr>';
@ -4660,7 +4660,7 @@ Listview.templates.subitempicker = {
a.href = url;
a.rel = 'rand=' + subitem.id;
$WH.ae(a, $WH.ct(item['name_' + g_locale.name] + ' ' + subitem.name));
$WH.ae(a, $WH.ct(item['name_' + Locale.getName()] + ' ' + subitem.name));
$WH.nw(td);
$WH.ae(td, a);

4
static/js/TalentCalc.js
View file

@ -2243,7 +2243,7 @@ function TalentCalc() {
c.div.style.display = "";
}
else {
$WH.g_ajaxIshRequest('?data=talents&class=' + classId + '&locale=' + g_locale.id + '&t=' + g_dataKey + '&' + _versionBuild);
$WH.g_ajaxIshRequest('?data=talents&class=' + classId + '&locale=' + Locale.getId() + '&t=' + g_dataKey + '&' + _versionBuild);
}
}
@ -2529,7 +2529,7 @@ function TalentCalc() {
function _simplifyGlyphName(name) {
var str;
switch (g_locale.id) {
switch (Locale.getId()) {
case 0:
str = name.replace(/^Glyph of (the )?/i, '');
break;

14
static/js/basic.js
View file

@ -1328,8 +1328,8 @@ $WH.g_setTooltipLevel = function(tooltip, level) {
if (_ == 'number') {
var arr = $WH.g_getDataSource();
if (arr[tooltip] && arr[tooltip][(buff ? 'buff_' : 'tooltip_') + g_locale.name]) {
tooltip = arr[tooltip][(buff ? 'buff_' : 'tooltip_') + g_locale.name];
if (arr[tooltip] && arr[tooltip][(buff ? 'buff_' : 'tooltip_') + Locale.getName()]) {
tooltip = arr[tooltip][(buff ? 'buff_' : 'tooltip_') + Locale.getName()];
}
else {
return tooltip; // Error
@ -1528,9 +1528,9 @@ $WH.g_enhanceTooltip = function(tooltip, isStatic, useGets, showSlider, buff, kn
arr = $WH.g_getDataSource(),
id = tooltip;
if (arr[id] && arr[id][(buff ? 'buff_' : 'tooltip_') + g_locale.name]) {
tooltip = arr[id][(buff ? 'buff_' : 'tooltip_') + g_locale.name];
spellJson = arr[id][(buff ? 'buff' : '') + 'spells_' + g_locale.name];
if (arr[id] && arr[id][(buff ? 'buff_' : 'tooltip_') + Locale.getName()]) {
tooltip = arr[id][(buff ? 'buff_' : 'tooltip_') + Locale.getName()];
spellJson = arr[id][(buff ? 'buff' : '') + 'spells_' + Locale.getName()];
if (spellJson) {
tooltip = $WH.g_setTooltipSpells(tooltip, knownSpells, spellJson);
@ -1595,7 +1595,7 @@ $WH.g_enhanceTooltip = function(tooltip, isStatic, useGets, showSlider, buff, kn
$(chooseSpells)
.append('<input type="checkbox" id="known-' + i + '" />')
.append('<label for="known-' + i + '"><a rel="spell=' + i + '&know=' + i + '">' + g_spells[i]['name_' + g_locale.name] + (g_spells[i]['rank_' + g_locale.name] ? ' (' + g_spells[i]['rank_' + g_locale.name] + ')' : '') + '</a></label>')
.append('<label for="known-' + i + '"><a rel="spell=' + i + '&know=' + i + '">' + g_spells[i]['name_' + Locale.getName()] + (g_spells[i]['rank_' + Locale.getName()] ? ' (' + g_spells[i]['rank_' + Locale.getName()] + ')' : '') + '</a></label>')
.append('<br />');
$('#known-' + i).change($WH.g_tooltipSpellsChange.bind(this));
@ -1646,7 +1646,7 @@ $WH.g_staticTooltipLevelClick = function (div, level, noSlider, buff) {
}
var arr = $WH.g_getDataSource();
_ = $WH.g_setTooltipLevel(arr[itemId][(buff ? 'buff_' : 'tooltip_') + g_locale.name], level, buff);
_ = $WH.g_setTooltipLevel(arr[itemId][(buff ? 'buff_' : 'tooltip_') + Locale.getName()], level, buff);
_ = $WH.g_enhanceTooltip(_, true);
div.innerHTML = '<table><tr><td>' + _ + '</td><th style="background-position: top right"></th></tr><tr><th style="background-position: bottom left"></th><th style="background-position: bottom right"></th></tr></table>';

21
static/js/filters.js
View file

@ -522,6 +522,12 @@ function fi_reset(_this) {
fi_resetCriterion($WH.ge('fi_criteria'));
fi_resetCriterion($WH.ge('fi_weight'));
// custom start (originally a click on reset would reload the page with empty filters)
var bc = PageTemplate.get('breadcrumb');
if (typeof bc[1] !== 'undefined')
Menu.modifyUrl(Menu.findItem(mn_database, [bc[1]]), {}, {});
// custom end
var _ = $WH.ge('sdkgnsdkn436');
if (_) {
_.parentNode.style.display = 'none';
@ -1467,11 +1473,12 @@ function fi_dropdownSync(_this) {
function fi_init(type) {
fi_type = type;
var s = $WH.ge('fi_subcat');
if (g_initPath.lastIt && g_initPath.lastIt[3]) {
if (s) {
Menu.add(s, g_initPath.lastIt[3]);
}
var
s = $WH.ge('fi_subcat'),
m = Menu.findItem(mn_path, PageTemplate.get('breadcrumb'));
if (s && m[3]) {
Menu.add(s, m[3]);
}
else if (s) {
$WH.de(s.parentNode);
@ -1846,7 +1853,7 @@ function fi_filterParamToJson(filters) {
if(filters) {
var parts = filters.split(';');
$WH.array_walk(parts, function(part){
$.each(parts, function(idx, part) {
$WH.g_splitQueryParam(part, result);
});
}
@ -1859,7 +1866,7 @@ function fi_filterJsonToParam(json) {
var i = 0;
$WH.array_walk(json, function(value, _, __, name) {
$.each(json, function(name, value) {
if (value !== '') {
if (i++ > 0) {
result += ';';

2837
static/js/global.js
View file

File diff suppressed because it is too large Load diff

4
static/js/petcalc.js
View file

@ -10,7 +10,7 @@ function pc_init() {
_,
clear;
g_initPath([1, 2]);
// PageTemplate.set({ breadcrumb: [1, 2] });
$WH.ge('pc-classes').className = 'choose';
@ -97,7 +97,7 @@ function pc_onChange(tc, info, data) {
_ = pc_classIcons[pc_classId];
_.className += ' iconmedium-gold-selected';
g_initPath([1, 2, pc_classId]);
PageTemplate.set({ breadcrumb: [1, 2, pc_classId] });
}
pc_build = tc.getWhBuild();

18
static/js/profile.js
View file

@ -582,20 +582,13 @@ function pr_addEquipButton(id, itemId)
function pr_onBreadcrumbUpdate() // Add character lookup textbox to the breadcrumb
{
// var breadcrumb = PageTemplate.get('breadcrumb');
var breadcrumb = temp_path;
// end
var breadcrumb = PageTemplate.get('breadcrumb');
if(!breadcrumb || breadcrumb.length != 6) // Realm is required
return;
var path = Menu.getFullPath(mn_path, breadcrumb);
var menuItem = path[path.length - 1];
// var span = PageTemplate.expandBreadcrumb()[0];
$('.path').children('span:last').addClass('breadcrumb-arrow');
var span = ($('<span/>').appendTo($('.path')))[0];
// end
var span = PageTemplate.expandBreadcrumb()[0];
var f = $WH.ce('form'),
i = $WH.ce('input'),
@ -797,10 +790,5 @@ if($WH.isset('mn_profiles'))
Menu.findItem(mn_path, [1,5,2])[MENU_IDX_SUB] = mn_guilds;
Menu.findItem(mn_path, [1,5,3])[MENU_IDX_SUB] = mn_arenateams;
// todo (low): understand and use pageTemplate
// PageTemplate.getBreadcrumb().bind('update', pr_onBreadcrumbUpdate);
DomContentLoaded.addEvent(function() {
pr_onBreadcrumbUpdate();
});
PageTemplate.getBreadcrumb().bind('update', pr_onBreadcrumbUpdate);
}

4
static/js/talent.js
View file

@ -11,7 +11,7 @@ function tc_init() {
_,
clear;
g_initPath([1, 0]);
// PageTemplate.set({ breadcrumb: [1, 0] });
$WH.ge('tc-classes').className = 'choose';
@ -88,7 +88,7 @@ function tc_onChange(tc, info, data) {
_ = tc_classIcons[tc_classId];
_.className += ' iconmedium-gold-selected';
g_initPath([1, 0, tc_classId]);
PageTemplate.set({ breadcrumb: [1, 0, tc_classId] });
}
tc_build = tc.getWhBuild();

1046
static/js/user.js
View file

File diff suppressed because it is too large Load diff

24
template/bricks/announcement.tpl.php
View file

@ -1,19 +1,19 @@
<?php
foreach ($this->announcements as $_):
?>
<div id="announcement-<?php echo abs($_['id']); ?>"></div>
<script type="text/javascript">
new Announcement({
parent: 'announcement-<?php echo abs($_['id']); ?>',
id: <?php echo $_['id']; ?>,
text: <?php echo $_['text'][0] == '$' ? substr($_['text'], 1) : "'".Util::jsEscape($_['text'])."'" ?>,
name: '<?php echo $_['name']; ?>',
style: '<?php echo $_['style']; ?>',
status: <?php echo $_['status']; ?>,
mode: <?php echo $_['mode']; ?>
<div id="announcement-<?php echo abs($_['id']); ?>"></div>
<script type="text/javascript">
new Announcement({
parent: 'announcement-<?php echo abs($_['id']); ?>',
id: <?php echo $_['id']; ?>,
text: <?php echo $_['text'][0] == '$' ? substr($_['text'], 1) : "'".Util::jsEscape($_['text'])."'" ?>,
name: '<?php echo $_['name']; ?>',
style: '<?php echo $_['style']; ?>',
status: <?php echo $_['status']; ?>,
mode: <?php echo $_['mode']; ?>
});
</script>
});
</script>
<?php
endforeach;
?>

3
template/bricks/community.tpl.php
View file

@ -1,3 +0,0 @@
var lv_comments = <?php echo json_encode($this->community['co'], JSON_NUMERIC_CHECK); ?>;
var lv_screenshots = <?php echo json_encode($this->community['sc'], JSON_NUMERIC_CHECK); ?>;
var lv_videos = <?php echo json_encode($this->community['vi'], JSON_NUMERIC_CHECK); ?>;

1
template/bricks/head.tpl.php
View file

@ -44,6 +44,5 @@ foreach ($this->js as $js):
endforeach;
?>
<script type="text/javascript">
var g_locale = <?php echo json_encode($this->gLocale, JSON_NUMERIC_CHECK); ?>;
var g_user = <?php echo json_encode($this->gUser, JSON_NUMERIC_CHECK); ?>;
</script>

2
template/bricks/header.tpl.php
View file

@ -31,8 +31,6 @@
</div>
<script type="text/javascript">
g_initHeader(<?php echo $this->tabId; ?>);
LiveSearch.attach($WH.ge('livesearch-generic'));
<?php
foreach ($this->jsGlobals as $glob):
$this->gBrick($glob[0], ['vars' => $glob[1], 'extra' => $glob[2]]);

5
template/bricks/headerMenu.tpl.php
View file

@ -1,10 +1,9 @@
<?php
if (User::$id):
echo '<a id="toptabs-menu-profiles">'.Lang::$main['userProfiles'].'</a>|<a id="toptabs-menu-user">'.User::$displayName.'</a></a>';
echo '<a id="toplinks-user">'.User::$displayName.'</a>';
else:
echo '<a href="?account=signin">'.Lang::$main['signIn'].'</a>';
endif;
?>
|<a href="#" id="toplinks-feedback" class="icon-email"><?php echo Lang::$main['feedback']; ?></a>
|<a href="javascript:;" id="toptabs-menu-language"><?php echo Lang::$main['language']; ?><small>&#9660;</small></a>
<script type="text/javascript">g_initHeaderMenus()</script>
|<a href="javascript:;" id="toplinks-language"><?php echo Lang::$main['language']; ?><small>&#9660;</small></a>

32
template/bricks/pageTemplate.tpl.php Normal file
View file

@ -0,0 +1,32 @@
<script type="text/javascript">//<![CDATA[
<?php
if (!empty($this->hasComContent)):
echo " var lv_comments = ".json_encode($this->community['co'], JSON_NUMERIC_CHECK).";\n";
echo " var lv_screenshots = ".json_encode($this->community['sc'], JSON_NUMERIC_CHECK).";\n";
echo " var lv_videos = ".json_encode($this->community['vi'], JSON_NUMERIC_CHECK).";\n";
endif;
if (!empty($this->gPageInfo)):
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n";
// only used by item.php
if (User::$id > 0 && isset($this->redButtons[BUTTON_EQUIP]) && $this->redButtons[BUTTON_EQUIP]):
echo " DomContentLoaded.addEvent(function() { pr_addEquipButton('equip-pinned-button', ".$this->typeId."); });\n";
endif;
endif;
if (!empty($this->pageTemplate)):
if (User::$localeId):
echo " Locale.set(".User::$localeId.");\n";
endif;
echo " PageTemplate.set(".json_encode($this->pageTemplate, JSON_NUMERIC_CHECK).");\n";
echo " PageTemplate.init();\n";
endif;
if (!empty($fi)):
echo " Menu.modifyUrl(Menu.findItem(mn_database, [".$fi['menuItem']."]), { filter: '+=".$fi['query']."' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [".$fi['menuItem']."])) });\n";
endif;
?>
//]]></script>

6
template/pages/acc-dashboard.tpl.php
View file

@ -4,7 +4,11 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<?php
$this->brick('announcement');
$this->brick('pageTemplate');
?>
<script type="text/javascript">var g_pageInfo = { username: '<?php echo Util::jsEscape($this->gUser['name']); ?>' }</script>

1
template/pages/acc-recover.tpl.php
View file

@ -3,6 +3,7 @@
<div class="main" id="main">
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('pageTemplate'); ?>
<div class="pad3"></div>
<?php if (!empty($this->text)): ?>
<div class="inputbox">

1
template/pages/acc-signIn.tpl.php
View file

@ -3,6 +3,7 @@
<div class="main" id="main">
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('pageTemplate'); ?>
<div class="pad3"></div>
<script type="text/javascript">
function inputBoxValidate(f)

1
template/pages/acc-signUp.tpl.php
View file

@ -3,6 +3,7 @@
<div class="main" id="main">
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('pageTemplate'); ?>
<div class="pad3"></div>
<?php if (!empty($this->text)): ?>
<div class="inputbox">

14
template/pages/achievement.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox', ['series' => $this->series]); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php

11
template/pages/achievements.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [9]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [9])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 9]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block'; ?>;">
<form action="?achievements<?php echo $this->subCat; ?>&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

7
template/pages/compare.tpl.php
View file

@ -4,9 +4,12 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<?php
$this->brick('announcement');
$this->brick('pageTemplate');
?>
<script type="text/javascript">g_initPath([1,3])</script>
<div class="text">
<div id="compare-generic"></div>
<script type="text/javascript">//<![CDATA[

14
template/pages/detail-page-generic.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php

17
template/pages/item.tpl.php
View file

@ -4,20 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
if (User::$id > 0 && $this->redButtons[BUTTON_EQUIP]):
echo " DomContentLoaded.addEvent(function() { pr_addEquipButton('equip-pinned-button', ".$this->typeId."); });\n";
endif;
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php $this->brick('redButtons'); ?>

11
template/pages/items.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [0]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [0])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 0]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;">
<form action="?items<?php echo $this->subCat; ?>&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

14
template/pages/itemset.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php

11
template/pages/itemsets.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [2]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [2])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 2]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;">
<form action="?itemsets&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

6
template/pages/list-page-generic.tpl.php
View file

@ -8,13 +8,9 @@
$this->brick('announcement');
$this->brick('mapper');
?>
<script type="text/javascript">//<![CDATA[
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK); ?>);
//]]></script>
$this->brick('pageTemplate');
<?php
if (!empty($this->name) || !empty($this->h1Links)):
echo '<div class="text">' .
(!empty($this->h1Links) ? '<div class="h1-links">'.$this->h1Links.'</div>' : null) .

1
template/pages/main.tpl.php
View file

@ -52,6 +52,7 @@ endif;
<div id="toplinks" class="toplinks">
<?php $this->brick('headerMenu'); ?>
</div>
<?php $this->brick('pageTemplate'); ?>
</div>
<div id="footer">

7
template/pages/maps.tpl.php
View file

@ -4,11 +4,14 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<?php
$this->brick('announcement');
$this->brick('pageTemplate');
?>
<div class="text">
<div style="text-align: center">
<script type="text/javascript">g_initPath([1,1])</script>
<div class="text">
<div style="text-align: center">
<select id="maps-ek" onchange="ma_ChooseZone(this)" class="zone-picker" style="margin: 0">

14
template/pages/npc.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php $this->brick('redButtons'); ?>

11
template/pages/npcs.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [4]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [45])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 4]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;">
<form action="?npcs<?php echo $this->subCat; ?>&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

14
template/pages/object.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php $this->brick('redButtons'); ?>

11
template/pages/objects.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [5]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [5])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 5]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;">
<form action="?objects<?php echo $this->subCat; ?>&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

17
template/pages/profiles.tpl.php
View file

@ -7,20 +7,13 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
var temp_path = <?php echo json_encode($this->path, JSON_NUMERIC_CHECK); // kill with pageTemplate ?>;
<?php
/*
PageTemplate.set({pageName: 'profiles', activeTab: 1, breadcrumb: [1,5,0,'eu']});
PageTemplate.init();
*/
?>
</script>
$this->brick('announcement');
<?php # for some arcane reason a newline (\n) means, the first childNode is a text instead of the form ?>
$this->brick('pageTemplate');
# for some arcane reason a newline (\n) means, the first childNode is a text instead of the form for the following div
?>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;"><form
action="?profiles&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
<div class="rightpanel">

14
template/pages/quest.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">
<?php $this->brick('redButtons'); ?>

11
template/pages/quests.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [3]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [3])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 3]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;">
<form action="?quests<?php echo $this->subCat; ?>&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

6
template/pages/search.tpl.php
View file

@ -4,7 +4,11 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<?php
$this->brick('announcement');
$this->brick('pageTemplate');
?>
<div class="text">
<a href="<?php echo Util::$wowheadLink; ?>" class="button-red"><em><b><i>Wowhead</i></b><span>Wowhead</span></em></a>

14
template/pages/spell.tpl.php
View file

@ -4,17 +4,13 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">//<![CDATA[
<?php
$this->brick('community');
echo " var g_pageInfo = ".json_encode($this->gPageInfo, JSON_NUMERIC_CHECK).";\n" .
" g_initPath(".json_encode($this->path, JSON_NUMERIC_CHECK).");\n";
?>
//]]></script>
$this->brick('announcement');
<?php $this->brick('infobox'); ?>
$this->brick('pageTemplate');
$this->brick('infobox');
?>
<div class="text">

11
template/pages/spells.tpl.php
View file

@ -7,16 +7,11 @@ $f = $this->filter; // shorthand
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<script type="text/javascript">
g_initPath(<?php echo json_encode($this->path, JSON_NUMERIC_CHECK).', '.(empty($f['query']) ? 0 : 1) ?>);
<?php
if (!empty($f['query'])):
// todo: update menu-class Menu.modifyUrl(Menu.findItem(mn_database, [1]), { filter: '+={$f['query']|escape:'quotes'}' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, [1])) });
endif;
$this->brick('announcement');
$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 1]]);
?>
</script>
<div id="fi" style="display: <?php echo empty($f['query']) ? 'none' : 'block' ?>;">
<form action="?spells<?php echo $this->subCat; ?>&filter" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">

6
template/pages/talent.tpl.php
View file

@ -4,7 +4,11 @@
<div class="main-precontents" id="main-precontents"></div>
<div class="main-contents" id="main-contents">
<?php $this->brick('announcement'); ?>
<?php
$this->brick('announcement');
$this->brick('pageTemplate');
?>
<div id="<?php echo $this->tcType; ?>-classes">
<div id="<?php echo $this->tcType; ?>-classes-outer">

9
template/pages/text-page-generic.tpl.php
View file

@ -5,7 +5,9 @@
<div class="main-contents" id="main-contents">
<?php
$this->brick('announcement');
$this->brick('announcement');
$this->brick('pageTemplate');
if (isset($this->typeStr)):
?>
@ -17,11 +19,6 @@ if (isset($this->typeStr)):
<?php
else:
?>
<script type="text/javascript">//<![CDATA[
var g_pageInfo = <?php echo json_encode($this->gPageInfo, JSON_NUMERIC_CHECK); ?>;
<?php echo isset($this->path) ? 'g_initPath('.json_encode($this->path, JSON_NUMERIC_CHECK).');' : null; ?>
//]]></script>
<div class="text">
<h1><?php echo $this->name; ?></h1>