#196

app/article/index.php

@@ -273,7 +273,7 @@ require_once "../pcdl/html_head.php";
 	<div id="right_pannal">
 		<div class="fun_frame">
 			<div id = "collect_title" class="title">Table of Content</div>
-			<div id = "toc_content" class="content" style="max-height:20em;">
+			<div id = "toc_content" class="content" style="max-height:25vw;">
 			</div>
 		</div>
 		<div class="fun_frame">
@@ -283,7 +283,7 @@ require_once "../pcdl/html_head.php";
 					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo "Multi-Select"; ?></div>
 				</div>
 			</div>
-			<div id="channal_list" class="content" style="max-height:20em;">
+			<div id="channal_list" class="content" style="max-height:25vw;">
 			</div>
 		</div>
 	</div>

app/public/lang/default.json

@@ -214,7 +214,7 @@
 		"num_m": "M",
 		"ok": "OK",
 		"order_by": "Order By",
-		"other": "Other",
+		"other": "Other ",
 		"other_meaning": "other meaning",
 		"otherdict": "Other Dictionary",
 		"pa_auk_dictionary": "Pa-auk Dictionary",
@@ -553,6 +553,8 @@
 		"extension": "extension",
 		"no_created": " is not created yet",
 		"create_now": "create now",
+		"only_this_para": "show this paragraph only",
+		"no": "No ",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -214,7 +214,7 @@
 		"num_m": "M",
 		"ok": "OK",
 		"order_by": "Order By",
-		"other": "Other",
+		"other": "Other ",
 		"other_meaning": "other meaning",
 		"otherdict": "Other Dictionary",
 		"pa_auk_dictionary": "Pa-auk Dictionary",
@@ -552,6 +552,8 @@
 		"extension": "extension",
 		"no_created": " is not created yet",
 		"create_now": "create now",
+		"only_this_para": "show this paragraph only",
+		"no": "No ",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -214,7 +214,7 @@
 		"num_m": "M",
 		"ok": "OK",
 		"order_by": "Order By",
-		"other": "Other",
+		"other": "Other ",
 		"other_meaning": "other meaning",
 		"otherdict": "Other Dictionary",
 		"pa_auk_dictionary": "Pa-auk Dictionary",
@@ -552,6 +552,8 @@
 		"extension": "extension",
 		"no_created": " is not created yet",
 		"create_now": "create now",
+		"only_this_para": "show this paragraph only",
+		"no": "No ",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -557,6 +557,8 @@
 		"extension": "extension",
 		"no_created": " is not created yet",
 		"create_now": "create now",
+		"only_this_para": "show this paragraph only",
+		"no": "No ",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -554,8 +554,8 @@
 		"extension": "横向对比",
 		"no_created": "尚未创建",
 		"create_now": "现在创建",
-		"": "",
-		"": "",
+		"only_this_para": "独立显示本段",
+		"no": "无",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -554,6 +554,8 @@
 		"extension": "橫向對比",
 		"no_created": "尚未建立",
 		"create_now": "現在建立",
+		"only_this_para": "獨立顯示本段",
+		"no": "無",
 		"": ""
 	},
 	"grammastr": [

app/reader/index.php

@@ -350,7 +350,7 @@ require_once "../pcdl/html_head.php";
 	<div id="right_pannal">
 		<div class="fun_frame">
 			<div id = "collect_title" class="title">Table of Content</div>
-			<div id = "toc_content" class="content" style="max-height:20em;">
+			<div id = "toc_content" class="content" style="max-height:25vw;">
 			</div>
 		</div>
 		<div class="fun_frame">
@@ -360,7 +360,7 @@ require_once "../pcdl/html_head.php";
 					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo "Multi-Select"; ?></div>
 				</div>
 			</div>
-			<div id="channal_list" class="content" style="max-height:20em;">
+			<div id="channal_list" class="content" style="max-height:25vw;">
 			</div>
 		</div>
 	</div>

app/term/expand.svg

@@ -1 +1,9 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1605398592854" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1180" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 42.666667C251.733333 42.666667 42.666667 251.733333 42.666667 512s209.066667 469.333333 469.333333 469.333333 469.333333-209.066667 469.333333-469.333333S772.266667 42.666667 512 42.666667z m0 874.666666c-221.866667 0-405.333333-179.2-405.333333-405.333333 0-221.866667 179.2-405.333333 405.333333-405.333333s405.333333 179.2 405.333333 405.333333c0 221.866667-183.466667 405.333333-405.333333 405.333333z" p-id="1181"></path><path d="M512 550.4L345.6 384 298.666667 426.666667l213.333333 213.333333 213.333333-213.333333-46.933333-42.666667z" p-id="1182"></path></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg t="1605799605417" class="icon" viewBox="0 0 1664 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1381"
+	width="200" height="200">
+	<path
+		d="M790.656 946.688c2.048 1.024 3.84 2.816 5.76 3.584a94.848 94.848 0 0 0 110.592-19.2l666.88-705.28a95.872 95.872 0 0 0-139.264-131.84L836.096 727.04 228.864 96.512A95.744 95.744 0 0 0 90.88 229.12l673.28 698.88c1.28 1.152 3.328 1.664 4.608 3.2 1.024 0.896 1.664 1.92 2.688 3.2 5.76 5.76 12.8 8.448 19.2 12.16z"
+		p-id="1382"></path>
+</svg>

app/term/note.js

@@ -63,7 +63,7 @@ function note_sent_edit_dlg_init() {
 }
 function note_init(input) {
 	let newString = input.replace(/\{\{/g, '<note info="');
-	newString = newString.replace(/\}\}/g, '"></note>');
+	newString = newString.replace(/\}\}/g, '" style="width=70vw;"></note>');
 
 	let output = "<div>";
 	output += marked(newString);
