yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Types:

Browse Source 
- added some more lasses for (for now) static use

Achievements:
 - moved setup to separate file (not included yet (and shouldn't have been))
 - unified use of the infobox.tpl

Items:
 - Tooltip-layout changes, when used as standalone or incorporated in other tooltips. This can now be considered.

Util:
 - added utf8-safe Util::ucFirst()
 - added Lang::getRequiredItems() for use with spell - equippedItem[Sub]Class

Templates:
 - minor wording fix (link -> links)

Markup:
 - [class=X], [race=X], [money=X] added (i really shouldn't have done this)
 - [color=X] now also accepts r1 - r4 as parameter

obligatory minor stuff here and there
This commit is contained in:
Sarjuuk
2013-05-12 23:56:51 +02:00
parent 732226b44a
commit cbd27c67b3
25 changed files with 282 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
template/achievement.tpl
View File

@@ -19,7 +19,7 @@
<tr><td><div class="infobox-spacer"></div>
<ul>
{if $lvData.page.points}<li><div>{$lang.points}: <span class="moneyachievement tip" onmouseover="Listview.funcBox.moneyAchievementOver(event)" onmousemove="Tooltip.cursorUpdate(event)" onmouseout="Tooltip.hide()">{$lvData.page.points}</span></div></li>{/if}
{foreach from=$lvData.page.infoBox item=info}
{foreach from=$lvData.infoBox item=info}
<li><div>{$info}</div></li>
{/foreach}
{*<li><div>Location: {$lvData.page.location}</div></li> todo: need to be parsed first *}
@@ -65,7 +65,7 @@
<a href="javascript:;" id="open-links-button" class="button-red" onclick="this.blur();
Links.show({ldelim} type: 10, typeId: {$lvData.page.id}, linkColor: 'ffffff00', linkId: '{$lvData.page.id}:&quot;..UnitGUID(&quot;player&quot;)..&quot;:0:0:0:0:0:0:0:0', linkName: '{$lvData.page.name|escape:'javascript'}' {rdelim});">
<em><b><i>{$lang.link}</i></b><span>{$lang.link}</span></em></a>
<em><b><i>{$lang.links}</i></b><span>{$lang.links}</span></em></a>
<a href="http://old.wowhead.com/?{$query[0]}={$query[1]}" class="button-red"><em><b><i>Wowhead</i></b><span>Wowhead</span></em></a>
<h1 class="h1-icon">{$lvData.page.name}</h1>

2
template/achievements.tpl
View File

@@ -12,7 +12,7 @@
<script type="text/javascript">
g_initPath({$page.path}, {if empty($filter.query)} 0 {else} 1 {/if});
{if isset($filter.query)}Menu.append(mn_database[1], '&filter={$filter.query}'); // todo: menu order varies per locale{/if}
{if isset($filter.query)}Menu.append(mn_database[1], '&filter={$filter.query|escape:'quotes'}'); // todo: menu order varies per locale{/if}
</script>
<div id="fi" style="display:{if empty($filter.query)}none{else}block{/if};">

10
template/bricks/infobox.tpl
View File

@@ -1,6 +1,8 @@
<table class="infobox">
{if !empty($lvData.infobox)}
<tr><th id="infobox-quick-facts">{$lang.quickFacts}</th></tr>
<tr><td><div class="infobox-spacer"></div><div id="infobox-contents0"></div></td></tr>
{/if}
<tr><th id="infobox-screenshots">{$lang.screenshots}</th></tr>
<tr><td><div class="infobox-spacer"></div><div id="infobox-sticky-ss"></div></td></tr>
{if $user.id > 0}
@@ -9,7 +11,11 @@
{/if}
</table>
<script type="text/javascript">ss_appendSticky()</script>
{if $user.id > 0} <script type="text/javascript">vi_appendSticky()</script>{/if}
{if $user.id > 0}
<script type="text/javascript">vi_appendSticky()</script>
{/if}
{if !empty($lvData.infobox)}
<script type="text/javascript">
Markup.printHtml("{$lvData.infobox}", "infobox-contents0", {ldelim}mode:Markup.MODE_QUICKFACTS{rdelim});
</script>
</script>
{/if}

9
template/css/global.css
View File

@@ -965,7 +965,6 @@ a#toptabs-menu-language
a.icontiny
{
text-decoration: none;
padding-left: 19px;
}
span.icontiny
@@ -985,6 +984,12 @@ span.icontiny
background: right center no-repeat;
}
span.icontiny, a.tinyspecial
{
padding-left:18px !important;
background:left center no-repeat;
}
.iconsmall, .iconmedium, .iconlarge
{
position: relative;
@@ -3114,7 +3119,7 @@ a:hover, a.open, .text b, .text ol li div, .text li div, .infobox li div, .minib
background-image: url(../../images/icons/border_medium_gold.png);
}
.iconmedium-gold-selected del
.iconmedium-gold-selected del
{
background-image: url(../../images/icons/border_medium_gold_selected.png);
}

2
template/itemsets.tpl
View File

@@ -12,7 +12,7 @@
<script type="text/javascript">
g_initPath({$page.path}, {if empty($filter.query)} 0 {else} 1 {/if});
{if isset($filter.query)}Menu.append(mn_database[6], '&filter={$filter.query}'); // todo: menu order varies per locale{/if}
{if isset($filter.query)}Menu.append(mn_database[6], '&filter={$filter.query|escape:'quotes'}'); // todo: menu order varies per locale{/if}
</script>
<div id="fi" style="display:{if empty($filter.query)}none{else}block{/if};">

2
template/js/Mapper.js
View File

@@ -422,7 +422,7 @@ Mapper.prototype = {
setZones: function(div, zones)
{
// div = $('#'+div);
div = ge(div);
div = ge(div);
if(!div || !zones || zones.length == 0 || !this.objectives)
return;

48
template/js/Markup.js
View File

@@ -9,10 +9,12 @@ var Markup = {
item: 1,
spell: 1,
achievement: 1,
money: 1,
npc: 1,
skill: 1,
pet: 1,
'class': 1
'class': 1,
race : 1
},
_prepare: function(D, C) {
Markup.tags = [];
@@ -100,7 +102,7 @@ var Markup = {
B += "|h3|minibox";
A += "|h3|minibox|toggler|div|map|pin";
case Markup.MODE_QUICKFACTS:
D = D.replace(/(.)?\[color\s*[\s+=:]\s*(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow|c[0-9]{2}|q[0-8]?|#[a-f0-9]{6})\]/gi,
D = D.replace(/(.)?\[color\s*[\s+=:]\s*(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow|c[0-9]{2}|r[1-4]?|q[0-8]?|#[a-f0-9]{6})\]/gi,
function(F, E, G) {
if (E == "\\") {
return F.substr(1)
@@ -113,7 +115,7 @@ var Markup = {
return (E || "") + "<t" + (Markup.nTags++) + ">"
}
});
D = D.replace(/(.)?\[(item|spell|achievement|class|npc|skill|pet)\s*[\s+=:]\s*(\d+?)\]/gi,
D = D.replace(/(.)?\[(item|spell|achievement|class|race|npc|skill|pet|money)\s*[\s+=:]\s*(\d+?)\]/gi,
function(F, E, I, H) {
if (E == "\\") {
return F.substr(1)
@@ -409,7 +411,7 @@ var Markup = {
G += '<div class="pad">' + Markup._htmlmize(B[D][1]) + "</div>";
break;
case "color":
G += "<span " + ((B[D][2].charAt(0) == "q" || B[D][2].charAt(0) == "c") ? 'class="': 'style="color: ') + B[D][2] + '">' + Markup._htmlmize(B[D][1]) + "</span>";
G += "<span " + ((B[D][2].charAt(0) == "q" || B[D][2].charAt(0) == "c" || B[D][2].charAt(0) == "r") ? 'class="': 'style="color: ') + B[D][2] + '">' + Markup._htmlmize(B[D][1]) + "</span>";
break;
case "toggler":
var F = B[D][2];
@@ -466,25 +468,42 @@ var Markup = {
case "achievement":
if (g_achievements[B[D][2]]) {
G += "<a href=\"?achievement=" + B[D][2] + "\" class=\"icontiny\">";
G += "<img src=\"images/icons/tiny/" + g_achievements[B[D][2]].icon + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/" + g_achievements[B[D][2]].icon + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_achievements[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
G += '<a href="?achievement=' + B[D][2] + '">(Achievement #' + B[D][2] + ")</a>";
break;
case "money":
if (_ = Math.floor(B[D][2] / 10000))
G += '<span class="moneygold">' + _ + "</span> ";
if (_ = Math.floor((B[D][2] % 10000) / 100))
G += '<span class="moneysilver">' + _ + "</span> ";
if (_ = Math.floor(B[D][2]) % 100)
G += '<span class="moneycopper">' + _ + "</span>";
break;
case "class":
if (g_classes[B[D][2]]) {
G += "<a href=\"?class=" + B[D][2] + "\" class=\"icontiny c" + B[D][2] + "\">";
G += "<img src=\"images/icons/tiny/class_" + g_file_classes[B[D][2]] + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/class_" + g_file_classes[B[D][2]] + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_classes[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
G += '<a href="?class=' + B[D][2] + '">(Class #' + B[D][2] + ")</a>";
break;
case "npc":
case "race":
if (g_races[B[D][2]]) {
G += "<a href=\"?race=" + B[D][2] + "\" class=\"icontiny\">";
G += "<img src=\"images/icons/tiny/race_" + g_file_races[B[D][2]] + "_male.gif\" align=\"absmiddle\"> ";
G += "<span>" + g_races[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
G += '<a href="?race=' + B[D][2] + '">(Race #' + B[D][2] + ")</a>";
break;
case "npc":
if (g_npcs[B[D][2]]) {
G += "<a href=\"?npc=" + B[D][2] + "\" class=\"icontiny\">";
G += "<img src=\"images/icons/tiny/" + g_npcs[B[D][2]].icon + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/" + g_npcs[B[D][2]].icon + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_npcs[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
@@ -493,7 +512,7 @@ var Markup = {
case "skill":
if (g_skills[B[D][2]]) {
G += "<a href=\"?skill=" + B[D][2] + "\" class=\"icontiny\">";
G += "<img src=\"images/icons/tiny/" + g_skills[B[D][2]].icon + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/" + g_skills[B[D][2]].icon + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_skills[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
@@ -502,7 +521,7 @@ var Markup = {
case "pet":
if (g_pets[B[D][2]]) {
G += "<a href=\"?pet=" + B[D][2] + "\" class=\"icontiny\">";
G += "<img src=\"images/icons/tiny/" + g_pets[B[D][2]].icon + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/" + g_pets[B[D][2]].icon + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_pets[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
@@ -511,7 +530,7 @@ var Markup = {
case "item":
if (g_items[B[D][2]]) {
G += "<a href=\"?item=" + B[D][2] + "\" class=\"icontiny q" + B[D][2].quality + "\">";
G += "<img src=\"images/icons/tiny/" + g_items[B[D][2]].icon + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/" + g_items[B[D][2]].icon + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_items[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
@@ -520,7 +539,7 @@ var Markup = {
case "spell":
if (g_spells[B[D][2]]) {
G += "<a href=\"?spell=" + B[D][2] + "\" class=\"icontiny\">";
G += "<img src=\"images/icons/tiny/" + g_spells[B[D][2]].icon + ".gif\" align=\"absmiddle\">";
G += "<img src=\"images/icons/tiny/" + g_spells[B[D][2]].icon + ".gif\" align=\"absmiddle\"> ";
G += "<span>" + g_spells[B[D][2]]["name_" + g_locale.name] + "</span></a>";
}
else
@@ -580,7 +599,10 @@ var Markup = {
case "class":
E += "(Class #" + B[C][2] + ")";
break;
case "skill":
case "race":
E += "(Race #" + B[C][2] + ")";
break;
case "skill":
E += "(Skill #" + B[C][2] + ")";
break;
case "pet":

2
template/js/TalentCalc.js
View File

@@ -24,7 +24,7 @@ function TalentCalc() {
_filteredGlyphs = false,
_locked = false,
_mode,
_nTrees, // _nTrees (conflicts with some width-parameters)
_nTrees,
_nTiers,
_nGlyphs,
_glyphSlots,

2
template/title.tpl
View File

@@ -19,7 +19,7 @@
<div class="text">
<a href="javascript:;" id="open-links-button" class="button-red" onclick="this.blur(); Links.show({ldelim} type: 11, typeId: {$lvData.page.id} {rdelim});">
<em><b><i>{$lang.link}</i></b><span>{$lang.link}</span></em>
<em><b><i>{$lang.links}</i></b><span>{$lang.links}</span></em>
</a>
<a href="http://old.wowhead.com/?{$query[0]}={$query[1]}" class="button-red"><em><b><i>Wowhead</i></b><span>Wowhead</span></em></a>
<h1 class="h1-icon">{if isset($lvData.page.expansion)}<span class="{$lvData.page.expansion}-icon-right">{$lvData.page.name}</span>{else}{$lvData.page.name}{/if}</h1>