From 6568161485ea57535c073c494751d3277618f7eb Mon Sep 17 00:00:00 2001
From: Eyre_S <Sukazyo@outlook.com>
Date: Fri, 30 Apr 2021 12:41:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E7=9A=84=E9=94=99=E8=AF=AF=E6=8C=87=E5=90=91?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=20php=20=E7=8E=AF=E5=A2=83=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复了正文顶端的隐藏标题错误链接到站点根的问题（删除了链接）
- 修复了站点标题不能链接到站点根的问题
- 删除了 Collections 和 Chapter 的 href 标签
- 修复了 Book，Page，Segment 当激活状态的时候会错误链接到站点根的问题
  - Segment 错误是当其父 Page 激活时
  - 现在 Book 和 Page 在激活状态不会有 href 标签（即没有链接功能了）
- 在 README 中添加了需要 php-xml 插件的声明
---
 README.md                           | 4 ++++
 index.php                           | 4 ++--
 src/Element/Book.php                | 4 ++--
 src/Element/BookCollection.php      | 2 +-
 src/Element/BookContent/Chapter.php | 2 +-
 src/Element/BookContent/Page.php    | 2 +-
 src/Element/BookContent/Segment.php | 4 ++--
 src/Element/LinkCollection.php      | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index d3ca09a..7c6a897 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@
 
 下载/clone此仓库的内容，然后拖进 php 站点根目录。
 
+**要求 php 环境安装了 php-xml 插件**
+（7.0及以下旧版本可能叫做 php-dom 插件）
+（安装方法应该是能 Google 到的）
+
 对于 Apache（即 .htaccess 支持的 php 环境），可以直接运行。
 
 对于 Nginx 或者别的之类的 php 环境，需要转换一下伪静态配置，以 .htaccess 文件内的内容为依据即可。
