mojotrollz/mojo_zero_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of mojotrollz.eu:hosting

Browse Source 
Conflicts:
	uVote/uVote/dbd/qq/UVOTE_DATA_USER_PER_PARTY_OVERALL.php
	uVote/uVote/page/user_main_urVote/user_main_urVote.php
This commit is contained in:
Nael 2014-02-17 01:06:21 +01:00
parent 312f864fc6
commit eb90938f90
5 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
mojotrollz/page/default_page/img/World-Of-Warcraft-Logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 134 KiB

BIN
mojotrollz/page/default_page/img/World-Of-Warcraft-Logo.psd
View File

Binary file not shown.

BIN
mojotrollz/page/default_page/img/button.psd
View File

Binary file not shown.

3
mojotrollz/page/user_guild/guild.tpl
View File

@ -38,6 +38,9 @@
<a class="fiveguildbankupgrades" href="#"> <img src="${WOWICONS}5guildbankupgrades.png"/> </a> <a class="fiveguildbankupgrades" href="#"> <img src="${WOWICONS}5guildbankupgrades.png"/> </a>
</div> </div>
</div> </div>
<div class="" id="guild_skilltree" style="background: url(${BG}black_structure.png) no-repeat; background-size: 100%; float: left; padding: 25px; margin-top: 5px;">
</div>
<div style="float: right; background: url(${BG}pergament_big.png) no-repeat; background-size: 200px; 100px; margin-top: 5px; display: none;"> <div style="float: right; background: url(${BG}pergament_big.png) no-repeat; background-size: 200px; 100px; margin-top: 5px; display: none;">

1
mojotrollz/page/wizard_details/wizard_details.php
View File

@ -15,7 +15,6 @@ class wizard_details extends SYSTEM\PAGE\Page {
$vars = array(); $vars = array();
$vars['js'] = $this->js(); $vars['js'] = $this->js();
$vars['css'] = $this->css(); $vars['css'] = $this->css();
$vars['PICPATH'] = \SYSTEM\WEBPATH(new PPAGE(),'wizard_details/img/');
$vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id='; $vars['WOWICONS'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=wowicons&id=';
$vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_MAINPAGE));
$vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT_RACES)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(DBD\locale_string::VALUE_CATEGORY_WOW_INFOTEXT_RACES));