diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index 22b418cd..766c36d0 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -90,7 +90,7 @@ if(!is_uploaded_file($image['tmp_name'])) { foreach(AppConf::getList() as $key=>$setting){ if($setting->isRunning()){ - $servers[] = $key; + $servers[] = [$key, $setting->getKorName()]; } } diff --git a/i_entrance/j_icon_delete.php b/i_entrance/j_icon_delete.php index 5703fc0d..36307616 100644 --- a/i_entrance/j_icon_delete.php +++ b/i_entrance/j_icon_delete.php @@ -42,7 +42,7 @@ if($dt == $rf) { foreach(AppConf::getList() as $key=>$setting){ if($setting->isRunning()){ - $servers[] = $key; + $servers[] = [$key, $setting->getKorName()]; } } diff --git a/i_entrance/user_info.php b/i_entrance/user_info.php index dd650a15..4e4941e1 100644 --- a/i_entrance/user_info.php +++ b/i_entrance/user_info.php @@ -163,7 +163,30 @@ require(__dir__.'/../vendor/autoload.php'); - + + + \ No newline at end of file diff --git a/js/user_info.js b/js/user_info.js index 8f31836d..fbd98089 100644 --- a/js/user_info.js +++ b/js/user_info.js @@ -59,23 +59,7 @@ function deleteIcon(){ return; } - var ajaxResults = result.servers.map(function(server){ - return $.ajax({ - type:'post', - url:'../{0}/j_adjust_icon.php'.format(server), - dataType:'json' - }); - }); - - $.when.apply($, ajaxResults).then(function(){ - alert('이미지를 삭제했습니다.'); - location.reload(); - },function(){ - //서버 폐쇄등으로 접근하지 못할 수도 있음. - alert('이미지를 삭제했습니다.'); - location.reload(); - }); - + showAdjustServerModal(result.servers); },function(){ alert('알 수 없는 이유로 아이콘 삭제를 실패했습니다.'); location.reload(); @@ -96,6 +80,57 @@ function disallowThirdUse(){ }); } +function showAdjustServerModal(serverList){ + + var $form = $('#chooseServerForm'); + $form.empty(); + + serverList.map(function(server){ + var serverKey = server[0]; + var serverKorName = server[1]; + + var $item = $('
\ + \ + \ +
'.format(serverKorName, serverKey)); + $form.append($item); + }); + + + var $modal = $('#chooseServer'); + $modal.modal({ + backdrop:'static' + }); + $modal.on('hidden.bs.modal', function (event) { + location.reload(); + return; + }); + + $("#modal-apply").off("click").on("click", function(){ + var events = []; + $form.find('input:checked').each(function(){ + var $input = $(this); + var server = $input.attr('name'); + console.log(server); + events.push($.ajax({ + type:'post', + url:'../{0}/j_adjust_icon.php'.format(server), + dataType:'json' + })); + }) + + $.when.apply($, events).then(function(){ + alert('적용되었습니다.'); + location.reload(); + },function(){ + //서버 폐쇄등으로 접근하지 못할 수도 있음. + alert('적용되었습니다.'); + location.reload(); + }); + }); + +} + function changeIcon(e){ e.preventDefault(); var $icon = $('#image_upload'); @@ -122,23 +157,7 @@ function changeIcon(e){ return; } - var ajaxResults = result.servers.map(function(server){ - return $.ajax({ - type:'post', - url:'../{0}/j_adjust_icon.php'.format(server), - dataType:'json' - }); - }); - - $.when.apply($, ajaxResults).then(function(){ - alert('이미지를 업로드했습니다.'); - location.reload(); - },function(){ - //서버 폐쇄등으로 접근하지 못할 수도 있음. - alert('이미지를 업로드했습니다.'); - location.reload(); - }); - + showAdjustServerModal(result.servers); },function(){ alert('알 수 없는 이유로 아이콘 업로드를 실패했습니다.'); location.reload();