[48] Show character arena teams on character sheet page

_css/character/sheet.css

@@ -262,18 +262,18 @@ a.more_char_act:hover { background-position:-18px -210px; }
 .deco-frame thead td,.deco-frame tfoot td{height:9px;width:12px}
 .deco-frame tfoot td.sb b{height:9px;width:1px;position:relative}
 .deco-frame td.sl b,.deco-frame td.sr b{width:12px;display:block;height:1px;position:relative}
-.deco-frame thead td.sl{background:url('../../images/toggle_btns.jpg)df-tl.gif') no-repeat 0 0 !important}
-.deco-frame thead td.sr{background:url('../../images/toggle_btns.jpg)df-tr.gif') no-repeat 0 0 !important}
-.deco-frame .st{background:url('../../images/toggle_btns.jpg)df-t.gif') repeat-x 0 0 !important}
-.deco-frame tbody td.sl{background:url('../../images/toggle_btns.jpg)df-l.gif') repeat-y 0 0 !important;vertical-align:middle !important}
-.deco-frame tbody td.sr{background:url('../../images/toggle_btns.jpg)df-r.gif') repeat-y 100% 0 !important;vertical-align:middle !important}
-.deco-frame tfoot td.sl{background:url('../../images/toggle_btns.jpg)df-bl.gif') no-repeat 0 0 !important}
-.deco-frame tfoot td.sr{background:url('../../images/toggle_btns.jpg)df-br.gif') no-repeat 0 0 !important}
-.deco-frame .sb{background:url('../../images/toggle_btns.jpg)df-b.gif') repeat-x 0 0 !important}
+.deco-frame thead td.sl{background:url('../../images/df-tl.gif') no-repeat 0 0 !important}
+.deco-frame thead td.sr{background:url('../../images/df-tr.gif') no-repeat 0 0 !important}
+.deco-frame .st{background:url('../../images/df-t.gif') repeat-x 0 0 !important}
+.deco-frame tbody td.sl{background:url('../../images/df-l.gif') repeat-y 0 0 !important;vertical-align:middle !important}
+.deco-frame tbody td.sr{background:url('../../images/df-r.gif') repeat-y 100% 0 !important;vertical-align:middle !important}
+.deco-frame tfoot td.sl{background:url('../../images/df-bl.gif') no-repeat 0 0 !important}
+.deco-frame tfoot td.sr{background:url('../../images/df-br.gif') no-repeat 0 0 !important}
+.deco-frame .sb{background:url('../../images/df-b.gif') repeat-x 0 0 !important}
 .deco-frame .ct{padding:2px;width:100% !important}
-.deco-frame em.port{background:url('../../images/toggle_btns.jpg)df-left.gif') no-repeat;width:25px;height:114px;top:-57px;left:-15px;display:block;position:absolute}
-.deco-frame em.star{background:url('../../images/toggle_btns.jpg)df-right.gif') no-repeat;width:25px;height:114px;top:-57px;right:-15px;display:block;position:absolute}
-.deco-frame em.foot{background:url('../../images/toggle_btns.jpg)df-bot.gif') no-repeat;width:136px;height:36px;top:4px;left:-68px;display:block;position:absolute}
+.deco-frame em.port{background:url('../../images/df-left.gif') no-repeat;width:25px;height:114px;top:-57px;left:-15px;display:block;position:absolute}
+.deco-frame em.star{background:url('../../images/df-right.gif') no-repeat;width:25px;height:114px;top:-57px;right:-15px;display:block;position:absolute}
+.deco-frame em.foot{background:url('../../images/df-bot.gif') no-repeat;width:136px;height:36px;top:4px;left:-68px;display:block;position:absolute}
 
 /* under level 10 */
 .under10{width:550px;margin:0 auto;}
@@ -288,25 +288,25 @@ a.more_char_act:hover { background-position:-18px -210px; }
 
 /* arena/pvp */
 .arena-ranking{padding:8px 8px 5px 8px;;}
