moving template around

(is now a lot closer to the original, shouldn't require updating new
scripts as the structure should fit)
also some minor bugfixes

.gitignore

@@ -0,0 +1,32 @@
+# smarty cache
+/cache/*index.html
+/cache/*.php
+
+# generated files
+/static/js/profile_all.js
+/config/config.php
+
+# extracted images
+/static/images/wow/icons/large/*
+/static/images/wow/icons/medium/*
+/static/images/wow/icons/small/*
+/static/images/wow/icons/tiny/*
+!/static/images/wow/icons/tiny/quest_*
+/static/images/wow/hunterpettalents/icons*
+/static/images/wow/interface/*
+/static/images/wow/loadingscreens/*
+/static/images/wow/maps/*
+!/static/images/wow/maps/overlay*
+/static/images/wow/talents/icons/*
+
+# modelviewer (~7GB data)
+/static/modelviewer/models/*
+/static/modelviewer/thumbs/*
+/static/modelviewer/textures2/*
+
+# user uploads
+/static/uploads/avatars/*
+/static/uploads/screenshots/*
+/static/uploads/signatures/*
+/static/uploads/temp/*
+

includes/kernel.php

@@ -12,7 +12,8 @@ require 'config/config.php';
 $e = !!$AoWoWconf['debug'] ? (E_ALL & ~(E_DEPRECATED|E_USER_DEPRECATED|E_STRICT)) : 0;
 error_reporting($e);
 
-define('STATIC_URL',        substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1));
+define('STATIC_URL',           substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1).'/static'); // points js to images & scripts (change here if you want to use a separate subdomain)
+define('HOST_URL',             substr('http://'.$_SERVER['SERVER_NAME'].strtr($_SERVER['SCRIPT_NAME'], ['index.php' => '']), 0, -1));           // points js to executable files
 
 define('SQL_LIMIT_NONE',       0);
 define('SQL_LIMIT_SEARCH',     $AoWoWconf['searchLimit']);
@@ -20,7 +21,6 @@ define('SQL_LIMIT_QUCKSEARCH', $AoWoWconf['quickSearchLimit']);
 define('SQL_LIMIT_DEFAULT',    $AoWoWconf['defaultLimit']);
 
 require 'includes/libs/Smarty-2.6.26/libs/Smarty.class.php';    // Libraray: http://www.smarty.net/
-// require 'includes/libs/Smarty-3.1.14/libs/Smarty.class.php';     // Libraray: http://www.smarty.net/
 require 'includes/libs/DbSimple/Generic.php';                   // Libraray: http://en.dklab.ru/lib/DbSimple (using mysqli variant: https://bitbucket.org/brainreaver/dbsimple/src)
 require 'includes/utilities.php';
 require 'localization/lang.class.php';

includes/types/creature.class.php

@@ -16,7 +16,7 @@ class CreatureList extends BaseType
     protected       $queryBase = 'SELECT ct.*, ct.id AS ARRAY_KEY FROM ?_creature ct';
     public          $queryOpts = array(
                         'ct'     => [['ft', 'clsMin', 'clsMax', 'qr']],
-                        'ft'     => ['j' => '?_factiontemplate ft ON ft.id = ct.factionA', 's' => ', ft.*'],
+                        'ft'     => ['j' => '?_factiontemplate ft ON ft.id = ct.factionA', 's' => ', ft.A, ft.H, ft.factionId'],
                         'clsMin' => ['j' => 'creature_classlevelstats clsMin ON ct.unitClass = clsMin.class AND ct.minLevel = clsMin.level', 's' => ', clsMin.attackpower AS mleAtkPwrMin, clsMin.rangedattackpower AS rngAtkPwrMin, clsMin.baseArmor * armorMod AS armorMin, (CASE ct.exp WHEN 0 THEN clsMin.damage_base WHEN 1 THEN clsMin.damage_exp1 ELSE clsMin.damage_exp2 END) * dmgMultiplier AS dmgMin, (CASE ct.exp WHEN 0 THEN clsMin.basehp0 WHEN 1 THEN clsMin.basehp1 ELSE clsMin.basehp2 END) * healthMod AS healthMin, clsMin.baseMana * manaMod AS manaMin'],
                         'clsMax' => ['j' => 'creature_classlevelstats clsMax ON ct.unitClass = clsMax.class AND ct.maxLevel = clsMax.level', 's' => ', clsMax.attackpower AS mleAtkPwrMax, clsMax.rangedattackpower AS rngAtkPwrMax, clsMax.baseArmor * armorMod AS armorMax, (CASE ct.exp WHEN 0 THEN clsMin.damage_base WHEN 1 THEN clsMin.damage_exp1 ELSE clsMin.damage_exp2 END) * dmgMultiplier AS dmgMax, (CASE ct.exp WHEN 0 THEN clsMax.basehp0 WHEN 1 THEN clsMax.basehp1 ELSE clsMax.basehp2 END) * healthMod AS healthMax, clsMax.baseMana * manaMod AS manaMax'],
                         'qr'     => ['j' => ['creature_questrelation qr ON qr.id = ct.id', true], 's' => ', qr.quest', 'g' => 'ct.id'],          // start
@@ -192,7 +192,7 @@ class CreatureList extends BaseType
                     'minlevel'       => $this->curTpl['minLevel'],
                     'maxlevel'       => $this->curTpl['maxLevel'],
                     'id'             => $this->id,
-                    'boss'           => $this->curTpl['typeFlags'] & 0x4 ? 1 : 0,
+                    'boss'           => $this->curTpl['typeFlags'] & 0x4 && $this->curTpl['rank'] ? 1 : 0,
                     'classification' => $this->curTpl['rank'],
                     'location'       => $this->getSpawns(SPAWNINFO_ZONES),
                     'name'           => $this->getField('name', true),

includes/types/currency.class.php

@@ -33,7 +33,7 @@ class CurrencyList extends BaseType
         foreach ($this->iterate() as $__)
         {
             if ($this->id == 104)                           // in case of honor commit sebbuku
-                $icon = ['alliance-icon', 'horde-icon'];
+                $icon = ['alliance', 'horde'];
             else if ($this->id == 103)                      // also arena-icon diffs from item-icon
                 $icon = ['money_arena', 'money_arena'];
             else

includes/utilities.php

@@ -77,7 +77,7 @@ class SmartyAoWoW extends Smarty
                     $tv['infobox'] = $article['quickInfo'];
 
                 if ($article['locale'] != User::$localeId)
-                    $tv['article']['params'] = ['prepend' => Util::jsEscape('<div class="notice-box" style="margin-right:245px;"><span class="bubble-icon">'.Lang::$main['englishOnly'].'</span></div>')];
+                    $tv['article']['params'] = ['prepend' => Util::jsEscape('<div class="notice-box" style="margin-right:245px;"><span class="icon-bubble">'.Lang::$main['englishOnly'].'</span></div>')];
 
                 foreach ($article as $text)
                     if (preg_match_all('/\[(npc|object|item|itemset|quest|spell|zone|faction|pet|achievement|title|holiday|class|race|skill|currency)=(\d+)[^\]]*\]/i', $text, $matches, PREG_SET_ORDER))
@@ -110,8 +110,8 @@ class SmartyAoWoW extends Smarty
                     'mode'   => 1,
                     'status' => 1,
                     'name'   => 'internal error',
-                    'style'  => 'padding-left: 40px; background-image: url(template/images/report.gif); background-size: 15px 15px; background-position: 12px center; border: dashed 2px #C03030;',
+                    'style'  => 'padding-left: 55px; background-image: url(static/images/announcements/warn-small.png); background-position: 10px center; border: dashed 2px #C03030;',
-                    'text'   => '[span id=inputbox-error]'.implode("\n", $buff).'[/span]',
+                    'text'   => '[span id=inputbox-error]'.implode("[br]", $buff).'[/span]',
                 );
             }
         }
@@ -455,6 +455,8 @@ class Util
 
     public static $dfnString                = '<dfn title="%s" class="w">%s</dfn>';
 
+    public static $mapSelectorString        = '<a href="javascript:;" onclick="myMapper.update({zone: %d}); g_setSelectedLink(this, \'mapper\'); return false" onmousedown="return false">%s</a>&nbsp;(%d)';
+
     public static $expansionString          = array(        // 3 & 4 unused .. obviously
         null,           'bc',           'wotlk',            'cata',                'mop'
     );
@@ -973,10 +975,10 @@ class Util
     );
 
     public static $bgImagePath              = array (
-        'tiny'   => 'style="background-image: url(%s/images/icons/tiny/%s.gif)"',
+        'tiny'   => 'style="background-image: url(%s/images/wow/icons/tiny/%s.gif)"',
-        'small'  => 'style="background-image: url(%s/images/icons/small/%s.jpg)"',
+        'small'  => 'style="background-image: url(%s/images/wow/icons/small/%s.jpg)"',
-        'medium' => 'style="background-image: url(%s/images/icons/medium/%s.jpg)"',
+        'medium' => 'style="background-image: url(%s/images/wow/icons/medium/%s.jpg)"',
-        'large'  => 'style="background-image: url(%s/images/icons/large/%s.jpg)"',
+        'large'  => 'style="background-image: url(%s/images/wow/icons/large/%s.jpg)"',
     );
 
     public static $tcEncoding               = '0zMcmVokRsaqbdrfwihuGINALpTjnyxtgevElBCDFHJKOPQSUWXYZ123456789';
@@ -1175,7 +1177,7 @@ class Util
             );
 
             // html may contain 'Pictures'
-            $text = preg_replace('/"Interface\\\Pictures\\\([\w_\-]+)"/i', '"images/interface/Pictures/\1.jpg"', strtr($text, $pairs));
+            $text = preg_replace('/"Interface\\\Pictures\\\([\w_\-]+)"/i', '"images/wow/interface/Pictures/\1.jpg"', strtr($text, $pairs));
         }
         else
             $text = strtr($text, ["\n" => '<br />', "\r" => '']);
@@ -1189,7 +1191,7 @@ class Util
         );
 
         $to = array(
-            '<span class="icontiny" style="background-image: url('.STATIC_URL.'/images/icons/tiny/\2.gif)">',
+            '<span class="icontiny" style="background-image: url('.STATIC_URL.'/images/wow/icons/tiny/\2.gif)">',
             '<span style="color: #\1">\2</span>',
             '&lt;\1/\2&gt;',
             '',

localization/locale_dede.php

@@ -603,7 +603,7 @@ $lang = array(
         'tool'          => "Werkzeug",
         'cost'          => "Preis",
         'content'       => "Inhalt",
-        '_transfer'     => 'Dieser Gegenstand wird mit <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(images/icons/tiny/%s.gif)">%s</a> vertauscht, wenn Ihr zur <span class="%s-icon">%s</span> wechselt.',
+        '_transfer'     => 'Dieser Gegenstand wird mit <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(static/images/wow/icons/tiny/%s.gif)">%s</a> vertauscht, wenn Ihr zur <span class="icon-%s">%s</span> wechselt.',
         '_unavailable'  => "Dieser Gegenstand ist nicht für Spieler verfügbar.",
         '_rndEnchants'  => "Zufällige Verzauberungen",
         '_chance'       => "(Chance von %s%%)",

localization/locale_enus.php

@@ -593,7 +593,7 @@ $lang = array(
         'tool'          => "Tool",
         'cost'          => "Cost",
         'content'       => "Content",
-        '_transfer'     => 'This item will be converted to <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(images/icons/tiny/%s.gif)">%s</a> if you transfer to <span class="%s-icon">%s</span>.',
+        '_transfer'     => 'This item will be converted to <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(static/images/wow/icons/tiny/%s.gif)">%s</a> if you transfer to <span class="icon-%s">%s</span>.',
         '_unavailable'  => "This item is not available to players.",
         '_rndEnchants'  => "Random Enchantments",
         '_chance'       => "(%s%% chance)",

localization/locale_eses.php

@@ -561,7 +561,7 @@ $lang = array(
         'tool'          => "Herramienta",
         'cost'          => "Coste",
         'content'       => "Contenido",
-        '_transfer'     => 'Este objeto será convertido a <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(images/icons/tiny/%s.gif)">%s</a> si lo transfieres a la <span class="%s-icon">%s</span>.',
+        '_transfer'     => 'Este objeto será convertido a <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(static/images/wow/icons/tiny/%s.gif)">%s</a> si lo transfieres a la <span class="icon-%s">%s</span>.',
         '_unavailable'  => "Este objeto no está disponible para los jugadores.",
         '_rndEnchants'  => "Encantamientos aleatorios",
         '_chance'       => "(probabilidad %s%%)",

localization/locale_frfr.php

@@ -561,7 +561,7 @@ $lang = array(
         'tool'          => "Outil",
         'cost'          => "Coût",
         'content'       => "Contenu",
-        '_transfer'     => 'Cet objet sera converti en <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(images/icons/tiny/%s.gif)">%s</a> si vous transférez en <span class="%s-icon">%s</span>.',
+        '_transfer'     => 'Cet objet sera converti en <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(static/images/wow/icons/tiny/%s.gif)">%s</a> si vous transférez en <span class="icon-%s">%s</span>.',
         '_unavailable'  => "Este objeto no está disponible para los jugadores.",
         '_rndEnchants'  => "Enchantements aléatoires",
         '_chance'       => "(%s%% de chance)",

localization/locale_ruru.php

@@ -561,7 +561,7 @@ $lang = array(
         'tool'          => "Инструмент",
         'cost'          => "Цена",
         'content'       => "Материал",
-        '_transfer'     => 'Этот предмет превратится в <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(images/icons/tiny/%s.gif)">%s</a>, если вы перейдете за <span class="%s-icon">%s</span>.',
+        '_transfer'     => 'Этот предмет превратится в <a href="?item=%d" class="q%d icontiny tinyspecial" style="background-image: url(static/images/wow/icons/tiny/%s.gif)">%s</a>, если вы перейдете за <span class="icon-%s">%s</span>.',
         '_unavailable'  => "Этот предмет не доступен игрокам.",
         '_rndEnchants'  => "Случайные улучшения",
         '_chance'       => "(шанс %s%%)",

pages/account.php

@@ -253,11 +253,11 @@ function recoverUser()
 
 $smarty->updatePageVars(array(
     'reqCSS' => array(
-        ['path' => 'template/css/Profiler.css'],
+        ['path' => 'static/css/Profiler.css'],
     ),
     'reqJS'  => array(
-        'template/js/user.js',
+        'static/js/user.js',
-        'template/js/profile.js',
+        'static/js/profile.js',
     ),
 ));
 

pages/achievement.php

@@ -88,10 +88,10 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
     switch ($acv->getField('faction'))
     {
         case 1:
-            $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=alliance-icon]'.Lang::$game['si'][SIDE_ALLIANCE].'[/span]';
+            $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=icon-alliance]'.Lang::$game['si'][SIDE_ALLIANCE].'[/span]';
             break;
         case 2:
-            $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=horde-icon]'.Lang::$game['si'][SIDE_HORDE].'[/span]';
+            $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=icon-horde]'.Lang::$game['si'][SIDE_HORDE].'[/span]';
             break;
         default:                                        // case 3
             $infobox[] = Lang::$main['side'].Lang::$colon.Lang::$game['si'][SIDE_BOTH];

pages/achievements.php

@@ -79,7 +79,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
             'path'   => json_encode($path, JSON_NUMERIC_CHECK),
             'tab'    => 0,
             'subCat' => $pageParam ? '='.$pageParam : '',
-            'reqJS'  => ['template/js/filters.js']
+            'reqJS'  => ['static/js/filters.js']
         ),
         'lv' => array(
             'data'   => $acvList->getListviewData(),

pages/class.php

@@ -70,7 +70,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
             'tab'        => 0,
             'type'       => TYPE_CLASS,
             'typeId'     => $_id,
-            'reqJS'      => ['template/js/swfobject.js'],
+            'reqJS'      => ['static/js/swfobject.js'],
             'name'       => $cl->getField('name', true),
             'expansion'  => Util::$expansionString[$cl->getField('expansion')],
             'infobox'    => '[ul][li]'.implode('[/li][li]', $infobox).'[/li][/ul]',

pages/compare.php

@@ -12,15 +12,15 @@ $pageData      = array(
     'title'   => Lang::$main['compareTool'],
     'tab'     => 1,
     'reqCSS'  => array(
-        ['path' => 'template/css/Summary.css'],
+        ['path' => 'static/css/Summary.css'],
-        ['path' => 'template/css/Summary_ie6.css', 'ieCond' => 'lte IE 6'],
+        ['path' => 'static/css/Summary_ie6.css', 'ieCond' => 'lte IE 6'],
     ),
     'reqJS'   => array(
-        'template/js/profile.js',
+        'static/js/profile.js',
-        'template/js/Draggable.js',
+        'static/js/Draggable.js',
-        'template/js/filters.js',
+        'static/js/filters.js',
-        'template/js/Summary.js',
+        'static/js/Summary.js',
-        'template/js/swfobject.js',
+        'static/js/swfobject.js',
         '?data=weight-presets.gems.enchants.itemsets'
     )
 );

pages/currency.php

@@ -123,9 +123,9 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
                     }
 
                     $row['stock'] = $vendors[$k]['stock'];
-                    $row['stack'] = $item->getField('buyCount');
+                    $row['stack'] = $itemObj->getField('buyCount');
                     $row['cost']  = array(
-                        $item->getField('buyPrice'),
+                        $itemObj->getField('buyPrice'),
                         $currency ? $currency : null,
                         $tokens   ? $tokens   : null
                     );

pages/faction.php

@@ -51,7 +51,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
 
     // side if any
     if ($_ = $faction->getField('side'))
-        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class='.($_ == 1 ? 'alliance' : 'horde').'-icon]'.Lang::$game['si'][$_].'[/span]';
+        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=icon-'.($_ == 1 ? 'alliance' : 'horde').']'.Lang::$game['si'][$_].'[/span]';
 
     /****************/
     /* Main Content */

