Merge branch 'laravel' of https://github.com/iapt-platform/mint into laravel

deploy/roles/mint-clone/tasks/main.yml

@@ -12,11 +12,15 @@
     version: laravel
 
 - name: Setup storage folder
+  become: true
   ansible.builtin.file:
     path: "{{ app_deploy_target }}/storage"
+    state: directory
+    recurse: true
     owner: www-data
     group: www-data
 
+
 - name: Install v2 php dependencies
   ansible.builtin.shell: "php{{ app_php_version }} {{ ansible_env.HOME }}/.local/bin/composer install"
   args:
@@ -49,12 +53,6 @@
     dest: "{{ app_deploy_target }}/public/node_modules"
     state: link
 
-- name: Install v2 tmp
-  ansible.builtin.file:
-    src: "/var/www/{{ inventory_hostname }}/tmp"
-    dest: "{{ app_deploy_target }}/tmp"
-    state: link
-
 # TODO will remove in future
 - name: Install v1 tmp
   ansible.builtin.file:

deploy/roles/mint-clone/templates/config-v1.php.j2

@@ -1,6 +1,4 @@
 <?php
-#目录设置，不能更改
-require_once __DIR__."/config.dir.php";
 
 #域名设置
 define("RPC_SERVER","https://rpc.wikipali.org");
@@ -48,14 +46,15 @@ define("SnowFlake",[
 	"DatacenterId"=>1,
 	"WorkerId"=>1
 ]);
+
+#目录设置，不能更改
+require_once __DIR__."/config.dir.php";
+
 /*
 数据表
 */
 #表设置，此行不能更改
 require_once __DIR__."/config.table.php";
 
-#表名设置，此行不能更改
-require_once __DIR__."/config.migrate.php";
-
 
 ?>

public/app/pcdl/head_bar.php

@@ -487,24 +487,31 @@ switch($_COOKIE['language']){
 						<?php echo $_local->gui->more; ?>
 					</button>
 					<ul class="header-dropdown-content left-content" style="display: none;" id="nav-more">
-					<li><a href="<?php echo URL_PALI_HANDBOOK.'/'.$help_lang ?>" target="_blank">
+						<li>
+							<a href="<?php echo URL_PALI_HANDBOOK.'/'.$help_lang ?>" target="_blank">
 								<div class="nav_link"><?php echo $_local->gui->palihandbook; ?></div>
-							</a></li>
-						<li><a href="https://assets-hk.wikipali.org/help/zh-Hans/" target="_blank">
-							<div class="nav_link"><?php echo $_local->gui->help_doc; ?></div>
-						</a></li>
-						<li><a href="../calendar/" target="_blank">
+							</a>
+						</li>
+						<li>
+							<a href="../calendar/" target="_blank">
 								<div class="nav_link"><?php echo $_local->gui->buddhist_calendar; ?></div>
-							</a></li>
-						<li><a href="../tools/unicode.html" target="_blank">
+							</a>
+						</li>
+						<li>
+							<a href="../tools/unicode.html" target="_blank">
 								<div class="nav_link"><?php echo $_local->gui->code_convert; ?></div>
-							</a></li>
-						<li><a href="../statistics" target="_blank">
+							</a>
+						</li>
+						<li>
+							<a href="../statistics" target="_blank">
 								<div class="nav_link"><?php echo $_local->gui->corpus_statistics; ?></div>
-							</a></li>
-						<li><a href="../calendar/history.html" target="_blank">
-							<div class="nav_link"><?php echo $_local->gui->history; ?></div>
-						</a></li>
+							</a>
+						</li>
+						<li>
+							<a href="../calendar/history.html" target="_blank">
+								<div class="nav_link"><?php echo $_local->gui->history; ?></div>
+							</a>
+						</li>
 					</ul>
 			</li>
 			<li class="nav_link nav-mobile"><a href="../calendar/">

public/app/studio/index_head.php

@@ -61,6 +61,9 @@ require_once '../public/load_lang.php';
 	<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 src="../../node_modules/marked/marked.min.js"></script>
+	<script src="../../node_modules/mermaid/dist/mermaid.min.js"></script>
+
 	<script src="../term/term.js"></script>
 	<script src="../term/note.js"></script>
 	<script src="../term/term_popup.js"></script>
@@ -69,8 +72,7 @@ require_once '../public/load_lang.php';
 	<script language="javascript" src="../guide/guide.js"></script>
 	<link type="text/css" rel="stylesheet" href="../guide/guide.css"/>
 
-	<script src="../../node_modules/marked/marked.min.js"></script>
-	<script src="../../node_modules/mermaid/dist/mermaid.min.js"></script>
+
 
 
 	<script src="../widget/iframe_modal_win.js"></script>

public/app/term/note.js

@@ -12,6 +12,12 @@ var _channalData;
 var MAX_NOTE_NEST = 2;
 
 var gBuildinDictIsOpen = false;
+
+var note_renderer = new marked.Renderer();
+note_renderer.code = function(code, language) {
+    if (language == "mermaid") return '<pre class="mermaid">' + code + "</pre>";
+    else return "<pre><code>" + code + "</code></pre>";
+};
 /*
 {{203-1654-23-45@11@en@*}}
 <note>203-1654-23-45@11@en@*</note>
@@ -78,7 +84,7 @@ function note_init(input,channel="",editor="",lang="en") {
 	if (input) {
 		let output = "<div>";
 		//output += marked(input);
-		output += marked(term_std_str_to_tran(input, channel, editor, lang));
+		output += marked(term_std_str_to_tran(input, channel, editor, lang), { renderer: note_renderer });
 
 		output += "</div>";
 
@@ -193,6 +199,8 @@ function note_refresh_new(callback = null) {
 						splite_pali_word();
 						//处理编辑框消息
 						tran_sent_textarea_event_init();
+						//初始化mermaid
+						mermaid.initialize();
 						if (callback) {
 							callback();
 						}