Browse Source

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

visuddhinanda 5 years ago
parent
commit
9eaad591b5

+ 1 - 1
app/article/my_article_index.php

@@ -38,7 +38,7 @@ require_once '../studio/index_head.php';
 	<div class="index_inner " style="margin-left: 18em;margin-top: 5em;">
 	<div class="index_inner " style="margin-left: 18em;margin-top: 5em;">
 		<div class="file_list_block">
 		<div class="file_list_block">
 			<div class="tool_bar">
 			<div class="tool_bar">
-				<div><?php echo $_local->gui->composition.$_local->gui->list ?></div>
+				<div><?php echo $_local->gui->text.$_local->gui->list ?></div>
 				<div>
 				<div>
 					<span class="icon_btn_div">
 					<span class="icon_btn_div">
 						<span class="icon_btn_tip"></span>
 						<span class="icon_btn_tip"></span>

+ 1 - 1
app/article/my_collect_index.php

@@ -29,7 +29,7 @@ require_once '../studio/index_tool_bar.php';
 		<div class="index_inner " style="margin-left: 18em;margin-top: 5em;">
 		<div class="index_inner " style="margin-left: 18em;margin-top: 5em;">
 		<div class="file_list_block">
 		<div class="file_list_block">
 			<div class="tool_bar">
 			<div class="tool_bar">
-				<div>文集列表</div>
+				<div><?php echo $_local->gui->composition.$_local->gui->list ?></div>
 				<div>
 				<div>
 					<span class="icon_btn_div">
 					<span class="icon_btn_div">
 						<span class="icon_btn_tip"></span>
 						<span class="icon_btn_tip"></span>

+ 10 - 2
app/lang/lang.php

@@ -16,7 +16,15 @@
 		background-color: var(--tool-bg-color2);
 		background-color: var(--tool-bg-color2);
 	}
 	}
 	#lang_list::after {
 	#lang_list::after {
-    margin-right: 10px;
+	content: " ";
+    position: absolute;
+    bottom: 100%;
+    right: 0;
+    margin-right: 0.7em;
+    border-width: 5px;
+    border-style: solid;
+    border-color: transparent;
+    border-bottom-color: var(--tool-bg-color);
 	}
 	}
 	.dropdown-content a {
 	.dropdown-content a {
 		cursor: pointer;
 		cursor: pointer;
@@ -26,7 +34,7 @@
 		fill: var(--btn-color);
 		fill: var(--btn-color);
 	}
 	}
 	#lang_select{
 	#lang_select{
-		margin: auto;
+		margin: auto 0;
 	}
 	}
 	</style>
 	</style>
 		<div id="lang_select" class="dropdown" onmouseover="switchMenu(this,'lang_list')" onmouseout="hideMenu()">
 		<div id="lang_select" class="dropdown" onmouseover="switchMenu(this,'lang_list')" onmouseout="hideMenu()">

+ 2 - 2
app/pcdl/head_bar.php

@@ -55,7 +55,7 @@
     margin-right: 20px;
     margin-right: 20px;
     border-width: 5px;
     border-width: 5px;
     border-style: solid;
     border-style: solid;
-    border-color: transparent transparent var(--tool-bg-color2) transparent;
+    /*border-color: transparent;*/
 }
 }
 
 
 
 
@@ -236,7 +236,7 @@
 			</div>
 			</div>
 			<div class="toolgroup1">
 			<div class="toolgroup1">
 			<!--<input id="search_input" type="input" placeholder="搜索"  style="margin-left: 0.5em;padding:4px;width: 40em;max-width: 80%" >-->
 			<!--<input id="search_input" type="input" placeholder="搜索"  style="margin-left: 0.5em;padding:4px;width: 40em;max-width: 80%" >-->
