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

app/article/my_article.js

@@ -142,10 +142,10 @@ function my_article_edit(id) {
 					html += "<div style='display:flex;'>";
 					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='channal_selector' form_name='channal' style='display:none;'></div>";
 					html += "<div id='aritcle_status' style='display: flex; '></div>";
 					html +=
-						'<div style="display:flex;width:100%;" ><span style="flex:3;margin: auto;">' +
+						'<div style="display:none;width:100%;" ><span style="flex:3;margin: auto;">' +
 						gLocal.gui.language_select +
 						'</span>	<input id="article_lang_select"  style="flex:7;width:100%;" type="input" onchange="article_lang_change()"  placeholder="' +
 						gLocal.gui.input +

app/course/index.php

@@ -196,13 +196,13 @@ include "../pcdl/html_head.php";
 	<div class="index_inner">
 		<div id="course_head_bar" class="collect_head_bar">
 			<div class="section_inner">
-				<h1>課程</h1>
-				<div style="max-width:30em">來自世界個地的巴利專家詳細解析聖典</div>
+				<h1><?php echo $_local->gui->lesson ;?></h1>
+				<div style="max-width:30em"><?php echo $_local->gui->lesson_intro; ?></div>
 			</div>
 		</div>
 		<div class="index_list_categories">
 			<div class="title_bar">
-				<h3><?php echo $_local->gui->speaker ?></h3>
+				<h3><?php echo $_local->gui->speaker ;?></h3>
 				<span class="title_more"><a href="../course"><?php echo $_local->gui->more ?></a></span>
 			</div>
 			<div class="content">

app/public/lang/default.json

@@ -609,6 +609,9 @@
 		"cooperate_group": "cooperative group",
 		"personal": "personal",
 		"empty_null_mark": "Here is so quiet",
+		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
+		"teaching_course": "teaching course",
+		"watching_course": "watching course",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/en.json

@@ -608,6 +608,9 @@
 		"cooperate_group": "cooperative group",
 		"personal": "personal",
 		"empty_null_mark": "Here is so quiet",
+		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
+		"teaching_course": "teaching course",
+		"watching_course": "watching course",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/my.json

@@ -608,6 +608,9 @@
 		"cooperate_group": "cooperative group",
 		"personal": "personal",
 		"empty_null_mark": "Here is so quiet",
+		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
+		"teaching_course": "teaching course",
+		"watching_course": "watching course",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/si.json

@@ -613,6 +613,9 @@
 		"cooperate_group": "cooperative group",
 		"personal": "personal",
 		"empty_null_mark": "Here is so quiet",
+		"lesson_intro": "Let’s take the course to see how the pāḷi experts explain conon",
+		"teaching_course": "teaching course",
+		"watching_course": "watching course",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-cn.json

@@ -611,6 +611,9 @@
 		"cooperate_group": "协作组",
 		"personal": "个人",
 		"empty_null_mark": "这里很安静",
+		"lesson_intro": "看看世界个地的巴利专家都是如何解析圣典的",
+		"teaching_course": "主讲的课程",
+		"watching_course": "关注的课程",
 		"": ""
 	},
 	"grammastr": [

app/public/lang/zh-tw.json

@@ -610,6 +610,9 @@
 		"cooperate_group": "協作組",
 		"personal": "個人",
 		"empty_null_mark": "這裡很安靜",
+		"lesson_intro": "看看世界個地的巴利專家都是如何解析聖典的",
+		"teaching_course": "主講的課程",
+		"watching_course": "關注的課程",
 		"": ""
 	},
 	"grammastr": [

app/uhome/course.php

@@ -19,16 +19,17 @@ include "../pcdl/html_head.php";
 
 <div class='section_inner'>
 	<div class="course_info_block">
-		<h2>你发布的课程</h2>
+		<h2><?php echo $_local->gui->teaching_course ;?></h2>
 		<div id="course_list" >
 		</div>
 	</div>
 	<div class="course_info_block">
-		<h2>你关注的课程</h2>
+		<h2><?php echo $_local->gui->watching_course ;?></h2>
 		<div id="my_like" >
 		</div>
 	</div>
 </div>	
+<script src="../public/js/marked.js"></script>
 
 <script>
 	$.get("../course/course_list.php",
@@ -39,7 +40,7 @@ include "../pcdl/html_head.php";
 		let arrData = JSON.parse(data);
 		let html='';
 		html +="<div style='display:flex;'>";
-		html +="<div style='flex:5;'>"
+		html +="<div style='flex:10;'>"
 		html +='<iframe style="width:100%;height: 550px;" src="../fullcalendar/examples/time-zones.php"></iframe>';
 		html +="</div>";
 		html +="<div style='flex:5;'>";
@@ -50,11 +51,11 @@ include "../pcdl/html_head.php";
 				html += '<div style="flex:7;">';
 				html +=  '<div class="title" style="padding-bottom:5px;font-size:110%;font-weight:600;"><a href="../course/course.php?id='+iterator.id+'">'+iterator.title+'</a></div>';
 				html += '<div class="summary"  style="padding-bottom:5px;">'+iterator.subtitle+'</div>';
-				html += '<div class="summary"  style="padding-bottom:5px;">'+iterator.summary+'</div>';
+				html += '<div class="summary"  style="padding-bottom:5px;">'+marked(iterator.summary)+'</div>';
 
 				html += '</div>';
 
-				html += '<div style="flex:3;max-width:15em;">';
+				html += '<div style="/*flex:3;max-width:15em;*/">';
 
 				html += '</div>';