Profiler/Frontend

* add pages and templates to display arena teams, guilds and chars
2025-11-29 15:58:16 +08:00 · 2018-03-22 17:38:44 +01:00
parent 3fd25ca889
commit 0ff0e5b59e
35 changed files with 1570 additions and 486 deletions
--- a/template/bricks/filter.tpl.php
+++ b/template/bricks/filter.tpl.php
@@ -1,6 +1,16 @@
            <script type="text/javascript">//<![CDATA[
-                fi_init('<?=$fi['init'];?>');
+<?php if (isset($this->region) && isset($this->realm)): ?>
+                pr_setRegionRealm($WH.ge('fi').firstChild, '<?=$this->region; ?>', '<?=$this->realm; ?>');
+                pr_onChangeRace();
 <?php
+endif;
+
+if (!empty($fi['init'])):
+    echo "                fi_init('".$fi['init']."');\n";
+elseif (!empty($fi['type'])):
+    echo "                var fi_type = '".$fi['type']."'\n";
+endif;
+
 if (!empty($fi['sc'])):
    echo '                fi_setCriteria('.Util::toJSON($fi['sc']['cr'] ?: []).', '.Util::toJSON($fi['sc']['crs'] ?: []).', '.Util::toJSON($fi['sc']['crv'] ?: []).");\n";
 endif;
--- a/template/bricks/pageTemplate.tpl.php
+++ b/template/bricks/pageTemplate.tpl.php
@@ -26,6 +26,7 @@ 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";
+        // $(document).ready(function(){ Menu.modifyUrl(Menu.findItem(mn_path, [1,5]), { filter: 'na=Malgayne'}, { onAppendCollision: fi_mergeFilterParams }) });
 endif;
 ?>
            //]]></script>
--- a/template/bricks/redButtons.tpl.php
+++ b/template/bricks/redButtons.tpl.php
@@ -71,3 +71,12 @@ endif;
 if (isset($this->redButtons[BUTTON_EQUIP])):
    echo '<div id="equip-pinned-button"></div>'; /* content is added by jScript */
 endif;
