From ef4790ff378666486004a8a7737fccb6fb322a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com>
Date: Sat, 14 Jan 2023 14:43:00 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 小胡 <3203164629@qq.com>
---
 core/template/default/common/showmessage.htm | 263 ++++++++++---------
 1 file changed, 138 insertions(+), 125 deletions(-)

diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm
index e511de6..3e79ff7 100644
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -1,3 +1,4 @@
+<!--{if !$_G['inajax']}-->
 <!--{template common/header_common}-->
 <style>
 	html,body{
@@ -29,135 +30,147 @@
   </div>
 </nav>
 <script type="text/javascript">
-jQuery(document).ready(function(e) {
-    _header.init('{FORMHASH}');//初始化头部效果
-    //_header.Topcolor();
-	//_notice.init();
-	jQuery(".resNav .js-popbox").each(function(){
-		jQuery(this).popbox();
-	});
-	_notice.getNotificationCount();
-});
-_notice={};
-_notice.flashStep=1;
-_notice.checkurl='index.php?mod=system&op=notification&filter=checknew';
-_notice.normalTitle= document.title;
-_notice.getNotificationCount=function(){
-	jQuery.getJSON(_notice.checkurl,function(json){
-		var sum=parseInt(json.sum);
-		_notice.showTips(sum);
-		if(json.timeout>0) window.setTimeout(_notice.getNotificationCount,json.timeout);
-	});
-}
-_notice.showTips=function(sum){
-	if(sum>0){
-		jQuery('#dzz_notification>span.badge').html(sum).removeClass('hide');
-		jQuery('#dzz_notification>span.dzz').hide();
-		//_notice.flashTitle();
-	}else{
-		jQuery('#dzz_notification>span.badge').addClass('hide');
-		jQuery('#dzz_notification>span.dzz').show();
-		//_notice.flashTitle(1);
-	}
-}
-_notice.flashTitle=function(flag){
-	//仅窗口不在焦点时闪烁title，回到焦点时停止闪烁并将title恢复正常
-	if(flag ||　CurrentActive){//当前处于焦点
-		document.title=_notice.normalTitle;
-		_notice.flashTitleRun = false;
-		return;//退出循环
-	}
-	_notice.flashTitleRun = true;
-	_notice.flashStep++;
-	if (_notice.flashStep==3) {_notice.flashStep=1;}
-	if (_notice.flashStep==1) {document.title="【您有新的通知】";}
-	if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";}
-	setTimeout(function(){_notice.flashTitle();},500);  //循环
-}
-$("img").one("error", function(e){
-   $(this).attr("src", "static/image/common/logo.png");
-});
+  jQuery(document).ready(function(e) {
+      _header.init('{FORMHASH}');//初始化头部效果
+      //_header.Topcolor();
+    //_notice.init();
+    jQuery(".resNav .js-popbox").each(function(){
+      jQuery(this).popbox();
+    });
+    _notice.getNotificationCount();
+  });
+  _notice={};
+  _notice.flashStep=1;
+  _notice.checkurl='index.php?mod=system&op=notification&filter=checknew';
+  _notice.normalTitle= document.title;
+  _notice.getNotificationCount=function(){
+    jQuery.getJSON(_notice.checkurl,function(json){
+      var sum=parseInt(json.sum);
+      _notice.showTips(sum);
+      if(json.timeout>0) window.setTimeout(_notice.getNotificationCount,json.timeout);
+    });
+  }
+  _notice.showTips=function(sum){
+    if(sum>0){
+      jQuery('#dzz_notification>span.badge').html(sum).removeClass('hide');
+      jQuery('#dzz_notification>span.dzz').hide();
+      //_notice.flashTitle();
+    }else{
+      jQuery('#dzz_notification>span.badge').addClass('hide');
+      jQuery('#dzz_notification>span.dzz').show();
+      //_notice.flashTitle(1);
+    }
+  }
+  _notice.flashTitle=function(flag){
+    //仅窗口不在焦点时闪烁title，回到焦点时停止闪烁并将title恢复正常
+    if(flag ||　CurrentActive){//当前处于焦点
+      document.title=_notice.normalTitle;
+      _notice.flashTitleRun = false;
+      return;//退出循环
+    }
+    _notice.flashTitleRun = true;
+    _notice.flashStep++;
+    if (_notice.flashStep==3) {_notice.flashStep=1;}
+    if (_notice.flashStep==1) {document.title="【您有新的通知】";}
+    if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";}
+    setTimeout(function(){_notice.flashTitle();},500);  //循环
+  }
+  $("img").one("error", function(e){
+     $(this).attr("src", "static/image/common/logo.png");
+  });
 </script>
 <!--{/if}-->
-<div id="ct" class="container " style="position: absolute;width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;min-height: -webkit-fill-available;margin: 0;text-align: center;">
 <!--{if !$param[login]}-->
 <!--{else}-->
-  <div class="" id="main_succeed" style="max-width:500px;margin:0 auto;display: none">
-      <div class="f_c altw">
-          <div class="alert_right">
-              <h5 id="succeedmessage"></h5>
-              <p id="succeedlocation" class="alert_btnleft"></p>
-              <p class="alert_btnleft"><a id="succeedmessage_href">{lang message_forward}</a></p>
-          </div>
-      </div>
-  </div>
-  <div class="well" id="main_message">      
-    <!--{/if}-->
-    <!--{if $param[msgtype] == 1 || $param[msgtype] == 2 && !$_G[inajax] || $param[msgtype] == 2}-->
-    <div class="f_c altw">
-      <div id="messagetext">
-        <!--{if $_G['setting']['sitelogo']}-->
-        <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
-        <!--{else}-->
-        <img src="static/image/common/logo.png">
-        <!--{/if}-->
-        <h4 style="font-size: large;">$show_message</h4>
-        <!--{if $param['closetime']}-->
-        <span class="btn btn-link text-muted">$param['closetime'] {lang message_closetime}</span>
-        <!--{elseif $param['locationtime']}-->
-        <span class="btn btn-link text-muted">$param['locationtime'] {lang message_locationtime}</span>
-        <!--{/if}-->
-        <!--{if !$_G['setting']['bbclosed']|| !$_G['adminid'] ==0}-->
-        <!--{if $url_forward}-->
-        <!--{if !$param[redirectmsg]}-->
-        <button class="btn-jump btn btn-primary" onclick="location.href='$url_forward';return false;" >立即跳转（<span class="num">3</span>s）</button>
-        <button class="btn-jump btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >{lang goback} $_G[setting][sitename]</button>
-        <!--{else}-->
-        <button class="btn-jump btn btn-primary" onclick="location.href='$url_forward';return false;">{lang return_to_the_naxt_level}（<span class="num">3</span>s）</button>
-        <!--{/if}-->
-        <!--{elseif $allowreturn}-->
-        <script type="text/javascript">
-          if(history.length > (BROWSER.ie ? 0 : 1)) {
-              document.write('<p class="btn-jump btn btn-primary"><a style="color: #fff;text-decoration: blink;font-size: large;" href="javascript:history.back()">{lang message_go_back}</a></p>');
-          } else {
-              document.write('<p class="btn-jump btn btn-primary"><a style="color: #fff;text-decoration: blink;font-size: large;" href="$_G['siteurl']">[ $_G['setting']['bbname'] {lang back_homepage} ]</a></p>');
-          }
-        </script>
-        <!--{/if}-->
-		<script type="text/javascript">
-          jQuery(document).ready(function(){
-            function jump(cont){						
-                window.setTimeout(function(){
-                    cont--;
-                    if(cont>0){
-                        $('.num').text(cont);
-                        jump(cont);
-                      }
-                  },1000)
-              }
-              jump(3);
-          });
-        </script>
-        <!--{/if}-->
-        <!--{if $param[login]}-->
-        <button type="button" class="btn btn-info" onclick="hideWindow('$_GET['handlekey']');showWindow('login', 'user.php?mod=login&action=login');"><strong>{lang login}</strong></button>
-        <!--{if !$_G['setting']['bbclosed']}-->
-        <button type="button" class="btn btn-info" onclick="hideWindow('$_GET['handlekey']');window.open('user.php?mod=rigister');"><em>$_G['setting']['reglinkname']</em></button>
-        <!--{/if}-->
-        <!--{/if}-->
-      </div>
+<div class="" id="main_succeed" style="max-width:500px;margin:0 auto;display: none">
+  <div class="f_c altw">
+    <div class="alert_right">
+      <h5 id="succeedmessage"></h5>
+      <p id="succeedlocation" class="alert_btnleft"></p>
+      <p class="alert_btnleft"><a id="succeedmessage_href">{lang message_forward}</a></p>
     </div>
-    <!--{else}-->
-    <div class="f_c altw">
-      <div id="messagetext">
-        <!--{if $_G['setting']['sitelogo']}-->
-        <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
-        <!--{else}-->
-        <img src="static/image/common/logo.png">
-        <!--{/if}-->
-        <h4 style="font-size: large;">$show_message</h4>
-	  </div>
-    </div>
-    <!--{/if}-->
   </div>
 </div>
+<div class="well" id="main_message">    
+<!--{/if}-->
+<!--{else}-->
+<!--{template common/header_ajax}-->
+<!--{/if}-->
+<!--{if $param[msgtype] == 1 || $param[msgtype] == 2 && !$_G[inajax]}-->
+  <div id="ct" class="container" style="position: absolute;width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;min-height: -webkit-fill-available;margin: 0;text-align: center;">
+		<div class="f_c altw">
+			<div id="messagetext">
+				<!--{if $_G['setting']['sitelogo']}-->
+        <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
+        <!--{else}-->
+        <img src="static/image/common/logo.png">
+        <!--{/if}-->
+				<h4 style="font-size: large;">$show_message</h4>
+				<!--{if !$_G['setting']['bbclosed']|| !$_G['adminid'] ==0}-->
+				<!--{if $url_forward}-->
+        <!--{if !$param[redirectmsg]}-->
+          <button class="btn-jump btn btn-primary" onclick="location.href='$url_forward';return false;" >立即跳转（<span class="num">3</span>s）</button>
+          <button class="btn-jump btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >{lang goback} $_G[setting][sitename]</button>
+          <!--{else}-->
+          <button class="btn-jump btn btn-primary" onclick="location.href='$url_forward';return false;">{lang return_to_the_naxt_level}（<span class="num">3</span>s）</button>
+        <!--{/if}-->
+				<!--{elseif $allowreturn}-->
+				<script type="text/javascript">
+					if(history.length > (BROWSER.ie ? 0 : 1)) {
+						document.write('<p class="alert_btnleft"><a href="javascript:history.back()">{lang message_go_back}</a></p>');
+					} else {
+						document.write('<p class="alert_btnleft"><a href="$_G['siteurl']">[ $_G['setting']['bbname'] {lang homepage} ]</a></p>');
+					}
+					
+				</script>
+				<!--{/if}-->
+				<!--{/if}-->
+			</div>
+			<!--{if $param[login]}-->
+				
+			<!--{/if}-->
+		</div>
+		<script type="text/javascript">
+      jQuery(document).ready(function(){
+					function jump(cont){						
+						window.setTimeout(function(){
+							cont--;
+							if(cont>0){
+								$('.num').text(cont);
+								jump(cont);
+							}
+						},1000)
+					}
+					jump(3);
+				});
+		</script>
+  </div>
+  <!--{elseif $param[msgtype] == 2}-->
+  <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+      <h4 class="modal-title">{lang board_message}</h4>
+  </div>
+  <div class="modal-body">
+    <div class="$alerttype">$show_message</div>
+  </div>
+  <div class="modal-footer">
+    <!--{if $param['closetime']}-->
+    <span class="btn btn-link text-muted">$param['closetime'] {lang message_closetime}</span>
+    <!--{elseif $param['locationtime']}-->
+    <span class="btn btn-link text-muted">$param['locationtime'] {lang message_locationtime}</span>
+    <!--{/if}-->
+    <!--{if $param[login]}-->
+    <button type="button" class="btn btn-info" onclick="hideWindow('$_GET['handlekey']');showWindow('login', 'user.php?mod=login&action=login');"><strong>{lang login}</strong></button>
+    <!--{if !$_G['setting']['bbclosed']}-->
+    <button type="button" class="btn btn-info" onclick="hideWindow('$_GET['handlekey']');window.open('user.php?mod=rigister');"><em>$_G['setting']['reglinkname']</em></button>
+    <!--{/if}-->	
+    <!--{/if}-->
+    <button type="button"  data-dismiss="modal" class="btn btn-default"><strong>{lang close}</strong></button>
+  </div>
+<!--{else}-->$show_message<!--{/if}-->
+<!--{if !$_G['inajax']}-->
+		</div>
+	<!--{template common/footer}-->
+<!--{else}-->
+	<!--{template common/footer_ajax}-->
+<!--{/if}-->
\ No newline at end of file

From 46deb899fc0ce2fc8acbba6735d3d62db02baacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com>
Date: Sun, 15 Jan 2023 05:46:49 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=B1=85=E4=B8=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 小胡 <3203164629@qq.com>
---
 admin/appmarket/template/cloudappmarket.htm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin/appmarket/template/cloudappmarket.htm b/admin/appmarket/template/cloudappmarket.htm
index ba41048..b01df40 100644
--- a/admin/appmarket/template/cloudappmarket.htm
+++ b/admin/appmarket/template/cloudappmarket.htm
@@ -8,6 +8,8 @@
 	padding: 8px;
 	border-bottom: 1px solid #f2f2f2;
 	position: relative;
+	display: flex;
+    align-items: center;
 }
 .app_upgradelist .progess {
 	position: absolute;

From ea30bc60ea27a7f1ef0fa26c90af2abdd1ee14d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com>
Date: Sun, 15 Jan 2023 05:56:10 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 小胡 <3203164629@qq.com>
---
 core/template/default/common/showmessage.htm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm
index 3e79ff7..8fcdfde 100644
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -98,7 +98,6 @@
 <!--{/if}-->
 <!--{if $param[msgtype] == 1 || $param[msgtype] == 2 && !$_G[inajax]}-->
   <div id="ct" class="container" style="position: absolute;width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;min-height: -webkit-fill-available;margin: 0;text-align: center;">
-		<div class="f_c altw">
 			<div id="messagetext">
 				<!--{if $_G['setting']['sitelogo']}-->
         <img src="{eval echo $_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'';}">
@@ -110,16 +109,16 @@
 				<!--{if $url_forward}-->
         <!--{if !$param[redirectmsg]}-->
           <button class="btn-jump btn btn-primary" onclick="location.href='$url_forward';return false;" >立即跳转（<span class="num">3</span>s）</button>
-          <button class="btn-jump btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >{lang goback} $_G[setting][sitename]</button>
+          <button class="btn-jump btn btn-primary" onclick="location.href='$_G['siteurl']';return false;" >首页 $_G[setting][sitename]</button>
           <!--{else}-->
           <button class="btn-jump btn btn-primary" onclick="location.href='$url_forward';return false;">{lang return_to_the_naxt_level}（<span class="num">3</span>s）</button>
         <!--{/if}-->
 				<!--{elseif $allowreturn}-->
 				<script type="text/javascript">
 					if(history.length > (BROWSER.ie ? 0 : 1)) {
-						document.write('<p class="alert_btnleft"><a href="javascript:history.back()">{lang message_go_back}</a></p>');
+						document.write('<a class="btn-jump btn btn-primary" href="javascript:history.back()">{lang message_go_back}</a>');
 					} else {
-						document.write('<p class="alert_btnleft"><a href="$_G['siteurl']">[ $_G['setting']['bbname'] {lang homepage} ]</a></p>');
+						document.write('<a class="btn-jump btn btn-primary" href="$_G['siteurl']">[ $_G['setting']['bbname'] {lang homepage} ]</a>');
 					}
 					
 				</script>
@@ -129,7 +128,6 @@
 			<!--{if $param[login]}-->
 				
 			<!--{/if}-->
-		</div>
 		<script type="text/javascript">
       jQuery(document).ready(function(){
 					function jump(cont){