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

app/article/index.php

@@ -117,6 +117,9 @@ require_once "../pcdl/html_head.php";
 	#head_bar{
 		height:unset;
 	}
+	#contents_foot{
+		margin-bottom: 70vh;
+	}
 
 
 #toc_content .level_2{
@@ -160,6 +163,17 @@ require_once "../pcdl/html_head.php";
      object-fit: cover;
      background-size: contain;   
  }
+ .channal_list{
+		white-space: nowrap;
+		overflow-x: hidden;
+	}
+	.userinfo_channal{
+		display:none;
+	}
+	.userinfo_channal:hover{
+		display:block;
+	}
+
 
 	</style>
 
@@ -264,7 +278,7 @@ require_once "../pcdl/html_head.php";
 		</div>
 		<div class="fun_frame">
 			<div style="display:flex;justify-content: space-between;">
-				<div class="title"><?php echo "Contributor" ?></div>
+				<div class="title"><?php echo $_local->gui->contributor ?></div>
 				<div class="click_dropdown_div">
 					<div class="channel_select_button" onclick="onChannelMultiSelectStart()"><?php echo "Multi-Select"; ?></div>
 				</div>

app/pcdl/html_head.php

@@ -67,6 +67,7 @@ else{
 	<style>
 	.list_with_head{
 		display:flex;
+		margin: 3px 0;
 	}
 	.head_img{
 		display: inline-block;
@@ -77,8 +78,7 @@ else{
 		color: white;
 		border-radius: 99px;
 		text-align: center;
-		margin-right: 0.5em;
-		margin-top: 0.5em;
+		margin: auto 2px;
 	}
 	.card{
 		box-shadow: 0 0 10px rgba(0,0,0,0.15);

app/pcdl/reader.php

@@ -252,6 +252,7 @@ note{
 }
 .list_with_head{
 	display:flex;
+	margin: 3px 0;
 }
 .head_img{
 	display: inline-block;
@@ -262,8 +263,7 @@ note{
     color: white;
     border-radius: 99px;
     text-align: center;
-    margin-right: 0.5em;
-    margin-top: 0.5em;
+    margin: auto 2px;
 }
 .term_mean{
 	color:blue;

app/public/lang/default.json

@@ -551,6 +551,8 @@
 		"search_tools": "search tools",
 		"timeline": "timeline",
 		"extension": "extension",
+		"no_created": " is not created yet",
+		"create_now": "create now",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -550,6 +550,8 @@
 		"search_tools": "search tools",
 		"timeline": "timeline",
 		"extension": "extension",
+		"no_created": " is not created yet",
+		"create_now": "create now",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -550,6 +550,8 @@
 		"search_tools": "search tools",
 		"timeline": "timeline",
 		"extension": "extension",
+		"no_created": " is not created yet",
+		"create_now": "create now",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -555,6 +555,8 @@
 		"search_tools": "search tools",
 		"timeline": "timeline",
 		"extension": "extension",
+		"no_created": " is not created yet",
+		"create_now": "create now",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -552,6 +552,10 @@
 		"search_tools": "搜索工具",
 		"timeline": "时间线",
 		"extension": "横向对比",
+		"no_created": "尚未创建",
+		"create_now": "现在创建",
+		"": "",
+		"": "",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -552,6 +552,8 @@
 		"search_tools": "搜尋工具",
 		"timeline": "時間線",
 		"extension": "橫向對比",
+		"no_created": "尚未建立",
+		"create_now": "現在建立",
 		"": ""
 	},
 	"grammastr": [

app/reader/index.php

@@ -128,6 +128,9 @@ require_once "../pcdl/html_head.php";
 	#head_bar{
 		height:unset;
 	}
+	#contents_foot{
+		margin-bottom: 70vh;
+	}
 
 
 #toc_content .level_2{
@@ -197,6 +200,16 @@ require_once "../pcdl/html_head.php";
 .level_6{
 	margin-left:6em;
 }
+.channal_list{
+		white-space: nowrap;
+		overflow-x: hidden;
+	}
+	.userinfo_channal{
+		display:none;
+	}
+	.userinfo_channal:hover{
+		display:block;
+	}
 
 
 	</style>

app/term/note.js

@@ -38,20 +38,22 @@ function note_create() {
 	term_edit_dlg_init();
 }
 function note_sent_edit_dlg_init() {
-	$("body").append('<div id="note_sent_edit_dlg" title="Edit"><div id="edit_dialog_content"></div></div>');
+	$("body").append(
+		'<div id="note_sent_edit_dlg" title="' + gLocal.gui.edit + '"><div id="edit_dialog_content"></div></div>'
+	);
 	$("#note_sent_edit_dlg").dialog({
 		autoOpen: false,
 		width: 550,
 		buttons: [
 			{
-				text: "Save",
+				text: gLocal.gui.save,
 				click: function () {
 					note_sent_save();
 					$(this).dialog("close");
 				},
 			},
 			{
-				text: "Cancel",
+				text: gLocal.gui.cancel,
 				click: function () {
 					$(this).dialog("close");
 				},
@@ -319,7 +321,7 @@ function render_channal_list(channalinfo) {
 
 	output += "<div style='width: 100%;overflow-x: hidden;'>";
 
-	output += "<div>";
+	output += "<div class='channal_list' >";
 
 	//  output += "<a href='../wiki/wiki.php?word=" + _word;
 	//  output += "&channal=" + channalinfo.id + "' >";
@@ -328,11 +330,11 @@ function render_channal_list(channalinfo) {
 	output += channalinfo["name"];
 
 	output += "</a>";
+	output += "@" + channalinfo["nickname"];
 	output += "</div>";
 
-	output += "<div>";
-	output += channalinfo["nickname"] + "/";
-	output += "@" + channalinfo["username"];
+	output += "<div class='userinfo_channal'>";
+	output += channalinfo["username"];
 	output += "</div>";
 
 	if (channalinfo["final"]) {
@@ -622,7 +624,7 @@ function note_edit_sentence(book, para, begin, end, channal) {
 			for (const tran of iterator.translation) {
 				if (tran.channal == channal) {
 					let html = "";
-					html += "<div style='color:blue;'>" + channalInfo.nickname + "/" + channalInfo.name + "</div>";
+					html += "<div style='color:blue;'>" + channalInfo.name + "@" + channalInfo.nickname + "</div>";
 					html +=
 						"<textarea id='edit_dialog_text' sent_id='" +
 						tran.id +

app/term/term.js

@@ -670,7 +670,17 @@ function term_updata_translation() {
 
 function term_show_win(guid, keyWord = "") {
 	if (guid == "") {
-		$(term_body).html("当前词条未创建。<br /><a onclick=\"term_add_new('" + keyWord + "')\">现在创建</a>");
+		$(term_body).html(
+			"“" +
+				keyWord +
+				"”" +
+				gLocal.gui.no_created +
+				"<br /><button onclick=\"term_add_new('" +
+				keyWord +
+				"')\">" +
+				gLocal.gui.create_now +
+				"</button>"
+		);
 	} else {
 		let currWord = term_lookup_my_id(guid);
 		if (currWord) {