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

app/article/add_to_collect_dlg.js

@@ -2,7 +2,7 @@ function add_to_collect_dlg_init() {
   $("[vui='collect-dlg']").each(function () {
     $(this).css("position", "relative");
     $(this).html(
-      "<button class='button_add_to_collect'>" + gLocal.gui.add_to + gLocal.gui.anthology + "</button><div class='float_dlg'></div>"
+      "<button class='button_add_to_collect icon_btn' title='" + gLocal.gui.add_to + gLocal.gui.anthology + "'><svg class='icon'><use xlink:href='../studio/svg/icon.svg#add_to_anthology'></use></svg></button><div class='float_dlg'></div>"
     );
   });
 
@@ -56,19 +56,21 @@ function add_to_collect_dlg_init() {
           .first()
           .html(html_exist);
 
-        let html_others = "";
-        for (const iterator of collect_list.others) {
-          html_others +=
-            "<div><input type='checkbox' class='collect' collect_id='" +
-            iterator.id +
-            "' />";
-          html_others += iterator.title;
-          html_others += "</div>";
+        if (collect_list.others) {
+          let html_others = "";
+          for (const iterator of collect_list.others) {
+            html_others +=
+              "<div><input type='checkbox' class='collect' collect_id='" +
+              iterator.id +
+              "' />";
+            html_others += iterator.title;
+            html_others += "</div>";
+          }
+          $("#add_to_collect_dlg_" + id)
+            .find(".others")
+            .first()
+            .html(html_others);
         }
-        $("#add_to_collect_dlg_" + id)
-          .find(".others")
-          .first()
-          .html(html_others);
       }
     );
   });

app/article/index.php

@@ -312,6 +312,8 @@ term_word_link_fun("wiki_goto_word");
 	<div>
 		<span>
 		<?php
+		echo "<button class='icon_btn'><a href='../article/my_article_edit.php?id=".$_GET["id"];
+		echo "'>{$_local->gui->edit_now}</a></button>";
 		echo "<button class='icon_btn'><a href='../article/?id=".$_GET["id"];
 		echo "&display=para";
 		echo "'>{$_local->gui->each_paragraph}</a></button>";

app/article/my_article.js

@@ -49,15 +49,16 @@ function my_article_list() {
   );
 }
 
