Merge branch 'devel' of devsam/core into master

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; }
+.font5  { font-size: 50px; }
+
+caption.section_title {
+    caption-side:top;
+}

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;
-}

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,

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']
+];

i_entrance/entrance.php

@@ -20,6 +20,7 @@ $userGrade = $session->userGrade;
         <title>서버목록</title>
 
         <!-- 스타일 -->
+        <link type="text/css" rel="stylesheet" href="../e_lib/bootstrap.min.css">
         <link type="text/css" rel="stylesheet" href='../d_shared/common.css'>
         <link type="text/css" rel="stylesheet" href='../css/config.css'>
 
@@ -30,6 +31,8 @@ $userGrade = $session->userGrade;
         <script type="text/javascript" src='../e_lib/jquery-3.2.1.min.js'></script>
         <script type="text/javascript" src='../js/func.js'></script>
         <script type="text/javascript" src='../js/entrance.js'></script>
+        <script src="../d_shared/menu.js"></script>
+        <script src="../js/title.js"></script>
 
 <?php if ($userGrade >= 5): ?>
         <!-- 운영자 -->
@@ -40,6 +43,17 @@ $userGrade = $session->userGrade;
     </head>
     <body>
 
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+  <a class="navbar-brand" href="../">삼국지 모의전투 HiDCHe</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navbarNav">
+    <ul class="navbar-nav">
+    </ul>
+  </div>
+</nav>
+
 <div id="server_list_container">
 
 <?php

i_entrance/user_info.html

@@ -6,6 +6,7 @@
         <title>계정 관리</title>
 
         <!-- 스타일 -->
+        <link type="text/css" rel="stylesheet" href="../e_lib/bootstrap.min.css">
         <link type="text/css" rel="stylesheet" href='../d_shared/common.css'>
         <link type="text/css" rel="stylesheet" href='../css/config.css'>
         <link type="text/css" rel="stylesheet" href='../css/user_info.css'>
@@ -17,8 +18,20 @@
         <script type="text/javascript" src='../e_lib/sha512.min.js'></script>
         <script type="text/javascript" src='../js/func.js'></script>
         <script type="text/javascript" src='../js/user_info.js'></script>
+        <script src="../d_shared/menu.js"></script>
+        <script src="../js/title.js"></script>
     </head>
 <body>
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+    <a class="navbar-brand" href="../">삼국지 모의전투 HiDCHe</a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarNav">
+        <ul class="navbar-nav">
+        </ul>
+    </div>
+</nav>
 <div id="user_info_container">
 <table class="bg0" id="user_info_table">
     <caption class="bg2 section_title with_border">

index.php

@@ -29,7 +29,10 @@ if ($session->isLoggedIn()) {
     <script src="e_lib/bootstrap.bundle.min.js"></script>
     <script src="e_lib/jquery.validate.min.js"></script>
     <script src="e_lib/sha512.min.js"></script>
+    <script src="d_shared/menu.js"></script>
+    <script src="js/common.js"></script>
     <script src="js/login.js"></script>
+    <script src="js/title.js"></script>
     <link type="text/css" rel="stylesheet" href="e_lib/bootstrap.min.css">
     <link type="text/css" rel="stylesheet" href="css/login.css">
     <script>
@@ -106,6 +109,16 @@ function postOAuthResult(result){
 </script>
 </head>
 <body>
+<nav class="navbar navbar-expand-lg fixed-top navbar-light bg-light">
+  <a class="navbar-brand" href=".">삼국지 모의전투 HiDCHe</a>
+  <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+  </button>
+  <div class="collapse navbar-collapse" id="navbarNav">
+    <ul class="navbar-nav">
+    </ul>
+  </div>
+</nav>
     <div class="vertical-center">
     <div class="container">
         <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe</h1>

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 = $('<a class="nav-link" href="{0}">{1}</a>'.format(href, name));
+        if(target){
+            $a.attr('target', target);
+        }
+        var $li = $('<li class="nav-item"></li>').append($a);
+        $('#navbarNav .navbar-nav').append($li);
+        console.log(this);
+    });
+});