diff --git a/f_config/config.css b/f_config/config.css
index 6c653dab..320fcaa0 100644
--- a/f_config/config.css
+++ b/f_config/config.css
@@ -57,8 +57,13 @@ input {
}
*/
+.obj_fill{
+ display:block;
+ width:100%;
+ height:100%;
+}
+
button.with_skin {
- width: 100px; height: 18px;
background-color: black; color: white;
font-family: '맑은 고딕';
font-size: 13px;
@@ -66,7 +71,6 @@ button.with_skin {
}
input.with_skin {
- width: 100px; height: 18px;
background-color: black; color: white;
font-family: '맑은 고딕';
font-size: 13px;
diff --git a/f_func/class._Setting.php b/f_func/class._Setting.php
index 5a043c2f..63872307 100644
--- a/f_func/class._Setting.php
+++ b/f_func/class._Setting.php
@@ -7,8 +7,6 @@ class _Setting {
private $exist = false;
public function __construct($basepath) {
-
- $basepath = realpath($basepath);
$this->basepath = $basepath;
$this->settingFile = realpath($basepath.'/d_setting/conf.php');
diff --git a/i_entrance/Style.css b/i_entrance/Style.css
index 65bb8c13..b1efab88 100644
--- a/i_entrance/Style.css
+++ b/i_entrance/Style.css
@@ -3,8 +3,9 @@
@import url("manage/Style.css");
#server_notice {
- height: 50px;
+ margin:10px 0;
border: none;
+ text-align:center;
}
#server_list_container{
diff --git a/i_entrance/adminAction.js b/i_entrance/adminAction.js
index b4b6610b..fe7b7f2d 100644
--- a/i_entrance/adminAction.js
+++ b/i_entrance/adminAction.js
@@ -1,22 +1,51 @@
var serverAdminTemplate = '\
-\
+ | <%korName%>(<%name%>) | \
<%status%> | \
- | \
- | \
- | \
- | \
- | \
- | \
+ | \
+ | \
+ | \
+ | \
+ | \
+ | \
\
';
+function drawServerAdminList(serverList){
+ var $table = $('#server_admin_list');
+ $.each(serverList, function(idx, server){
+ console.log(server);
+ var status = '';
+ if(!server.valid){
+ status = '에러, {0}'.format(server.reason);
+ }
+ else if(!server.run){
+ status = '폐쇄됨';
+ }
+ else{
+ status = '운영 중';
+ }
+ server.status = status;
+
+ $table.append(
+ TemplateEngine(serverAdminTemplate, server)
+ );
+ });
+}
+
$(function(){
Entrance_AdminImport();
Entrance_AdminInit();
Entrance_AdminUpdate();
+
+ $.ajax({
+ cache:false,
+ type:'post',
+ url:'j_serverAdminStatus.php',
+ dataType:'json'
+ }).then(drawServerAdminList);
});
function Entrance_AdminImport() {
}
@@ -25,7 +54,7 @@ function Entrance_AdminInit() {
console.log('adminInit');
$("#Entrance_000201").click(Entrance_Donation);
$("#Entrance_000202").click(Entrance_Member);
- $("#Entrance_000204").click(Entrance_AdminChangeNotice);
+ $("#notice_change_btn").click(Entrance_AdminChangeNotice);
}
function Entrance_AdminUpdate() {
@@ -44,7 +73,7 @@ function Entrance_Member() {
}
function Entrance_AdminChangeNotice() {
- var notice = $("#Entrance_000203").val();
+ var notice = $("#notice_edit").val();
Popup_Confirm('정말 실행하시겠습니까?', function() {
Popup_Wait(function() {
@@ -55,8 +84,7 @@ function Entrance_AdminChangeNotice() {
},
function(response, textStatus) {
if(response.result == "SUCCESS") {
- Popup_WaitHide();
- Replace(ENTRANCE+PHP);
+ location.reload();
} else {
Popup_WaitShow(response.msg);
}
@@ -66,7 +94,10 @@ function Entrance_AdminChangeNotice() {
});
}
-function Entrance_AdminPost(server, select) {
+function Entrance_AdminPost(caller, select) {
+ var $caller = $(caller);
+ var server = $caller.parents('tr').data('server_name');
+
Popup_Confirm('정말 실행하시겠습니까?', function() {
Popup_Wait(function() {
PostJSON(
@@ -92,18 +123,26 @@ function Entrance_AdminPost(server, select) {
});
}
-function Entrance_AdminNPCLogin(serverDir) {
- ReplaceFrame(serverDir+W+'npc_login'+PHP);
+function Entrance_AdminNPCLogin(caller) {
+ var $caller = $(caller);
+ var serverDir = $caller.parents('tr').data('server_name');
+ location.href = serverDir+W+'npc_login'+PHP;
}
-function Entrance_AdminNPCCreate(serverDir) {
- ReplaceFrame(serverDir+W+'npc_join'+PHP);
+function Entrance_AdminNPCCreate(caller) {
+ var $caller = $(caller);
+ var serverDir = $caller.parents('tr').data('server_name');
+ location.href = serverDir+W+'npc_join'+PHP;
}
-function Entrance_AdminClosedLogin(serverDir) {
- ReplaceFrame(serverDir+W+'npc_login'+PHP);
+function Entrance_AdminClosedLogin(caller) {
+ var $caller = $(caller);
+ var serverDir = $caller.parents('tr').data('server_name');
+ location.href = serverDir+W+'npc_login'+PHP;
}
-function Entrance_AdminOpen119(serverDir) {
- Open(serverDir+W+'_119'+PHP);
+function Entrance_AdminOpen119(caller) {
+ var $caller = $(caller);
+ var serverDir = $caller.parents('tr').data('server_name');
+ location.href = serverDir+W+'_119'+PHP;
}
diff --git a/i_entrance/adminPost.php b/i_entrance/adminPost.php
index bb6ff2ad..444ef115 100644
--- a/i_entrance/adminPost.php
+++ b/i_entrance/adminPost.php
@@ -72,7 +72,7 @@ function doAdminPost($member, $action, $notice, $server, $select){
}
if($action == 0) {
- $db->update('SYSTEM', ['NOTICE'=>$notice], 'NO=1');
+ getRootDB()->update('SYSTEM', ['NOTICE'=>$notice], 'NO=1');
$response['result'] = 'SUCCESS';
return $response;
}
diff --git a/i_entrance/adminStyle.css b/i_entrance/adminStyle.css
index dadf3bb4..8226bf12 100644
--- a/i_entrance/adminStyle.css
+++ b/i_entrance/adminStyle.css
@@ -1,108 +1,35 @@
@charset "utf-8";
+#admin_userlist{
+ margin-top:10px;
+}
+
#server_admin_table{
width:100%;
+ margin-top:30px;
+ margin-bottom:30px;
}
-#Entrance_0002 {
- width: 800px; height: 170px;
- /*position: absolute; top: 304px; left: 0px;*/
+#server_admin_table input{
+ padding:2px 3px;
}
-#Entrance_000200 {
- width: 798px; height: 50px;
- position: absolute; top: 0px; left: 0px;
- font-size: 30px; font-weight: bold;
+#admin_userlist .center_ordered_items {
+ padding:10px;
}
-#Entrance_000201 {
- width: 200px; height: 50px;
- position: absolute; top: 65px; left: 150px;
+#notice_edit{
+ vertical-align: top;
+ display:inline-block;
+ margin:0;
+ padding:0;
+ height:4em;
+ background:black;
+ color:white;
}
-#Entrance_000202 {
- width: 200px; height: 50px;
- position: absolute; top: 65px; left: 450px;
-}
-
-#Entrance_000203 {
- width: 590px; height: 20px;
- position: absolute; top: 130px; left: 50px;
-}
-
-#Entrance_000204 {
- width: 100px; height: 20px;
- position: absolute; top: 130px; left: 650px;
-}
-
-
-#Entrance_0003 {
- width: 800px; height: 176px;
-}
-
-#Entrance_000300 {
- width: 798px; height: 50px;
- font-size: 30px; font-weight: bold;
-}
-
-#Entrance_000301 {
- width: 798px; height: 20px;
- border: none;
-}
-
-#Entrance_00030000 {
- width: 98px; height: 20px;
-}
-
-#Entrance_00030001 {
- width: 198px; height: 20px;
-}
-
-#Entrance_00030002 {
- width: 498px; height: 20px;
-}
-
-#Entrance_00030003 {
- width: 118px; height: 20px;
-}
-
-#Entrance_000302 {
- width: 798px;
- border: none;
-}
-
-.Entrance_ServerAdminList {
- width: 800px; height: 20px;
- border: none;
- float: left;
-}
-
-.Entrance_ServerAdminListServer {
- width: 98px; height: 20px;
- float: left;
-}
-
-.Entrance_ServerAdminListState {
- width: 198px; height: 20px;
- float: left;
-}
-
-.Entrance_ServerAdminListSelect {
- width: 498px; height: 20px;
- float: left;
-}
-
-.Entrance_ServerAdminListSelectButton1 {
- width: 50px; height: 20px;
- float: left;
-}
-
-.Entrance_ServerAdminListSelectButton2 {
- width: 80px; height: 20px;
- float: left;
-}
-
-.Entrance_ServerAdminListSelectButton3 {
- width: 100px; height: 20px;
- float: left;
+#notice_change_btn{
+ vertical-align: top;
+ display:inline-block;
+ height:4em;
}
diff --git a/i_entrance/admin_userlist.php b/i_entrance/admin_userlist.php
new file mode 100644
index 00000000..3d148509
--- /dev/null
+++ b/i_entrance/admin_userlist.php
@@ -0,0 +1,3 @@
+
- 회 원 관 리
-
-
-
-
\ No newline at end of file
+
+
회 원 관 리
+
+
+
+
+
+
서버 |
상태 |
명령 선택 |
-
+
diff --git a/i_entrance/user_info.php b/i_entrance/user_info.php
new file mode 100644
index 00000000..e69de29b