Merge https://github.com/Takenbacon/wowarmory

.gitignore

@@ -1,2 +1,10 @@
 # Add ignore files here
 .DS_Store
+
+.buildpath
+.project
+.settings/org.eclipse.php.core.prefs
+.settings/com.zend.php.remoteproject.core.prefs
+.settings/org.eclipse.php.server.core.phpServersPrefs.prefs
+.settings/org.eclipse.core.resources.prefs
+includes/classes/configuration.php

.htaccess

@@ -1,10 +1,9 @@
 # UTF8 support
 AddDefaultCharset utf8
-#php_value default_charset UTF-8
+php_value default_charset UTF-8
 
 RewriteEngine On
 RewriteRule ^(.*).xml $1.php?%{QUERY_STRING}
+# RSS Feed
 RewriteRule character-feed.atom character-feed-atom.php?%{QUERY_STRING}
-RewriteRule ^(.*).html $1.php?%{QUERY_STRING}
-RewriteRule ^(.*).htm $1.php?%{QUERY_STRING}
 Options -Indexes

3DViewer_info.txt

@@ -1,10 +1,10 @@
-Last updated: Jan-08-2011
+Last updated: Mar-5-2013
 
 Attention!
-Currently 3D Viewer is not completed full - there's no saving character poses, full screen mode
+Currently 3D Viewer is not yet fully completed - there's no saving character poses, full screen mode
 and some other features.
 
-For correct work, you need to download an archive with textures (~206 MB).
+To work correctly, you need to download an archive with the model textures (~297 MB compressed).
 
 All files from archive must be unpacked to the 'models' folder. The unpacked files are approximately 465 megabytes.
 Directory tree:
@@ -18,33 +18,8 @@ Directory tree:
                 |- texturecomponents
          |- spells
 
-If you have some troubles, report on forum:
-http://getmangos.com/community/topic/12096/world-of-warcraft-armory/
+If you find a bug, please report them here:
+https://github.com/Takenbacon/wowarmory/issues?state=open
 
-Direct link to 3D Viewer Models:
+Download link for 3D Viewer Models:
 http://uploading.com/files/8acm6582/models.rar/
-
------------------------
-
-Внимание!
-На данный момент 3D Viewer не завершен полностью - отсутствует сохранение позы персонажа, поддержка проигрывания в полном экране
-и некоторые другие возможности.
-
-Для корректной работы необходимо скачать архив с текстурами (~206 мегабайт).
-
-Все файлы из архива должны быть распакованы в папку 'models'. Распакованные файлы занимают примерно 465 мегабайт.
-Структура папок:
- - models
-         |- bgs
-         |- character
-         |- flash
-         |- images
-         |- item
-                |- objectcomponents
-                |- texturecomponents
-         |- spells
-Если у вас возникли какие-либо затруднения, пишите на форум:
-http://getmangos.com/community/topic/12096/world-of-warcraft-armory/
-
-Прямая ссылка на модели 3D просмотрщика:
-http://www.megaupload.com/?d=FNT1F64V

INSTALL

@@ -4,55 +4,19 @@ How to install WoW Armory
 
 SYSTEM REQUIREMENTS:
 1. Apache HTTP Server with mod_rewrite
-2. PHP 5 (PHP 6 is not supported) with XMLWriter package installed and enabled
+2. PHP 5.3 or higher with XMLWriter package installed and enabled (XMLWriter is installed and enabled by default since PHP 5.1.2)
 3. MySQL 5 Server or higher
 
 INSTALLATION STEPS:
-1. Create new MySQL database (`armory`, for expample) with utf8_general_ci encoding;
-2. Unzip sql/wowarmory_release_r{LATEST_REVISION}.sql.7z to any folder;
-3. Upload unpacked wowarmory_release_r{LATEST_REVISION}.sql and wowarmory_spell_release_r{LATEST_REVISION}.sql into `armory` database.
-4. Rename includes/classes/configuration.php.default to configuration.php and edit this file (read comments).
+1. Go to the patch folder and upload armory.sql (Will automatically create the database `armory`).
+2. Rename includes/classes/configuration.php.default to configuration.php and edit this file (read comments).
    Characters DB configs are stored in
        $ArmoryConfig['multiRealm'][1]['*_characters']
    And World DB configs are stored in
        $ArmoryConfig['multiRealm'][1]['*_mangos']
    You should edit these values according with your MySQL configs (user/password/dbname).
