优化UI

2026-03-01 16:42:43 +08:00 · 2024-07-06 17:49:14 +08:00
parent 14aebf0535
commit 87043430b7
11 changed files with 186 additions and 178 deletions
--- a/admin/cloud/template/cloud.htm
+++ b/admin/cloud/template/cloud.htm
@@ -46,10 +46,10 @@
              <input type="checkbox" class="form-check-input" name="available[{$value[bz]}]" value="{eval echo ($value[available]?$value[available]:1)}" <!--{if $value[available]>0}-->checked<!--{/if}--> <!--{if $value[warning]}-->disabled<!--{/if}--> > <span class="text-danger" style="padding-left:3px">$value[warning]</span> 
              <!--{/if}-->
            </td>
-            <td><a href="{MOD_URL}&op=edit&bz=$value[bz]">{lang set}</a> 
+            <td width="140"><a class="btn btn-outline-primary" href="{MOD_URL}&op=edit&bz=$value[bz]">{lang set}</a> 
              <!--{if $value[warning]}--> 
              <!-- <br /> -->
-              <a class="text-danger" href="{MOD_URL}&operation=delete&bz=$value[bz]" style="margin-left:15px;">{lang delete}</a> 
+              <a class="btn btn-outline-danger" href="{MOD_URL}&operation=delete&bz=$value[bz]" style="margin-left:15px;">{lang delete}</a> 
              <!--{/if}-->
              </td>
          </tr>
--- a/admin/member/template/verify.htm
+++ b/admin/member/template/verify.htm
@@ -50,6 +50,7 @@
 				<!--{/if}-->
 			</ul>
 		</div>
+		<div class="main-content">
 		<form class="row gx-3 gy-2 align-items-center" action="{MOD_URL}" method="get">
 			<input type="hidden" name="mod" value="{MOD_NAME}">
 			<input type="hidden" name="op" value="verify">
@@ -64,7 +65,7 @@
 			<input type="text" class="form-control" id="uid" name="uid" value="$_GET[uid]"  placeholder="UID">
 		</div>
 		<!--{if $anchor!='pass'}-->
-			<div class="mb-3">
+		<div class="col-sm-6">
 			<div class="input-group" data-provide="datepicker">
 			<span class="input-group-text">从</span>
 			<input type="text" class="form-control" id="dateline1" name="dateline1" placeholder="{lang members_verify_dateline}" value="$_GET[dateline1]">
@@ -97,14 +98,12 @@
 			<option value="100" <!--{if $_GET[perpage]=='100' }-->selected="selected"<!--{/if}-->>{lang logs_lpp}100{lang individual}</option>
 			</select>
 		</div>
-      <div class="col-auto">
+		<dl>
 			<button type="submit" name="searchsubmit" value="{lang search}" class="btn btn-primary">{lang search}</button>
 			<span class="help-block">&nbsp;&nbsp;&nbsp;*{lang fuzzy_search}</span>
-      </div>
+		</dl>
 		</form>
-		<div class="main-content">
 		<iframe id="frame_profile" name="frame_profile" style="display: none"></iframe>
-
 		<form id="cpform" action="{MOD_URL}&op=verify&" class="form-horizontal" method="post" name="cpform">
 			<input type="hidden" value="{FORMHASH}" name="formhash">
 			<input type="hidden" value="true" name="verifysubmit">
--- a/admin/member/template/verifyset.htm
+++ b/admin/member/template/verifyset.htm
@@ -30,12 +30,12 @@
 				</li>
 			</ul>
 		</div>
+		<div class="main-content">
 			<div class="alert alert-warning ">
 				<ul>
 					{lang verifyset_members_verify_text}
 				</ul>
 			</div>
-		<div class="main-content">
 			<form id="cpform" action="{MOD_URL}&op=verifyset" class="form-horizontal" method="post" name="cpform">
 				<input type="hidden" value="{FORMHASH}" name="formhash">
 				<input type="hidden" value="true" name="verifysubmit">
--- a/admin/system/template/updatecache.htm
+++ b/admin/system/template/updatecache.htm
@@ -6,13 +6,11 @@
 		<!--{template left}-->
 	</div>
 	<div class="left-drager">
+		<div class="left-drager-op">
+		  <div class="left-drager-sub"></div>
+		</div>
 	  </div>
 	<div class="bs-main-container  clearfix">
-		<div class="main-header clearfix">
-      <span id="step1" <!--{if $step==1}-->style="color:green"<!--{/if}-->>1.{lang nav_updatecache_confirm}</span>
-      <span id="step2" <!--{if $step==2}-->style="color:green"<!--{/if}-->>2.{lang nav_updatecache_verify}</span>
-      <span id="step3" <!--{if $step==3}-->style="color:green"<!--{/if}-->>3.{lang nav_updatecache_completed}</span>
-		</div>
 		<div class="main-content">
 			<div class="well well-sm">
 				<!--{if $step==1}-->
