From 35a7f0dcbb27b3e0d1845c73ecd75d555814e604 Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Sat, 19 Dec 2020 19:21:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E5=A5=97md=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 class/Api.php                                 |   2 +-
 config.simple.php                             |  12 +-
 templates/admin/static/embed.js               |   6 +-
 templates/default/index.php                   | 402 ++++++------------
 templates/default/static/embed.js             |   3 +
 templates/default/static/style.css            |  87 ++++
 templates/{default => webstack}/404.html      |   0
 templates/{default => webstack}/about.html    |   0
 .../assets/css/bootstrap.css                  |   0
 .../css/fonts/elusive/css/animation.css       |   0
 .../css/fonts/elusive/css/elusive-codes.css   |   0
 .../fonts/elusive/css/elusive-embedded.css    |   0
 .../fonts/elusive/css/elusive-ie7-codes.css   |   0
 .../css/fonts/elusive/css/elusive-ie7.css     |   0
 .../assets/css/fonts/elusive/css/elusive.css  |   0
 .../assets/css/fonts/elusive/font/elusive.eot | Bin
 .../assets/css/fonts/elusive/font/elusive.svg |   0
 .../assets/css/fonts/elusive/font/elusive.ttf | Bin
 .../css/fonts/elusive/font/elusive.woff       | Bin
 .../fonts/fontawesome/css/font-awesome.css    |   0
 .../fontawesome/css/font-awesome.min.css      |   0
 .../fonts/fontawesome/fonts/FontAwesome.otf   | Bin
 .../fontawesome/fonts/fontawesome-webfont.eot | Bin
 .../fontawesome/fonts/fontawesome-webfont.svg |   0
 .../fontawesome/fonts/fontawesome-webfont.ttf | Bin
 .../fonts/fontawesome-webfont.woff            | Bin
 .../glyphicons-halflings-regular.eot          | Bin
 .../glyphicons-halflings-regular.svg          |   0
 .../glyphicons-halflings-regular.ttf          | Bin
 .../glyphicons-halflings-regular.woff         | Bin
 .../css/fonts/linecons/css/animation.css      |   0
 .../css/fonts/linecons/css/linecons-codes.css |   0
 .../fonts/linecons/css/linecons-embedded.css  |   0
 .../fonts/linecons/css/linecons-ie7-codes.css |   0
 .../css/fonts/linecons/css/linecons-ie7.css   |   0
 .../css/fonts/linecons/css/linecons.css       |   0
 .../css/fonts/linecons/font/linecons.eot      | Bin
 .../css/fonts/linecons/font/linecons.svg      |   0
 .../css/fonts/linecons/font/linecons.ttf      | Bin
 .../css/fonts/linecons/font/linecons.woff     | Bin
 .../css/fonts/meteocons/css/animation.css     |   0
 .../fonts/meteocons/css/meteocons-codes.css   |   0
 .../meteocons/css/meteocons-embedded.css      |   0
 .../meteocons/css/meteocons-ie7-codes.css     |   0
 .../css/fonts/meteocons/css/meteocons-ie7.css |   0
 .../css/fonts/meteocons/css/meteocons.css     |   0
 .../css/fonts/meteocons/font/meteocons.eot    | Bin
 .../css/fonts/meteocons/font/meteocons.svg    |   0
 .../css/fonts/meteocons/font/meteocons.ttf    | Bin
 .../css/fonts/meteocons/font/meteocons.woff   | Bin
 .../{default => webstack}/assets/css/nav.css  |   0
 .../assets/css/xenon-components.css           |   0
 .../assets/css/xenon-core.css                 |   0
 .../assets/css/xenon-forms.css                |   0
 .../assets/css/xenon-skins.css                |   0
 .../assets/css/xenon.css                      |   0
 .../assets/images/favicon.ico                 | Bin
 .../assets/images/favicon.png                 | Bin
 .../assets/images/flags/flag-cn.png           | Bin
 .../assets/images/flags/flag-us.png           | Bin
 .../assets/images/logo-collapsed@2x.png       | Bin
 .../assets/images/logo@2x.png                 | Bin
 .../assets/images/logo_dark@2x.png            | Bin
 .../assets/images/webstack_banner_cn.png      | Bin
 .../images/webstack_icon_producthunt.png      | Bin
 .../assets/js/TweenMax.min.js                 |   0
 .../assets/js/bootstrap.min.js                |   0
 .../assets/js/joinable.js                     |   0
 .../assets/js/jquery-1.11.1.min.js            |   0
 .../{default => webstack}/assets/js/lozad.js  |   0
 .../assets/js/resizeable.js                   |   0
 .../assets/js/xenon-api.js                    |   0
 .../assets/js/xenon-custom.js                 |   0
 .../assets/js/xenon-toggles.js                |   0
 templates/{default => webstack}/index.html    |   0
 templates/webstack/index.php                  | 288 +++++++++++++
 version.txt                                   |   2 +-
 77 files changed, 520 insertions(+), 282 deletions(-)
 create mode 100644 templates/default/static/embed.js
 create mode 100644 templates/default/static/style.css
 rename templates/{default => webstack}/404.html (100%)
 rename templates/{default => webstack}/about.html (100%)
 rename templates/{default => webstack}/assets/css/bootstrap.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/css/animation.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/css/elusive-codes.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/css/elusive-embedded.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/css/elusive-ie7-codes.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/css/elusive-ie7.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/css/elusive.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/font/elusive.eot (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/font/elusive.svg (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/font/elusive.ttf (100%)
 rename templates/{default => webstack}/assets/css/fonts/elusive/font/elusive.woff (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/css/font-awesome.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/css/font-awesome.min.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/fonts/FontAwesome.otf (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.eot (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.ttf (100%)
 rename templates/{default => webstack}/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.woff (100%)
 rename templates/{default => webstack}/assets/css/fonts/glyphicons/glyphicons-halflings-regular.eot (100%)
 rename templates/{default => webstack}/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg (100%)
 rename templates/{default => webstack}/assets/css/fonts/glyphicons/glyphicons-halflings-regular.ttf (100%)
 rename templates/{default => webstack}/assets/css/fonts/glyphicons/glyphicons-halflings-regular.woff (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/css/animation.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/css/linecons-codes.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/css/linecons-embedded.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/css/linecons-ie7-codes.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/css/linecons-ie7.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/css/linecons.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/font/linecons.eot (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/font/linecons.svg (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/font/linecons.ttf (100%)
 rename templates/{default => webstack}/assets/css/fonts/linecons/font/linecons.woff (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/css/animation.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/css/meteocons-codes.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/css/meteocons-embedded.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/css/meteocons-ie7-codes.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/css/meteocons-ie7.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/css/meteocons.css (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/font/meteocons.eot (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/font/meteocons.svg (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/font/meteocons.ttf (100%)
 rename templates/{default => webstack}/assets/css/fonts/meteocons/font/meteocons.woff (100%)
 rename templates/{default => webstack}/assets/css/nav.css (100%)
 rename templates/{default => webstack}/assets/css/xenon-components.css (100%)
 rename templates/{default => webstack}/assets/css/xenon-core.css (100%)
 rename templates/{default => webstack}/assets/css/xenon-forms.css (100%)
 rename templates/{default => webstack}/assets/css/xenon-skins.css (100%)
 rename templates/{default => webstack}/assets/css/xenon.css (100%)
 rename templates/{default => webstack}/assets/images/favicon.ico (100%)
 rename templates/{default => webstack}/assets/images/favicon.png (100%)
 rename templates/{default => webstack}/assets/images/flags/flag-cn.png (100%)
 rename templates/{default => webstack}/assets/images/flags/flag-us.png (100%)
 rename templates/{default => webstack}/assets/images/logo-collapsed@2x.png (100%)
 rename templates/{default => webstack}/assets/images/logo@2x.png (100%)
 rename templates/{default => webstack}/assets/images/logo_dark@2x.png (100%)
 rename templates/{default => webstack}/assets/images/webstack_banner_cn.png (100%)
 rename templates/{default => webstack}/assets/images/webstack_icon_producthunt.png (100%)
 rename templates/{default => webstack}/assets/js/TweenMax.min.js (100%)
 rename templates/{default => webstack}/assets/js/bootstrap.min.js (100%)
 rename templates/{default => webstack}/assets/js/joinable.js (100%)
 rename templates/{default => webstack}/assets/js/jquery-1.11.1.min.js (100%)
 rename templates/{default => webstack}/assets/js/lozad.js (100%)
 rename templates/{default => webstack}/assets/js/resizeable.js (100%)
 rename templates/{default => webstack}/assets/js/xenon-api.js (100%)
 rename templates/{default => webstack}/assets/js/xenon-custom.js (100%)
 rename templates/{default => webstack}/assets/js/xenon-toggles.js (100%)
 rename templates/{default => webstack}/index.html (100%)
 create mode 100644 templates/webstack/index.php

diff --git a/class/Api.php b/class/Api.php
index 4771933..9859d46 100644
--- a/class/Api.php
+++ b/class/Api.php
@@ -196,7 +196,7 @@ class Api {
         $count = $this->db->count('on_links',[ 'id' => $id]);
         //如果id不存在
         if( (empty($id)) || ($count == false) ) {
-            $this->err_msg(-1010,'link id not exists!');
+            $this->err_msg(-1012,'link id not exists!');
         }
         //合并数据
         $data = [
diff --git a/config.simple.php b/config.simple.php
index aec4111..1f3b796 100644
--- a/config.simple.php
+++ b/config.simple.php
@@ -18,17 +18,17 @@ define('TOKEN','xiaoz.me');
 //主题风格
 define('TEMPLATE','default');
 
+//站点信息
 $site_setting = [];
-//用户名
-$site_setting['user']           =   USER;
-$site_setting['password']       =   PASSWORD;
-
 //站点标题
 $site_setting['title']          =   'OneNav';
 //文字Logo
 $site_setting['logo']          =   'OneNav';
 //站点关键词
-$site_setting['keywords']       =   'OneNav,简洁导航,云链接,个人书签';
+$site_setting['keywords']       =   'OneNav,OneNav导航,OneNav书签,开源导航,开源书签,简洁导航,云链接,个人导航,个人书签';
 //站点描述
-$site_setting['description']    =   '';
+$site_setting['description']    =   'OneNav是一款使用PHP + SQLite3开发的简约导航/书签管理器，免费开源。';
 
+//这两项不要修改
+$site_setting['user']           =   USER;
+$site_setting['password']       =   PASSWORD;
\ No newline at end of file
diff --git a/templates/admin/static/embed.js b/templates/admin/static/embed.js
index 783f1e4..c7b4efc 100644
--- a/templates/admin/static/embed.js
+++ b/templates/admin/static/embed.js
@@ -74,17 +74,17 @@ layui.use(['element','table','layer','form'], function(){
       {type:'checkbox'} //开启复选框
       ,{field: 'id', title: 'ID', width:80, sort: true}
       // ,{field: 'fid', title: '分类ID',sort:true, width:90}
-      ,{field: 'category_name', title: '所属分类',width:140}
+      ,{field: 'category_name', title: '所属分类',sort:true,width:120}
       ,{field: 'url', title: 'URL',width:140,templet:function(d){
         var url = '<a target = "_blank" href = "' + d.url + '" title = "' + d.url + '">' + d.url + '</a>';
         return url;
       }}
       ,{field: 'title', title: '链接标题', width:140}
-      ,{field: 'add_time', title: '添加时间', width:150, sort: true,templet:function(d){
+      ,{field: 'add_time', title: '添加时间', width:148, sort: true,templet:function(d){
         var add_time = timestampToTime(d.add_time);
         return add_time;
       }}
-      ,{field: 'up_time', title: '修改时间', width:150,sort:true,templet:function(d){
+      ,{field: 'up_time', title: '修改时间', width:148,sort:true,templet:function(d){
           if(d.up_time == null){
             return '';
           }
diff --git a/templates/default/index.php b/templates/default/index.php
index b4c227d..e5d6759 100644
--- a/templates/default/index.php
+++ b/templates/default/index.php
@@ -1,135 +1,84 @@
 <!DOCTYPE html>
-<html lang="zh">
-
+<html lang="zh-ch" xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    </script>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="author" content="viggo" />
-    <title><?php echo $site_setting['title']; ?></title>
-    <meta name="keywords" content="<?php echo $site_setting['title']; ?>">
-    <meta name="description" content="<?php echo $site_setting['description']; ?>">
-    <link rel="shortcut icon" href="templates/default/assets/images/favicon.ico">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Arimo:400,700,400italic">
-    <link rel="stylesheet" href="templates/default/assets/css/fonts/linecons/css/linecons.css">
-    <link rel='stylesheet' href='https://libs.xiaoz.top/font-awesome/4.7.0/css/font-awesome.css'>
-    <link rel="stylesheet" href="templates/default/assets/css/fonts/fontawesome/css/font-awesome.min.css">
-    <link rel="stylesheet" href="templates/default/assets/css/bootstrap.css">
-    <link rel="stylesheet" href="templates/default/assets/css/xenon-core.css">
-    <link rel="stylesheet" href="templates/default/assets/css/xenon-components.css">
-    <link rel="stylesheet" href="templates/default/assets/css/xenon-skins.css">
-    <link rel="stylesheet" href="templates/default/assets/css/nav.css">
-    <script src="templates/default/assets/js/jquery-1.11.1.min.js"></script>
-    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-    <!-- / FB Open Graph -->
+	<meta charset="utf-8" />
+	<title><?php echo $site_setting['title']; ?></title>
+	<meta name="generator" content="EverEdit" />
+	<meta name="author" content="xiaoz<www.xiaoz.me>" />
+	<meta name="keywords" content="<?php echo $site_setting['keywords']; ?>" />
+	<meta name="description" content="<?php echo $site_setting['description']; ?>" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<link rel='stylesheet' href='https://libs.xiaoz.top/mdui/v1.0.1/css/mdui.min.css'>
+	<link rel="stylesheet" href="https://libs.xiaoz.top/font-awesome/4.7.0/css/font-awesome.css">
+	<link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/static/style.css">
+	<script src = 'https://libs.xiaoz.top/mdui/v1.0.1/js/mdui.min.js'></script>
 </head>
+<body class = "mdui-drawer-body-left mdui-appbar-with-toolbar mdui-theme-primary-indigo mdui-theme-accent-pink mdui-theme-layout-auto mdui-loaded">
+	<!--导航工具-->
+	<header class = "mdui-appbar mdui-appbar-fixed">
+		<div class="mdui-toolbar mdui-color-theme">
+		<!-- <button class="mdui-btn" mdui-drawer="{target: '#drawer'}"><i class="mdui-icon material-icons">home</i></button> -->
+		<span class="mdui-btn mdui-btn-icon mdui-ripple mdui-ripple-white" mdui-drawer="{target: '#drawer', swipe: true}"><i class="mdui-icon material-icons">menu</i></span>
+		  <!-- <a href="javascript:;" class="mdui-btn mdui-btn-icon"><i class="mdui-icon material-icons">home</i></a> -->
+		  <a href="/" class = "mdui-typo-headline" title = "<?php echo $site_setting['description'] ?>"><span class="mdui-typo-title"><?php echo $site_setting['logo']; ?></span></a>
+		  <div class="mdui-toolbar-spacer"></div>
+		  <!-- 搜索框 -->
+		  <!-- <div class="mdui-col-lg-3">
+			  <div class="mdui-textfield mdui-textfield-expandable mdui-float-right">
+			<button class="mdui-textfield-icon mdui-btn mdui-btn-icon"><i class="mdui-icon material-icons">search</i></button>
+			<input class="mdui-textfield-input" type="text" placeholder="Search"/>
+			<button class="mdui-textfield-close mdui-btn mdui-btn-icon"><i class="mdui-icon material-icons">close</i></button>
+			</div>
+		</div> -->
+		  <!-- 搜索框END -->
+		  <a href="https://github.com/helloxz/onenav" rel = "nofollow" target="_blank" class="mdui-btn mdui-btn-icon mdui-ripple mdui-ripple-white" mdui-tooltip="{content: '查看 Github'}">
+      <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 36 36" enable-background="new 0 0 36 36" xml:space="preserve" class="mdui-icon" style="width: 24px;height:24px;">
+        <path fill-rule="evenodd" clip-rule="evenodd" fill="#ffffff" d="M18,1.4C9,1.4,1.7,8.7,1.7,17.7c0,7.2,4.7,13.3,11.1,15.5
+	c0.8,0.1,1.1-0.4,1.1-0.8c0-0.4,0-1.4,0-2.8c-4.5,1-5.5-2.2-5.5-2.2c-0.7-1.9-1.8-2.4-1.8-2.4c-1.5-1,0.1-1,0.1-1
+	c1.6,0.1,2.5,1.7,2.5,1.7c1.5,2.5,3.8,1.8,4.7,1.4c0.1-1.1,0.6-1.8,1-2.2c-3.6-0.4-7.4-1.8-7.4-8.1c0-1.8,0.6-3.2,1.7-4.4
+	c-0.2-0.4-0.7-2.1,0.2-4.3c0,0,1.4-0.4,4.5,1.7c1.3-0.4,2.7-0.5,4.1-0.5c1.4,0,2.8,0.2,4.1,0.5c3.1-2.1,4.5-1.7,4.5-1.7
+	c0.9,2.2,0.3,3.9,0.2,4.3c1,1.1,1.7,2.6,1.7,4.4c0,6.3-3.8,7.6-7.4,8c0.6,0.5,1.1,1.5,1.1,3c0,2.2,0,3.9,0,4.5
+	c0,0.4,0.3,0.9,1.1,0.8c6.5-2.2,11.1-8.3,11.1-15.5C34.3,8.7,27,1.4,18,1.4z"></path>
+	  </svg>
+	  <a href="/index.php?c=login" title = "登录OneNav" target="_blank" class="mdui-btn mdui-btn-icon"><i class="mdui-icon material-icons">account_circle</i></a>
+    </a>
+		</div>
+	</header>
+	<!--导航工具END-->
+	<!-- 返回顶部按钮 -->
+	<div id="top"></div>
+	<div class="top mdui-shadow-10"><a href="javascript:;" title="返回顶部" onclick="gotop()"><i class="mdui-icon material-icons">arrow_drop_up</i></div>
+	<!-- 返回顶部END -->
+		<!--左侧抽屉导航-->
+	<!-- 默认抽屉栏在左侧 -->
+	<div class="mdui-drawer" id="drawer">
+	  <ul class="mdui-list">
+	  	<?php
+			//遍历分类目录并显示
+			foreach ($categorys as $category) {
+			//var_dump($category);
+			
+		?>
+		<a href="#category-<?php echo $category['id']; ?>">
+			<li class="mdui-list-item mdui-ripple">
+				<div class="mdui-list-item-content category-name"><?php echo $category['name']; ?></div>
+			</li>
+		</a>
+	    
+		<?php } ?>
+		<a href="https://www.xiaoz.me/" target="_blank" title="小z博客">
+			<li class="mdui-list-item mdui-ripple">
+			<div class="mdui-list-item-content category-name"><i class="fa fa-user-circle"></i> About</div>
+			</li>
+		</a>
+	  </ul>
+	</div>
+	<!--左侧抽屉导航END-->
 
-<body class="page-body">
-    <!-- skin-white -->
-    <div class="page-container">
-        <div class="sidebar-menu toggle-others fixed">
-            <div class="sidebar-menu-inner">
-                <header class="logo-env">
-                    <!-- logo -->
-                    <div class="logo">
-                        <a href="/" class="logo-expanded">
-                            <!-- <img src="templates/default/assets/images/logo@2x.png" width="100%" alt="" /> -->
-                            <h1 style = "color:#0099FF;"><?php echo $site_setting['logo']; ?></h1>
-                        </a>
-                        <a href="/" class="logo-collapsed">
-                            <img src="templates/default/assets/images/logo-collapsed@2x.png" width="40" alt="" />
-                        </a>
-                    </div>
-                    <div class="mobile-menu-toggle visible-xs">
-                        <a href="#" data-toggle="user-info-menu">
-                            <i class="linecons-cog"></i>
-                        </a>
-                        <a href="#" data-toggle="mobile-menu">
-                            <i class="fa-bars"></i>
-                        </a>
-                    </div>
-                </header>
-                
-                <ul id="main-menu" class="main-menu">
-                    <?php
-                        //遍历分类目录并显示
-                        foreach ($categorys as $category) {
-                        //var_dump($category);
-                        
-                    ?>
-                    <li>
-                        <a href="#category-<?php echo $category['id']; ?>" class="smooth">
-                            
-                            <span class="title">&nbsp; <?php echo $category['name']; ?></span>
-                        </a>
-                    </li>
-                    <?php } ?>
-                    <!-- <li>
-                        <a href="#社区资讯" class="smooth">
-                            <i class="linecons-doc"></i>
-                            <span class="title">社区资讯</span>
-                        </a>
-                    </li> -->
-                    <li>
-                        <a href="https://www.xiaoz.me/about" target="_blank">
-                            <span class="title">&nbsp;<i class="fa fa-user-circle"></i> 关于本站</span>
-                        </a>
-                    </li>
-                    <!-- <div class="submit-tag">
-                        <a href="about.html">
-                            <i class="linecons-heart"></i>
-                            <span class="tooltip-blue">关于本站</span>
-                            <span class="label label-Primary pull-right hidden-collapsed">♥︎</span>
-                        </a>
-                    </div> -->
-                </ul>
-            </div>
-        </div>
-        <div class="main-content">
-            <nav class="navbar user-info-navbar" role="navigation">
-                <!-- User Info, Notifications and Menu Bar -->
-                <!-- Left links for user info navbar -->
-                <!-- <ul class="user-info-menu left-links list-inline list-unstyled">
-                    <li class="hidden-sm hidden-xs">
-                        <a href="#" data-toggle="sidebar">
-                            <i class="fa-bars"></i>
-                        </a>
-                    </li>
-                    <li class="dropdown hover-line language-switcher">
-                        <a href="../cn/index.html" class="dropdown-toggle" data-toggle="dropdown">
-                            <img src="templates/default/assets/images/flags/flag-cn.png" alt="flag-cn" /> Chinese
-                        </a>
-                        <ul class="dropdown-menu languages">
-                            <li>
-                                <a href="../en/index.html">
-                                    <img src="templates/default/assets/images/flags/flag-us.png" alt="flag-us" /> English
-                                </a>
-                            </li>
-                            <li class="active">
-                                <a href="../cn/index.html">
-                                    <img src="templates/default/assets/images/flags/flag-cn.png" alt="flag-cn" /> Chinese
-                                </a>
-                            </li>
-                        </ul>
-                    </li>
-                </ul>
-                <ul class="user-info-menu right-links list-inline list-unstyled">
-                    <li class="hidden-sm hidden-xs">
-                        <a href="https://github.com/WebStackPage/WebStackPage.github.io" target="_blank">
-                            <i class="fa-github"></i>  GitHub
-                        </a>
-                    </li>
-                </ul> -->
-                <!-- <a href="https://github.com/WebStackPage/WebStackPage.github.io" target="_blank"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a> -->
-
-            </nav>
-            <!-- 常用推荐 -->
-            <!-- 遍历分类目录 -->
+	<!--正文内容部分-->
+	<div class="mdui-container">
+		<div class="mdui-row">
+			<!-- 遍历分类目录 -->
             <?php foreach ( $categorys as $category ) {
                 $fid = $category['id'];
                 $links = get_links($fid);
@@ -141,149 +90,60 @@
                     $property = '';
                 }
             ?>
-            <h4 class="text-gray" id = "category-<?php echo $fid ?>"><?php echo $category['name']; ?> <?php echo $property; ?></h4>
-            <!-- 遍历链接 -->
-            <div class="row">
-                <?php
-                    foreach ($links as $link) {
-                        //判断是否是私有项目
-                        if( $link['property'] == 1 ) {
-                            $privacy_class = 'property';
-                        }
-                        else {
-                            $privacy_class = '';
-                        }
-                        
-                    //var_dump($link);
-                ?>
-                <div class="col-sm-3">
-                    <div class="<?php echo $privacy_class; ?> xe-widget xe-conversations box2 label-info" onclick="window.open('/index.php?c=click&id=<?php echo $link['id']; ?>', '_blank')" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="<?php echo $link['url']; ?>">
-                        <div class="xe-comment-entry">
-                            <!-- <a class="xe-user-img">
-                                <img data-src="templates/default/assets/images/logos/uisdc.png" class="lozad img-circle" width="40">
-                            </a> -->
-                            
-                            <span class="label label-info" data-toggle="tooltip" data-placement="left" title="" data-original-title="Hello I am a Tooltip"></span>
-                            <div class="xe-comment">
-                                <a href="#" class="xe-user-name overflowClip_1">
-                                <img src="https://favicon.rss.ink/v1/<?php echo base64($link['url']); ?>" alt="HUAN" width="16" height="16" />
-                                    <strong><?php echo $link['title']; ?></strong>
-                                </a>
-                                <p class="overflowClip_2"><?php echo $link['description']; ?></p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <?php } ?>
-            </div>
-            <div class="placeholder" style = "height:2em;"></div> 
-            <?php } ?>
-            
-            <br />
-            
-            <!-- END 常用推荐 -->
-                
-            
-            
-            
-
-            <!-- Main Footer -->
-            <!-- Choose between footer styles: "footer-type-1" or "footer-type-2" -->
-            <!-- Add class "sticky" to  always stick the footer to the end of page (if page contents is small) -->
-            <!-- Or class "fixed" to  always fix the footer to the end of page -->
-            <footer class="main-footer sticky footer-type-1">
-                <div class="footer-inner">
-                    <!-- Add your copyright text here -->
-                    <div class="footer-text">
-                        &copy; 2020
-                        Theme design by Viggo.
-                        Powered by <a href="https://github.com/helloxz/onenav" rel = "nofollow" target="_blank"><strong>OneNav</strong></a> | 
-                        <a href="/index.php?c=login">login</a>
-                        <!--  - Purchase for only <strong>23$</strong> -->
-                    </div>
-                    <!-- Go to Top Link, just add rel="go-top" to any link to add this functionality -->
-                    <div class="go-up">
-                        <a href="#" rel="go-top">
-                            <i class="fa-angle-up"></i>
-                        </a>
-                    </div>
-                </div>
-            </footer>
-        </div>
-    </div>
-    <!-- 锚点平滑移动 -->
-    <script type="text/javascript">
-    $(document).ready(function() {
-         //img lazy loaded
-         const observer = lozad();
-         observer.observe();
+			<div id = "category-<?php echo $category['id']; ?>" class = "mdui-col-xs-12 mdui-typo-title" style = "margin-top:1.5em;">
+				<?php echo $category['name']; ?> <?php echo $property; ?>
+				<span class = "mdui-typo-caption"><?php echo $category['description']; ?></span>
+			</div>
+			<!-- 遍历链接 -->
+			<?php
+				foreach ($links as $link) {
+					//默认描述
+					$link['description'] = empty($link['description']) ? '作者很懒，没有填写描述。' : $link['description'];
+					
+				//var_dump($link);
+			?>
+			<div class="mdui-col-lg-3 mdui-col-xs-12 link-space">
+				<!--定义一个卡片-->
+				<div class="mdui-card link-line mdui-hoverable">
+						<!-- 如果是私有链接，则显示角标 -->
+						<?php if($link['property'] == 1 ) { ?>
+						<div class="angle">
+							<span> </span>
+						</div>
+						<?php } ?>
+						<!-- 角标END -->
+						<a href="<?php echo $link['url']; ?>" target="_blank" title = "<?php echo $link['description']; ?>" class="xe-user-name overflowClip_1">
+							<div class="mdui-card-primary" style = "padding-top:16px;">
+									<div class="mdui-card-primary-title link-title">
+										<img src="https://favicon.rss.ink/v1/<?php echo base64($link['url']); ?>" alt="HUAN" width="16" height="16">
+										<span><?php echo $link['title']; ?></span> 
+									</div>
 
-        $(document).on('click', '.has-sub', function(){
-            var _this = $(this)
-            if(!$(this).hasClass('expanded')) {
-               setTimeout(function(){
-                    _this.find('ul').attr("style","")
-               }, 300);
-              
-            } else {
-                $('.has-sub ul').each(function(id,ele){
-                    var _that = $(this)
-                    if(_this.find('ul')[0] != ele) {
-                        setTimeout(function(){
-                            _that.attr("style","")
-                        }, 300);
-                    }
-                })
-            }
-        })
-        $('.user-info-menu .hidden-sm').click(function(){
-            if($('.sidebar-menu').hasClass('collapsed')) {
-                $('.has-sub.expanded > ul').attr("style","")
-            } else {
-                $('.has-sub.expanded > ul').show()
-            }
-        })
-        $("#main-menu li ul li").click(function() {
-            $(this).siblings('li').removeClass('active'); // 删除其他兄弟元素的样式
-            $(this).addClass('active'); // 添加当前元素的样式
-        });
-        $("a.smooth").click(function(ev) {
-            ev.preventDefault();
-
-            public_vars.$mainMenu.add(public_vars.$sidebarProfile).toggleClass('mobile-is-visible');
-            ps_destroy();
-            $("html, body").animate({
-                scrollTop: $($(this).attr("href")).offset().top - 30
-            }, {
-                duration: 500,
-                easing: "swing"
-            });
-        });
-        return false;
-    });
-
-    var href = "";
-    var pos = 0;
-    $("a.smooth").click(function(e) {
-        $("#main-menu li").each(function() {
-            $(this).removeClass("active");
-        });
-        $(this).parent("li").addClass("active");
-        e.preventDefault();
-        href = $(this).attr("href");
-        pos = $(href).position().top - 30;
-    });
-    </script>
-    <!-- Bottom Scripts -->
-    <script src="templates/default/assets/js/bootstrap.min.js"></script>
-    <script src="templates/default/assets/js/TweenMax.min.js"></script>
-    <script src="templates/default/assets/js/resizeable.js"></script>
-    <script src="templates/default/assets/js/joinable.js"></script>
-    <script src="templates/default/assets/js/xenon-api.js"></script>
-    <script src="templates/default/assets/js/xenon-toggles.js"></script>
-    <!-- JavaScripts initializations and stuff -->
-    <script src="templates/default/assets/js/xenon-custom.js"></script>
-    <script src="templates/default/assets/js/lozad.js"></script>
+							</div>
+						</a>
+						
+					
+					<!-- 卡片的内容 -->
+					<div class="mdui-card-content mdui-text-color-black-disabled" style="padding-top:0px;"><span class="link-content"><?php echo $link['description']; ?></span></div>
+				</div>
+				<!--卡片END-->
+			</div>
+			<?php } ?>
+			<!-- 遍历链接END -->
+			<?php } ?>
+		</div>
+	</div>
+	<div class="mdui-divider" style = "margin-top:2em;"></div>
+	<!--正文内容部分END-->
+	<!-- footer部分 -->
+	<footer>
+		© 2020 Powered by <a target = "_blank" href="https://github.com/helloxz/onenav" title = "简约导航/书签管理器" rel = "nofollow">OneNav</a>.The author is <a href="https://www.xiaoz.me/" target="_blank" title = "小z博客">xiaoz.me</a>
+	</footer>
+	<!-- footerend -->
 </body>
-
+<script>
+	//var inst = new mdui.Drawer(selector, options);
+</script>
+<script src = 'https://libs.xiaoz.top/jquery/2.2.4/jquery.min.js'></script>
+<script src="templates/<?php echo TEMPLATE; ?>/static/embed.js"></script>
 </html>
diff --git a/templates/default/static/embed.js b/templates/default/static/embed.js
new file mode 100644
index 0000000..6a6a57c
--- /dev/null
+++ b/templates/default/static/embed.js
@@ -0,0 +1,3 @@
+function gotop(){
+	$("html,body").animate({scrollTop: '0px'}, 600);
+}
\ No newline at end of file
diff --git a/templates/default/static/style.css b/templates/default/static/style.css
new file mode 100644
index 0000000..633b6f4
--- /dev/null
+++ b/templates/default/static/style.css
@@ -0,0 +1,87 @@
+.link-line {
+    font-size: 16px;
+    border-bottom: 1px solid #dddddd;
+    height:120px;
+    position:relative;
+    overflow: hidden;
+}
+.link-line .angle{
+    width:70px;
+    height:70px;
+    position: absolute;
+    background: #FF5722;
+    top:-50px;
+    right:-50px;
+    transform: rotate(45deg);
+    color:#fff;
+}
+.link-line .angle span{
+    position: absolute;
+    bottom:0;
+    display: block;
+    width:20px;
+    text-align: center;
+}
+.link-line img {
+    width: 16px;
+    height: 16px;
+    /*border-radius: 50%;*/
+    margin-right: 1px;
+    position: relative;
+    top:3px;
+}
+.link-line a{
+    color:#212121;
+    text-decoration:none;
+}
+.link-space{
+    margin-top:16px;
+}
+.link-title{
+    /*color:rgb(0,0,0);*/
+    font-size:14px;
+    font-weight:bold;
+    white-space: nowrap;
+overflow: hidden;
+text-overflow: ellipsis;
+line-height:15px;
+}
+.link-content{
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-box-orient: vertical; 
+    -webkit-line-clamp: 2; 
+    
+}
+.category-name{
+    padding-left:8px;
+}
+.category-name i {
+    padding-right:12px;
+}
+footer{
+    width:100%;
+    /* margin-top:2em; */
+    text-align:center;
+    line-height: 18px;
+    margin-top:2em;
+    margin-bottom: 2em;
+}
+footer a{
+    color:#8C9EFF;
+    text-decoration: none;
+}
+
+.top{
+	position:fixed;
+	right:10px;
+	bottom:30px;
+    z-index:99;
+    border-radius: 40px;
+    /* border:1px solid red; */
+}
+.top i{
+    font-size: 40px; color: #1E9FFF;
+    font-weight: bold;
+}
\ No newline at end of file
diff --git a/templates/default/404.html b/templates/webstack/404.html
similarity index 100%
rename from templates/default/404.html
rename to templates/webstack/404.html
diff --git a/templates/default/about.html b/templates/webstack/about.html
similarity index 100%
rename from templates/default/about.html
rename to templates/webstack/about.html
diff --git a/templates/default/assets/css/bootstrap.css b/templates/webstack/assets/css/bootstrap.css
similarity index 100%
rename from templates/default/assets/css/bootstrap.css
rename to templates/webstack/assets/css/bootstrap.css
diff --git a/templates/default/assets/css/fonts/elusive/css/animation.css b/templates/webstack/assets/css/fonts/elusive/css/animation.css
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/css/animation.css
rename to templates/webstack/assets/css/fonts/elusive/css/animation.css
diff --git a/templates/default/assets/css/fonts/elusive/css/elusive-codes.css b/templates/webstack/assets/css/fonts/elusive/css/elusive-codes.css
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/css/elusive-codes.css
rename to templates/webstack/assets/css/fonts/elusive/css/elusive-codes.css
diff --git a/templates/default/assets/css/fonts/elusive/css/elusive-embedded.css b/templates/webstack/assets/css/fonts/elusive/css/elusive-embedded.css
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/css/elusive-embedded.css
rename to templates/webstack/assets/css/fonts/elusive/css/elusive-embedded.css
diff --git a/templates/default/assets/css/fonts/elusive/css/elusive-ie7-codes.css b/templates/webstack/assets/css/fonts/elusive/css/elusive-ie7-codes.css
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/css/elusive-ie7-codes.css
rename to templates/webstack/assets/css/fonts/elusive/css/elusive-ie7-codes.css
diff --git a/templates/default/assets/css/fonts/elusive/css/elusive-ie7.css b/templates/webstack/assets/css/fonts/elusive/css/elusive-ie7.css
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/css/elusive-ie7.css
rename to templates/webstack/assets/css/fonts/elusive/css/elusive-ie7.css
diff --git a/templates/default/assets/css/fonts/elusive/css/elusive.css b/templates/webstack/assets/css/fonts/elusive/css/elusive.css
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/css/elusive.css
rename to templates/webstack/assets/css/fonts/elusive/css/elusive.css
diff --git a/templates/default/assets/css/fonts/elusive/font/elusive.eot b/templates/webstack/assets/css/fonts/elusive/font/elusive.eot
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/font/elusive.eot
rename to templates/webstack/assets/css/fonts/elusive/font/elusive.eot
diff --git a/templates/default/assets/css/fonts/elusive/font/elusive.svg b/templates/webstack/assets/css/fonts/elusive/font/elusive.svg
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/font/elusive.svg
rename to templates/webstack/assets/css/fonts/elusive/font/elusive.svg
diff --git a/templates/default/assets/css/fonts/elusive/font/elusive.ttf b/templates/webstack/assets/css/fonts/elusive/font/elusive.ttf
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/font/elusive.ttf
rename to templates/webstack/assets/css/fonts/elusive/font/elusive.ttf
diff --git a/templates/default/assets/css/fonts/elusive/font/elusive.woff b/templates/webstack/assets/css/fonts/elusive/font/elusive.woff
similarity index 100%
rename from templates/default/assets/css/fonts/elusive/font/elusive.woff
rename to templates/webstack/assets/css/fonts/elusive/font/elusive.woff
diff --git a/templates/default/assets/css/fonts/fontawesome/css/font-awesome.css b/templates/webstack/assets/css/fonts/fontawesome/css/font-awesome.css
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/css/font-awesome.css
rename to templates/webstack/assets/css/fonts/fontawesome/css/font-awesome.css
diff --git a/templates/default/assets/css/fonts/fontawesome/css/font-awesome.min.css b/templates/webstack/assets/css/fonts/fontawesome/css/font-awesome.min.css
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/css/font-awesome.min.css
rename to templates/webstack/assets/css/fonts/fontawesome/css/font-awesome.min.css
diff --git a/templates/default/assets/css/fonts/fontawesome/fonts/FontAwesome.otf b/templates/webstack/assets/css/fonts/fontawesome/fonts/FontAwesome.otf
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/fonts/FontAwesome.otf
rename to templates/webstack/assets/css/fonts/fontawesome/fonts/FontAwesome.otf
diff --git a/templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.eot b/templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.eot
rename to templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.eot
diff --git a/templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg b/templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg
rename to templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.ttf b/templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.ttf
rename to templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.woff b/templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from templates/default/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.woff
rename to templates/webstack/assets/css/fonts/fontawesome/fonts/fontawesome-webfont.woff
diff --git a/templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.eot b/templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.eot
similarity index 100%
rename from templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.eot
rename to templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.eot
diff --git a/templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg b/templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg
similarity index 100%
rename from templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg
rename to templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.svg
diff --git a/templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.ttf b/templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.ttf
similarity index 100%
rename from templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.ttf
rename to templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.ttf
diff --git a/templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.woff b/templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.woff
similarity index 100%
rename from templates/default/assets/css/fonts/glyphicons/glyphicons-halflings-regular.woff
rename to templates/webstack/assets/css/fonts/glyphicons/glyphicons-halflings-regular.woff
diff --git a/templates/default/assets/css/fonts/linecons/css/animation.css b/templates/webstack/assets/css/fonts/linecons/css/animation.css
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/css/animation.css
rename to templates/webstack/assets/css/fonts/linecons/css/animation.css
diff --git a/templates/default/assets/css/fonts/linecons/css/linecons-codes.css b/templates/webstack/assets/css/fonts/linecons/css/linecons-codes.css
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/css/linecons-codes.css
rename to templates/webstack/assets/css/fonts/linecons/css/linecons-codes.css
diff --git a/templates/default/assets/css/fonts/linecons/css/linecons-embedded.css b/templates/webstack/assets/css/fonts/linecons/css/linecons-embedded.css
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/css/linecons-embedded.css
rename to templates/webstack/assets/css/fonts/linecons/css/linecons-embedded.css
diff --git a/templates/default/assets/css/fonts/linecons/css/linecons-ie7-codes.css b/templates/webstack/assets/css/fonts/linecons/css/linecons-ie7-codes.css
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/css/linecons-ie7-codes.css
rename to templates/webstack/assets/css/fonts/linecons/css/linecons-ie7-codes.css
diff --git a/templates/default/assets/css/fonts/linecons/css/linecons-ie7.css b/templates/webstack/assets/css/fonts/linecons/css/linecons-ie7.css
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/css/linecons-ie7.css
rename to templates/webstack/assets/css/fonts/linecons/css/linecons-ie7.css
diff --git a/templates/default/assets/css/fonts/linecons/css/linecons.css b/templates/webstack/assets/css/fonts/linecons/css/linecons.css
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/css/linecons.css
rename to templates/webstack/assets/css/fonts/linecons/css/linecons.css
diff --git a/templates/default/assets/css/fonts/linecons/font/linecons.eot b/templates/webstack/assets/css/fonts/linecons/font/linecons.eot
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/font/linecons.eot
rename to templates/webstack/assets/css/fonts/linecons/font/linecons.eot
diff --git a/templates/default/assets/css/fonts/linecons/font/linecons.svg b/templates/webstack/assets/css/fonts/linecons/font/linecons.svg
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/font/linecons.svg
rename to templates/webstack/assets/css/fonts/linecons/font/linecons.svg
diff --git a/templates/default/assets/css/fonts/linecons/font/linecons.ttf b/templates/webstack/assets/css/fonts/linecons/font/linecons.ttf
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/font/linecons.ttf
rename to templates/webstack/assets/css/fonts/linecons/font/linecons.ttf
diff --git a/templates/default/assets/css/fonts/linecons/font/linecons.woff b/templates/webstack/assets/css/fonts/linecons/font/linecons.woff
similarity index 100%
rename from templates/default/assets/css/fonts/linecons/font/linecons.woff
rename to templates/webstack/assets/css/fonts/linecons/font/linecons.woff
diff --git a/templates/default/assets/css/fonts/meteocons/css/animation.css b/templates/webstack/assets/css/fonts/meteocons/css/animation.css
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/css/animation.css
rename to templates/webstack/assets/css/fonts/meteocons/css/animation.css
diff --git a/templates/default/assets/css/fonts/meteocons/css/meteocons-codes.css b/templates/webstack/assets/css/fonts/meteocons/css/meteocons-codes.css
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/css/meteocons-codes.css
rename to templates/webstack/assets/css/fonts/meteocons/css/meteocons-codes.css
diff --git a/templates/default/assets/css/fonts/meteocons/css/meteocons-embedded.css b/templates/webstack/assets/css/fonts/meteocons/css/meteocons-embedded.css
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/css/meteocons-embedded.css
rename to templates/webstack/assets/css/fonts/meteocons/css/meteocons-embedded.css
diff --git a/templates/default/assets/css/fonts/meteocons/css/meteocons-ie7-codes.css b/templates/webstack/assets/css/fonts/meteocons/css/meteocons-ie7-codes.css
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/css/meteocons-ie7-codes.css
rename to templates/webstack/assets/css/fonts/meteocons/css/meteocons-ie7-codes.css
diff --git a/templates/default/assets/css/fonts/meteocons/css/meteocons-ie7.css b/templates/webstack/assets/css/fonts/meteocons/css/meteocons-ie7.css
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/css/meteocons-ie7.css
rename to templates/webstack/assets/css/fonts/meteocons/css/meteocons-ie7.css
diff --git a/templates/default/assets/css/fonts/meteocons/css/meteocons.css b/templates/webstack/assets/css/fonts/meteocons/css/meteocons.css
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/css/meteocons.css
rename to templates/webstack/assets/css/fonts/meteocons/css/meteocons.css
diff --git a/templates/default/assets/css/fonts/meteocons/font/meteocons.eot b/templates/webstack/assets/css/fonts/meteocons/font/meteocons.eot
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/font/meteocons.eot
rename to templates/webstack/assets/css/fonts/meteocons/font/meteocons.eot
diff --git a/templates/default/assets/css/fonts/meteocons/font/meteocons.svg b/templates/webstack/assets/css/fonts/meteocons/font/meteocons.svg
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/font/meteocons.svg
rename to templates/webstack/assets/css/fonts/meteocons/font/meteocons.svg
diff --git a/templates/default/assets/css/fonts/meteocons/font/meteocons.ttf b/templates/webstack/assets/css/fonts/meteocons/font/meteocons.ttf
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/font/meteocons.ttf
rename to templates/webstack/assets/css/fonts/meteocons/font/meteocons.ttf
diff --git a/templates/default/assets/css/fonts/meteocons/font/meteocons.woff b/templates/webstack/assets/css/fonts/meteocons/font/meteocons.woff
similarity index 100%
rename from templates/default/assets/css/fonts/meteocons/font/meteocons.woff
rename to templates/webstack/assets/css/fonts/meteocons/font/meteocons.woff
diff --git a/templates/default/assets/css/nav.css b/templates/webstack/assets/css/nav.css
similarity index 100%
rename from templates/default/assets/css/nav.css
rename to templates/webstack/assets/css/nav.css
diff --git a/templates/default/assets/css/xenon-components.css b/templates/webstack/assets/css/xenon-components.css
similarity index 100%
rename from templates/default/assets/css/xenon-components.css
rename to templates/webstack/assets/css/xenon-components.css
diff --git a/templates/default/assets/css/xenon-core.css b/templates/webstack/assets/css/xenon-core.css
similarity index 100%
rename from templates/default/assets/css/xenon-core.css
rename to templates/webstack/assets/css/xenon-core.css
diff --git a/templates/default/assets/css/xenon-forms.css b/templates/webstack/assets/css/xenon-forms.css
similarity index 100%
rename from templates/default/assets/css/xenon-forms.css
rename to templates/webstack/assets/css/xenon-forms.css
diff --git a/templates/default/assets/css/xenon-skins.css b/templates/webstack/assets/css/xenon-skins.css
similarity index 100%
rename from templates/default/assets/css/xenon-skins.css
rename to templates/webstack/assets/css/xenon-skins.css
diff --git a/templates/default/assets/css/xenon.css b/templates/webstack/assets/css/xenon.css
similarity index 100%
rename from templates/default/assets/css/xenon.css
rename to templates/webstack/assets/css/xenon.css
diff --git a/templates/default/assets/images/favicon.ico b/templates/webstack/assets/images/favicon.ico
similarity index 100%
rename from templates/default/assets/images/favicon.ico
rename to templates/webstack/assets/images/favicon.ico
diff --git a/templates/default/assets/images/favicon.png b/templates/webstack/assets/images/favicon.png
similarity index 100%
rename from templates/default/assets/images/favicon.png
rename to templates/webstack/assets/images/favicon.png
diff --git a/templates/default/assets/images/flags/flag-cn.png b/templates/webstack/assets/images/flags/flag-cn.png
similarity index 100%
rename from templates/default/assets/images/flags/flag-cn.png
rename to templates/webstack/assets/images/flags/flag-cn.png
diff --git a/templates/default/assets/images/flags/flag-us.png b/templates/webstack/assets/images/flags/flag-us.png
similarity index 100%
rename from templates/default/assets/images/flags/flag-us.png
rename to templates/webstack/assets/images/flags/flag-us.png
diff --git a/templates/default/assets/images/logo-collapsed@2x.png b/templates/webstack/assets/images/logo-collapsed@2x.png
similarity index 100%
rename from templates/default/assets/images/logo-collapsed@2x.png
rename to templates/webstack/assets/images/logo-collapsed@2x.png
diff --git a/templates/default/assets/images/logo@2x.png b/templates/webstack/assets/images/logo@2x.png
similarity index 100%
rename from templates/default/assets/images/logo@2x.png
rename to templates/webstack/assets/images/logo@2x.png
diff --git a/templates/default/assets/images/logo_dark@2x.png b/templates/webstack/assets/images/logo_dark@2x.png
similarity index 100%
rename from templates/default/assets/images/logo_dark@2x.png
rename to templates/webstack/assets/images/logo_dark@2x.png
diff --git a/templates/default/assets/images/webstack_banner_cn.png b/templates/webstack/assets/images/webstack_banner_cn.png
similarity index 100%
rename from templates/default/assets/images/webstack_banner_cn.png
rename to templates/webstack/assets/images/webstack_banner_cn.png
diff --git a/templates/default/assets/images/webstack_icon_producthunt.png b/templates/webstack/assets/images/webstack_icon_producthunt.png
similarity index 100%
rename from templates/default/assets/images/webstack_icon_producthunt.png
rename to templates/webstack/assets/images/webstack_icon_producthunt.png
diff --git a/templates/default/assets/js/TweenMax.min.js b/templates/webstack/assets/js/TweenMax.min.js
similarity index 100%
rename from templates/default/assets/js/TweenMax.min.js
rename to templates/webstack/assets/js/TweenMax.min.js
diff --git a/templates/default/assets/js/bootstrap.min.js b/templates/webstack/assets/js/bootstrap.min.js
similarity index 100%
rename from templates/default/assets/js/bootstrap.min.js
rename to templates/webstack/assets/js/bootstrap.min.js
diff --git a/templates/default/assets/js/joinable.js b/templates/webstack/assets/js/joinable.js
similarity index 100%
rename from templates/default/assets/js/joinable.js
rename to templates/webstack/assets/js/joinable.js
diff --git a/templates/default/assets/js/jquery-1.11.1.min.js b/templates/webstack/assets/js/jquery-1.11.1.min.js
similarity index 100%
rename from templates/default/assets/js/jquery-1.11.1.min.js
rename to templates/webstack/assets/js/jquery-1.11.1.min.js
diff --git a/templates/default/assets/js/lozad.js b/templates/webstack/assets/js/lozad.js
similarity index 100%
rename from templates/default/assets/js/lozad.js
rename to templates/webstack/assets/js/lozad.js
diff --git a/templates/default/assets/js/resizeable.js b/templates/webstack/assets/js/resizeable.js
similarity index 100%
rename from templates/default/assets/js/resizeable.js
rename to templates/webstack/assets/js/resizeable.js
diff --git a/templates/default/assets/js/xenon-api.js b/templates/webstack/assets/js/xenon-api.js
similarity index 100%
rename from templates/default/assets/js/xenon-api.js
rename to templates/webstack/assets/js/xenon-api.js
diff --git a/templates/default/assets/js/xenon-custom.js b/templates/webstack/assets/js/xenon-custom.js
similarity index 100%
rename from templates/default/assets/js/xenon-custom.js
rename to templates/webstack/assets/js/xenon-custom.js
diff --git a/templates/default/assets/js/xenon-toggles.js b/templates/webstack/assets/js/xenon-toggles.js
similarity index 100%
rename from templates/default/assets/js/xenon-toggles.js
rename to templates/webstack/assets/js/xenon-toggles.js
diff --git a/templates/default/index.html b/templates/webstack/index.html
similarity index 100%
rename from templates/default/index.html
rename to templates/webstack/index.html
diff --git a/templates/webstack/index.php b/templates/webstack/index.php
new file mode 100644
index 0000000..e1a267f
--- /dev/null
+++ b/templates/webstack/index.php
@@ -0,0 +1,288 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+    </script>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="author" content="viggo" />
+    <title><?php echo $site_setting['title']; ?></title>
+    <meta name="keywords" content="<?php echo $site_setting['keywords']; ?>">
+    <meta name="description" content="<?php echo $site_setting['description']; ?>">
+    <link rel="shortcut icon" href="templates/<?php echo TEMPLATE; ?>/assets/images/favicon.ico">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Arimo:400,700,400italic">
+    <link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/assets/css/fonts/linecons/css/linecons.css">
+    <link rel='stylesheet' href='https://libs.xiaoz.top/font-awesome/4.7.0/css/font-awesome.css'>
+    <link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/assets/css/bootstrap.css">
+    <link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/assets/css/xenon-core.css">
+    <link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/assets/css/xenon-components.css">
+    <link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/assets/css/xenon-skins.css">
+    <link rel="stylesheet" href="templates/<?php echo TEMPLATE; ?>/assets/css/nav.css">
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/jquery-1.11.1.min.js"></script>
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+    <!-- / FB Open Graph -->
+</head>
+
+<body class="page-body">
+    <!-- skin-white -->
+    <div class="page-container">
+        <div class="sidebar-menu toggle-others fixed">
+            <div class="sidebar-menu-inner">
+                <header class="logo-env">
+                    <!-- logo -->
+                    <div class="logo">
+                        <a href="/" class="logo-expanded">
+                            <!-- <img src="templates/default/assets/images/logo@2x.png" width="100%" alt="" /> -->
+                            <h1 style = "color:#0099FF;"><?php echo $site_setting['logo']; ?></h1>
+                        </a>
+                        <a href="/" class="logo-collapsed">
+                            <img src="templates/default/assets/images/logo-collapsed@2x.png" width="40" alt="" />
+                        </a>
+                    </div>
+                    <div class="mobile-menu-toggle visible-xs">
+                        <a href="#" data-toggle="user-info-menu">
+                            <i class="linecons-cog"></i>
+                        </a>
+                        <a href="#" data-toggle="mobile-menu">
+                            <i class="fa-bars"></i>
+                        </a>
+                    </div>
+                </header>
+                
+                <ul id="main-menu" class="main-menu">
+                    <?php
+                        //遍历分类目录并显示
+                        foreach ($categorys as $category) {
+                        //var_dump($category);
+                        
+                    ?>
+                    <li>
+                        <a href="#category-<?php echo $category['id']; ?>" class="smooth">
+                            
+                            <span class="title">&nbsp; <?php echo $category['name']; ?></span>
+                        </a>
+                    </li>
+                    <?php } ?>
+                    <!-- <li>
+                        <a href="#社区资讯" class="smooth">
+                            <i class="linecons-doc"></i>
+                            <span class="title">社区资讯</span>
+                        </a>
+                    </li> -->
+                    <li>
+                        <a href="https://www.xiaoz.me/about" target="_blank">
+                            <span class="title">&nbsp;<i class="fa fa-user-circle"></i> 关于本站</span>
+                        </a>
+                    </li>
+                    <!-- <div class="submit-tag">
+                        <a href="about.html">
+                            <i class="linecons-heart"></i>
+                            <span class="tooltip-blue">关于本站</span>
+                            <span class="label label-Primary pull-right hidden-collapsed">♥︎</span>
+                        </a>
+                    </div> -->
+                </ul>
+            </div>
+        </div>
+        <div class="main-content">
+            <nav class="navbar user-info-navbar" role="navigation">
+                <!-- User Info, Notifications and Menu Bar -->
+                <!-- Left links for user info navbar -->
+                <!-- <ul class="user-info-menu left-links list-inline list-unstyled">
+                    <li class="hidden-sm hidden-xs">
+                        <a href="#" data-toggle="sidebar">
+                            <i class="fa-bars"></i>
+                        </a>
+                    </li>
+                    <li class="dropdown hover-line language-switcher">
+                        <a href="../cn/index.html" class="dropdown-toggle" data-toggle="dropdown">
+                            <img src="templates/default/assets/images/flags/flag-cn.png" alt="flag-cn" /> Chinese
+                        </a>
+                        <ul class="dropdown-menu languages">
+                            <li>
+                                <a href="../en/index.html">
+                                    <img src="templates/default/assets/images/flags/flag-us.png" alt="flag-us" /> English
+                                </a>
+                            </li>
+                            <li class="active">
+                                <a href="../cn/index.html">
+                                    <img src="templates/default/assets/images/flags/flag-cn.png" alt="flag-cn" /> Chinese
+                                </a>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+                <ul class="user-info-menu right-links list-inline list-unstyled">
+                    <li class="hidden-sm hidden-xs">
+                        <a href="https://github.com/WebStackPage/WebStackPage.github.io" target="_blank">
+                            <i class="fa-github"></i>  GitHub
+                        </a>
+                    </li>
+                </ul> -->
+                <!-- <a href="https://github.com/WebStackPage/WebStackPage.github.io" target="_blank"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a> -->
+
+            </nav>
+            <!-- 常用推荐 -->
+            <!-- 遍历分类目录 -->
+            <?php foreach ( $categorys as $category ) {
+                $fid = $category['id'];
+                $links = get_links($fid);
+                //如果分类是私有的
+                if( $category['property'] == 1 ) {
+                    $property = '<i class="fa fa-expeditedssl" style = "color:#5FB878"></i>';
+                }
+                else {
+                    $property = '';
+                }
+            ?>
+            <h4 class="text-gray" id = "category-<?php echo $fid ?>"><?php echo $category['name']; ?> <?php echo $property; ?></h4>
+            <!-- 遍历链接 -->
+            <div class="row">
+                <?php
+                    foreach ($links as $link) {
+                        //判断是否是私有项目
+                        if( $link['property'] == 1 ) {
+                            $privacy_class = 'property';
+                        }
+                        else {
+                            $privacy_class = '';
+                        }
+                        
+                    //var_dump($link);
+                ?>
+                <div class="col-sm-3">
+                    <div class="<?php echo $privacy_class; ?> xe-widget xe-conversations box2 label-info" onclick="window.open('/index.php?c=click&id=<?php echo $link['id']; ?>', '_blank')" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="<?php echo $link['url']; ?>">
+                        <div class="xe-comment-entry">
+                            <!-- <a class="xe-user-img">
+                                <img data-src="templates/default/assets/images/logos/uisdc.png" class="lozad img-circle" width="40">
+                            </a> -->
+                            
+                            <span class="label label-info" data-toggle="tooltip" data-placement="left" title="" data-original-title="Hello I am a Tooltip"></span>
+                            <div class="xe-comment">
+                                <a href="#" class="xe-user-name overflowClip_1">
+                                <img src="https://favicon.rss.ink/v1/<?php echo base64($link['url']); ?>" alt="HUAN" width="16" height="16" />
+                                    <strong><?php echo $link['title']; ?></strong>
+                                </a>
+                                <p class="overflowClip_2"><?php echo $link['description']; ?></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <?php } ?>
+            </div>
+            <div class="placeholder" style = "height:2em;"></div> 
+            <?php } ?>
+            
+            <br />
+            
+            <!-- END 常用推荐 -->
+                
+            
+            
+            
+
+            <!-- Main Footer -->
+            <!-- Choose between footer styles: "footer-type-1" or "footer-type-2" -->
+            <!-- Add class "sticky" to  always stick the footer to the end of page (if page contents is small) -->
+            <!-- Or class "fixed" to  always fix the footer to the end of page -->
+            <footer class="main-footer sticky footer-type-1">
+                <div class="footer-inner">
+                    <!-- Add your copyright text here -->
+                    <div class="footer-text">
+                        &copy; 2020
+                        Theme design by Viggo.
+                        Powered by <a href="https://github.com/helloxz/onenav" rel = "nofollow" target="_blank"><strong>OneNav</strong></a> | 
+                        <a href="/index.php?c=login">login</a>
+                        <!--  - Purchase for only <strong>23$</strong> -->
+                    </div>
+                    <!-- Go to Top Link, just add rel="go-top" to any link to add this functionality -->
+                    <div class="go-up">
+                        <a href="#" rel="go-top">
+                            <i class="fa-angle-up"></i>
+                        </a>
+                    </div>
+                </div>
+            </footer>
+        </div>
+    </div>
+    <!-- 锚点平滑移动 -->
+    <script type="text/javascript">
+    $(document).ready(function() {
+         //img lazy loaded
+         const observer = lozad();
+         observer.observe();
+
+        $(document).on('click', '.has-sub', function(){
+            var _this = $(this)
+            if(!$(this).hasClass('expanded')) {
+               setTimeout(function(){
+                    _this.find('ul').attr("style","")
+               }, 300);
+              
+            } else {
+                $('.has-sub ul').each(function(id,ele){
+                    var _that = $(this)
+                    if(_this.find('ul')[0] != ele) {
+                        setTimeout(function(){
+                            _that.attr("style","")
+                        }, 300);
+                    }
+                })
+            }
+        })
+        $('.user-info-menu .hidden-sm').click(function(){
+            if($('.sidebar-menu').hasClass('collapsed')) {
+                $('.has-sub.expanded > ul').attr("style","")
+            } else {
+                $('.has-sub.expanded > ul').show()
+            }
+        })
+        $("#main-menu li ul li").click(function() {
+            $(this).siblings('li').removeClass('active'); // 删除其他兄弟元素的样式
+            $(this).addClass('active'); // 添加当前元素的样式
+        });
+        $("a.smooth").click(function(ev) {
+            ev.preventDefault();
+
+            public_vars.$mainMenu.add(public_vars.$sidebarProfile).toggleClass('mobile-is-visible');
+            ps_destroy();
+            $("html, body").animate({
+                scrollTop: $($(this).attr("href")).offset().top - 30
+            }, {
+                duration: 500,
+                easing: "swing"
+            });
+        });
+        return false;
+    });
+
+    var href = "";
+    var pos = 0;
+    $("a.smooth").click(function(e) {
+        $("#main-menu li").each(function() {
+            $(this).removeClass("active");
+        });
+        $(this).parent("li").addClass("active");
+        e.preventDefault();
+        href = $(this).attr("href");
+        pos = $(href).position().top - 30;
+    });
+    </script>
+    <!-- Bottom Scripts -->
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/bootstrap.min.js"></script>
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/TweenMax.min.js"></script>
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/resizeable.js"></script>
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/joinable.js"></script>
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/xenon-api.js"></script>
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/xenon-toggles.js"></script>
+    <!-- JavaScripts initializations and stuff -->
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/xenon-custom.js"></script>
+    <script src="templates/<?php echo TEMPLATE; ?>/assets/js/lozad.js"></script>
+</body>
+
+</html>
diff --git a/version.txt b/version.txt
index bb1c2b8..a7f50f8 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.9.3-20201216
\ No newline at end of file
+v0.9.4-20201219
\ No newline at end of file