From 19e91b2de0ed638bde1a0e5dfeaa216b60dca506 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 29 Apr 2018 02:44:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9E=85=EA=B5=AC=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f_install/j_setup_db.php | 7 +++++++ f_install/templates/menu.orig.js | 8 ++++++++ index.php | 13 +++++++++++++ js/title.js | 15 +++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 f_install/templates/menu.orig.js create mode 100644 js/title.js diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php index 9db7c2a9..ad9b1f14 100644 --- a/f_install/j_setup_db.php +++ b/f_install/j_setup_db.php @@ -216,6 +216,13 @@ $result = Util::generateFileUsingSimpleTemplate( true ); +$result = Util::generateFileUsingSimpleTemplate( + __dir__.'/templates/menu.orig.js', + ROOT.'/d_shared/menu.js', + [], + true +); + if ($result !== true) { Json::die([ 'result'=>false, diff --git a/f_install/templates/menu.orig.js b/f_install/templates/menu.orig.js new file mode 100644 index 00000000..308daf9d --- /dev/null +++ b/f_install/templates/menu.orig.js @@ -0,0 +1,8 @@ +window.sammo_menu = [ + ['/bbs/board', '삼모게시판', '_blank'], + ['/bbs/tip', '팁/강좌', '_blank'], + ['/bbs/news', '삼국 일보', '_blank'], + ['/bbs/history2', '개인 열전', '_blank'], + ['/bbs/history3', '국가 열전', '_blank'], + ['/bbs/patch', '패치 내역', '_blank'] +]; \ No newline at end of file diff --git a/index.php b/index.php index 30eaadc3..c2f0cce0 100644 --- a/index.php +++ b/index.php @@ -29,7 +29,10 @@ if ($session->isLoggedIn()) { + + + +

삼국지 모의전투 HiDCHe

diff --git a/js/title.js b/js/title.js new file mode 100644 index 00000000..7fe5c47d --- /dev/null +++ b/js/title.js @@ -0,0 +1,15 @@ +jQuery(function($){ + $.each(window.sammo_menu, function(idx){ + var href = this[0]; + var name = this[1]; + var target = (this.length > 2)?this[2]:null; + + var $a = $('{1}'.format(href, name)); + if(target){ + $a.attr('target', target); + } + var $li = $('
  • ').append($a); + $('#navbarNav .navbar-nav').append($li); + console.log(this); + }); +}); \ No newline at end of file From a242b9a20ed88949f4120c4effd2c800481dd06b Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 29 Apr 2018 03:08:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=A3=BC=EC=9A=94=20=EB=A9=94=EB=89=B4?= =?UTF-8?q?=EC=97=90=20=EC=83=81=EB=8B=A8=20=EB=B0=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/config.css | 9 +++- css/entrance.css | 98 ++------------------------------------- i_entrance/entrance.php | 14 ++++++ i_entrance/user_info.html | 13 ++++++ index.php | 4 +- 5 files changed, 42 insertions(+), 96 deletions(-) diff --git a/css/config.css b/css/config.css index a4cf8686..d09bdb69 100644 --- a/css/config.css +++ b/css/config.css @@ -45,6 +45,8 @@ div { line-height:50px; font-size: 30px; font-weight: bold; text-align: center; + color:white; + padding:0; } .legacy_layout div { @@ -87,6 +89,7 @@ button { background-color: black; color: white; font-family: '맑은 고딕'; font-size: 13px; + line-height:1.3; } .font0 { font-size: 10px; } @@ -94,4 +97,8 @@ button { .font2 { font-size: 15px; } .font3 { font-size: 20px; } .font4 { font-size: 30px; } -.font5 { font-size: 50px; } \ No newline at end of file +.font5 { font-size: 50px; } + +caption.section_title { + caption-side:top; +} \ No newline at end of file diff --git a/css/entrance.css b/css/entrance.css index 451c1738..d16e8e00 100644 --- a/css/entrance.css +++ b/css/entrance.css @@ -1,5 +1,9 @@ @charset "utf-8"; +body{ + line-height: 1.3; +} + #server_notice { margin:10px 0; border: none; @@ -55,77 +59,6 @@ text-align:center; } -/*Legacy*/ - - -#Entrance_00 { - width: 800px; - position: absolute; top: 50px; left: 50%; - margin-left: -400px; - border: none; -} - -#Entrance_0004 { - width: 52px; height: 52px; - position: absolute; top: 0px; left: -62px; - border: 1px solid white; -} - -#Entrance_0005 { - width: 160px; height: 600px; - position: absolute; top: 62px; left: -170px; -} - -#Entrance_0006 { - width: 160px; height: 600px; - position: absolute; top: 62px; left: 810px; -} - - - -#Entrance_0000 { - width: 800px; height: 134px; - position: absolute; top: 0px; left: 0px; -} - -#Entrance_000000 { - width: 798px; height: 50px; - position: absolute; top: 0px; left: 0px; - font-size: 30px; font-weight: bold; -} - -#Entrance_000001 { - width: 798px; height: 20px; - position: absolute; top: 52px; left: 0px; - border: none; -} - -#Entrance_00000000 { - width: 98px; height: 20px; - position: absolute; top: 0px; left: 0px; -} - -#Entrance_00000001 { - width: 398px; height: 20px; - position: absolute; top: 0px; left: 100px; -} - -#Entrance_00000002 { - width: 178px; height: 20px; - position: absolute; top: 0px; left: 500px; -} - -#Entrance_00000003 { - width: 118px; height: 20px; - position: absolute; top: 0px; left: 680px; -} - -#Entrance_000002 { - width: 798px; height: 64px; - position: absolute; top: 74px; left: 0px; - border: none; -} - .Entrance_ServerList { width: 800px; height: 64px; border: none; @@ -197,25 +130,4 @@ .Entrance_Hwe { color: red; font-size: 15px; font-weight: bold; -} - -#Entrance_0001 { - width: 800px; height: 130px; - position: absolute; top: 154px; left: 0px; -} - -#Entrance_000100 { - width: 798px; height: 50px; - position: absolute; top: 0px; left: 0px; - font-size: 30px; font-weight: bold; -} - -#Entrance_000101 { - width: 200px; height: 50px; - position: absolute; top: 65px; left: 150px; -} - -#Entrance_000102 { - width: 200px; height: 50px; - position: absolute; top: 65px; left: 450px; -} +} \ No newline at end of file diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index 8a0d86ba..e7d026c1 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -20,6 +20,7 @@ $userGrade = $session->userGrade; 서버목록 + @@ -30,6 +31,8 @@ $userGrade = $session->userGrade; + + = 5): ?> @@ -40,6 +43,17 @@ $userGrade = $session->userGrade; + +
    계정 관리 + @@ -17,8 +18,20 @@ + + +
    diff --git a/index.php b/index.php index c2f0cce0..e4d5b5dc 100644 --- a/index.php +++ b/index.php @@ -109,8 +109,8 @@ function postOAuthResult(result){ -