Bhikkhu-Kosalla 5 年 前
コミット
17b62ba96c

+ 7 - 3
app/article/index.php

@@ -272,17 +272,21 @@ require_once "../pcdl/html_head.php";
 	</div>
 	<div id="right_pannal">
 		<div class="fun_frame">
-			<div id = "collect_title" class="title">Table of Content</div>
+			<div id = "collect_title" class="title"><?php echo $_local->gui->contents; ?></div>
 			<div id = "toc_content" class="content" style="max-height:25vw;">
 			</div>
 		</div>
 		<div class="fun_frame">
 			<div style="display:flex;justify-content: space-between;">
-				<div class="title"><?php echo $_local->gui->contributor ?></div>
+				<div class="title"><?php echo $_local->gui->contributor; ?></div>
 				<div class="click_dropdown_div">
-					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo "Multi-Select"; ?></div>
+					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo $_local->gui->select; ?></div>
 				</div>
 			</div>
+			<div class='channel_select'>
+				<button onclick='onChannelChange()'><?php echo $_local->gui->confirm; ?></button>
+				<button onclick='onChannelMultiSelectCancel()'><?php echo $_local->gui->cancel; ?></button>
+			</div>
 			<div id="channal_list" class="content" style="max-height:25vw;">
 			</div>
 		</div>

+ 2 - 1
app/public/lang/default.json

@@ -51,7 +51,7 @@
 		"computer": "Computer",
 		"confirm": "Confirm",
 		"content": "Content",
-		"contents": "Contents",
+		"contents": "Table of Content",
 		"copy": "copy",
 		"copy_to_clipboard": "copy the link to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
@@ -555,6 +555,7 @@
 		"create_now": "create now",
 		"only_this_para": "show this paragraph only",
 		"no": "No&nbsp;",
+		"select": "select",
 		"": ""
 	},
 	"grammastr": [

+ 2 - 1
app/public/lang/en.json

@@ -51,7 +51,7 @@
 		"computer": "Computer",
 		"confirm": "Confirm",
 		"content": "Content",
-		"contents": "Contents",
+		"contents": "Table of Content",
 		"copy": "copy",
 		"copy_to_clipboard": "copy the link to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
@@ -554,6 +554,7 @@
 		"create_now": "create now",
 		"only_this_para": "show this paragraph only",
 		"no": "No&nbsp;",
+		"select": "select",
 		"": ""
 	},
 	"grammastr": [

+ 2 - 1
app/public/lang/my.json

@@ -51,7 +51,7 @@
 		"computer": "Computer",
 		"confirm": "Confirm",
 		"content": "Content",
-		"contents": "Contents",
+		"contents": "Table of Content",
 		"copy": "copy",
 		"copy_to_clipboard": "copy the link to clipboard",
 		"creat_a_new_file_by_yourself": "Creat a new file by yourself",
@@ -554,6 +554,7 @@
 		"create_now": "create now",
 		"only_this_para": "show this paragraph only",
 		"no": "No&nbsp;",
+		"select": "select",
 		"": "",
 		"": ""
 	},

+ 1 - 0
app/public/lang/si.json

@@ -559,6 +559,7 @@
 		"create_now": "create now",
 		"only_this_para": "show this paragraph only",
 		"no": "No&nbsp;",
+		"select": "select",
 		"": "",
 		"": ""
 	},

+ 2 - 1
app/public/lang/zh-cn.json

@@ -49,7 +49,7 @@
 		"commentary": "注疏",
 		"completely_delete": "彻底删除",
 		"computer": "电脑",
-		"confirm": "确",
+		"confirm": "确",
 		"content": "目录",
 		"contents": "目录",
 		"copy": "复制",
@@ -556,6 +556,7 @@
 		"create_now": "现在创建",
 		"only_this_para": "独立显示本段",
 		"no": "无",