pages/item.php

@@ -101,7 +101,7 @@ if (!$smarty->loadCache($cacheKeyPage, $item))
 
     if ($si = $item->json[$_id]['side'])                    // side
         if ($si != 3)
-            $quickInfo[] = Lang::$main['side'].Lang::$colon.'[span class='.($si == 1 ? 'alliance' : 'horde').'-icon]'.Lang::$game['si'][$si].'[/span]';
+            $quickInfo[] = Lang::$main['side'].Lang::$colon.'[span class=icon-'.($si == 1 ? 'alliance' : 'horde').']'.Lang::$game['si'][$si].'[/span]';
 
     // consumable / not consumable
     if (!$_slot)
@@ -307,14 +307,14 @@ if (!$smarty->loadCache($cacheKeyPage, $item))
             'type'       => TYPE_ITEM,
             'typeId'     => $_id,
             'reqJS'      => array(
-                $pageText ? 'template/js/Book.js' : null,
+                $pageText ? 'static/js/Book.js' : null,
-                'template/js/swfobject.js',
+                'static/js/swfobject.js',
-                'template/js/profile.js',
+                'static/js/profile.js',
-                'template/js/filters.js',
+                'static/js/filters.js',
                 '?data=weight-presets'
             ),
             'reqCSS'     => array(
-                $pageText ? ['path' => 'template/css/Book.css'] : null,
+                $pageText ? ['path' => 'static/css/Book.css'] : null,
             ),
             'redButtons' => array(
                 BUTTON_WOWHEAD => true,

pages/items.php

@@ -211,8 +211,8 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
             'tab'    => 0,
             'subCat' => $pageParam !== null ? '='.$pageParam : '',
             'reqJS'  => array(
-                'template/js/filters.js',
+                'static/js/filters.js',
-                'template/js/swfobject.js',
+                'static/js/swfobject.js',
                 '?data=weight-presets'
             )
         ),