+
+// resync profiler content
+if (isset($this->redButtons[BUTTON_RESYNC])):
+    if ($b = $this->redButtons[BUTTON_RESYNC]):
+        echo '<a href="javascript:;" class="button-red" onclick="pr_resyncRoster('.$b[0].',\''.$b[1].'\')"><em><b><i>'.Lang::profiler('resync').'</i></b><span>'.Lang::profiler('resync').'</span></em></a>';
+    else:
+        echo '<a href="javascript:;" class="button-red button-red-disabled"><em><b><i>'.Lang::profiler('resync').'</i></b><span>'.Lang::profiler('resync').'</span></em></a>';
+    endif;
+endif;
--- a/template/listviews/membersCol.tpl.php
+++ b/template/listviews/membersCol.tpl.php
@@ -0,0 +1,41 @@
+Listview.extraCols.members = {
+    id: 'members',
+    name: LANG.members,
+    after: 'name',
+    sortable: false,
+    type: 'text',
+    compute: function(profile, td) {
+        if (profile.members) {
+            var
+                mbs = profile.members,
+                d   = $WH.ce('div');
+
+            d.style.width = (26 * mbs.length) + 'px';
+            d.style.margin = '0 auto';
+
+            for (var i = 0, len = mbs.length; i < len; ++i) {
+                var icon = Icon.create('class_' + g_file_classes[mbs[i][1]], 0, null, '?profile=' + profile.region + '.' + profile.realm + '.' + g_urlize(mbs[i][0], true));
+
+                if (mbs[i][2])
+                    icon.className += ' iconsmall-gold';
+
+                icon.style.cssFloat = icon.style.styleFloat = 'left';
+                $WH.ae(d, icon);
+            }
+
+            $WH.ae(td, d);
+        }
+    },
+    getVisibleText: function(profile) {
+        if (profile.members) {
+            var
+                buff = '',
+                mbs = profile.members;
+
+            for (var i = 0, len = mbs.length; i < len; ++i)
+                buff += mbs[i][0] + ' ' + g_chr_classes[mbs[i][1]] + ' ';
+
+            return buff.rtrim();
+        }
+    }
+};
--- a/template/listviews/profile.tpl.php
+++ b/template/listviews/profile.tpl.php
@@ -1,41 +0,0 @@
-<?php
-    Util::addNote(U_GROUP_NONE, 'Profile-listview NYI');
-/* data:
-{
-    id:{$curr.id},
-    name:'{$curr.name|escape:"javascript"}',
-    race:{$curr.race},
-    classs:{$curr.class},
-    gender:{$curr.gender},
-    level:{$curr.level},
-    faction:{$curr.faction},
-    talenttree1:{$curr.tree[0]},
-    talenttree2:{$curr.tree[1]},
-    talenttree3:{$curr.tree[2]},
-    talentspec:{$curr.spec},
-    achievementpoints:{$curr.acvPts},
-    guild:'{$curr.guildName|escape:"javascript"}', {* 0 if none *}
-    guildrank:{$curr.guildRank},
-    {if isset($curr.description)}
-        description:'{$curr.description|escape:"javascript"}',
-    {/if}
-    {if isset($curr.icon)}
-        icon:'{$curr.icon|escape:"javascript"}',
-    {/if}
-    {if isset($curr.published)}
-        published:1,
-    {/if}
-    {if isset($curr.pinned)}
-        pinned:1,
-    {/if}
-    {if isset($curr.deleted)}
-        deleted:1,
-    {/if}
-    realm:'{$curr.realmInternal|escape:"javascript"}',
-    realmname:'{$curr.realmName|escape:"javascript"}',
-    battlegroup:'{$curr.bgInternal|escape:"javascript"}',
-    battlegroupname:'{$curr.bgName|escape:"javascript"}',
-    region:'{$curr.region|escape:"javascript"}'
-}
-*/
-?>
--- a/template/pages/arena-teams.tpl.php
+++ b/template/pages/arena-teams.tpl.php
@@ -0,0 +1,77 @@
+<?php
+$this->brick('header');
+$f = $this->filter;                                         // shorthand
+?>
+
+    <div class="main" id="main">
+        <div class="main-precontents" id="main-precontents"></div>
+        <div class="main-contents" id="main-contents">
+
+<?php
+$this->brick('announcement');
+
+$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 2]]);
+
+# 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: <?=(empty($f['query']) ? 'none' : 'block'); ?>;"><form
+                action="?filter=arena-teams&<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
+                    <table>
+                        <tr>
+                            <td><?=Util::ucFirst(Lang::main('name')).Lang::main('colon'); ?></td>
+                            <td colspan="3">
+                                <table><tr>
+                                    <td>&nbsp;<input type="text" name="na" size="30" <?=(isset($f['na']) ? 'value="'.Util::htmlEscape($f['na']).'" ' : null); ?>/></td>
+                                    <td>&nbsp; <input type="checkbox" name="ex" value="on" id="profile-ex" <?=(isset($f['ex']) ? 'checked="checked"' : null); ?>/></td>
+                                    <td><label for="profile-ex"><span class="tip" onmouseover="$WH.Tooltip.showAtCursor(event, LANG.tooltip_exactprofilesearch, 0, 0, 'q')" onmousemove="$WH.Tooltip.cursorUpdate(event)" onmouseout="$WH.Tooltip.hide()"><?=Lang::main('exactMatch'); ?></span></label></td>
+                                </tr></table>
+                            </td>
+                        </tr><tr>
+                            <td class="padded"><?=Lang::profiler('region').Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<select name="rg" onchange="pr_onChangeRegion(this.form, null, null)">
+                            <option></option>
+<?php
+    foreach (array_unique(array_column(Profiler::getRealms(), 'region')) as $rg):
+        echo "                             <option value=\"".$rg."\">".Lang::profiler('regions', $rg)."</option>\n";
+    endforeach;
+?>
+                            </select>&nbsp;</td>
+                            <td style="width:50px;" class="padded">&nbsp;&nbsp;&nbsp;<?=Lang::profiler('realm').Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<select name="sv"><option></option></select><input type="hidden" name="bg" value="<?=(isset($f['bg']) ? Util::htmlEscape($f['bg']) : null); ?>" /></td>
+                        </tr><tr>
+                            <td class="padded"><?=Lang::main('side').Lang::main('colon'); ?></td>
+                            <td class="padded" style="width:80px;">&nbsp;<select name="si">
+                                <option></option>
+                                <option value="1"<?=(!empty($f['si']) && $f['si'] == 1 ? ' selected' : null);?>><?=Lang::game('si', 1); ?></option>
+                                <option value="2"<?=(!empty($f['si']) && $f['si'] == 2 ? ' selected' : null);?>><?=Lang::game('si', 2); ?></option>
+                            </select></td>
+                            <td class="padded">&nbsp;&nbsp;&nbsp;Size<?=Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<select name="sz">
+                                <option></option>
+                                <option value="2"<?=(!empty($f['sz']) && $f['sz'] == 2 ? ' selected' : null);?>>2v2</option>
+                                <option value="3"<?=(!empty($f['sz']) && $f['sz'] == 3 ? ' selected' : null);?>>3v3</option>
+                                <option value="5"<?=(!empty($f['sz']) && $f['sz'] == 5 ? ' selected' : null);?>>5v5</option>
+                            </select></td>
+                        </tr>
+                    </table>
+
+                    <div class="clear"></div>
+
+                    <div class="padded">
+                        <input type="submit" value="<?=Lang::main('applyFilter'); ?>" />
+                        <input type="reset" value="<?=Lang::main('resetForm'); ?>" />
+                    </div>
+
+                </form>
+                <div class="pad"></div>
+            </div>
+
+<?php $this->brick('filter', ['fi' => $f['initData']]); ?>
+
+<?php $this->brick('lvTabs'); ?>
+
+            <div class="clear"></div>
+        </div><!-- main-contents -->
+    </div><!-- main -->
+
+<?php $this->brick('footer'); ?>
--- a/template/pages/guilds.tpl
+++ b/template/pages/guilds.tpl
@@ -1,77 +0,0 @@
-{include file='header.tpl'}
-
-    <div class="main" id="main">
-        <div class="main-precontents" id="main-precontents"></div>
-        <div class="main-contents" id="main-contents">
-{if !empty($announcements)}
-    {foreach from=$announcements item=item}
-        {include file='bricks/announcement.tpl' an=$item}
-    {/foreach}
-{/if}
-
-            <script type="text/javascript">
-                g_initPath({$page.path}, {if empty($filter.query)} 0 {else} 1 {/if});           _// activeTab: 1, breadcrumb: [1,5,2,'eu','blackout','dragonblight']});
-                {if isset($filter.query)}Menu.append(mn_database[1], '&filter={$filter.query|escape:'quotes'}'); // todo: menu order varies per locale{/if}
-            </script>
-
-            <div id="fi">
-                <form action="/web/20120205222627/http://www.wowhead.com/filter=guilds" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
-                <table>
-                    <tr>
-                        <td>{$lang.name}{$lang.colon}</td>
-                        <td colspan="3">
-                            <table><tr>
-                                <td>&nbsp;<input type="text" name="na" size="30" /></td>
-                                <td>&nbsp; <input type="checkbox" name="ex" value="on" id="profile-ex" /></td>
-                                <td><label for="profile-ex"><span class="tip" onmouseover="$WH.Tooltip.showAtCursor(event, LANG.tooltip_exactprofilesearch, 0, 0, 'q')" onmousemove="$WH.Tooltip.cursorUpdate(event)" onmouseout="$WH.Tooltip.hide()">Exact match</span></label></td>
-                            </tr></table>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="padded">Region{$lang.colon}</td>
-                        <td class="padded">&nbsp;<select name="rg" onchange="pr_onChangeRegion(this.form, null, null)">
-                            <option></option>
-                            <option value="us">US &amp; Oceanic</option>
-                            <option value="eu" selected="selected">Europe</option>
-                        </select>&nbsp;</td>
-                        <td class="padded">&nbsp;&nbsp;&nbsp;Realm{$lang.colon}</td>
-                        <td class="padded">&nbsp;<select name="sv"><option></option></select><input type="hidden" name="bg" value="blackout" /></td>
-                    </tr>
-                    <tr>
-                    <td class="padded">{$lang.side}{$lang.colon}</td>
-                        <td class="padded">&nbsp;<select name="si">
-                            <option></option>
-                            <option value="1" {if isset($filter.si) && $filter.si == 1}selected{/if}>{$lang.alliance}</option>
-                            <option value="2" {if isset($filter.si) && $filter.si == 2}selected{/if}>{$lang.horde}</option>
-                        </select>&nbsp;</td>
-                        <td class="padded">&nbsp;&nbsp;&nbsp;Level{$lang.colon}</td>
-                        <td class="padded">&nbsp;<input type="text" name="minle" maxlength="2" class="smalltextbox" /> - <input type="text" name="maxle" maxlength="2" class="smalltextbox" /></td>
-                    </tr>
-                </table>
-
-                <div class="clear"></div>
-
-                <div class="padded"></div>
-                <input type="submit" value="{$lang.applyFilter}" /><div style="float: right">{$lang.refineSearch}</div>
-
-                </form>
-                <div class="pad"></div>
-            </div>
-
-            <script type="text/javascript">//<![CDATA[
-                // pr_setRegionRealm($WH.ge('fi').firstChild, 'eu', 'Dragonblight');
-                // var fi_type = 'guilds';
-                fi_init('guilds');
-                {if isset($filter.setCr)}{$filter.setCr}{/if}
-            //]]></script>
-
-            <div id="lv-guilds" class="listview"></div>
-            <script type="text/javascript">//<![CDATA[
-                {include file='listviews/profiles.tpl' data=$data.page params=$data.params}
-            //]]></script>
-
-            <div class="clear"></div>
-        </div><!-- main-contents -->
-    </div><!-- main -->
-
-{include file='footer.tpl'}
--- a/template/pages/guilds.tpl.php
+++ b/template/pages/guilds.tpl.php
@@ -0,0 +1,72 @@
+<?php
+$this->brick('header');
+$f = $this->filter;                                         // shorthand
+?>
+
+    <div class="main" id="main">
+        <div class="main-precontents" id="main-precontents"></div>
+        <div class="main-contents" id="main-contents">
+
+<?php
+$this->brick('announcement');
+
+$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 2]]);
+
+# 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: <?=(empty($f['query']) ? 'none' : 'block'); ?>;"><form
+                action="?filter=guilds&<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
+                    <table>
+                        <tr>
+                            <td><?=Util::ucFirst(Lang::main('name')).Lang::main('colon'); ?></td>
+                            <td colspan="3">
+                                <table><tr>
+                                    <td>&nbsp;<input type="text" name="na" size="30" <?=(isset($f['na']) ? 'value="'.Util::htmlEscape($f['na']).'" ' : null); ?>/></td>
+                                    <td>&nbsp; <input type="checkbox" name="ex" value="on" id="profile-ex" <?=(isset($f['ex']) ? 'checked="checked"' : null); ?>/></td>
+                                    <td><label for="profile-ex"><span class="tip" onmouseover="$WH.Tooltip.showAtCursor(event, LANG.tooltip_exactprofilesearch, 0, 0, 'q')" onmousemove="$WH.Tooltip.cursorUpdate(event)" onmouseout="$WH.Tooltip.hide()"><?=Lang::main('exactMatch'); ?></span></label></td>
+                                </tr></table>
+                            </td>
+                        </tr><tr>
+                            <td class="padded"><?=Lang::profiler('region').Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<select name="rg" onchange="pr_onChangeRegion(this.form, null, null)">
+                            <option></option>
+<?php
+    foreach (array_unique(array_column(Profiler::getRealms(), 'region')) as $rg):
+        echo "                             <option value=\"".$rg."\">".Lang::profiler('regions', $rg)."</option>\n";
+    endforeach;
+?>
+                            </select>&nbsp;</td>
+                            <td style="width:50px;" class="padded">&nbsp;&nbsp;&nbsp;<?=Lang::profiler('realm').Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<select name="sv"><option></option></select><input type="hidden" name="bg" value="<?=(isset($f['bg']) ? Util::htmlEscape($f['bg']) : null); ?>" /></td>
+                        </tr><tr>
+                            <td class="padded"><?=Lang::main('side').Lang::main('colon'); ?></td>
+                            <td class="padded" style="width:80px;">&nbsp;<select name="si">
+                                <option></option>
+                                <option value="1"<?=(!empty($f['si']) && $f['si'] == 1 ? ' selected' : null);?>><?=Lang::game('si', 1); ?></option>
+                                <option value="2"<?=(!empty($f['si']) && $f['si'] == 2 ? ' selected' : null);?>><?=Lang::game('si', 2); ?></option>
+                            </select></td>
+                            <td class="padded">&nbsp;</td>
+                            <td class="padded">&nbsp;</td>
+                        </tr>
+                    </table>
+
+                    <div class="clear"></div>
+
+                    <div class="padded">
+                        <input type="submit" value="<?=Lang::main('applyFilter'); ?>" />
+                        <input type="reset" value="<?=Lang::main('resetForm'); ?>" />
+                    </div>
+
+                </form>
+                <div class="pad"></div>
+            </div>
+
+<?php $this->brick('filter', ['fi' => $f['initData']]); ?>
+
+<?php $this->brick('lvTabs'); ?>
+
+            <div class="clear"></div>
+        </div><!-- main-contents -->
+    </div><!-- main -->
+
+<?php $this->brick('footer'); ?>
--- a/template/pages/profile.tpl.php
+++ b/template/pages/profile.tpl.php
@@ -13,8 +13,8 @@
            <div id="profilah-generic"></div>
            <script type="text/javascript">//<![CDATA[
                var profilah = new Profiler();
