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

app/dict/language/default.php

@@ -286,7 +286,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/dict/language/en.php

@@ -286,7 +286,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/pcdl/html_head.php

@@ -79,15 +79,18 @@ else{
 		margin: 3px 0;
 	}
 	.head_img{
-		display: inline-block;
-		width: 20px;
-		font-size: 14px;
-		padding: 2px;
-		background-color: gray;
-		color: white;
-		border-radius: 99px;
-		text-align: center;
-		margin: auto 2px;
+		display: inline-flex;
+    min-width: 3em;
+    height: 3em;
+    padding: 0 0px;
+    font-size: 60%;
+    background-color: gray;
+    color: white;
+    border-radius: 1.5em;
+    text-align: center;
+    justify-content: center;
+    margin: auto 2px;
+    line-height: 3em;
 	}
 	.card{
 		box-shadow: 0 0 10px rgba(0,0,0,0.15);

app/pcdl/language/default.php

@@ -264,7 +264,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/pcdl/language/en.php

@@ -264,7 +264,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/pcdl/reader.php

@@ -255,16 +255,19 @@ note{
 	margin: 3px 0;
 }
 .head_img{
-	display: inline-block;
-    width: 20px;
-	font-size: 14px;
-    padding: 2px;
+	display: inline-flex;
+    min-width: 3em;
+    height: 3em;
+    padding: 0 0px;
+    font-size: 60%;
     background-color: gray;
     color: white;
-    border-radius: 99px;
+    border-radius: 1.5em;
     text-align: center;
+    justify-content: center;
     margin: auto 2px;
-}
+	line-height: 3em;
+	}
 .term_mean{
 	color:blue;
 	cursor: pointer;

app/public/casesuf.inc

@@ -3143,6 +3143,10 @@ array("oti","vhaṃ",".2p.$.pl.$.aor.")
  );
  
  $union = array(
+array("ssa","ssāpi"),
+array("ssa","ssāti"),
+array("ena","enāti"),
+array("ena","enāpi"),
 array("ṃ","ñca"),
 array("ṃ","nti"),
 array("a","āti"),
@@ -3158,6 +3162,7 @@ array("e","epi"),
 array("ī","īpi"),
 array("i","īpi"),
 array("o","opi"),
+array("e","epi"),
 array("ū","upi"),
 array("u","upi"),
 array("ṃ","mpi"),

app/public/lang/default.json

@@ -27,7 +27,7 @@
 		"bhumma": "Bhumma",
 		"book": "book",
 		"book_mark": "Book Mark",
-		"book_name": "book name",
+		"book_name": "book name ",
 		"bookmark": "bookmark...",
 		"buddhist_calendar": "Buddhist Calendar",
 		"budha": "Budha",
@@ -556,6 +556,8 @@
 		"only_this_para": "show this paragraph only",
 		"no": "No ",
 		"select": "select",
+		"history": "history",
+		"top_search": "Top search",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -27,7 +27,7 @@
 		"bhumma": "Bhumma",
 		"book": "book",
 		"book_mark": "Book Mark",
-		"book_name": "book name",
+		"book_name": "book name ",
 		"bookmark": "bookmark...",
 		"buddhist_calendar": "Buddhist Calendar",
 		"budha": "Budha",
@@ -555,6 +555,8 @@
 		"only_this_para": "show this paragraph only",
 		"no": "No ",
 		"select": "select",
+		"history": "history",
+		"top_search": "Top search",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -27,7 +27,7 @@
 		"bhumma": "ဘုမ္မ",
 		"book": "book",
 		"book_mark": "Book Mark",
-		"book_name": "book name",
+		"book_name": "book name ",
 		"bookmark": "bookmark...",
 		"buddhist_calendar": "Buddhist Calendar",
 		"budha": "ဗုဓ",
@@ -555,6 +555,8 @@
 		"only_this_para": "show this paragraph only",
 		"no": "No ",
 		"select": "select",
+		"history": "history",
+		"top_search": "Top search",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -560,6 +560,8 @@
 		"only_this_para": "show this paragraph only",
 		"no": "No ",
 		"select": "select",
+		"history": "history",
+		"top_search": "Top search",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -557,6 +557,8 @@
 		"only_this_para": "独立显示本段",
 		"no": "无",
 		"select": "选择",
+		"history": "历史记录",
+		"top_search": "热搜",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -557,6 +557,8 @@
 		"only_this_para": "獨立顯示本段",
 		"no": "無",
 		"select": "選擇",
+		"history": "歷史記錄",
+		"top_search": "熱搜",
 		"": ""
 	},
 	"grammastr": [

app/search/language/default.php

@@ -286,7 +286,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/search/language/en.php

@@ -286,7 +286,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/search/paliword.php

@@ -73,7 +73,27 @@ include "../pcdl/html_head.php";
 	#pre_search_word_content{
 		display:block;
 	}
+	@-webkit-keyframes spin {
+	from {
+		-webkit-transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(360deg);
+	}
+}
 
