Merge commit 'a5ba8a673e84496300ddba87d7e35d412cf5d855'

typecho-fans · Aug 24, 2018 · 6aab22d · 6aab22d
2 parents dabc9e0 + a5ba8a6
commit 6aab22d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/AMP/Plugin.php b/AMP/Plugin.php
@@ -4,14 +4,14 @@
  *
  * @package AMP-MIP
  * @author Holmesian
- * @version 0.7.0
+ * @version 0.7.1
  * @link https://holmesian.org/AMP-for-Typecho
  */
 if (!defined('__TYPECHO_ROOT_DIR__')) exit;
 
 class AMP_Plugin implements Typecho_Plugin_Interface
 {
-    public static $version = '0.7.0';
+    public static $version = '0.7.1';
 
     public static function activate()
     {

diff --git a/AMP/templates/AMPindex.php b/AMP/templates/AMPindex.php
@@ -6,16 +6,16 @@
     <script async custom-element="amp-list" src="https://cdn.ampproject.org/v0/amp-list-0.1.js"></script>
     <script async custom-template="amp-mustache" src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js"></script>
     <script async custom-element="amp-bind" src="https://cdn.ampproject.org/v0/amp-bind-0.1.js"></script>
-    <title><?php print($this->publisher." -- AMP Version"); ?></title>
-    <link rel="canonical" href="<?php print($this->baseurl); ?>"/>
+    <title><?php echo(Helper::options()->title." -- AMP Version"); ?></title>
+    <link rel="canonical" href="<?php echo($this->baseurl); ?>"/>
     <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
     <style amp-custom>*{margin:0;padding:0}html,body{height:100%}body{background:#fff;color:#666;font-size:14px;font-family:"-apple-system","Open Sans","HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,sans-serif}::selection,::-moz-selection,::-webkit-selection{background-color:#2479cc;color:#eee}h1{font-size:1.5em}h3{font-size:1.3em}h4{font-size:1.1em}a{color:#2479cc;text-decoration:none}header{background-color:#fff;box-shadow:0 0 40px 0 rgba(0,0,0,0.1);box-sizing:border-box;font-size:14px;height:60px;padding:0 15px;position:absolute;width:100%}header a{color:#333}header h1{font-size:30px;font-weight:400;line-height:30px;margin:15px 0}footer{font-size:.9em;text-align:center;width:auto;padding: 10px;}.content{padding-top:60px}article{position:relative;padding:30px;border-top:1px solid #fff;border-bottom:1px solid #ddd}.pageinfo{font-size:15px;padding:5px;margin:5px;text-align:center}.info{background-color:#f5d09a;border:1px solid #e2e2e2;border-left:5px solid #fff000;color:#333;font-size:15px;padding:5px 10px;margin:10px 0}.nav{text-align:center;margin-bottom:-25px}.nav button{width:150px;height:25px;margin:auto;margin-bottom:20px;border-width:0;border-radius:3px;background:#1e90ff;cursor:pointer;outline:0;color:white;font-size:16px}button:hover{background:#59f}article a{font-size:2em}article p{position:relative;line-height:2em;font-size:16px;text-indent:2em;padding-top:15px}</style>
     <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style>
     <noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
 </head>
 <body>
 <header>
-    <div class="header-title"><h1><a href="<?php print($this->baseurl); ?>"><?php print($this->publisher);?></a></h1></div>
+    <div class="header-title"><h1><a href="<?php echo($this->baseurl); ?>"><?php echo(Helper::options()->title);?></a></h1></div>
 </header>
 <div></div>
 <div class="content">
@@ -58,9 +58,9 @@
                src="<?php echo Typecho_Common::url("amp/list/1", $this->baseurl);?>"
                [src]="'<?php echo Typecho_Common::url("amp/list/", $this->baseurl);?>' + pageNumber"></amp-state>
     <div><p class="info">当前页面是本站的「<a href="//www.ampproject.org/zh_cn/">Google AMP</a>」版。查看和发表评论请点击：<a
-                    href="<?php print($this->baseurl); ?>">完整版 »</a></p></div>
+                    href="<?php echo($this->baseurl); ?>">完整版 »</a></p></div>
 
-    <div class="footer"><p>© 2018 <a data-type="amp" href="https://github.com/holmesian/Typecho-AMP">AMP for Typecho</a> v<?php print($this->version); ?>
+    <div class="footer"><p>© 2018 <a data-type="amp" href="https://github.com/holmesian/Typecho-AMP">AMP for Typecho</a> v<?php echo(AMP_Plugin::$version); ?>
             , Designed by  <a href="https://holmesian.org/" target="_blank">Holmesian</a>.</p></div>
 </footer>
 </body>

diff --git a/AMP/templates/AMPpage.php b/AMP/templates/AMPpage.php
@@ -43,7 +43,7 @@
 </head>
 <body>
 <header class="header">
-    <div class="header-title"><h1><a href="<?php echo(Typecho_Common::url("ampindex/", $this->baseurl)); ?>"><?php echo($this->publisher);?></a></h1></div>
+    <div class="header-title"><h1><a href="<?php echo(Typecho_Common::url("ampindex/", $this->baseurl)); ?>"><?php echo($AMPpage['publisher']);?></a></h1></div>
 </header>
 
 <article class="post"><h1 class="title"><?php echo($AMPpage['title']); ?></h1>