-.arena-ranking h2{clear:both;height:25px;line-height:25px !important;margin:0;padding:0 0 0 6px;background:url(../../images/toggle_btns.jpg)achievetitle-bg.jpg) #f1db91 0 0 repeat-y;color:#f2e09a;font:18px 'Trebuchet MS',Arial,Helvetica,sans-serif;text-transform:uppercase}
+.arena-ranking h2{clear:both;height:25px;line-height:25px !important;margin:0;padding:0 0 0 6px;background:url(../../images/achievetitle-bg.jpg) #f1db91 0 0 repeat-y;color:#f2e09a;font:18px 'Trebuchet MS',Arial,Helvetica,sans-serif;text-transform:uppercase}
 .arena-ranking h2 a:link,.arena-ranking h2 a:hover,.arena-ranking h2 a:visited,.arena-ranking h2 a:active{float:right;position:relative;color:#005ba1;font:11px 'Trebuchet MS',Arial,Helvetica,sans-serif;display:block;height:25px;line-height:25px;text-transform:none;background:url('../../images/toggle_btns.jpg)more-arrow.gif') 100% 50% no-repeat;padding-right:21px}
-.arena-ranking h3{margin:0 0 3px 0;padding:0 0 0px 6px;text-transform:uppercase;color:#847240;font-size:12px;background:url('../../images/toggle_btns.jpg)achievetitle-bg.jpg') #f0da8d -250px 100% repeat-y;}
+.arena-ranking h3{margin:0 0 3px 0;padding:0 0 0px 6px;text-transform:uppercase;color:#847240;font-size:12px;background:url('../../images/achievetitle-bg.jpg') #f0da8d -250px 100% repeat-y;}
 .arena-ranking h3 strong{color:#533A00}
 
 ul.badges-pvp{margin:3px 0 3px 8px;padding:0;width:100%}
-ul.badges-pvp li{float:left;width:32%;margin:0 3px 3px 0;padding:0;list-style:none;position:relative;border:1px dotted #cbb166;text-align:center;background:url(../../images/toggle_btns.jpg)achieve-pvp-bg.jpg) 50% 0 repeat;color:#443b1f}
+ul.badges-pvp li{float:left;width:32%;margin:0 3px 3px 0;padding:0;list-style:none;position:relative;border:1px dotted #cbb166;text-align:center;background:url(../../images/achieve-pvp-bg.jpg) 50% 0 repeat;color:#443b1f}
 ul.badges-pvp li h4{display:block;margin:0;padding:17px 0 0 0;font:28px Georgia,"Times New Roman",Times,serif}
 ul.badges-pvp li em{display:block;text-transform:uppercase;font:12px 'Trebuchet MS',Arial,Helvetica,sans-serif;letter-spacing:0px}
-ul.badges-pvp li .arenacontainer{width:100%;height:160px;background:url(../../images/toggle_btns.jpg)achieve-pvp-wreath.jpg) 50% 0 no-repeat}
+ul.badges-pvp li .arenacontainer{width:100%;height:160px;background:url(../../images/achieve-pvp-wreath.jpg) 50% 0 no-repeat}
 ul.badges-pvp li .icon{width:149px;height:82px;margin:0 0 0 -74px;padding:0;background-position:48px 11px;background-repeat:no-repeat;background-image:none;position:absolute;top:66px;left:50%}
 ul.badges-pvp li .icon img{width:149px;height:82px}
 ul.badges-pvp li .rank-num{width:60px;height:40px;margin:0 0 0 -30px;padding:0;background:none;position:absolute;top:54px;left:36%}
 .personalrating span {font-size:10px;}
-.arena-team-faded{width:100%;height:160px;background:url(../../images/toggle_btns.jpg)achieve-pvp-wreath.jpg) 50% 0 no-repeat}
+.arena-team-faded{width:100%;height:160px;background:url(../../images/achieve-pvp-wreath.jpg) 50% 0 no-repeat}
 .arena-team-faded h4{color:#b09c61}
 .arena-team-faded em{color:#b09c61}
 
-.teamShortcut { background: url('../../images/toggle_btns.jpg)icons/arenareports/view-team.gif') no-repeat top left; height: 21px; width: 21px; display: block; float: left; margin: 2px; text-align:center; }
+.teamShortcut { background: url('../../images/icons/arenareports/view-team.gif') no-repeat top left; height: 21px; width: 21px; display: block; float: left; margin: 2px; text-align:center; }
 
 /* Embeded 3d Character Styles */
 

character-achievements.php

@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 46
+ * @revision 48
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -75,6 +75,7 @@
 }
 $armory->tpl->assign('tpl2include', 'character_achievement_main'); // Show achievements page
 $armory->tpl->assign('achievementsTree', $achievements->buildAchievementsTree()); // Achievement categories
+$armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 
 /*** Звание ***/
 $charTitle = $characters->GetCharacterTitle();

character-reputation.php

@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 46
+ * @revision 48
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -74,6 +74,7 @@ function cmp($a, $b) {
 }
 usort($rep, "cmp");
 $armory->tpl->assign('repList', $rep);
+$armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 
 $armory->tpl->assign('tpl2include', 'character_reputation');
 $armory->tpl->display('overall_header.tpl');

character-sheet.php

@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 47
+ * @revision 48
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -152,6 +152,8 @@
 /*** Звание ***/
 // TODO: расставить запятые
 $charTitle = $characters->GetCharacterTitle();
+$armory->tpl->assign('characterArenaTeamInfo', $characters->getCharacterArenaTeamInfo());
+$armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 $armory->tpl->assign('character_title_'.$charTitle['place'], $charTitle['title']);
 $armory->tpl->assign('playerHonorKills', $characters->getCharacterHonorKills());
 $armory->tpl->assign('tpl2include', 'character_sheet_info');

character-talents.php

@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 47
+ * @revision 48
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -162,7 +162,7 @@
         break;
 }
 $armory->tpl->assign('talentsFileName', $tplName);
-$armory->tpl->assign('playerHonorKills', $characters->getCharacterHonorKills());
+$armory->tpl->assign('characterArenaTeamInfoButton', $characters->getCharacterArenaTeamInfo(true));
 
 $charTitle = $characters->GetCharacterTitle();
 $armory->tpl->assign('character_title_'.$charTitle['place'], $charTitle['title']);

includes/classes/class.characters.php

@@ -3,7 +3,7 @@
 /**
  * @package World of Warcraft Armory
  * @version Release Candidate 1
- * @revision 47
+ * @revision 48
  * @copyright (c) 2009-2010 Shadez  
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  *
@@ -1148,5 +1148,59 @@ public function getCharacterSkill($skill, $guid=false) {
         $skillInfo = $this->cDB->selectRow("SELECT * FROM `character_skill` WHERE `guid`=? AND `skill`=?", $this->guid, $skill);
         return $skillInfo;
     }
+
+    public function getCharacterArenaTeamInfo($check = false) {
+        if(!$this->guid) {
+            return false;
+        }
+        $arenaTeamInfo = array();
+        $tmp_info = $this->cDB->select(
+        "SELECT 
+        `arena_team_member`.`arenateamid`,
+        `arena_team_member`.`guid`,
+        `arena_team_member`.`personal_rating`,
+        `arena_team`.`name`,
+        `arena_team`.`type`,
+        `arena_team_stats`.`rating`,
+        `arena_team_stats`.`rank`
+        FROM `arena_team_member` AS `arena_team_member`
+        LEFT JOIN `arena_team_stats` AS `arena_team_stats` ON `arena_team_stats`.`arenateamid`=`arena_team_member`.`arenateamid`
+        LEFT JOIN `arena_team` AS `arena_team` ON `arena_team`.`arenateamid`=`arena_team_member`.`arenateamid`
+        WHERE `arena_team_member`.`guid`=?", $this->guid);
+        if(!$tmp_info) {
+            return false;
+        }
+        if($check == true && $tmp_info) {
+            return true;
+        }
+        for($i=0;$i<3;$i++) {
+            if($tmp_info[$i]['type'] == '2') {
+                $arenaTeamInfo['2x2'] = array(
+                    'name' => $tmp_info[$i]['name'],
+                    'rank' => $tmp_info[$i]['rank'],
+                    'rating' => $tmp_info[$i]['rating'],
+                    'personalrating' => $tmp_info[$i]['personal_rating']
+                );
+            }
+            elseif($tmp_info[$i]['type'] == '3') {
+                $arenaTeamInfo['3x3'] = array(
+                    'name' => $tmp_info[$i]['name'],
+                    'rank' => $tmp_info[$i]['rank'],
+                    'rating' => $tmp_info[$i]['rating'],
+                    'personalrating' => $tmp_info[$i]['personal_rating']
+                );
+            }
+            elseif($tmp_info[$i]['type'] == '5') {
+                $arenaTeamInfo['5x5'] = array(
+                    'name' => $tmp_info[$i]['name'],
+                    'rank' => $tmp_info[$i]['rank'],
+                    'rating' => $tmp_info[$i]['rating'],
+                    'personalrating' => $tmp_info[$i]['personal_rating']
+                );
+            }
+            return $arenaTeamInfo;
+        }
+        return false;
+    }
 }
 ?>

includes/locales/en_gb.conf

@@ -1,9 +1,9 @@
 # File: en_gb.conf
-# Last-modified: January 8, 2010
+# Last-modified: January 17, 2010
 # Author: Shadez
 # Locale: English (en_GB)
 # Package: World of Warcraft Armory
-# File revision: 43
+# File revision: 48
 # Status: Release Candidate 1
 
 # global strings
@@ -332,6 +332,8 @@ armory_character_sheet_faq_a7 = For a complete list of titles, please visit our
 
 armory_error_profile_unavailable_title = Profile Unavailable
 armory_error_profile_unavailable_text = This character profile could not be displayed, possibly for one of the following reasons:<ul><li>The character has been inactive for an extended period of time.</li><li>The character name was spelled incorrectly.</li><li>The profile is temporarily unavailable while the character is in the midst of a process such as a realm transfer or faction change.</li><li>Characters that have been deleted are no longer available on the Armory.</li></ul>
+armory_error_item_not_exists_title = Item not found
+armory_error_item_not_exists_text = This item doesn't exist or is not yet in the database.
 
 armory_character_sheet_character_string = Character
 armory_character_sheet_guild_string = Guild
@@ -361,6 +363,22 @@ armory_character_sheet_active_dualspec = Active
 armory_character_sheet_upgrade_gear = Find an Upgrade
 armory_character_sheet_health = Health
 
+armory_character_sheet_gear_list = Gear List
+armory_character_sheet_view_model = Model View
+armory_character_sheet_loginExpired = Login Required.
+armory_character_sheet_list_item_name = Item Name
+armory_character_sheet_list_gems = Gems
+armory_character_sheet_list_enchants = Enchant
+armory_character_sheet_na_profession = None
+armory_character_sheet_na_dualspec = N/A
+armory_character_sheet_recent_activity = Recent Activity
+
+armory_character_talents_major_glyph = Major Glyph
+armory_character_talents_minor_glyph = Minor Glyph
+
+armory_character_sheet_arena = Arena
+armory_character_no_team = No Arena Team
+
 # character-achievements.php
 armory_character_achievements_loading_achievements = Loading.
 armory_character_achievements_unable_to_load = Unable to load data
@@ -513,8 +531,14 @@ armory_vault_previous = Previous
 armory_vault_next = Forward
 armory_vault_logoff = Log Out
 armory_vault_you_logged_as = You are logged in as
-armory_vault_add_character_to_list = &quot;Добавить персонажа в меню &laquo;Мои персонажи&raquo;&quot;
-armory_vault_add_new_char_disallowed = &quot;Вы уже ввели в меню &laquo;быстрого перехода&raquo; максимально допустимое количество персонажей. Чтобы добавить нового персонажа, необходимо удалить одного из нынешних.&quot;
+armory_vault_add_character_to_list = &quot;Add to My Characters menu&quot;
+armory_vault_add_new_char_disallowed = &quot;The quick access character limit has been reached. Remove a character to add new ones.&quot;
+armory_vault_dualtooltips_tip = With dual item tooltips enabled, mousing over an item will display a second tooltip of the item in your primary character\'s corresponding inventory slot.
+armory_vault_dualtooltips = Enable Dual Item Tooltips
+armory_vault_select_main_char = Designate as primary character
+armory_vault_delete_char = Remove from My Characters menu
+armory_vault_free_char_slot = Available character slot
+armory_vault_character_select = Character Selection
 
 # talent-calc.php
 armory_talent_calc_talents_calc = Talent Calculator