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

app/pcdl/reader.php

@@ -443,19 +443,19 @@ para:hover{
 			<div>
 				<span id="tool_bar_title"><?php echo $_local->gui->title; ?></span>
 			</div>
-			<div>
-			<form action="../studio/project.php" method="post" onsubmit="return pali_canon_edit_now(this)" target="_blank" style="display: inline-block;">
-				<div style="display:none;">
-					<input type="input" name="op" value="create">
-					<input type="hidden" name="view" value="<?php echo $_GET["view"]?>" />
-					<input type="hidden" name="book" value="<?php echo $_GET["book"]?>" />
-					<input type="hidden" id = "para" name="para" value="" />
-					<input type="hidden" id = "para_end" name="para_end" value="" />
-					<input type="hidden" id = "chapter_title" name="chapter_title" value="" />
-						<textarea id="project_new_res_data" rows="3" cols="18" name="data"></textarea>
-				</div>
-				<input type="submit" value="编辑">
-			</form>
+			<div style="display: flex;">
+				<form action="../studio/project.php" method="post" onsubmit="return pali_canon_edit_now(this)" target="_blank" style="display: inline-block;">
+					<div style="display:none;">
+						<input type="input" name="op" value="create">
+						<input type="hidden" name="view" value="<?php echo $_GET["view"]?>" />
+						<input type="hidden" name="book" value="<?php echo $_GET["book"]?>" />
+						<input type="hidden" id = "para" name="para" value="" />
+						<input type="hidden" id = "para_end" name="para_end" value="" />
+						<input type="hidden" id = "chapter_title" name="chapter_title" value="" />
+							<textarea id="project_new_res_data" rows="3" cols="18" name="data"></textarea>
+					</div>
+					<input type="submit" value="<?php echo $_local->gui->edit_now; ?>">
+				</form>
 				<div class="case_dropdown">
 					<p class="case_dropbtn"><button>
 						<svg t='1598086376923' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='8426' width='20px' height='20px'><path d='M609.745455 453.818182v130.327273h69.818181V535.272727H744.727273v377.018182h95.418182V535.272727H907.636364v48.872728h69.818181V453.818182z' p-id='8427' fill='#757AF7'></path><path d='M677.236364 300.218182V111.709091H46.545455V300.218182h69.818181v-51.2h162.909091v663.272727h165.236364V249.018182h162.909091v51.2z' p-id='8428' fill='#757AF7'></path></svg>
@@ -470,13 +470,13 @@ para:hover{
 					<svg t='1598086493824' class='icon' viewBox='0 0 1024 1024' version='1.1' xmlns='http://www.w3.org/2000/svg' p-id='9217' width='20px' height='20px'><path d='M912.695652 512m-111.304348 0a5 5 0 1 0 222.608696 0 5 5 0 1 0-222.608696 0Z' p-id='9218' fill='#757AF7'></path><path d='M512 512m-111.304348 0a5 5 0 1 0 222.608696 0 5 5 0 1 0-222.608696 0Z' p-id='9219' fill='#757AF7'></path><path d='M111.304348 512m-111.304348 0a5 5 0 1 0 222.608696 0 5 5 0 1 0-222.608696 0Z' p-id='9220' fill='#757AF7'></path></svg>
 					</button></p>
 					<div class="case_dropdown-content" style="right: 2em;min-width:6em;">
-						<a onclick="tool_changed('dighest')">书摘</a>
-						<a onclick="tool_changed('comments')">批注</a>
-						<a onclick="tool_changed('target')">标签</a>
-						<a onclick="tool_changed('layout')">布局</a>
-						<a onclick="tool_changed('porpername')">术语</a>
-						<a onclick="tool_changed('share')">分享</a>		
-						<a onclick="tool_changed('fix')">修改</a>								
+						<a onclick="tool_changed('dighest')"><?php echo $_local->gui->digest; //书摘?></a>
+						<a onclick="tool_changed('comments')"><?php echo $_local->gui->comment; //批注?></a>
+						<a onclick="tool_changed('target')"><?php echo $_local->gui->tag; //标签?></a>
+						<a onclick="tool_changed('layout')"><?php echo $_local->gui->layout; //布局?></a>
+						<a onclick="tool_changed('porpername')"><?php echo $_local->gui->dict_terms; //术语?></a>
+						<a onclick="tool_changed('share')"><?php echo $_local->gui->share; //分享?></a>		
+						<a onclick="tool_changed('fix')"><?php echo $_local->gui->modify; //修改?></a>								
 					</div>
 				</div>			
 			

app/public/lang/default.json

@@ -84,7 +84,7 @@
 		"each_sentence": "E sentence",
 		"eat": "eat",
 		"edit": "Edit",
-		"edit_now": "Edit Now",
+		"edit_now": "Edit in Studio",
 		"edit1": "Edited By ",
 		"edition": "Edition ",
 		"editor": "Editor",
@@ -457,6 +457,12 @@
 		"preference": "preference",
 		"appearance": "appearance",
 		"theme": "theme",
+		"first_choice_word": "first-choice term",
+		"pali_word": "pali word",
+		"required": "required",
+		"optional": "optional",
+		"comment": "comments",
+		"my_term": "my term",
 		"": ""
 	},
 	"grammastr": [
@@ -806,6 +812,10 @@
 			"id": ".pron.",
 			"value": "pron."
 		},
+		{
+			"id": ".note.",
+			"value": "original"
+		},
 		{
 			"id": ".num.",
 			"value": "num."

app/public/lang/en.json

@@ -84,7 +84,7 @@
 		"each_sentence": "E sentence",
 		"eat": "eat",
 		"edit": "Edit",
-		"edit_now": "Edit Now",
+		"edit_now": "Edit in Studio",
 		"edit1": "Edited By ",
 		"edition": "Edition",
 		"editor": "Editor",
@@ -456,6 +456,12 @@
 		"preference": "preference",
 		"appearance": "appearance",
 		"theme": "theme",
+		"first_choice_word": "first-choice term",
+		"pali_word": "pali word",
+		"required": "required",
+		"optional": "optional",
+		"comment": "comments",
+		"my_term": "my term",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -84,7 +84,7 @@
 		"each_sentence": "E sentence",
 		"eat": "eat",
 		"edit": "Edit",
-		"edit_now": "Edit Now",
+		"edit_now": "Edit in Studio",
 		"edit1": "Edited By ",
 		"edition": "Edition ",
 		"editor": "Editor",
@@ -456,6 +456,12 @@
 		"preference": "preference",
 		"appearance": "appearance",
 		"theme": "theme",
+		"first_choice_word": "first-choice term",
+		"pali_word": "pali word",
+		"required": "required",
+		"optional": "optional",
+		"comment": "comments",
+		"my_term": "my term",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -461,6 +461,12 @@
 		"preference": "preference",
 		"appearance": "appearance",
 		"theme": "theme",
+		"first_choice_word": "first-choice term",
+		"pali_word": "pali word",
+		"required": "required",
+		"optional": "optional",
+		"comment": "comments",
+		"my_term": "my term",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -84,7 +84,7 @@
 		"each_sentence": "逐句",
 		"eat": "进餐",
 		"edit": "编辑",
-		"edit_now": "立即编辑",
+		"edit_now": "转到译经楼中编辑",
 		"edit1": "编辑：",
 		"edition": "版本：",
 		"editor": "编辑者",
@@ -462,7 +462,10 @@
 		"first_choice_word": "首选用词",
 		"pali_word": "巴利原词",
 		"required": "必填",
-		"optional": "选填"
+		"optional": "选填",
+		"comment": "评论",
+		"my_term": "我的术语",
+		"": ""
 	},
 	"grammastr": [
 		{
@@ -689,6 +692,10 @@
 			"id": ".pron.",
 			"value": "代"
 		},
+		{
+			"id": ".note.",
+			"value": "原版注释"
+		},
 		{
 			"id": ".pron.per.",
 			"value": "人代"

app/public/lang/zh-tw.json

@@ -84,7 +84,7 @@
 		"each_sentence": "逐句",
 		"eat": "進餐",
 		"edit": "編輯",
-		"edit_now": "立即編輯",
+		"edit_now": "轉至譯經樓中編輯",
 		"edit1": "編輯：",
 		"edition": "版次：",
 		"editor": "編輯",
@@ -458,7 +458,12 @@
 		"preference": "個性化",
 		"appearance": "外觀",
 		"theme": "主題",
-		"first_choice_word": "首选用词",
+		"first_choice_word": "首選用詞",
+		"pali_word": "巴利原詞",
+		"required": "必填",
+		"optional": "選填",
+		"comment": "評論",
+		"my_term": "我的術語",
 		"": ""
 	},
 	"grammastr": [

app/term/term.php

@@ -149,19 +149,32 @@ switch($op){
 				echo "<div class='dict_word'>";
 				echo "<a name='ref_dict_$guid'></a>";
 				echo "<div id='term_dict_my_$guid'>";
-				echo "<div class='dict'>Your</div>";
+				echo "<div class='dict'>{$_local->gui->my_term}</div>";
+				echo "<div class='mean'><span>".$mean."</span>";
+				echo "<span class='other_mean' style='margin-right: auto;'>（".$Fetch[$i]["other_meaning"]."）</span></div>";
 				echo "<div class='tag'>{$Fetch[$i]["tag"]}</div>";
-				echo "<div class='mean'>".$mean."</div>";
-				echo "<div class='other_mean'>".$Fetch[$i]["other_meaning"]."</div>";
 				echo "<div class='term_note' status=0>".$Fetch[$i]["note"]."</div>";
 				echo "</div>";
 				//编辑词条表单
 				echo "<div id='term_dict_my_edit_$guid' style='display:none'>";
 				echo "<input type='hidden' id='term_edit_word_$guid' value='$word' />";
-				echo "<div class='mean'><input type='input' id='term_edit_mean_{$guid}'  placeholder='{$_local->gui->meaning}' value='$mean' /></div>";//'意思'
-				echo "<div class='other_mean'><input type='input' id='term_edit_mean2_{$guid}'  placeholder='{$_local->gui->other_meaning}' value='".$Fetch[$i]["other_meaning"]."' /></div>";//'备选意思（可选项）'
-				echo "<div class='tag'><input type='input' id='term_edit_tag_{$guid}'  placeholder='{$_local->gui->other_tag}' value='".$Fetch[$i]["tag"]."' /></div>";//'备选意思（可选项）'
-				echo "<div class='note'><textarea  id='term_edit_note_$guid'  placeholder='".$module_gui_str['editor']['1043']."'>".$Fetch[$i]["note"]."</textarea></div>";//'注解'
+				echo "<div class='mean' style='display:flex;'><span style='flex:1;'>{$_local->gui->first_choice_word}：</span>";
+				echo "<input type='input' style='flex:3;' placeholder='{$_local->gui->required}' id='term_edit_mean_{$guid}' value='$mean' /></div>";//'意思'
+		
+				//echo "<div class='mean'><input type='input' id='term_edit_mean_{$guid}'  placeholder='{$_local->gui->meaning}' value='$mean' /></div>";//'意思'
+				echo "<div class='mean' style='display:flex;'><span style='flex:1;'>{$_local->gui->other_meaning}：</span>";
+				echo "<input type='input' style='flex:3;' placeholder='{$_local->gui->optional}' id='term_edit_mean2_{$guid}' value='".$Fetch[$i]["other_meaning"]."'/></div>";//'备选意思（可选项）'
+
+				//echo "<div class='other_mean'><input type='input' id='term_edit_mean2_{$guid}'  placeholder='{$_local->gui->other_meaning}' value='".$Fetch[$i]["other_meaning"]."' /></div>";//'备选意思（可选项）'
+				echo "<div class='mean' style='display:flex;'><span style='flex:1;'>{$_local->gui->tag}：</span>";
+				echo "<input type='input' style='flex:3;' placeholder='{$_local->gui->optional}' id='term_edit_tag_{$guid}' value='".$Fetch[$i]["tag"]."'/></div>";//'标签'
+
+				//echo "<div class='tag'><input type='input' id='term_edit_tag_{$guid}'  placeholder='{$_local->gui->other_tag}' value='".$Fetch[$i]["tag"]."' /></div>";//'标签'
+				echo "<div class='note'><span style='display:flex;'><span>{$_local->gui->encyclopedia} & {$_local->gui->note}：</span>";
+				echo "<guide gid='term_pedia_sys' style='margin-left: auto;'></guide></span>";
+				echo "<textarea width='100%' height='3em'  placeholder='{$_local->gui->optional}' id='term_edit_note_$guid'>".$Fetch[$i]["note"]."</textarea></div>";//'注解'
+
+				//echo "<div class='note'><textarea  id='term_edit_note_$guid'  placeholder='".$module_gui_str['editor']['1043']."'>".$Fetch[$i]["note"]."</textarea></div>";//'注解'
 				echo "</div>";
 				echo "<div id='term_edit_btn1_$guid'>";
 				//echo "<button onclick=\"term_apply('$guid')\">{$_local->gui->apply}</button>";//Apply

documents/course/课程历史链接.md

@@ -4,7 +4,9 @@
 [字幕投稿Subtitle distribute](https://www.youtube.com/timedtext_cs_panel?c=UClGNGi4ULgZafT_OIit_owA&tab=2)
 
 - 中国大陆地区
+
 [优酷](https://list.youku.com/albumlist/show/id_52498274?spm=a2h9p.12367095.app.SECTION~MAIN~SECTION~MAIN~5~5~5!3~5~5!2~5~5~5~5~5!2~5~A)
+
   
 ## 其他参考资料Other Referance
 ### Dhamma Talk on "The Significance of Āsāḷha Full Moon Day"

documents/course/课程通知.md

@@ -16,11 +16,11 @@ Pa-auk Meditation Centre（Dawei, Myanmar）
 - 密码Password：791203
 
 授课时间Time：
-SUN MON TUE THR (3 from 4)
-18:30 L. A.
-21:30 NewYork
-周一 周二 周三 周五 (4选3)
-8:00 仰光
-9:30 北京
+- SUN MON TUE THR (3 from 4)
+ - 18:30 L. A.
+ - 21:30 NewYork
+- 周一 周二 周三 周五 (4选3)
+ - 8:00 仰光
+ - 9:30 北京
 
-技术支持Power by：www.wikipali.org
+技术支持Power by：www.wikipali.org

documents/users_guide/en/studio_term.md

@@ -0,0 +1,22 @@
+## 术语大兼容系统
+在佛教翻译中，术语使用在历史沿革中一直存在大量争论，这是在纸媒体的时代永远无法解决的。
+
+然而在电子阅读时代，这个问题是可以通过兼容的方式，同时照顾**译者**和**读者**两大群体的感受。
+
+### 视频演示
+- [YouTube](https://youtu.be/NdXgxo5YAIo "按住Ctrl键点开")
+- 优酷
+### 操作方法
+- 点击逐词解析中的术语
+- 检查**词典原型**是否为空，如果为空请填入去掉变化之后的能够在词典中查询到的**原型**
+- 点击页面右上角的<svg id="icon_term" viewBox="0 0 24 24" style='fill:#6baaff;height: 15px; width: 15px;'><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"></path></svg>调出侧边栏
+- 点击**新建**按钮，在其中键入**首选术语**(必填)，其他为选填
+- 之后，在键入译文的时候，如下：
+```
+[[isipatana]] [[migadāya]]：由仙人们起飞和降落而得名。由于给予[[miga]]安全感，而划定为[[migadāya]]的区域。
+```
+<b>[[pāḷi]]</b>会被自动替换，最终显示为：
+```
+落仙坪(isipatana 仙人降落处,仙人堕处,仙人落处 ) 野生保护(区)(migadāya 鹿野苑 )：由仙人们起飞和降落而得名。由于给予野兽(miga 鹿,野生动物 )安全感，而划定为野生保护(区)的区域。
+```
+注：该替换优先依照读者的个性化术语系统

documents/users_guide/en/term_pedia_sys.md

@@ -0,0 +1,10 @@
+## 术语百科系统
+术语+注释书名词解释=巴利百科词条
+### 视频演示
+
+
+### 具体操作
+* 首先创建术语
+* 然后复制句子编号
+* 将句子编号黏贴到下面的输入框中
+* 系统会自动根据句子编号，返回巴利原文、译文以及引用路径

documents/users_guide/zh-cn/academy.md

@@ -0,0 +1 @@
+## 圣书院

documents/users_guide/zh-cn/sent_func.md

@@ -2,4 +2,8 @@
 ### 在逐词解析中添加巴利原文注释
 (文本暂无)
 - [YouTube](https://youtu.be/phRFoQbAh8s "按住Ctrl键点开")
-- [优酷](https://v.youku.com/v_show/id_XNDgwOTg4OTA0NA==.html "按住Ctrl键点开")
+- [优酷](https://v.youku.com/v_show/id_XNDgwOTg4OTA0NA==.html "按住Ctrl键点开")
+
+### 术语百科
+术语+巴利原文注释
+- * [YouTube](https://youtu.be/YxVwxYA4spU)

documents/users_guide/zh-cn/term_pedia_sys.md

@@ -1,10 +1,12 @@
 ## 术语百科系统
 术语+注释书名词解释=巴利百科词条
 ### 视频演示
-
+* [YouTube](https://youtu.be/YxVwxYA4spU)
 
 ### 具体操作
 * 首先创建术语
 * 然后复制句子编号
 * 将句子编号黏贴到下面的输入框中
-* 系统会自动根据句子编号，返回巴利原文、译文以及引用路径
+* 系统会自动根据句子编号，返回巴利原文、译文以及引用路径
+### 结果呈现
+[巴利百科](https://www.wikipali.org/app/wiki/)

documents/users_guide/zh-tw/studio_term.md

@@ -0,0 +1,22 @@
+## 术语大兼容系统
+在佛教翻译中，术语使用在历史沿革中一直存在大量争论，这是在纸媒体的时代永远无法解决的。
+
+然而在电子阅读时代，这个问题是可以通过兼容的方式，同时照顾**译者**和**读者**两大群体的感受。
+
+### 视频演示
+- [YouTube](https://youtu.be/NdXgxo5YAIo "按住Ctrl键点开")
+- 优酷
+### 操作方法
+- 点击逐词解析中的术语
+- 检查**词典原型**是否为空，如果为空请填入去掉变化之后的能够在词典中查询到的**原型**
+- 点击页面右上角的<svg id="icon_term" viewBox="0 0 24 24" style='fill:#6baaff;height: 15px; width: 15px;'><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"></path></svg>调出侧边栏
+- 点击**新建**按钮，在其中键入**首选术语**(必填)，其他为选填
+- 之后，在键入译文的时候，如下：
+```
+[[isipatana]] [[migadāya]]：由仙人们起飞和降落而得名。由于给予[[miga]]安全感，而划定为[[migadāya]]的区域。
+```
+<b>[[pāḷi]]</b>会被自动替换，最终显示为：
+```
+落仙坪(isipatana 仙人降落处,仙人堕处,仙人落处 ) 野生保护(区)(migadāya 鹿野苑 )：由仙人们起飞和降落而得名。由于给予野兽(miga 鹿,野生动物 )安全感，而划定为野生保护(区)的区域。
+```
+注：该替换优先依照读者的个性化术语系统

documents/users_guide/zh-tw/term_pedia_sys.md

@@ -0,0 +1,10 @@
+## 术语百科系统
+术语+注释书名词解释=巴利百科词条
+### 视频演示
+
+
+### 具体操作
+* 首先创建术语
+* 然后复制句子编号
+* 将句子编号黏贴到下面的输入框中
+* 系统会自动根据句子编号，返回巴利原文、译文以及引用路径