-			<span style="display: inline-flex; margin-right: 100px;" title=<?php echo "wikipāli&nbsp;{$_local->gui->search_tools}";?>> 
+			<span style="display: inline-flex; padding-right: 10px;" title=<?php echo "wikipāli&nbsp;{$_local->gui->search_tools}";?>> 
 			<a href="../search" style="display: inline-flex;">
 			<a href="../search" style="display: inline-flex;">
 					<svg t="1598273659942" class="icon" viewBox="0 0 5836 1024" style="fill: var(--btn-color); width: 150px; height: 25px;" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18667" >
 					<svg t="1598273659942" class="icon" viewBox="0 0 5836 1024" style="fill: var(--btn-color); width: 150px; height: 25px;" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18667" >
 						<path d="M5243.733333666665 1024H619.2172046666668C338.4430106666666 1024 107.21720466666665 792.774194 107.21720466666665 512S338.4430106666666 0 619.2172046666668 0h4624.516129c280.774194 0 512 231.225806 512 512s-231.225806 512-512 512zM140.24946266666666 512C140.24946266666666 776.258065 354.9591396666666 990.967742 619.2172046666668 990.967742h4624.516129c264.258065 0 478.967742-214.709677 478.967742-478.967742 0 264.258065-214.709677 478.967742-478.967742 478.967742H619.2172046666668C354.9591396666666 990.967742 140.24946266666666 776.258065 140.24946266666666 512zM619.2172046666668 66.064516C374.7784946666666 66.064516 173.28172066666667 267.56129 173.28172066666667 512S374.7784946666666 957.935484 619.2172046666668 957.935484h4624.516129c244.43871 0 445.935484-201.496774 445.935484-445.935484S5488.172042666665 66.064516 5243.733333666665 66.064516H619.2172046666668z m4624.516129-33.032258c264.258065 0 478.967742 214.709677 478.967742 475.664516C5722.701075666665 247.741935 5507.991397666665 33.032258 5243.733333666665 33.032258zM619.2172046666668 33.032258C354.9591396666666 33.032258 140.24946266666666 247.741935 140.24946266666666 508.696774 140.24946266666666 247.741935 354.9591396666666 33.032258 619.2172046666668 33.032258z" p-id="18668">
 						<path d="M5243.733333666665 1024H619.2172046666668C338.4430106666666 1024 107.21720466666665 792.774194 107.21720466666665 512S338.4430106666666 0 619.2172046666668 0h4624.516129c280.774194 0 512 231.225806 512 512s-231.225806 512-512 512zM140.24946266666666 512C140.24946266666666 776.258065 354.9591396666666 990.967742 619.2172046666668 990.967742h4624.516129c264.258065 0 478.967742-214.709677 478.967742-478.967742 0 264.258065-214.709677 478.967742-478.967742 478.967742H619.2172046666668C354.9591396666666 990.967742 140.24946266666666 776.258065 140.24946266666666 512zM619.2172046666668 66.064516C374.7784946666666 66.064516 173.28172066666667 267.56129 173.28172066666667 512S374.7784946666666 957.935484 619.2172046666668 957.935484h4624.516129c244.43871 0 445.935484-201.496774 445.935484-445.935484S5488.172042666665 66.064516 5243.733333666665 66.064516H619.2172046666668z m4624.516129-33.032258c264.258065 0 478.967742 214.709677 478.967742 475.664516C5722.701075666665 247.741935 5507.991397666665 33.032258 5243.733333666665 33.032258zM619.2172046666668 33.032258C354.9591396666666 33.032258 140.24946266666666 247.741935 140.24946266666666 508.696774 140.24946266666666 247.741935 354.9591396666666 33.032258 619.2172046666668 33.032258z" p-id="18668">

+ 14 - 12
app/public/lang/default.json

@@ -10,7 +10,7 @@
 		"all_data!": "All Data!",
 		"all_data!": "All Data!",
 		"all_done": "Looking up accomplished",
 		"all_done": "Looking up accomplished",
 		"allsplit": "Words Splited Successfully ^-^",
 		"allsplit": "Words Splited Successfully ^-^",
-		"and_another": " and ",
+		"and_another": "&nbsp;and ",
 		"append": "Append",
 		"append": "Append",
 		"apply": "Apply",
 		"apply": "Apply",
 		"applyto": "Apply to",
 		"applyto": "Apply to",
@@ -59,9 +59,9 @@
 		"current": "Current",
 		"current": "Current",
 		"database_admin": "Database Admin",
 		"database_admin": "Database Admin",
 		"date": "Date ",
 		"date": "Date ",
-		"day": " ",
-		"day_1": " ",
-		"days": " day(s) ",
+		"day": "&nbsp;",
+		"day_1": "&nbsp;",
+		"days": "&nbsp;day(s) ",
 		"debug": "Debug",
 		"debug": "Debug",
 		"delete": "Delete",
 		"delete": "Delete",
 		"departure_in_detail": "departure in detail",
 		"departure_in_detail": "departure in detail",
@@ -185,7 +185,7 @@
 		"modifyok": "Modified ",
 		"modifyok": "Modified ",
 		"month": "Month ",
 		"month": "Month ",
 		"month_1": "- ",
 		"month_1": "- ",
-		"months": " month(s) ",
+		"months": "&nbsp;month(s) ",
 		"more": "more",
 		"more": "more",
 		"my_book": "My Book",
 		"my_book": "My Book",
 		"my_dictionary": "My Dictionary",
 		"my_dictionary": "My Dictionary",
@@ -223,7 +223,7 @@
 		"pāli": "Pāli",
 		"pāli": "Pāli",
 		"pali_canon": "Pāḷi Canon",
 		"pali_canon": "Pāḷi Canon",
 		"pāli_code": "Pāli Code",
 		"pāli_code": "Pāli Code",
-		"para": " Paragraphs",
+		"para": "&nbsp;Paragraphs",
 		"paragraph": "Paragraph",
 		"paragraph": "Paragraph",
 		"parent": "Parent",
 		"parent": "Parent",
 		"parent_input": "input parent by click",
 		"parent_input": "input parent by click",
@@ -292,7 +292,7 @@
 		"style": "Style",
 		"style": "Style",
 		"sub_pcode": "Sub&nbsp;Code",
 		"sub_pcode": "Sub&nbsp;Code",
 		"subversion": "Subversion",
 		"subversion": "Subversion",
-		"success": " Words Successfully",
+		"success": "&nbsp;Words Successfully",
 		"successful": "Successful",
 		"successful": "Successful",
 		"sukka": "Sukka",
 		"sukka": "Sukka",
 		"sun_height_degree": "Max solar altitude ",
 		"sun_height_degree": "Max solar altitude ",
@@ -356,7 +356,7 @@
 		"year": "(year)",
 		"year": "(year)",
 		"year_0": "saṃvacchara",
 		"year_0": "saṃvacchara",
 		"year_1": "- ",
 		"year_1": "- ",
