diff --git a/src/admin/templets/index.htm b/src/admin/templets/index.htm
index e8d05977..85c45f78 100644
--- a/src/admin/templets/index.htm
+++ b/src/admin/templets/index.htm
@@ -14,8 +14,7 @@
 	<body class="menu-show">
 		<header class="admin-head navbar navbar-expand navbar-dark">
 			<div class="logo">
-				<a href="index_body.php" target="main" class="name"><?php echo cn_substr($cfg_webname, 12);?></a>
-				<span class="version"><?php echo $cfg_version_detail;?></span>
+				<a href="index_body.php" target="main" class="name mr-2"><?php echo cn_substr($cfg_webname, 14);?></a>
 				<?php if (DEDEBIZ_SAFE_MODE) {?>
 				<a href="index_body.php?dopost=safe_mode" target="main" class="btn btn-primary btn-xs">安全</a>
 				<?php } else {?>
diff --git a/src/admin/templets/index_body.htm b/src/admin/templets/index_body.htm
index 34328b50..79d063d4 100644
--- a/src/admin/templets/index_body.htm
+++ b/src/admin/templets/index_body.htm
@@ -75,17 +75,17 @@
 									<tbody>
 										<tr>
 											<td width="16%">
-												<p>操作系统</p>
-												<span><?php echo PHP_OS;?></span>
-											</td>
-											<td width="16%">
-												<p>WEB服务器</p>
-												<span><?php echo GetSimpleServerSoftware();?></span>
+												<p>软件版本</p>
+												<span><?php echo $cfg_version_detail;?></span>
 											</td>
 											<td width="16%">
 												<p>IP地址</p>
 												<span><?php echo gethostbyname($_SERVER['SERVER_NAME']);?></span>
 											</td>
+											<td width="16%">
+												<p>操作系统</p>
+												<span><?php echo PHP_OS;?> / <?php echo GetSimpleServerSoftware();?></span>
+											</td>
 											<td width="16%">
 												<p>PHP版本</p>
 												<span><?php echo @phpversion();?></span>
diff --git a/src/system/taglib/channel.lib.php b/src/system/taglib/channel.lib.php
index 8bac5a80..40df44c4 100755
--- a/src/system/taglib/channel.lib.php
+++ b/src/system/taglib/channel.lib.php
@@ -91,10 +91,13 @@ function lib_channel(&$ctag, &$refObj)
                     $row['typelink'] = GetOneTypeUrlA($row);
                     $linkOkstr = str_replace("~rel~", $row['rel'], $linkOkstr);
                     $linkOkstr = str_replace("~id~", $row['id'], $linkOkstr);
+                    $linkOkstr = str_replace("~typename~", $row['typename'], $linkOkstr);
+                    $linkOkstr = str_replace("~cnoverview~", $row['cnoverview'], $linkOkstr);
+                    $linkOkstr = str_replace("~enname~", $row['enname'], $linkOkstr);
+                    $linkOkstr = str_replace("~enoverview~", $row['enoverview'], $linkOkstr);
+                    $linkOkstr = str_replace("~typelink~", $row['typelink'], $linkOkstr);
                     $linkOkstr = str_replace("~bigpic~", $row['bigpic'], $linkOkstr);
                     $linkOkstr = str_replace("~litimg~", $row['litimg'], $linkOkstr);
-                    $linkOkstr = str_replace("~typelink~", $row['typelink'], $linkOkstr);
-                    $linkOkstr = str_replace("~typename~", $row['typename'], $linkOkstr);
                     $likeType .= $linkOkstr;
                 } else {
                     $row['typelink'] = $row['typeurl'] = GetOneTypeUrlA($row);
