Merge branch 'master' of https://github.com/iapt-platform/mint

app/public/lang/zh-cn.json

@@ -325,7 +325,7 @@
 		"up_and_down": "上下对译",
 		"update_all_wbw_to_database": "全部同步至数据库",
 		"user": "用户",
-		"to_user_dictionary": "保存并添加到单词本",
+		"to_user_dictionary": "公开到社区词典",
 		"user_id": "账号",
 		"userdict": "单词本",
 		"vannana": "注释书",

app/public/lang/zh-tw.json

@@ -325,7 +325,7 @@
 		"up_and_down": "上下對譯",
 		"update_all_wbw_to_database": "所有逐詞解析資訊上傳到資料庫",
 		"user": "使用者",
-		"to_user_dictionary": "儲存並新增到單詞簿",
+		"to_user_dictionary": "公開到社羣詞典",
 		"user_id": "賬號",
 		"userdict": "使用者詞典",
 		"vannana": "註疏",

app/studio/css/style.css

@@ -4909,3 +4909,6 @@ note {
     font-size: 80%;
 	border-spacing: 0
 }
+/*#pali_canon{
+	display: none;
+}*/

app/studio/editor.php

@@ -247,12 +247,21 @@ else{$currDevice="computer";}
 	.translate_sent_head_toolbar {
 		display: none;
 	}
+	div#input_org_select{
+		position: relative;
+	}
 	div#input_org_select .case_dropbtn {
-		background-color: rgb(127 127 127 / 20%);
 		padding: 0 6px;
 		border-radius: 4px;
 		min-width: 1em;
 		min-height: 1.3em;
+		background: url(../../node_modules/bootstrap-icons/icons/chevron-double-down.svg);
+		background-repeat: no-repeat;
+		background-position-x: center;
+		background-position-y: bottom;
+		background-origin: content-box;
+		background-color: var(--main-color1);
+		white-space: nowrap;
 	}
 
 	#word_mdf_parts_dropdown  a {
@@ -262,6 +271,25 @@ else{$currDevice="computer";}
 		white-space: nowrap;
 		text-overflow: ellipsis;
 	}
+	#merge_button{
+		position: absolute;
+		left: 7em;
+		border: unset;
+		height: 6em;
+		width: 3em;
+		padding: unset;
+		transform: scaleX(0.6);
+	}
+	#merge_button>.icon{
+		fill: var(--link-color);
+	}
+
+	#merge_button:hover{
+		background: unset;
+	}
+	#merge_button:hover>.icon{
+		fill: var(--link-hover-color);
+	}
 	</style>
 	<link type="text/css" rel="stylesheet" href="css/print.css" media="print" />
 	<style id="display_set">