pages/itemset.php

@@ -188,8 +188,8 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
             'type'        => TYPE_ITEMSET,
             'typeId'      => $_id,
             'reqJS'       => array(
-                'template/js/Summary.js',
+                'static/js/Summary.js',
-                'template/js/swfobject.js'
+                'static/js/swfobject.js'
             ),
             'pieces'      => $pieces,
             'spells'      => $spells,

pages/itemsets.php

@@ -31,7 +31,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
             'tab'    => 0,
             'subCat' => $pageParam ? '='.$pageParam : '',
             'reqJS'  => array(
-                'template/js/filters.js',
+                'static/js/filters.js',
                 '?data=weight-presets'
             )
         ),

pages/maps.php

@@ -10,12 +10,12 @@ $smarty->updatePageVars(array(
     'tab'    => 1,
     'reqCSS' => array(
         ['string' => 'zone-picker { margin-left: 4px }'],
-        ['path' => 'template/css/Mapper.css'],
+        ['path' => 'static/css/Mapper.css'],
-        ['path' => 'template/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6']
+        ['path' => 'static/css/Mapper_ie6.css', 'ieCond' => 'lte IE 6']
     ),
     'reqJS'  => array(
-        'template/js/maps.js',
+        'static/js/maps.js',
-        'template/js/Mapper.js',
+        'static/js/Mapper.js',
         '?data=zones'
     )
 ));

pages/miscTools.php

@@ -143,7 +143,7 @@ if (strstr($pageCall, 'latest') || $pageCall == 'most-comments')
         die($xml);
     }
     else
-        $h1Links = '<small><a href="?'.$pageCall.($pageParam ? '='.$pageParam : null).'&rss" class="rss-icon">'.Lang::$main['subscribe'].'</a></small>';
+        $h1Links = '<small><a href="?'.$pageCall.($pageParam ? '='.$pageParam : null).'&rss" class="icon-rss">'.Lang::$main['subscribe'].'</a></small>';
 }
 
 array_push($_path, $menu);

pages/objects.php

@@ -34,7 +34,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
             'title'  => implode(" - ", $title),
             'path'   => json_encode($path, JSON_NUMERIC_CHECK),
             'subCat' => $pageParam ? '='.$pageParam : '',
-            'reqJS'  => ['template/js/filters.js']
+            'reqJS'  => ['static/js/filters.js']
         ),
         'lv' => []
     );

pages/pet.php

@@ -52,7 +52,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
             'tab'        => 0,
             'type'       => TYPE_PET,
             'typeId'     => $_id,
-            'reqJS'      => ['template/js/swfobject.js']
+            'reqJS'      => ['static/js/swfobject.js']
         ),
         'relTabs'  => []
     );

pages/profile.php

@@ -589,18 +589,18 @@ $pageData = array(
         'title'     => Util::ucFirst(Lang::$game['profile']), // actual name is set per jScript
         'tab'       => 1,
         'reqJS'     => array(
-            'template/js/filters.js',
+            'static/js/filters.js',
-            'template/js/TalentCalc.js',
+            'static/js/TalentCalc.js',
-            'template/js/swfobject.js',
+            'static/js/swfobject.js',
-            'template/js/profile_all.js',
+            'static/js/profile_all.js',
-            'template/js/profile.js',
+            'static/js/profile.js',
-            'template/js/Profiler.js',
+            'static/js/Profiler.js',
             '?data=enchants.gems.glyphs.itemsets.pets.pet-talents.quick-excludes.realms.statistics.weight-presets'  // quick-excludes?!
             // ?data=user&1270968639
         ),
         'reqCSS'    => array(
-            ['path' => 'template/css/TalentCalc.css'],
+            ['path' => 'static/css/TalentCalc.css'],
-            ['path' => 'template/css/Profiler.css']
+            ['path' => 'static/css/Profiler.css']
         )
     )
 );

pages/profiles.php

@@ -145,14 +145,14 @@ $smarty->updatePageVars(array(
     'path'  => "[1, 5, 0, 'us', 'pure-pwnage', 'trinity']",                                    // [1,5,'eu','cyclone-wirbelsturm','silvermoon']
     'tab'   => 1,
     'reqJS' => array(
-        'template/js/filters.js?978',
+        'static/js/filters.js?978',
-        'template/js/profile_all.js?978',
+        'static/js/profile_all.js?978',
-        'template/js/profile.js?978',
+        'static/js/profile.js?978',
         '?data=weight-presets.realms&978',
         // '?data=user&1280640186'
     ),
     'reqCSS' => array(
-        ['path' => 'template/css/profiler.css']
+        ['path' => 'static/css/profiler.css']
     )
 ));
 $smarty->assign('lang', array_merge(Lang::$main, Lang::$game, ['colon' => Lang::$colon]));

