Javascript:

- 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

template/pages/acc-dashboard.tpl.php

@@ -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>
 

template/pages/acc-recover.tpl.php

@@ -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">

template/pages/acc-signIn.tpl.php

@@ -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)

template/pages/acc-signUp.tpl.php

@@ -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">

template/pages/achievement.tpl.php

@@ -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

template/pages/achievements.tpl.php

@@ -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)">

template/pages/compare.tpl.php

@@ -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[

template/pages/detail-page-generic.tpl.php

@@ -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

template/pages/item.tpl.php

@@ -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'); ?>

template/pages/items.tpl.php

@@ -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)">

template/pages/itemset.tpl.php

@@ -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

template/pages/itemsets.tpl.php

@@ -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)">

template/pages/list-page-generic.tpl.php

@@ -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) .

template/pages/main.tpl.php

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

template/pages/maps.tpl.php

@@ -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">

template/pages/npc.tpl.php

@@ -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'); ?>

template/pages/npcs.tpl.php

@@ -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)">

template/pages/object.tpl.php

@@ -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'); ?>

template/pages/objects.tpl.php

@@ -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)">

template/pages/profiles.tpl.php

@@ -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">

template/pages/quest.tpl.php

@@ -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'); ?>

template/pages/quests.tpl.php

@@ -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)">

template/pages/search.tpl.php

@@ -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>

template/pages/spell.tpl.php

@@ -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">
 

template/pages/spells.tpl.php

@@ -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)">

template/pages/talent.tpl.php

@@ -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">

template/pages/text-page-generic.tpl.php

@@ -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>