@@ -31,22 +29,32 @@
 					</dl>
 				</form>
 				<!--{elseif $step==2}-->
-				<p class="ml20">{lang tools_updatecache_waiting}</p>
-				<p class="text-success ml20">
-					<a href="{MOD_URL}&op=updatecache&step=3&type=data_tpl" class="lightlink">{lang message_redirect}</a>
-				</p>
-				<script type="text/JavaScript">setTimeout(function(){location.href='{MOD_URL}&op=updatecache&step=3&type=data_tpl';}, 2000);</script>
+				<div class="text-center" style="margin:20px 0;">
+					<h2 class="text-success ml20">{lang tools_updatecache_waiting}</h2>
+					<div class="progress progress-striped active">
+						<div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width:0%"><span class="sr-only">100% Complete</span></div>
+					</div>
+				</div>
+				<dl><a href="{MOD_URL}&op=updatecache&step=3&type=data_tpl" class="btn btn-primary">{lang message_redirect}</a></dl>
+				<script type="text/javascript">
+					jQuery('.progress-bar').animate({ width: '100%' }, 2000, function() {
+						window.location.href = '{MOD_URL}&op=updatecache&step=3&type=data_tpl';
+					});
+				</script>
 				<!--{elseif $step==3}-->
-				<p class="text-success ml20" style="margin:10px;">{lang update_cache_succeed}</p>
+				<h2 class="text-primary ml20 text-center">{lang update_cache_succeed}</h2>
 				<script type="text/javascript">
 					window.setTimeout(function() { location.href = '{MOD_URL}&op=updatecache'; }, 5000);
 				</script>
 				<!--{/if}-->
 			</div>
+			<div class="alert alert-warning">
+				<h5>{lang board_message}</h5>
 				<ul class="help-block">
-				<h5>{lang board_message}</h5> {lang tools_updatecache_tips}
+					{lang tools_updatecache_tips}
 				</ul>
 		  </div>
 		</div>
 	</div>
+</div>
 <!--{template common/footer_simple}-->
--- a/admin/system/template/upgrade.htm
+++ b/admin/system/template/upgrade.htm
@@ -1,14 +1,5 @@
 <!--{template common/header_simple_start}-->
 <script src="admin/scripts/admin.js?{VERHASH}"></script>
-<style>
-	.progress.active .progress-bar {
-		-webkit-animation: none;
-		animation: none;
-		transition: none;
-		-webkit-box-shadow: none;
-		box-shadow: none;
-	}
-</style>
 <!--{template common/header_simple_end}-->
 <!--{template common/commer_header}-->
 <div class="bs-container clearfix">
@@ -16,9 +7,10 @@
 		<!--{template left}-->
 	</div>
 	<div class="left-drager">
-		
+		<div class="left-drager-op">
+		  <div class="left-drager-sub"></div>
+		</div>
 	  </div>
-
 	<div class="bs-main-container  clearfix">
 		<!--{if $operation == 'patch' || $operation == 'cross'}-->		
 		<div class="main-header clearfix">
@@ -83,7 +75,6 @@
 			<!--{/if}-->
 		</div>
 		<!--{elseif $operation=='patch' || $operation=='cross' }-->
-
 		<div class="main-content">
 			<!--{if !$_G['setting']['bbclosed']}-->
 			<div style="padding:20px;height:450px">
@@ -225,9 +216,7 @@
 			</div>
 			<!--{/if}-->
 		</div>
-
 		<!--{/if}-->
-
 	</div>
 </div>
 <script type="text/javascript">
--- a/core/core_version.php
+++ b/core/core_version.php
@@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) {
 	define('CORE_VERSION', '2.02');
 	define('CORE_RELEASE', '20180909');
 	define('CORE_FIXBUG' , '20000000');
-	define('CORE_XHVERSION', '1.87.7');
-	define('CORE_XHRELEASE', '20240412');
-	define('CORE_XHFIXBUG' , '20240110');
+	define('CORE_XHVERSION', '1.87.8');
+	define('CORE_XHRELEASE', '20240706');
+	define('CORE_XHFIXBUG' , '20240706');
 }
