Browse Source

Merge pull request #222 from visuddhinanda/master

:bug: 有些relation显示不出来
visuddhinanda 5 years ago
parent
commit
547c785d90

+ 3 - 0
app/pcdl/css/style.css

@@ -3157,4 +3157,7 @@ text-align: center;
 
 .file_list_shell{
 border-bottom: 1px solid var(--tool-line-color);
+}
+#footer_nav{
+    display: none;
 }

+ 56 - 1
app/pcdl/head_bar.php

@@ -174,7 +174,9 @@
 	.lab_tab>li{
 		padding:5px;
 	}
-	
+	.title_bar{
+		width:95vw;
+	}
 	.head_nav_dropdown:hover  {
 		color: var(--btn-border-color);
 	}
@@ -189,6 +191,59 @@
 		padding: 0.1em 0.5em 0.1em 0;
 	}
 	</style>
+	<style media="screen and (max-width:800px)">
+#right_pannal{
+	display:none;
+}
+.when_right_fixed{
+	padding-right:0;
+}
+.index_toolbar{
+	position:unset;
+}
+#pali_pedia{
+	font-size: 200%;
+	margin-top: auto;
+	margin-bottom: auto;
+	padding-left: 0.5em;
+}
+.index_inner{
+		display:block;
+	}
+	.card{
+	display: flex;
+    justify-content: space-between;
+    padding-right: 5em !important;
+}
+.card_info{
+	flex:5;
+}
+.article_title_link{
+	flex:5;
+}
+.content_inner{
+	width:95vw;
+}
+.content_inner>div{
+    width:100% !important;
+}
+.index_toolbar{
+	padding:0;
+
+}
+.head_nav{
+	padding:0;
+
+}
+.head_nav>li:not(:first-child){
+	display:none;
+}
+.toolgroup1>span{
+	display:none !important;
+}
+
+</style>
+
 		<!-- tool bar begin-->
 		<div class='index_toolbar'>
 			<div id="index_nav">

+ 25 - 0
app/search/paliword.php

@@ -100,6 +100,31 @@ include "../pcdl/html_head.php";
 		#index_list{
 			display:block;
 		}
+		#contents_view{
+		display:block;
+	}
+	#dict_ref_search_result{
+		display:none;
+	}
+	#footer_nav{
+    display: none;
+}
+#contents_foot {
+    margin-bottom: 70vh;
+    position: absolute;
+    left: 0;
+	width: 100vw;
+	margin-bottom: 10vh;
+}
+#contents_nav{
+	overflow-x: scroll;
+}
+.page_nav{
+	display:flex;
+}
+.foot_div{
+	margin-top:10vh;
+}
 	</style>
 	<script language="javascript" src="paliword.js"></script>
 	<script>

+ 4 - 0
app/search/search.css

@@ -4,7 +4,11 @@
 .search_result > .title {
 	font-size: 18px;
 }
+.search_result .bodytext {
+	overflow-x: scroll;
+}
 .search_result > .path {
+	overflow-x: scroll;
 	color: var(--btn-border-color);
 }
 highlight {

+ 2 - 2
app/search/toobar.php

@@ -86,11 +86,11 @@
 	<div id='search_toolbar_1' class="search_toolbar search_fixed">
 			<div style="display:flex;">
 				<span >
-					搜索
+					<?php echo $_local->gui->search;?>
 				</span>
 				<div class="case_dropdown">
 					<div>
-						<input id="dict_ref_search_input_1" type="input" placeholder="<?php echo $_local->gui->search;?>" onkeyup="search_input_keyup(event,this)" style="margin-left: 0.5em;width: 40em;max-width: 80%;font-size:120%;padding: 0.2em;color: var(--btn-hover-bg-color);background-color: var(--btn-color);" onfocus="search_input_onfocus()">
+						<input id="dict_ref_search_input_1" type="input" placeholder="<?php echo $_local->gui->search;?>" onkeyup="search_input_keyup(event,this)" style="margin-left: 0.5em;min-width: 40vw;max-width: 80%;font-size:120%;padding: 0.2em;color: var(--btn-hover-bg-color);background-color: var(--btn-color);" onfocus="search_input_onfocus()">
 					</div>
 					<div id="pre_search_word_content_1" class="case_dropdown-content"></div>
 				</div>

+ 3 - 2
app/studio/js/render.js

@@ -1551,10 +1551,11 @@ function renderWordParBlockInner(elementBlock) {
 }
 
 function sent_show_rel_map(book, para, begin, end) {
-	let wordId;
+	let wordId = 0;
 	let memind = "graph LR\n";
 	let pali_text = "";
-	for (wordId = begin; wordId <= end; wordId++) {
+
+	for (wordId = parseInt(begin); wordId <= parseInt(end); wordId++) {
 		let rel = doc_word("#p" + book + "-" + para + "-" + wordId).val("rela");
 		let pali = doc_word("#p" + book + "-" + para + "-" + wordId).val("real");
 		let type = doc_word("#p" + book + "-" + para + "-" + wordId).val("type");