diff --git a/fields/ajax.php b/fields/ajax.php deleted file mode 100755 index a50c4c9..0000000 --- a/fields/ajax.php +++ /dev/null @@ -1,44 +0,0 @@ - - * @link http://www.z-index.net - * @copyright (c) 2013 - 2014 Branko Wilhelm - * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html - */ - -defined('_JEXEC') or die; - -JFormHelper::loadFieldClass('radio'); - -class JFormFieldAjax extends JFormFieldRadio -{ - - public $type = 'Ajax'; - - protected function getInput() - { - if (JPluginHelper::isEnabled('system', 'wow')) { - return parent::getInput(); - } - - return ''; - } - - protected function getLabel() - { - if (JPluginHelper::isEnabled('system', 'wow')) { - return parent::getLabel(); - } - - return ''; - } - - protected function getOptions() - { - $options[] = JHtml::_('select.option', 1, JText::_('JYES')); - $options[] = JHtml::_('select.option', 0, JText::_('JNO')); - - return $options; - } -} \ No newline at end of file diff --git a/helper.php b/helper.php index 2b04717..70f9620 100755 --- a/helper.php +++ b/helper.php @@ -3,94 +3,29 @@ /** * @author Branko Wilhelm * @link http://www.z-index.net - * @copyright (c) 2013 - 2014 Branko Wilhelm + * @copyright (c) 2012 - 2015 Branko Wilhelm * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html */ defined('_JEXEC') or die; -final class ModWowGuildMembersHelper +class ModWowGuildMembersHelper extends WoWModuleAbstract { - private $params = null; - - private function __construct(JRegistry &$params) - { - if (version_compare(JVERSION, 3, '>=')) { - $params->set('guild', rawurlencode(JString::strtolower($params->get('guild')))); - $params->set('realm', rawurlencode(JString::strtolower($params->get('realm')))); - } else { - $params->set('realm', str_replace(array('%20', ' '), '-', $params->get('realm'))); - $params->set('guild', str_replace(array('%20', ' '), '%2520', $params->get('guild'))); - } - - $params->set('region', JString::strtolower($params->get('region'))); - $params->set('lang', JString::strtolower($params->get('lang', 'en'))); - $params->set('link', $params->get('link', 'battle.net')); - $params->set('order', $params->get('order')); - - $this->params = & $params; - } - - public static function getAjax() + protected function getInternalData() { - $module = JModuleHelper::getModule('mod_' . JFactory::getApplication()->input->get('module')); - - if (empty($module)) { - return false; - } - - JFactory::getLanguage()->load($module->module); - - $params = new JRegistry($module->params); - $params->set('ajax', 0); - - ob_start(); - - require(dirname(__FILE__) . '/' . $module->module . '.php'); - - return ob_get_clean(); - } - - public static function getData(JRegistry &$params) - { - if ($params->get('ajax')) { - return; - } - - $instance = new self($params); - - return $instance->getMembers(); - } - - private function getMembers() - { - if ($this->params->get('ajax')) { - return; - } - - if (!$this->params->get('guild') || !$this->params->get('realm')) { - return JString::_('MOD_WOW_GUILD_MEMBERS_CONFIGURATION_MISSING'); - } - - $url = 'http://' . $this->params->get('region') . '.battle.net/api/wow/guild/' . $this->params->get('realm') . '/' . $this->params->get('guild') . '?fields=members,achievements&locale=' . $this->params->get('lang'); - - $cache = JFactory::getCache('wow', 'output'); - $cache->setCaching(1); - $cache->setLifeTime($this->params->get('cache_time', 60) * 60); - - $result = $this->remoteContent($url); - - if (is_string($result)) { - return $result; + try { + $result = WoW::getInstance()->getAdapter('WoWAPI')->getData('members'); + } catch (Exception $e) { + return $e->getMessage(); } - $result->classes = $this->getClasses(); - $result->races = $this->getRaces(); + $result->body->classes = $this->getClasses(); + $result->body->races = $this->getRaces(); - $ranks = $this->params->get('ranks', array()); + $ranks = $this->params->module->get('ranks', array()); - foreach ($result->members as $key => $row) { - if (($this->params->get('level_min') && $row->character->level < $this->params->get('level_min')) || ($this->params->get('level_max') && $row->character->level > $this->params->get('level_max')) || (!empty($ranks) && !in_array($row->rank, $ranks))) { + foreach ($result->body->members as $key => $row) { + if (($this->params->module->get('level_min') && $row->character->level < $this->params->module->get('level_min')) || ($this->params->module->get('level_max') && $row->character->level > $this->params->module->get('level_max')) || (!empty($ranks) && !in_array($row->rank, $ranks))) { unset($result->members[$key]); continue; } @@ -99,8 +34,9 @@ private function getMembers() $member->name = new stdClass; $member->name->title = $row->character->name; + $member->name->realm = $row->character->realm; $member->name->avatar = $row->character->thumbnail; - $member->name->link = $this->link($row->character->name); + $member->name->link = $this->link($row->character->name, $row->character->realm); $member->level = new stdClass; $member->level->title = $row->character->level; @@ -110,17 +46,17 @@ private function getMembers() $member->rank = new stdClass; $member->rank->id = $row->rank; - $member->rank->title = $this->params->get('rank_' . $row->rank, JText::_('MOD_WOW_GUILD_MEMBERS_RANK_' . $row->rank . '_LABEL')); + $member->rank->title = $this->params->module->get('rank_' . $row->rank, JText::_('MOD_WOW_GUILD_MEMBERS_RANK_' . $row->rank . '_LABEL')); $member->race = new stdClass; - $member->race->id = $result->races[$row->character->race]->id; - $member->race->title = $result->races[$row->character->race]->name; + $member->race->id = $result->body->races[$row->character->race]->id; + $member->race->title = $result->body->races[$row->character->race]->name; $member->race->icon = 'race_' . $member->race->id . '_' . $row->character->gender . '.jpg'; $member->class = new stdClass; - $member->class->id = $result->classes[$row->character->class]->id; - $member->class->title = $result->classes[$row->character->class]->name; - $member->class->icon = 'class_' . $result->classes[$row->character->class]->id . '.jpg'; + $member->class->id = $result->body->classes[$row->character->class]->id; + $member->class->title = $result->body->classes[$row->character->class]->name; + $member->class->icon = 'class_' . $result->body->classes[$row->character->class]->id . '.jpg'; $member->role = new stdClass; $member->role->title = JText::_('MOD_WOW_GUILD_MEMBERS_' . ($row->character->spec->role ? $row->character->spec->role : 'UNKNOWN')); @@ -134,106 +70,111 @@ private function getMembers() $result->members[$key] = $member; } - if ($this->params->get('table_break')) { - $this->params->set('order', $this->params->get('table_break')); + if ($this->params->module->get('table_break')) { + $this->params->module->set('order', $this->params->module->get('table_break')); } usort($result->members, array($this, 'sort')); + $result->members = array_slice($result->members, 0, $this->params->module->get('rows') ? $this->params->module->get('rows') : count($result->members)); + if (empty($result->members)) { return JText::_('MOD_WOW_GUILD_MEMBERS_NOTHING_FOUND'); } - if ($this->params->get('display_index')) { + if ($this->params->module->get('display_index')) { $this->addIndex($result->members); } - return array_slice($result->members, 0, $this->params->get('rows') ? $this->params->get('rows') : count($result->members)); + /* + if ($this->params->module->get('display_itemlvl') && $this->params->module->get('rows')) { + $this->addItemLvl($result->members); + } else { + $this->params->module->set('display_itemlvl', 0); + } + */ + + return $result->members; } private function sort($a, $b) { - if ($this->params->get('order') == 'rank') { + if ($this->params->module->get('order') == 'rank') { $field = 'id'; } else { $field = 'title'; } - if ($this->params->get('sort', 'ASC') == 'ASC') { - return ($a->{$this->params->get('order')}->{$field} > $b->{$this->params->get('order')}->{$field}); + if ($this->params->module->get('sort', 'ASC') == 'ASC') { + return ($a->{$this->params->module->get('order')}->{$field} > $b->{$this->params->module->get('order')}->{$field}); } else { - return ($a->{$this->params->get('order')}->{$field} < $b->{$this->params->get('order')}->{$field}); + return ($a->{$this->params->module->get('order')}->{$field} < $b->{$this->params->module->get('order')}->{$field}); } } - private function getRaces() + private function getRaces($races = array()) { - $result = self::remoteContent('http://' . $this->params->get('region') . '.battle.net/api/wow/data/character/races?locale=' . $this->params->get('lang'), true); - - $tmp = array(); - foreach ($result->races as $race) { - $tmp[$race->id] = $race; + try { + $result = WoW::getInstance()->getAdapter('WoWAPI')->getData('races', true); + } catch (Exception $e) { + return $races; } - unset($result); + foreach ($result->body->races as $race) { + $races[$race->id] = $race; + } - return $tmp; + return $races; } - private function getClasses() + private function getClasses($classes = array()) { - $result = self::remoteContent('http://' . $this->params->get('region') . '.battle.net/api/wow/data/character/classes?locale=' . $this->params->get('lang'), true); - - $tmp = array(); - foreach ($result->classes as $class) { - $tmp[$class->id] = $class; + try { + $result = WoW::getInstance()->getAdapter('WoWAPI')->getData('classes', true); + } catch (Exception $e) { + return $classes; } - unset($result); + foreach ($result->body->classes as $class) { + $classes[$class->id] = $class; + } - return $tmp; + return $classes; } - private function link($member) + private function link($member, $realm) { - $sites['battle.net'] = 'http://' . $this->params->get('region') . '.battle.net/wow/' . $this->params->get('lang') . '/character/' . $this->params->get('realm') . '/' . $member . '/'; - $sites['wowhead.com'] = 'http://' . $this->params->get('lang') . '.wowhead.com/profile=' . $this->params->get('region') . '.' . $this->params->get('realm') . '.' . $member; - return $sites[$this->params->get('link')]; + $sites['battle.net'] = 'http://' . $this->params->global->get('region') . '.battle.net/wow/' . $this->params->global->get('locale') . '/character/' . $realm . '/' . $member . '/'; + $sites['wowhead.com'] = 'http://' . $this->params->global->get('locale') . '.wowhead.com/profile=' . $this->params->global->get('region') . '.' . $realm . '.' . $member; + return $sites[$this->params->global->get('link')]; } - private function addIndex(array &$members) + /* + private function addItemLvl(array &$members) { - $index = ($this->params->get('display_index') == 2) ? count($members) : 1; - foreach ($members as &$member) { - $member->index = ($this->params->get('display_index') == 2) ? $index-- : $index++; - } - } - - private function remoteContent($url, $persistent = false) - { - $cache = JFactory::getCache('wow', 'output'); - $cache->setCaching(1); - $cache->setLifeTime($this->params->get('cache_time', 60) * ($persistent ? 172800 : 60)); - - $key = md5($url); - - if (!$result = $cache->get($key)) { + $member->itemlvl = new stdClass; try { - $http = JHttpFactory::getHttp(); - $http->setOption('userAgent', 'Joomla! ' . JVERSION . '; WoW Guild Members; php/' . phpversion()); - $result = $http->get($url, null, $this->params->get('timeout', 10)); + $profile = WoW::getInstance()->getAdapter('WoWAPI')->getMember($member->name->title, $member->name->realm); + if (!isset($profile->body->items)) { + throw new Exception(); + } + $member->itemlvl->title = $profile->body->items->averageItemLevel; + $member->itemlvl->equipped = $profile->body->items->averageItemLevelEquipped; } catch (Exception $e) { - return $e->getMessage(); + $member->itemlvl->title = 0; + $member->itemlvl->equipped = 0; } - - $cache->store($result, $key); } + } + */ - if ($result->code != 200) { - return __CLASS__ . ' HTTP-Status ' . JHtml::_('link', 'http://wikipedia.org/wiki/List_of_HTTP_status_codes#' . $result->code, $result->code, array('target' => '_blank')); - } + private function addIndex(array &$members) + { + $index = ($this->params->module->get('display_index') == 2) ? count($members) : 1; - return json_decode($result->body); + foreach ($members as &$member) { + $member->index = ($this->params->module->get('display_index') == 2) ? $index-- : $index++; + } } } \ No newline at end of file diff --git a/language/de-DE/de-DE.mod_wow_guild_members.ini b/language/de-DE/de-DE.mod_wow_guild_members.ini index 3945b33..b1c68b5 100755 --- a/language/de-DE/de-DE.mod_wow_guild_members.ini +++ b/language/de-DE/de-DE.mod_wow_guild_members.ini @@ -1,18 +1,6 @@ MOD_WOW_GUILD_MEMBERS = "WoW Guild Members" MOD_WOW_GUILD_MEMBERS_DESC = "Display latest WoW Armory Guild News" -MOD_WOW_GUILD_MEMBERS_CONFIGURATION_MISSING = "Kein Gildenname oder Realm hinterlegt!" - -MOD_WOW_GUILD_MEMBERS_GUILD_LABEL = "Gildenname" - -MOD_WOW_GUILD_MEMBERS_REALM_LABEL = "Realm" - -MOD_WOW_GUILD_MEMBERS_REGION_LABEL = "Region" - -MOD_WOW_GUILD_MEMBERS_LANG_LABEL = "Sprache" - -MOD_WOW_GUILD_MEMBERS_LINK_LABEL = "Verlinkung" - MOD_WOW_GUILD_MEMBERS_RANKS_LABEL = "Gildenränge" MOD_WOW_GUILD_MEMBERS_RANKS_DESC = "Welche Gildenränge sollen dargestellt werden? keine Auswahl = Alle" @@ -34,8 +22,6 @@ MOD_WOW_GUILD_MEMBERS_SORT_DESC = "Nach welcher spalte soll sortiert werden" MOD_WOW_GUILD_MEMBERS_SORT_ASC_LABEL = "aufsteigend" MOD_WOW_GUILD_MEMBERS_SORT_DESC_LABEL = "absteigend" -MOD_WOW_GUILD_MEMBERS_FIELDSET_DISPLAY_LABEL = "Anzeige" - MOD_WOW_GUILD_MEMBERS_DISPLAY_ROWS_LABEL = "Spalten" MOD_WOW_GUILD_MEMBERS_DISPLAY_ROWS_DESC = "Spaltenlimit als Zahl, z.B. für Top5. Leer lassen für alle!" @@ -93,12 +79,6 @@ MOD_WOW_GUILD_MEMBERS_RANK_8_LABEL = "Rang 8" MOD_WOW_GUILD_MEMBERS_RANK_9_LABEL = "Rang 9" MOD_WOW_GUILD_MEMBERS_RANK_10_LABEL = "Rang 10" -MOD_WOW_GUILD_MEMBERS_CACHE_LABEL = "Cache Dauer" -MOD_WOW_GUILD_MEMBERS_CACHE_DESC = "Nach wieviel Minuten sollen die Daten aus dem Armory Neu geladen werden?" - -MOD_WOW_GUILD_MEMBERS_TIMEOUT_LABEL = "Timeout" -MOD_WOW_GUILD_MEMBERS_TIMEOUT_DESC = "Wieviel Sekunden soll maximal auf Antwort vom Armory Server gewartet werden?" - MOD_WOW_GUILD_MEMBERS_NAME = "Name" MOD_WOW_GUILD_MEMBERS_RACE = "Rasse" MOD_WOW_GUILD_MEMBERS_CLASS = "Klasse" diff --git a/language/en-GB/en-GB.mod_wow_guild_members.ini b/language/en-GB/en-GB.mod_wow_guild_members.ini index 9cbe20a..e0827f8 100755 --- a/language/en-GB/en-GB.mod_wow_guild_members.ini +++ b/language/en-GB/en-GB.mod_wow_guild_members.ini @@ -1,18 +1,6 @@ MOD_WOW_GUILD_MEMBERS = "WoW Guild Members" MOD_WOW_GUILD_MEMBERS_DESC = "Display latest WoW Armory Guild News" -MOD_WOW_GUILD_MEMBERS_CONFIGURATION_MISSING = "no guild or realm defined!" - -MOD_WOW_GUILD_MEMBERS_GUILD_LABEL = "Guildname" - -MOD_WOW_GUILD_MEMBERS_REALM_LABEL = "Realm" - -MOD_WOW_GUILD_MEMBERS_REGION_LABEL = "Region" - -MOD_WOW_GUILD_MEMBERS_LANG_LABEL = "Language" - -MOD_WOW_GUILD_MEMBERS_LINK_LABEL = "Linking" - MOD_WOW_GUILD_MEMBERS_RANKS_LABEL = "Be displayed guild ranks" MOD_WOW_GUILD_MEMBERS_RANKS_DESC = "Which guild ranks should be displayed? no choice = all" @@ -34,8 +22,6 @@ MOD_WOW_GUILD_MEMBERS_SORT_DESC = "Which column to sort by" MOD_WOW_GUILD_MEMBERS_SORT_ASC_LABEL = "ascending" MOD_WOW_GUILD_MEMBERS_SORT_DESC_LABEL = "descending" -MOD_WOW_GUILD_MEMBERS_FIELDSET_DISPLAY_LABEL = "Display" - MOD_WOW_GUILD_MEMBERS_DISPLAY_ROWS_LABEL = "Rows" MOD_WOW_GUILD_MEMBERS_DISPLAY_ROWS_DESC = "Rowlimit as Digit, e.g. for Top5. Leave it empty for all rows!" @@ -93,12 +79,6 @@ MOD_WOW_GUILD_MEMBERS_RANK_8_LABEL = "Rank 8" MOD_WOW_GUILD_MEMBERS_RANK_9_LABEL = "Rank 9" MOD_WOW_GUILD_MEMBERS_RANK_10_LABEL = "Rank 10" -MOD_WOW_GUILD_MEMBERS_CACHE_LABEL = "Cache" -MOD_WOW_GUILD_MEMBERS_CACHE_DESC = "How many minutes elapse until armory data is reloaded." - -MOD_WOW_GUILD_MEMBERS_TIMEOUT_LABEL = "Timeout" -MOD_WOW_GUILD_MEMBERS_TIMEOUT_DESC = "Maximum waiting time for armory server answer (in seconds)." - MOD_WOW_GUILD_MEMBERS_NAME = "Name" MOD_WOW_GUILD_MEMBERS_RACE = "Race" MOD_WOW_GUILD_MEMBERS_CLASS = "Class" @@ -115,4 +95,4 @@ MOD_WOW_GUILD_MEMBERS_UNKNOWN = "Unknown" MOD_WOW_GUILD_MEMBERS_GENDER_0 = "Male" MOD_WOW_GUILD_MEMBERS_GENDER_1 = "Female" -MOD_WOW_GUILD_MEMBERS_NOTHING_FOUND = "No members found based on the configuration.." \ No newline at end of file +MOD_WOW_GUILD_MEMBERS_NOTHING_FOUND = "No members found based on configuration.." \ No newline at end of file diff --git a/media/css/default.css b/media/css/default.css new file mode 100644 index 0000000..2f26043 --- /dev/null +++ b/media/css/default.css @@ -0,0 +1,85 @@ +.mod_wow_guild_members { + width: 100%; +} + +.mod_wow_guild_members td, +.mod_wow_guild_members th { + padding: 2px; +} + +.mod_wow_guild_members .race, +.mod_wow_guild_members .class, +.mod_wow_guild_members .role { + width: 20px; +} + +.mod_wow_guild_members .break { + text-align: left; + font-size: 1.2em; +} + +.mod_wow_guild_members .name img { + vertical-align: middle; +} + +.mod_wow_guild_members .level { + text-align: center; +} + +.mod_wow_guild_members .points { + text-align: right; + padding-right: 10px; + background: no-repeat center right url('../images/points.gif'); +} + +.mod_wow_guild_members .index { + text-align: center; +} + +.mod_wow_guild_members .index.idx_1 { + background: no-repeat top left url('../images/idx_1.png'); +} + +.mod_wow_guild_members .class_6 { + color: #C41F3B; +} + +.mod_wow_guild_members .class_11 { + color: #FF7D0A; +} + +.mod_wow_guild_members .class_3 { + color: #ABD473; +} + +.mod_wow_guild_members .class_8 { + color: #69CCF0; +} + +.mod_wow_guild_members .class_10 { + color: #00FF96; +} + +.mod_wow_guild_members .class_2 { + color: #F58CBA; +} + +.mod_wow_guild_members .class_5 { + color: #FFFFFF; +} + +.mod_wow_guild_members .class_4 { + color: #FFF569; +} + +.mod_wow_guild_members .class_7 { + color: #0070DE; +} + +.mod_wow_guild_members .class_9 { + color: #9482C9; +} + +.mod_wow_guild_members .class_1 { + color: #C79C6E; +} \ No newline at end of file diff --git a/media/images/idx_1.png b/media/images/idx_1.png new file mode 100644 index 0000000..2b7b416 Binary files /dev/null and b/media/images/idx_1.png differ diff --git a/media/images/points.gif b/media/images/points.gif new file mode 100644 index 0000000..04cc96c Binary files /dev/null and b/media/images/points.gif differ diff --git a/mod_wow_guild_members.php b/mod_wow_guild_members.php index e0c68e7..70f06ea 100755 --- a/mod_wow_guild_members.php +++ b/mod_wow_guild_members.php @@ -3,15 +3,23 @@ /** * @author Branko Wilhelm * @link http://www.z-index.net - * @copyright (c) 2013 - 2014 Branko Wilhelm + * @copyright (c) 2012 - 2015 Branko Wilhelm * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html + * + * @var stdClass $module + * @var Joomla\Registry\Registry $params */ defined('_JEXEC') or die; -JLoader::register('ModWowGuildMembersHelper', dirname(__FILE__) . '/helper.php'); +if (!class_exists('WoWModuleAbstract')) { + echo JText::_('JERROR_ERROR') . ': WoW-Plugin not found?!'; + return; +} + +JLoader::register('ModWowGuildMembersHelper', __DIR__ . '/helper.php'); -$members = ModWowGuildMembersHelper::getData($params, $module); +$members = ModWowGuildMembersHelper::getData($params); if (!$params->get('ajax') && !is_array($members)) { echo $members; diff --git a/mod_wow_guild_members.xml b/mod_wow_guild_members.xml index 5178097..2a066b7 100755 --- a/mod_wow_guild_members.xml +++ b/mod_wow_guild_members.xml @@ -3,7 +3,7 @@ MOD_WOW_GUILD_MEMBERS Branko Wilhelm Mar 2012 - (C) 2012 - 2014 Branko Wilhelm + (c) 2012 - 2014 Branko Wilhelm GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html branko.wilhelm@gmail.com www.z-index.net @@ -12,7 +12,6 @@ mod_wow_guild_members.php helper.php - fields tmpl script.installer.php @@ -25,33 +24,13 @@ http://www.z-index.net/en/extensions.xml + + css + images + - +
- - - - - - - - - - - - - - - - - - - - - - - - @@ -79,15 +58,14 @@ - - - -
-
- - -
-
+ + + + + + + + @@ -95,6 +73,11 @@ + + + + + @@ -123,32 +106,24 @@ - - - - - - - - - - - - - + +
+
+ +
- - - - - - - - - - - + + + + + + + + + + +
diff --git a/script.installer.php b/script.installer.php index 91edcb3..dd329f6 100755 --- a/script.installer.php +++ b/script.installer.php @@ -3,7 +3,7 @@ /** * @author Branko Wilhelm * @link http://www.z-index.net - * @copyright (c) 2013 - 2014 Branko Wilhelm + * @copyright (c) 2012 - 2015 Branko Wilhelm * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html */ @@ -11,13 +11,11 @@ class mod_wow_guild_membersInstallerScript { - private $required = '2.5.16'; - public function preflight() { - if (!version_compare(JVERSION, $this->required, '>=')) { - $link = JHtml::link('index.php?option=com_joomlaupdate', $this->required); - JFactory::getApplication()->enqueueMessage(sprintf('You need Joomla! %s or later to install this extension', $link), 'error'); + if (!class_exists('WoW')) { + $link = JHtml::_('link', 'http://www.z-index.net', 'z-index.net', array('target' => '_blank')); + JFactory::getApplication()->enqueueMessage(sprintf('You need the latest Joomla WoW configuration Extension from ', $link), 'error'); return false; } diff --git a/tmpl/default.css b/tmpl/default.css deleted file mode 100755 index bf8d9f2..0000000 --- a/tmpl/default.css +++ /dev/null @@ -1,85 +0,0 @@ -.mod_wow_guild_members { - width: 100%; -} - -.mod_wow_guild_members td, -.mod_wow_guild_members th { - padding: 2px; -} - -.mod_wow_guild_members .race, -.mod_wow_guild_members .class, -.mod_wow_guild_members .role { - width: 20px; -} - -.mod_wow_guild_members .break { - text-align: left; - font-size: 1.2em; -} - -.mod_wow_guild_members .name img { - vertical-align: middle; -} - -.mod_wow_guild_members .level { - text-align: center; -} - -.mod_wow_guild_members .points { - text-align: right; - padding-right: 10px; - background: no-repeat center right url('data:image/gif;base64,R0lGODlhCAAKALMKAOKwIkw3D2VMEkAtDVlCEKN9GicZCnJWE8mcH9WmIP///wAAAAAAAAAAAAAAAAAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NUE4RDcyNTVGRjRBMTFERjgwQjY4MDk4RUZFRkQzMTQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NUE4RDcyNTZGRjRBMTFERjgwQjY4MDk4RUZFRkQzMTQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1QThENzI1M0ZGNEExMURGODBCNjgwOThFRkVGRDMxNCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1QThENzI1NEZGNEExMURGODBCNjgwOThFRkVGRDMxNCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgH//v38+/r5+Pf29fTz8vHw7+7t7Ovq6ejn5uXk4+Lh4N/e3dzb2tnY19bV1NPS0dDPzs3My8rJyMfGxcTDwsHAv769vLu6ubi3trW0s7KxsK+urayrqqmop6alpKOioaCfnp2cm5qZmJeWlZSTkpGQj46NjIuKiYiHhoWEg4KBgH9+fXx7enl4d3Z1dHNycXBvbm1sa2ppaGdmZWRjYmFgX15dXFtaWVhXVlVUU1JRUE9OTUxLSklIR0ZFRENCQUA/Pj08Ozo5ODc2NTQzMjEwLy4tLCsqKSgnJiUkIyIhIB8eHRwbGhkYFxYVFBMSERAPDg0MCwoJCAcGBQQDAgEAACH5BAEAAAoALAAAAAAIAAoAAAQcEJ2gVDgI6M27/1zhFYM3KAInVAqRJARbGQYbAQA7'); -} - -.mod_wow_guild_members .index { - text-align: center; -} - -.mod_wow_guild_members .index.idx_1 { - background: no-repeat top left url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAd0SU1FB9oEDwsAG1SiBXIAAABBdEVYdENvbW1lbnQAQ1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gOTMKm2gLUAAABBtJREFUOBEBEATv+wAAAAAAAAAAAAAAAAAAAAAAAL0yAADy6QL/qRkD7MAiA0LrtQOZ1T0BWv+mAP8k0ACj8CADcv86AnOh8wH/mE4CAAAAAAAAAAAAAAAAAAAAAACflwAA4uYAAzKO/wEAAP8A//oBBQAAAADQ/x4D/4d1A//HOwH/Q7gB//8AAT/4xwAAAAAAAAAAAAAAAAAAAAAAAAAIAADAANYCANH/Aj7/dwPAvlAB7OohAzfuLQNbQfEBeYVEAswA5AHp6wQB//cAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAOPfARLq1wEz4JhlAgCC/wH/AP8Bs+4BB9fiASHy/yABAO+sAQ9J/wD/sAwCAAAAAAAA7v8AAAAAANnEAAAAAAAA//oAHfHdALf02gY35f8HBraUAD7/9wAj6d8AgP+nZAVGzUwClf8AA/8Q/wACZGwvAQARmQMAAAAAJjsWA76fAD/96AAXCAQAEAUC+oIT2/lS/hAAZ9jIAHEHAgBEACqhFroa1wH46Rf/AM0kAgMAtrIC5gZQDmZQAFENFfbs5N4AauvuAGUbGgD7AQQADvcEADDw7QAwFAsAGxMUAPzxBv7w1BER0ZPuBALbNN7+Apx3zgAABAD3+QEAOfDa/54RDgA4//YAHwIEAAX+AgDuDQEA8DgwAPcdFwD7AvgABQP9ACye3+oHAId4/ZfCvAAByPEcAzgP5P3w4QBC/OQAnhEbAPf2+AD2BwkA/P79AAgC/AATAAIAAP0CAP8F/gDz9QMA1AYOAHAGEgDsu3V+/ARO6cn/1wMaAgoLB87jBPreBfIAJAcMAP39/AAMCAQAAvb2APPh5AAL6+wABfz8ABgKCgDVISUFAU2Wx/uzUGsBBMDpOAH69+cAAo+V8hRSZ6L48gCBAvQABufoAAfe3QAQ9fsAAA0KAPQKCgDxEBYA2R0kAMTo5R7uM3uEARcCyP4EANaQ/i45UwGVQq3/a/4GsOX2+mfS2gArBgUA8RcgAOIOFwDnAwQAwxENAMEJAQ3Z8K5S7CpOZP6MAUUD+0qy/wCG/ggF67ptABDSsAEMPqwB7d0AMfPfAE/34AE+//8AHf//BAf//xACY+ttAQD0uAKg+wAFfruSAbwA/wH/qlICAPmmVwH/AP8A6fsGBIjjJgNsjbkC3P8WA0rz/wD/AP8B9MMNAdbkEQIF0vkAbcJtAehPqAH/hyEC//8AA7T/HgMA/wD/APr7AQT+V64B/5JdAJT/DQOnPv8B8cUDA+b5AARRlo8A/0ugAfqHbwH/bkYB/5Q4Af8L3gD/C+4AvtVvAQBq/yYCNP+lBC34qwL/rFQB9MwFBJdu9wEJ/9YAL9jkARno/AJE/bwCh+pVAUX/pwEG//cCMv98Af/pEAH/W6IDp+qOsDKTNzoAAAAASUVORK5CYII='); -} - -.mod_wow_guild_members .class_6 { - color: #C41F3B; -} - -.mod_wow_guild_members .class_11 { - color: #FF7D0A; -} - -.mod_wow_guild_members .class_3 { - color: #ABD473; -} - -.mod_wow_guild_members .class_8 { - color: #69CCF0; -} - -.mod_wow_guild_members .class_10 { - color: #00FF96; -} - -.mod_wow_guild_members .class_2 { - color: #F58CBA; -} - -.mod_wow_guild_members .class_5 { - color: #FFFFFF; -} - -.mod_wow_guild_members .class_4 { - color: #FFF569; -} - -.mod_wow_guild_members .class_7 { - color: #0070DE; -} - -.mod_wow_guild_members .class_9 { - color: #9482C9; -} - -.mod_wow_guild_members .class_1 { - color: #C79C6E; -} \ No newline at end of file diff --git a/tmpl/default.php b/tmpl/default.php old mode 100755 new mode 100644 index 78d4423..c78a4a4 --- a/tmpl/default.php +++ b/tmpl/default.php @@ -3,17 +3,21 @@ /** * @author Branko Wilhelm * @link http://www.z-index.net - * @copyright (c) 2013 - 2014 Branko Wilhelm + * @copyright (c) 2012 - 2015 Branko Wilhelm * @license GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html + * + * @var array $members + * @var stdClass $module + * @var Joomla\Registry\Registry $params */ defined('_JEXEC') or die; $break = ''; -$media_path = 'http://' . $params->get('region') . '.media.blizzard.com/wow/icons/18/'; +$media_path = 'http://media.blizzard.com/wow/icons/18/'; -JFactory::getDocument()->addStyleSheet(JUri::base(true) . '/modules/' . $module->module . '/tmpl/default.css'); +JFactory::getDocument()->addStyleSheet('media/' . $module->module . '/css/default.css'); ?> get('ajax')) : ?>