--- a/dzz/images/folder/folder.css
+++ b/dzz/images/folder/folder.css
@@ -238,8 +238,6 @@ span .chk-ico {
 }
 .module-grid-view .wrapper .icoimgContainer{
 	position:relative;
-	width: 100px;
-    height: 100px;
 }
 .module-grid-view .wrapper .icoimgContainer .imageclass{
 	display:block;
@@ -289,7 +287,10 @@ span .chk-ico {
 }
 .sharepame-name{
 	font-size: 14px;
-	margin-bottom: 12px;
+	margin-bottom: 10px;
+}
+.sharepame-detailed {
+	color: #6c757d;
 }
 .sharepame-detailed .sharepame-time{
 	padding-right:5px ;
--- a/dzz/orguser/template/detail_org.htm
+++ b/dzz/orguser/template/detail_org.htm
@@ -19,12 +19,16 @@

 </style>
 <div class="main-header clearfix">
-	<ul class="nav nav-pills">
+  <nav class="navbar navbar-expand-lg navbar-light">
+    <div class="container-fluid">
      <strong class="pull-left" id="title_orgname">$org['orgname']</strong>
+        <div class="collapse navbar-collapse">
          <!--{if $_G['adminid']==1}-->
          <a href="{MOD_URL}&op=export&orgid=$orgid" class="btn btn-outline-primary pull-right" title="{lang export_excl}" target="_blank">{lang export_user}</a> 
          <!--{/if}-->
-  </ul>
+      </div>
+    </div>
+  </nav>
 </div>
 <div class="main-content">
      <div class="col-md-12">
--- a/dzz/system/config/config.php
+++ b/dzz/system/config/config.php
@@ -1,4 +1,5 @@
 <?php
 return array(
    'allow_robot'=>false,
+    'allow_view'=>1,
 );
--- a/dzz/system/fileselection.php
+++ b/dzz/system/fileselection.php
@@ -17,7 +17,7 @@ $type =  isset($_GET['type']) ? intval($_GET['type']):0;//2,选择位置；1，
 $exttype =  isset($_GET['exttype']) ? trim($_GET['exttype']):'';//类型范围
 $filename = isset($_GET['filename'])?trim($_GET['filename']):'';
 $token = isset($_GET['token']) ? trim($_GET['token']):'';//调用地方传递参数，将原样返回给回调函数
-$perm = isset($_GET['perm']) ? trim($_GET['perm']):'';//权限判断值：比如 write,判断是否有写入权限；再如，write,copy，判断是否有写入和copy权限(即多个权限用逗号分隔)
+$perm = isset($_GET['perm']) ? trim($_GET['perm']):'write';//权限判断值：比如 write,判断是否有写入权限；再如，write,copy，判断是否有写入和copy权限(即多个权限用逗号分隔)
 $mulitype =  isset($_GET['mulitype']) ? intval($_GET['mulitype']):0;//0，不允许多选；1，允许多选
 if($type == 1){
    $rid = isset($_GET['rid']) ? trim($_GET['rid']):'';
--- a/static/bootstrap/css/bootstrap.min.css
+++ b/static/bootstrap/css/bootstrap.min.css
@@ -1511,6 +1511,7 @@ input[type=submit].btn-block {
    position: relative;
    padding: 8px;
 	display: table;
+    cursor: pointer;
 }
 .nav>li>a:focus,
 .nav>li>a:hover {
@@ -1579,7 +1580,9 @@ input[type=submit].btn-block {
    border: 1px solid #ddd;
    border-bottom-color: transparent
 }
-
+.nav-pills {
+    width: 100%;
+}
 .nav-pills>li {
    float: left
 }
@@ -8804,7 +8807,8 @@ fieldset:disabled .btn {
 .btn-group-vertical {
    position: relative;
    display: inline-flex;
-    vertical-align: middle
+    vertical-align: middle;
+    padding: var(--radius);
 }

 .btn-group-vertical>.btn,
@@ -16123,6 +16127,8 @@ fieldset:disabled .btn {
    border: .2rem solid var(--bs-pre);
    background: rgba(var(--bs-primary-hover),0.1);
    background-color: rgba(var(--bs-primary-hover),0.1);
+    margin-right: auto;
+    margin-left: auto;
  }
  .navbar-right .nav-item{
    padding: var(--radius);
@@ -16238,35 +16244,35 @@ fieldset:disabled .btn {

@media (min-width:576px) {

-    .main-content{
+    .main-content,.main-header{
        max-width: 540px
    }
 }

@media (min-width:768px) {

-    .main-content{
+    .main-content,.main-header{
        max-width: 720px
    }
 }

@media (min-width:992px) {

-    .main-content{
+    .main-content,.main-header{
        max-width: 960px
    }
 }

@media (min-width:1200px) {

-    .main-content {
+    .main-content,.main-header{
        max-width: 1140px
    }
 }

@media (min-width:1400px) {

-    .main-content {
+    .main-content,.main-header{
        max-width: 1320px
    }
 }