-		"years": " year(s) ",
+		"years": "&nbsp;year(s) ",
 		"yes_string": "can ",
 		"yes_string": "can ",
 		"": "",
 		"": "",
 		"continue": "continue",
 		"continue": "continue",
@@ -378,7 +378,7 @@
 		"online_dict_db": "Online Search for Pāḷi",
 		"online_dict_db": "Online Search for Pāḷi",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"cooperate_edit": "Multi-translator Collaboration",
 		"cooperate_edit": "Multi-translator Collaboration",
-		"cannot_empty": " cannot be empty",
+		"cannot_empty": "&nbsp;cannot be empty",
 		"account_existed": "Username is already existed.",
 		"account_existed": "Username is already existed.",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"sync": "synchron",
 		"sync": "synchron",
@@ -416,7 +416,7 @@
 		"folk": "folk",
 		"folk": "folk",
 		"and": "&nbsp;and&nbsp;",
 		"and": "&nbsp;and&nbsp;",
 		"digest": "digest",
 		"digest": "digest",
-		"composition": "composition",
+		"composition": "composition&nbsp;",
 		"corpus_statistics": "corpus statistics",
 		"corpus_statistics": "corpus statistics",
 		"studio": "Studio",
 		"studio": "Studio",
 		"library": "Library",
 		"library": "Library",
@@ -517,7 +517,7 @@
 		"text_num": "No. of text",
 		"text_num": "No. of text",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"I_know": "Got it!",
 		"I_know": "Got it!",
-		"text": "DIY text",
+		"text": "text&nbsp;",
 		"anthology": "anthology ",
 		"anthology": "anthology ",
 		"channel": "channel & style",
 		"channel": "channel & style",
 		"channels": "channels list",
 		"channels": "channels list",
@@ -549,6 +549,8 @@
 		"EXP": "EXP",
 		"EXP": "EXP",
 		"composition_structure": "composition structure",
 		"composition_structure": "composition structure",
 		"search_tools": "search&nbsp;tools",
 		"search_tools": "search&nbsp;tools",
+		"timeline": "timeline",
+		"extension": "extension",
 		"": ""
 		"": ""
 	},
 	},
 	"grammastr": [
 	"grammastr": [
@@ -1943,4 +1945,4 @@
 		"zh_cn": "Simple cīna",
 		"zh_cn": "Simple cīna",
 		"zh_tw": "Traditional cīna"
 		"zh_tw": "Traditional cīna"
 	}
 	}
-}
+}

+ 14 - 12
app/public/lang/en.json

@@ -10,7 +10,7 @@
 		"all_data!": "All Data!",
 		"all_data!": "All Data!",
 		"all_done": "Looking up accomplished",
 		"all_done": "Looking up accomplished",
 		"allsplit": "Words Splited Successfully ^-^",
 		"allsplit": "Words Splited Successfully ^-^",
-		"and_another": " and ",
+		"and_another": "&nbsp;and ",
 		"append": "Append",
 		"append": "Append",
 		"apply": "Apply",
 		"apply": "Apply",
 		"applyto": "Apply to",
 		"applyto": "Apply to",
@@ -59,9 +59,9 @@
 		"current": "Current",
 		"current": "Current",
 		"database_admin": "Database Admin",
 		"database_admin": "Database Admin",
 		"date": "Date",
 		"date": "Date",
-		"day": " ",
-		"day_1": " ",
-		"days": " day(s) ",
+		"day": "&nbsp;",
+		"day_1": "&nbsp;",
+		"days": "&nbsp;day(s) ",
 		"debug": "Debug",
 		"debug": "Debug",
 		"delete": "delete",
 		"delete": "delete",
 		"departure_in_detail": "departure in detail",
 		"departure_in_detail": "departure in detail",
@@ -185,7 +185,7 @@
 		"modifyok": "Modified ",
 		"modifyok": "Modified ",
 		"month": "Month ",
 		"month": "Month ",
 		"month_1": "- ",
 		"month_1": "- ",
-		"months": " month(s) ",
+		"months": "&nbsp;month(s) ",
 		"more": "more",
 		"more": "more",
 		"my_book": "My Book",
 		"my_book": "My Book",
 		"my_dictionary": "My Vocabulary",
 		"my_dictionary": "My Vocabulary",
@@ -223,7 +223,7 @@
 		"pāli": "Pāli",
 		"pāli": "Pāli",
 		"pali_canon": "Pāḷi Canon",
 		"pali_canon": "Pāḷi Canon",
 		"pāli_code": "Pāli Code",
 		"pāli_code": "Pāli Code",
-		"para": " Paragraphs",
+		"para": "&nbsp;Paragraphs",
 		"paragraph": "Paragraph",
 		"paragraph": "Paragraph",
 		"parent": "Parent",
 		"parent": "Parent",
 		"parent_input": "input parent by click",
 		"parent_input": "input parent by click",
@@ -292,7 +292,7 @@
 		"style": "Style",
 		"style": "Style",
 		"sub_pcode": "Sub&nbsp;Code",
 		"sub_pcode": "Sub&nbsp;Code",
 		"subversion": "Subversion",
 		"subversion": "Subversion",
