From 51bdd3bbfdc4652b5ffc576d42e852cdc69ff80c Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 4 May 2019 17:02:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=84=9C=EB=B2=84=EA=B0=80=20=EC=97=B4?= =?UTF-8?q?=EB=A6=B0=20=EA=B2=BD=EC=9A=B0=20=EC=84=9C=EB=B2=84=EA=B0=80=20?= =?UTF-8?q?=EC=97=B4=EB=A6=B0=20=EA=B8=B0=EA=B0=84=EC=9D=84=20=ED=91=9C?= =?UTF-8?q?=EA=B8=B0=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/config.css | 4 +++ hwe/j_server_basic_info.php | 4 ++- js/common.js | 49 ++++++++++++++++++++++++++++++++++++- js/entrance.js | 7 ++++-- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/css/config.css b/css/config.css index aa3cdf0f..f5b02819 100644 --- a/css/config.css +++ b/css/config.css @@ -164,4 +164,8 @@ a.samButton.disabled { .samCommandButton.disabled > .samButtonOuter > .samButtonInner::after{ content:'】' +} + +.tooltiptext { + display: none; } \ No newline at end of file diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php index 40a89e5f..32913687 100644 --- a/hwe/j_server_basic_info.php +++ b/hwe/j_server_basic_info.php @@ -63,11 +63,13 @@ if(file_exists(__dir__.'/.htaccess')){ //TODO: 천통시에도 예약 오픈 알림이 필요..? -$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm']); +$admin = $gameStor->getValues(['isunited', 'npcmode', 'year', 'month', 'scenario', 'scenario_text', 'maxgeneral', 'turnterm', 'starttime', 'turntime']); $admin['maxUserCnt'] = $admin['maxgeneral']; $admin['npcMode'] = $admin['npcmode']; $admin['turnTerm'] = $admin['turnterm']; $admin['isUnited'] = $admin['isunited']; +$admin['starttime'] = substr($admin['starttime'], 5, 11); +$admin['turntime'] = substr($admin['turntime'], 5, 11); unset($admin['npcmode']); unset($admin['maxgeneral']); unset($admin['turnterm']); diff --git a/js/common.js b/js/common.js index 96602943..9e35ba19 100644 --- a/js/common.js +++ b/js/common.js @@ -141,4 +141,51 @@ function quickReject(errMsg){ var deferred = $.Deferred(); deferred.reject(errMsg); return deferred.promise(); -} \ No newline at end of file +} + +function initTooltip($obj){ + if($obj === undefined){ + $obj = $('.obj_tooltip'); + } + else if(!$obj.hasClass('obj_tooltip')){ + $obj = $obj.find('.obj_tooltip'); + } + console.log($obj); + + $obj.each(function(){ + $target = $(this); + + if($target.data('installHandler')){ + return true; + } + $target.data('installHandler', true); + + $target.mouseover(function(){ + var $objTooltip = $(this); + if($objTooltip.data('setObjTooltip')){ + return true; + } + + var tooltipClassText = $objTooltip.data('tooltip-class'); + if(!tooltipClassText){ + tooltipClassText = ''; + } + var template = '' + .format(tooltipClassText); + + $objTooltip.tooltip({ + title:function(){ + return $.trim($(this).find('.tooltiptext').html()); + }, + template:template, + html:true + }).tooltip('show'); + + $objTooltip.data('setObjTooltip', true); + }); + }); +} + +jQuery(function($){ + initTooltip(); +}); \ No newline at end of file diff --git a/js/entrance.js b/js/entrance.js index 7a369025..60651717 100644 --- a/js/entrance.js +++ b/js/entrance.js @@ -2,7 +2,7 @@ var serverListTemplate = "\ \ \ <%korName%>섭
\ - \ + \ \ - 폐 쇄 중 -\ \ @@ -96,12 +96,15 @@ function Entrance_drawServerList(serverInfos){ var game= result.game; //TODO: 서버 폐쇄 방식을 새롭게 변경 $serverHtml.find('.server_down').detach(); + var serverTime = '%s ~ %s'.format(game.startFrom) if(game.isUnited == 2){ $serverHtml.find('.n_country').html('§천하통일§'); + $serverHtml.find('.server_date').html('{0}
~ {1}'.format(game.starttime, game.turntime)); } else{ $serverHtml.find('.n_country').html('<{0}국 경쟁중>'.format(game.nationCnt)); + $serverHtml.find('.server_date').html('{0} ~'.format(game.starttime)); } $serverHtml.append( @@ -131,7 +134,7 @@ function Entrance_drawServerList(serverInfos){ ); } - + initTooltip($serverHtml); }); }); } From f6d16883de04d02206d923123496843d2931b8a4 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 4 May 2019 17:05:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EA=B8=B0=EA=B0=84=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/entrance.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/entrance.js b/js/entrance.js index 60651717..1a5b0191 100644 --- a/js/entrance.js +++ b/js/entrance.js @@ -1,8 +1,9 @@ var serverListTemplate = "\ \ - \ + \ <%korName%>섭
\ - \ + \ + \ \ - 폐 쇄 중 -\ \ From e33d8776bc03334ba055ba21156b6b6a256a9363 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 4 May 2019 17:08:36 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EB=A3=A8=ED=8A=B8=20j?= =?UTF-8?q?s=20include=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i_entrance/entrance.php | 2 +- i_entrance/user_info.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index b2c7a7f3..f6c21591 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -30,9 +30,9 @@ $acl = $session->acl; - + diff --git a/i_entrance/user_info.php b/i_entrance/user_info.php index 4e4941e1..e0dd4f10 100644 --- a/i_entrance/user_info.php +++ b/i_entrance/user_info.php @@ -18,10 +18,10 @@ require(__dir__.'/../vendor/autoload.php'); - - + +