-                profilah.initialize('profilah-generic', { id: <?php echo $this->profileId; ?> });
-                pr_setRegionRealm($WH.gE($WH.ge('topbar'), 'form')[0], '<?php echo $this->region; ?>', '<?php echo $this->realm; ?>');
+                profilah.initialize('profilah-generic', { id: <?=$this->subjectGUID; ?> });
+                pr_setRegionRealm($WH.gE($WH.ge('topbar'), 'form')[0], '<?=$this->region; ?>', '<?=$this->realm; ?>');
            //]]></script>

            <div class="clear"></div>
--- a/template/pages/profiler.tpl.php
+++ b/template/pages/profiler.tpl.php
@@ -11,41 +11,41 @@
 ?>

            <div class="text">
-                <h1><?php echo Lang::main('_cpHead'); ?></h1>
+                <h1><?=Lang::profiler('profiler'); ?></h1>

-                <p><?php echo Lang::main('_cpHint'); ?></p>
+                <p><?=Lang::profiler('_cpHint'); ?></p>

                <div class="pad"></div>

-                <p><?php echo Lang::main('_cpHelp'); ?></p>
+                <p><?=Lang::profiler('_cpHelp'); ?></p>

                <div class="profiler-home">
                    <div>
-                        <h2><?php echo Util::ucFirst(Lang::main('name')).Lang::main('colon'); ?></h2>
+                        <h2><?=Util::ucFirst(Lang::main('name')).Lang::main('colon'); ?></h2>
                        <input type="text" name="na" value="" />
                    </div>

                    <div>
