Merge pull request #1024 from bhikkhu-kosalla-china/laravel

Laravel

public/app/guide/guide.css

@@ -27,7 +27,7 @@ guide ol {
 }
 .guide_contence {
 	/*border-top: 7px;*/
-	position: fixed;
+	position: absolute;
 	border: 1px solid var(--border-line-color);
 	border-radius: 5px;
 	top: 100%;

public/app/guide/guide.js

@@ -19,16 +19,19 @@ function guide_init() {
 	});
 
 	$("guide").mouseenter(function (event) {
-		let mouse_x=event.clientX
-		let mouse_y=event.clientY
-	if ($(this).offset().left < $(document.body).width() / 2) {//左边
-		$(this).children(".guide_contence").first().css("left",(mouse_x-20)+"px")
-		$(this).children(".guide_contence").first().css("top",mouse_y+"px")
-		$(this).children(".guide_contence").first().css("max-width",($(document.body).width()-mouse_x-20)+"px")
+		let mouse_x=event.pageX
+		let mouse_y=event.pageY
+		$(this).children(".guide_contence").first().css("top","15px")
+        $(this).children(".guide_contence").first().css("width","max-content")
+        //if ($(this).offset().left < $(document.body).width() / 2) {//左边
+    if (mouse_x < ($(document.body).width() / 2)) {//左边
+    		$(this).children(".guide_contence").first().css("left","-10px")
+            $(this).children(".guide_contence").first().css("max-width",("calc(100vw - "+mouse_x+"px - 20px"))
 	} else {//右边
-		$(this).children(".guide_contence").first().css("right",($(document.body).width()-mouse_x-20)+"px")
-		$(this).children(".guide_contence").first().css("top",mouse_y+"px")
+		//$(this).children(".guide_contence").first().css("right",($(document.body).width()-mouse_x-20)+"px")
+		//$(this).children(".guide_contence").first().css("top",mouse_y+"px")
 		$(this).children(".guide_contence").first().css("max-width",(mouse_x-20)+"px")
+        $(this).children(".guide_contence").first().css("right","-10px")
 	}
 	if ($(this).children(".guide_contence").first().html().length > 0) {
 			return;

public/app/term/note.js

@@ -19,7 +19,7 @@ var gBuildinDictIsOpen = false;
 update 修改
 pr 修改建议
 */
-var _edit_mode = "update"; 
+var _edit_mode = "update";
 
 var note_renderer = new marked.Renderer();
 note_renderer.code = function(code, language) {
@@ -141,7 +141,7 @@ function note_refresh_new(callback = null) {
 	for (const iterator of objNotes) {
 		let id = iterator.id;
 		if (id == null || id == "") {
-            
+
 			//查看这个节点是第几层note嵌套。大于预定层数退出。
 			let layout = 1;
 			let parent = iterator.parentNode;
@@ -156,7 +156,7 @@ function note_refresh_new(callback = null) {
 				}
 				parent = parent.parentNode;
 			}
-            
+
 			id = com_guid();
 			iterator.id = id;
 			if (iterator.hasAttribute("info")) {
@@ -164,7 +164,7 @@ function note_refresh_new(callback = null) {
 				if (info != null || info != "") {
 					/*
 					let arrInfo = info.split("-");
-					
+
 					if (arrInfo.length >= 2) {
 						let book = arrInfo[0];
 						let para = arrInfo[1];
@@ -239,7 +239,7 @@ function note_refresh_new(callback = null) {
 						console.error(e);
 					}
 				}
-                
+
 			}
 		);
 	} else {
@@ -268,7 +268,7 @@ function render_pali_sent(palitext){
 	else{
 		output += marked(palitext.palitext);
 	}
-		
+
 	output +="</pali>";
 	return output;
 }
@@ -420,7 +420,7 @@ function note_channal_list() {
 						let firstChannel="";
 						if(_channal!=""){
 							firstChannel = _channal.split(",")[0];
-						}										
+						}
 						for (const iterator of _channalData) {
 							lang[iterator.lang]=1;
 							if(iterator.id==firstChannel){
@@ -440,7 +440,7 @@ function note_channal_list() {
 									htmlLangSelect += "selected ";
 									isLangMatched = true;
 								}
-								htmlLangSelect +=">"+strLang+"</option>";	
+								htmlLangSelect +=">"+strLang+"</option>";
 							}
 						}
 						$("#select_lang").html(htmlLangSelect);
@@ -466,7 +466,7 @@ function render_edition_list(lang=""){
 	let firstChannel="";
 	if(_channal!=""){
 		firstChannel = _channal.split(",")[0];
-	}	
+	}
 	let html = "";
 	html += "<div class='case_dropdown-content'>";
 	let currChannel="选择一个版本";
@@ -660,7 +660,7 @@ function note_ref_init(target='_blank') {
 		let urlChannel='';
 		if(_channal !== ""){
 			urlChannel = "&channel=" + _channal;
-		}		
+		}
 		window.open("../article/?view=para&book=" + bookid + "&par=" + para + urlChannel, target);
 	});
 }
@@ -723,7 +723,7 @@ function note_json_html(in_json) {
 		"_" +
 		in_json.begin +
 		"_" +
-		in_json.end + 
+		in_json.end +
 		"')\" >" +
 		gLocal.gui.copy_link +
 		"</a>";*/
@@ -788,7 +788,7 @@ function note_json_html(in_json) {
     //分隔线
 	output += "<span class='separate_line'></span>";
 
-	
+
 	output += "<span class='more_tran icon_expand'></span>";
 
 	//第二个按钮其他译文
@@ -965,7 +965,7 @@ function sent_pr_merge(id) {
 				}else{
 					ntf_show("找不到句子容器");
 				}
-				
+
 			}
 		}
 	);
@@ -1346,7 +1346,7 @@ function render_one_sent_tran_a(iterator, diff = false) {
 
 	html += "</div>"; //end of foot bar
 	html += '<ul class="tag_list">';
-	html += "<li class='pr' onclick=\"note_pr_show('" + iterator.channal + "','" + sid + "')\">";	
+	html += "<li class='pr' onclick=\"note_pr_show('" + iterator.channal + "','" + sid + "')\">";
 	if (iterator.pr_all && parseInt(iterator.pr_all) > 0) {
 		html += render_pr_number(iterator.pr_new,iterator.pr_all);
 	}
@@ -1409,12 +1409,12 @@ function myEndingTooltip(inStr){
             id:"my_nom2",
             name:"ကား",
             tooltip:'主格/主语',
-        },        
+        },
         {
             id:"my_nom3",
             name:"က",
             tooltip:'主格/主语',
-        },        
+        },
         {
             id:"my_acc1",
             name:"ကို",
@@ -1555,6 +1555,11 @@ function myEndingTooltip(inStr){
             name:"လျက်",
             tooltip:'同时发生的时间状语(当……的时候)',
         },
+        {
+            id:"my_api",
+            name:"လည်း",
+            tooltip:'也',
+        },
     ];
 
     for (const iterator of myEnding) {
@@ -1571,7 +1576,7 @@ function render_pr_number(pr_new,pr_all){
 	if(pr_all > 0){
 		html = "<span class='icon'>✋</span><span class='num'>" + pr_new + "/" + pr_all + "</span>";
 	}
- return html;	
+ return html;
 }
 function tran_sent_textarea_event_init() {
 	let textarea = document.querySelectorAll(".tran_sent_textarea");
@@ -1881,10 +1886,10 @@ function set_more_button_display() {
                 if(thisChannel && thisChannel.type=='commentary'){
                     commentaryChannel++;
                 }
-            }            
+            }
         }
 
-        
+
 		for (const iterator of _channalData) {
 			if (iterator.final && iterator.type==channelType) {
 				for (const onesent of iterator.final) {
@@ -1901,7 +1906,7 @@ function set_more_button_display() {
 				}
 			}
 		}
-		if (count > 0 || commentaryChannel>0) 
+		if (count > 0 || commentaryChannel>0)
         {
 			$(this).find(".other_tran_num").html(count);
 			$(this).find(".other_tran_num").attr("style", "display:inline-flex;");
@@ -1973,7 +1978,7 @@ function set_more_button_display() {
 
                     return false;    //  阻止事件冒泡
 				});
-		}else 
+		}else
         {
 			//隐藏自己
 			//$(this).hide();
@@ -2344,7 +2349,7 @@ function update_sent_text(sent_tran_div,result){
 				divPreview.html(
 					note_init(result.text, result.channal, result.editor, result.lang)
 				);
-				term_updata_translation();                        
+				term_updata_translation();
 				break;
 		}
 		popup_init();
@@ -2362,13 +2367,13 @@ function pr_create_callback(data) {
 			alert(e.message);
 			console.error('pr_create_callback',data);
 			return;
-		}			
-		
+		}
+
 	}else{
 		response = data;
 	}
 
-	
+
 	if (!response.ok) {
 		ntf_show("修改建议提交失败");
 		console.log("pr_create_callback", response.message);
@@ -2385,7 +2390,7 @@ function pr_create_callback(data) {
 			sent_tran_div.removeClass("loading");
 			sent_tran_div.find(".tag_list").first().children(".pr").first().html(render_pr_number(1,response.data.count));
 		}
-		
+
 		ntf_show("成功提交修改建议");
 	}
 }
@@ -2399,13 +2404,13 @@ function pr_update_callback(data) {
 			alert(e.message);
 			console.error('pr_create_callback',data);
 			return;
-		}			
-		
+		}
+
 	}else{
 		response = data;
 	}
 
-	
+
 	if (!response.ok) {
 		ntf_show("修改建议更新失败");
 		console.log("pr_update_callback", response.message);
@@ -2440,7 +2445,7 @@ function pr_update_callback(data) {
 			let tranText = str_diff(orgText, result.content);
 			sent_tran_div.find(".preview").html(tranText);
 		}
-		
+
 		ntf_show("成功更新修改建议");
 	}
 }
@@ -2604,7 +2609,7 @@ function set_pali_script(pos, script) {
 				default:
 					return(oldcontent);
 			}
-			
+
 		});
 	}
 }