-		"success": " Words Successfully",
+		"success": "&nbsp;Words Successfully",
 		"successful": "Successful",
 		"successful": "Successful",
 		"sukka": "Sukka",
 		"sukka": "Sukka",
 		"sun_height_degree": "Max solar altitude ",
 		"sun_height_degree": "Max solar altitude ",
@@ -356,7 +356,7 @@
 		"year": "(year)",
 		"year": "(year)",
 		"year_0": "year",
 		"year_0": "year",
 		"year_1": "- ",
 		"year_1": "- ",
-		"years": " year(s) ",
+		"years": "&nbsp;year(s) ",
 		"yes_string": "can ",
 		"yes_string": "can ",
 		"": "",
 		"": "",
 		"continue": "continue",
 		"continue": "continue",
@@ -378,7 +378,7 @@
 		"online_dict_db": "Online Search for Pāḷi",
 		"online_dict_db": "Online Search for Pāḷi",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"cooperate_edit": "Multi-translator Collaboration",
 		"cooperate_edit": "Multi-translator Collaboration",
-		"cannot_empty": " cannot be empty",
+		"cannot_empty": "&nbsp;cannot be empty",
 		"account_existed": "Username is already existed",
 		"account_existed": "Username is already existed",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"sync": "synchron",
 		"sync": "synchron",
@@ -416,7 +416,7 @@
 		"folk": "folk",
 		"folk": "folk",
 		"and": "&nbsp;and&nbsp;",
 		"and": "&nbsp;and&nbsp;",
 		"digest": "digest",
 		"digest": "digest",
-		"composition": "composition",
+		"composition": "composition&nbsp;",
 		"corpus_statistics": "corpus statistics",
 		"corpus_statistics": "corpus statistics",
 		"studio": "Studio",
 		"studio": "Studio",
 		"library": "Library",
 		"library": "Library",
@@ -516,7 +516,7 @@
 		"text_num": "No. of text",
 		"text_num": "No. of text",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"I_know": "Got it!",
 		"I_know": "Got it!",
-		"text": "DIY text",
+		"text": "text&nbsp;",
 		"anthology": "anthology ",
 		"anthology": "anthology ",
 		"channel": "channel & style",
 		"channel": "channel & style",
 		"channels": "channels list",
 		"channels": "channels list",
@@ -548,6 +548,8 @@
 		"EXP": "EXP",
 		"EXP": "EXP",
 		"composition_structure": "composition structure",
 		"composition_structure": "composition structure",
 		"search_tools": "search&nbsp;tools",
 		"search_tools": "search&nbsp;tools",
+		"timeline": "timeline",
+		"extension": "extension",
 		"": ""
 		"": ""
 	},
 	},
 	"grammastr": [
 	"grammastr": [
@@ -2126,4 +2128,4 @@
 		"zh_cn": "Simple Chinese",
 		"zh_cn": "Simple Chinese",
 		"zh_tw": "Traditional Chinese"
 		"zh_tw": "Traditional Chinese"
 	}
 	}
-}
+}

+ 14 - 12
app/public/lang/my.json

@@ -10,7 +10,7 @@
 		"all_data!": "All Data!",
 		"all_data!": "All Data!",
 		"all_done": "Looking up accomplished",
 		"all_done": "Looking up accomplished",
 		"allsplit": "Words Splited Successfully ^-^",
 		"allsplit": "Words Splited Successfully ^-^",
-		"and_another": " and ",
+		"and_another": "&nbsp;and ",
 		"append": "Append",
 		"append": "Append",
 		"apply": "Apply",
 		"apply": "Apply",
 		"applyto": "Apply to",
 		"applyto": "Apply to",
@@ -59,9 +59,9 @@
 		"current": "Current",
 		"current": "Current",
 		"database_admin": "Database Admin",
 		"database_admin": "Database Admin",
 		"date": "Date ",
 		"date": "Date ",
-		"day": " ",
-		"day_1": " ",
-		"days": " day(s) ",
+		"day": "&nbsp;",
+		"day_1": "&nbsp;",
+		"days": "&nbsp;day(s) ",
 		"debug": "Debug",
 		"debug": "Debug",
 		"delete": "Delete",
 		"delete": "Delete",
 		"departure_in_detail": "departure in detail",
 		"departure_in_detail": "departure in detail",
@@ -185,7 +185,7 @@
 		"modifyok": "Modified ",
 		"modifyok": "Modified ",
 		"month": "Month ",
 		"month": "Month ",
 		"month_1": "- ",
 		"month_1": "- ",
-		"months": " month(s) ",
+		"months": "&nbsp;month(s) ",
 		"more": "more",
 		"more": "more",
 		"my_book": "My Book",
 		"my_book": "My Book",
 		"my_dictionary": "My Dictionary",
 		"my_dictionary": "My Dictionary",
@@ -223,7 +223,7 @@
 		"pāli": "Pāli",
 		"pāli": "Pāli",
 		"pali_canon": "Pāḷi Canon",
 		"pali_canon": "Pāḷi Canon",
 		"pāli_code": "Pāli Code",
 		"pāli_code": "Pāli Code",
-		"para": " Paragraphs",
+		"para": "&nbsp;Paragraphs",
 		"paragraph": "Paragraph",
 		"paragraph": "Paragraph",
 		"parent": "Parent",
 		"parent": "Parent",
 		"parent_input": "input parent by click",
 		"parent_input": "input parent by click",