-                        <h2><?php echo Lang::main('region').Lang::main('colon'); ?></h2>
+                        <h2><?=Lang::profiler('region').Lang::main('colon'); ?></h2>
                        <input type="radio" name="rg" value="us" id="rg-1" checked="checked" /><label for="rg-1" class="profiler-button profiler-option-left selected"><em><i>US &amp; Oceanic</i></em></label>
                        <input type="radio" name="rg" value="eu" id="rg-2" /><label for="rg-2" class="profiler-button profiler-option-right"><em><i>Europe</i></em></label>
                    </div>

                    <div>
-                        <h2><?php echo Lang::main('realm').Lang::main('colon'); ?></h2>
+                        <h2><?=Lang::profiler('realm').Lang::main('colon'); ?></h2>
                        <input type="text" name="sv" autocomplete="off" />
                        <div class="profiler-autocomplete"></div>
                    </div>

                    <div class="profiler-buttons">
-                        <a href="javascript:;" class="profiler-button" id="profiler-lookup"><em><?php echo Lang::main('viewCharacter'); ?></em></a>
-                        <a href="javascript:;" class="profiler-button" id="profiler-search"><em><?php echo Lang::main('searchButton'); ?></em></a>
+                        <a href="javascript:;" class="profiler-button" id="profiler-lookup"><em><?=Lang::profiler('viewCharacter'); ?></em></a>
+                        <a href="javascript:;" class="profiler-button" id="profiler-search"><em><?=Lang::main('searchButton'); ?></em></a>
                    </div>
                </div>

                <div class="clear pad3"></div>

