Bhikkhu-Kosalla 5 лет назад
Родитель
Сommit
3b67f3f7e3
3 измененных файлов с 67 добавлено и 73 удалено
  1. 61 70
      app/studio/js/relation_list.json
  2. 2 2
      app/term/popup_note.js
  3. 4 1
      app/term/term.css

+ 61 - 70
app/studio/js/relation_list.json

@@ -1,53 +1,80 @@
 var list_relation=[
     {
-        "id": "NIO",
+        "id": "IAD",
+        "case": "",
+        "note": "Identical Adjective relation",
+        "sys_name": "Sadda Pan Goun",
+        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
+        "editor": "Bhikkhu Kosalla sy1987",
+        "language": "en"
+    },
+    {
+        "id": "IAD",
+        "case": "",
+        "note": "同类修饰",
+        "sys_name": "Sadda Pan Goun",
+        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
+        "editor": "Bhikkhu Kosalla sy1987",
+        "language": "zh-cn"
+    },
+    {
+        "id": "IAD",
+        "case": "",
+        "note": "tulyādhikaraṇavisesana -> visesya",
+        "sys_name": "Sadda Pan Goun",
+        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
+        "editor": "Bhikkhu Kosalla sy1987",
+        "language": "default"
+    },
+    {
+        "id": "ASV",
         "case": ".nom.",
-        "note": "Nominal Identity <Ordinary> Relation",
+        "note": "Active Subject Relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "en"
     },
     {
-        "id": "NIO",
+        "id": "ASV",
         "case": ".nom.",
-        "note": "被描述 -> 定性<br>XX有...",
+        "note": "施动者<主格> -> 动词<br>XX把...",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "zh-cn"
     },
     {
-        "id": "NIO",
+        "id": "ASV",
         "case": ".nom.",
-        "note": "tulyattha -> liṅgattha",
+        "note": "vuttakattar -> kiriyā",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     },
     {
-        "id": "NID",
+        "id": "AOV",
         "case": ".nom.",
-        "note": "Nominal Identity <Denominative> Relation",
+        "note": "Active Object Relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "en"
     },
     {
-        "id": "NID",
+        "id": "AOV",
         "case": ".nom.",
-        "note": "待命名 -> 命名<br>XX叫做...",
+        "note": "受动者<主格> -> 动词<br>XX被...",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "zh-cn"
     },
     {
-        "id": "NID",
+        "id": "AOV",
         "case": ".nom.",
-        "note": "saññin <nāmin> -> saññā <nāma>",
+        "note": "vuttakamma -> kiriyā",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -108,108 +135,99 @@ var list_relation=[
         "language": "default"
     },
     {
-        "id": "DASD-P",
-        "case": ".nom.",
-        "note": "Double Active Subject <Denominative> Relation",
-        "sys_name": "Sadda Pan Goun",
-        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
-        "editor": "Bhikkhu Kosalla sy1987",
-        "language": "en"
-    },
-    {
-        "id": "DASD-P",
+        "id": "NIO",
         "case": ".nom.",
-        "note": "<命名>主 -> 系<br>XX叫做...",
+        "note": "被描述 -> 定性<br>XX有...",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "zh-cn"
     },
     {
-        "id": "DASD-P",
+        "id": "NIO",
         "case": ".nom.",
-        "note": "pakati<saññin, nāmin> -> kiriyā",
+        "note": "tulyattha -> liṅgattha",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     },
     {
-        "id": "DASD-S",
+        "id": "NID",
         "case": ".nom.",
-        "note": "Double Active Subject <Denominative> Relation",
+        "note": "Nominal Identity <Denominative> Relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "en"
     },
     {
-        "id": "DASD-S",
+        "id": "NID",
         "case": ".nom.",
-        "note": "<命名>表 -> 系<br>...叫做XX",
+        "note": "待命名 -> 命名<br>XX叫做...",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "zh-cn"
     },
     {
-        "id": "DASD-S",
+        "id": "NID",
         "case": ".nom.",
-        "note": "vikati<saññā,nāma> -> kiriyā",
+        "note": "saññin <nāmin> -> saññā <nāma>",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     },
     {
-        "id": "ASV",
+        "id": "DASD-P",
         "case": ".nom.",
-        "note": "Active Subject Relation",
+        "note": "Double Active Subject <Denominative> Relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "en"
     },
     {
-        "id": "ASV",
+        "id": "DASD-P",
         "case": ".nom.",
-        "note": "施动者<主格> -> 动词<br>XX把...",
+        "note": "<命名>主 -> 系<br>XX叫做...",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "zh-cn"
     },
     {
-        "id": "ASV",
+        "id": "DASD-P",
         "case": ".nom.",
-        "note": "vuttakattar -> kiriyā",
+        "note": "pakati<saññin, nāmin> -> kiriyā",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     },
     {
-        "id": "AOV",
+        "id": "DASD-S",
         "case": ".nom.",
-        "note": "Active Object Relation",
+        "note": "Double Active Subject <Denominative> Relation",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "en"
     },
     {
-        "id": "AOV",
+        "id": "DASD-S",
         "case": ".nom.",
-        "note": "受动者<主格> -> 动词<br>XX被...",
+        "note": "<命名>表 -> 系<br>...叫做XX",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "zh-cn"
     },
     {
-        "id": "AOV",
+        "id": "DASD-S",
         "case": ".nom.",
-        "note": "vuttakamma -> kiriyā",
+        "note": "vikati<saññā,nāma> -> kiriyā",
         "sys_name": "Sadda Pan Goun",
         "author": "Ven. Pandita Pariyatti Faculty ITBMU",
         "editor": "Bhikkhu Kosalla sy1987",
@@ -1241,33 +1259,6 @@ var list_relation=[
         "editor": "Bhikkhu Kosalla sy1987",
         "language": "default"
     },
-    {
-        "id": "IAD",
-        "case": "",
-        "note": "Identical Adjective relation",
-        "sys_name": "Sadda Pan Goun",
-        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
-        "editor": "Bhikkhu Kosalla sy1987",
-        "language": "en"
-    },
-    {
-        "id": "IAD",
-        "case": "",
-        "note": "同类修饰",
-        "sys_name": "Sadda Pan Goun",
-        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
-        "editor": "Bhikkhu Kosalla sy1987",
-        "language": "zh-cn"
-    },
-    {
-        "id": "IAD",
-        "case": "",
-        "note": "tulyādhikaraṇavisesana -> visesya",
-        "sys_name": "Sadda Pan Goun",
-        "author": "Ven. Pandita Pariyatti Faculty ITBMU",
-        "editor": "Bhikkhu Kosalla sy1987",
-        "language": "default"
-    },
     {
         "id": "AC",
         "case": "",

+ 2 - 2
app/term/popup_note.js

@@ -7,10 +7,10 @@ function popup_init() {
 			const noteText = $(this).html();
 			$(this).html("");
 			if ($(this).offset().left < $(document.body).width() / 2) {
-				$(this).append('<div  class="popup_contence" style="left: -15px;">' + noteText + "</div>");
+				$(this).append('<div  class="popup_contence" style="left: -15px;">' + marked(noteText) + "</div>");
 				$(".popup_contence:after").css("left", "0");
 			} else {
-				$(this).append('<div  class="popup_contence" style="right: -15px;">' + noteText + "</div>");
+				$(this).append('<div  class="popup_contence" style="right: -15px;">' + marked(noteText) + "</div>");
 				$(".popup_contence:after").css("right", "0");
 			}
 			$(this).attr("init", "1");

+ 4 - 1
app/term/term.css

@@ -657,7 +657,8 @@ pw {
 }
 .tool_bar > .right {
 	position: absolute;
-	right: calc(100% - 65vw);
+	right: calc(30px + 2.4em - 70vw);
+	right: calc(30px + 3em - 100vw);
 	margin-top: calc(-1.8em - 8px);
 	display: none;
 	width: auto;
@@ -729,6 +730,8 @@ li.active {
 .sent_tran .preview p {
 	line-height: normal;
 	margin: 0;
+	font-family: "Noto Sans", "Noto Sans", "Noto Sans SC", "Noto Sans TC", "Padauk", "ATaiThamKHNewV1-Normal", "Arial",
+		"Verdana";
 }
 .pop_menu .icon {
 	fill: var(--main-color);