Update to version 2.4 RC1

2613df · Jan 25, 2019 · c17c37a · c17c37a
1 parent c033875
commit c17c37a
Show file tree

Hide file tree

Showing 7 changed files with 183 additions and 76 deletions.
diff --git a/content/templates/B421/assets/css/main.css b/content/templates/B421/assets/css/main.css
@@ -1 +1,107 @@
-/*基于BootStrap 3调整的CSS代码, Written By MyJoy(94joy.cn)*/.content{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1.2em;line-height:1.5em;color:#777;width:100%;height:100%;min-height:100%;resize:none;overflow-y:auto;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}textarea{overflow:auto;vertical-align:top;}#controls{position:absolute;left:0;height:25px;text-align:center;right:0;bottom:5%;}pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}body{padding-top:5em;}.txa{position:absolute;top:10%;bottom:10%;left:5%;right:5%;}.obody{text-align:center;}*{transition:all 0.5s;-moz-transition:all 0.5s;-webkit-transition:all 0.5s;-o-transition:all 0.5s;}::selection { background:#e3f2fd; color:#555; } ::-moz-selection { background:#e3f2fd; color:#555; } ::-webkit-selection { background:#e3f2fd; color:#555; }
+/*基于BootStrap 3调整的CSS代码,Written By MyJoy(94joy.cn)*/
+.navbar{background-color: #4cb4e7;}
+.container {
+    padding-right: 0px;
+    padding-left: 0px;
+    margin-right: auto;
+    margin-left: auto;
+}
+.containerContent{
+	height:100%;
+}
+.containerForm,.containerTips{
+	display: flex;
+    text-align: center;
+}
+
+.pageForm,.containerTips .alert{
+	margin:auto;
+}
+.pageFromInput{
+display:inline-block;
+width: auto;
+}
+.pageFromButton{
+	display: flex;
+    text-align: center;
+}
+.pageFromButton .btn-group{
+margin:auto;
+}
+.content {
+	overflow:auto;
+	vertical-align:top;
+	height:100%;
+	padding: 0.75rem 1rem;
+    border: 2px solid #f9f9fa;
+	width:100%;
+	font-size:1.2rem;
+	line-height:1.5;
+	outline: none;
+    box-shadow: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+	outline: 0px !important;
+    -webkit-appearance: none;
+    resize: none;
+	margin-bottom:0;/*抵消BS4.2的问题*/
+}
+.content:hover{
+	color: #495057;
+	border-color: #a5d9f3;
+}
+.content:focus{
+	color: #495057;
+	border-color: #4cb4e7;
+	box-shadow: 0 0 0 .2rem rgba(165,217,243,.25);
+}
+.footer {
+	position:fixed;
+	bottom:0rem;
+	height:auto;
+	width:100%;
+	text-align:center;
+
+}
+.bodyBtn{padding-bottom:5rem;}
+.bodyNoBtn{padding-bottom:2.5rem;}
+.footerBtn{height:5rem;}
+.footerNoBtn{height:2.5rem;}
+#controls {
+	padding:.5rem;
+	text-align:center;
+	margin:0 auto;
+	background-color:#f9f9fa;
+}
+pre {
+	white-space:pre-wrap;
+	white-space:-moz-pre-wrap;
+	white-space:-pre-wrap;
+	white-space:-o-pre-wrap;
+	word-wrap:break-word;
+}
+body {
+	padding-top:3.5rem;
+}
+
+* {
+	transition:all 0.5s;
+	-moz-transition:all 0.5s;
+	-webkit-transition:all 0.5s;
+	-o-transition:all 0.5s;
+}
+::selection {
+	background:#e3f2fd;
+	color:#555;
+}
+::-moz-selection {
+	background:#e3f2fd;
+	color:#555;
+}
+::-webkit-selection {
+	background:#e3f2fd;
+	color:#555;
+}
+html,body{
+height:100%;
+}
diff --git a/content/templates/B421/footer.php b/content/templates/B421/footer.php
@@ -1,22 +1,28 @@
 <?php ($visit) ? ("") : (header('location: /'));?>
-<div id="controls">
+<div class="footer <?php ($do)?(print "footerNoBtn"):(print "footerBtn");?>"><div class="container"><div id="controls">
 	<span>试试在别处上打开 <?php echo $URL."/".$isShareFolder.$name;?></span>
   <?php
     if(!$do and !$readOnly){//底部按钮
       $confirm="javascript:if(confirm('重置笔记将会使当前笔记内容丢失，并同时分配一个新的笔记地址，请确认您知道这么做的后果！')){location='/'}";
-      echo  '<br><div class="btn-group">
-            <a href="javascript:void(0)" class="btn btn-light" onclick="history.go(0)">刷新</a>
-            <a href="'.$confirm.'" class="btn btn-danger">重置</a>
-            <form name="form9" method="post" action="/'.$name.'" style="display:inline"> 
-              <INPUT TYPE="hidden" name="setpw" value="1" /> 
-              <button TYPE="submit" class="btn btn-success" >设定密码</button>
-            </form>
-            <form name="form10" method="post" action="/'.$name.'" style="display:inline"> 
-              <INPUT TYPE="hidden" name="share" value="1" /> 
-              <button TYPE="submit" class="btn btn-warning">获取只读页面</button>
-            </form></div>';
+	  $confirmN="{if(confirm('重置后将分配新的笔记空间，原笔记只能通过浏览记录找回，您确认重置吗?')){window.location='/';return true;}return false;}";
+      echo  '<br>
+			<div class="btn-group">
+				<a href="javascript:void(0)" class="btn btn-light" onclick="history.go(0)">刷新</a>
+				<!--a href="'.$confirm.'" class="btn btn-warning">重置</a-->
+				<a href="javascript:void(0)" class="btn btn-warning" onclick="'.$confirmN.'">重置</a>
+				<form name="form9" method="post" action="/'.$name.'" style="display:none"> 
+				  <INPUT TYPE="hidden" name="setpw" value="1" /> 
+				  <input TYPE="submit" name="button"/>
+				</form>
+				<a href="javascript:void(0)" class="btn btn-success" target="_self" onclick="javascript:document.form9.button.click();">设密</a>
+				<form name="form10" method="post" action="/'.$name.'" style="display:none"> 
+				  <INPUT TYPE="hidden" name="share" value="1" /> 
+				  <input TYPE="submit" name="button"/>
+				</form>
+				<a href="javascript:void(0)" class="btn btn-info" target="_self" onclick="javascript:document.form10.button.click();">分享</a>
+			</div>';
     }
-    if($readOnly){
+    if($readOnly and $fileShare){
       echo '<br><form name="form11" method="post" action="/share/'.$name.'" style="display:inline"> 
               <INPUT TYPE="hidden" name="share" value="0" /> 
               <INPUT TYPE="submit" name="" value ="关闭共享权限" class="btn btn-warning" >  
@@ -25,7 +31,8 @@
     }
   ?>
 </div>
-
+</div>
+</div>
 
 
 <!--备用的BootStrap JS 3.4以及Jquery 1.11.1地址

diff --git a/content/templates/B421/header.php b/content/templates/B421/header.php
@@ -7,19 +7,20 @@
     <meta name="author" content="94joy.cn" />
     <meta name="keywords" content="跨端传输,同屏传输,在线笔记,简单,简约,笔记,94Joy,NotePad" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><?php echo $name;($readOnly)?(print "(只读)"):("");?> - 94Notepad</title>
+    <title><?php ($readOnly)?(print substr($name,6)."(只读)"):(print $name);?> - 94Notepad</title>
 	<!--备用的BootStrap CSS 3.4地址
 	<link rel="stylesheet" href="/<?php echo $templateFolder."assets/css/bootstrap.min.css";?>">
 	-->
 	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
 	<link rel="stylesheet" href="/<?php echo $templateFolder."assets/css/main.css";?>" crossorigin="anonymous">
 
 </head>
-<body>
+<body class="<?php ($do)?(print "bodyNoBtn"):(print "bodyBtn");?>">
 	<!--nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top"-->
-	<nav class="navbar navbar-expand-lg navbar-light fixed-top" style="background-color: #5ed5d1;">
+	<nav class="navbar navbar-expand-lg navbar-dark fixed-top">
+	<div class="container">
 		<a class="navbar-brand" href="./">
-			<!--img src="logo.svg" width="30" height="30" alt=""--><?php print $name; ?> - 94Notepad</a>
+			<!--img src="logo.svg" width="30" height="30" alt=""--><?php ($readOnly)?(print substr($name,6)."(只读)"):(print $name);?> - 94Notepad</a>
 		<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
 			<span class="navbar-toggler-icon"></span>
 		</button>
@@ -34,15 +35,16 @@
 				<li class="nav-item">
 					<a class="nav-link" href="http://www.94joy.cn" target="_blank">返回主站</a>
 				</li>
-				<li class="nav-item"><a class="nav-link">试试在别处上打开 <?php echo $URL."/".$isShareFolder.$name;?></a></li>
+				<!--li class="nav-item"><a class="nav-link">试试在别处上打开 <?php echo $URL."/".$isShareFolder.$name;?></a></li-->
 			</ul>
 			<!--form class="form-inline my-2 my-lg-0">
 				<input class="form-control mr-sm-2" type="search" placeholder="搜寻项目、计划与文档" aria-label="Search">
 				<button class="btn btn-outline-light my-2 my-sm-0" type="submit">搜寻</button>
 			</form-->
 		  <form class="form-inline my-2 my-lg-0" action="/<?php echo $name;?>" method="POST">
-			<input type="text" name="goto" class="form-control" placeholder="笔记后缀,如 <?php echo $name;?>">
+			<input type="text" name="goto" class="form-control" placeholder="笔记后缀,如 <?php ($readOnly)?(print substr($name,6)):(print $name);?>">
 			<input type="submit" value="前往" class="btn btn-outline-light">
 		  </form>
 		</div>
+		</div>
 	</nav>