kosalla3-11后累计修改

app/article/mobile.css

@@ -19,3 +19,6 @@
 #head_bar {
 	flex-direction: column;
 }
+#main_view {
+	padding-top: 10em;
+}

app/article/style.css

@@ -22,10 +22,22 @@
 	border-bottom: 1px solid var(--tool-line-color);
 	padding: 10px;
 	margin-top: 50px;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 100;
+}
+#pali_pedia {
+	font-size: 200%;
+	margin-top: auto;
+	margin-bottom: auto;
+	padding-left: 0.5em;
 }
 
 .main_view {
 	padding: 0 1em;
+	padding-top: 7em;
 	max-width: 1280px;
 	margin-left: auto;
 	margin-right: auto;

app/calendar/index.html

@@ -90,6 +90,7 @@
 				list: "列表",
 				location: "所在地",
 				city_name: "城市名",
+				re_loc: "重新定位",
 			};
 			localString["zh-tw"] = {
 				and_another: "又 ",
@@ -156,6 +157,7 @@
 				list: "列表",
 				location: "所在地",
 				city_name: "城市名",
+				re_loc: "重新定位",
 			};
 			localString["default"] = {
 				and_another: " and ",
@@ -222,6 +224,7 @@
 				list: "list",
 				location: "location",
 				city_name: "city name",
+				re_loc: "relocation",
 			};
 			localString["en"] = {
 				and_another: " and ",
@@ -288,6 +291,7 @@
 				list: "list",
 				location: "location",
 				city_name: "city name",
+				re_loc: "relocation",
 			};
 			localString["my"] = {
 				and_another: " and ",
@@ -354,6 +358,7 @@
 				list: "list",
 				location: "location",
 				city_name: "city name",
+				re_loc: "relocation",
 			};
 			localString["si"] = {
 				and_another: " ච ",
@@ -420,6 +425,7 @@
 				list: "list",
 				location: "location",
 				city_name: "city name",
+				re_loc: "relocation",
 			};
 			var pali_month_name = [
 				{ id: "1", value: "jeṭṭha", season: "gimhāna", season_icon: "☀" }, //5.X-四-十五-心
@@ -1079,6 +1085,11 @@ function angle_trans(angle,type) {
 					document.write(localString[g_language].location);
 				</script>
 				<span id="city_str" onclick=""></span>
+				<button id="re_loc" onclick="getLocation()">
+					<script>
+						document.write(localString[g_language].re_loc);
+					</script>
+				</button>
 				<span id="city_info" ></span>
 				<input class="cityinput" id="citySelect" value="" style="display: none;">
 				<div class="citySelector" style="position: absolute; left: 8px; top: 25.6px; z-index: 999999;">

app/course/my_course_index.php

@@ -19,6 +19,10 @@ require_once '../studio/index_head.php';
 		color: var(--btn-color);
 		cursor:auto;
 	}
+	.summary{
+		max-height: 10em;
+		overflow-y: scroll;
+	}
 	</style>
 
 	<?php

app/dict/index.php

@@ -33,7 +33,7 @@ if (!(isset($_GET["builtin"]) && $_GET["builtin"] == 'true')) {
 			<div style="flex:6;">
 				<div>
 					<div>
-						<input id="dict_ref_search_input" type="text" autocomplete="off" placeholder="<?php echo $_local->gui->search; ?> 单词里面添加 '+' 预览拆词结果" onkeyup="dict_input_keyup(event,this)" style="" onfocus="dict_input_onfocus()" />
+						<input id="dict_ref_search_input" type="text" autocomplete="off" placeholder="<?php echo $_local->gui->dict_searching_placehold; ?> " onkeyup="dict_input_keyup(event,this)" style="" onfocus="dict_input_onfocus()" />
 					</div>
 					<div id="result_msg"></div>
 					<div id="manual_split"></div>

app/pali_sent/redis_upgrade_pali_sent.php

@@ -31,7 +31,7 @@ if (isset($argv[1])) {
 	$db_pali_sent_sim = new PDO(_FILE_DB_PALI_SENTENCE_SIM_, "", "", array(PDO::ATTR_PERSISTENT => true));
 	$db_pali_sent_sim->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
 
-    $query = "SELECT id, book,paragraph, begin,end ,text FROM pali_sent WHERE 1 ";
+    $query = "SELECT id, book,paragraph, begin,end ,html FROM pali_sent WHERE 1 ";
     $stmt = $dbh->prepare($query);
     $stmt->execute();
     $r_conn = redis_connect();
@@ -40,7 +40,7 @@ if (isset($argv[1])) {
     if ($r_conn) {
         while ($sent = $stmt->fetch(PDO::FETCH_ASSOC)) {
 			$count++;
-            $stringSize += strlen($sent["text"]);
+            $stringSize += strlen($sent["html"]);
             if ($stringSize > 50000000) {
                 sleep(1);
                 $stringSize = 0;  
@@ -48,7 +48,7 @@ if (isset($argv[1])) {
 			if($count%10000==0){
 				echo $count . "-".$sent["book"] . "_" . $sent["paragraph"] . "\n";
 			}
-			$result = $redis->hSet('pali://sent/' . $sent["book"] . "_" . $sent["paragraph"] . "_" . $sent["begin"] . "_" . $sent["end"], "pali", $sent["text"]);
+			$result = $redis->hSet('pali://sent/' . $sent["book"] . "_" . $sent["paragraph"] . "_" . $sent["begin"] . "_" . $sent["end"], "pali", $sent["html"]);
 			if($result===FALSE){
 				echo "hSet error \n";
 			}

app/palicanon/index.php

@@ -41,7 +41,11 @@ require_once '../public/function.php';
 
 	<div id="select_bar" >
 		<div id="tag_selected"></div>
-		<div><button onclick="tag_list_slide_toggle()">展开</button></div>
+		<div>
+			<button onclick="tag_list_slide_toggle(this)">
+				⮝
+			</button>
+		</div>
 	</div>
 	<div>
 

app/palicanon/palicanon.js

@@ -406,7 +406,13 @@ function sortNumber(a, b) {
 	return b - a;
 }
 
-function tag_list_slide_toggle() {
+function tag_list_slide_toggle(element) {
+	if($(element).html().indexOf("⮟")!= -1){
+		$(element).html("⮝")
+	}
+	else{
+		$(element).html("⮟")
+	}
 	$("#tag_list").slideToggle();
 }
 function chapter_back(parent) {

app/public/lang/default.json

@@ -195,7 +195,7 @@
 		"need_inform": "without informing other Bhikkhu ",
 		"new": "New",
 		"new_account": "New Account",
-		"new_project": "New Project",
+		"new_project": "New Word by Word Analysis",
 		"new_revision": "New Revision",
 		"new_technic_term": "New Technic Term",
 		"newheading": "Text Editor",
@@ -612,6 +612,8 @@
 		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
 		"teaching_course": "teaching course",
 		"watching_course": "watching course",
+		"searching_instruction": "searching instruction",
+		"dict_searching_placehold": "insert “+” into a word to search them separately",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -195,7 +195,7 @@
 		"need_inform": "without informing other Bhikkhu ",
 		"new": "New",
 		"new_account": "New Account",
-		"new_project": "New Project",
+		"new_project": "New Word by Word Analysis",
 		"new_revision": "New Revision",
 		"new_technic_term": "New Technic Term",
 		"newheading": "Text Editor",
@@ -611,6 +611,8 @@
 		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
 		"teaching_course": "teaching course",
 		"watching_course": "watching course",
+		"searching_instruction": "searching instruction",
+		"dict_searching_placehold": "insert “+” into a word to search them separately",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -195,7 +195,7 @@
 		"need_inform": "without informing other Bhikkhu ",
 		"new": "New",
 		"new_account": "New Account",
-		"new_project": "New Project",
+		"new_project": "New Word by Word Analysis",
 		"new_revision": "New Revision",
 		"new_technic_term": "New Technic Term",
 		"newheading": "Text Editor",
@@ -611,6 +611,8 @@
 		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
 		"teaching_course": "teaching course",
 		"watching_course": "watching course",
+		"searching_instruction": "searching instruction",
+		"dict_searching_placehold": "insert “+” into a word to search them separately",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/si.json

@@ -616,6 +616,8 @@
 		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
 		"teaching_course": "teaching course",
 		"watching_course": "watching course",
+		"searching_instruction": "searching instruction",
+		"dict_searching_placehold": "insert “+” into a word to search them separately",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-cn.json

@@ -196,7 +196,7 @@
 		"need_inform": "未告知其他比库",
 		"new": "新建",
 		"new_account": "注册",
-		"new_project": "新建工程",
+		"new_project": "新建逐词解析",
 		"new_revision": "新版本",
 		"new_technic_term": "新建术语",
 		"newheading": "内容编辑",
@@ -522,7 +522,7 @@
 		"channel": "版本风格",
 		"channels": "版本风格列表",
 		"like": "赞",
-		"blank": "空白",
+		"blank": "无",
 		"vocabulary_list": "词汇列表",
 		"private": "私享",
 		"private_note": "仅自己可见，不支持订阅，不可搜索",
@@ -614,6 +614,9 @@
 		"lesson_intro": "看看世界各地的巴利专家都是如何解析圣典的",
 		"teaching_course": "主讲的课程",
 		"watching_course": "关注的课程",
+		"searching_instruction": "查词指南",
+		"dict_searching_placehold": "单词里面添加“+”可分别查看查询结果",
+		"": "",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -196,7 +196,7 @@
 		"need_inform": "未告知其他同伴",
 		"new": "新建",
 		"new_account": "註冊",
-		"new_project": "新建工程",
+		"new_project": "新建逐詞解析",
 		"new_revision": "新版本",
 		"new_technic_term": "新建術語",
 		"newheading": "內容編輯",
@@ -522,7 +522,7 @@
 		"channel": "版本風格",
 		"channels": "版本風格列錶",
 		"like": "贊",
-		"blank": "空白",
+		"blank": "無",
 		"vocabulary_list": "詞彙列錶",
 		"private": "私享",
 		"private_note": "僅自己可見，不推訂閱，不可搜尋",
@@ -613,6 +613,8 @@
 		"lesson_intro": "看看世界各地的巴利專家都是如何解析聖典的",
 		"teaching_course": "主講的課程",
 		"watching_course": "關注的課程",
+		"searching_instruction": "查詞指南",
+		"dict_searching_placehold": "单词里面添加“+”可分别查看查询结果",
 		"": ""
 	},
 	"grammastr": [

app/reader/reader.js

@@ -9,6 +9,7 @@ var _author = "";
 var _display = "para";
 var arrMyTerm = new Array();
 var _sent_data = new Array();
+var link_str="";
 
 palicanon_load_term();
 
@@ -47,6 +48,7 @@ function reader_load() {
 						iterator.end +
 						"}}\n";
 				}
+				link_str=tpl;
 				$("#contents").html(note_init(tpl));
 				note_refresh_new();
 				reader_draw_para_menu();

app/reader/right_tool_bar.php

@@ -30,13 +30,15 @@
 	left: calc(100% - 30em);
 }
 #right_float_pannal > #tool_bar {
-	position: absolute;
+	/*position: absolute;*/
 	display: flex;
 	width: 100%;
 	justify-content: space-between;
 }
 #right_float_pannal > #tool_bar svg {
-	fill: var(--box-bg-color1);
+	fill: var(--bg-color);
+	height: 2em;
+	width: 2em;
 }
 #min_right_float {
 	display: none;
@@ -68,6 +70,9 @@
 				<svg class='icon'><use xlink:href='../studio/svg/icon.svg#right_expand'></use></svg>
 			</button>
 			</span>
+			<span id="tool_bar_title" style="font-size: 150%;">
+				<?php echo $_local->gui->searching_instruction; ?><guide gid="dict_search_input" init="1"></guide>
+			</span>
 			<span>
 			<button id="close_right_float" class="icon_btn" onclick="close_right_float()">
 			<svg class='icon'><use xlink:href='../studio/svg/icon.svg#cross_with_circle'></use></svg>
@@ -76,4 +81,8 @@
 		</div>
 		<iframe id="dict" src="../dict/index.php?builtin=true" name="dict" title="wikipali"></iframe>
 	</div>
-</div>				
+</div>
+
+<script>
+	guide_init();
+</script>

app/studio/editor.php

@@ -149,6 +149,10 @@ else{$currDevice="computer";}
 		padding: 0.5em 0.5em 0.1em 0.5em;
 		padding-top:0;
 	}
+	.translate_sent_head_content{
+		max-height: 17em;
+		overflow-y: scroll;
+	}
 	.translate_sent_head_content .readonly{
 		border-color: #d1d1d1;
 		background-color: #f1f1f1;		

app/studio/project.php

@@ -324,7 +324,7 @@ switch ($op) {
             if (!isset($_POST["title"])) {
                 $thisFileName = basename(__FILE__);
                 echo "<div class='fun_block'>";
-                echo "<h2>New Document 新建文档</h2>";
+                echo "<h2>{$_local->gui->new_project}</h2>";
                 echo "<form action=\"{$thisFileName}\" method=\"post\">";
                 echo "<input type='hidden' name='op' value='{$op}'/>";
                 echo "<input type='hidden' name='data' value='{$data}'/>";
@@ -362,10 +362,10 @@ switch ($op) {
                     echo '<div class="title" style="flex:2;padding-bottom:5px;">';
                     if ($FetchWBW == 0) {
                         echo $_local->gui->blank;
-                        echo "<a>快捷编辑</a>";
+                        echo "&nbsp;<a></a>";//快捷编辑？
                     } else {
                         echo $FetchWBW . $_local->gui->para;
-                        echo "<a href='../studio/editor.php?op=openchannal&book=$book&para={$paraList}&channal={$row["id"]}'>open</a>";
+                        echo "&nbsp;<a href='../studio/editor.php?op=openchannal&book=$book&para={$paraList}&channal={$row["id"]}'>{$_local->gui->open}</a>";
                     }
                     echo '</div>';
 
@@ -390,10 +390,10 @@ switch ($op) {
                 }
                 echo '<div class="file_list_row" style="padding:5px;">';
 
-                echo '<div class="pd-10"  style="max-width:2em;flex:1;">New Channal 新建频道</div>';
-                echo '<div class="title" style="flex:3;padding-bottom:5px;">';
+                echo '<div class="pd-10"  style="max-width:7em;flex:1;">'.$_local->gui->new.'&nbsp;'.$_local->gui->channel.'</div>';
+                echo '<div class="title" style="flex:3;padding-bottom:5px;display:none;">';
                 echo '在studio中新建版本风格</div>';
-                echo '<div class="author"  style="flex:1;padding-bottom:5px;"><button>New 新建</button></div>';
+                echo '<div class="author"  style="flex:1;padding-bottom:5px;"><button>'.$_local->gui->new.'</button></div>';
 
                 echo '</div>';
                 echo "</div>";
@@ -408,7 +408,7 @@ switch ($op) {
 
                 echo "</select>";
                 echo "</fieldset>";
-                echo "<input type=\"submit\" value='Create 建立'>";
+                echo "<input type=\"submit\" value='{$_local->gui->create_now}'>";
                 echo "<input type='hidden' name='format' value='db'>";
                 echo "</form>";
                 echo "</div>";

app/term/note.js

@@ -419,7 +419,7 @@ function render_channal_list(channalinfo) {
 			svg_height / 5 +
 			"' class='progress_bar_percent' style='stroke-width: 0; fill: rgb(100, 228, 100);'/>";
 		output += '<text x="0" y="' + svg_height + '" font-size="' + svg_height * 0.8 + '">';
-		output += channalinfo["count"] + "/" + channalinfo["all"];
+		output += channalinfo["count"] + "/" + channalinfo["all"]+"@"+curr_x;
 		output += "</text>";
 		output += "<svg>";
 		output += "</div>";