Преглед изворни кода

Merge pull request #541 from bhikkhu-kosalla-china/master

优化article的目录和贡献者
Bhikkhu China Kosalla пре 4 година
родитељ
комит
e256165108
3 измењених фајлова са 26 додато и 11 уклоњено
  1. 19 6
      app/article/index.php
  2. 1 1
      app/article/pad.css
  3. 6 4
      app/article/style.css

+ 19 - 6
app/article/index.php

@@ -198,9 +198,23 @@ span.fancytree-node{
 <?php
     require_once("../pcdl/head_bar.php");
 ?>
+<script>
+var show_hide=0;
+function show_content(){
+		if(show_hide==0){
+			$("#left_pannal_inner").show();
+			show_hide=1;
+		}
+		else{
+			$("#left_pannal_inner").hide();
+			show_hide=0;
+		}
+	}
+
+</script>
 <div id="head_bar" >
 	<div style="display:flex;">
-
+	<button class="icon_btn" onclick="show_content()"><?php echo $_local->gui->contents; ?></button>
 	</div>
 
 	<div style="margin: auto 0;">
@@ -262,11 +276,10 @@ span.fancytree-node{
 		</span>
 	</div>
 </div>
-
 <div id="left_pannal">
-	<div id="left_pannal_inner" class="fun_frame" >
-		<div id = "collect_title" class="title"><?php echo $_local->gui->contents; ?></div>
-		<div id = "toc_content" class="content" >
+	<div id="left_pannal_inner" class="fun_frame" style="z-index: 99;display:none;">
+		<!--<div id = "collect_title" class="title" style="text-align: right;background: #ffd70087;" onclick="show_content(this)"></div>-->
+		<div id = "toc_content" class="content" style="padding-top:0;">
 		</div>
 	</div>
 </div>
@@ -314,7 +327,7 @@ span.fancytree-node{
 				<button onclick='onChannelChange()'><?php echo $_local->gui->confirm; ?></button>
 				<button onclick='onChannelMultiSelectCancel()'><?php echo $_local->gui->cancel; ?></button>
 			</div>
-			<div id="channal_list" class="content" style="max-height:25vw;">
+			<div id="channal_list" class="content" style="max-height:calc(100vh - 20em);">
 			</div>
 		</div>
 	</div>

+ 1 - 1
app/article/pad.css

@@ -1,3 +1,3 @@
 #right_pannal {
-    display:none;
+    /*display:none;*/
 }

+ 6 - 4
app/article/style.css

@@ -39,7 +39,7 @@
 	padding: 0 1em;
 	padding-top: 7em;
 	max-width: 1280px;
-	margin-left: 300px;
+	/*margin-left: 300px;*/
 	margin-right: auto;
 }
 
@@ -49,14 +49,15 @@
     left: 0;
     padding-top: 90px;
     height: 100%;
-	width:300px;
+	/*width:300px;*/
 	overflow-x: hidden;
 	overflow-y: hidden;
 }
 
 #toc_content{
-	max-height: 100%;
+	max-height: calc(100vh - 90px);
     width: max-content;
+	/*max-width:260px;*/
 }
 
 .fun_frame {
@@ -69,9 +70,10 @@
 	font-weight: 700;
 }
 .fun_frame > .content {
-	padding: 6px;
+	padding: 4em 6px 6px 6px;
 	max-height: 6em;
 	overflow-y: scroll;
+	/*max-width: 260px;*/
 }
 
 .fixed {