Merge pull request #286 from visuddhinanda/master

channel管理样式调整

app/channal/channal.js

@@ -99,10 +99,17 @@ function my_channal_edit(id) {
 					html += '<div style="max-width:2em;flex:1;"></div>';
 					html += "</div>";
 
-					html += "<div style='display:flex;'>";
+					html += "<div style='width: 60%;padding: 1em;min-width: 25em;'>";
+					html += '<div style="display:flex;line-height:32px;">';
 					html += "<div style='flex:2;'>" + gLocal.gui.title + "</div>";
 					html += "<div style='flex:8;'>";
 					html += "<input type='hidden' name='id' value='" + result.id + "'/>";
+					html += "</div>";
+					html += "</div>";
+
+					html += '<div style="display:flex;line-height:32px;">';
+					html += '<div style="flex:2;">'+gLocal.gui.name+'</div>';
+					html += '<div style="flex:8;">';
 					html +=
 						"<input type='input' name='name' value='" +
 						result.name +
@@ -117,9 +124,9 @@ function my_channal_edit(id) {
 					html += "</div>";
 					html += "</div>";
 
-					html += "<div style='display:flex;'>";
-					html += "<div style='flex:2;'>" + gLocal.gui.language + "</div>";
-					html += "<div style='flex:8;'>";
+					html += '<div style="display:flex;line-height:32px;">';
+					html += '<div style="flex:2;">'+gLocal.gui.language_select+'</div>';
+					html += '<div style="flex:8;">';
 					html +=
 						'<input id="channal_lang_select" type="input"  onchange="channal_lang_change()"' +
 						' placeholder = "try type chinese or en " ' +
@@ -133,8 +140,8 @@ function my_channal_edit(id) {
 					html += "</div>";
 					html += "</div>";
 
-					html += '<div style="display:flex;">';
-					html += '<div style="flex:2;">' + gLocal.gui.view + "</div>";
+					html += '<div style="display:flex;line-height:32px;">';
+					html += '<div style="flex:2;">'+gLocal.gui.privacy+'</div>';
 					html += '<div style="flex:8;">';
 					let arrStatus = [
 						{ id: 0, string: gLocal.gui.disable, note: gLocal.gui.disable_note },
@@ -153,7 +160,8 @@ function my_channal_edit(id) {
 					}
 
 					html += "</select>";
-					html += "<span id = 'status_help'>" + status_note + "</span><a href='#' target='_blank'>[详情]</a>";
+					html += "<span id = 'status_help' style='margin: 0 1em;'>" + status_note + "</span><a href='#' target='_blank'>["+gLocal.gui.infomation+"]</li>";
+					html += "</div>";
 					html += "</div>";
 					html += "</div>";
 

app/channal/my_channal_edit.php

@@ -55,10 +55,10 @@ require_once '../studio/index_head.php';
 	<div class="index_inner " >
 	<form id="channal_edit" action="##" onsubmit="return false"  method="POST" >
 	<div class="file_list_block">
-		<div class="tool_bar">
+		<div class="tool_bar" style="line-height: 30px;">
 			<div style="display:flex;">
 				<a href="../channal/my_channal_index.php"><?php echo $_local->gui->back;?></a>
-				<span id="channal_title"></span>
+				<span id="channal_title" style="padding: 0 1em;"></span>
 			</div>
 			<div style="display:flex;">
 				<div id="aritcle_status"></div>
@@ -82,7 +82,7 @@ require_once '../studio/index_head.php';
 			</div>
 		</div>
 
-		<div id="channal_info"  class="file_list_block" style="">
+		<div id="channal_info"  class="file_list_block" style="height: 28em;">
 
 		</div>
 

app/public/lang/default.json

@@ -570,7 +570,7 @@
 		"show_nissaya": "show nissaya",
 		"related_para": "related paragraph",
 		"disable": "disable",
-		"disable_note": "disable",
+		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"": ""
 	},

app/public/lang/en.json

@@ -569,7 +569,7 @@
 		"show_nissaya": "show nissaya",
 		"related_para": "related paragraph",
 		"disable": "disable",
-		"disable_note": "disable",
+		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"": ""
 	},

app/public/lang/my.json

@@ -569,7 +569,7 @@
 		"show_nissaya": "show nissaya",
 		"related_para": "related paragraph",
 		"disable": "disable",
-		"disable_note": "disable",
+		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"": "",
 		"": ""

app/public/lang/si.json

@@ -574,7 +574,7 @@
 		"show_nissaya": "show nissaya",
 		"related_para": "related paragraph",
 		"disable": "disable",
-		"disable_note": "disable",
+		"disable_note": "disable & invisible to anyone including myself",
 		"not_found": "not found",
 		"": "",
 		"": ""

app/public/lang/zh-cn.json

@@ -571,7 +571,7 @@
 		"show_nissaya": "显示nissaya",
 		"related_para": "相应段落",
 		"disable": "停用",
-		"disable_note": "停用,即使自己也无法更新",
+		"disable_note": "停用，即使自己也无法更新",
 		"not_found": "未找到",
 		"site_intro": "想学巴利不知从何开始<br>学过巴利语法但是面对圣典无从下手<br>想要翻译巴利但面临种种困难<br>我们都有相关工具为您提供支持<br>降低巴利语的阅读门槛",