-5. Downloads icons archive from "Downloads" on GitHub.com and unpack it to "wow-icons/_images/"
-6. Unzip htaccess.zip archive and place unpacked .htaccess file to root site dir for correct scripts work.
-7. If there are some sql updates in 'sql/updates' dir (rev. {LATEST_REVISION} or higher), you need to upload it to DB too.
-8. For 3D Viewer installation info read 3DViewer_info.txt
-9. For full work you need to patch MaNGOS core with tools/{SERVER}/wowarmory_patch.patch
-   and your characters DB with provided SQL update (characters.sql - in the same folder).
-10. If you use UNIX system, you need to manage access rights to allow script write data to 'cache' folder.
-11. If you have diffirent servers (MaNGOS and Trinity Core):
-    Open 'includes/classes/configuration.php' and edit $ArmoryConfig['multiRealm'][{REALM_ID}]['type'] to 'trinity' or 'mangos'.
-
-========================
- 安装说明
-========================
-
-系统要求：
-1. Apache HTTP 服务器，启用mod_rewrite模块
-2. PHP 5（不支持PHP 6），并安装启用XMLWriter
-3. MySQL 5 服务器或更新
-
-安装步骤：
-1. 创建新的MySQL数据库（比如`armory`），编码格式为utf8_general_ci；
-2. 解压缩 sql/wowarmory_release_r{LATEST_REVISION}.sql.7z 至任意文件夹；
-3. 将SQL文件导入`armory`数据库。
-4. 修改 includes/classes/configuration.php文件
-		Character 数据库连接：$ArmoryConfig['multiRealm'][1]['*_characters']
-		World 	  数据库连接：$ArmoryConfig['multiRealm'][1]['*_mangos']
-5. 解压缩wow-icons.zip到网站目录下
-6. 解压缩htaccess.zip,
-    修改 .htaccess 文件（如果不是网站更目录请修改）：RewriteBase /Armory/  #这一行为英雄榜的访问地址，不含域名
-7. 将sql/updates下比{LATEST_REVISION}更新的版本SQL文件导入至'armory'数据库；
-	[汉化]将'armory_*_cn.7z'解压缩，连同目录下其他'armory_*_cn.sql'等SQL文件悉数导入至'armory'数据库完成汉化。
-8. 启用3D人物显示模块，解压缩models.zip至网站目录下
-9. 为了更好地使用所有功能，请使用tools里的文件给服务器端打上代码补丁：
-	tools/{SERVER}/wowarmory_patch.patch
-   并给character数据库打补丁 
-	tools/{SERVER}/sql/characters_patch.sql	
-10.Unix/Linux系统需要给Cache文件夹可写入权限
-11.支持多服务器：
-	打开 'includes/classes/configuration.php' 并编辑 $ArmoryConfig['multiRealm'][{REALM_ID}]['type'] 为 'trinity' 或 'mangos'.
+3. Downloads the icons archive from: http://www.mediafire.com/download.php?2newd68vnz847pv and unpack it to "wow-icons/_images/"
+4. For 3D Viewer installation info read 3DViewer_info.txt
+5. For full work you need to patch MaNGOS/Trinity core with the appropriate patch file found in the patch folder
+   and to update your characters DB with the provided SQL update (characters.sql - in the patch folder).
+6. If you use a UNIX system, you need to manage access rights to allow script write data to 'cache' folder.

README

@@ -4,4 +4,4 @@ Chinese Supported!
 WARNING: You must not remove and/or change any Blizzard's copyrights in any files and/or at the bottom of Armory pages!
 
 World of Warcraft™, Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries.
-The data contained herein is proprietary to Blizzard Entertainment, Inc. You are granted a limited license to make personal use of the information contained herein for non-commercial purposes only.
+The data contained herein is proprietary to Blizzard Entertainment, Inc. You are granted a limited license to make personal use of the information contained herein for non-commercial purposes only.

_css/_lang/en_gb/language.css

@@ -57,6 +57,10 @@ a.reset:hover{background-position:0 100%}
 .exportbutton a:link,.exportbutton a:hover,.exportbutton a:visited,.exportbutton a:active,.exportbutton span{font:bold 16px 'Trebuchet MS',Arial,Helvetica,sans-serif;color:#503512;text-decoration:none}
 .exportbutton span{padding-top:5px;height:32px;line-height:32px;display:block}
 .exportbutton a:hover{background:none}
+/* Items */
+/*...........................................................*/
+.item-title{background:url('../../../images/en_gb/title-itemsearch.gif') no-repeat 133px 5px}
+.pvprewards-header{background:url('../../../images/en_gb/header-pvprewards.jpg') no-repeat 0 0}
 /* Updates */
 /*...........................................................*/
 .ud-url{background:url('../../../images/en_gb/updates/armory4-url.jpg') no-repeat 50% 0;height:60px;position:relative;top:-10px;margin-bottom:-10px}

_css/tools/talent-calc.css

@@ -61,7 +61,7 @@ a.awesomeButton-printableVersion div { background-image: url('../../images/talen
 
 /* glyphs */
 #glyphsLabel { float: left; margin: 50px 0 0 0px !important; }
-#glyphHolder {position:absolute; top: 203px; right: 25px; width: 210px; height: 232px;}
+#glyphHolder {position:absolute; top: 165px; right: 25px; width: 210px; height: 232px;}
 .glyphHolderBottom { margin: 0 auto; background: url('../../images/talents/glyph-frame-bottom.gif') 0 0 no-repeat; width: 836px; height: 27px; position:relative; top: -30px;  } 
 
 #glyphHolder .glyph { cursor: default; float: left; display: block; background: url('../../images/talents/glyphs-small-left.gif') 0 0 no-repeat; padding: 0 0 0 33px; height: 33px; width: 173px; }

_js/armory.js

@@ -26,10 +26,10 @@ function initializeArmory(){
 	bindToolTips();
 
 	//ads are dead last so we don't wait for them
-	initializeAds();
+	//initializeAds();
 }
 
-function initializeAds()
+/*function initializeAds()
 {	//loadScript("http://ads1.msn.com/library/dap.js") 
 	//Does not callback when loaded, following commands error when loaded too soon
 
@@ -53,7 +53,7 @@ function initializeAds()
 
 	});
 
-}
+}*/
 
 
 //begin cookies section