Browse Source

搜索默认逐段显示

Bhikkhu-Kosalla 5 năm trước cách đây
mục cha
commit
14ecfe5046

+ 1 - 1
app/pcdl/head_bar.php

@@ -478,7 +478,7 @@
 	</nav>
 	<div class="nav-right">
 		<button class="dropbtn icon_btn">
-			<a href="../search" style="height:20px;">
+			<a href="../search/paliword.php" style="height:20px;">
 				<svg t="1598275338832" class="icon" viewBox="0 0 1024 1024" style="width: 16px; height: 20px; margin:0 2px;" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="19379">
 					<path d="M441.936842 824.751158c-229.052632 0-414.989474-182.810947-414.989474-408.629895C26.947368 190.356211 212.884211 7.545263 441.936842 7.545263s414.989474 182.864842 414.989474 408.629895c0 225.818947-185.936842 408.629895-414.989474 408.629895z m0-53.894737c199.518316 0 361.094737-158.881684 361.094737-354.735158 0-195.799579-161.576421-354.735158-361.094737-354.735158S80.842105 220.429474 80.842105 416.121263c0 195.853474 161.576421 354.735158 361.094737 354.735158z" p-id="19380"></path>
 					<path d="M713.889684 740.513684a26.947368 26.947368 0 1 1 38.157474-38.103579l264.569263 264.784842a26.947368 26.947368 0 0 1-38.157474 38.103579l-264.569263-264.784842z" p-id="19381">

+ 1 - 1
app/pcdl/reader.php

@@ -653,7 +653,7 @@ else{
 			}
 		break;
 		case "sent":
-				echo "<a href='reader.php?view=para&book={$book}&para={$paragraph}'>";
+				echo "<a href='reader.php?view=para&book={$book}&para={$paragraph}&display=para'>";
 				echo "<svg t='1598083209786' class='icon' style='fill:#666666;' height='30px' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='4926'><path d='M446.464 118.784l-254.976 256c-13.312 13.312-4.096 35.84 15.36 35.84H716.8c18.432 0 28.672-22.528 15.36-35.84l-254.976-256c-9.216-8.192-22.528-8.192-30.72 0zM563.2 796.672V533.504c0-11.264-9.216-21.504-21.504-21.504H379.904c-11.264 0-21.504 9.216-21.504 21.504v366.592c0 11.264 9.216 21.504 21.504 21.504h467.968c11.264 0 21.504-9.216 21.504-21.504V839.68c0-11.264-9.216-21.504-21.504-21.504H584.704c-12.288 0-21.504-9.216-21.504-21.504z m0 21.504' p-id='4927'></path></svg>";
 				echo "{$paragraph}</a>";
 		break;