@@ -292,7 +292,7 @@
 		"style": "Style",
 		"style": "Style",
 		"sub_pcode": "Sub&nbsp;Code",
 		"sub_pcode": "Sub&nbsp;Code",
 		"subversion": "Subversion",
 		"subversion": "Subversion",
-		"success": " Words Successfully",
+		"success": "&nbsp;Words Successfully",
 		"successful": "Successful",
 		"successful": "Successful",
 		"sukka": "သုက္က",
 		"sukka": "သုက္က",
 		"sun_height_degree": "Max solar altitude ",
 		"sun_height_degree": "Max solar altitude ",
@@ -356,7 +356,7 @@
 		"year": "(year)",
 		"year": "(year)",
 		"year_0": "year",
 		"year_0": "year",
 		"year_1": "- ",
 		"year_1": "- ",
-		"years": " year(s) ",
+		"years": "&nbsp;year(s) ",
 		"yes_string": "can ",
 		"yes_string": "can ",
 		"": "",
 		"": "",
 		"continue": "continue",
 		"continue": "continue",
@@ -378,7 +378,7 @@
 		"online_dict_db": "Online Search for Pāḷi",
 		"online_dict_db": "Online Search for Pāḷi",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"cooperate_edit": "Multi-translator Collaboration",
 		"cooperate_edit": "Multi-translator Collaboration",
-		"cannot_empty": " cannot be empty",
+		"cannot_empty": "&nbsp;cannot be empty",
 		"account_existed": "Username is already existed",
 		"account_existed": "Username is already existed",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"sync": "synchron",
 		"sync": "synchron",
@@ -416,7 +416,7 @@
 		"folk": "folk",
 		"folk": "folk",
 		"and": "&nbsp;and&nbsp;",
 		"and": "&nbsp;and&nbsp;",
 		"digest": "digest",
 		"digest": "digest",
-		"composition": "composition",
+		"composition": "composition&nbsp;",
 		"corpus_statistics": "corpus statistics",
 		"corpus_statistics": "corpus statistics",
 		"studio": "Studio",
 		"studio": "Studio",
 		"library": "Library",
 		"library": "Library",
@@ -516,7 +516,7 @@
 		"text_num": "No. of text",
 		"text_num": "No. of text",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"I_know": "Got it!",
 		"I_know": "Got it!",
-		"text": "DIY text",
+		"text": "text&nbsp;",
 		"anthology": "anthology ",
 		"anthology": "anthology ",
 		"channel": "channel & style",
 		"channel": "channel & style",
 		"channels": "channels list",
 		"channels": "channels list",
@@ -548,6 +548,8 @@
 		"EXP": "EXP",
 		"EXP": "EXP",
 		"composition_structure": "composition structure",
 		"composition_structure": "composition structure",
 		"search_tools": "search&nbsp;tools",
 		"search_tools": "search&nbsp;tools",
+		"timeline": "timeline",
+		"extension": "extension",
 		"": "",
 		"": "",
 		"": ""
 		"": ""
 	},
 	},
@@ -1935,4 +1937,4 @@
 		"zh_cn": "Simple စီနဘာသ",
 		"zh_cn": "Simple စီနဘာသ",
 		"zh_tw": "Traditional စီနဘာသ"
 		"zh_tw": "Traditional စီနဘာသ"
 	}
 	}
-}
+}

+ 17 - 15
app/public/lang/si.json

@@ -10,7 +10,7 @@
 		"all_data!": "දත්ත සියල්ලම",
 		"all_data!": "දත්ත සියල්ලම",
 		"all_done": "Looking up accomplished",
 		"all_done": "Looking up accomplished",
 		"allsplit": "Words Splited Successfully ^-^",
 		"allsplit": "Words Splited Successfully ^-^",
-		"and_another": " ච ",
+		"and_another": "&nbsp;ච ",
 		"append": "Append",
 		"append": "Append",
 		"apply": "යොමු කරනවා",
 		"apply": "යොමු කරනවා",
 		"applyto": "ගානවා",
 		"applyto": "ගානවා",
@@ -59,9 +59,9 @@
 		"current": "අලුත්ම",
 		"current": "අලුත්ම",
 		"database_admin": "පරිගණක දත්ත ගබඩාව පරිපාලනය කරනවා",
 		"database_admin": "පරිගණක දත්ත ගබඩාව පරිපාලනය කරනවා",
 		"date": "දිවස ",
 		"date": "දිවස ",
-		"day": " ",
-		"day_1": " ",
-		"days": " දිවසා(නි) ",
+		"day": "&nbsp;",
+		"day_1": "&nbsp;",
+		"days": "&nbsp;දිවසා(නි) ",
 		"debug": "නිදොස්කරුව",
 		"debug": "නිදොස්කරුව",
 		"delete": "මකා දමනවා",
 		"delete": "මකා දමනවා",
 		"departure_in_detail": "departure in detail",
 		"departure_in_detail": "departure in detail",
@@ -155,7 +155,7 @@
 		"lesson": "lesson",
 		"lesson": "lesson",
 		"letters": "letters",
 		"letters": "letters",
 		"level": "Lv",
 		"level": "Lv",
