Skip to content

Commit 7091cd7

Browse files
tomaskitomaski
authored
Merge pull request #55 from grcrt/feature/temples
feat(reports): add temple/Olympus conversion
2 parents 661fb14 + 7bf648f commit 7091cd7

File tree

4 files changed

+154
-72
lines changed

4 files changed

+154
-72
lines changed

‎modules/GRCRTConverterCtrl.js

Lines changed: 58 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ function _GRCRTConverterCtrl(wnd) {
335335
$.each(__repconvValueArray, function(ind,repconvValue){
336336
var _res = $('<div/>');
337337
var params = {message: repconvValue};
338-
RepConv.Debug && console.log(value.length);
338+
RepConv.Debug && console.log(repconvValue.length);
339339
gpAjax._ajax(
340340
'message',
341341
'preview',
@@ -659,7 +659,7 @@ function _GRCRTConverterCtrl(wnd) {
659659
}
660660
_UA = {
661661
i : RepConvTool.GetUnit(RCunit),
662-
b : $(elem).children('span').html()
662+
b : ($(elem).children('div.value').length >0 ? $(elem).children('div.value') : $(elem).children('span')).html()
663663
}
664664
report[site].full.ua.push(_UA),
665665
report[site].splits[rowNumber].ua.push(_UA)
@@ -717,8 +717,8 @@ function _GRCRTConverterCtrl(wnd) {
717717
// );
718718
result.town = _getTown(item);
719719
result.town_type = _getTownType(item);
720-
result.player = (result.town_type == "town") ? _getPlayer(item) : "";
721-
result.ally = (result.town_type == "town") ? _getAlly(item) : _getAllyFromOwner(item);
720+
result.player = (result.town_type == "town" || _reportType == "powers" ) ? _getPlayer(item) : "";
721+
result.ally = (result.town_type == "town" || _reportType == "powers") ? _getAlly(item) : _getAllyFromOwner(item);
722722
result.townName = _getTownName(item);
723723
result.playerName = _getPlayerName(item);
724724
// result.island = _getIsland(item);
@@ -1691,13 +1691,13 @@ function _GRCRTConverterCtrl(wnd) {
16911691
// przybywające ataki,wsparcia
16921692
report.unit_movements = { 'support':0, 'attack':0}
16931693
if(MM.getCollections().Support && MM.getCollections().Support[0] && MM.getCollections().Support[0].getIncomingSupportsForTown(Game.townId)){
1694-
report.unit_movements.support = MM.getCollections().Support[0].length;
1694+
report.unit_movements.support = MM.getCollections().Support[0].getIncomingSupportsForTown(Game.townId).getIncoming();
16951695
// $.each(MM.getCollections().Support[0].getIncomingSupportsForTown(Game.townId), function(ind, command){
16961696
// report.unit_movements.support += ((command.getIncoming()==1) ? 1 : 0)
16971697
// })
16981698
}
16991699
if(MM.getCollections().Attack && MM.getCollections().Attack[0] && MM.getCollections().Attack[0].getIncomingAttacksForTown(Game.townId)){
1700-
report.unit_movements.attack = MM.getCollections().Attack[0].length;
1700+
report.unit_movements.attack = MM.getCollections().Attack[0].getIncomingAttacksForTown(Game.townId).getIncoming();
17011701
// $.each(MM.getCollections().Attack[0].getIncomingAttacksForTown(Game.townId), function(ind, command){
17021702
// report.unit_movements.attack += ((command.getIncoming()==1) ? 1 : 0)
17031703
// })
@@ -2191,7 +2191,8 @@ function _GRCRTConverterCtrl(wnd) {
21912191

21922192
function _olympus(){
21932193
var temple = MM.getCollections().Temple[0].getTempleById(wnd.attributes.args.target_id);
2194-
report.title = RepConvTool.Adds((GRCRTtpl.rct.outside) ? temple.getName() : temple.getId(), GRCRTtpl.rct.temple);
2194+
RepConv.TEMPL = MM.getCollections().Temple[0].getTempleById(wnd.attributes.args.target_id);
2195+
report.title = wnd.getTitle();
21952196
report.type = '';
21962197
report.time = '';
21972198
report.power = '';
@@ -2202,56 +2203,63 @@ function _GRCRTConverterCtrl(wnd) {
22022203
report.attacker = {};
22032204
report.defender = {};
22042205
report.command = {};
2205-
// report.attacker.title = $(_content.find($('h4'))[0]).html();
2206-
// report.attacker.player = RepConvTool.Adds(_content.find($('a.gp_player_link')).html(), GRCRTtpl.rct.player);
2207-
// report.defender.town = RepConvTool.Adds(JSON.parse(RepConvTool.Atob(_content.find($('a.gp_town_link')).attr('href')))[GRCRTtpl.rct.getTown].toString(), GRCRTtpl.rct.town);
2208-
2209-
// report.attacker.units_title = _content.find($('div.clearfix div.bold')).html();
2210-
// if (cAttUnit.isChecked()) {
2211-
// __getUnitDetail1Way('attacker', 'div.report_unit', 11);
2212-
// }else{
2213-
// report.attacker.full = {'img_url' : RepConvTool.Adds(RepConvTool.GetLabel('HIDDEN'), 'i') };
2214-
// }
2206+
2207+
__getUnitDetail1Way('defender', 'div.troops_support>div.unit_slots>div.unit', 9);
2208+
22152209
report.temple = {
2216-
owner : RepConvTool.Adds(olympOwner.isChecked() ? temple.getAllianceName() : RepConvTool.GetLabel('HIDDEN'), GRCRTtpl.rct.ally),
2217-
god : RepConvTool.Adds((RepConv.grcrt_cdn+"ui/3/{0}.png").RCFormat((temple.getGod() || 'nogod')), "img")
2210+
owner : (temple.getAllianceName()) ? RepConvTool.Adds(olympOwner.isChecked() ? temple.getAllianceName() : RepConvTool.GetLabel('HIDDEN'), GRCRTtpl.rct.ally) : "",
2211+
god : {
2212+
img_url : RepConvTool.Adds((RepConv.grcrt_cdn+"ui/3/{0}.png").RCFormat((temple.getGod() || 'nogod')), "img"),
2213+
name : DM.getl10n('layout').powers_menu.gods[temple.getGod() || 'nogod']
2214+
},
2215+
name : RepConvTool.Adds(((GRCRTtpl.rct.outside || (rBbcode.getValue() == 'BBCODEI')) ? temple.getName() : temple.getId())+"", GRCRTtpl.rct.temple),
2216+
buff : ''
22182217

22192218
};
2219+
report.addInfo = _content.find($('div.state_text')).text();
2220+
report.movements_count = {
2221+
attack : _content.find($('.troops_movements_count>.incoming_attacks>.value')).html(),
2222+
support : _content.find($('.troops_movements_count>.incoming_support>.value')).html()
2223+
}
2224+
2225+
$.each(temple.getBuff(), function (ii,ee){
2226+
var tmp = GameDataPowers.getTooltipPowerData(GameData.powers[ii], ee, 0);
2227+
report.temple.buff += ((report.temple.buff != '') ? "\n" : "")+tmp.i_descr;
2228+
})
22202229

22212230
report.linia = {};
2222-
if (_content.find($('ul#unit_movements')).length == 0) {
2223-
report.command.title = "\n[i]" + (_content.find($('.conquest_info_wrapper>span')).html()||'') + "[/i]";
2231+
2232+
var ti = MM.getModels().TempleInfo[wnd.attributes.args.target_id];
2233+
2234+
if (ti.getMovements().length == 0) {
2235+
report.command.title = "\n[i]" + (_content.find($('.troops_movements>.content>.centered_text')).html()||'') + "[/i]";
22242236
} else {
2225-
report.linia = {};
2226-
$.each(_content.find($('ul#unit_movements>li')), function(ind, elem) {
2237+
$.each(ti.getMovements(), function(ind, elem) {
22272238
report.linia[ind] = {};
2228-
report.linia[ind].inout = RepConvTool.Adds(RepConv.Const.staticImg + (($(elem).attr('class').replace(/.*(incoming).*/, '$1').length == 0) ? 'out' : 'in') + '.png', 'img');
2229-
report.linia[ind].img = RepConvTool.Adds($(elem).find($('img.command_type')).attr('src'), 'img');
2239+
report.linia[ind].inout = RepConvTool.Adds(RepConv.Const.staticImg + 'in' + '.png', 'img');
2240+
report.linia[ind].img = RepConvTool.Adds('https://cdn.grcrt.net/ui/c/'+elem.type+'.png', 'img');
22302241
var
2231-
_tbtime = $(elem).find('div>span.eta').html().split(':'),
2232-
_sec = (parseInt(_tbtime[0])*60*60+parseInt(_tbtime[1])*60+parseInt(_tbtime[2])),
2233-
_time = readableUnixTimestamp(Timestamp.server()+parseInt(_sec), 'player_timezone', {with_seconds: true, extended_date : true})//formatDateTimeNice(Timestamp.server()+parseInt(_sec), true)
2242+
// _tbtime = $(elem).find('div>span.eta').html().split(':'),
2243+
// _sec = (parseInt(_tbtime[0])*60*60+parseInt(_tbtime[1])*60+parseInt(_tbtime[2])),
2244+
_time = readableUnixTimestamp(elem.arrival_at, 'player_timezone', {with_seconds: true, extended_date : true})//formatDateTimeNice(Timestamp.server()+parseInt(_sec), true)
22342245
report.linia[ind].time = _time;
2235-
//report.linia[ind].time = $(elem).find('div>span.eta').html();
22362246
var
2237-
_cmd_town = RepConvTool.Adds(JSON.parse(RepConvTool.Atob($($($(elem).find('div')[2]).html()).eq(3).attr('href')))[GRCRTtpl.rct.getTown].toString(), GRCRTtpl.rct.town),
2238-
_cmd_player = RepConvTool.Adds(JSON.parse(RepConvTool.Atob($($($(elem).find('div')[2]).html()).eq(5).attr('href'))).name, GRCRTtpl.rct.player),
2239-
_cmd_ally = '('+RepConvTool.Adds($($($(elem).find('div')[2]).html()).eq(7).html(), GRCRTtpl.rct.ally)+')' || '';
2247+
_cmd_town = RepConvTool.Adds( elem['origin_town_'+GRCRTtpl.rct.getTown].toString(), GRCRTtpl.rct.town),
2248+
_cmd_player = RepConvTool.Adds(elem.sender_name, GRCRTtpl.rct.player),
2249+
_cmd_ally = '';
22402250
report.linia[ind].text = '';
2241-
$.each($($($(elem).find('div')[2]).html().replace(/.*<span.*span>(.*)/, '$1')), function(icmd, ecmd){
2242-
//console.log(icmd)
2243-
//console.log($(ecmd).text())
2244-
if ($(ecmd).hasClass('gp_town_link')) {
2251+
// $.each($($($(elem).find('div')[2]).html().replace(/.*<span.*span>(.*)/, '$1')), function(icmd, ecmd){
2252+
// if ($(ecmd).hasClass('gp_town_link')) {
22452253
report.linia[ind].text += " "+_cmd_town;
2246-
} else if ($(ecmd).hasClass('gp_player_link')) {
2247-
report.linia[ind].text += "\n"+_cmd_player;
2248-
} else if ($(ecmd).attr('onclick') != undefined) {
2249-
report.linia[ind].text += " "+_cmd_ally;
2250-
} else if ($(ecmd).text().replace(/(\(|\))/,'').trim().length > 0) {
2251-
report.linia[ind].text += " "+$(ecmd).text().trim();
2252-
}
2253-
})
2254-
ind++;
2254+
// } else if ($(ecmd).hasClass('gp_player_link')) {
2255+
report.linia[ind].text += " ("+_cmd_player+")";
2256+
// } else if ($(ecmd).attr('onclick') != undefined) {
2257+
// report.linia[ind].text += " "+_cmd_ally;
2258+
// } else if ($(ecmd).text().replace(/(\(|\))/,'').trim().length > 0) {
2259+
// report.linia[ind].text += " "+$(ecmd).text().trim();
2260+
// }
2261+
// })
2262+
// ind++;
22552263
});
22562264
}
22572265

@@ -2688,10 +2696,10 @@ function _GRCRTConverterCtrl(wnd) {
26882696
_formbody.append(ramka);
26892697
}
26902698
function optionsOlymp() {
2691-
olympOwner = genCheckBox('OLYMPOWNER', true),
2692-
olympTroop = genCheckBox('OLYMPTROOP', true),
2693-
olympAcCom = genCheckBox('OLYMPACCOM', true),
2694-
olympDesc = genCheckBox('OLYMPDESC', false);
2699+
// olympOwner = genCheckBox('OLYMPOWNER', true),
2700+
// olympTroop = genCheckBox('OLYMPTROOP', true),
2701+
// olympAcCom = genCheckBox('OLYMPACCOM', false),
2702+
// olympDesc = genCheckBox('OLYMPDESC', true);
26952703
var tag = $('<div/>')
26962704
.append(olympOwner)
26972705
.append(olympDesc)
@@ -2914,7 +2922,7 @@ function _GRCRTConverterCtrl(wnd) {
29142922
olympOwner = genCheckBox('OLYMPOWNER', true),
29152923
olympTroop = genCheckBox('OLYMPTROOP', true),
29162924
olympAcCom = genCheckBox('OLYMPACCOM', true),
2917-
olympDesc = genCheckBox('OLYMPDESC', false);
2925+
olympDesc = genCheckBox('OLYMPDESC', true);
29182926
try {
29192927
(WM.getWindowByType("grcrt_convert")[0]).close()
29202928
} catch (e){}

‎modules/GRCRTInnoFix.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ function _GRCRTInnoFix() {
77
'max-width: none;\n'+
88
'}'
99
)
10-
// size units value
11-
.append('.olympus_temple_info .unit .value {\n'+
12-
'font-size: 10px;\n'+
13-
'}'
14-
)
10+
// // size units value
11+
// .append('.olympus_temple_info .unit .value {\n'+
12+
// 'font-size: 10px;\n'+
13+
// '}'
14+
// )
1515
)
1616
$.Observer(GameEvents.window.reload).subscribe("grcrt_trade", function(a, b) {
1717
$.each($('div[class*=trade_tab_target]'), function(ii, trade){

‎modules/GRCRTtpl.js

Lines changed: 86 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
function _GRCRTtpl() {
2+
"use strict";
23
var
34
_spliter = '=#=#=',
45
_site2site = ' (##/##)',
@@ -376,14 +377,19 @@ _spliter+
376377
'<%}%>'+
377378
'<%=GRCRTtpl.rct.singleline%>\\n'+
378379
'',
379-
//'<%=command.title%>\\n'+
380-
//'<%for(ind in linia){%>'+
381-
//'<% if (ind > 0){%>'+
382-
//'<%=GRCRTtpl.rct.singleline%>\\n'+
383-
//'<% }%>'+
384-
//'<%=linia[ind].img%> <%=linia[ind].inout%> (<%=linia[ind].time%>) <%=linia[ind].text%>\\n'+
385-
//'<%}%>'+
386-
//'',
380+
olympus : ''+
381+
'[b]<%=GRCRTtpl.AddSize(title,9)%>[/b]\\n'+
382+
'<%=temple.god.img_url%> <%=temple.god.name%>\\n' +
383+
'[i]<%=temple.buff%>[/i]\\n'+
384+
'<%=GRCRTtpl.rct.singleline%>\\n'+
385+
'<%=temple.name%> \\n'+
386+
'<% if (temple.owner!="") {%>'+
387+
'<%=temple.owner%> \\n'+
388+
'<%}%>'+
389+
'[img]https://cdn.grcrt.net/ui/attack.png[/img] <%=movements_count.attack%> '+
390+
'[img]https://cdn.grcrt.net/ui/support.png[/img] <%=movements_count.support%>\\n'+
391+
'<%=GRCRTtpl.rct.singleline%>\\n'+
392+
'',
387393
conquestTroopsHead : ''+
388394
'[b]<%=GRCRTtpl.AddSize(command.title,9)%>[/b]'+_site2site+'\\n'+
389395
'',
@@ -404,6 +410,13 @@ _spliter+
404410
ownTropsInTheCity : ''+
405411
'<%=defender.full.img_url%>\\n'+
406412
'',
413+
ownTropsInOlympus : ''+
414+
'<%=defender.full.img_url %>\\n'+
415+
'<% if ( addInfo != "" ) { %>'+
416+
'<%=addInfo %>\\n'+
417+
'<% } %>'+
418+
'',
419+
407420
revoltTool : ''+
408421
'[quote][table]\\n'+
409422
'[*][|]<%=defender.town%>[/*]\\n'+
@@ -481,6 +494,33 @@ _spliter+
481494
'<%=RepConvTool.addLine(698)%>'+
482495
'<%=GRCRTtpl.rct.tplSizeEnd + GRCRTtpl.rct.tplFontEnd%>'+
483496
'<%=GRCRTtpl.rct.tplColEnd + GRCRTtpl.rct.tplRowEnd%>'+
497+
'',
498+
olympus : ''+
499+
'<%=GRCRTtpl.rct.tplRowBegin + GRCRTtpl.rct.tplColBegin%>'+
500+
'<%=GRCRTtpl.rct.tplFontBegin %>'+
501+
'[b]<%=title%>[/b]\\n'+
502+
'<%=temple.god.img_url%> <%=temple.god.name%>\\n' +
503+
'[i]<%=temple.buff%>[/i]\\n'+
504+
'<%=GRCRTtpl.rct.tplFontEnd%>'+
505+
'<%=GRCRTtpl.rct.tplColSep%>'+
506+
'<%=GRCRTtpl.rct.tplFontBegin %>'+
507+
'<%=temple.name%> \\n'+
508+
'<% if (temple.owner!="") {%>'+
509+
'<%=temple.owner%> \\n'+
510+
'<%}%>'+
511+
'[img]https://cdn.grcrt.net/ui/attack.png[/img] <%=movements_count.attack%> '+
512+
'[img]https://cdn.grcrt.net/ui/support.png[/img] <%=movements_count.support%>\\n'+
513+
'<%=GRCRTtpl.rct.tplFontEnd%>'+
514+
'<%=GRCRTtpl.rct.tplColEnd + GRCRTtpl.rct.tplRowEnd%>'+
515+
'<%=GRCRTtpl.rct.tplRowBegin + GRCRTtpl.rct.tplColBegin%>'+
516+
'<%=GRCRTtpl.rct.tplFontBegin + GRCRTtpl.rct.tplSize9 %>'+
517+
'<%=RepConvTool.addLine(345)%>'+
518+
'<%=GRCRTtpl.rct.tplSizeEnd + GRCRTtpl.rct.tplFontEnd%>'+
519+
'<%=GRCRTtpl.rct.tplColSep%>'+
520+
'<%=GRCRTtpl.rct.tplFontBegin + GRCRTtpl.rct.tplSize9 %>'+
521+
'<%=RepConvTool.addLine(345)%>'+
522+
'<%=GRCRTtpl.rct.tplSizeEnd + GRCRTtpl.rct.tplFontEnd%>'+
523+
'<%=GRCRTtpl.rct.tplColEnd + GRCRTtpl.rct.tplRowEnd%>'+
484524
'',
485525
t3col : ''+
486526
'<%=GRCRTtpl.rct.tplRowBegin + GRCRTtpl.rct.tplColBegin%>'+
@@ -739,6 +779,15 @@ _spliter+
739779
'<%=RepConvTool.addLine(698)%>\\n'+
740780
'<%=defender.full.img_url %>\\n'+
741781
'<%=GRCRTtpl.rct.tplFontEnd + GRCRTtpl.rct.tplColEnd + GRCRTtpl.rct.tplRowEnd%>'+
782+
'',
783+
ownTropsInOlympus : ''+
784+
'<%=GRCRTtpl.rct.tplRowBegin + GRCRTtpl.rct.tplColSpan2 + GRCRTtpl.rct.tplFontBegin%>'+
785+
'<%=RepConvTool.addLine(698)%>\\n'+
786+
'<%=defender.full.img_url %>\\n'+
787+
'<% if ( addInfo != "" ) { %>'+
788+
'<%=addInfo %>\\n'+
789+
'<% } %>\\n'+
790+
'<%=GRCRTtpl.rct.tplFontEnd + GRCRTtpl.rct.tplColEnd + GRCRTtpl.rct.tplRowEnd%>'+
742791
'',
743792
wallDet : ''+
744793
'<%=GRCRTtpl.rct.tplRowBegin + GRCRTtpl.rct.tplColBegin %>'+
@@ -819,12 +868,12 @@ _spliter+
819868
'<%=GRCRTtpl.rct.tplColSep%>'+
820869
'<%=GRCRTtpl.rct.tplFontBegin %>'+
821870
'[b]<%=GRCRTtpl.AddSize(command.title,10)%>[/b]'+_site2site+'\\n'+
822-
'<%=RepConvTool.addLine(302)%>'+
871+
'<%=RepConvTool.addLine(304)%>'+
823872
'<%=GRCRTtpl.rct.tplFontEnd %>'+
824873
'<%=GRCRTtpl.rct.tplColSep%>'+
825874
'<%=RepConvTool.addLine(32)%>'+
826875
'<%=GRCRTtpl.rct.tplColSep%>'+
827-
'<%=RepConvTool.addLine(302)%>'+
876+
'<%=RepConvTool.addLine(304)%>'+
828877
'<%=GRCRTtpl.rct.tplColEnd + GRCRTtpl.rct.tplRowEnd%>'+
829878
'',
830879
conquestTroops : ''+
@@ -999,6 +1048,17 @@ _spliter+
9991048
result = templ.txt.bbcode_ipa;
10001049
printFooter = false;
10011050
break;
1051+
case "olympus_temple_info" :
1052+
result =
1053+
templ.txt.olympus +
1054+
templ.txt.ownTropsInOlympus +
1055+
templ.txt.conquestTroopsHead +
1056+
((Object.size(pReport.linia)>0) ?
1057+
_spliter +
1058+
templ.txt.conquestTroops
1059+
: '' )
1060+
;
1061+
break;
10021062
}
10031063
result += (printFooter) ?
10041064
templ.txt.duble +
@@ -1225,12 +1285,25 @@ _spliter+
12251285
break;
12261286
case "olympus_temple_info" :
12271287
result =
1228-
GRCRTtpl.rct.tplTableBegin + "aqq"
1288+
GRCRTtpl.rct.tplTableBegin +
1289+
templ.tbl.olympus +
1290+
((GRCRTtpl.rct.outside) ? GRCRTtpl.rct.tplTableNBBegin : GRCRTtpl.rct.tplTableEnd) +
1291+
templ.tbl.foot +
1292+
((GRCRTtpl.rct.outside) ? GRCRTtpl.rct.tplTableNBEnd : GRCRTtpl.rct.tplTableBegin) +
1293+
GRCRTtpl.rct.tplRowBegin +
1294+
templ.tbl.ownTropsInOlympus +
1295+
GRCRTtpl.rct.tplRowEnd +
1296+
((GRCRTtpl.rct.outside) ? GRCRTtpl.rct.tplTableNBBegin : GRCRTtpl.rct.tplTableEnd) +
1297+
((GRCRTtpl.rct.outside) ? GRCRTtpl.rct.tplTableNBEnd : GRCRTtpl.rct.tplTableBegin) +
1298+
templ.tbl.conquestTroopsHead+
1299+
((Object.size(pReport.linia)>0) ?
1300+
_spliter+
1301+
templ.tbl.conquestTroops
1302+
: '' )+
12291303
GRCRTtpl.rct.tplTableEnd;
12301304
break;
12311305

12321306
}
1233-
12341307
return tmpl(RepConvTool.Adds(result, GRCRTtpl.rct.tag), pReport);
12351308
}
12361309

@@ -1276,7 +1349,7 @@ _spliter+
12761349
}
12771350

12781351
this.AddSize = function(value, size) {
1279-
if (value.length > 0 && this.rcts.A == this.rct)
1352+
if (value && value.length > 0 && this.rcts.A == this.rct)
12801353
return "[size=" + size + "]" + value + "[/size]";
12811354
return value;
12821355
}

‎modules/RepConvGRC.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2415,7 +2415,8 @@ function _RepConvGRC() {
24152415
(RepConvTool.AddBtn('BTNCONV', wnd.getIdentifier())).click(function() {
24162416
window.GRCRTConvWnd = new _GRCRTConverterCtrl(wnd);
24172417
})
2418-
.insertBefore($('#window_'+wnd.getIdentifier()).find('.action_buttons.centered_text .btn_jump_to.button_new.square'))
2418+
.css({'top':'56px','right':'40px'})
2419+
.insertBefore($('#window_'+wnd.getIdentifier()).find('.temple_image_wrapper'))
24192420
}
24202421
})
24212422
}
@@ -3186,9 +3187,9 @@ function _RepConvGRC() {
31863187
case windowIds.NOTES:
31873188
addBtnPasteReport(wnd);
31883189
break;
3189-
// case windowIds.OLYMPUS_TEMPLE_INFO:
3190-
// addBtnOlympusTempleInfo(wnd);
3191-
// break;
3190+
case windowIds.OLYMPUS_TEMPLE_INFO:
3191+
addBtnOlympusTempleInfo(wnd);
3192+
break;
31923193
}
31933194
}
31943195

0 commit comments

Comments
 (0)