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

public/app/article/article.js

@@ -395,10 +395,18 @@ function palicanon_load() {
 						$("#article_author").html(result.username.nickname + "@" + result.username.username);
 						$("#contents").html(note_init(result.content));
 						note_refresh_new(function () {
-							document.querySelector("#para_focus").scrollIntoView({
-								block: "end",
-								behavior: "smooth",
-							});
+                            if(document.querySelector("#para_focus")){
+                                document.querySelector("#para_focus").scrollIntoView({
+                                    block: "end",
+                                    behavior: "smooth",
+                                });                                
+                            }
+
+                            $.get('templiates/glossary.tpl',function(data){
+                                let TermData = term_get_used();
+                                let rendered = Mustache.render(data,TermData);
+                                $("#glossary").html(rendered);                                
+                            });
 						});
 						reader_draw_para_menu();
 						guide_init();

public/app/studio/css/print.css

@@ -71,3 +71,7 @@
 #id_info_panal {
 	display: none;
 }
+
+.term_other{
+    color:unset;
+}

public/app/studio/js/common.js

@@ -171,12 +171,22 @@ function setArrange(mode) {
 		getStyleClass("trandiv").style.flex = "1";
 		getStyleClass("pardiv").style.flexDirection = "column";
 		getStyleClass("sent_wbw_trans").style.flexDirection = "column";
+        	$(".translate_sent_head").each(function(){
+                    $(this).height('auto');
+                });
+            $('.translate_sent').css('margin-top','unset');
+        getStyleClass("sent_wbw_trans").style.margintop = '0';
 	} else if (_display_para_arrange == 0) {
 		/* 0 左右对读 */
 		getStyleClass("wbwdiv").style.flex = "7";
 		getStyleClass("trandiv").style.flex = "3";
 		getStyleClass("pardiv").style.flexDirection = "row";
 		getStyleClass("sent_wbw_trans").style.flexDirection = "row";
+	    $(".translate_sent_head").each(function(){
+            $(this).height($(this).parent()[0].scrollHeight+"px");
+            });
+        getStyleClass("sent_wbw_trans").style.margintop = '-20px';
+        $('.translate_sent').css('margin-top','-20px');
 	}
 	if (_display_sbs == 1) {
 		/* 逐句对读 */
@@ -633,7 +643,7 @@ function tab_click(panalId, tabid, callback = null, parm = null) {
 		}
 	}
 	guide_init();
-	$(".translate_sent_head").each(function(){$(this).height($(this).parent()[0].scrollHeight+"px")})
+
 }
 
 /*