+ 2 - 2
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='../reader/?view=para&book={$book}&para={$paragraph}' target='_blank'>$path</a></div>";
+					echo  "<div class='mean' style='font-size:120%;'><a href='../reader/?view=para&book={$book}&para={$paragraph}&display=para' 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='../reader/?view=para&book={$book}&para={$paragraph}' target='_blank'>$path</a></div>";
+					echo  "<div class='mean' style='font-size:120%;'><a href='../reader/?view=para&book={$book}&para={$paragraph}&display=para' target='_blank'>$path</a></div>";
 
 			
 									if(substr($paliword,-1)=="n"){

+ 1 - 1
app/search/paliword.js

@@ -75,7 +75,7 @@ function render_word_result(worddata) {
 	let html = "";
 	html += "<div class='search_result'>";
 	let keyword = worddata.keyword;
-	let link = "<a href='../reader/?view=para&book=" + worddata.book + "&para=" + worddata.para + "' target='_blank'>";
+	let link = "<a href='../reader/?view=para&book=" + worddata.book + "&para=" + worddata.para + "&display=sent' target='_blank'>";
 	html += "<div class='title'>" + link + worddata.title + "</a></div>";
 
 	let newStr = highlightWords(worddata.palitext, keyword);

+ 2 - 2
app/search/paliword_search.php

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

+ 1 - 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='../reader/?view=chapter&book={$book}&para={$paragraph}' target='_blank'>$title</a></div>";		
+				echo  "<div style='font-size: 130%;font-weight: 700;'><a href='../reader/?view=chapter&book={$book}&para={$paragraph}&display=para' target='_blank'>$title</a></div>";		
 
 				$bookInfo = _get_book_info($book);
 				$bookname=$bookInfo->title;

+ 34 - 20
app/search/toobar.php

@@ -8,7 +8,7 @@
 	}
 
 	.lab_tab {
-		display: flex;
+
 	}
 
 	.lab_tab>li {
@@ -23,6 +23,7 @@
 		background-color: var(--tool-bg-color1);
 		border-bottom: none;
 		color: var(--tool-color1);
+		display: flex;
 	}
 
 	.search_fixed {
@@ -61,6 +62,38 @@
 </style>
 <!-- tool bar begin-->
 <div id='search_toolbar' class="search_toolbar">
+	<div style="display:block;z-index: 5;">
+			<ul id="dict_type" class="lab_tab" style="color:black;">
+				<?php
+				if (isset($_GET["key"])) {
+					$key = "?key=" . $_GET["key"];
+				} else {
+					$key = "";
+				}
+				?>
+				<li id="dt_all" style="display:none;">
+					<a href="../search/index.php<?php echo $key; ?>">
+						<span><?php echo $_local->gui->all; ?></span>
+						<span id="search_all_num"></span>
+					</a>
+				</li>
+				<li id="dt_title">
+					<a href="../search/title.php<?php echo $key; ?>">
+						<span><?php echo $_local->gui->title; ?></span>
+						<span id="search_title_num"></span>
+					</a>
+				</li>
+				<li id="dt_pali">
+					<a href="../search/paliword.php<?php echo $key; ?>">
+						<span><?php echo $_local->gui->full_text; ?></span>
+						<span id="search_palitext_num"></span>
+					</a>
+				</li>
+				<li id="dt_bold" style="display:none;"><a href="../search/bold.php<?php echo $key; ?>"><span><?php echo $_local->gui->vannana; ?></span><span id="search_bold_num"></span></a></li>
+				<li id="dt_trans" style="display:none;"><a href="../search/trans.php<?php echo $key; ?>"><span><?php echo $_local->gui->translate; ?></span><span id="search_trans_num"></span></a></li>
+			</ul>
+		</div>
+
 	<div style="display:flex;">
 		<span>
 			<svg class="small_icon" style=" width: 3em;height: 3em;">
@@ -75,25 +108,6 @@
 			<div id="pre_search_word_content" class="case_dropdown-content"></div>
 		</div>
 	</div>
-	<div style="display:block;z-index: 5;">
-		<ul id="dict_type" class="lab_tab" style="color:black;">
-			<?php
-			if (isset($_GET["key"])) {
-				$key = "?key=" . $_GET["key"];
-			} else {
-				$key = "";
-			}
-			?>
-			<li id="dt_all" style="display:none;"><a href="../search/index.php<?php echo $key; ?>"><span><?php echo $_local->gui->all; //全部
-																										?></span><span id="search_all_num"></span></a></li>
-			<li id="dt_title"><a href="../search/title.php<?php echo $key; ?>"><span><?php echo $_local->gui->title; //标题
-																					?></span><span id="search_title_num"></span></a></li>
-			<li id="dt_pali"><a href="../search/paliword.php<?php echo $key; ?>"><span><?php echo $_local->gui->full_text; //巴利原文
-																						?></span><span id="search_palitext_num"></span></a></li>
-			<li id="dt_bold"><a href="../search/bold.php<?php echo $key; ?>"><span><?php echo $_local->gui->vannana; ?></span><span id="search_bold_num"></span></a></li>
-			<li id="dt_trans" style="display:none;"><a href="../search/trans.php<?php echo $key; ?>"><span><?php echo $_local->gui->translate; ?></span><span id="search_trans_num"></span></a></li>
-		</ul>
-	</div>
 </div>
 <!--tool bar end -->