+		"select": "选择",
 		"": ""
 	},
 	"grammastr": [

+ 2 - 1
app/public/lang/zh-tw.json

@@ -49,7 +49,7 @@
 		"commentary": "註疏",
 		"completely_delete": "永久移除",
 		"computer": "電腦",
-		"confirm": "確",
+		"confirm": "確",
 		"content": "目錄",
 		"contents": "目錄",
 		"copy": "複製",
@@ -556,6 +556,7 @@
 		"create_now": "現在建立",
 		"only_this_para": "獨立顯示本段",
 		"no": "無",
+		"select": "選擇",
 		"": ""
 	},
 	"grammastr": [

+ 6 - 2
app/reader/index.php

@@ -365,7 +365,7 @@ require_once "../pcdl/html_head.php";
 	</div>
 	<div id="right_pannal">
 		<div class="fun_frame">
-			<div id = "collect_title" class="title">Table of Content</div>
+			<div id = "collect_title" class="title"><?php echo $_local->gui->contents; ?></div>
 			<div id = "toc_content" class="content" style="max-height:25vw;">
 			</div>
 		</div>
@@ -373,9 +373,13 @@ require_once "../pcdl/html_head.php";
 			<div style="display:flex;justify-content: space-between;">
 				<div class="title"><?php echo $_local->gui->contributor; ?></div>
 				<div class="click_dropdown_div">
-					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo "Multi-Select"; ?></div>
+					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo $_local->gui->select; ?></div>
 				</div>
 			</div>
+			<div class='channel_select'>
+			<button onclick='onChannelChange()'><?php echo $_local->gui->confirm; ?></button>
+				<button onclick='onChannelMultiSelectCancel()'><?php echo $_local->gui->cancel; ?></button>
+			</div>
 			<div id="channal_list" class="content" style="max-height:25vw;">
 			</div>
 		</div>

+ 5 - 3
app/studio/css/style.css

@@ -3925,9 +3925,11 @@ border-bottom: 2px solid red;
 	overflow-y: scroll;
 }
 .win_body_inner {
-	width: calc(100% + 30em);
-	height: calc(100% + 30em);
-	padding: 1em;
+	max-height: 61vh;
+	max-width: 90vw;
+	padding: 0 1em;
+	overflow-y: scroll;
+	overflow-x: scroll;
 }
 .term_win_mean {
 	color: black;

+ 42 - 20
app/studio/editor.php

@@ -156,12 +156,15 @@ else{$currDevice="computer";}
 	wnh{
 	background-color: var(--link-hover-color);
     color: var(--btn-color);
-    border-radius: 99px;
+    border-radius: 0.8em;
     cursor: pointer;
     padding: 2px;
     font-size: 80%;
     display: inline-block;
-    min-width: 1.2em;
+	min-width: 1.2em;
+	width: fit-content;
+	height: 1.2em;
+	line-height: 1.2em;
     text-align: center;
 	}	
 	#left_tool_bar {
@@ -817,23 +820,26 @@ foreach($plugin_list as $info){
 	<div id="id_text_edit_form">
 		<div id="id_text_edit_caption"  class="dialog-title">
 			<div><button id="id_text_edit_cancel" type="button" onclick="edit_tran_cancal()"><?php echo $module_gui_str['editor']['1028'];?></button></div>
-			<div><span id="id_text_edit_caption_text">Translate</span></div>
+			<div><span id="id_text_edit_caption_text">
+				<?php echo $_local->gui->translation; ?></span></div>
 			<div id="id_text_edit_bottom">
-				<button id="id_text_edit_delete" type="button" onclick="edit_tran_delete()"><?php echo $module_gui_str['editor']['1029'];?></button>
+				<button id="id_text_edit_delete" type="button" onclick="edit_tran_delete()">
+					<?php echo $_local->gui->delete;?>
+				</button>
 			</div>
-			<div><button id="id_text_edit_save" type="button" onclick="edit_tran_save()"><?php echo $module_gui_str['editor']['1027'];?></button></div>
+			<div><button id="id_text_edit_save" type="button" onclick="edit_tran_save()"><?php echo $_local->gui->save;?></button></div>
 		</div>
 		<div id="id_text_edit_info">
 			<select id="id_heading_edit_level" >
-					<option value="0"><?php echo $module_gui_str['editor']['1031'];?></option>
-					<option value="1"><?php echo $module_gui_str['editor']['1032'];?></option>
-					<option value="2"><?php echo $module_gui_str['editor']['1033'];?></option>
-					<option value="3"><?php echo $module_gui_str['editor']['1034'];?></option>
-					<option value="4"><?php echo $module_gui_str['editor']['1035'];?></option>
-					<option value="5"><?php echo $module_gui_str['editor']['1036'];?></option>
-					<option value="6"><?php echo $module_gui_str['editor']['1037'];?></option>
-					<option value="7"><?php echo $module_gui_str['editor']['1038'];?></option>
-					<option value="8"><?php echo $module_gui_str['editor']['1039'];?></option>
+					<option value="0"><?php echo $_local->gui->normal;?></option>
+					<option value="1"><?php echo $_local->gui->heading_1;?></option>
+					<option value="2"><?php echo $_local->gui->heading_2;?></option>
+					<option value="3"><?php echo $_local->gui->heading_3;?></option>
+					<option value="4"><?php echo $_local->gui->heading_4;?></option>
+					<option value="5"><?php echo $_local->gui->heading_5;?></option>
+					<option value="6"><?php echo $_local->gui->heading_6;?></option>
+					<option value="7"><?php echo $_local->gui->heading_7;?></option>
+					<option value="8"><?php echo $_local->gui->heading_8;?></option>
 			</select>
 			<select id="id_text_edit_language">
 					<option value="pali">Pali</option>
@@ -844,7 +850,7 @@ foreach($plugin_list as $info){
 			<span>
 				<?php echo $_local->gui->author;?>
 				<input type="input" id="id_text_edit_author" onkeydown="match_key(this)" onkeyup="unicode_key(this)"/>
-				<?php echo $module_gui_str['editor_project']['1042'];?>
+				<?php echo $_local->gui->smart_spell;?>
 				<input id="id_text_edit_area_smart_switch" type="checkbox" checked="">
 			</span>
 		</div>
@@ -904,14 +910,28 @@ foreach($plugin_list as $info){
 		<div class="pop_win_inner">
 			<div class="win_title">
 				<div>
-					<button onclick="win_close('term_win')">Close</button>
+					<button onclick="win_close('term_win')">
+						<svg class="button_icon" style="fill: var(--btn-hover-bg-color);">
+							<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_clear">
+							</use>
+						</svg>
+					</button>
+				</div>
+				<div>
+					<span>
+						<?php echo $_local->gui->relational_map; ?>
+					</span>
 				</div>
-				<div><span>Term</span></div>
 				<div>
-					<button onclick="term_save()">Save</button>
+					<button onclick="term_save()">
+					<svg class="button_icon" style="fill: var(--btn-hover-bg-color);">
+							<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="svg/icon.svg#ic_save">
+							</use>
+						</svg>
+					</button>
 				</div>
 			</div>
-			<div class="win_body">
+			<div class="win_body" id="term_body_parent">
 				<div class="win_body_inner" id="term_body">
 				</div>
 			</div>
@@ -930,7 +950,9 @@ foreach($plugin_list as $info){
 	<div id="word_tool_bar_div">
 		<div id="word_tool_bar" class="word_head_bar"style="font-size: 70%">
 			<button  onclick="rela_link_click()">Link</button>
-			<button  onclick="rela_link_click(false)">Cancel</button>
+			<button  onclick="rela_link_click(false)">
+				<?php echo $_local->gui->page_end; ?>
+			</button>
 		</div>
 	</div>
 	

+ 5 - 1
app/studio/js/render.js

@@ -1587,8 +1587,12 @@ function sent_show_rel_map(book, para, begin, end) {
 	}
 
 	let graph = mermaid.render("graphDiv", memind);
-	document.querySelector("#term_body").innerHTML = "<h3>" + pali_text + "</h3>" + graph;
+	document.querySelector("#term_body_parent").innerHTML = '<div class="win_body_inner" id="term_body"></div>'; //清空之前的记录
+	document.querySelector("#term_body").outerHTML =
+		"<h3 style='padding: 0 1em;'>" + pali_text + "</h3>" + document.querySelector("#term_body").outerHTML;
+	document.querySelector("#term_body").innerHTML = graph;
 	document.querySelector("#term_win").style.display = "flex";
+	document.querySelector(".win_body").style.display = "block";
 }
 
 //句子编辑块

+ 7 - 5
app/term/note.js

@@ -269,10 +269,6 @@ function note_channal_list() {
 							}
 						}
 						let strHtml = "";
-						strHtml += "<div class='channel_select'>";
-						strHtml += "<button onclick='onChannelChange()'>确定</button>";
-						strHtml += "<button onclick='onChannelMultiSelectCancel()'>取消</button>";
-						strHtml += "</div>";
 						for (const iterator of _channalData) {
 							if (_channal.indexOf(iterator.id) >= 0) {
 								strHtml += render_channal_list(iterator);
@@ -472,7 +468,7 @@ function note_json_html(in_json) {
 		//译文工具按钮开始
 		output += "<div class='tran_text_tool_botton' onclick='tool_bar_show(this)'>";
 		output +=
-			"<div class='icon_expand' style='width: 0.8em;height: 0.8em;min-width: 0.8em;min-height: 0.8em;'></div>";
+			"<div class='icon_expand' style='width: 0.8em;height: 0.8em;min-width: 0.8em;min-height: 0.8em;transition: transform 0.5s ease;'></div>";
 		//译文工具栏开始
 		output += "<div class='tran_text_tool_bar'>";
 		output += "<li class = 'tip_buttom' ";
@@ -794,7 +790,13 @@ function edit_in_studio(book, para, begin, end) {
 function tool_bar_show(element) {
 	if ($(element).find(".tran_text_tool_bar").css("display") == "none") {
 		$(element).find(".tran_text_tool_bar").show();
+		$(element).find(".icon_expand").css("transform", "rotate(-180deg)");
+		$(element).css("background-color", "var(--btn-bg-color)");
+		$(element).css("visibility", "visible");
 	} else {
 		$(element).find(".tran_text_tool_bar").hide();
+		$(element).css("background-color", "var(--nocolor)");
+		$(element).find(".icon_expand").css("transform", "unset");
+		$(element).css("visibility", "");
 	}
 }

+ 9 - 6
app/term/term.css

@@ -174,9 +174,11 @@ note > .tran > .text {
 	padding: 2px;
 	height: fit-content;
 	margin-left: -1em;
-    margin-right: 1em;
-}
+	margin-right: 1em;
+	background-color: var(--nocolor);
+	visibility: hidden;
 }
+
 .tran_text_tool_botton > .icon_expand {
 	width: 0.8em;
 	height: 0.8em;
@@ -192,7 +194,7 @@ note > .tran .tran_text_tool_bar {
 	width: auto;
 	left: -5em;
 	font-size: 14px;
-	height: 28px;
+	height: auto;
 	line-height: 28px;
 	margin-top: 1em;
 	background-color: var(--box-bg-color1);
@@ -212,8 +214,8 @@ note > .tran .tran_text_tool_bar::after {
 	border-color: transparent transparent var(--box-bg-color1) transparent;
 }
 
-.tran:hover > .tran_text_tool_bar {
-	display: block;
+.tran:hover > .tran_text_tool_botton {
+	visibility: visible;
 }
 .tran_text_tool_bar li {
 	list-style: none;
@@ -222,6 +224,7 @@ note > .tran .tran_text_tool_bar::after {
 	padding: 0 8px;
 	cursor: pointer;
 	background-color: inherit;
+	border-radius: 5px;
 }
 .tip_buttom:hover {
 	background-color: var(--btn-border-color);
@@ -337,7 +340,7 @@ note > .bottm_tool_button {
 	border-radius: 5px;
 	border: 4px dotted var(--border-line-color);
 	display: none;
-	transition: all 0.2s ease;
+	transition: all 0.3s ease;
 }
 note:hover > .bottm_tool_button {
 	display: block;

+ 1 - 0
app/widget/click_dropdown.css

@@ -1,5 +1,6 @@
 .click_dropdown_div {
 	position: relative;
+	padding: 6px;
 }
 .click_dropdown_content {
 	display: none;