+@keyframes spin {
+	from {
+		transform: rotate(0deg);
+	}
+	to {
+		transform: rotate(360deg);
+	}
+}
+.icon_spin {
+	-webkit-animation: spin 2.5s linear infinite;
+	animation: spin 2.5s linear infinite;
+}
 
     </style>
     <style  media="screen and (max-width:800px)">
@@ -95,8 +115,12 @@ include "../pcdl/html_head.php";
 
 <div id="contents_view">
 	<div id="contents_div" style="padding: 0 1em 0 30px;">
-		<div id="contents">
-		<?php echo $_local->gui->loading; ?>...
+		<div id="contents" >
+		<div style="text-align: center;">
+			<svg class='icon_spin' style='fill: saddlebrown; '>
+				<use xlink='http://www.w3.org/1999/xlink' href='../studio/svg/icon.svg#dhammacakkha'></use>
+			</svg>
+		</div>
 		</div>
 		<div id="contents_foot">
 			<div id="contents_nav" style="">
@@ -107,12 +131,12 @@ include "../pcdl/html_head.php";
 	<div id="right_pannal">
 		<div class="fun_frame">
 			<div style="display:flex;justify-content: space-between;">
-				<div class="title">Declension</div>
-				<div id="case_tools">
-					<div class="select_button" onclick="onWordFilterStart()"><?php echo "Select"; ?></div>
-					<div class="filter">
-						<button onclick='word_search_filter()'>Filtrate</button>
-						<button onclick='filter_cancel()'>取消</button>
+				<div class="title"><?php echo $_local->gui->real_declension; ?></div>
+				<div id="case_tools" style="display:flex;">
+					<div class="select_button" style="margin:auto 0"  onclick="onWordFilterStart()"><?php echo $_local->gui->select; ?></div>
+					<div class="filter" >
+						<button onclick='word_search_filter()'><?php echo $_local->gui->filter; ?></button>
+						<button onclick='filter_cancel()'><?php echo $_local->gui->cancel; ?></button>
 					</div>
 				</div>
 			</div>
@@ -121,12 +145,12 @@ include "../pcdl/html_head.php";
 		</div>
 		<div class="fun_frame">
 			<div style="display:flex;justify-content: space-between;">
-				<div class="title"><?php echo "Books"; ?></div>
-				<div id="book_tools">
-					<div class="select_button" onclick="onBookFilterStart()"><?php echo "Select"; ?></div>
+				<div class="title"><?php echo $_local->gui->book_name.$_local->gui->list; ?></div>
+				<div id="book_tools" style="display:flex;">
+					<div class="select_button" style="margin:auto 0" onclick="onBookFilterStart()"><?php echo $_local->gui->select; ?></div>
 					<div class="filter">
-						<button onclick='book_search_filter()'>Filtrate</button>
-						<button onclick='book_filter_cancel()'>取消</button>
+						<button onclick='book_search_filter()'><?php echo $_local->gui->filter; ?></button>
+						<button onclick='book_filter_cancel()'><?php echo $_local->gui->cancel; ?></button>
 					</div>
 				</div>
 			</div>
@@ -146,13 +170,13 @@ include "../pcdl/html_head.php";
     <div id="index_list">
 			<div style="flex:3;margin:12px;">
 				<div class="card" style="padding:10px;">
-					<div>最近搜索</div>
+					<div><?php echo $_local->gui->search.$_local->gui->history; ?></div>
                     <div id="search_histray"></div>
 				</div>
 			</div>
 			<div style="flex:3;margin:12px;">
 				<div class="card" style="padding:10px;">
-					<div>热搜</div>
+					<div><?php echo $_local->gui->top_search; ?></div>
                     <div id="title_hot"></div>
 				</div>
 			</div>

app/search/search.css

@@ -41,9 +41,14 @@ highlight {
 .fileter_item > .tag {
 	background-color: gray;
 	color: white;
-	border-radius: 99px;
+	border-radius: 1em;
 	font-size: 75%;
-	padding: 0 8px;
+	padding: 0 0.6em;
+	line-height: 2em;
+	height: 2em;
+	min-width: 2em;
+	justify-content: center;
+	display: inline-flex;
 }
 
 .book_tag_div {

app/studio/language/default.php

@@ -293,7 +293,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/studio/language/en.php

@@ -293,7 +293,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/studio/language/my.php

@@ -293,7 +293,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";

app/studio/language/pali.php

@@ -293,7 +293,7 @@ $module_gui_str['editor_wizard']['1008']="With Title";
 $module_gui_str['editor_wizard']['1009']="Pāli";
 $module_gui_str['editor_wizard']['1010']="Translation";
 $module_gui_str['editor_wizard']['1011']="Finish";
-$module_gui_str['editor_wizard']['1012']="book name";
+$module_gui_str['editor_wizard']['1012']="book name ";
 $module_gui_str['editor_wizard']['1013']="Edit Now";
 $module_gui_str['editor_wizard']['1014']="Add to Edit List";
 $module_gui_str['editor_wizard']['1015']="";