-                <p><?php echo Lang::main('_cpFooter'); ?></p>
+                <p><?=Lang::profiler('_cpFooter'); ?></p>
            </div>

            <script type="text/javascript">//<![CDATA[
--- a/template/pages/profiles.tpl.php
+++ b/template/pages/profiles.tpl.php
@@ -10,15 +10,15 @@ $f = $this->filter;                                         // shorthand
 <?php
 $this->brick('announcement');

-$this->brick('pageTemplate');
+$this->brick('pageTemplate', ['fi' => empty($f['query']) ? null : ['query' => $f['query'], 'menuItem' => 2]]);

 # 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="?filter=profiles" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
+            <div id="fi" style="display: <?=(empty($f['query']) ? 'none' : 'block'); ?>;"><form
+                action="?filter=profiles<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                    <div class="rightpanel">
-                        <div style="float: left"><?php echo Util::ucFirst(Lang::game('class')).Lang::main('colon'); ?></div>
-                        <small><a href="javascript:;" onclick="document.forms['fi'].elements['cl[]'].selectedIndex = -1; return false" onmousedown="return false"><?php echo Lang::main('clear'); ?></a></small>
+                        <div style="float: left"><?=Util::ucFirst(Lang::game('class')).Lang::main('colon'); ?></div>
+                        <small><a href="javascript:;" onclick="document.forms['fi'].elements['cl[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
                        <div class="clear"></div>
                        <select name="cl[]" size="7" multiple="multiple" class="rightselect" style="background-color: #181818">
 <?php
