Merge branch 'master' of https://github.com/visuddhinanda/mint

app/install/db_update_palitext.php

@@ -123,16 +123,17 @@ for($iPar=0;$iPar < count($title_data); $iPar++){
 	$book=$from+1;
 	$paragraph=$title_data[$iPar]["paragraph"];
 	
-	if($title_data[$iPar]["level"]==8){
+	if((int)$title_data[$iPar]["level"]==8){
 		$title_data[$iPar]["level"]=100;
-	}				
-	$curr_level=$title_data[$iPar]["level"];
-
+	}
 	
+	$curr_level=(int)$title_data[$iPar]["level"];
+	# j计算这个chapter的段落数量
 	$length=-1;
 	for($iPar1=$iPar+1;$iPar1<count($title_data); $iPar1++){
-		if($title_data[$iPar1]["level"]<=$curr_level){
-			$length=$title_data[$iPar1]["paragraph"]-$paragraph;
+		$thislevel = (int)$title_data[$iPar1]["level"];
+		if( $thislevel <= $curr_level){
+			$length=(int)$title_data[$iPar1]["paragraph"]-$paragraph;
 			break;
 		}
 	}

app/pcdl/head_bar.php

@@ -113,15 +113,16 @@
 }
 	.head_nav{
 		display: flex;
-    padding: 0 1em;
-    color: var(--btn-color);
-    font-size: 1.2em;
-    font-weight: 300;
+		padding: 0 1em;
+		color: var(--btn-color);
+		font-size: 1.2em;
+		font-weight: 300;
+		text-transform: capitalize;
 	}	
 	.head_nav li{
 		display: inline-flex;
-    padding: 0 0.5em;
-    align-items: center;
+		padding: 0 0.5em;
+		align-items: center;
 	}
 
 	.nav_link, .nav_link:link, .nav_link:visited {

app/reader/get_para.php

@@ -49,7 +49,7 @@ if($FetchParInfo){
     }
 
     //获取下级目录
-    $query = "SELECT * FROM 'pali_text'  WHERE book= ? AND (paragraph BETWEEN ?AND ? ) AND level < 100 ";
+    $query = "SELECT * FROM 'pali_text'  WHERE book= ? AND (paragraph BETWEEN ?AND ? ) AND level < 8 ";
     $output["toc"] = PDO_FetchAll($query , array($_book,$paraBegin,$paraEnd));
 
     if($FetchParInfo["chapter_strlen"]>_MAX_CHAPTER_LEN_ && $_view === "chapter" && count($output["toc"])>1){

app/reader/index.php

@@ -355,18 +355,9 @@ require_once "../pcdl/html_head.php";
 		</div>
 		<div class="fun_frame">
 			<div style="display:flex;justify-content: space-between;">
-				<div class="title"><?php echo $_local->gui->channels; ?></div>
+				<div class="title"><?php echo $_local->gui->contributor; ?></div>
 				<div class="click_dropdown_div">
-					<div class="click_dropdown_button"><?php echo $_local->gui->more; ?></div>
-					<div class="click_dropdown_content">
-						<div class="click_dropdown_content_inner" id="channal_select">
-							<?php echo $_local->gui->channels; ?>
-						</div>
-						<div>
-						<button class="icon_btn click_dropdown_ok"><?php echo $_local->gui->confirm; ?></button>
-						<button class="icon_btn click_dropdown_cancel"><?php echo $_local->gui->cancel; ?></button>
-						</div>
-					</div>	
+					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo "Multi-Select"; ?></div>
 				</div>
 			</div>
 			<div id="channal_list" class="content" style="max-height:20em;">

pali_title/203_title.csv

@@ -1,4 +1,3 @@
-id,book,par_num,level,class,title,text
 NULL,p203,1,100,centered,," Namo tassa bhagavato arahato sammāsambuddhassa"
 NULL,p203,2,100,book,,Khuddasikkhā-mūlasikkhā
 NULL,p203,3,1,chapter,Khuddasikkhā,Khuddasikkhā
@@ -3629,4 +3628,4 @@ NULL,p203,3627,100,gatha1,,"Nānātarugaṇākiṇṇe, nānākusalakāmino;"
 NULL,p203,3628,100,gathalast,,"Ramme yuddhānapatino, vihāre vasatā satā."
 NULL,p203,3629,100,gatha1,,"Sāsane siddhipattassa, siddhinā ñāṇasiddhinā;"
 NULL,p203,3630,100,gathalast,,"Paṇḍitena katā esā, mūlasikkhatthavaṇṇanā."
-NULL,p203,3631,100,centered,,Mūlasikkhā-ṭīkā samattā.
+NULL,p203,3631,100,centered,,Mūlasikkhā-ṭīkā samattā.