pages/race.php

@@ -41,7 +41,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
 
     // side
     if ($_ = $race->getField('side'))
-        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class='.($_ == 2 ? 'horde' : 'alliance').'-icon]'.Lang::$game['si'][$_].'[/span]';
+        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=icon-'.($_ == 2 ? 'horde' : 'alliance').']'.Lang::$game['si'][$_].'[/span]';
 
     // faction
     if ($_ = $race->getField('factionId'))

pages/spell.php

@@ -409,7 +409,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
             'type'   => TYPE_SPELL,
             'typeId' => $_id,
             'reqJS'  => array(
-                $pageData['buttons'][BUTTON_VIEW3D] ? 'template/js/swfobject.js' : null
+                $pageData['buttons'][BUTTON_VIEW3D] ? 'static/js/swfobject.js' : null
             ),
             'redButtons' => array(
                 BUTTON_LINKS   => ['color' => 'ff71d5ff', 'linkId' => Util::$typeStrings[TYPE_SPELL].':'.$_id],
@@ -783,7 +783,7 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
                     if ($n = SpellList::getName($_))
                         $foo['name'] .= Lang::$colon.'(<a href="?spell='.$_.'">'.$n.'</a>)';
                     else
-                        $foo['name'] .= Lang::$colon.Util::ucFirst(Lang::$game['spell']).' #'.$_;;
+                        $foo['name'] .= Lang::$colon.Util::ucFirst(Lang::$game['spell']).' #'.$effMV;
                 }
                 else
                     $foo['name'] .= ' #'.$effMV;;

pages/spells.php

@@ -438,7 +438,7 @@ if (!$smarty->loadCache($cacheKey, $pageData, $filter))
             'tab'    => 0,
             'subCat' => $pageParam !== null ? '='.$pageParam : '',
             'reqJS'  => array(
-                'template/js/filters.js'
+                'static/js/filters.js'
             )
         ),
         'lv'    => $lv

pages/talent.php

@@ -12,17 +12,17 @@ $smarty->updatePageVars(array(
     'title'  => $petCalc ? Lang::$main['petCalc'] : Lang::$main['talentCalc'],
     'tab'    => 1,
     'reqCSS' => array(
-        ['path' => 'template/css/TalentCalc.css'],
+        ['path' => 'static/css/TalentCalc.css'],
-        ['path' => 'template/css/talent.css'],
+        ['path' => 'static/css/talent.css'],
-        ['path' => 'template/css/TalentCalc_ie6.css',  'ieCond' => 'lte IE 6'],
+        ['path' => 'static/css/TalentCalc_ie6.css',  'ieCond' => 'lte IE 6'],
-        ['path' => 'template/css/TalentCalc_ie67.css', 'ieCond' => 'lte IE 7'],
+        ['path' => 'static/css/TalentCalc_ie67.css', 'ieCond' => 'lte IE 7'],
-        $petCalc ? ['path' => 'template/css/petcalc.css'] : null
+        $petCalc ? ['path' => 'static/css/petcalc.css'] : null
     ),
     'reqJS'  => array(
-        'template/js/TalentCalc.js',
+        'static/js/TalentCalc.js',
         $petCalc ? '?data=pet-talents.pets'   : '?data=glyphs',
-        $petCalc ? 'template/js/petcalc.js'   : 'template/js/talent.js',
+        $petCalc ? 'static/js/petcalc.js'   : 'static/js/talent.js',
-        $petCalc ? 'template/js/swfobject.js' : null
+        $petCalc ? 'static/js/swfobject.js' : null
     )
 ));
 $smarty->assign('tcType', $petCalc ? 'pc' : 'tc');

pages/title.php

@@ -22,14 +22,14 @@ if (!$smarty->loadCache($cacheKeyPage, $pageData))
 
     $infobox = [];
     if ($title->getField('side') == SIDE_ALLIANCE)
-        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=alliance-icon]'.Lang::$game['si'][SIDE_ALLIANCE].'[/span]';
+        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=icon-alliance]'.Lang::$game['si'][SIDE_ALLIANCE].'[/span]';
     else if ($title->getField('side') == SIDE_HORDE)
-        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=horde-icon]'.Lang::$game['si'][SIDE_HORDE].'[/span]';
+        $infobox[] = Lang::$main['side'].Lang::$colon.'[span class=icon-horde]'.Lang::$game['si'][SIDE_HORDE].'[/span]';
     else
         $infobox[] = Lang::$main['side'].Lang::$colon.Lang::$game['si'][SIDE_BOTH];
 
     if ($g = $title->getField('gender'))
-        $infobox[] = Lang::$main['gender'].Lang::$colon.'[span class='.($g == 2 ? 'female' : 'male').'-icon]'.Lang::$main['sex'][$g].'[/span]';
+        $infobox[] = Lang::$main['gender'].Lang::$colon.'[span class=icon-'.($g == 2 ? 'female' : 'male').']'.Lang::$main['sex'][$g].'[/span]';
 
     if ($e = $title->getField('eventId'))
         $infobox[] = Lang::$game['eventShort'].Lang::$colon.'[url=?event='.$e.']'.WorldEventList::getName($e).'[/url]';

power/aowowPower.js

@@ -10,7 +10,7 @@ if (typeof $WH == "undefined") {
 
         var match = document.scripts[i].src.match(/(.*)\/power\/aowowPower.js/i);
         if (match) {
-            var g_staticUrl = match[1];
+            var g_host = match[1];
             break;
         }
     }