diff --git a/index.php b/index.php
index ce9fc38..d808540 100644
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@ try {
 	<div class="book-summary">
 		<div id="book-search-input">
 			<ul id="site-name" class="summary">
-				<li class="chapter active"><a><?= SiteMeta::getBookshelf()->getSiteName() ?></a></li>
+				<li class="chapter active"><a href="."><?= SiteMeta::getBookshelf()->getSiteName() ?></a></li>
 			</ul>
 		</div>
 		<nav role="navigation">
@@ -82,7 +82,7 @@ try {
 				</div>
 				<h1>
 					<i class="fa fa-circle-o-notch fa-spin"></i>
-					<a href="."><?= PageMeta::$book->getName() ?></a>
+					<a><?= PageMeta::$book->getName() ?></a>
 				</h1>
 			</div>
 			<div class="page-wrapper" tabindex="-1" role="main">
diff --git a/src/Element/Book.php b/src/Element/Book.php
index 03e2f98..8601f76 100644
--- a/src/Element/Book.php
+++ b/src/Element/Book.php
@@ -54,7 +54,7 @@ class Book {
 	}
 	
 	public function getHtml (): string {
-		return "<li class='link" . (PageMeta::$book->getId()==$this->id?" active":"") . "'><a class='link' href='/$this->id'>$this->name</a></li>";
+		return "<li class='link" . (PageMeta::$book->getId()==$this->id?" active":"") . "'><a class='link' " . (PageMeta::$book->getId()==$this->id?"":" href='/$this->id'") . ">$this->name</a></li>";
 	}
 	
 	/**
@@ -64,4 +64,4 @@ class Book {
 		return BookContented::parseString(file_get_contents("./data/$this->id/book.xml"));
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/src/Element/BookCollection.php b/src/Element/BookCollection.php
index 9a424da..da071dd 100644
--- a/src/Element/BookCollection.php
+++ b/src/Element/BookCollection.php
@@ -72,7 +72,7 @@ class BookCollection {
 	
 	public function getHtml (): string {
 		$str = "";
-		if ($this->name != self::ROOT) $str .= "<li class='book-collection fold" . ($this->getBook(PageMeta::$book->getId())==null?"":"on") . "'><a class='book-collection' href='#'>$this->name<i class='exc-trigger fa'></i></a><ul class='book-collection summary'>";
+		if ($this->name != self::ROOT) $str .= "<li class='book-collection fold" . ($this->getBook(PageMeta::$book->getId())==null?"":" on") . "'><a class='book-collection'>$this->name<i class='exc-trigger fa'></i></a><ul class='book-collection summary'>";
 		foreach ($this->array as $node) {
 			$str .= $node->getHtml();
 		}
diff --git a/src/Element/BookContent/Chapter.php b/src/Element/BookContent/Chapter.php
index f48e262..b8abd8e 100644
--- a/src/Element/BookContent/Chapter.php
+++ b/src/Element/BookContent/Chapter.php
@@ -66,7 +66,7 @@ class Chapter {
 	
 	public function getSummaryHtml (): string {
 		$str = "";
-		if ($this->parent != null) $str .= "<li class='chapter fold" . ($this->getPage(PageMeta::$page->getId())==null?"":"on") . "'><a class='page-chapter' href='#'>$this->name<i class='exc-trigger fa'></i></a><ul class='page-chapter summary'>";
+		if ($this->parent != null) $str .= "<li class='chapter fold" . ($this->getPage(PageMeta::$page->getId())==null?"":" on") . "'><a class='page-chapter'>$this->name<i class='exc-trigger fa'></i></a><ul class='page-chapter summary'>";
 		foreach ($this->childs as $node) {
 			$str .= $node->getSummaryHtml();
 		}
diff --git a/src/Element/BookContent/Page.php b/src/Element/BookContent/Page.php
index bbe2cc3..a1ab0b8 100644
--- a/src/Element/BookContent/Page.php
+++ b/src/Element/BookContent/Page.php
@@ -72,7 +72,7 @@ class Page {
 	}
 	
 	public function getSummaryHtml (): string {
-		$str = "<li class='page-contented chapter" . (PageMeta::$page->getId()==$this->id?" active":"") . "'><a class='page-contented' href='/" . (PageMeta::$page->getId()==$this->id?"#":(PageMeta::$book->getId()."/".$this->id)) . "'>$this->name</a>";
+		$str = "<li class='page-contented chapter" . (PageMeta::$page->getId()==$this->id?" active":"") . "'><a class='page-contented' " . (PageMeta::$page->getId()==$this->id?"":(PageMeta::$book->getId()." href='/".$this->id."'")) . ">$this->name</a>";
 		if (sizeof($this->segues) > 0) {
 			$str .= "<ul class='page-contented summary'>";
 			foreach ($this->segues as $node) {
diff --git a/src/Element/BookContent/Segment.php b/src/Element/BookContent/Segment.php
index 7423fc3..d8e40dd 100644
--- a/src/Element/BookContent/Segment.php
+++ b/src/Element/BookContent/Segment.php
@@ -50,7 +50,7 @@ class Segment {
 	}
 	
 	public function getSummaryHtml (): string {
-		return "<li class='page-segment chapter'><a href='/" . (PageMeta::$page->getId()==$this->parent->getId()?"":PageMeta::$book->getId()."/".$this->parent->getId()."") . "#$this->id'>$this->name</a></li>";
+		return "<li class='page-segment chapter'><a href='" . (PageMeta::$page->getId()==$this->parent->getId()?"":"/".PageMeta::$book->getId()."/".$this->parent->getId()."") . "#$this->id'>$this->name</a></li>";
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/src/Element/LinkCollection.php b/src/Element/LinkCollection.php
index eb170fc..66ae1b8 100644
--- a/src/Element/LinkCollection.php
+++ b/src/Element/LinkCollection.php
@@ -72,7 +72,7 @@ class LinkCollection {
 	
 	public function getHtml (): string {
 		$str = "";
-		if ($this->name != self::ROOT) $str .= "<li class='link-collection fold'><a class='link-collection chapter' href='#'>$this->name<i class='exc-trigger fa'></i></a><ul class='link-collection articles'>";
+		if ($this->name != self::ROOT) $str .= "<li class='link-collection fold'><a class='link-collection chapter'>$this->name<i class='exc-trigger fa'></i></a><ul class='link-collection articles'>";
 		foreach ($this->array as $node) {
 			$str .= $node->getHtml();
 		}