@@ -2772,7 +2777,7 @@ function render_heading_toc() {
 }
 
 
-//术语输入At 
+//术语输入At
 const _term_max_menu=9;
 function term_set_word_list_data(el){
 	let sid = $(el).attr("sid");
@@ -2794,7 +2799,7 @@ function term_set_word_list_data(el){
 			let parents = term_parent(words[index]);
 
 			for (const key in parents) {
-				if (parents.hasOwnProperty.call(parents, key)) {		
+				if (parents.hasOwnProperty.call(parents, key)) {
 					//term_data.push({word:key,en:com_getPaliEn(key),weight:weight});
 					tmpWords[key]={word:key,en:com_getPaliEn(key),weight:3,exist:0};
 				}
@@ -2808,7 +2813,7 @@ function term_set_word_list_data(el){
 		}else{
 			tmpWords[iterator.word]={word:iterator.word,en:com_getPaliEn(iterator.word),weight:1,exist:1};
 		}
-	}	
+	}
 	//arrMyTerm 词头查重
 	let tmpMyTerm=[];
 	for (const iterator of arrMyTerm) {
@@ -2846,7 +2851,7 @@ function text_input_textarea_focuse(el){
 		term_input_text.parentElement.querySelector(".text_shadow").style.height=term_input_text.clientHeight+"px";
 	}
 	term_input_text.onkeydown = function (e) {
-	
+
 		let menu = term_input_text.parentElement.querySelector('.menu');
 		switch (e.key) {
 			case "ArrowDown"://down arrow
@@ -2856,7 +2861,7 @@ function text_input_textarea_focuse(el){
 						menuFocusIndex=_term_max_menu;
 					}
 					menu.innerHTML=TermAtRenderMenu({focus:menuFocusIndex});
-					return false;					
+					return false;
 				}
 				break;
 			case "ArrowUp"://up arrow
@@ -2866,7 +2871,7 @@ function text_input_textarea_focuse(el){
 						menuFocusIndex=0;
 					}
 					menu.innerHTML=TermAtRenderMenu({focus:menuFocusIndex});
-					return false;					
+					return false;
 				}
 			break;
 			case "Enter":
@@ -2886,7 +2891,7 @@ function text_input_textarea_focuse(el){
 				}else{
 					tran_sent_edit_cancel(e.currentTarget);
 				}
-				
+
 				break;
 			default:
 				break;
@@ -2915,7 +2920,7 @@ function text_input_textarea_focuse(el){
 	mirror.appendChild(textNode1)
 	mirror.appendChild(cursor)
 	mirror.appendChild(textNode2)
-	let menu = term_input_text.parentElement.querySelector('.menu');	
+	let menu = term_input_text.parentElement.querySelector('.menu');
 	if(str1.slice(-2)=="[[" ){
 		if( menu.style.display!="block"){
 			menuFocusIndex=0;
@@ -2933,7 +2938,7 @@ function text_input_textarea_focuse(el){
 		}
 	}
 
-	
+
 	if(menu.style.display=="block"){
 		//term_input += e.key;
 		let value = term_input_text.value
@@ -3002,13 +3007,13 @@ function TermAtRenderMenu(params) {
 	let focusIndex = params.focus%term_data.length;
 	for (const it of term_data) {
 		if(term_input=="" || it.word.indexOf(term_input)==0 || it.en.indexOf(term_input)==0){
-			
+
 			html +="<li ";
 			if(focusIndex==index){
 				html +="class='trem_focus' "
 			}
 			html += "onclick=\"term_insert('"+it.word+"')\" ";
-			
+
 			html +=">";
 			html += (index+1)+ ". ";
 			if(it.exist>0){
@@ -3023,7 +3028,7 @@ function TermAtRenderMenu(params) {
 			}
 			index++;
 		}
-		
+
 	}
 	return html;
 }
@@ -3038,7 +3043,7 @@ function term_parent(paliword) {
 				let wordParent = paliword.slice(0, 0 - it.end2.length) + it.end1;
 				output[wordParent]=1;
 			}
-		}		
+		}
 	}
 	return output;
 }
@@ -3050,4 +3055,4 @@ function setSentToolBarEvent(){
     $('.sent_tran_inner').not('.commentary').off('mouseleave').on('mouseleave',function(){
         $(this).children('.tool_bar').first().children('.right').hide();
     })
-}
+}

public/app/term/term.css

@@ -489,8 +489,8 @@ note:hover .add_new {
 	min-height: 1em;
 	transition: all 0.2s ease;
 	display: none;
-	max-height: 50vh;
-	overflow: scroll;
+	/*max-height: 50vh;*/
+	/*overflow: scroll;*/
 	margin-top: 2em;
 }
 .tool_bar {

public/app/term/term_popup.js

@@ -27,11 +27,7 @@ function term_popup_init() {
   });
 
   $(".term_link").mouseenter(function (event) {
-	let mouse_x=event.clientX - 20
-	let mouse_y=event.clientY
-	$(this).children(".guide_contence").first().css("left",mouse_x+"px")
-	$(this).children(".guide_contence").first().css("top",mouse_y+"px")
-if ($(this).children(".guide_contence").first().html().length > 0) {
+    if ($(this).children(".guide_contence").first().html().length > 0) {
       return;
     }
     let gid = $(this).attr("gid");

public/app/users_guide/zh-cn/grammar_my_api.md

@@ -0,0 +1,5 @@
+# 缅文语尾
+
+巴利词api的一种情况，表示：也。
+
+git clone -b agile https://github.com/YOUR FORK/mint.git ~/workspace/mint

public/app/users_guide/zh-cn/grammar_my_dat2.md

@@ -4,4 +4,5 @@
 
 |格位|含义|翻译建议|关系|
 |-|-|-|-|
-|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**动作的目的**<br>相当于英语“for”|为了……|[目的 ➡ 动词<br>REC](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/dat/dat-rec.html)|
+|[**目的**格](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**动作的目的**<br>相当于英语“for”|为了……|[目的 ➡ 动词<br>PUR](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/dat/dat-pur.html)|
+|[**不定**体](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/declension/dat.html)|表达**目的的动作**<br>相当于英语“to do”|用来……|[目的 ➡ 动词<br>PUR](https://assets-hk.wikipali.org/pali-handbook/zh-Hans/basic-relation/verb/inf.html)|