Merge pull request #727 from visuddhinanda/laravel

:sparkles: 术语表增加排序

public/app/article/article.js

@@ -53,7 +53,7 @@ function articel_load(id, collection_id) {
 						popup_init();
 						guide_init();
 						note_refresh_new(function(){
-                            $.get('templiates/glossary.tpf',function(data){
+                            $.get('templiates/glossary.tpl',function(data){
                                 let TermData = term_get_used();
                                 let rendered = Mustache.render(data,TermData);
                                 $("#glossary").html(rendered);                                

public/app/article/templiates/glossary.tpl

@@ -1,6 +1,13 @@
 <h2>Glossary</h2>
-{{#glossary}}
+{{#glossary.word}}
 <div>
 <b>{{pali}}</b>:{{meaning}}
 </div>
-{{/glossary}}
+{{/glossary.word}}
+
+<h2>术语表</h2>
+{{#glossary.meaning}}
+<div>
+<b>{{meaning}}</b>:{{pali}}
+</div>
+{{/glossary.meaning}}

public/app/course/lesson.js

@@ -81,7 +81,7 @@ function lesson_show(id) {
             }
             $("#lesson_list").html(html);
 			note_refresh_new();
-            mermaid.initialize();
+            mermaid.initialize({startOnLoad:true});
         }
     );
 }

public/app/term/note.js

@@ -203,7 +203,7 @@ function note_refresh_new(callback = null) {
 							callback();
 						}
 						//初始化mermaid
-						mermaid.initialize();
+						mermaid.initialize({startOnLoad:true});
 
 					} catch (e) {
 						console.error(e);

public/app/term/term.js

@@ -719,13 +719,55 @@ function term_get_dict() {
 function term_get_used(){
     let output = [];
     $("term").each(function () {
-        output.push({
-            pali:$(this).attr("pali"),
-            meaning:$(this).attr("mean")
-        });
+        let word = $(this).attr("pali");
+        let meaning = $(this).attr("mean");
+        if(word !== ""){
+            output[word] = {
+                pali:word,
+                pali_en:com_getPaliEn(word),
+                meaning:meaning
+            };
+        }
+
     });
+
+    let arrWord=[];
+    for (const key in output) {
+        if (output.hasOwnProperty.call(output, key)) {
+            const element = output[key];
+            arrWord.push(element);
+        }
+    }
+    arrWord = arrWord.sort(function(a, b){
+	  var x = a.pali_en;
+	  var y = b.pali_en;
+	  if (x < y) {return -1;}
+	  if (x > y) {return 1;}
+	  return 0;
+        });
+
+    let arrMeaning=[];
+    for (const key in output) {
+        if (output.hasOwnProperty.call(output, key)) {
+            const element = output[key];
+            if(element.meaning != ""){
+                arrMeaning.push(element);
+            }
+        }
+    }
+    arrMeaning = arrMeaning.sort(function(a, b){
+	  var x = a.meaning;
+	  var y = b.meaning;
+	  if (x < y) {return -1;}
+	  if (x > y) {return 1;}
+	  return 0;
+        });
+
     return {
-        glossary:output
+        glossary:{
+            word:arrWord,
+            meaning:arrMeaning
+        }
     }
 }
 /*