@@ -100,7 +100,7 @@ if (typeof $WowheadPower == "undefined") {
             if (isRemote) {
                 var script = document.createElement("script");
                 // script.src = "http://static.wowhead.com/js/basic.js?4";
-                script.src = g_staticUrl + "/template/js/basic.js";
+                script.src = g_host + "/static/js/basic.js";
                 head.appendChild(script);
             }
             else {
@@ -122,7 +122,7 @@ if (typeof $WowheadPower == "undefined") {
                 $WH.ae(head, $WH.ce("link", {
                     type: "text/css",
                     // href: "http://static.wowhead.com/css/basic.css?4",
-                    href: g_staticUrl + "/template/css/basic.css",
+                    href: g_host + "/static/css/basic.css",
                     rel:  "stylesheet"
                 }));
 
@@ -130,7 +130,7 @@ if (typeof $WowheadPower == "undefined") {
                     $WH.ae(head, $WH.ce("link", {
                         type: "text/css",
                         // href: "http://static.wowhead.com/css/basic_ie67.css?4",
-                        href: g_staticUrl + "/template/css/global_ie67.css",
+                        href: g_host + "/static/css/global_ie67.css",
                         rel:  "stylesheet"
                     }));
 
@@ -138,7 +138,7 @@ if (typeof $WowheadPower == "undefined") {
                         $WH.ae(head, $WH.ce("link", {
                             type: "text/css",
                             // href: "http://static.wowhead.com/css/basic_ie6.css?4",
-                            href: g_staticUrl + "/template/css/global_ie6.css",
+                            href: g_host + "/static/css/global_ie6.css",
                             rel:  "stylesheet"
                         }));
                     }
@@ -431,7 +431,7 @@ if (typeof $WowheadPower == "undefined") {
             // url += "ajax.php?" + LOOKUPS[type][1] + "=" + id + "&power" + p;
             var
                 localeDomain = $WH.g_getDomainFromLocale(locale),
-                url = g_staticUrl + "/";
+                url = g_host + "/";
 
             $WH.g_ajaxIshRequest(url + "?" + LOOKUPS[type][1] + "=" + id + "&domain=" + localeDomain + "&power" + p);
             if (SCALES[type] && !SCALES[type][locale]) {

search.php

@@ -1161,7 +1161,7 @@ else /* if ($searchMask & SEARCH_TYPE_REGULAR) */
         'title' => $search.' - '.Lang::$search['search'],
         'tab'   => 0,
         'reqJS' => array(
-            'template/js/swfobject.js'
+            'static/js/swfobject.js'
         )
     ));
     $smarty->assign('lang', array_merge(Lang::$main, Lang::$search));

static/css/Book.css

@@ -0,0 +1,58 @@
+.book
+{
+	width:28em;
+	border:2px solid #404040;
+	-webkit-border-radius:2px;
+	-moz-border-radius:2px;
+	border-radius:2px;
+}
+
+.book .paging
+{
+	cursor:default;
+	text-align:center;
+	background-color:#404040;
+	padding:3px 4px 5px;
+}
+
+.book .previous
+{
+	float:left;
+	text-align:left;
+	width:33%;
+}
+
+.book .next
+{
+	float:right;
+	text-align:right;
+	width:33%;
+}
+
+.book .page
+{
+	background-color:#141414;
+	padding:4px;
+}
+
+.book p
+{
+	margin:0;
+	padding:0;
+}
+
+.book h1,.book h2
+{
+	border:0;
+	font-weight:bold;
+}
+
+.book h1
+{
+	font-size:16px;
+}
+
+.book h2
+{
+	font-size:14px;
+}

static/css/Mapper.css

@@ -57,21 +57,10 @@
     background-position: 0 50%;
 }
 
-.mapper-pin-1, .mapper .pin-1 a {
+.mapper-pin-1, .mapper .pin-1 a { background-image: url(../images/Mapper/pin-green.png);  }
-    background-image: url(../images/Mapper/pin-green.png);
+.mapper-pin-2, .mapper .pin-2 a { background-image: url(../images/Mapper/pin-red.png);    }
-}
+.mapper-pin-3, .mapper .pin-3 a { background-image: url(../images/Mapper/pin-blue.png);   }
-
+.mapper-pin-4, .mapper .pin-4 a { background-image: url(../images/Mapper/pin-purple.png); }
-.mapper-pin-2, .mapper .pin-2 a {
-    background-image: url(../images/Mapper/pin-red.png);
-}
-
-.mapper-pin-3, .mapper .pin-3 a {
-    background-image: url(../images/Mapper/pin-blue.png);
-}
-
-.mapper-pin-4, .mapper .pin-4 a {
-    background-image: url(../images/Mapper/pin-purple.png);
-}
 
 .mapper .glow {
     margin: 0 2px;
@@ -117,25 +106,11 @@
     margin: 0 5px;
 }
 
-.mapper .line var {
+.mapper .line   var { background: #C8B94C; }
-    background: #C8B94C;
+.mapper .line-1 var { background: #73B85B; }
-}
+.mapper .line-2 var { background: #D7563C; }
-
+.mapper .line-3 var { background: #47ACCD; }
-.mapper .line-1 var {
+.mapper .line-4 var { background: #C844D0; }
-    background: #73B85B;
-}
-
-.mapper .line-2 var {
-    background: #D7563C;
-}
-
-.mapper .line-3 var {
-    background: #47ACCD;
-}
-
-.mapper .line-4 var {
-    background: #C844D0;
-}
 
 html.ie678 .line var {
     margin-left: 0;
@@ -172,22 +147,8 @@ html.ie678 .line var {
     filter: FlipV;
 }
 
-.mapper .line var {
+.mapper .line   var { background: #C8B94C; }
-    background: #C8B94C;
+.mapper .line-1 var { background: #73B85B; }
-}
+.mapper .line-2 var { background: #D7563C; }
-
+.mapper .line-3 var { background: #47ACCD; }
-.mapper .line-1 var {
+.mapper .line-4 var { background: #C844D0; }
-    background: #73B85B;
-}
-
-.mapper .line-2 var {
-    background: #D7563C;
-}
-
-.mapper .line-3 var {
-    background: #47ACCD;
-}
-
-.mapper .line-4 var {
-    background: #C844D0;
-}

static/css/Mapper_ie6.css

@@ -0,0 +1,8 @@
+/*
+ TalentCalc_ie6.css version 278
+*/
+.mapper .pin a   { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Mapper/pin-yellow.png'); }
+.mapper .pin-1 a { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Mapper/pin-green.png');  }
+.mapper .pin-2 a { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Mapper/pin-red.png');    }
+.mapper .pin-3 a { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Mapper/pin-blue.png');   } 
+.mapper .pin-4 a { filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Mapper/pin-purple.png'); }

static/css/Profiler.css

@@ -218,7 +218,7 @@ a.profiler-header-editlink {
     margin-bottom: 10px;
     text-align: center;
     border: 1px solid #101010;
-    background: url(../images/ajax.gif) no-repeat 8px #141414;
+    background: url(../images/icons/ajax.gif) no-repeat 8px #141414;
 
     -webkit-border-radius: 6px;
     -moz-border-radius: 6px;
@@ -245,7 +245,7 @@ a.profiler-header-editlink {
     z-index: 1;
     float: right;
     font-size: 13px;
-    background: url(../images/link.gif) no-repeat left center;
+    background: url(../images/icons/link.gif) no-repeat left center;
     padding: 5px 5px 5px 19px;
     margin-left: 6px;
 }
@@ -254,7 +254,7 @@ a.profiler-header-editlink {
     z-index: 1;
     float: right;
     font-size: 13px;
-    background: url(../images/help.gif) no-repeat left center;
+    background: url(../images/icons/help.gif) no-repeat left center;
     padding: 5px 5px 5px 21px;
     margin-left: 6px;
 }
@@ -263,7 +263,7 @@ a.profiler-header-editlink {
     z-index: 1;
     float: right;
     font-size: 13px;
-    background: url(../images/print.gif) no-repeat left center;
+    background: url(../images/icons/print.gif) no-repeat left center;
     padding: 5px 5px 5px 21px;
 }
 
@@ -353,70 +353,21 @@ a.profiler-header-editlink {
     border-radius: 0 0 3px 3px;
 }
 
-.profiler-infobox-gear .progressbar-rep0 {
+.profiler-infobox-gear .progressbar-rep0 { border: 1px solid #9c2319; border-top: 1px solid #b82e21; }
-    border: 1px solid #9c2319;
+.profiler-infobox-gear .progressbar-rep1 { border: 1px solid #b05421; border-top: 1px solid #c9662b; }
-    border-top: 1px solid #b82e21;
+.profiler-infobox-gear .progressbar-rep2 { border: 1px solid #bf8626; border-top: 1px solid #d59b31; }
-}
+.profiler-infobox-gear .progressbar-rep3 { border: 1px solid #bb9b25; border-top: 1px solid #d2b130; }
+.profiler-infobox-gear .progressbar-rep4 { border: 1px solid #8d8b01; border-top: 1px solid #a4a201; }
+.profiler-infobox-gear .progressbar-rep5 { border: 1px solid #638701; border-top: 1px solid #74a001; }
+.profiler-infobox-gear .progressbar-rep6 { border: 1px solid #288b01; border-top: 1px solid #30a601; }
+.profiler-infobox-gear .progressbar-rep7 { border: 1px solid #068870; border-top: 1px solid #0aa087; }
+.profiler-infobox-gear .progressbar-ach0 { border: 1px solid #2082af; border-top: 1px solid #0aa087; }
 
-.profiler-infobox-gear .progressbar-rep1 {
+.profiler-infobox-gear .progressbar-ach1 { border: 1px solid #686868; border-top: 1px solid #7a7a7a; }
-    border: 1px solid #b05421;
-    border-top: 1px solid #c9662b;
-}
 
-.profiler-infobox-gear .progressbar-rep2 {
+.profiler-infobox-gear .progressbar-green  { border: 1px solid #2b9401; border-top: 1px solid #3aca01; }
-    border: 1px solid #bf8626;
+.profiler-infobox-gear .progressbar-yellow { border: 1px solid #b1ae00; border-top: 1px solid #e6e200; }
-    border-top: 1px solid #d59b31;
+.profiler-infobox-gear .progressbar-red    { border: 1px solid #b10c00; border-top: 1px solid #e60f00; }
-}
-
-.profiler-infobox-gear .progressbar-rep3 {
-    border: 1px solid #bb9b25;
-    border-top: 1px solid #d2b130;
-}
-
-.profiler-infobox-gear .progressbar-rep4 {
-    border: 1px solid #8d8b01;
-    border-top: 1px solid #a4a201;
-}
-
-.profiler-infobox-gear .progressbar-rep5 {
-    border: 1px solid #638701;
-    border-top: 1px solid #74a001;
-}
-
-.profiler-infobox-gear .progressbar-rep6 {
-    border: 1px solid #288b01;
-    border-top: 1px solid #30a601;
-}
-
-.profiler-infobox-gear .progressbar-rep7 {
-    border: 1px solid #068870;
-    border-top: 1px solid #0aa087;
-}
-
-.profiler-infobox-gear .progressbar-ach0 {
-    border: 1px solid #2082af;
-    border-top: 1px solid #0aa087;
-}
-
-.profiler-infobox-gear .progressbar-ach1 {
-    border: 1px solid #686868;
-    border-top: 1px solid #7a7a7a;
-}
-
-.profiler-infobox-gear .progressbar-green {
-    border: 1px solid #2b9401;
-    border-top: 1px solid #3aca01;
-}
-
-.profiler-infobox-gear .progressbar-yellow {
-    border: 1px solid #b1ae00;
-    border-top: 1px solid #e6e200;
-}
-
-.profiler-infobox-gear .progressbar-red {
-    border: 1px solid #b10c00;
-    border-top: 1px solid #e60f00;
-}
 
 /*********************************************/
 
@@ -843,12 +794,12 @@ a.profiler-achievements-total-right {
     background: no-repeat left center;
 }
 
-.moneyschoolarc { background-image: url(../../images/icons/resist-arcane.gif); }
+.moneyschoolarc { background-image: url(../images/icons/resist-arcane.gif); }
-.moneyschoolfir { background-image: url(../../images/icons/resist-fire.gif); }
+.moneyschoolfir { background-image: url(../images/icons/resist-fire.gif); }
-.moneyschoolfro { background-image: url(../../images/icons/resist-frost.gif); }
+.moneyschoolfro { background-image: url(../images/icons/resist-frost.gif); }
-.moneyschoolhol { background-image: url(../../images/icons/resist-holy.gif); }
+.moneyschoolhol { background-image: url(../images/icons/resist-holy.gif); }
-.moneyschoolnat { background-image: url(../../images/icons/resist-nature.gif); }
+.moneyschoolnat { background-image: url(../images/icons/resist-nature.gif); }
-.moneyschoolsha { background-image: url(../../images/icons/resist-shadow.gif); }
+.moneyschoolsha { background-image: url(../images/icons/resist-shadow.gif); }
 
 
 /**************/

static/css/Summary.css

@@ -114,7 +114,7 @@ div.summary-group-controls {
 	height:13px;
 	margin:1px;
 	white-space:nowrap;
-	background:url(/template/images/group-controls.gif) repeat-x;
+	background:url(../images/Summary/group-controls.gif) repeat-x;
 }
 
 a.summary-group-dropdown {
@@ -127,7 +127,7 @@ a.summary-group-dropdown span {
 	display:block;
 	width:10px;
 	height:6px;
-	background:url(/template/images/group-controls.gif) 0 -13px no-repeat;
+	background:url(../images/Summary/group-controls.gif) 0 -13px no-repeat;
 }
 
 a.summary-group-dropdown:hover span {
@@ -144,7 +144,7 @@ a.summary-group-focus span {
 	display:block;
 	width:13px;
 	height:8px;
-	background:url(/template/images/group-controls.gif) -37px -13px no-repeat;
+	background:url(../images/Summary/group-controls.gif) -37px -13px no-repeat;
 }
 
 a.summary-group-focus:hover span,a.summary-group-focus span.selected {
@@ -161,7 +161,7 @@ a.summary-group-delete span {
 	display:block;
 	width:10px;
 	height:9px;
-	background:url(/template/images/group-controls.gif) -10px -13px no-repeat;
+	background:url(../images/Summary/group-controls.gif) -10px -13px no-repeat;
 }
 
 a.summary-group-delete:hover span {
@@ -180,7 +180,7 @@ a.summary-group-drag span {
 	display:block;
 	width:17px;
 	height:6px;
-	background:url(/template/images/group-controls.gif) -20px -13px no-repeat;
+	background:url(../images/Summary/group-controls.gif) -20px -13px no-repeat;
 }
 
 div.summary-group-bottom {
@@ -188,7 +188,7 @@ div.summary-group-bottom {
 }
 
 div.summary-notice {
-	background:url(../../images/icons/help.gif) 8px 9px no-repeat;
+	background:url(../images/icons/help.gif) 8px 9px no-repeat;
     background-color: #141414;
     border: 1px solid #101010;
     border-radius: 4px;

static/css/TalentCalc_ie6.css

@@ -0,0 +1,45 @@
+/*
+ TalentCalc_ie6.css version 278
+*/
+.talentcalc-upper
+{
+    height:1px;
+}
+
+.iconmedium a.bubbly { background-image:url(../images/TalentCalc/icon-medium-hilite.gif); }
+
+.talentcalc-arrow-leftdown   td { background-image:url(../images/TalentCalc/arrows/leftdown.gif);   }
+.talentcalc-arrow-leftdown2  td { background-image:url(../images/TalentCalc/arrows/leftdown2.gif);  }
+
+.talentcalc-arrow-rightdown  td { background-image:url(../images/TalentCalc/arrows/rightdown.gif);  }
+.talentcalc-arrow-rightdown2 td { background-image:url(../images/TalentCalc/arrows/rightdown2.gif); }
+
+.talentcalc-arrow-right      td { background-image:url(../images/TalentCalc/arrows/right.gif);      }
+.talentcalc-arrow-right2     td { background-image:url(../images/TalentCalc/arrows/right2.gif);     }
+
+.talentcalc-arrow-left       td { background-image:url(../images/TalentCalc/arrows/left.gif);       }
+.talentcalc-arrow-left2      td { background-image:url(../images/TalentCalc/arrows/left2.gif);      }
+
+.talentcalc-arrow-down       td,
+.talentcalc-arrow-leftdown   th,
+.talentcalc-arrow-rightdown  th { background-image:url(../images/TalentCalc/arrows/down.gif);       }
+
+.talentcalc-arrow-down2      td,
+.talentcalc-arrow-leftdown2  th,
+.talentcalc-arrow-rightdown2 th { background-image:url(../images/TalentCalc/arrows/down2.gif);      }
+
+.iconmedium div.icon-bubble
+{
+    background:none;
+    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/TalentCalc/bubble2.png');
+}
+
+.talentcalc-lower a
+{
+    filter:alpha(opacity=33.33);
+}
+
+.talentcalc-lower a:hover
+{
+    filter:alpha(opacity=100);
+}

static/css/TalentCalc_ie67.css

@@ -0,0 +1,7 @@
+/*
+ TalentCalc_ie67.css version 278
+*/
+.talentcalc-glyphpicker .listview table
+{
+    width:97%;
+}

static/css/basic.css

@@ -13,7 +13,7 @@
 .wowhead-tooltip table { border-spacing: 0; border-collapse: collapse; margin: 0; width: auto; } /*maybe remove width:auto*/
 .wowhead-tooltip table, .wowhead-tooltip td, .wowhead-tooltip th, .wowhead-tooltip tbody { border: 0 !important; }
 .wowhead-tooltip td table td table { width: 100% }
-.wowhead-tooltip td, .wowhead-tooltip th { background: url(../images/tooltip.png); font-family: Verdana, sans-serif; font-size: 12px; line-height: 17px; color: white; }
+.wowhead-tooltip td, .wowhead-tooltip th { background: url(../images/wow/tooltip.png); font-family: Verdana, sans-serif; font-size: 12px; line-height: 17px; color: white; }
 
 .wowhead-tooltip th { height: auto; padding: 3px; vertical-align: top; }
 .wowhead-tooltip td { padding: 8px 4px 1px 9px; text-align: left; vertical-align: top; }
@@ -25,7 +25,7 @@
 .wowhead-tooltip td td { padding: 0; text-align: left; }
 
 .wowhead-tooltip p     { position: absolute; left: -44px; top: -1px; width: 44px; height: 44px; background: 4px 4px no-repeat; margin: 0; padding: 0; }
-.wowhead-tooltip p div { width: 44px; height: 44px; background-image: url(../../images/icons/border_medium.png); }
+.wowhead-tooltip p div { width: 44px; height: 44px; background-image: url(../images/Icon/medium/border/default.png); }
 
 .wowhead-tooltip table.shrink b { font-size: 12px; line-height: 15px; }
 .wowhead-tooltip table.shrink td, .wowhead-tooltip table.shrink th { font-size: 10px; line-height: 14px; }
@@ -36,7 +36,7 @@
 .wowhead-tooltip del { color: #FF8040; text-decoration: none; border-bottom: 1px dotted; }
 
 .wowhead-tooltip-powered {
-    /* background: url(../../../images/powered.png) no-repeat; */
+    /* background: url(../images/powered.png) no-repeat; */
     width: 53px;
     height: 33px;
     position: absolute;
@@ -51,18 +51,18 @@
 }
 
 .moneyitem            { padding-right: 18px; }
-.moneygold            { padding-right: 15px; background-image: url(../../images/icons/money_gold.gif);         }
+.moneygold            { padding-right: 15px; background-image: url(../images/icons/money-gold.gif);       }
-.moneysilver          { padding-right: 15px; background-image: url(../../images/icons/money_silver.gif);       }
+.moneysilver          { padding-right: 15px; background-image: url(../images/icons/money-silver.gif);     }
-.moneycopper          { padding-right: 15px; background-image: url(../../images/icons/money_copper.gif);       }
+.moneycopper          { padding-right: 15px; background-image: url(../images/icons/money-copper.gif);     }
-.moneyalliance        { padding-right: 12px; background-image: url(../../images/icons/alliance-icon.gif);      }
+.moneyalliance        { padding-right: 12px; background-image: url(../images/icons/alliance.gif);         }
-.moneyhorde           { padding-right: 17px; background-image: url(../../images/icons/horde-icon.gif);         }
+.moneyhorde           { padding-right: 17px; background-image: url(../images/icons/horde.gif);            }
-.moneyarena           { padding-right: 18px; background-image: url(../../images/icons/money_arena.gif);        }
+.moneyarena           { padding-right: 18px; background-image: url(../images/icons/arena.gif);            }
-.moneyachievement     { padding-right: 13px; background-image: url(../../images/icons/money_achievement.gif);  }
+.moneyachievement     { padding-right: 13px; background-image: url(../images/icons/achievement.gif);      }
-.moneysocketmeta      { padding-right: 18px; background-image: url(../../images/sockets/socket_meta.gif);      }
+.moneysocketmeta      { padding-right: 18px; background-image: url(../images/icons/socket-meta.gif);      }
-.moneysocketred       { padding-right: 18px; background-image: url(../../images/sockets/socket_red.gif);       }
+.moneysocketred       { padding-right: 18px; background-image: url(../images/icons/socket-red.gif);       }
-.moneysocketyellow    { padding-right: 18px; background-image: url(../../images/sockets/socket_yellow.gif);    }
+.moneysocketyellow    { padding-right: 18px; background-image: url(../images/icons/socket-yellow.gif);    }
-.moneysocketblue      { padding-right: 18px; background-image: url(../../images/sockets/socket_blue.gif);      }
+.moneysocketblue      { padding-right: 18px; background-image: url(../images/icons/socket-blue.gif);      }
-.moneysocketprismatic { padding-right: 18px; background-image: url(../../images/sockets/socket_prismatic.gif); }
+.moneysocketprismatic { padding-right: 18px; background-image: url(../images/icons/socket-prismatic.gif); }
 
 a.moneyitem, a.moneysocketmeta, a.moneysocketred, a.moneysocketyellow, a.moneysocketblue, a.moneysocketprismatic,  a.moneyachievement{
     text-decoration: none !important;
@@ -147,11 +147,11 @@ a span.moneyitem, a span.moneysocketmeta, a span.moneysocketred, a span.moneysoc
 /* SOCKETS ICONS */
 /*****************/
 
-.socket-meta      { padding-left: 26px; background: url(../../images/sockets/socket_meta.gif) no-repeat left center;      }
+.socket-meta      { padding-left: 26px; background: url(../images/icons/socket-meta.gif) no-repeat left center;      }
-.socket-red       { padding-left: 26px; background: url(../../images/sockets/socket_red.gif) no-repeat left center;       }
+.socket-red       { padding-left: 26px; background: url(../images/icons/socket-red.gif) no-repeat left center;       }
-.socket-yellow    { padding-left: 26px; background: url(../../images/sockets/socket_yellow.gif) no-repeat left center;    }
+.socket-yellow    { padding-left: 26px; background: url(../images/icons/socket-yellow.gif) no-repeat left center;    }
-.socket-blue      { padding-left: 26px; background: url(../../images/sockets/socket_blue.gif) no-repeat left center;      }
+.socket-blue      { padding-left: 26px; background: url(../images/icons/socket-blue.gif) no-repeat left center;      }
-.socket-prismatic { padding-left: 26px; background: url(../../images/sockets/socket_prismatic.gif) no-repeat left center; }
+.socket-prismatic { padding-left: 26px; background: url(../images/icons/socket-prismatic.gif) no-repeat left center; }
 
 /***********/
 /* WIDGETS */

static/css/global_ie.css

@@ -35,7 +35,7 @@ div.lightbox-overlay
 
 div.screenshotviewer-screen a
 {
-    background: url(../images/pixel.gif) no-repeat;
+    background: url(../images/deprecated/pixel.gif) no-repeat;
 }
 
 .dragged

static/css/global_ie6.css

@@ -3,7 +3,7 @@
     top: 1px;
 }
 
-.tooltip th
+.wowhead-tooltip th
 {
     height: 8px;
 }
@@ -89,7 +89,7 @@ height: 498px;
     visibility: visible;
     font-weight: normal;
     line-height: 29px;
-    background: url(../images/tab_tl.gif) top left no-repeat;
+    background: url(../images/Tabs/corner-tl.gif) top left no-repeat;
 }
 
 .tabs a.selected b
@@ -100,154 +100,154 @@ height: 498px;
 .iconsmall del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/icons/border_small.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/border/default.png');
 }
 
 .iconlarge del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/icons/border_large.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/large/border/default.png');
 }
 
 .iconsmall-socket-meta del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_meta1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/meta1.png');
 }
 
 .iconsmall-socket-meta-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_meta0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/meta0.png');
 }
 
 .iconsmall-socket-red del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_red1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/red1.png');
 }
 
 .iconsmall-socket-red-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_red0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/red0.png');
 }
 
 .iconsmall-socket-yellow del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_yellow1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/yellow1.png');
 }
 
 .iconsmall-socket-yellow-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_yellow0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/yellow0.png');
 }
 
 .iconsmall-socket-blue del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_blue1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/blue1.png');
 }
 
 .iconsmall-socket-blue-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_blue0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/blue0.png');
 }
 
 .iconsmall-socket-prismatic del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_prismatic1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/prismatic1.png');
 }
 
 .iconsmall-socket-prismatic-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/small/socket_prismatic0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/small/socket/prismatic0.png');
 }
 
 .iconmedium-socket-meta del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_meta1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/meta1.png');
 }
 
 .iconmedium-socket-meta-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_meta0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/meta0.png');
 }
 
 .iconmedium-socket-red del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_red1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/red1.png');
 }
 
 .iconmedium-socket-red-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_red0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/red0.png');
 }
 
 .iconmedium-socket-yellow del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_yellow1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/yellow1.png');
 }
 
 .iconmedium-socket-yellow-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_yellow0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/yellow0.png');
 }
 
 .iconmedium-socket-blue del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_blue1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/blue1.png');
 }
 
 .iconmedium-socket-blue-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_blue0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/blue0.png');
 }
 
 .iconmedium-socket-prismatic del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_prismatic1.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/prismatic1.png');
 }
 
 .iconmedium-socket-prismatic-empty del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/sockets/medium/socket_prismatic0.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/socket/prismatic0.png');
 }
 
 .iconsmall a
 {
-    background-image: url(../images/hilite_small.gif);
+    background-image: url(../images/Icon/small/hilite/default.gif);
 }
 
 .iconmedium a
 {
-    background-image: url(../images/hilite_medium_new.gif);
+    background-image: url(../images/Icon/medium/hilite/default.gif);
 }
 
 .iconmedium-gold del
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/icons/border_medium_gold.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/border/gold.png');
 }
 
-.tooltip td, .tooltip th
+.wowhead-tooltip td, .wowhead-tooltip th
 {
-    background-image: url(../images/tooltip.gif);
+    background-image: url(../images/wow/tooltip.gif);
 }
 
 .listview-quicksearch em
@@ -258,7 +258,7 @@ height: 498px;
 
 div.live-search-icon div
 {
-    background-image: url(../images/border_small.gif);
+    background-image: url(../images/Icon/small/border/default.gif);
 }
 
 .live-search a, .live-search div div
@@ -278,63 +278,63 @@ div.toolbar img
 
 img.toolbar-b
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-b.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-b.png');
 }
 
 img.toolbar-i
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-i.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-i.png');
 }
 
 img.toolbar-u
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-u.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-u.png');
 }
 
 img.toolbar-s
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-s.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-s.png');
 }
 
 img.toolbar-url
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-url.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-url.png');
 }
 
 img.toolbar-small
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-small.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-small.png');
 }
 
 img.toolbar-quote
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-quote.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-quote.png');
 }
 
 img.toolbar-code
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-code.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-code.png');
 }
 
 img.toolbar-ul
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-ul.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-ul.png');
 }
 
 img.toolbar-ol
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-ol.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-ol.png');
 }
 
 img.toolbar-li
 {
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='template/images/toolbar-li.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/deprecated/toolbar-li.png');
 }
 
 .rcorners tt, .rcorners strong, .rcorners var, .rcorners em
 {
     font-size: 1px;
-    background-image: url(../images/corners.gif);
+    background-image: url(../images/deprecated/corners.gif);
 }
 
 #header, .wrapper.nosidebar #main, .wrapper.nosidebar #main-contents.main-contents
@@ -352,8 +352,8 @@ img.toolbar-li
     font-size: 1px;
 }
 
-.iconmedium del, .tooltip p div
+.iconmedium del, .wowhead-tooltip p div
 {
     background: none;
-    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='images/icons/border_medium.png');
+    filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src='../images/Icon/medium/border/default.png');
 }

static/css/talentcalc.css

@@ -29,23 +29,23 @@ a.talentcalc-button-help {
     right:10px;
     top:10px;
     margin:0;
-    background-image:url(../images/help.gif);
+    background-image:url(../images/icons/help.gif);
 }
 
 a.talentcalc-button-lock {
     float:left;
-    background-image:url(../images/locked.gif);
+    background-image:url(../images/icons/locked.gif);
 }
 
 a.talentcalc-button-unlock {
     float:left;
-    background-image:url(../images/unlocked.gif);
+    background-image:url(../images/icons/unlocked.gif);
 }
 
 a.talentcalc-button-reset {
     float:left;
     padding-left:19px;
-    background-image:url(../images/delete.gif);
+    background-image:url(../images/icons/delete.gif);
 }
 
 .talentcalc-sidebar-controls2 a {
@@ -57,12 +57,12 @@ a.talentcalc-button-reset {
 
 a.talentcalc-button-export {
     padding-left:19px;
-    background-image:url(../images/link.gif);
+    background-image:url(../images/icons/link.gif);
 }
 
 a.talentcalc-button-summary {
     padding-left:19px;
-    background-image:url(../images/print.gif);
+    background-image:url(../images/icons/print.gif);
 }
 
 .talentcalc-sidebar h3 {
@@ -150,7 +150,7 @@ a.talentcalc-button-summary {
     width:244px;
     height:364px;
     margin-left: 370px;
-    /* background: url(../../images/talent/pet-tree-glow.png); */
+    /* background: url(../images/TalentCalc/pet-tree-glow.png); */
 }
 
 .talentcalc-main table {
@@ -179,7 +179,7 @@ a.talentcalc-button-summary {
     top:1px;
     width:42px;
     height:42px;
-    background:url(../../images/talent/border.gif) no-repeat;
+    background:url(../images/TalentCalc/border.gif) no-repeat;
 }
 
 .iconmedium div.icon-bubble {
@@ -189,7 +189,7 @@ a.talentcalc-button-summary {
     height:23px;
     left:30px;
     top:29px;
-    background:url(../../images/talent/bubble2.png) no-repeat;
+    background:url(../images/TalentCalc/bubble2.png) no-repeat;
     visibility:hidden;
     padding:4px 0 0;
     font-family:Verdana,sans-serif;
@@ -199,7 +199,7 @@ a.talentcalc-button-summary {
 }
 
 .iconmedium a.bubbly {
-    background-image:url(../../images/talent/hilite_medium_talent.png);
+    background-image:url(../images/TalentCalc/icon-medium-hilite.png);
 }
 
 .talentcalc-arrow-anchor {
@@ -224,37 +224,26 @@ a.talentcalc-button-summary {
     height:auto;
 }
 
-.talentcalc-arrow-leftdown td {
+.talentcalc-arrow-leftdown  td { background-image:url(../images/TalentCalc/arrows/leftdown.png);    }
-    background-image:url(../../images/talent/arrows/leftdown.png);
+.talentcalc-arrow-leftdown2 td { background-image:url(../images/TalentCalc/arrows/leftdown2.png);   }
-}
 
-.talentcalc-arrow-leftdown2 td {
+.talentcalc-arrow-rightdown  td { background-image:url(../images/TalentCalc/arrows/rightdown.png);  }
-    background-image:url(../../images/talent/arrows/leftdown2.png);
+.talentcalc-arrow-rightdown2 td { background-image:url(../images/TalentCalc/arrows/rightdown2.png); }
-}
 
-.talentcalc-arrow-rightdown td {
+.talentcalc-arrow-right td { background-image:url(../images/TalentCalc/arrows/right.png);           }
-    background-image:url(../../images/talent/arrows/rightdown.png);
+.talentcalc-arrow-right2 td { background-image:url(../images/TalentCalc/arrows/right2.png);         }
-}
 
-.talentcalc-arrow-rightdown2 td {
+.talentcalc-arrow-left  td { background-image:url(../images/TalentCalc/arrows/left.png);            }
-    background-image:url(../../images/talent/arrows/rightdown2.png);
+.talentcalc-arrow-left2 td { background-image:url(../images/TalentCalc/arrows/left2.png);           }
-}
 
-.talentcalc-arrow-right td {
+.talentcalc-arrow-down      td,
-    background-image:url(../../images/talent/arrows/right.png);
+.talentcalc-arrow-leftdown  th,
-}
+.talentcalc-arrow-rightdown th { background-image:url(../images/TalentCalc/arrows/down.png);        }
 
-.talentcalc-arrow-right2 td {
+.talentcalc-arrow-down2      td,
-    background-image:url(../../images/talent/arrows/right2.png);
+.talentcalc-arrow-leftdown2  th,
-}
+.talentcalc-arrow-rightdown2 th { background-image:url(../images/TalentCalc/arrows/down2.png);      }
 
-.talentcalc-arrow-left td {
-    background-image:url(../../images/talent/arrows/left.png);
-}
-
-.talentcalc-arrow-left2 td {
-    background-image:url(../../images/talent/arrows/left2.png);
-}
 
 .talentcalc-lower {
     position:relative;
@@ -334,7 +323,7 @@ a.talentcalc-button-summary {
     width:20px;
     height:20px;
     opacity:.3333;
-    background:url(../images/delete.gif) no-repeat 2px 2px;
+    background:url(../images/icons/delete.gif) no-repeat 2px 2px;
 }
 
 .talentcalc-lower a:hover {
@@ -375,14 +364,6 @@ a.talentcalc-button-summary {
     width:600px;
 }
 
-.talentcalc-arrow-down td, .talentcalc-arrow-leftdown th, .talentcalc-arrow-rightdown th {
-    background-image:url(../../images/talent/arrows/down.png);
-}
-
-.talentcalc-arrow-down2 td, .talentcalc-arrow-leftdown2 th, .talentcalc-arrow-rightdown2 th {
-    background-image:url(../../images/talent/arrows/down2.png);
-}
-
 .talentcalc-wrapper {
     float: left;
     width: 614px; /* fixes IE7 being dumb and moving down the glyph window */