From 59877e181eb561d536fc07255374cb04bba090d0 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 28 Nov 2018 01:02:56 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8F=84=EC=8B=9C=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=20select2=EB=A5=BC=20=EC=8B=9C=ED=97=98=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 e_lib/select2/select2-bootstrap4.css |  2 +-
 hwe/b_currentCity.php                | 28 ++++++++++++++++------------
 hwe/css/common.css                   |  7 +++++++
 hwe/js/currentCity.js                | 22 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 hwe/js/currentCity.js

diff --git a/e_lib/select2/select2-bootstrap4.css b/e_lib/select2/select2-bootstrap4.css
index 9cde3c28..ea8cc86e 100644
--- a/e_lib/select2/select2-bootstrap4.css
+++ b/e_lib/select2/select2-bootstrap4.css
@@ -1,5 +1,5 @@
 /* select2-bootstrap4 with Darkly */
-.select2-container--bootstrap4 { display: block; color: black; }
+.select2-container--bootstrap4 { color: black; }
 
 .select2-container--bootstrap4 .select2-selection { background-color: #fff; border: 1px solid #ced4da; border-radius: 0.25rem; color: #495057; font-size: 1rem; outline: 0; }
 
diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index 5e24ca2b..db85da77 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -35,8 +35,12 @@ $templates = new \League\Plates\Engine('templates');
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
 <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+<?=WebUtil::printJS('../e_lib/select2/select2.full.min.js')?>
 <?=WebUtil::printJS('js/common.js')?>
+<?=WebUtil::printJS('js/currentCity.js')?>
 <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2.min.css')?>
+<?=WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css')?>
 <?=WebUtil::printCSS('../d_shared/common.css')?>
 <?=WebUtil::printCSS('css/common.css')?>
 <style>
@@ -63,8 +67,9 @@ $templates = new \League\Plates\Engine('templates');
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td width=998>
-            <form name=cityselect method=get>도시선택 :
-                <select name=citylist size=1 style=color:white;background-color:black;width:798px;>
+            <form name=cityselect method=get>
+                <div style='text-align:center;'>도시선택 :
+                <select id="citySelector" name=citylist size=1 style='display:inline-block;min-width:400px;'>
 <?php
 if(!$citylist){
     $citylist = $me['city'];
@@ -81,8 +86,8 @@ if($me['level'] == 0) {
     if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
     echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
     if($city['nation'] == 0) echo "공백지";
-    elseif($me['nation'] == $city['nation']) echo "본국==";
-    else echo "타국==";
+    elseif($me['nation'] == $city['nation']) echo "본국";
+    else echo "타국";
     echo "</option>";
 } else {
     // 아국 도시들 선택
@@ -97,8 +102,8 @@ if($me['level'] == 0) {
         if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
         echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
         if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
+        elseif($me['nation'] == $city['nation']) echo "본국";
+        else echo "타국";
         echo "</option>";
     }
 
@@ -114,8 +119,8 @@ if($me['level'] == 0) {
         if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
         echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
         if($city['nation'] == 0) echo "공백지";
-        elseif($me['nation'] == $city['nation']) echo "본국==";
-        else echo "타국==";
+        elseif($me['nation'] == $city['nation']) echo "본국";
+        else echo "타국";
         echo "</option>";
     }
 }
@@ -146,8 +151,8 @@ if($myNation['level'] > 0) {
             if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
             echo ">【".StringUtil::padString($city['name'], 4, '_')."】";
             if($city['nation'] == 0) echo "공백지";
-            elseif($me['nation'] == $city['nation']) echo "본국==";
-            else echo "타국==";
+            elseif($me['nation'] == $city['nation']) echo "본국";
+            else echo "타국";
             echo "</option>";
         }
     }
@@ -155,8 +160,7 @@ if($myNation['level'] > 0) {
 }
 
 echo "
-                </select>
-                <input type=submit value='도 시 선 택'>
+                </select></div>
                 <p align=center>명령 화면에서 도시를 클릭하셔도 됩니다.</p>
             </form>
         </td>
diff --git a/hwe/css/common.css b/hwe/css/common.css
index d96b6364..f69d03c5 100644
--- a/hwe/css/common.css
+++ b/hwe/css/common.css
@@ -240,3 +240,10 @@ div.bar_out div.bar_in{
     background-color:red;
     color:white;
 }
+.select2-selection--single.simple-select2-align-center .select2-selection__rendered {
+    text-align: center;
+}
+
+.select2-dropdown.simple-select2-align-center li.select2-results__option{
+    text-align: center;
+}
diff --git a/hwe/js/currentCity.js b/hwe/js/currentCity.js
new file mode 100644
index 00000000..33d8541b
--- /dev/null
+++ b/hwe/js/currentCity.js
@@ -0,0 +1,22 @@
+$(function() {
+    $('#citySelector').select2({
+        theme: 'bootstrap4',
+        placeholder: "도시를 선택해 주세요.",
+        allowClear: false,
+        language: "ko",
+        containerCss: {
+            display: "inline-block !important"
+        },
+        containerCssClass: 'simple-select2-align-center',
+        dropdownCssClass: 'simple-select2-align-center',
+    });
+    $('#citySelector').on('select2:select', function(e){
+        var data = e.params.data;
+        if(!data.selected || data.disabled){
+            return;
+        }
+        var $obj = $('#citySelector').parents('form');
+        $obj.submit();
+        console.log($obj);
+    });
+});
\ No newline at end of file