Merge branch 'devel' into ng_turn

2018-09-12 00:54:48 +09:00
parent 91a36eb9a0 6eadf718fc
commit 89bf457878
9 changed files with 44 additions and 31 deletions
@@ -217,8 +217,8 @@ $result = Util::generateFileUsingSimpleTemplate(
 );

 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/menu.orig.js',
-    ROOT.'/d_shared/menu.js',
+    __dir__.'/templates/menu.orig.json',
+    ROOT.'/d_shared/menu.json',
    [],
    true
 );
@@ -1,8 +0,0 @@
-window.sammo_menu = [
-    ['/bbs/board', '삼모게시판', '_blank'],
-    ['/bbs/tip', '팁/강좌', '_blank'],
-    ['/bbs/news', '삼국 일보', '_blank'],
-    ['/bbs/history2', '개인 열전', '_blank'],
-    ['/bbs/history3', '국가 열전', '_blank'],
-    ['/bbs/patch', '패치 내역', '_blank']
-];
@@ -0,0 +1,8 @@
+[
+    ["/bbs/board", "삼모게시판", "_blank"],
+    ["/bbs/tip", "팁/강좌", "_blank"],
+    ["/bbs/news", "삼국 일보", "_blank"],
+    ["/bbs/history2", "개인 열전", "_blank"],
+    ["/bbs/history3", "국가 열전", "_blank"],
+    ["/bbs/patch", "패치 내역", "_blank"]
+]
@@ -12,6 +12,7 @@ $db = RootDB::db();
 $notice = $db->queryFirstField('SELECT `NOTICE` FROM `system` WHERE `NO`=1');
 $userGrade = $session->userGrade;
 $acl = $session->acl;
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -34,8 +35,6 @@ $acl = $session->acl;
        <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
        <?=WebUtil::printJS('../js/func.js')?>
        <?=WebUtil::printJS('../js/entrance.js')?>
-        <?=WebUtil::printJS('../d_shared/menu.js')?>
-        <?=WebUtil::printJS('../js/title.js')?>

 <?php if ($userGrade >= 5 || $acl): ?>
        <!-- 운영자 -->
@@ -53,6 +52,7 @@ $acl = $session->acl;
  </button>
  <div class="collapse navbar-collapse" id="navbarNav">
    <ul class="navbar-nav">
+    <?=WebUtil::drawMenu(ROOT.'/d_shared/menu.json')?>
    </ul>
  </div>
 </nav>
@@ -26,8 +26,6 @@ require(__dir__.'/../vendor/autoload.php');
        <?=WebUtil::printJS('../e_lib/moment.min.js')?>
        <?=WebUtil::printJS('../js/func.js')?>
        <?=WebUtil::printJS('../js/user_info.js')?>
-        <?=WebUtil::printJS('../d_shared/menu.js')?>
-        <?=WebUtil::printJS('../js/title.js')?>
    </head>
 <body>
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
@@ -37,6 +35,7 @@ require(__dir__.'/../vendor/autoload.php');
    </button>
    <div class="collapse navbar-collapse" id="navbarNav">
        <ul class="navbar-nav">
+        <?=WebUtil::drawMenu(ROOT.'/d_shared/menu.json')?>
        </ul>
    </div>
 </nav>
@@ -30,12 +30,16 @@ if ($session->isLoggedIn()) {
    <?=WebUtil::printJS('e_lib/bootstrap.bundle.min.js')?>
    <?=WebUtil::printJS('e_lib/jquery.validate.min.js')?>
    <?=WebUtil::printJS('e_lib/sha512.min.js')?>
-    <?=WebUtil::printJS('d_shared/menu.js')?>
    <?=WebUtil::printJS('js/common.js')?>
    <?=WebUtil::printJS('js/login.js')?>
-    <?=WebUtil::printJS('js/title.js')?>
    <?=WebUtil::printCSS('e_lib/bootstrap.min.css')?>
    <?=WebUtil::printCSS('css/login.css')?>
+    <meta name="description" content="실시간으로 진행되는 삼국지 웹게임(삼모전)입니다">
+    <meta name="keywords" content="삼국지,삼모전,웹게임,힏체,힏체섭,히데체,히데체섭,HiDCHe,체섭">
+    <meta property="og:type" content="website">
+    <meta property="og:title" content="삼국지 모의전투 HiDCHe">
+    <meta property="og:description" content="실시간으로 진행되는 삼국지 웹게임(삼모전)입니다">
+    <meta property="og:url" content="https://sam.hided.net">
    <script>

 var oauthMode = null;
@@ -135,6 +139,7 @@ function postOAuthResult(result){
  </button>
  <div class="collapse navbar-collapse" id="navbarNav">
    <ul class="navbar-nav">
+        <?=WebUtil::drawMenu(ROOT.'/d_shared/menu.json')?>
    </ul>
  </div>
 </nav>
@@ -1,15 +0,0 @@
-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);
-    });
-});
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
@@ -135,4 +135,26 @@ class WebUtil
        $purifier = new \HTMLPurifier($config);
        return $purifier->purify($text);
    }
+
+    public static function drawMenu(string $path): string{
+        $json = Json::decode(file_get_contents($path));
+
+        $result = [];
+        foreach($json as $menuItem){
+            if (count($path) == 2) {
+                [$url, $title] = $menuItem;
+                $targetAttr = '';
+            }
+            else{
+                [$url, $title, $target] = $menuItem;
+                $target = htmlspecialchars($target);
+                $targetAttr = "target='$target' ";
+            }
+            $title = htmlspecialchars($title);
+            $url = htmlspecialchars($url);
+            $result[] = "<a class='nav-link' href='$url' $targetAttr>$title</a>";
+        }
+
+        return join("\n", $result);
+    }
 }