+
 function render_status(status) {
   status = parseInt(status);
   let html = "";
   let objStatus = [
-    { id: 1, name: gLocal.gui.private, tip: gLocal.gui.private_note },
-    { id: 2, name: gLocal.gui.unlisted, tip: gLocal.gui.unlisted_note },
-    { id: 3, name: gLocal.gui.public, tip: gLocal.gui.public_note },
+    { id: 1, name: "<svg class='icon'><use xlink:href='../studio/svg/icon.svg#ic_lock'></use></svg>" + gLocal.gui.private, tip: gLocal.gui.private_note },
+    { id: 2, name: "<svg class='icon'><use xlink:href='../studio/svg/icon.svg#eye_disable'></use></svg>" + gLocal.gui.unlisted, tip: gLocal.gui.unlisted_note },
+    { id: 3, name: "<svg class='icon'><use xlink:href='../studio/svg/icon.svg#eye_enable'></use></svg>" + gLocal.gui.public, tip: gLocal.gui.public_note },
   ];
-  html += '<div class="case_dropdown">';
+  html += "<span style='flex:3;margin:auto;'>" + gLocal.gui.privacy + '</span><div class="case_dropdown"  style="flex:7;">';
   html += '<input type="hidden" name="status"  value ="' + status + '" />';
 
   for (const iterator of objStatus) {
@@ -65,7 +66,7 @@ function render_status(status) {
       html += "<div >" + iterator.name + "</div>";
     }
   }
-  html += '<div class="case_dropdown-content">';
+  html += '<div id="privacy_list" class="case_dropdown-content" style="background-color: var(--detail-color); color: var(--btn-color);">';
 
   for (const iterator of objStatus) {
     let active = "";
@@ -94,25 +95,37 @@ function my_article_edit(id) {
           let html = "";
           let result = JSON.parse(data);
           $("#article_collect").attr("a_id", result.id);
+
+          html += "<div style='display:flex;'>";
+          html += "<div style='flex:4;'>";
+
           html += '<div class="" style="padding:5px;">';
           html += '<div style="max-width:2em;flex:1;"></div>';
           html += "<input type='hidden' name='id' value='" + result.id + "'/>";
           html +=
             "<input type='hidden' name='tag' value='" + result.tag + "'/>";
           html +=
-            "<input type='hidden' name='summary' value='" +
-            result.summary +
-            "'/>";
+            "<textarea  name='summary' >" + result.summary + "</textarea>";
           html +=
             "<input type='hidden' name='status' value='" +
             result.status +
             "'/>";
 
-          html += "<button onclick='article_preview()'>" + gLocal.gui.preview + "</button>";
           html += "<input type='checkbox' name='import' />" + gLocal.gui.import + gLocal.gui.text;
-          html += "</div>";
+          html += "<div>";
           html += "<div style='display:flex;'>";
-          html += "<div style='flex:4;'>";
+          html += "<span style='flex:3;margin:auto;'>" + gLocal.gui.title + "</span>"
+          html += '<span id="article_title" style="flex:7;"></span></div>';
+          html += "<div id='channal_selector' form_name='channal' style='display:flex;'></div>";
+          html += "<div id='aritcle_status' style='display: flex; width: 100 %;'></div>";
+          html +=
+            '<div style="display:flex;width:100%;" ><span style="flex:3;margin: auto;">' + gLocal.gui.language_select + '</span>	<input id="article_lang_select"  style="flex:7;" type="input" onchange="article_lang_change()"  placeholder="' + gLocal.gui.input + " & " + gLocal.gui.language_select + '，' + gLocal.gui.example + '：Engilish" code="' +
+            result.lang +
+            '" value="' +
+            result.lang +
+            '" > <input id="article_lang" type="hidden" name="lang" value=""></div>';
+          html += "</div>";
+          html += "</div>";
 
           html +=
             "<textarea id='article_content' name='content' style='height:500px;'>" +
@@ -127,6 +140,8 @@ function my_article_edit(id) {
           html += "</div>";
 
           $("#article_list").html(html);
+          channal_select_init("channal_selector");
+          tran_lang_select_init("article_lang_select");
           $("#aritcle_status").html(render_status(result.status));
           let html_title =
             "<input id='input_article_title' type='input' name='title' value='" +
@@ -146,7 +161,14 @@ function my_article_edit(id) {
     }
   );
 }
-
+function article_lang_change() {
+  let lang = $("#article_lang_select").val();
+  if (lang.split("-").length == 3) {
+    $("#article_lang").val(lang.split("-")[2]);
+  } else {
+    $("#article_lang").val(lang);
+  }
+}
 function article_preview() {
   $("#preview_inner").html(note_init($("#article_content").val()));
   note_refresh_new();

app/article/my_article_edit.php

@@ -8,6 +8,12 @@ require_once '../studio/index_head.php';
 	<script language="javascript" src="../term/term.js"></script>
 	<script language="javascript" src="../public/js/marked.js"></script>
 	<script language="javascript" src="../article/add_to_collect_dlg.js"></script>
+	<script language="javascript" src="../channal/channal_select.js"></script>
+	<script language="javascript" src="../channal/channal.js"></script>
+	<script src="../public/js/jquery-ui-1.12.1/jquery-ui.js"></script>
+	<link type="text/css" rel="stylesheet" href="../public/js/jquery-ui-1.12.1/jquery-ui.css"/>
+	<script language="javascript" src="../lang/tran_lang_select.js"></script>
+
 	<script >
 	var gCurrPage="article";
 	</script>
@@ -54,18 +60,34 @@ require_once '../studio/index_head.php';
 	<div class="index_inner " >
 	<form id="article_edit" action="##" onsubmit="return false"  method="POST" >
 	<div class="file_list_block">
-		<div class="tool_bar">
+		<div class="tool_bar" style="width:50%;">
 			<div style="display:flex;">
-				<a href="../article/my_article_index.php"><?php echo $_local->gui->back ;?></a>
-				<span id="article_title"></span>
+				<button class="icon_btn" title=<?php echo $_local->gui->back ;?>>
+					<a href="../article/my_article_index.php" >
+					<svg class="icon">
+						<use xlink:href="../studio/svg/icon.svg#return"></use>
+					</svg>
+				</a></button>
+				<button onclick='article_preview()'  class="icon_btn" title=<?php echo $_local->gui->preview ;?>>
+					<svg class="icon">
+						<use xlink:href="../studio/svg/icon.svg#preview"></use>
+					</svg>
+				</button>
 				<div id="article_collect" vui='collect-dlg' ></div>
 			</div>
 			<div style="display:flex;">
-				<div><a href="../article/index.php?id=<?php echo $_GET["id"];?>" target="_blank"><?php echo $_local->gui->scan_in_reader ;?></a></div>
-				<div id="aritcle_status"></div>
-				<span class="icon_btn_div">
+				<div>
+					<button class="icon_btn" title=<?php echo $_local->gui->scan_in_reader ;?>>
+						<a href="../article/index.php?id=<?php echo $_GET["id"];?>" target="_blank">
+							<svg class="icon">
+								<use xlink:href="../studio/svg/icon.svg#library"></use>
+							</svg>
+						</a>
+					</button>
+				</div>
+					<span class="icon_btn_div">
 					<span class="icon_btn_tip"></span>
-					<button id="edit_save" type="button" class="icon_btn" title=" " onclick="my_article_save()">
+					<button id="edit_save" type="button" class="icon_btn" title=<?php echo $_local->gui->save ;?> onclick="my_article_save()">
 						<svg class="icon">
 							<use xlink:href="../studio/svg/icon.svg#ic_save"></use>
 						</svg>
@@ -82,7 +104,6 @@ require_once '../studio/index_head.php';
 				</span>	
 			</div>
 		</div>
-
 		<div id="article_list"  class="file_list_block" style="">
 
 		</div>
@@ -92,7 +113,15 @@ require_once '../studio/index_head.php';
 	</div>
 	
 <script>
-my_article_edit("<?php echo $_GET["id"] ?>");
+<?php
+if(isset($_POST["active"]) && $_POST["active"]=="new"){
+	echo "my_article_edit('{$_POST["content"]}');";
+}
+else if(isset($_GET["id"])){
+	echo "my_article_edit('{$_GET["id"]}');";
+}
+
+?>
 </script>
 <?php
 require_once '../studio/index_foot.php';

app/article/my_article_post.php

@@ -43,7 +43,7 @@ if($_POST["import"]=='on'){
 
         /* 开始一个事务，关闭自动提交 */
         $PDO->beginTransaction();
-        $query="INSERT INTO sentence ('id','block_id','book','paragraph','begin','end','tag','author','editor','text','language','ver','status','strlen','modify_time','receive_time') VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+        $query="INSERT INTO sentence ('id','block_id','channal','book','paragraph','begin','end','tag','author','editor','text','language','ver','status','strlen','create_time','modify_time','receive_time') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? , ?, ?)";
         
         $sth = $PDO->prepare($query);
         
@@ -69,6 +69,7 @@ if($_POST["import"]=='on'){
                 $sth->execute(
                         array(UUID::v4(),
                                     "",
+                                    $_POST["channal"],
                                     $currBook,
                                     $para,
                                     $sentNum,
@@ -77,11 +78,12 @@ if($_POST["import"]=='on'){
                                     "[]",
                                     $_COOKIE["userid"],
                                     $data,
-                                    "my",
+                                    $_POST["lang"],
                                     1,
                                     1,
                                     mb_strlen($data,"UTF-8"),
                                     mTime(),
+                                    mTime(),
                                     mTime()
                                 ));                
             }

app/channal/channal_select.js

@@ -0,0 +1,13 @@
+function channal_select_init(div_id) {
+  $.get("../channal/get.php", {}, function (data) {
+    let channal = JSON.parse(data);
+    let name = $("#" + div_id).attr("form_name");
+    let html = "<span style='flex:3;margin:auto;'>" + gLocal.gui.channels + "</span><select style='flex:7;' name='" + name + "'>";
+    for (const iterator of channal) {
+      html +=
+        "<option value='" + iterator.id + "'>" + iterator.name + "</option>";
+    }
+    html += "</select>";
+    $("#" + div_id).html(html);
+  });
+}

app/public/lang/default.json

@@ -135,7 +135,7 @@
 		"home": "Home",
 		"hori_ref_time": "horizontal refraction correct ",
 		"html_text_data": "HTML Text Data",
-		"import": "Import",
+		"import": "Import ",
 		"import_csv": "Import CSV",
 		"import_export": "Import/Export",
 		"import_the_flie_from_cscd": "Import the flie From Cattha Sangayana data base",
@@ -533,6 +533,8 @@
 		"copy_link": "copy the Link",
 		"saved": "saved ",
 		"title_necessary": "title is necessary",
+		"example": "for example ",
+		"privacy": "privacy",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -135,7 +135,7 @@
 		"home": "Home",
 		"hori_ref_time": "horizontal refraction correct ",
 		"html_text_data": "HTML Text Data",
-		"import": "Import",
+		"import": "Import ",
 		"import_csv": "Import CSV",
 		"import_export": "Import/Export",
 		"import_the_flie_from_cscd": "Import the flie From Cattha Sangayana data base",
@@ -532,6 +532,8 @@
 		"copy_link": "copy the Link",
 		"saved": "saved ",
 		"title_necessary": "title is necessary",
+		"example": "for example ",
+		"privacy": "privacy",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -135,7 +135,7 @@
 		"home": "Home",
 		"hori_ref_time": "horizontal refraction correct ",
 		"html_text_data": "HTML Text Data",
-		"import": "Import",
+		"import": "Import ",
 		"import_csv": "Import CSV",
 		"import_export": "Import/Export",
 		"import_the_flie_from_cscd": "Import the flie From Cattha Sangayana data base",
@@ -532,6 +532,8 @@
 		"copy_link": "copy the Link",
 		"saved": "saved ",
 		"title_necessary": "title is necessary",
+		"example": "for example ",
+		"privacy": "privacy",
 		"": "",
 		"": ""
 	},

app/public/lang/si.json

@@ -136,7 +136,7 @@
 		"home": "නිවස",
 		"hori_ref_time": "horizontal refraction correct ",
 		"html_text_data": "HTML සටහන් දත්ත",
-		"import": "ආනයන",
+		"import": "ආනයන ",
 		"import_csv": "ආනයන csv",
 		"import_export": "ආනයන /අපනයන ",
 		"import_the_flie_from_cscd": "Import the flie From Cattha Sangayana data base",
@@ -537,6 +537,8 @@
 		"copy_link": "copy the Link",
 		"saved": "saved ",
 		"title_necessary": "title is necessary",
+		"example": "for example ",
+		"privacy": "privacy",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-cn.json

@@ -534,8 +534,8 @@
 		"copy_link": "复制链接",
 		"saved": "已保存",
 		"title_necessary": "必须填写标题",
-		"": "",
-		"": "",
+		"example": "例如",
+		"privacy": "隐私设置",
 		"": "",
 		"": ""
 	},

app/public/lang/zh-tw.json

@@ -534,6 +534,8 @@
 		"copy_link": "複製連結",
 		"saved": "已儲存",
 		"title_necessary": "必須填寫標題",
+		"example": "例如",
+		"privacy": "隱私設定",
 		"": ""
 	},
 	"grammastr": [

app/studio/svg/icon.svg

@@ -692,4 +692,37 @@
 			</g>
 		</g>
 	</symbol>
+	<symbol id="article" t="1603380139679" class="icon" viewBox="0 0 1072 1024" version="1.1"
+		xmlns="http://www.w3.org/2000/svg" p-id="1055">
+		<path
+			d="M93.9 123.6h76.7c24.9 0 45-20.2 45-45V1.9L93.9 123.6zM1017.2 556.2l34.1-34.1c28.1-28.1 28.1-73.7 0-101.8-28.1-28.1-73.7-28.1-101.8 0l-34.1 34.1 101.8 101.8zM880.5 489.2L625.3 744.4l-44.9 146.8 146.7-44.9 255.2-255.2z"
+			fill="#666666" p-id="1056"></path>
+		<path
+			d="M700.4 953.6L509.5 962 568 721.1 930.1 359V69.6c0-37.3-30.6-67.8-68-67.8H237.9v75.9c0 37.6-30.5 68-68 68h-76v808.7c0 37.3 30.6 67.8 68 67.8h700.2c37.4 0 68-30.5 68-67.8V743.9L700.4 953.6zM259.8 188.3h504.6c25 0 45.4 20.2 45.4 45.2s-20.3 45.2-45.4 45.2H259.7c-25 0-45.3-20.2-45.3-45.2s20.3-45.2 45.4-45.2z m0 220.6h296.9c25 0 45.4 20.2 45.4 45.2s-20.3 45.2-45.4 45.2h-297c-25-0.1-45.3-20.3-45.3-45.2 0-25 20.3-45.2 45.4-45.2z m160.1 310.8H259.7c-25 0-45.4-20.2-45.4-45.2s20.3-45.2 45.4-45.2h160.2c25.1 0 45.4 20.2 45.4 45.2s-20.3 45.2-45.4 45.2z"
+			fill="#666666" p-id="1057"></path>
+	</symbol>
+	<symbol id="add_to_anthology" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+		t="1603380648769" class="icon" viewBox="0 0 1024 1024" version="1.1" p-id="3981">
+		<defs>
+			<style type="text/css" /></defs>
+			<path d="M522.768405 966.328483c24.69205 0 44.749431-19.088552 44.749431-43.558033V97.157849c0-24.089805-20.358504-43.623495-44.749431-43.623495H386.438438c-24.69205 0.078554-44.749431 19.127829-44.749431 43.623495v825.534048c0 24.089805 20.358504 43.558033 44.749431 43.558033h136.329967v0.078553zM789.130948 966.328483c24.69205 0 44.749431-19.088552 44.749431-43.558033V529.203263c0-24.089805-20.358504-43.623495-44.749431-43.623495H652.800982c-24.69205 0.078554-44.749431 19.127829-44.749431 43.623495v393.488634c0 24.089805 20.358504 43.558033 44.749431 43.558033h136.329966v0.078553zM256.379676 966.328483c24.718235 0 44.775616-19.140921 44.775616-43.59731V97.157849c0-24.089805-20.384688-43.623495-44.775616-43.623495H120.062802c-24.705142 0.091646-44.762523 19.127829-44.762523 43.623495v825.534048c0 24.089805 20.384688 43.558033 44.762523 43.558033h136.303782v0.078553z" p-id="3982"/>
+			<path d="M945.335004 251.908661H665.749252c-10.395275 0-18.90526-8.509985-18.90526-18.90526v-41.528729c0-10.395275 8.509985-18.90526 18.90526-18.90526h279.585752c10.395275 0 18.90526 8.509985 18.90526 18.90526v41.528729c0 10.395275-8.509985 18.90526-18.90526 18.90526z" p-id="3983"/>
+			<path d="M845.218299 72.439614v279.585752c0 10.395275-8.509985 18.90526-18.90526 18.90526h-41.528729c-10.395275 0-18.90526-8.509985-18.90526-18.90526V72.439614c0-10.395275 8.509985-18.90526 18.90526-18.90526h41.528729c10.395275 0 18.90526 8.509985 18.90526 18.90526z" p-id="3984" />
+		</symbol>
+		<symbol id="return" t="1603381219001" class="icon" viewBox="0 0 1339 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9542" >
+			<path d="M1319.676948 1023.921237c-80.889778-241.802938-315.367741-414.451811-591.905238-419.335128-34.498269-0.630105-66.948696 0.078763-97.902623 2.126605v238.888701l0.23629 2.126606a10.790555 10.790555 0 0 1-10.869318 10.633028 10.633028 10.633028 0 0 1-9.294055-5.119606v1.023921L7.876317 444.539343h3.150527A10.790555 10.790555 0 0 1 0 433.906315c0-4.253211 2.520422-7.876317 6.143527-9.609107L609.863241 13.626029v1.023921A11.026844 11.026844 0 0 1 619.078532 9.609107c5.986001 0 10.948081 4.72579 10.948081 10.633028 0 0.708869-0.157526 1.417737-0.315052 2.126606v231.721252c27.56711-1.338974 56.551958-1.73279 87.033305-1.181448 343.564957 5.670948 622.229059 286.225367 622.229059 620.890086A588.518422 588.518422 0 0 1 1319.676948 1023.921237zM635.461272 3.150527v1.811553H631.68064L635.461272 3.150527z m-0.393816 869.230367l-2.835474-1.890316h2.835474v1.890316z" p-id="9543"></path>
+		</symbol>
+		<symbol id="preview" t="1603382451124" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15536">
+			<path d="M703.730499 544.578527a191.730499 191.730499 0 0 1 156.260356 302.806368l122.004508 122.004507a31.955083 31.955083 0 0 1-45.248398 45.184488l-121.940597-121.940598A191.730499 191.730499 0 1 1 703.730499 544.642437z m-6.391017-511.28133c38.857381 0 70.301183 30.67688 70.301183 68.511698v386.912146a255.640665 255.640665 0 1 0-69.022979 503.16474l-563.687667 0.06391c-38.857381 0-70.301183-30.67688-70.301183-68.447788V101.808895C64.628836 63.910166 96.072638 33.233286 134.930019 33.233286h562.409463z m6.391017 575.191496a127.820333 127.820333 0 1 0 0 255.640665 127.820333 127.820333 0 0 0 0-255.640665z m-351.505915 0h-127.820332a31.955083 31.955083 0 0 0-5.751915 63.398885l5.751915 0.511281h127.820332a31.955083 31.955083 0 0 0 0-63.910166z m0-191.730499h-127.820332a31.955083 31.955083 0 0 0-5.751915 63.398885l5.751915 0.511282h127.820332a31.955083 31.955083 0 0 0 0-63.910167z m191.730499-191.730499h-319.550831a31.955083 31.955083 0 0 0-5.751915 63.398885l5.751915 0.511282h319.550831a31.955083 31.955083 0 0 0 0-63.910167z" p-id="15537">
+			</path>
+		</symbol>
+		<symbol id="library" t="1603382761175" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16364">
+			<path d="M511.974717 475.849119a670.455197 670.455197 0 0 0-455.085828-176.914615v548.15088c175.947558 0 335.73957 67.238931 455.085828 176.85773a672.787512 672.787512 0 0 1 455.085829-176.914616V298.991389a670.455197 670.455197 0 0 0-455.085829 176.914616z m0-176.914615c83.963335 0 151.714238-66.72696 151.714239-149.438809C663.688956 66.783845 595.938053 0 511.974717 0 428.011382 0 360.260479 66.783845 360.260479 149.495695c0 82.711849 67.750903 149.438809 151.714238 149.438809z" p-id="16365"></path>
+		</symbol>
+		<symbol id="eye_disable" t="1603383513346" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3337">
+			<path d="M192.853333 253.184L59.434667 119.808l60.373333-60.373333 844.757333 844.8-60.373333 60.330666-141.226667-141.226666A467.157333 467.157333 0 0 1 512 896c-230.058667 0-421.461333-165.546667-461.610667-384a468.565333 468.565333 0 0 1 142.506667-258.816z m436.778667 436.821333l-62.464-62.464a128 128 0 0 1-170.709333-170.709333L333.994667 394.368a213.333333 213.333333 0 0 0 295.637333 295.637333zM340.224 160.426667C393.429333 139.52 451.413333 128 512 128c230.058667 0 421.461333 165.546667 461.610667 384a467.072 467.072 0 0 1-85.845334 195.925333l-164.693333-164.693333a213.333333 213.333333 0 0 0-242.346667-242.346667L340.224 160.469333z" p-id="3338"></path>
+		</symbol>
+		<symbol id="eye_enable" t="1603383594328" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3482">
+			<path d="M50.389333 512C90.496 293.546667 281.941333 128 512 128c230.058667 0 421.461333 165.546667 461.610667 384-40.106667 218.453333-231.552 384-461.610667 384-230.058667 0-421.461333-165.546667-461.610667-384zM512 725.333333a213.333333 213.333333 0 1 0 0-426.666666 213.333333 213.333333 0 0 0 0 426.666666z m0-85.333333a128 128 0 1 1 0-256 128 128 0 0 1 0 256z" p-id="3483"></path>
+		</symbol>
 </svg>

app/term/note.js

@@ -305,13 +305,13 @@ function render_channal_list(channalinfo) {
   //  output += "&channal=" + channalinfo.id + "' >";
   output += "<a onclick=\"set_channal('" + channalinfo.id + "')\">";
 
-  output += channalinfo["nickname"];
-  output += "/" + channalinfo["name"];
+  output += channalinfo["name"];
 
   output += "</a>";
   output += "</div>";
 
   output += "<div>";
+  output += channalinfo["nickname"] + "/";
   output += "@" + channalinfo["username"];
   output += "</div>";
   output += "<div style='background-color: #e0dfdffa;'>";

app/term/term.css

@@ -56,3 +56,10 @@ para {
 para:hover {
   text-decoration: underline;
 }
+
+commentary {
+  margin-left: 1.5em;
+  display: block;
+  border-left: 3px solid gray;
+  padding-left: 5px;
+}