Merge pull request #19 from outtimes/master

年⭐底⭐劲⭐爆 明🏮年🏮再🏮更

2 files changed, 30 insertions, 38 deletions

diff --git a/includes/footer.php b/includes/footer.php
index 66d4702..81b153d 100644
--- a/includes/footer.php
+++ b/includes/footer.php
@@ -3,9 +3,19 @@
 	<!-- Footer Information -->
     <footer>
       <div class="footer-info footer-dark">
+		<?php 
+		echo $this->options->build_time?"记录已延续了 <span id=\"build-time\"></span>":"";
+		if($faces=$this->options->anime_face){
+		$faces = explode("&&",$faces);
+		$faces = "<span class=\"anime-face\">".$faces[rand(0,count($faces))]."</span>";
+		}
+		if($faces && $this->options->build_time)echo $faces;
+		?>
 	    <p class="copyright">&copy; <?php echo date('Y'); ?> <a href="<?php $this->options->SiteUrl(); ?>"><?php $this->options->title(); ?></a>  All rights reserved.<br />
+		<?php 
+		if($faces && !$this->options->build_time)echo $faces;
+		$this->options->footerEcho(); ?>
 		Powered by <a href="http://typecho.org">Typecho</a> | Theme <a href="https://guhub.cn/p/miracles.html">Miracles</a> by <a href="https://guhub.cn">Eltrac</a></p>
-	    <?php $this->options->footerEcho(); ?>
 	  </div>
     </footer>
 	<!-- Raised Buttons -->
@@ -13,35 +23,24 @@
 	  <button title="返回顶部" class="fixed-button gotop-button" id="gotop" style="color:white;"><i class="iconfont icon-chevron-up"></i></button>
 	</div>
 	<!-- JavaScript -->
-	<?php if($this->options->CDN && $this->options->CDN=1): ?>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/jquery.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/pjax.jquery.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/jquery.fancybox.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/jquery.lazyload.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/nprogress.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/OwO.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/highlight.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/highlight-line-number.js"></script>
-	<script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/pangu.js"></script>
-	<?php if($this->options->cat!=0 || $this->options->customModel!=''): ?><script src="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/js/l2dwidget.min.js"></script><?php endif; ?>
-	<?php else: ?>
-    <script src="<?php Utils::indexTheme('assets/js/jquery.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/pjax.jquery.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/jquery.fancybox.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/jquery.lazyload.min.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/nprogress.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/OwO.min.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/highlight.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/highlight-line-number.js'); ?>"></script>
-	<script src="<?php Utils::indexTheme('assets/js/pangu.js'); ?>"></script>
-	<?php endif; ?>
+	<?php
+	$js_files=array("jquery","pjax.jquery","jquery.fancybox","jquery.lazyload.min","nprogress","OwO.min","highlight","highlight-line-number","pangu");
+	generate_require($js_files,"js",$this->options->CDN?"https://cdn.jsdelivr.net/gh/BigCoke233/miracles@":"");
+	?>
 	<!-- Varribles and Functions -->
-	<script>var allowNavAero=<?php if($this->options->navAero==0):?>true<?php else:?>false<?php endif;?>;var siteurl = '<?php $this->options->SiteUrl() ;?>';var owoJson = '<?php Utils::indexTheme('assets/OwO.json'); ?>';
+	<script>
+	var allowNavAero = <?php if($this->options->navAero):?>false<?php else:?>true<?php endif;?>;
+	var siteurl = '<?php $this->options->SiteUrl() ;?>';
+	var owoJson = '<?php Utils::indexTheme('assets/OwO.json'); ?>';
 	<?php if($this->options->pjax && $this->options->pjax!=0) :?>var loadPjax = true;
     beforePjax = function() {NProgress.start();};
 	afterPjax = function() {owoLoad();<?php $this->options->pjax_complete(); ?>};<?php endif; ?></script>
-	<!-- Script that must be after -->
+	<!-- Script that must be after-->
 	<script src="<?php Utils::indexTheme('assets/js/miracles.min.js'); ?>"></script>
+	<!-- BuildTime -->
+	<script>
+	<?php if($this->options->build_time)echo "startTime(\"".$this->options->build_time."\");" ?>
+	</script>
 	<!-- Send News and Loaders -->
 	<script><?php if($this->is('index')): ?><?php if($this->options->news==!''): ?>alertSend('公告：<?php echo $this->options->news(); ?>');<?php endif; ?><?php endif; ?><?php if($this->is('post') || $this->is('page')): ?>owoLoad();<?php endif; ?><?php $this->options->jsEcho(); ?></script>
     <!-- Others -->
diff --git a/includes/head.php b/includes/head.php
index cf25c22..1876285 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -20,6 +20,8 @@
     }
     ?>
     <title><?php Contents::title($this); ?></title>
+    <meta itemprop="name" content="<?php Contents::title($this); ?>"/>
+    <meta itemprop="image" content="<?php Utils::indexTheme('favicon.ico'); ?>" />
     <meta name="author" content="<?php $this->author(); ?>" />
     <meta name="description" content="<?php if($description != '') echo $description; else $this->excerpt(50); ?>" />
     <meta property="og:title" content="<?php Contents::title($this); ?>" />
@@ -38,19 +40,10 @@
     <?php $this->header('description=&'); ?>
 	<?php $this->options->headerEcho(); ?>
 	<!-- css -->
-	<?php if($this->options->CDN && $this->options->CDN=1): ?>
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/css/codestyle.css" />
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/css/owo.min.css" />
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/css/fancybox.css" />
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/css/prism.css" />
-	<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/BigCoke233/miracles@<?php echo themeVersion(); ?>/assets/css/main/miracles.min.css" />
-	<?php else: ?>
-	<link rel="stylesheet" href="<?php Utils::indexTheme('assets/css/codestyle.css'); ?>" />
-	<link rel="stylesheet" href="<?php Utils::indexTheme('assets/css/owo.min.css'); ?>" />
-	<link rel="stylesheet" href="<?php Utils::indexTheme('assets/css/nprogress.css'); ?>" />
-	<link rel="stylesheet" href="<?php Utils::indexTheme('assets/css/fancybox.css'); ?>" />
-	<link rel="stylesheet" href="<?php Utils::indexTheme('assets/css/main/miracles.min.css'); ?>" />
-	<?php endif; ?>
+    <?php
+	$css_files=array("codestyle","owo.min","nprogress","fancybox","main/miracles.min");
+	generate_require($css_files,"css",$this->options->CDN?"https://cdn.jsdelivr.net/gh/BigCoke233/miracles@":"");
+	?>
 	<!-- icon font -->
 	<link rel="stylesheet" href="//at.alicdn.com/t/font_1165190_t5sh6mq8n6i.css" />
 	<!-- Google Fonts -->