样式微调

app/article/article.js

@@ -31,6 +31,7 @@ function articel_load(id, collection_id) {
 						$("#article_author").html(result.username.nickname + "@" + result.username.username);
 						$("#contents").html(note_init(result.content));
 						note_refresh_new();
+						guide_init();
 					}
 				} catch (e) {
 					console.error(e);

app/article/get.php

@@ -18,10 +18,10 @@ if(isset($_GET["id"])){
 	$power = $article->getPower($_GET["id"],$collectionId);
 	if($power<10){
 		$output = array();
-		$output["title"]="error";
-		$output["subtitle"]="No Power For Read";
+		$output["title"]="Sorry对不起";
+		$output["subtitle"]="No Power For Read<br>没有阅读权限";
 		$output["summary"]="";
-		$output["content"]="该资源不是公开资源。您**没有**阅读权限。";
+		$output["content"]="This is a **private** rescouce, reading need special <guide gid='power_set'><b>power</b></guide>.<br>该资源是**私密**资源，阅读需要<guide gid='power_set'><b>权限</b></guide>。";
 		$output["owner"]="";
 		$output["username"]=array("username"=>"","nickname"=>"");
 		$output["status"]="";

app/article/my_article.js

@@ -25,8 +25,8 @@ function my_article_list() {
 					html += "<div style='flex:4;'>" + gLocal.gui.title + "</div>";
 					html += "<div style='flex:2;'>" + gLocal.gui.privacy + "</div>";
 					html += "<div style='flex:1;'>" + gLocal.gui.edit + "</a></div>";
-					html += "<div style='flex:1;'>" + gLocal.gui.copy_link + "</div>";
 					html += "<div style='flex:1;'>" + gLocal.gui.preview + "</a></div>";
+					html += "<div style='flex:1;'>" + gLocal.gui.copy_link + "</div>";
 					html += "<div style='flex:1;'>" + gLocal.gui.share_to + "</div>";
 					html += "</div>";
 					//列表

app/dict/redis_refresh_first_mean.php

@@ -20,24 +20,24 @@ if (PHP_SAPI == "cli") {
 			print_r($languages);
 			foreach ($languages as $thisLang) {
 				# code...
+				echo "runing $thisLang \n";
 				$query = "SELECT word,mean from " . _TABLE_DICT_REF_ . " where language = ? group by word";
-				$meanings = PDO_FetchAll($query, array($thisLang));
-				foreach ($meanings as $mean) {
-					# code...
-					$redis->hSet("ref_first_mean://".$thisLang,$mean["word"],$mean["mean"]);
+				$stmt = $PDO->prepare($query);
+        		$stmt->execute(array($thisLang));
+				while($meaning=$stmt->fetch(PDO::FETCH_ASSOC)){
+					$redis->hSet("ref_first_mean://".$thisLang,$meaning["word"],$meaning["mean"]);
 				}
 				echo $thisLang.":".$redis->hLen("ref_first_mean://".$thisLang)."\n";
 			}
 
 			$query = "SELECT word,mean from " . _TABLE_DICT_REF_ . " where 1 group by word";
-			$meanings = PDO_FetchAll($query);
-			foreach ($meanings as $mean) {
-				# code...
-				$redis->hSet("ref_first_mean://com",$mean["word"],$mean["mean"]);
+			$stmt = $PDO->prepare($query);
+			$stmt->execute();
+			while($meaning=$stmt->fetch(PDO::FETCH_ASSOC)){
+				$redis->hSet("ref_first_mean://com",$meaning["word"],$meaning["mean"]);
 			}
 			echo "com:".$redis->hLen("ref_first_mean://com")."\n";
 		}
-
 	}
 	else{
 		echo "no redis server";

app/group/group.js

@@ -200,7 +200,7 @@ function group_list(id, list) {
 									cardUrl = "../channal/card.php";
 									break;
 								case 3: //article
-									html += "<use xlink:href='../studio/svg/icon.svg#article-1'></use>";
+									html += "<use xlink:href='../studio/svg/icon.svg#article_1'></use>";
 									cardUrl = "../article/card.php";
 									doing +=
 										"<a href='../article/?id=" + iterator.res_id + "' target='_blank'>查看</a>";

app/guide/guide.css

@@ -10,7 +10,7 @@ guide {
 	background-repeat: no-repeat;
 	background-size: contain;
 	margin: 0 6px;
-	color: var(--tool-color);
+	color: var(--link-color);
 }
 guide:hover .guide_contence {
 	display: inline-block;

app/studio/index_tool_bar.php

@@ -111,7 +111,7 @@
 				<li id="article"  onclick="goto_url(this,'../article/my_article_index.php')">
 					<span  class="navi_icon">
 					<svg class="icon">
-						<use xlink:href="../studio/svg/icon.svg#article-1"></use>
+						<use xlink:href="../studio/svg/icon.svg#article_1"></use>
 					</svg>	
 					</span>	
 					<span class="navi_text">

app/term/note.js

@@ -917,7 +917,7 @@ function render_one_sent_tran_a(iterator) {
 	html += '<ul class="tag_list">';
 	if (iterator.pr_all && parseInt(iterator.pr_all) > 0) {
 		html +=
-			"			<li onclick=\"note_pr_show('" +
+			"<li onclick=\"note_pr_show('" +
 			iterator.channal +
 			"','" +
 			sid +
@@ -1028,11 +1028,82 @@ function render_one_sent_tran(book, para, begin, end, iterator) {
 	return output;
 }
 function add_new_tran_button_click(obj) {
-	let html = "<ul>";
+	let html = "<div style='display:flex; max-width: 40vw; white-space: normal;'>"
+	var first_lang = ""
 	for (const iterator of _my_channal) {
-		if (iterator.status > 0) {
+		if(iterator.lang){
+			first_lang=iterator.lang
+			break;
+		}
+	}
+	html += "<ul class='channel_list lang_0' >";
+	html += '<li style="border-bottom: solid 1px;">';
+	html += first_lang;
+	html += "</li>";
+	for (const iterator of _my_channal) {
+		if (iterator.status > 0 && first_lang.indexOf(iterator.lang)!=-1 && iterator.lang!=0) {
+			if (_channal.indexOf(iterator.id) < 0) {
+				html += '<li class="channel_name" onclick="';
+				html +=
+					"new_sentence('" +
+					$(obj).parent().attr("book") +
+					"' ,'" +
+					$(obj).parent().attr("para") +
+					"' ,'" +
+					$(obj).parent().attr("begin") +
+					"' ,'" +
+					$(obj).parent().attr("end") +
+					"' ,'" +
+					iterator.id +
+					"',this)";
+				html += '" title="'+iterator.nickname
+				html += '">' + iterator.name;
+				if (parseInt(iterator.power) < 20) {
+					html += "(建议)";
+				}
+				html += "</li>";
+			}
+		}
+	}
+	html += "</ul>";
+	html+="<ul class='channel_list lang_1'>";
+	html += '<li style="border-bottom: solid 1px;">';
+	html += gLocal.gui.other;
+	html += "</li>";
+	for (const iterator of _my_channal) {
+		if (iterator.status > 0 && first_lang.indexOf(iterator.lang)==-1 && iterator.lang!=0) {
+			if (_channal.indexOf(iterator.id) < 0) {
+				html += '<li class="channel_name" onclick="';
+				html +=
+					"new_sentence('" +
+					$(obj).parent().attr("book") +
+					"' ,'" +
+					$(obj).parent().attr("para") +
+					"' ,'" +
+					$(obj).parent().attr("begin") +
+					"' ,'" +
+					$(obj).parent().attr("end") +
+					"' ,'" +
+					iterator.id +
+					"',this)";
+				html += '" title="'+iterator.nickname
+				html += '">' + iterator.name;
+				if (parseInt(iterator.power) < 20) {
+					html += "(建议)";
+				}
+				html += "</li>";
+			}
+		}
+	}
+	html += "</ul>";
+	html+="<ul class='channel_list lang_2'>";
+	html += '<li style="border-bottom: solid 1px;">';
+	html += gLocal.gui.collaborate;
+	html += "</li>";
+	for (const iterator of _my_channal) {
+		if (iterator.status > 0 && iterator.lang==0) {
 			if (_channal.indexOf(iterator.id) < 0) {
-				html += '<li onclick="';
+				html += '<li class="channel_name" onclick="';
 				html +=
 					"new_sentence('" +
 					$(obj).parent().attr("book") +
@@ -1045,6 +1116,7 @@ function add_new_tran_button_click(obj) {
 					"' ,'" +
 					iterator.id +
 					"',this)";
+				html += '" title="'+iterator.nickname
 				html += '">' + iterator.name;
 				if (parseInt(iterator.power) < 20) {
 					html += "(建议)";
@@ -1054,6 +1126,8 @@ function add_new_tran_button_click(obj) {
 		}
 	}
 	html += "</ul>";
+
+	html += "</div>";
 	$(obj).parent().children(".tran_text_tool_bar").first().html(html);
 
 	if ($(obj).parent().children(".tran_text_tool_bar").css("display") == "block") {

app/term/term.css

@@ -627,7 +627,7 @@ pw {
 .tool_bar > .right {
 	position: absolute;
 	right: 0;
-	margin-top: -18px;
+	margin-top: -2.6em;
 	display: none;
 	width: auto;
 	background-color: var(--bg-color);
@@ -718,3 +718,12 @@ li.active {
 .disable {
 	cursor: not-allowed;
 }
+.channel_name {
+	white-space: nowrap;
+}
+.channel_name:hover {
+	background-color: var(--btn-border-color);
+}
+.channel_list {
+	margin-right: 4px;
+}

app/uhome/foot_step.php

@@ -28,6 +28,10 @@ include "../pcdl/html_head.php";
 <link href='../lib/fullcalendar/main.css' rel='stylesheet' />
 <script src='../lib/fullcalendar/main.js'></script>
 
+<script src="..app/public/js/highcharts/modules/stock.js"></script>
+<script src="https://code.highcharts.com/stock/modules/data.js"></script>
+<script src="https://code.highcharts.com/stock/modules/exporting.js"></script>
+
 <script src="https://code.highcharts.com/stock/highstock.js"></script>
 <script src="https://code.highcharts.com/stock/modules/data.js"></script>
 <script src="https://code.highcharts.com/stock/modules/exporting.js"></script>

documents/users_guide/en/power_set.md

@@ -0,0 +1,7 @@
+# Private & Power
+|Power Level|Private|Public|Towards to|
+|-|-|-|-|
+|none|invisible|read<br>suggest|guests<br>open distributors|
+|Read Only|read<br>suggest|read<br>suggest|students<br>test-reader|
+|Read & Write|read<br>write|read<br>write|proof reader<br>reviser<br>collaborator<br>polisher|
+|Owner|read<br>write<br>power set|read<br>write<br>power set|——|

documents/users_guide/zh-cn/power_set.md

@@ -0,0 +1,8 @@
+# 隐私与权限
+
+|权限级别|私享|公开|应用范例|
+|-|-|-|-|
+|无|不可见|查看<br>提建议|陌生读者<br>开源协作|
+|只读|查看<br>提建议|查看<br>提建议|上课学员<br>尝鲜试读|
+|修改|查看<br>修改|查看<br>修改|审稿人<br>校对者<br>协作者<br>润色者|
+|拥有者|查看<br>修改<br>设权限|查看<br>修改<br>设权限|——|

documents/users_guide/zh-tw/power_set.md

@@ -0,0 +1,8 @@
+# 隱私與許可權
+
+|許可權級別|私享|公開|應用範例|
+|-|-|-|-|
+|無|不可見|檢視<br>提建議|陌生讀者<br>開源協作|
+|只讀|檢視<br>提建議|檢視<br>提建議|上課學員<br>嚐鮮試讀|
+|修改|檢視<br>修改|檢視<br>修改|審稿人<br>校對者<br>協作者<br>潤色者|
+|擁有者|檢視<br>修改<br>設許可權|檢視<br>修改<br>設許可權|——|

documents/图标.md

@@ -104,4 +104,10 @@
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48" height="48" viewBox="0 0 256 256" enable-background="new 0 0 248 256" xml:space="preserve"> <path d="M118,31v194l128,29V2L118,31z M130,40.59l104-23.57v221.96l-104-23.57V40.59z M2,30v224h39v-30h12 c18.085,0,31.965-15.162,31.965-33.346v-19.666h14.033c3.755,0,6.72-2.965,6.72-6.621c0-0.889-0.099-1.779-0.494-2.569 l-19.468-47.435c0,0-1.779-18.085-3.36-25.002C75.181,58.132,40.751,30,3,30C2.704,30,2.988,30,2,30z M54.824,116.635 c0-4.941,3.953-8.894,8.894-8.894s8.894,3.953,8.894,8.894c0,4.941-3.953,8.894-8.894,8.894S54.824,121.576,54.824,116.635z M177.925,83.037c-5.814,0.501-10.49,5.945-10.49,12.207c0,6.209,4.627,11.107,10.49,10.856c5.995-0.256,10.921-5.716,10.921-12.235 S183.868,82.526,177.925,83.037z M216.909,160.854c-2.191-0.123-4.079-1.267-5.275-2.944c-0.114-0.121-0.227-0.184-0.284-0.302 l-14.11-14.07c-0.485-0.517-0.969-1.202-1.238-1.824l-4.316-9.765l0.212,17.114l19.51,11.943c3.714,2.238,5.444,6.875,4.116,10.784 c-1.321,3.949-5.306,6.147-9.458,5.215l-28.191-9.947l-25.49,5.334c-3.302,0.228-6.429-2.232-7.492-5.925 c-1.014-3.624,0.31-7.446,3.203-9.06l16.459-9.356l0.191-16.255l-3.842,9.097c-0.235,0.675-0.658,1.188-1.08,1.648l-11.683,11.853 c-0.09,0.098-0.179,0.144-0.224,0.244c-0.938,1.329-2.404,2.215-4.082,2.121c-2.801-0.157-5.053-2.841-5.053-6.101 c0-1.755,0.691-3.284,1.774-4.351c0.13-0.197,0.261-0.343,0.391-0.54l10.71-11.163l7.137-17.403c2.016-4.5,4.855-7.434,9.318-7.598 l19.742-0.727c4.839-0.178,8.095,2.668,10.414,7.429l8.523,18.927l13.788,13.314c0.176,0.182,0.352,0.422,0.528,0.662 c1.472,1.284,2.418,3.142,2.418,5.258C223.642,158.174,220.637,161.063,216.909,160.854z"/> </svg> 
 
 # bhikkhu
-<svg viewBox="0 0 484.336 484.336" id="bhikkhu" height="48" width="48" version="1.1"><polygon id="polygon2" points="302.504,280.32 181.832,280.32 189.88,184.32 294.456,184.32  " style="fill:#F9BDA0;" /><polygon id="polygon4" points="459.368,308.576 306.168,254.4 306.168,247.704 183.384,246.224 173.416,254.392 22.592,308.576 0,480.32 30.736,480.32 174.36,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32  " style="fill:#F9BDA0;" /><polygon id="polygon6" points="302.504,283.48 254.944,309.456 181.832,184.32 294.456,184.32 " style="fill:#E28F71;" /><path id="path8" d="M323.632,102.696c0,70.872-35.704,135-81.456,135c-45.768,0-81.488-64.128-81.488-135 c0-70.88,35.72-98.68,81.488-98.68C287.928,4.016,323.632,31.816,323.632,102.696z" style="fill:#FCCCB9;" /><path id="path10" d="M242.176,4.016c45.752,0,81.456,27.8,81.456,98.68c0,70.872-35.704,135-81.456,135" style="fill:#F9BDA0;" /><polyline id="polyline12" points="2.168,480.32 30.736,480.32 174.36,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32 459.368,308.576 306.168,254.4 306.168,248.32 " style="fill:#ED1856;" /><polyline id="polyline14" points="34.168,480.32 174.36,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32 459.368,308.576 306.168,254.4 306.168,248.32 " style="fill:#CE0D4E;" /><polyline id="polyline16" points="178.168,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32 459.368,308.576 306.168,254.4 306.168,248.32 " style="fill:#AF0848;" /><path sodipodi:nodetypes="ccccc" id="path42" d="m 22.592,308.576 74.275197,99.31661 5.251833,72.35862 L 0,480.32 Z" style="fill:#fcccb9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
+<svg viewBox="0 0 484.336 484.336" id="bhikkhu" height="48" width="48" version="1.1"><polygon id="polygon2" points="302.504,280.32 181.832,280.32 189.88,184.32 294.456,184.32  " style="fill:#F9BDA0;" /><polygon id="polygon4" points="459.368,308.576 306.168,254.4 306.168,247.704 183.384,246.224 173.416,254.392 22.592,308.576 0,480.32 30.736,480.32 174.36,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32  " style="fill:#F9BDA0;" /><polygon id="polygon6" points="302.504,283.48 254.944,309.456 181.832,184.32 294.456,184.32 " style="fill:#E28F71;" /><path id="path8" d="M323.632,102.696c0,70.872-35.704,135-81.456,135c-45.768,0-81.488-64.128-81.488-135 c0-70.88,35.72-98.68,81.488-98.68C287.928,4.016,323.632,31.816,323.632,102.696z" style="fill:#FCCCB9;" /><path id="path10" d="M242.176,4.016c45.752,0,81.456,27.8,81.456,98.68c0,70.872-35.704,135-81.456,135" style="fill:#F9BDA0;" /><polyline id="polyline12" points="2.168,480.32 30.736,480.32 174.36,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32 459.368,308.576 306.168,254.4 306.168,248.32 " style="fill:#ED1856;" /><polyline id="polyline14" points="34.168,480.32 174.36,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32 459.368,308.576 306.168,254.4 306.168,248.32 " style="fill:#CE0D4E;" /><polyline id="polyline16" points="178.168,480.32 235,480.32 249.336,480.32 309.96,480.32 453.6,480.32 484.336,480.32 459.368,308.576 306.168,254.4 306.168,248.32 " style="fill:#AF0848;" /><path sodipodi:nodetypes="ccccc" id="path42" d="m 22.592,308.576 74.275197,99.31661 5.251833,72.35862 L 0,480.32 Z" style="fill:#fcccb9;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></svg>
+
+# 其他译文
+
+<svg id="svg3" version="1.1" height="48" width="48" viewBox="0 0 256 256"> <path d="M 220.93359 56.091797 A 35 34.999993 0 0 0 188.65234 77.726562 L 55.314453 77.726562 L 0 77.726562 L 0 104.45703 L 55.314453 104.45703 C 63.006079 104.57585 67.874217 106.6966 74.513672 111.95898 C 84.336463 119.78454 93.914436 134.74563 107.12305 148.91992 C 120.06727 162.95829 139.98541 177.13178 168.875 177.26758 L 188.65234 177.26758 A 35 34.999992 0 0 0 221 198.90625 A 35 34.999992 0 0 0 256 163.90625 A 35 34.999992 0 0 0 221 128.90625 A 35 34.999992 0 0 0 220.93359 128.90625 A 35 34.999992 0 0 0 188.64844 150.55469 C 180.99222 150.54544 172.62003 150.54297 169.06641 150.54297 C 157.8418 150.31656 150.47519 147.34627 142.80859 142.02734 C 131.38157 134.08864 121.62883 119.80193 109.86719 106.03516 C 109.40671 105.50813 108.93411 104.98281 108.46484 104.45703 L 188.6543 104.45703 A 35 34.999993 0 0 0 221 126.0918 A 35 34.999993 0 0 0 256 91.091797 A 35 34.999993 0 0 0 221 56.091797 A 35 34.999993 0 0 0 220.93359 56.091797 z M 220.94922 73.591797 A 17.5 17.499997 0 0 1 221 73.591797 A 17.5 17.499997 0 0 1 238.5 91.091797 A 17.5 17.499997 0 0 1 221 108.5918 A 17.5 17.499997 0 0 1 203.5 91.091797 A 17.5 17.499997 0 0 1 220.94922 73.591797 z M 220.94922 146.40625 A 17.5 17.499996 0 0 1 221 146.40625 A 17.5 17.499996 0 0 1 238.5 163.90625 A 17.5 17.499996 0 0 1 221 181.40625 A 17.5 17.499996 0 0 1 203.5 163.90625 A 17.5 17.499996 0 0 1 220.94922 146.40625 z " id="svg_2" /> </svg>
+
+#