@@ -32,8 +32,8 @@ endforeach;
                    </div>

                    <div class="rightpanel2">
-                        <div style="float: left"><?php echo Util::ucFirst(Lang::game('race')).Lang::main('colon'); ?></div>
-                        <small><a href="javascript:;" onclick="document.forms['fi'].elements['ra[]'].selectedIndex = -1; pr_onChangeRace(); return false" onmousedown="return false"><?php echo Lang::main('clear'); ?></a></small>
+                        <div style="float: left"><?=Util::ucFirst(Lang::game('race')).Lang::main('colon'); ?></div>
+                        <small><a href="javascript:;" onclick="document.forms['fi'].elements['ra[]'].selectedIndex = -1; pr_onChangeRace(); return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
                        <div class="clear"></div>
                        <select name="ra[]" size="7" multiple="multiple" class="rightselect" onchange="pr_onChangeRace()">
 <?php
@@ -49,63 +49,68 @@ endforeach;

                    <table>
                        <tr>
-                            <td><?php echo Util::ucFirst(Lang::main('name')).Lang::main('colon'); ?></td>
+                            <td><?=Util::ucFirst(Lang::main('name')).Lang::main('colon'); ?></td>
                            <td colspan="3">
                                <table><tr>
-                                    <td>&nbsp;<input type="text" name="na" size="30" <?php echo isset($f['na']) ? 'value="'.Util::htmlEscape($f['na']).'" ' : null; ?>/></td>
-                                    <td>&nbsp; <input type="checkbox" name="ex" value="on" id="profile-ex" <?php echo isset($f['ex']) ? 'checked="checked"' : null; ?>/></td>
-                                    <td><label for="profile-ex"><span class="tip" onmouseover="$WH.Tooltip.showAtCursor(event, LANG.tooltip_exactprofilesearch, 0, 0, 'q')" onmousemove="$WH.Tooltip.cursorUpdate(event)" onmouseout="$WH.Tooltip.hide()"><?php echo Lang::main('exactMatch'); ?></span></label></td>
+                                    <td>&nbsp;<input type="text" name="na" size="30" <?=(isset($f['na']) ? 'value="'.Util::htmlEscape($f['na']).'" ' : null); ?>/></td>
+                                    <td>&nbsp; <input type="checkbox" name="ex" value="on" id="profile-ex" <?=(isset($f['ex']) ? 'checked="checked"' : null); ?>/></td>
+                                    <td><label for="profile-ex"><span class="tip" onmouseover="$WH.Tooltip.showAtCursor(event, LANG.tooltip_exactprofilesearch, 0, 0, 'q')" onmousemove="$WH.Tooltip.cursorUpdate(event)" onmouseout="$WH.Tooltip.hide()"><?=Lang::main('exactMatch'); ?></span></label></td>
                                </tr></table>
                            </td>
                        </tr><tr>
-                            <td class="padded"><?php echo Lang::main('region').Lang::main('colon'); ?></td>
+                            <td class="padded"><?=Lang::profiler('region').Lang::main('colon'); ?></td>
                            <td class="padded">&nbsp;<select name="rg" onchange="pr_onChangeRegion(this.form, null, null)">
                            <option></option>
-                            <option value="us">US & Oceanic</option>
-                            <option value="eu" selected="selected">Europe</option>
+<?php
+    foreach (array_unique(array_column(Profiler::getRealms(), 'region')) as $rg):
+        echo "                             <option value=\"".$rg."\">".Lang::profiler('regions', $rg)."</option>\n";
+    endforeach;
+?>
                            </select>&nbsp;</td>