@@ -681,6 +709,11 @@ foreach($plugin_list as $info){
 				<div class="edit_detail_p">
 					<guide gid="studio_general_meaning">⑤</guide>
 					<span class="edit_detail_span"><?php echo $_local->gui->meaning;?>：</span>
+					<button id="merge_button" onclick="copy_part_mean_to_mean()">
+						<svg class="icon" style="transform: rotate(315deg);height: 4em;width: 6em;">
+							<use xlink="http://www.w3.org/1999/xlink" href="../../node_modules/bootstrap-icons/bootstrap-icons.svg#arrow-90deg-right">
+						</svg>
+					</button>
 					<input type="text" id="input_meaning" class="input_bar" value="" name="in_meaning">
 					<div class="case_dropdown">
 						<svg class="edit_icon">

app/studio/index.php

@@ -355,7 +355,7 @@ else{
 					</svg>
 				</a>
 			</li>
-			<li><a href="" target="_block">wikipali论坛（企劃中）</a></li>
+			<li><a href="https://iaptforum.top/" target="_block">wikipali论坛</a></li>
 			<li>
 				<!--<a href="https://github.com/iapt-platform/PCD-internet1.0#wikipali-demo" target="_block">-->
 				<?php echo $_local->gui->help_doc;?>

app/studio/js/editor.js

@@ -3270,14 +3270,15 @@ function showModifyWin(sWordId) {
 			"<button class=' apply_to' id='apply_to_this' onclick=\"modifyApply('" +
 			sWordId +
 			"',true)\"  title='Save and Favorite'>";
-		tApply += "💾&🌐";//gLocal.gui.to_user_dictionary+
+		tApply += "💾&🌐"+gLocal.gui.to_user_dictionary;
 		tApply += "</button>";
 
 		tApply +=
 			"<button class=' apply_to' id='apply_to_this' onclick=\"modifyApply('" +
 			sWordId +
 			"',false)\"  title='Save Draft'>";
-		tApply += "💾";//gLocal.gui.save+
+		tApply += "💾";//gLocal.gui.save
+		//tApply += '<svg class="icon" style="fill: var(--box-bg-color1)"><use xlink:href="../../node_modules/bootstrap-icons/bootstrap-icons.svg#translate"></use></svg>'
 		tApply += "</button>";
 
 		tApply += "<button class=' apply_to' onclick=\"modifyCancel()\">";
@@ -3489,7 +3490,7 @@ function refreshPartMeaningSelect() {
 	if (g_initPartMeaning) {
 		g_arrPartMean = part.split("+");
 	}
-	var output = "";
+	var output = "<div style='overflow-x: scroll;white-space: nowrap;max-width: 13em;'>";
 	//output="<span style='width:90%' onclick=\"input_org_switch('input_org_select','input_om')\"></span><br/>"
 	for (iPart in arrPart) {
 		output += getMeaningMenuList(iPart, arrPart[iPart]);
@@ -3499,10 +3500,10 @@ function refreshPartMeaningSelect() {
 			output += "+";
 		}
 	}
-	output += "<div>";
-	output += "<button style='margin-left:auto; padding: 1px 6px;' onclick=\"copy_part_mean_to_mean()\">";
-	output += '<svg class="icon"><use xlink="http://www.w3.org/1999/xlink" href="svg/icon.svg#ic_vertical_align_top">';
-	output += "</button>";
+	output += "</div><div>";
+	//output += "<button style='margin-left:auto; padding: 1px 6px;' onclick=\"copy_part_mean_to_mean()\">";
+	//output += '<svg class="icon"><use xlink="http://www.w3.org/1999/xlink" href="svg/icon.svg#ic_vertical_align_top">';
+	//output += "</button>";
 
 	output +=
 		"<button style='margin-left:auto; padding: 1px 6px;' onclick=\"input_org_switch('input_org_select','input_om')\">";
@@ -3526,7 +3527,7 @@ function refreshPartMeaningSelect() {
 		}
 		if (part_mean_display_array.length < arrPart.length) {
 			for (i_display = part_mean_display_array.length; i_display < arrPart.length; i_display++) {
-				document.getElementById("org_part_mean_" + i_display).innerHTML = "↓↓";
+				//document.getElementById("org_part_mean_" + i_display).innerHTML = "⬇";
 			}
 		}
 	} else {
@@ -3591,7 +3592,7 @@ function getMeaningMenuList(index, word) {
 	}
 	output += currMean + "</p>";
 
-	output += '<div class="case_dropdown-content" id=\'part_mean_menu_' + index + "'>";
+	output += '<div class="case_dropdown-content" id=\'part_mean_menu_' + index + "' style='left:0;right:0;'>";
 	//直列菜单
 	output += "<a onclick='meaningPartLookup(\"" +word +"\")'>🔍" +gLocal.gui.dict +"</a>";	
 	for (const itMean of currMeaningList) {

deploy/install.bat

@@ -1,21 +1,25 @@
-
 php ../app/install/db_insert_templet_cli.php 1 217
 php ../app/install/db_update_toc_cli.php 1 217 pali
 php ../app/install/db_update_toc_cli.php 1 217 zh-hans
 php ../app/install/db_update_toc_cli.php 1 217 zh-hant
+::耗时30min
 php ../app/install/db_insert_palitext_cli.php 1 217
 php ../app/install/db_update_palitext_cli.php 1 217
 php ../app/install/db_insert_bookword_from_csv_cli.php 1 217
+::耗时9min
 php ../app/install/db_insert_word_from_csv_cli.php 1 217
+::耗时22min
+
 php ../app/install/db_insert_wordindex_from_csv_cli.php
 php ../app/admin/word_index_weight_refresh.php 1 217
-
+::耗时51min
 php ./migaration/20211202084900_init_pali_serieses.php
 php ./migaration/20211125155600_word_statistics.php
 php ./migaration/20211125155700_pali_sent_org.php
 php ./migaration/20211125165700-pali_sent-upgrade.php
 php ./migaration/20211126220400-pali_sent_index-upgrade.php
+::耗时15min
 php ./migaration/20211127214800_sent_sim.php
 php ./migaration/20211127214900-sent_sim_index.php
-
+::耗时53min
 net time \\127.0.0.1

deploy/multi_process_install/install1.bat

@@ -0,0 +1,29 @@
+
+php ../../app/install/db_insert_templet_cli.php 1 217
+php ../../app/install/db_update_toc_cli.php 1 217 pali
+php ../../app/install/db_update_toc_cli.php 1 217 zh-hans
+php ../../app/install/db_update_toc_cli.php 1 217 zh-hant
+
+::php ../../app/install/db_insert_palitext_cli.php 1 217
+::php ../../app/install/db_update_palitext_cli.php 1 217
+
+::php ../../app/install/db_insert_bookword_from_csv_cli.php 1 217
+
+::php ../../app/install/db_insert_word_from_csv_cli.php 1 217
+
+
+::php ../../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../../app/admin/word_index_weight_refresh.php 1 217
+
+::php ./migaration/20211202084900_init_pali_serieses.php
+
+::php ./migaration/20211125155600_word_statistics.php
+
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+
+net time \\127.0.0.1

deploy/multi_process_install/install2.bat

@@ -0,0 +1,28 @@
+
+::php ../../app/install/db_insert_templet_cli.php 1 217
+::php ../../app/install/db_update_toc_cli.php 1 217 pali
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hans
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hant
+
+php ../../app/install/db_insert_palitext_cli.php 1 217
+php ../../app/install/db_update_palitext_cli.php 1 217
+php ../../app/install/db_insert_bookword_from_csv_cli.php 1 217
+
+::php ../../app/install/db_insert_word_from_csv_cli.php 1 217
+
+
+::php ../../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../../app/admin/word_index_weight_refresh.php 1 217
+
+::php ./migaration/20211202084900_init_pali_serieses.php
+
+::php ./migaration/20211125155600_word_statistics.php
+
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+
+net time \\127.0.0.1

deploy/multi_process_install/install3.bat

@@ -0,0 +1,29 @@
+
+::php ../../app/install/db_insert_templet_cli.php 1 217
+::php ../../app/install/db_update_toc_cli.php 1 217 pali
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hans
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hant
+
+::php ../../app/install/db_insert_palitext_cli.php 1 217
+::php ../../app/install/db_update_palitext_cli.php 1 217
+
+::php ../../app/install/db_insert_bookword_from_csv_cli.php 1 217
+
+php ../../app/install/db_insert_word_from_csv_cli.php 1 217
+
+
+::php ../../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../../app/admin/word_index_weight_refresh.php 1 217
+
+::php ./migaration/20211202084900_init_pali_serieses.php
+
+::php ./migaration/20211125155600_word_statistics.php
+
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+
+net time \\127.0.0.1

deploy/multi_process_install/install4.bat

@@ -0,0 +1,29 @@
+
+::php ../../app/install/db_insert_templet_cli.php 1 217
+::php ../../app/install/db_update_toc_cli.php 1 217 pali
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hans
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hant
+
+::php ../../app/install/db_insert_palitext_cli.php 1 217
+::php ../../app/install/db_update_palitext_cli.php 1 217
+
+::php ../../app/install/db_insert_bookword_from_csv_cli.php 1 217
+
+::php ../../app/install/db_insert_word_from_csv_cli.php 1 217
+
+
+php ../../app/install/db_insert_wordindex_from_csv_cli.php
+php ../../app/admin/word_index_weight_refresh.php 1 217
+
+::php ./migaration/20211202084900_init_pali_serieses.php
+
+::php ./migaration/20211125155600_word_statistics.php
+
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+
+net time \\127.0.0.1

deploy/multi_process_install/install5.bat

@@ -0,0 +1,27 @@
+
+::php ../../app/install/db_insert_templet_cli.php 1 217
+::php ../../app/install/db_update_toc_cli.php 1 217 pali
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hans
+::php ../../app/install/db_update_toc_cli.php 1 217 zh-hant
+
+::php ../../app/install/db_insert_palitext_cli.php 1 217
+::php ../../app/install/db_update_palitext_cli.php 1 217
+
+::php ../../app/install/db_insert_bookword_from_csv_cli.php 1 217
+
+::php ../../app/install/db_insert_word_from_csv_cli.php 1 217
+
+
+::php ../../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../../app/admin/word_index_weight_refresh.php 1 217
+
+php ../migaration/20211202084900_init_pali_serieses.php
+php ../migaration/20211125155600_word_statistics.php
+php ../migaration/20211125155700_pali_sent_org.php
+php ../migaration/20211125165700-pali_sent-upgrade.php
+php ../migaration/20211126220400-pali_sent_index-upgrade.php
+
+::php ./migaration/20211127214800_sent_sim.php
+::php ./migaration/20211127214900-sent_sim_index.php
+
+net time \\127.0.0.1

deploy/multi_process_install/install6.bat

@@ -0,0 +1,29 @@
+
+::php ../app/install/db_insert_templet_cli.php 1 217
+::php ../app/install/db_update_toc_cli.php 1 217 pali
+::php ../app/install/db_update_toc_cli.php 1 217 zh-hans
+::php ../app/install/db_update_toc_cli.php 1 217 zh-hant
+
+::php ../app/install/db_insert_palitext_cli.php 1 217
+::php ../app/install/db_update_palitext_cli.php 1 217
+
+::php ../app/install/db_insert_bookword_from_csv_cli.php 1 217
+
+::php ../app/install/db_insert_word_from_csv_cli.php 1 217
+
+
+::php ../app/install/db_insert_wordindex_from_csv_cli.php
+::php ../app/admin/word_index_weight_refresh.php 1 217
+
+::php ./migaration/20211202084900_init_pali_serieses.php
+
+::php ./migaration/20211125155600_word_statistics.php
+
+::php ./migaration/20211125155700_pali_sent_org.php
+::php ./migaration/20211125165700-pali_sent-upgrade.php
+::php ./migaration/20211126220400-pali_sent_index-upgrade.php
+
+php ../migaration/20211127214800_sent_sim.php
+php ../migaration/20211127214900-sent_sim_index.php
+
+net time \\127.0.0.1