diff --git a/setup/tools/filegen/templates/power.js.in b/setup/tools/filegen/templates/power.js.in index 56438dd6..aee4548c 100644 --- a/setup/tools/filegen/templates/power.js.in +++ b/setup/tools/filegen/templates/power.js.in @@ -304,7 +304,7 @@ if (typeof $WowheadPower == "undefined") { i1 = 1; i2 = 2; url = rel.match(/(item|quest|spell|achievement|event|npc|object|itemset|currency).?(-?[0-9]+)/); - // if (url == null) { // sarjuuk: also matches 'profiler' and 'profiles' which screws with the language-menu workaround + // if (url == null) { // aowow: also matches 'profiler' and 'profiles' which screws with the language-menu workaround // url = rel.match(/(profile).?([^]+)/); // } showLogo = 1; diff --git a/static/css/aowow.css b/static/css/aowow.css index f292bdc4..f9429e75 100644 --- a/static/css/aowow.css +++ b/static/css/aowow.css @@ -3281,7 +3281,7 @@ a.button-red i { left: -1px; top: 2px; z-index: 1; - /* font-style: normal; sarjuuk: breaks textShadow*/ + /* font-style: normal; aowow: breaks textShadow*/ color: black; } @@ -3976,9 +3976,9 @@ div.captcha-center { } -/**************************************************/ -/* sarjuuk: deprecated stuff that might be of use */ -/**************************************************/ +/************************************************/ +/* aowow: deprecated stuff that might be of use */ +/************************************************/ .pet-model { diff --git a/static/css/locale_dede.css b/static/css/locale_dede.css index 1f67b8f6..6004c159 100644 --- a/static/css/locale_dede.css +++ b/static/css/locale_dede.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/dede/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/dede/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/dede/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 71px; diff --git a/static/css/locale_enus.css b/static/css/locale_enus.css index dc8952d5..9e5d204a 100644 --- a/static/css/locale_enus.css +++ b/static/css/locale_enus.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/enus/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/enus/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/enus/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 61px; diff --git a/static/css/locale_eses.css b/static/css/locale_eses.css index 0aa7aa60..2fd01db7 100644 --- a/static/css/locale_eses.css +++ b/static/css/locale_eses.css @@ -3,18 +3,6 @@ width, left, background-position values may need adjustment! */ -.topbar-search input.search-database { - background: white url(../images/eses/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/eses/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/eses/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 70px; @@ -111,4 +99,3 @@ a:hover.screenshotviewer-close span { width: 500px !important; } */ - \ No newline at end of file diff --git a/static/css/locale_frfr.css b/static/css/locale_frfr.css index 7e18b9a9..46ba8b21 100644 --- a/static/css/locale_frfr.css +++ b/static/css/locale_frfr.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/frfr/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/frfr/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/frfr/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 61px; @@ -106,4 +94,3 @@ a:hover.screenshotviewer-close span { width: 550px !important; } */ - \ No newline at end of file diff --git a/static/css/locale_ruru.css b/static/css/locale_ruru.css index 70614368..d9891b9b 100644 --- a/static/css/locale_ruru.css +++ b/static/css/locale_ruru.css @@ -1,15 +1,3 @@ -.topbar-search input.search-database { - background: white url(../images/ruru/searchdatabase.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results { - background: white url(../images/ruru/searchwithinresults.gif) .2em center no-repeat; -} - -.listview-quicksearch input.search-within-results2 { - background: white url(../images/ruru/searchwithinresults2.gif) .2em center no-repeat; -} - div.modelviewer-quality div { float: left; width: 76px; @@ -106,4 +94,3 @@ a:hover.screenshotviewer-close span { width: 625px !important; } */ - \ No newline at end of file diff --git a/static/images/dede/searchdatabase.gif b/static/images/dede/searchdatabase.gif deleted file mode 100644 index 31b27405..00000000 Binary files a/static/images/dede/searchdatabase.gif and /dev/null differ diff --git a/static/images/dede/searchwithinresults.gif b/static/images/dede/searchwithinresults.gif deleted file mode 100644 index 53b5761a..00000000 Binary files a/static/images/dede/searchwithinresults.gif and /dev/null differ diff --git a/static/images/dede/searchwithinresults2.gif b/static/images/dede/searchwithinresults2.gif deleted file mode 100644 index 1b119a53..00000000 Binary files a/static/images/dede/searchwithinresults2.gif and /dev/null differ diff --git a/static/images/enus/searchdatabase.gif b/static/images/enus/searchdatabase.gif deleted file mode 100644 index f9aaccc2..00000000 Binary files a/static/images/enus/searchdatabase.gif and /dev/null differ diff --git a/static/images/enus/searchwithinresults.gif b/static/images/enus/searchwithinresults.gif deleted file mode 100644 index 69b8118e..00000000 Binary files a/static/images/enus/searchwithinresults.gif and /dev/null differ diff --git a/static/images/enus/searchwithinresults2.gif b/static/images/enus/searchwithinresults2.gif deleted file mode 100644 index 447d6bde..00000000 Binary files a/static/images/enus/searchwithinresults2.gif and /dev/null differ diff --git a/static/images/eses/searchdatabase.gif b/static/images/eses/searchdatabase.gif deleted file mode 100644 index 9e74f343..00000000 Binary files a/static/images/eses/searchdatabase.gif and /dev/null differ diff --git a/static/images/eses/searchwithinresults.gif b/static/images/eses/searchwithinresults.gif deleted file mode 100644 index d3af4861..00000000 Binary files a/static/images/eses/searchwithinresults.gif and /dev/null differ diff --git a/static/images/eses/searchwithinresults2.gif b/static/images/eses/searchwithinresults2.gif deleted file mode 100644 index 703f8a24..00000000 Binary files a/static/images/eses/searchwithinresults2.gif and /dev/null differ diff --git a/static/images/frfr/searchdatabase.gif b/static/images/frfr/searchdatabase.gif deleted file mode 100644 index 9f57a1c9..00000000 Binary files a/static/images/frfr/searchdatabase.gif and /dev/null differ diff --git a/static/images/frfr/searchwithinresults.gif b/static/images/frfr/searchwithinresults.gif deleted file mode 100644 index dfe39a40..00000000 Binary files a/static/images/frfr/searchwithinresults.gif and /dev/null differ diff --git a/static/images/frfr/searchwithinresults2.gif b/static/images/frfr/searchwithinresults2.gif deleted file mode 100644 index aa0d317f..00000000 Binary files a/static/images/frfr/searchwithinresults2.gif and /dev/null differ diff --git a/static/images/ruru/searchdatabase.gif b/static/images/ruru/searchdatabase.gif deleted file mode 100644 index 365ac3d6..00000000 Binary files a/static/images/ruru/searchdatabase.gif and /dev/null differ diff --git a/static/images/ruru/searchwithinresults.gif b/static/images/ruru/searchwithinresults.gif deleted file mode 100644 index 22e3bf8b..00000000 Binary files a/static/images/ruru/searchwithinresults.gif and /dev/null differ diff --git a/static/images/ruru/searchwithinresults2.gif b/static/images/ruru/searchwithinresults2.gif deleted file mode 100644 index 8c4b5a55..00000000 Binary files a/static/images/ruru/searchwithinresults2.gif and /dev/null differ diff --git a/static/js/Profiler.js b/static/js/Profiler.js index a8f4883c..6430187e 100644 --- a/static/js/Profiler.js +++ b/static/js/Profiler.js @@ -2380,7 +2380,7 @@ function ProfilerTalents(_parent) { } if (!_displayed) { - // sarjuuk: causes infinite loop and it works fine without this + // aowow: causes infinite loop and it works fine without this // _talentCalc.setLevelCap(_profile.level); if (_mode != 'pets') { _updateBuilds(); @@ -4600,7 +4600,7 @@ function ProfilerInventory(_parent) { }; var params = { - wmode: 'direct', // sarjuuk: was 'opaque'; doesn't draw with this + wmode: 'direct', // aowow: was 'opaque'; doesn't draw with this quality: 'high', allowscriptaccess: 'always', allowfullscreen: true, @@ -4617,7 +4617,7 @@ function ProfilerInventory(_parent) { _mvInited = true; } - else { /* sarjuuk: the idea of this is to directly access the swf. it just doesn't work with the ZAMviewerfp11.swf */ + else { /* aowow: the idea of this is to directly access the swf. it just doesn't work with the ZAMviewerfp11.swf */ _swfModel = $WH.ge(_swfModel.id); if (_swfModel.clearSlots) { @@ -7388,7 +7388,7 @@ function ProfilerCompletion(_parent) { return _timer[wut] = setTimeout(_self.filterData.bind(_self, wut, value), 750); } - if (!_divTotals) // sarjuuk: prevent error on matching available data against empty known data + if (!_divTotals) // aowow: prevent error on matching available data against empty known data return; var _ = 0; @@ -7513,7 +7513,7 @@ function ProfilerCompletion(_parent) { } if ((!_opt.compute || _opt.compute(row, data[i])) && data[i]) { - // row.completed = (data[i].getTime ? data[i] : (_opt.showQuantity ? data[i] : 1)); // sarjuuk: idk a way to generate a jScript-TimeObject in php (there probably isn't), but one is expected here + // row.completed = (data[i].getTime ? data[i] : (_opt.showQuantity ? data[i] : 1)); // aowow: idk a way to generate a jScript-TimeObject in php (there probably isn't), but one is expected here row.completed = (data[i] > 946681200 ? new Date(data[i] * 1000) : (_opt.showQuantity ? data[i] : 1)); // so we create a dateObject from data[i] if it is a unixtime past the 1.1.2000 - 0:00 (wich probably isn't used as a sensible int anyway) hasData = true; } diff --git a/static/js/ShowOnMap.js b/static/js/ShowOnMap.js index 2173a51b..52ab3de6 100644 --- a/static/js/ShowOnMap.js +++ b/static/js/ShowOnMap.js @@ -395,7 +395,7 @@ ShowOnMap.prototype.construct = function() { } } } - if (menu && menu[2] && menu[2].constructor && menu[2].call && menu[2].apply) { // sarjuuk: check if menu[2] is function + if (menu && menu[2] && menu[2].constructor && menu[2].call && menu[2].apply) { // aowow: check if menu[2] is function menu[2](); } } diff --git a/static/js/Summary.js b/static/js/Summary.js index 3ab79a13..f8e9ff59 100644 --- a/static/js/Summary.js +++ b/static/js/Summary.js @@ -94,7 +94,7 @@ function Summary(opt) { } var GET = $WH.g_getGets(); - /* sarjuuk: GET.compare => GET.items, when using flat urls */ + /* aowow: GET.compare => GET.items, when using flat urls */ this.autoSave = 1; if (GET.compare) { @@ -1413,7 +1413,7 @@ Summary.prototype = { var href ='?compare'; if (groups) { - href += '=' + groups; // sarjuuk - with fixed urls: href += '?items=' + groups; + href += '=' + groups; // aowow - with fixed urls: href += '?items=' + groups; if (level != 80) { href += '&l=' + level; @@ -3181,7 +3181,7 @@ Summary.prototype = { case 13: // Enter g_listviews.items.submitSearch(e); break; -/* sarjuuk todo: internal misconception ... hide() and cycle(dir) are members of Livesearch and cant be reused here without further adaptation +/* aowow todo: internal misconception ... hide() and cycle(dir) are members of Livesearch and cant be reused here without further adaptation case 27: // Escape hide(); break; diff --git a/static/js/basic.js b/static/js/basic.js index aff4535c..0477f784 100644 --- a/static/js/basic.js +++ b/static/js/basic.js @@ -1045,7 +1045,7 @@ $WH.g_intersectRect = function(a, b) { //****************************************************************************// //****************************************************************************// -// sarjuuk: this function should be obsolete by now :x +// aowow: this function should be obsolete by now :x $WH.g_setRatingLevel = function(sp, level, rating, value) { var newLvl = prompt($WH.sprintf(LANG.prompt_ratinglevel, 1, 80), level); if (newLvl != null) { @@ -1378,7 +1378,7 @@ $WH.g_setTooltipLevel = function(tooltip, level) { } // Always keep the base armor type - return $WH.isset('g_itemset_types') ? prefix + g_itemset_types[_] : _all; // sarjuuk: LANG is not available if the tooltip is included externaly + return $WH.isset('g_itemset_types') ? prefix + g_itemset_types[_] : _all; // aowow: LANG is not available if the tooltip is included externaly // return prefix + g_itemset_types[_]; }); @@ -1461,7 +1461,7 @@ $WH.g_setTooltipLevel = function(tooltip, level) { // Rating to percent nMatch = []; tooltip = tooltip.replace(/()([\.0-9]+)/g, function(_all, prefix, ratingId, percent) { -/* sarjuuk: fix tooltips with multiple occurences of the same rating +/* aowow: fix tooltips with multiple occurences of the same rating _ = tooltip.match(new RegExp('(\\d+)')); if (!_) { return _all; diff --git a/static/js/global.js b/static/js/global.js index 4e41e1b2..15c7ad4e 100644 --- a/static/js/global.js +++ b/static/js/global.js @@ -404,7 +404,7 @@ var PageTemplate = new function() initFeedbackLink(); initLanguageMenu(); - initFilterDisclosure(); // sarjuuk: custom (visibility toggle for filters was removed at some point) + initFilterDisclosure(); // aowow: custom (visibility toggle for filters was removed at some point) // UI before page contents initFloatingStuff(); @@ -644,7 +644,7 @@ var PageTemplate = new function() var menuItem = [ locale.id, locale.description, - g_host + '/?locale=' + locale.id, // sarjuuk: edited for unsupported subdomains # linkBefore + locale.domain + linkAfter + g_host + '/?locale=' + locale.id, // aowow: edited for unsupported subdomains # linkBefore + locale.domain + linkAfter null, // more custom null // also custom ]; @@ -718,26 +718,9 @@ var PageTemplate = new function() // Search var $search = $('div.topbar-search', $topBar); - // custom start (note: html5 supports placeholder attribute) - var inp = $WH.ge('livesearch-generic'); - if (inp.value == '') { - inp.className = 'search-database'; - } - inp.onmouseover = function() { - if ($WH.trim(this.value) != '') { - this.className = ''; - } - }; - inp.onfocus = function() { - this.className = ''; - }; - inp.onblur = function() { - if ($WH.trim(this.value) == '') { - this.className = 'search-database'; - this.value = ''; - } - }; - // custom end + // aowow: custom start + $('#livesearch-generic').attr('placeholder', LANG.searchdb); + // aowow: custom end // Icon var $icon = $('').attr('href', 'javascript:;'); @@ -1469,7 +1452,7 @@ function g_getMoneyHtml(money, side, costItems, costCurrency, achievementPoints) side = 1; } - // sarjuuk: custom start + // aowow: custom start if (currencyId == 103) { // arena html += '' + $WH.number_format(count) + ''; } @@ -1479,7 +1462,7 @@ function g_getMoneyHtml(money, side, costItems, costCurrency, achievementPoints) else { // tokens html += '' + count + ''; } - // sarjuuk: custom end + // aowow: custom end // html += '' + (side == 3 ? '' : '') + count + (side == 3 ? '' : '') + ''; } } @@ -3682,6 +3665,10 @@ var } } + if (field.placeholder) { + f.placeholder = field.placeholder; + } + if (field.type != 'checkbox' && field.type != 'radio') { if (field.width) { f.style.width = field.width; @@ -5420,12 +5407,12 @@ Listview.prototype = { $WH.ae(bandTop, this.navTop); if (this.searchable) { var - FI_FUNC = this.updateFilters.bind(this, true), - FI_CLASS = (this._truncated ? 'search-within-results2' : 'search-within-results'), - sp = $WH.ce('span'), - em = $WH.ce('em'), - a = $WH.ce('a'), - input = $WH.ce('input'); + FI_FUNC = this.updateFilters.bind(this, true), + FI_PH = (this._truncated ? LANG.lvsearchdisplayedresults : LANG.lvsearchresults), + sp = $WH.ce('span'), + em = $WH.ce('em'), + a = $WH.ce('a'), + input = $WH.ce('input'); sp.className = 'listview-quicksearch'; @@ -5439,7 +5426,7 @@ Listview.prototype = { a.onclick = function() { var foo = this.nextSibling; foo.value = ''; - foo.className = FI_CLASS; + foo.placeholder = FI_PH; FI_FUNC(); }; a.style.display = 'none'; @@ -5448,7 +5435,7 @@ Listview.prototype = { $WH.ns(a); input.setAttribute('type', 'text'); - input.className = FI_CLASS; + input.placeholder = FI_PH; input.style.width = (this._truncated ? '19em': '15em'); g_onAfterTyping(input, FI_FUNC, this.searchDelay); @@ -5464,7 +5451,6 @@ Listview.prototype = { input.onblur = function() { if ($WH.trim(this.value) == '') { - this.className = FI_CLASS; this.value = ''; } }; @@ -7322,7 +7308,7 @@ Listview.extraCols = { } // var value = parseFloat(row.percent.toFixed(row.percent >= 1.95 ? 0 : (row.percent >= 0.195 ? 1 : 2))); - var value = parseFloat(row.percent.toFixed(row.percent >= 1.95 ? 1 : 2)); // sarjuuk: doesn't look as nice but i prefer accuracy + var value = parseFloat(row.percent.toFixed(row.percent >= 1.95 ? 1 : 2)); // aowow: doesn't look as nice but i prefer accuracy if (row.pctstack) { var sp = $WH.ce('span'); @@ -8595,7 +8581,7 @@ Listview.funcBox = { Listview.templates.comment.updateCommentCell(comment); comment.deleted = true; - // sarjuuk: lets see.... + // aowow: custom start comment.voteCell.hide(); comment.repliesCell.hide(); comment.commentBody.hide(); @@ -8615,7 +8601,7 @@ Listview.funcBox = { comment.repliesControl.toggle(); }); } - // nothing more to see here + // aowow: custom end return; } @@ -8641,7 +8627,7 @@ Listview.funcBox = { comment.deleted = false; Listview.templates.comment.updateCommentCell(comment); - // sarjuuk: lets see.... + // aowow: custom start comment.voteCell.show(); comment.repliesCell.show(); comment.commentBody.show(); @@ -8651,7 +8637,7 @@ Listview.funcBox = { comment.headerCell.css('cursor', 'auto'); comment.headerCell.unbind('click'); } - // nothig mor to see here + // aowow custom end } } else @@ -8661,7 +8647,7 @@ Listview.funcBox = { coEdit: function(comment, mode, blog) { - // sarjuuk: already editing + // aowow: custom if (comment.commentCell.find('.comment-edit')[0]) { return; } @@ -9406,7 +9392,7 @@ Listview.funcBox = { moneyCurrencyOver: function(currencyId, count, e) { var buff = g_gatheredcurrencies[currencyId]['name_' + Locale.getName()]; - // sarjuuk: justice / valor points handling removed + // aowow: justice / valor points handling removed $WH.Tooltip.showAtCursor(e, buff, 0, 0, 'q1'); }, @@ -9504,7 +9490,7 @@ Listview.funcBox = { icon = g_gatheredcurrencies[currencyId].icon; } -// sarjuuk: replacement +// aowow: replacement _ = $WH.ce('a'); _.href = '?currency=' + currencyId; _.onmousemove = $WH.Tooltip.cursorUpdate; @@ -9537,7 +9523,7 @@ Listview.funcBox = { _.onmouseover = Listview.funcBox.moneyCurrencyOver.bind(_, currencyId, count); $WH.ae(_, $WH.ct($WH.number_format(count))); } -/* sarjuuk: original +/* aowow: original if (side == 3 && icon[0] == icon[1]) { side = 1; } @@ -12064,7 +12050,7 @@ Listview.templates = { return buff; }, sortFunc: function(a, b) { - /* sarjuuk: behaves unpredictable if reqclass not set or 0 + /* aowow: behaves unpredictable if reqclass not set or 0 if (a.reqclass && b.reqclass) { var reqClass = $WH.strcmp(g_chr_classes[(1 + Math.log(a.reqclass) / Math.LN2)], g_chr_classes[(1 + Math.log(b.reqclass) / Math.LN2)]); if (reqClass) { @@ -12107,7 +12093,7 @@ Listview.templates = { return Listview.funcBox.assocArrCmp(a.skill, b.skill, g_spell_skills); } }, - /* sarjuuk + /* aowow todo: localize he next three cols */ { @@ -12902,7 +12888,7 @@ Listview.templates = { comment.headerCell.css('cursor', 'pointer'); comment.headerCell.bind('click', function(e) { if ($WH.$E(e)._target.nodeName == 'A') { - return; // sarjuuk - custom: prevent toggle if using function buttons + return; // aowow - custom: prevent toggle if using function buttons } comment.voteCell.toggle(); @@ -13773,7 +13759,7 @@ Listview.templates = { getItemLink: function(reply) { - /* sarjuuk: g_getCommentDomain returned a whole domain to ptr., old., ect. + /* aowow: g_getCommentDomain returned a whole domain to ptr., old., ect. if(reply.url) return g_getCommentDomain(reply.domain) + '/' + reply.url; if(!g_types[reply.type]) @@ -15310,7 +15296,7 @@ Listview.templates = { var a = $WH.ce('a'); a.href = 'javascript:;'; - // a.className = 'pet-zoom'; // sarjuuk: keep as reference only + // a.className = 'pet-zoom'; // aowow: keep as reference only a.onclick = this.template.modelShow.bind(this.template, model.npcId, model.displayId, false); var img = $WH.ce('img'); @@ -16758,12 +16744,12 @@ function MessageBox(parent, text) { box.addClass("message-box"); box.html('
(Click on this box to close it)
'); - setTimeout(function() { // sarjuuk - custom: popups that never vanish are just insane + setTimeout(function() { // aowow - custom: popups that never vanish are just insane box.fadeOut(); }, 5000); box.click(function (e) { - $WH.sp(e); // sarjuuk - custom: without this, the comment-header would also register the click + $WH.sp(e); // aowow - custom: without this, the comment-header would also register the click $(this).fadeOut(); }); @@ -18590,7 +18576,7 @@ Mapper.prototype = { this.sZoom.style.display = 'none'; } - /* sarjuuk: check for e is custom as it should only affect the lightbox */ + /* aowow: check for e is custom as it should only affect the lightbox */ if(this.zoom && e === undefined) MapViewer.show({ mapper: this }); }, @@ -18980,7 +18966,7 @@ Mapper.prototype = { } }; -/* sarjuuk: already defined in locale_xx instead of being fetched later +/* aowow: already defined in locale_xx instead of being fetched later var g_zone_areas = {}; */ diff --git a/static/js/locale_dede.js b/static/js/locale_dede.js index 6eb69a76..a77c2402 100644 --- a/static/js/locale_dede.js +++ b/static/js/locale_dede.js @@ -2487,6 +2487,8 @@ var LANG = { male: "Mann", female: "Frau", + searchdb: "Datenbank durchsuchen...", + source_bossdrop: "Bossdrop", source_zonedrop: "Gebietsdrop", source_quests: "Quests", @@ -2568,6 +2570,9 @@ var LANG = { lvpage_next: "Nächste ", lvpage_last: "Letzte ", + lvsearchresults: "In Ergebnissen suchen...", + lvsearchdisplayedresults: "In angezeigten Ergebnissen suchen...", + lvscreenshot_submit: "Einen Screenshot einsenden", lvscreenshot_from: "Von ", lvscreenshot_hires: "Ansicht", diff --git a/static/js/locale_enus.js b/static/js/locale_enus.js index 96f76aa4..9039ba4b 100644 --- a/static/js/locale_enus.js +++ b/static/js/locale_enus.js @@ -1650,7 +1650,7 @@ var g_sources = { 10: 'Starter', 11: 'Event', 12: 'Achievement', - // sarjuuk: 13 is string from serverside table, used by titles + // aowow: note - 13 is string from serverside table, used by titles 14: 'Black Market', 15: 'Disenchanted', 16: 'Fished', @@ -2534,6 +2534,8 @@ var LANG = { male: "Male", female: "Female", + searchdb: "Search database...", + source_bossdrop: "Boss Drop", source_zonedrop: "Zone Drop", source_quests: "Quests", @@ -2615,6 +2617,9 @@ var LANG = { lvpage_next: "Next ", lvpage_last: "Last ", + lvsearchresults: "Search within results...", + lvsearchdisplayedresults: "Search within displayed results...", + lvscreenshot_submit: "Submit a screenshot", lvscreenshot_from: "From ", lvscreenshot_hires: "View", diff --git a/static/js/locale_eses.js b/static/js/locale_eses.js index 8f6f45f4..a24fa184 100644 --- a/static/js/locale_eses.js +++ b/static/js/locale_eses.js @@ -2487,6 +2487,8 @@ var LANG = { male: "Hombre", female: "Mujer", + searchdb: "Buscar en la Base de Datos...", + source_bossdrop: "Botín de Jefe", source_zonedrop: "Despojo de zona", source_quests: "Misiones", @@ -2568,6 +2570,9 @@ var LANG = { lvpage_next: "Siguiente ", lvpage_last: "Última ", + lvsearchresults: "Buscar en resultados", + lvsearchdisplayedresults: "Buscar en los resultados mostrados", + lvscreenshot_submit: "Envia una captura de pantalla", lvscreenshot_from: "Desde ", lvscreenshot_hires: "Ver", diff --git a/static/js/locale_frfr.js b/static/js/locale_frfr.js index cc7297c8..d9edcee2 100644 --- a/static/js/locale_frfr.js +++ b/static/js/locale_frfr.js @@ -2477,6 +2477,8 @@ var LANG = { male: "Homme", female: "Femme", + searchdb: "Rechercher dans la base de données...", + source_bossdrop: "Butin de Boss", source_zonedrop: "Butin de zone", source_quests: "Quêtes", @@ -2558,6 +2560,9 @@ var LANG = { lvpage_next: "Suiv. ", lvpage_last: "Dernière ", + lvsearchresults: "Rechercher parmi les résultats...", + lvsearchdisplayedresults: "Rechercher parmi les résultats affichés...", + lvscreenshot_submit: "Envoyer une capture d'écran", lvscreenshot_from: "Par ", lvscreenshot_hires: "Voir", diff --git a/static/js/locale_ruru.js b/static/js/locale_ruru.js index debb597a..8edfa355 100644 --- a/static/js/locale_ruru.js +++ b/static/js/locale_ruru.js @@ -2477,6 +2477,8 @@ var LANG = { male: "Мужчина", female: "Женщина", + searchdb: "Искать в Базе Данных...", + source_bossdrop: "Добыча с боссов", source_zonedrop: "Добыча на территории", source_quests: "Задания", @@ -2558,6 +2560,9 @@ var LANG = { lvpage_next: "Далее ", lvpage_last: "Конец ", + lvsearchresults: "Поиск в результатах", + lvsearchdisplayedresults: "Поиск в показанных результатах", + lvscreenshot_submit: "Отправить изображение", lvscreenshot_from: "От ", lvscreenshot_hires: "Просмотр", diff --git a/static/js/screenshot.js b/static/js/screenshot.js index d13821bc..08486484 100644 --- a/static/js/screenshot.js +++ b/static/js/screenshot.js @@ -170,14 +170,14 @@ function ssm_ColorizeRow(color) { } function ssm_ConfirmMassApprove() { - ajaxAnchor(this); // sarjuuk custom - there has to be something in place or we are manually using a script for ajax + ajaxAnchor(this); // aowow custom - there has to be something in place or we are manually using a script for ajax return false; // return true; } function ssm_ConfirmMassDelete() { - if (confirm('Delete selected screenshot(s)?')) // sarjuuk custom - see above + if (confirm('Delete selected screenshot(s)?')) // aowow custom - see above ajaxAnchor(this); return false; @@ -185,7 +185,7 @@ function ssm_ConfirmMassDelete() { } function ssm_ConfirmMassSticky() { - if (confirm('Sticky selected screenshot(s)?')) // sarjuuk custom - see above + if (confirm('Sticky selected screenshot(s)?')) // aowow custom - see above ajaxAnchor(this); return false; @@ -542,7 +542,7 @@ function ssm_ShowEdit(screenshot, isAlt) { iCaption.value = screenshot.caption; iCaption.maxLength = 200; iCaption.size = 35; - iCaption.onclick = function (e) { $WH.sp(e); } // sarjuuk - custom to inhibit screenshot popup, when clicking into input element + iCaption.onclick = function (e) { $WH.sp(e); } // aowow - custom to inhibit screenshot popup, when clicking into input element div.appendChild(iCaption); var btn = $WH.ce('input');