-                            <td style="width:50px;" class="padded">&nbsp;&nbsp;&nbsp;<?php echo Lang::main('realm').Lang::main('colon'); ?></td>
-                            <td class="padded">&nbsp;<select name="sv"><option></option></select><input type="hidden" name="bg" value="" /></td>
+                            <td style="width:50px;" class="padded">&nbsp;&nbsp;&nbsp;<?=Lang::profiler('realm').Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<select name="sv"><option></option></select><input type="hidden" name="bg" value="<?=(isset($f['bg']) ? Util::htmlEscape($f['bg']) : null); ?>" /></td>
                        </tr><tr>
-                            <td class="padded"><?php echo Lang::main('side').Lang::main('colon'); ?></td>
+                            <td class="padded"><?=Lang::main('side').Lang::main('colon'); ?></td>
                            <td class="padded" style="width:80px;">&nbsp;<select name="si">
                                <option></option>
-                                <option value="1"><?php echo Lang::game('si', 1); ?></option>
-                                <option value="2"><?php echo Lang::game('si', 2); ?></option>
+                                <option value="1"<?=(!empty($f['si']) && $f['si'] == 1 ? ' selected' : null);?>><?=Lang::game('si', 1); ?></option>
+                                <option value="2"<?=(!empty($f['si']) && $f['si'] == 2 ? ' selected' : null);?>><?=Lang::game('si', 2); ?></option>
                            </select></td>
-                            <td class="padded">&nbsp;&nbsp;&nbsp;<?php echo Lang::game('level').Lang::main('colon'); ?></td>
-                            <td class="padded">&nbsp;<input type="text" name="minle" maxlength="3" class="smalltextbox" <?php echo isset($f['minle']) ? 'value="'.$f['minle'].'" ' : null; ?>/> - <input type="text" name="maxle" maxlength="3" class="smalltextbox" <?php echo isset($f['maxle']) ? 'value="'.$f['maxle'].'" ' : null; ?>/></td>
+                            <td class="padded">&nbsp;&nbsp;&nbsp;<?=Lang::game('level').Lang::main('colon'); ?></td>
+                            <td class="padded">&nbsp;<input type="text" name="minle" maxlength="3" class="smalltextbox" <?=(isset($f['minle']) ? 'value="'.$f['minle'].'" ' : null); ?>/> - <input type="text" name="maxle" maxlength="3" class="smalltextbox" <?=(isset($f['maxle']) ? 'value="'.$f['maxle'].'" ' : null); ?>/></td>
                        </tr>
                    </table>

                    <div id="fi_criteria" class="padded criteria"><div></div></div>
-                    <div><a href="javascript:;" id="fi_addcriteria" onclick="fi_addCriterion(this); return false"><?php echo Lang::main('addFilter'); ?></a></div>
+                    <div><a href="javascript:;" id="fi_addcriteria" onclick="fi_addCriterion(this); return false"><?=Lang::main('addFilter'); ?></a></div>

                    <div class="padded2">
-                        <?php echo Lang::main('match').Lang::main('colon'); ?><input type="radio" name="ma" value="" id="ma-0" <?php echo !isset($f['ma']) ? 'checked="checked" ' : null; ?>/><label for="ma-0"><?php echo Lang::main('allFilter'); ?></label><input type="radio" name="ma" value="1" id="ma-1" <?php echo isset($f['ma']) ? 'checked="checked" ' : null; ?>/><label for="ma-1"><?php echo Lang::main('oneFilter'); ?></label>
+                        <?=Lang::main('match').Lang::main('colon'); ?><input type="radio" name="ma" value="" id="ma-0" <?=(!isset($f['ma']) ? 'checked="checked" ' : null); ?>/><label for="ma-0"><?=Lang::main('allFilter'); ?></label><input type="radio" name="ma" value="1" id="ma-1" <?=(isset($f['ma']) ? 'checked="checked" ' : null); ?>/><label for="ma-1"><?=Lang::main('oneFilter'); ?></label>
                    </div>

                    <div class="clear"></div>

                    <div class="padded">
