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

Laravel

app/Http/Controllers/SentPrController.php

@@ -102,27 +102,29 @@ class SentPrController extends Controller
 			$palitext = mb_substr($palitext,0,20,"UTF-8");
 			$sent_num = $data['book']."-".$data['para']."-".$data['begin']."-".$data['end'];
 			$prtext = mb_substr($data['text'],0,140,"UTF-8");
-			$link = "https://www-hk.wikipali.org/app/article/index.php?view=para&book={$data['book']}&par={$data['para']}&begin={$data['begin']}&end={$data['end']}";
+			$link = "https://www-hk.wikipali.org/app/article/index.php?view=para&book={$data['book']}&par={$data['para']}&begin={$data['begin']}&end={$data['end']}&mode=edit";
 			Log::info("palitext:{$palitext} prtext = {$prtext} link={$link}");
-			if(($data['book']==65 && $data['para']>=829 && $data['para']<=1306) || ($data['book']== 67 && $data['para'] >= 759 && $data['para'] <= 1152)){
+			//$palitext = str_replace("{","**",$palitext);
+			//$palitext = str_replace("}","**",$palitext);
+					if(($data['book']==65 && $data['para']>=829 && $data['para']<=1306) || ($data['book']== 67 && $data['para'] >= 759 && $data['para'] <= 1152)){
 				switch ($data['channel']) {
 					case 'e5bc5c97-a6fb-4ccb-b7df-be6dcfee9c43':
 						$strMessage = "{$username} 就文句`{$palitext}`提出了修改建议：\n
 						>内容摘要：<font color=\"comment\">{$prtext}</font>，
 						>句子编号：<font color=\"info\">{$sent_num}</font>
-						欢迎大家[点击链接]({$link}&channel=e5bc5c97-a6fb-4ccb-b7df-be6dcfee9c43,8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8&mode=edit)查看并讨论。";
+						欢迎大家[点击链接]({$link}&channel=e5bc5c97-a6fb-4ccb-b7df-be6dcfee9c43,8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8)查看并讨论。";
 						break;
 					case '8622ad73-deef-4525-8e8e-ba3f1462724e':
 						$strMessage = "{$username} 就文句`{$palitext}`有疑问：\n
 						>内容摘要：<font color=\"comment\">{$prtext}</font>，
 						>句子编号：<font color=\"info\">{$sent_num}</font>
-						欢迎大家[点击链接]({$link}&channel=8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8&mode=edit)查看并讨论。";
+						欢迎大家[点击链接]({$link}&channel=8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8)查看并讨论。";
 						break;
 					case '5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8':
 						$strMessage = "{$username} 就文句`{$palitext}`中的疑问有这样的回复：\n
 						>内容摘要：<font color=\"comment\">{$prtext}</font>，
 						>句子编号：<font color=\"info\">{$sent_num}</font>
-						欢迎大家[点击链接]({$link}&channel=8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8&mode=edit)查看并讨论。";
+						欢迎大家[点击链接]({$link}&channel=8622ad73-deef-4525-8e8e-ba3f1462724e,5ab653d7-1ae3-40b0-ae07-c3d530a2a8f8)查看并讨论。";
 						break;
 					default:
 						$strMessage = "";

public/app/calendar/index.html

@@ -639,11 +639,14 @@
 			solar_num = get_position(data_time).solar_station;
 			solar_num = Math.floor(solar_num);
 			lunar_num = get_position(data_time).lunar_station;
+			next_month = new Date()
+			next_month.setDate(data_time.getDate() + 30)
+			lunar_month_num = get_position(phaseRange(data_time, next_month, FULL)[0]).lunar_station
 			for (x_m in pali_month_name) {
-				if (lunar_num > pali_month_name[x_m].position && lunar_num < pali_month_name[Number(x_m) + 1].position) {
+				if (lunar_month_num > pali_month_name[x_m].position && lunar_month_num < pali_month_name[Number(x_m) + 1].position) {
 					result.month_name = pali_month_name[x_m]
 					break;
-				} else if (lunar_num < 1.25 || lunar_num >= 26) {
+				} else if (lunar_month_num < 1.25 || lunar_month_num >= 26) {
 					result.month_name = pali_month_name[0]
 					break;
 				}
@@ -653,6 +656,7 @@
 
 			result.solar = horoscope_name[solar_num]; //黄道十二宫星象名称
 			result.lunar = pali_nakkhatta_name[lunar_num]; //27星宿月站名称
+			result.nextfullmoon = phaseRange(data_time, next_month, FULL)[0]
 			return result;
 		}
 		function show_position() {
@@ -1121,6 +1125,26 @@
 			</div>
 
 
+		</div>
+		<div style="display: inline-block; width: 50%; justify-content: center;">
+			<script>
+				//document.write(localString[g_language].location);
+				document.write("单日查询：");
+				function set_date_info(date_time_element){
+					var date_info = new Object();
+					date_info = get_station_name(new Date(date_time_element.value))
+					let string="";
+					string += "在" + date_info.month_name.season_icon + date_info.month_name.season + "的" + date_info.month_name.value + "月";
+					string +=  "<br>月亮星宿：" + date_info.lunar.value + date_info.lunar.name_zh + "<br>";
+					string += "太阳星宿：" + date_info.solar.value + date_info.solar.name_zh;
+					string += "<br>月圆时间：" + date_info.nextfullmoon.toLocaleString()
+					$("#date_info_indetal").html(string)
+				}
+			</script>
+			<input type="datetime-local" id="input_date" onblur="set_date_info(this)" style="display: block;">
+			<span id="date_info_indetal" ></span>
+
+
 		</div>
 		<div class="right">
 			<span id="loading">

public/app/term/popup_note.css

@@ -51,6 +51,9 @@ code ol {
 	z-index: 200;
 	/*font-family: "Noto Sans", "Noto Sans SC", "Noto Sans TC", Arial, Verdana;*/
 }
+.translation .popup_contence{
+	font-family: "Noto Sans", "Noto Sans SC", "Noto Sans TC", Arial, Verdana;
+}
 
 .popup_contence:after {
 	content: "\00a0";

public/app/term/term.css

@@ -730,7 +730,7 @@ pw {
 }
 .commentary .tool_bar > .right{
     /*left: 8em;*/
-    width: 8em;
+    width: fit-content;
 }
 .translation>.sent_tran_inner>.tool_bar > .right{
     right: 2em;