-		"list": " ඇලය",
+		"list": "&nbsp;ඇලය",
 		"load": "ප්‍රවේශනය ",
 		"load": "ප්‍රවේශනය ",
 		"load_from_database": "දත්ත ගබඩාවේ සිට ප්‍රවේශනය ",
 		"load_from_database": "දත්ත ගබඩාවේ සිට ප්‍රවේශනය ",
 		"load_from_wbw_file": "WBW ගොනුවේ සිට ප්‍රවේශනය ",
 		"load_from_wbw_file": "WBW ගොනුවේ සිට ප්‍රවේශනය ",
@@ -186,9 +186,9 @@
 		"modifyok": "Modified ",
 		"modifyok": "Modified ",
 		"month": "මාස ",
 		"month": "මාස ",
 		"month_1": "- ",
 		"month_1": "- ",
-		"months": " මාසා(නි) ",
+		"months": "&nbsp;මාසා(නි) ",
 		"more": "more",
 		"more": "more",
-		"my_book": " මගේ පොත් ",
+		"my_book": "&nbsp;මගේ පොත් ",
 		"my_book": "අමතර පොත් ",
 		"my_book": "අමතර පොත් ",
 		"my_dictionary": "මගේ ශබ්දකෝෂය",
 		"my_dictionary": "මගේ ශබ්දකෝෂය",
 		"my_document": "මගේ ලිපිගොනු ",
 		"my_document": "මගේ ලිපිගොනු ",
@@ -204,7 +204,7 @@
 		"newproject": "New Project",
 		"newproject": "New Project",
 		"newword": "New Word",
 		"newword": "New Word",
 		"night": "රාත්‍රි ",
 		"night": "රාත්‍රි ",
-		"no.": " No.",
+		"no.": "&nbsp;No.",
 		"no_related_file": "No related file",
 		"no_related_file": "No related file",
 		"no_string": "cannot ",
 		"no_string": "cannot ",
 		"nofilename": "No File Name",
 		"nofilename": "No File Name",
@@ -226,7 +226,7 @@
 		"pāli": "පාලි",
 		"pāli": "පාලි",
 		"pali_canon": "පාලි කැනොන්",
 		"pali_canon": "පාලි කැනොන්",
 		"pāli_code": "Pāli Code",
 		"pāli_code": "Pāli Code",
-		"para": " Paragraphs",
+		"para": "&nbsp;Paragraphs",
 		"paragraph": "ඡේදය",
 		"paragraph": "ඡේදය",
 		"parent": "මූල්‍ය",
 		"parent": "මූල්‍ය",
 		"parent_input": "input parent by click",
 		"parent_input": "input parent by click",
@@ -296,7 +296,7 @@
 		"style": "රීතිය ",
 		"style": "රීතිය ",
 		"sub_pcode": "2nd",
 		"sub_pcode": "2nd",
 		"subversion": "අනු ප්‍රභවය",
 		"subversion": "අනු ප්‍රභවය",
-		"success": " Words Successfully",
+		"success": "&nbsp;Words Successfully",
 		"successful": "සඵල",
 		"successful": "සඵල",
 		"sukka": "සුක්ක",
 		"sukka": "සුක්ක",
 		"sun_height_degree": "Max solar altitude ",
 		"sun_height_degree": "Max solar altitude ",
@@ -361,7 +361,7 @@
 		"year": "(year)",
 		"year": "(year)",
 		"year_0": "සංවච්ඡ‍ර",
 		"year_0": "සංවච්ඡ‍ර",
 		"year_1": "- ",
 		"year_1": "- ",
-		"years": " සංවච්ඡ‍රා(නි) ",
+		"years": "&nbsp;සංවච්ඡ‍රා(නි) ",
 		"yes_string": "can ",
 		"yes_string": "can ",
 		"": "",
 		"": "",
 		"continue": "continue",
 		"continue": "continue",
@@ -383,7 +383,7 @@
 		"online_dict_db": "Online Search for Pāḷi",
 		"online_dict_db": "Online Search for Pāḷi",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"user_data_share": "Editing & Sharing as Open Source",
 		"cooperate_edit": "Multi-translator Collaboration",
 		"cooperate_edit": "Multi-translator Collaboration",
-		"cannot_empty": " cannot be empty",
+		"cannot_empty": "&nbsp;cannot be empty",
 		"account_existed": "Username is already existed",
 		"account_existed": "Username is already existed",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"incorrect_ID_PASS": "Incorrect Username or password.",
 		"sync": "synchron",
 		"sync": "synchron",
@@ -421,7 +421,7 @@
 		"folk": "folk",
 		"folk": "folk",
 		"and": "&nbsp;and&nbsp;",
 		"and": "&nbsp;and&nbsp;",
 		"digest": "digest",
 		"digest": "digest",
-		"composition": "composition",
+		"composition": "composition&nbsp;",
 		"corpus_statistics": "corpus statistics",
 		"corpus_statistics": "corpus statistics",
 		"studio": "Studio",
 		"studio": "Studio",
 		"library": "Library",
 		"library": "Library",
@@ -521,7 +521,7 @@
 		"text_num": "No. of text",
 		"text_num": "No. of text",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"copied_to_clipboard": "has been copied to clipboard.",
 		"I_know": "Got it!",
 		"I_know": "Got it!",