-                        <input type="submit" value="<?php echo Lang::main('applyFilter'); ?>" />
-                        <input type="reset" value="<?php echo Lang::main('resetForm'); ?>" />
+                        <input type="submit" value="<?=Lang::main('applyFilter'); ?>" />
+                        <input type="reset" value="<?=Lang::main('resetForm'); ?>" />
                    </div>

                </form>
+
+<?php
+    if ($this->roster):
+?>
+                <div class="text"><h2 style="padding-top: 0;"><?=$this->roster;?></h2></div>
+<?php
+    else:
+?>
                <div class="pad"></div>
+<?php
+    endif;
+?>
            </div>

-            <script type="text/javascript">//<![CDATA[
-                pr_setRegionRealm($WH.ge('fi').firstChild, '<?php echo $this->region; ?>', '<?php echo $this->realm; ?>');
-                pr_onChangeRace();
-                fi_init('profiles');
-<?php
-foreach ($f['fi'] as $str):
-    echo '                '.$str."\n";
-endforeach;
-?>
-            //]]></script>
+<?php $this->brick('filter', ['fi' => $f['initData']]); ?>

 <?php $this->brick('lvTabs'); ?>

--- a/template/pages/roster.tpl.php
+++ b/template/pages/roster.tpl.php
@@ -0,0 +1,34 @@
+<?php $this->brick('header'); ?>
+
+    <div class="main" id="main">
+        <div class="main-precontents" id="main-precontents"></div>
+        <div class="main-contents" id="main-contents">
+
+<?php
+$this->brick('announcement');
+
+$this->brick('pageTemplate');
+
+?>
+<div id="roster-status" class="profiler-message" style="display: none"></div>
+
+            <div class="text">
+<?php $this->brick('redButtons'); ?>
+                <h1 class="first"><?=$this->name; ?></h1>
+
+<?php
+    // subject statistics here
+    if (isset($this->extraHTML)):
+        echo $this->extraHTML;
+    endif;
+?>
+
+            </div>
+<?php
+    $this->brick('lvTabs');
+?>
+            <div class="clear"></div>
+        </div><!-- main-contents -->
+    </div><!-- main -->
+
+<?php $this->brick('footer'); ?>
--- a/template/pages/text-page-generic.tpl.php
+++ b/template/pages/text-page-generic.tpl.php
@@ -0,0 +1,72 @@
+<?php $this->brick('header'); ?>
+
+    <div class="main" id="main">
+        <div class="main-precontents" id="main-precontents"></div>
+        <div class="main-contents" id="main-contents">
+
+<?php
+$this->brick('announcement');
+
+$this->brick('pageTemplate');
+
+if (isset($this->notFound)):
+?>
+<?php
+    if (!empty($this->doResync)):
+?>
+            <div id="roster-status" class="profiler-message clear"></div>
+<?php
+    endif;
+?>
+
+            <div class="pad3"></div>
+
+            <div class="inputbox">
+                <h1><?=$this->notFound['title']; ?></h1>
+                <div id="inputbox-error"><?=$this->notFound['msg']; ?></div>        <!-- style="background: no-repeat 3px 3px" -->
+<?php
+    if (!empty($this->doResync)):
+?>
+                <script type="text/javascript">//<![CDATA[
+                    pr_updateStatus('<?=$this->doResync[0]; ?>', $WH.ge('roster-status'), <?=$this->doResync[1]; ?>, 1);
+                    pr_setRegionRealm($WH.gE($WH.ge('topbar'), 'form')[0], '<?=$this->region; ?>', '<?=$this->realm; ?>');
+                //]]></script>
+<?php
+    endif;
+?>
+                <div class="clear"></div>
+            </div>
+<?php
+else:
+?>
+            <div class="text">
+                <h1><?=$this->name; ?></h1>
+
+<?php
+    $this->brick('article');
+
+    if (isset($this->extraText)):
+?>
+                <div id="text-generic" class="left"></div>
+                <script type="text/javascript">//<![CDATA[
+                    Markup.printHtml("<?=Util::jsEscape($this->extraText); ?>", "text-generic", {
+                        allow: Markup.CLASS_ADMIN,
+                        dbpage: true
+                    });
+                //]]></script>
+
+                <div class="pad2"></div>
+            </div>
+<?php
+    endif;
+
+    if (isset($this->extraHTML)):
+        echo $this->extraHTML;
+    endif;
+
+endif;
+?>
+        </div><!-- main-contents -->
+    </div><!-- main -->
+
+<?php $this->brick('footer'); ?>