所有模块调用新的阅读器

app/pcdl/get_res_index.php

@@ -169,7 +169,7 @@ else{
 				echo "<li class='title'>可用资源</li>";
 				foreach($Fetch as $one_album){
 					$album_type=$one_album["type"];
-					$read_link="../pcdl/reader.php?book=$book&album=".$one_album["album"]."&paragraph=$paragraph";
+					$read_link="../reader/?book=$book&album=".$one_album["album"]."&paragraph=$paragraph";
 					$info_link="index_render_res_list($book,".$one_album["album"].",$paragraph)";
 					echo "<li onclick='$info_link' >";
 					echo "<span><span class='media_type'>{$media_type_short[$album_type]}</span>{$one_album["title"]}</span>";

app/pcdl/reader.php

@@ -749,7 +749,7 @@ else{
 			$FetchSim = PDO_FetchAll($query);
 			foreach ($FetchSim as $key => $value) {
 				$strSimSent .= "<div>". $value["text"]."</div>";
-				$strSimSent .= "<div><a href='../pcdl/reader.php?view=para&book={$value["book"]}&para={$value["paragraph"]}'>"._get_para_path($value["book"],$value["paragraph"])."</a></div><br/>";
+				$strSimSent .= "<div><a href='../reader/?view=para&book={$value["book"]}&para={$value["paragraph"]}'>"._get_para_path($value["book"],$value["paragraph"])."</a></div><br/>";
 			}
 		}
 	}
@@ -1090,7 +1090,7 @@ function render_sent($sent_data,$sn,$display_mode,$sent_count,$class=""){
 	<div class="content"  style='max-height:10em;' >
 		<?php
 		echo "<div>";
-		echo "<a href='../pcdl/reader.php?view={$_GET["view"]}";
+		echo "<a href='../reader/?view={$_GET["view"]}";
 		echo "&book=".$_GET["book"];
 		echo "&para=".$_GET["para"];
 		if(isset($_GET["begin"])){
@@ -1127,7 +1127,7 @@ function render_sent($sent_data,$sn,$display_mode,$sent_count,$class=""){
 			echo "<div>";
 
 			echo "<div>";
-			echo "<a href='../pcdl/reader.php?view={$_GET["view"]}";
+			echo "<a href='../reader/?view={$_GET["view"]}";
 			echo "&book=".$_GET["book"];
 			echo "&para=".$_GET["para"];
 			if(isset($_GET["begin"])){

app/reader/get_para.php

@@ -51,10 +51,10 @@ if($FetchParInfo){
     $output["toc"] = PDO_FetchAll($query , array($_book,$paraBegin,$paraEnd));
 
     if($FetchParInfo["chapter_strlen"]>_MAX_CHAPTER_LEN_ && $_view === "chapter" && count($output["toc"])>1){
-        if($output["toc"][1].paragraph-$_para>1){
+        if($output["toc"][1]["paragraph"]-$_para>1){
             # 中间有间隔
             $paraBegin = $_para;
-            $paraEnd = $output["toc"][1].paragraph-1;
+            $paraEnd = $output["toc"][1]["paragraph"]-1;
             $output["head"] = 1;
         }
         else{

app/reader/index.php

@@ -116,7 +116,7 @@ require_once "../pcdl/html_head.php";
 		flex:7;
 	}
 	#contents{
-		min-height: 400px;
+
 	}
 	#contents li{
 		white-space: normal;
@@ -229,7 +229,7 @@ require_once "../pcdl/html_head.php";
 		<span><?php echo $_local->gui->anthology; ?></span>
 		<span id="para_path"></span>
 		<span class="case_dropdown" id="para_path_next_level">
-		next
+		……
 		<div id="toc_next_menu" class="case_dropdown-content">
 		</div>
 		</span>
@@ -314,6 +314,8 @@ require_once "../pcdl/html_head.php";
 		<div id="contents">
 		<?php echo $_local->gui->loading; ?>...
 		</div>
+		<div id="contents_toc">
+		</div>
 		<div id="contents_foot">
 			<div id="contents_nav" style="display:flex;justify-content: space-between;">
 				<div id="contents_nav_left"></div>

app/reader/reader.js

@@ -26,7 +26,7 @@ function reader_load(){
             _sent_data = JSON.parse(data);
             let tpl = "";
             let currPara=0;
-            if(_sent_data.sentences.length>0){
+            if(_sent_data.sentences.length>0  ){
                 for (const iterator of _sent_data.sentences) {
                     if(currPara!=iterator.paragraph){
                         tpl +="\n";
@@ -52,13 +52,22 @@ function reader_load(){
                         tocNextMenu +="<a href='../reader/?view=chapter&book="+_reader_book+"&para="+element.paragraph+"'>"+element.toc+"</a>";
                     } 
                     $("#toc_content").html(tocHtml);
-                    $("#toc_next_menu").html(tocNextMenu);
+                    if(tocNextMenu===""){
+                        $("#para_path_next_level").hide();
+                    }
+                    else{
+                        $("#toc_next_menu").html(tocNextMenu);
+                        $("#para_path_next_level").show();                       
+                    }
+
                 }
                 
             }
-            else{
-                //仅有目录
-                tpl += "<h2>Table of Content</h2>";
+
+            
+            if(_sent_data.head==1 || _sent_data.sentences.length==0){
+                //渲染目录
+                tpl = "<h2>Table of Content</h2>";
                 if(_sent_data.toc.length>0){
                     let firstLevel = _sent_data.toc[0].level;
                     for (let index = 1; index < _sent_data.toc.length; index++) {
@@ -68,9 +77,8 @@ function reader_load(){
                         }
                     } 
                 }
-                $("#contents").html(tpl);
+                $("#contents_toc").html(tpl);
             }
-            
         }
     );
 

app/search/bold_search.php

@@ -200,7 +200,7 @@ switch($op){
 						}
 					}
 					$path=$bookPath.$path."No. ".$paragraph;
-					echo  "<div class='mean' style='font-size:120%;'><a href='../pcdl/reader.php?view=para&book={$book}&paragraph={$paragraph}' target='_blank'>$path</a></div>";
+					echo  "<div class='mean' style='font-size:120%;'><a href='../reader/?view=para&book={$book}&paragraph={$paragraph}' target='_blank'>$path</a></div>";
 								if(substr($paliword,-1)=="n"){
 									$paliword=substr($paliword,0,-1);
 								}
@@ -361,7 +361,7 @@ switch($op){
 					}
 					$path="<span>{$bookPath}>{$path} No. {$paragraph}</span>";
 					//echo  "<div class='mean'>$path</div>";
-					echo  "<div class='mean' style='font-size:120%;'><a href='../pcdl/reader.php?view=para&book={$book}&paragraph={$paragraph}' target='_blank'>$path</a></div>";
+					echo  "<div class='mean' style='font-size:120%;'><a href='../reader/?view=para&book={$book}&paragraph={$paragraph}' target='_blank'>$path</a></div>";
 
 			
 									if(substr($paliword,-1)=="n"){

app/search/paliword_search.php

@@ -217,7 +217,7 @@ switch($op){
 						}
 					}
 					$path=$path_1.$path."para. ".$paragraph;
-					echo  "<div class='mean' style='font-size:120%'><a href='../pcdl/reader.php?view=para&book={$book}&paragraph={$paragraph}' target='_blank'>$path</a></div>";
+					echo  "<div class='mean' style='font-size:120%'><a href='../reader/?view=para&book={$book}&paragraph={$paragraph}' target='_blank'>$path</a></div>";
 					
 					for($iPali=0;$iPali<$countPaliText;$iPali++){
 						if(substr($paliword,-1)=="n"){
@@ -329,7 +329,7 @@ switch($op){
 									}
 								}
 								$path=$path."No. ".$paragraph;
-								echo  "<div class='mean' style='font-size:120%;'><a href='../pcdl/reader.php?view=para&book={$book}&paragraph={$paragraph}' target='_blank' >$path</a></div>";
+								echo  "<div class='mean' style='font-size:120%;'><a href='../reader/?view=para&book={$book}&paragraph={$paragraph}' target='_blank' >$path</a></div>";
 																
 								if(substr($paliword,-1)=="n"){
 									$paliword=substr($paliword,0,-1);

app/search/title_search.php

@@ -201,7 +201,7 @@ switch($op){
 				$book=$Fetch[$i]["book"];		
 				$paragraph=$Fetch[$i]["paragraph"];							
 				echo "<div style='margin: 10px 0;padding: 5px;border-bottom: 1px solid var(--border-line-color);'>";
-				echo  "<div style='font-size: 130%;font-weight: 700;'><a href='../pcdl/reader.php?view=chapter&book={$book}&paragraph={$paragraph}' target='_blank'>$title</a></div>";		
+				echo  "<div style='font-size: 130%;font-weight: 700;'><a href='../reader/?view=chapter&book={$book}&paragraph={$paragraph}' target='_blank'>$title</a></div>";		
 
 				$bookInfo = _get_book_info($book);
 				$bookname=$bookInfo->title;

app/studio/album.php

@@ -180,7 +180,7 @@ switch($op)
 			if($iFetchText>0){
 				echo "<ul>";
 				for($i=0;$i<$iFetchText;$i++){
-					$read_link="../pcdl/reader.php?book={$book}&album={$album_id}&paragraph={$FetchText[$i]["paragraph"]}";
+					$read_link="../reader/?book={$book}&album={$album_id}&paragraph={$FetchText[$i]["paragraph"]}";
 					echo "<li class='palicannon_nav_level_{$FetchText[$i]["level"]}'><a href='{$read_link}' target='_blank'>{$FetchText[$i]["title"]}</a></li>";
 				}
 				echo "</ul>";

app/studio/js/render.js

@@ -1322,14 +1322,14 @@ function render_sent_tool_bar(elementBlock, begin) {
   if (_display_sbs == 0) {
     //逐段模式
     sentReaderLink =
-      "https://www.wikipali.org/app/pcdl/reader.php?view=para&book=" +
+      "https://www.wikipali.org/app/reader/?view=para&book=" +
       abook +
       "&para=" +
       aparagraph;
   } else {
     //逐句模式
     sentReaderLink =
-      "https://www.wikipali.org/app/pcdl/reader.php?view=sent&book=" +
+      "https://www.wikipali.org/app/reader/?view=sent&book=" +
       abook +
       "&para=" +
       aparagraph +
@@ -1355,7 +1355,7 @@ function render_sent_tool_bar(elementBlock, begin) {
   if (_display_sbs == 0) {
     //逐段模式
     output +=
-      "<button class='icon_btn'  onclick=\"window.open('../pcdl/reader.php?view=para&book=" +
+      "<button class='icon_btn'  onclick=\"window.open('../reader/?view=para&book=" +
       abook +
       "&para=" +
       aparagraph +
@@ -1365,7 +1365,7 @@ function render_sent_tool_bar(elementBlock, begin) {
   } else {
     //逐句模式
     output +=
-      "<button class='icon_btn'  onclick=\"window.open('../pcdl/reader.php?view=sent&book=" +
+      "<button class='icon_btn'  onclick=\"window.open('../reader/?view=sent&book=" +
       abook +
       "&para=" +
       aparagraph +
@@ -1666,7 +1666,7 @@ function renderWordParBlockInner(elementBlock) {
           '<svg style="fill: var(--link-color);" t="1601480724259" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4644"><path d="M791.272727 93.090909H139.636364v837.818182a93.090909 93.090909 0 0 1-93.090909-93.090909V93.090909a93.090909 93.090909 0 0 1 93.090909-93.090909h558.545454a93.090909 93.090909 0 0 1 93.090909 93.090909zM232.727273 186.181818h744.727272v837.818182H232.727273V186.181818z" p-id="4645"></path></svg>';
         output += "</button>";
         output +=
-          "<button class='icon_btn'  onclick=\"window.open('../pcdl/reader.php?view=sent&book=" +
+          "<button class='icon_btn'  onclick=\"window.open('../reader/?view=sent&book=" +
           book +
           "&para=" +
           paragraph +

app/studio/js/wizard.js

@@ -650,7 +650,7 @@ function explorer_show_res_list(book,para){
 			}
 			else{
 				arrResData[i].enable=true;
-				var read_link="../pcdl/reader.php?book="+arrResData[i].book+"&album="+arrResData[i].album_id+"&paragraph="+arrResData[i].paragraph;
+				var read_link="../reader/?book="+arrResData[i].book+"&album="+arrResData[i].album_id+"&paragraph="+arrResData[i].paragraph;
 				var check="<input type='checkbox' id='res_check_"+resCount+"' checked onclick=\"set_res_enable(this,"+i+")\" />";
 				html+=check+"["+arrResData[i].type+"]<a href='"+read_link+"' target='_blank'>"+arrResData[i].title+"</a>-"+arrResData[i].author;
 				resCount++;

app/studio/pc_get_pali_text.php

@@ -25,7 +25,7 @@ include "../public/_pdo.php";
 			echo "<div class=\"wizard_par_tools\">";
 			echo "<div class=\"wizard_par_tools_title\">";
 			echo "<input id='par_enable_$parNumber' onclick='par_enable_change($parNumber,this)' type=\"checkbox\" checked/>";				
-			echo "<a href='../pcdl/reader.php?view=para&book={$get_book}&para={$parNumber}' name='pali_text_par_$parNumber' target='_blank'>$parNumber</a><span id='par_level_$parNumber' class='par_level'></span>";
+			echo "<a href='../reader/?view=para&book={$get_book}&para={$parNumber}' name='pali_text_par_$parNumber' target='_blank'>$parNumber</a><span id='par_level_$parNumber' class='par_level'></span>";
 			echo "</div>";
 			echo "</div>";
 			echo "<div id=\"wizard_pali_par_text_$parNumber\">".$Fetch[$i]["html"]."</div>";

app/studio/project.php

@@ -937,7 +937,7 @@ switch($op){
 						</div>
 						<p><?php echo $_local->gui->open_with?>：</p>
 						<ul>
-						<li style="display:none;"><a href="../pcdl/reader.php?file=<?php echo $doc_id;?>"><?php echo $_local->gui->reader;?>（<?php echo $_local->gui->read_only;?>）</a></li>
+						<li style="display:none;"><a href="../reader/?file=<?php echo $doc_id;?>"><?php echo $_local->gui->reader;?>（<?php echo $_local->gui->read_only;?>）</a></li>
 						<?php
 						if(empty($doc_head)){
 							echo '<li><a href="../studio/project.php?op=open&doc_id='.$doc_id.'&openin=editor">复制到我的空间用编辑器打开</a></li>';

app/term/note.js

@@ -197,7 +197,7 @@ function note_refresh_new() {
             $(".palitext").click(function () {
               let sentid = $(this).parent().attr("info").split("-");
               window.open(
-                "../pcdl/reader.php?view=sent&book=" +
+                "../reader/?view=sent&book=" +
                   sentid[0] +
                   "&para=" +
                   sentid[1] +
@@ -209,7 +209,7 @@ function note_refresh_new() {
             });
             $("pali").click(function () {
               window.open(
-                "../pcdl/reader.php?view=sent&book=" +
+                "../reader/?view=sent&book=" +
                   $(this).attr("book") +
                   "&para=" +
                   $(this).attr("para") +