-		"text": "DIY text",
+		"text": "text&nbsp;",
 		"anthology": "anthology ",
 		"anthology": "anthology ",
 		"channel": "channel & style",
 		"channel": "channel & style",
 		"channels": "channels list",
 		"channels": "channels list",
@@ -553,6 +553,8 @@
 		"EXP": "EXP",
 		"EXP": "EXP",
 		"composition_structure": "composition structure",
 		"composition_structure": "composition structure",
 		"search_tools": "search&nbsp;tools",
 		"search_tools": "search&nbsp;tools",
+		"timeline": "timeline",
+		"extension": "extension",
 		"": "",
 		"": "",
 		"": ""
 		"": ""
 	},
 	},
@@ -1828,4 +1830,4 @@
 		"zh_cn": "Simple චීන",
 		"zh_cn": "Simple චීන",
 		"zh_tw": "Traditional චීන"
 		"zh_tw": "Traditional චීන"
 	}
 	}
-}
+}

+ 3 - 1
app/public/lang/zh-cn.json

@@ -550,6 +550,8 @@
 		"EXP": "经验",
 		"EXP": "经验",
 		"composition_structure": "文章架构",
 		"composition_structure": "文章架构",
 		"search_tools": "搜索工具",
 		"search_tools": "搜索工具",
+		"timeline": "时间线",
+		"extension": "横向对比",
 		"": ""
 		"": ""
 	},
 	},
 	"grammastr": [
 	"grammastr": [
@@ -2112,4 +2114,4 @@
 		"zh_cn": "简体中文",
 		"zh_cn": "简体中文",
 		"zh_tw": "正体中文"
 		"zh_tw": "正体中文"
 	}
 	}
-}
+}

+ 3 - 1
app/public/lang/zh-tw.json

@@ -550,6 +550,8 @@
 		"EXP": "經驗",
 		"EXP": "經驗",
 		"composition_structure": "文章架構",
 		"composition_structure": "文章架構",
 		"search_tools": "搜尋工具",
 		"search_tools": "搜尋工具",
+		"timeline": "時間線",
+		"extension": "橫向對比",
 		"": ""
 		"": ""
 	},
 	},
 	"grammastr": [
 	"grammastr": [
@@ -2108,4 +2110,4 @@
 		"zh_cn": "簡體中文",
 		"zh_cn": "簡體中文",
 		"zh_tw": "正體中文"
 		"zh_tw": "正體中文"
 	}
 	}
-}
+}

+ 1 - 1
app/studio/index_tool_bar.php

@@ -113,7 +113,7 @@
 						<svg t="1603167726865" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3914" width="32" height="32"><path d="M927.873506 253.409882H768V160.018071C768 71.806494 696.193506 0 607.981929 0H160.015059C71.661929 0 0.144565 71.661929 0 160.018071V863.984941C0 952.193506 71.806494 1024 160.018071 1024h702.238117l0.572236-0.144565 1.153505 0.144565C952.193506 1024 1024 952.193506 1024 863.981929V349.536376c-0.144565-53.097412-43.026071-95.984941-96.126494-96.126494zM525.239718 602.515576H205.203576c-17.700141 0-31.945788-14.390212-31.945788-31.945788 0-17.700141 14.390212-31.9488 31.945788-31.9488h320.036142c17.700141 0 31.945788 14.390212 31.945788 31.9488 0 17.697129-14.245647 31.945788-31.945788 31.945788z m0-159.873505H205.203576c-17.700141 0-31.945788-14.390212-31.945788-31.945789 0-17.700141 14.390212-31.9488 31.945788-31.9488h320.036142c17.700141 0 31.945788 14.390212 31.945788 31.9488 0 17.555576-14.245647 31.945788-31.945788 31.945789z m0-160.021083H205.203576c-17.700141 0-31.945788-14.3872-31.945788-31.945788 0-17.697129 14.390212-31.945788 31.945788-31.945788h320.036142c17.700141 0 31.945788 14.390212 31.945788 31.945788 0 17.558588-14.245647 31.945788-31.945788 31.945788z m434.724141 581.360941c0 52.811294-43.026071 95.984941-95.984941 95.984942-52.952847 0-95.978918-43.173647-95.978918-95.984942V317.446024h160.015059c17.703153 0 31.9488 14.390212 31.9488 31.945788v514.590117z" p-id="3915"></path></svg>	
 						<svg t="1603167726865" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3914" width="32" height="32"><path d="M927.873506 253.409882H768V160.018071C768 71.806494 696.193506 0 607.981929 0H160.015059C71.661929 0 0.144565 71.661929 0 160.018071V863.984941C0 952.193506 71.806494 1024 160.018071 1024h702.238117l0.572236-0.144565 1.153505 0.144565C952.193506 1024 1024 952.193506 1024 863.981929V349.536376c-0.144565-53.097412-43.026071-95.984941-96.126494-96.126494zM525.239718 602.515576H205.203576c-17.700141 0-31.945788-14.390212-31.945788-31.945788 0-17.700141 14.390212-31.9488 31.945788-31.9488h320.036142c17.700141 0 31.945788 14.390212 31.945788 31.9488 0 17.697129-14.245647 31.945788-31.945788 31.945788z m0-159.873505H205.203576c-17.700141 0-31.945788-14.390212-31.945788-31.945789 0-17.700141 14.390212-31.9488 31.945788-31.9488h320.036142c17.700141 0 31.945788 14.390212 31.945788 31.9488 0 17.555576-14.245647 31.945788-31.945788 31.945789z m0-160.021083H205.203576c-17.700141 0-31.945788-14.3872-31.945788-31.945788 0-17.697129 14.390212-31.945788 31.945788-31.945788h320.036142c17.700141 0 31.945788 14.390212 31.945788 31.945788 0 17.558588-14.245647 31.945788-31.945788 31.945788z m434.724141 581.360941c0 52.811294-43.026071 95.984941-95.984941 95.984942-52.952847 0-95.978918-43.173647-95.978918-95.984942V317.446024h160.015059c17.703153 0 31.9488 14.390212 31.9488 31.945788v514.590117z" p-id="3915"></path></svg>	
 					</span>	
 					</span>	
 					<span class="navi_text">
 					<span class="navi_text">