@@ -424,8 +424,7 @@ ref
 function note_json_html(in_json) {
 	let output = "";
 	output += '<div class="note_tool_bar" style=" position: relative;">';
-	output +=
-		'<div class="case_dropdown note_tool_context" style="position: absolute; right: 0;width:1.5em;text-align: right;">';
+	output += '<div class="case_dropdown note_tool_context" >';
 	output += "<svg class='icon' >";
 	output += "<use xlink:href='../studio/svg/icon.svg#ic_more'></use>";
 	output += "</svg>";
@@ -532,21 +531,21 @@ function note_json_html(in_json) {
 	output += "'>";
 	output += "<div class='tool_bar'>";
 	output += "<span class='more_tran icon_expand'></span>";
-	output += "<span>其他译文</span>";
-	output += "（<span class='other_tran_num'></span>）";
+	output += "<span class='other_tran_span'>" + gLocal.gui.other + gLocal.gui.translation + "</span>";
+	output += "<span class='other_tran_num'></span>";
 	output += "</div>";
 	output += "<div class='other_tran'>";
 
 	output += "</div>";
 	output += "</div>";
 
-	output += "<div class='bottm_tool_button ' ";
+	output += "<div class='add_new icon_add' ";
 	output += "book='" + in_json.book + "' ";
 	output += "para='" + in_json.para + "' ";
 	output += "begin='" + in_json.begin + "' ";
 	output += "end='" + in_json.end + "' ";
 	output += " style='left:0;'>";
-	output += "<div class='add_new icon_add'></div>";
+
 	//output += "<div class='more_tran icon_expand'></div>";
 	output += "</div>";
 
@@ -589,6 +588,7 @@ function set_more_button_display() {
 		}
 		if (count > 0) {
 			$(this).find(".other_tran_num").html(count);
+			$(this).find(".other_tran_num").attr("style", "display:inline-flex;");
 			$(this)
 				.find(".tool_bar")
 				.click(function () {
@@ -642,6 +642,10 @@ function set_more_button_display() {
 		} else {
 			//隐藏自己
 			//$(this).hide();
+			$(this)
+				.find(".other_tran_span")
+				.html(gLocal.gui.no + gLocal.gui.other + gLocal.gui.translation);
+			$(this).find(".more_tran").hide();
 		}
 	});
 }

app/term/term.css

@@ -42,11 +42,11 @@ chapter {
 	cursor: pointer;
 }
 chapter::after {
-	content: " > ";
+	content: " ＞ ";
 }
 chapter:hover {
 	color: var(--link-color);
-	text-decoration: underline;
+	/*text-decoration: underline;*/
 }
 para {
 	background-color: var(--drop-bg-color);
@@ -178,9 +178,16 @@ note > .palitext > note {
 
 note .ref {
 	text-align: right;
-	padding: 5px;
+	padding: 0px 5px 2px 5px;
 	font-size: 75%;
-	margin-top: -2em;
+	white-space: nowrap;
+	overflow-x: scroll;
+	width: 67vw;
+	margin-left: auto;
+	border-top: solid 1px var(--nocolor);
+}
+note:hover .ref {
+	border-top: solid 1px var(--border-line-color);
 }
 
 .tran {
@@ -296,7 +303,7 @@ r {
 }
 
 note {
-	padding: 0.5em 1em;
+	padding: 0.5em 1.5vw;
 	margin-bottom: 0.4em;
 	border-radius: 5px;
 	line-height: 1.3em;
@@ -313,10 +320,9 @@ note > .bottm_tool_button {
 note:hover > .bottm_tool_button {
 	display: block;
 }
-.bottm_tool_button > .add_new {
-	width: 30px;
-	height: 30px;
+note:hover .add_new {
 	display: inline-block;
+	position: absolute;
 }
 .tool_bar > .more_tran {
 	display: inline-block;
@@ -326,13 +332,14 @@ note:hover > .bottm_tool_button {
 }
 .icon_add {
 	width: auto;
-	min-width: 18px;
-	height: auto;
-	min-height: 18x;
+	min-width: 1.4vw;
+	height: 1.5vw;
 	cursor: pointer;
 	background: url(add.svg);
 	background-repeat: no-repeat;
 	background-size: contain;
+	display: none;
+	margin-top: -0.5em;
 }
 .icon_expand {
 	width: auto;
@@ -365,6 +372,7 @@ note:hover > .bottm_tool_button {
 	padding: 0 6px;
 	border-radius: 4px;
 	cursor: pointer;
+	display: flex;
 }
 .other_tran_div > .other_tran {
 	min-height: 1em;
@@ -427,9 +435,10 @@ note:hover .note_tool_bar {
 
 .note_tool_context {
 	position: absolute;
-	right: 0;
+	right: -1vw;
 	width: 1.5em;
 	text-align: right;
+	margin-top: -0.3em;
 }
 
 .note_tool_context .icon {
@@ -452,3 +461,18 @@ note:hover .note_tool_bar {
 	padding: 5px;
 	border-radius: 5px;
 }
+.other_tran_num {
+	-webkit-border-radius: 7px;
+	border-radius: 7px;
+	background-color: cornflowerblue;
+	position: relative;
+	min-width: 14px;
+	height: 14px;
+	display: inline-flex;
+	justify-content: center;
+	text-align: center;
+	line-height: 14px;
+	display: none;
+	margin: auto 2px;
+	color: whitesmoke;
+}