-					<?php echo $_local->gui->text;?>
+					<?php echo $_local->gui->text."DIY";?>
 					</span>
 					</span>
 				</li>
 				</li>
 
 

+ 8 - 8
app/term/note.js

@@ -487,16 +487,16 @@ function note_json_html(in_json) {
 			"' ,'" +
 			"' ,'" +
 			iterator.channal +
 			iterator.channal +
 			"')\"";
 			"')\"";
-		output += ">Edit</span>";
-		output += "<span class = 'tip_buttom'>Like</span>";
-		output += "<span class = 'tip_buttom'>Comment</span>";
-		output += "<span class = 'tip_buttom'>Share</span>";
-		output += "<span class = 'tip_buttom'>Copy</span>";
-		output += "<span class = 'tip_buttom'>Digest</span>";
+		output += ">" + gLocal.gui.edit + "</span>";
 		output += "<span class = 'tip_buttom' ";
 		output += "<span class = 'tip_buttom' ";
 		output += " onclick=\"history_show('" + iterator.id + "')\"";
 		output += " onclick=\"history_show('" + iterator.id + "')\"";
-		output += ">History</span>";
-		output += "<span class = 'tip_buttom'>Expand</span>";
+		output += ">" + gLocal.gui.timeline + "</span>";
+		output += "<span class = 'tip_buttom'>" + gLocal.gui.extension + "</span>";
+		output += "<span class = 'tip_buttom'>" + gLocal.gui.like + "</span>";
+		output += "<span class = 'tip_buttom'>" + gLocal.gui.comment + "</span>";
+		output += "<span class = 'tip_buttom'>" + gLocal.gui.copy + "</span>";
+		output += "<span class = 'tip_buttom'>" + gLocal.gui.digest + "</span>";
+		output += "<span class = 'tip_buttom'>" + gLocal.gui.share_to + "</span>";
 		output += "</div>";
 		output += "</div>";
 		//句子工具栏结束
 		//句子工具栏结束
 		output += "</div>";
 		output += "</div>";

+ 4 - 1
app/term/term.css

@@ -41,6 +41,9 @@ chapter {
 	text-decoration: none;
 	text-decoration: none;
 	cursor: pointer;
 	cursor: pointer;
 }
 }
+chapter::after {
+	content: " > ";
+}
 chapter:hover {
 chapter:hover {
 	color: var(--link-color);
 	color: var(--link-color);
 	text-decoration: underline;
 	text-decoration: underline;
@@ -177,7 +180,7 @@ note .ref {
 	text-align: right;
 	text-align: right;
 	padding: 5px;
 	padding: 5px;
 	font-size: 75%;
 	font-size: 75%;
-	margin-top: -2.5em;
+	margin-top: -2em;
 }
 }
 
 
 .tran {
 .tran {

+ 11 - 2
app/ucenter/user.php

@@ -12,7 +12,15 @@
 		background-color: var(--tool-bg-color2);
 		background-color: var(--tool-bg-color2);
 	}
 	}
 	#user_info::after {
 	#user_info::after {
-    margin-right: 10px;
+	content: " ";
+    position: absolute;
+    bottom: 100%;
+    right: 0;
+    margin-right: 1em;
+    border-width: 5px;
+    border-style: solid;
+    border-color: transparent;
+    border-bottom-color: var(--bg-color);
 	}
 	}
 	.dropdown-content a {
 	.dropdown-content a {
 		cursor: pointer;
 		cursor: pointer;
@@ -20,6 +28,7 @@
 	#user_info{
 	#user_info{
 		width:20em;
 		width:20em;
 	}
 	}
+
 	#user_info_welcome{
 	#user_info_welcome{
 		border-bottom: 1px solid var(--tool-line-color);
 		border-bottom: 1px solid var(--tool-line-color);
 		padding: 10px;
 		padding: 10px;
@@ -52,7 +61,7 @@
 	}
 	}
 
 
 	</style>
 	</style>
-		<div style="margin:auto;" class="dropdown" onmouseover="switchMenu(this,'user_info')" onmouseout="hideMenu()">
+		<div style="margin:auto 0;" class="dropdown" onmouseover="switchMenu(this,'user_info')" onmouseout="hideMenu()">
 			
 			
 				<?php
 				<?php
 				if(isset($_COOKIE["userid"])){
 				if(isset($_COOKIE["userid"])){