优化自由列表页面

.gitignore

@@ -29,3 +29,7 @@ src/data/backupdata/*
 src/a/*.html
 src/data/mkall_cache_*.php
 src/data/payment/cod.php
+src/freelist/
+src/data/rss/*
+src/data/rssmap.html
+src/data/sitemap.html

src/dede/makehtml_freelist.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_freelist.php 1 9:17 2010年7月19日Z tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */

src/dede/makehtml_freelist_action.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_freelist_action.php 1 9:11 2010年7月19日Z tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
@@ -18,7 +19,7 @@ if(!empty($endid) && $endid>=$startid)
     $ci .= " And aid <= $endid ";
 }
 header("Content-Type: text/html; charset={$cfg_soft_lang}");
-$dsql->SetQuery("Select aid From #@__freelist where $ci");
+$dsql->SetQuery("SELECT aid FROM `#@__freelist` WHERE $ci");
 $dsql->Execute();
 while($row=$dsql->GetArray())
 {

src/dede/makehtml_homepage.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_homepage.php 2 9:30 2010-11-11 tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
@@ -44,11 +45,13 @@ else if($dopost=="make")
         $GLOBALS['_arclistEnv'] = 'index';
         $pv->SetTemplet($cfg_basedir.$cfg_templets_dir."/".$templet);
         $pv->SaveToHtml($homeFile);
-        echo "成功更新主页HTML：".$homeFile."<br /><a href='{$position}' target='_blank'>浏览...</a><br />";
+        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
+        echo "<div class=\"alert alert-success\" role=\"alert\">成功更新主页HTML：".$homeFile."<br /><a href='{$position}' target='_blank' class='btn btn-secondary'>浏览...</a></div><br />";
     } else { 
         // 动态浏览
         if (file_exists($homeFile)) @unlink($homeFile);
-        echo "采用动态浏览模式：<a href='../index.php' target='_blank'>浏览...</a><br />";
+        echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
+        echo "<div class=\"alert alert-success\" role=\"alert\">采用动态浏览模式：<a href='../index.php' target='_blank' class='btn btn-secondary'>浏览...</a></div><br />";
     }
     
     $iquery = "UPDATE `#@__homepageset` SET showmod='$showmod'";

src/dede/makehtml_map.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_map.php 1 11:17 2010年7月19日Z tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
@@ -35,5 +36,6 @@ $dtp = new DedeTagParse();
 $dtp->LoadTemplet($tmpfile);
 $dtp->SaveTo($cfg_basedir.$murl);
 $dtp->Clear();
-echo "<a href='$murl' target='_blank'>成功更新文件: $murl 浏览...</a>";
+echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
+echo "<div class=\"alert alert-success\" role=\"alert\">成功更新文件: $murl <a href='$murl' target='_blank' class='btn btn-secondary'>浏览...</a></div>";
 exit();

src/dede/makehtml_rss.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_rss.php 1 11:17 2010年7月19日Z tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */

src/dede/makehtml_rss_action.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_rss.php 1 11:17 2010年7月19日Z tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
@@ -18,7 +19,8 @@ if(empty($maxrecord)) $maxrecord = 50;
 $row = $dsql->GetOne("SELECT id FROM `#@__arctype` WHERE id>'$tid' AND ispart<>2 ORDER BY id ASC LIMIT 0,1;");
 if(!is_array($row))
 {
-    echo "完成所有文件更新！";
+    echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
+    echo "<div class=\"alert alert-success\" role=\"alert\">完成所有文件更新！</div>";
 } else {
     $rv = new RssView($row['id'],$maxrecord);
     $rssurl = $rv->MakeRss(0);

src/dede/makehtml_spec.php

@@ -5,6 +5,7 @@
  * @version        $Id: makehtml_spec.php 1 11:17 2010年7月19日Z tianya $
  * @package        DedeCMS.Administrator
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
@@ -17,7 +18,8 @@ if($dopost=="ok")
     require_once(DEDEINC."/arc.specview.class.php");
     $sp = new SpecView();
     $rurl = $sp->MakeHtml(0);
-    echo "成功生成所有专题HTML列表！<a href='$rurl' target='_blank'>预览</a>";
+    echo "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style>";
+    echo "<div class=\"alert alert-success\" role=\"alert\">成功生成所有专题HTML列表！<a href='$rurl' target='_blank' class='btn btn-secondary'>预览</a></div>";
     exit();
 }
 include DedeInclude('templets/makehtml_spec.htm');

src/dede/templets/freelist_add.htm

@@ -11,44 +11,6 @@
   <script language="javascript" src="../static/js/jquery.js"></script>
   <script src="../static/js/bootstrap.bundle.js"></script>
   <script src="js/main.js" language="javascript"></script>
-  <script language="JavaScript">
-    function ChangeListStyle() {
-      var itxt = document.getElementById("myinnertext");
-      var myems = document.getElementsByName("liststyle");
-      if (myems[0].checked) itxt.value = document.getElementById("list1").innerHTML;
-      else if (myems[1].checked) itxt.value = document.getElementById("list2").innerHTML;
-      else if (myems[2].checked) itxt.value = document.getElementById("list3").innerHTML;
-      else if (myems[3].checked) itxt.value = document.getElementById("list4").innerHTML;
-      itxt.value = itxt.value.replace("<BR>", "<BR/>");
-      itxt.value = itxt.value.toLowerCase();
-    }
-    function ShowHide(objname) {
-      var obj = document.getElementById(objname);
-      if (obj.style.display == "block" || obj.style.display == "")
-        obj.style.display = "none";
-      else
-        obj.style.display = "block";
-    }
-    function SelectTemplets(fname) {
-      if (document.all) {
-        var posLeft = window.event.clientY - 200;
-        var posTop = window.event.clientX - 300;
-      }
-      else {
-        var posLeft = 100;
-        var posTop = 100;
-      }
-      window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop);
-    }
-    function CheckSubmit() {
-      if (document.form1.title.value == "") {
-        ShowMsg("自由列表标题标题不能为空！");
-        document.form1.title.focus();
-        return false;
-      }
-      return true;
-    }
-  </script>
   <link rel="stylesheet" type="text/css" href="css/codemirror.css">
   <script type="text/javascript" src="js/codemirror.js"></script>
   <script type="text/javascript" src="js/mode/xml/xml.js"></script>
@@ -64,11 +26,27 @@
   </div>
   <center>
     <div style="display:none" id="list1">
-      <li>[field:textlink/]</li>
+      <li class="media border-bottom-dashed mt-2 py-2">
+          <div class="media-body row">
+              <div class="col-12 title">
+                  <a href="[field:arcurl/]">
+                      <h4 class="mt-0 mb-3">[field:title/]</h4>
+                  </a>
+              </div>
+          </div>
+      </li>
     </div>
 
     <div style="display:none" id="list2">
-      <li>[[field:typelink/]][field:textlink/]</li>
+      <li class="media border-bottom-dashed mt-2 py-2">
+          <div class="media-body row">
+              <div class="col-12 title">
+                [[field:typelink/]] <a href="[field:arcurl/]">
+                      <h4 class="mt-0 mb-3">[field:title/]</h4>
+                  </a>
+              </div>
+          </div>
+      </li>
     </div>
 
     <div style="display:none" id="list3">
@@ -83,15 +61,23 @@
     </div>
 
     <div style="display:none" id="list4">
-      <li>
-        [field:imglink/]
-        [field:textlink/]
-        <span class="info">
-          <small>日期：</small>[field:pubdate function="GetDateMK(@me)"/]
-          <small>点击：</small>[field:click/]
-          <small>好评：</small>[field:scores/]
-        </span>
-        <p class="intro"> [field:description/]...</p>
+      <li class="media border-bottom-dashed mt-2 py-2">
+          <a href="[field:arcurl/]"><img src="[field:litpic/]" class="mr-3" alt="[field:title/]"></a>
+          <div class="media-body row">
+              <div class="col-12 title">
+                  <a href="[field:arcurl/]">
+                      <h4 class="mt-0 mb-3">[field:title/]</h4>
+                  </a>
+              </div>
+              <div class="col-12 description py-2">
+                  <a href="[field:arcurl/]">
+                      [field:description/]...
+                  </a>
+              </div>
+              <div class="col-12 addinfo">
+              日期：[field:pubdate function="MyDate('Y-m-d', @me)"/] 点击：[field:click/] 好评：[field:scores/]
+              </div>
+          </div>
       </li>
     </div>
     <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center"
@@ -321,6 +307,42 @@
       lineWrapping: true,
       mode: 'text/html'
     });
+    function ChangeListStyle() {
+      var itxt = document.getElementById("myinnertext");
+      var myems = document.getElementsByName("liststyle");
+      if (myems[0].checked) editor.setValue(document.getElementById("list1").innerHTML);
+      else if (myems[1].checked) editor.setValue(document.getElementById("list2").innerHTML);
+      else if (myems[2].checked) editor.setValue(document.getElementById("list3").innerHTML);
+      else if (myems[3].checked) editor.setValue(document.getElementById("list4").innerHTML);
+      editor.setValue(editor.getValue().replace("<BR>", "<BR/>"));
+      editor.setValue(editor.getValue().toLowerCase());
+    }
+    function ShowHide(objname) {
+      var obj = document.getElementById(objname);
+      if (obj.style.display == "block" || obj.style.display == "")
+        obj.style.display = "none";
+      else
+        obj.style.display = "block";
+    }
+    function SelectTemplets(fname) {
+      if (document.all) {
+        var posLeft = window.event.clientY - 200;
+        var posTop = window.event.clientX - 300;
+      }
+      else {
+        var posLeft = 100;
+        var posTop = 100;
+      }
+      window.open("./dialog/select_templets.php?&activepath=<?php echo urlencode($cfg_templets_dir)?>&f=" + fname, "poptempWin", "scrollbars=yes,resizable=yes,statebar=no,width=600,height=400,left=" + posLeft + ", top=" + posTop);
+    }
+    function CheckSubmit() {
+      if (document.form1.title.value == "") {
+        ShowMsg("自由列表标题标题不能为空！");
+        document.form1.title.focus();
+        return false;
+      }
+      return true;
+    }
   </script>
 </body>
 

src/dede/templets/makehtml_freelist.htm

@@ -1,77 +1,92 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
-<title>生成HTML</title>
-<link href="css/base.css" rel="stylesheet" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
+  <title>生成HTML</title>
+  <link rel="stylesheet" href="../static/css/bootstrap.min.css">
+  <link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+  <link href="css/base.css" rel="stylesheet" type="text/css">
 </head>
+
 <body background="images/allbg.gif">
-<div class="bodytitle">
-	<div class="bodytitleleft"></div>
-	<div class="bodytitletxt" style="padding-left:10px;">HTML更新</div>
-</div>
-<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="tbtitle" style="background:#CFCFCF;">
-  <form name="form1" action="makehtml_freelist_action.php" method="get" target='stafrm'>
-    <tr> 
-      <td colspan="2" bgcolor="#EDF9D5" background="images/tbg.gif" ><table width="98%" border="0" cellpadding="0" cellspacing="0">
-        <tr>
-          <td width="30%" height="18" style="padding-left:10px;"><strong>更新自由列表HTML：</strong></td>
-          <td width="70%" align="right"><input type="button" name="b113" value="管理自由列表" onClick="location='freelist_main.php';" class="inputbut"/>
-          </td>
-        </tr>
-      </table></td>
+  <div class="bodytitle mt-3">
+    <div class="bodytitleleft"></div>
+    <div class="bodytitletxt" style="padding-left:10px;">HTML更新</div>
+  </div>
+  <table width="98%" border="0" cellpadding="1" cellspacing="1" align="center"  class="table maintable table-bordered"
+    style="background:#CFCFCF;">
+    <form name="form1" action="makehtml_freelist_action.php" method="get" target='stafrm'>
+      <tr>
+        <td colspan="2" bgcolor="#EDF9D5" background="images/tbg.gif">
+          <table width="98%" border="0" cellpadding="0" cellspacing="0" class="table-borderless">
+            <tr>
+              <td width="30%" height="18" style="padding-left:10px;"><strong>更新自由列表HTML：</strong></td>
+              <td width="70%" align="right"><button type="button" name="b113"
+                  onClick="location='freelist_main.php';" class="btn btn-secondary btn-sm">管理自由列表</button>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td width="108" height="20" bgcolor="#FFFFFF">&nbsp;&nbsp;起始ID：</td>
+        <td width="377" height="20" valign="top" bgcolor="#FFFFFF">
+          <strong>&nbsp;&nbsp;</strong>
+          <input name="startid" type="text" id="startid" size="10" <?php  if(!empty($aid)) echo " value='$aid'"; ?>>
+          （空或0表示从头开始）
+        </td>
+      </tr>
+      <tr>
+        <td height="20" valign="top" bgcolor="#FFFFFF">&nbsp;&nbsp;结束ID：</td>
+        <td height="20" valign="top" bgcolor="#FFFFFF">
+          <strong>&nbsp;&nbsp;</strong>
+          <input name="endid" type="text" id="endid" size="10" <?php  if(!empty($aid)) echo " value='$aid'"; ?>>
+          （空或0表示直到结束ID）
+        </td>
+      </tr>
+      <tr>
+        <td height="20" bgcolor="#FFFFFF">&nbsp;&nbsp;每批生成：</td>
+        <td height="20" bgcolor="#FFFFFF"> <strong>&nbsp;&nbsp;</strong>
+          <input name="pagesize" type="text" id="pagesize" value="100" size="8">
+          个文件</td>
+      </tr>
+      <tr>
+        <td height="35" colspan="2" bgcolor="#ffffff" align="center">
+            <button type="button" onClick="document.form1.submit();"  class="btn btn-secondary">开始生成HTML</button>
+          &nbsp; </td>
+      </tr>
+    </form>
+    <tr>
+      <td height="20" colspan="2" bgcolor="#F9FCEF">
+        <table width="100%">
+          <tr>
+            <td width="74%">进行状态： </td>
+            <td width="26%" align="right">
+              <script language='javascript'>
+                function ResizeDiv(obj, ty) {
+                  if (ty == "+") document.all[obj].style.pixelHeight += 50;
+                  else if (document.all[obj].style.pixelHeight > 80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
+                }
+              </script>
+              [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>]
+            </td>
+          </tr>
+        </table>
+      </td>
     </tr>
-    <tr> 
-      <td width="108" height="20" bgcolor="#FFFFFF">&nbsp;&nbsp;起始ID：</td>
-      <td width="377" height="20" valign="top" bgcolor="#FFFFFF">
-      	<strong>&nbsp;&nbsp;</strong>
-      	<input name="startid" type="text" id="startid" size="10"<?php  if(!empty($aid)) echo " value='$aid'"; ?>>
-        （空或0表示从头开始）
-       </td>
+    <tr bgcolor="#FFFFFF">
+      <td colspan="2" id="mtd">
+        <div id='mdv' style='width:100%;height:100;'>
+          <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
+        </div>
+        <script language="JavaScript">
+          document.all.mdv.style.pixelHeight = screen.height - 360;
+        </script>
+      </td>
     </tr>
-    <tr> 
-      <td height="20" valign="top" bgcolor="#FFFFFF">&nbsp;&nbsp;结束ID：</td>
-      <td height="20" valign="top" bgcolor="#FFFFFF">
-      	<strong>&nbsp;&nbsp;</strong>
-      	<input name="endid" type="text" id="endid" size="10"<?php  if(!empty($aid)) echo " value='$aid'"; ?>>
-        （空或0表示直到结束ID） 
-       </td>
-    </tr>
-    <tr> 
-      <td height="20" bgcolor="#FFFFFF">&nbsp;&nbsp;每批生成：</td>
-      <td height="20" bgcolor="#FFFFFF"> <strong>&nbsp;&nbsp;</strong>
-        <input name="pagesize" type="text" id="pagesize" value="100" size="8">
-        个文件</td>
-    </tr>
-    <tr> 
-      <td height="35" colspan="2" bgcolor="#ffffff" align="center"> <input name="b112" type="button" value="开始生成HTML" onClick="document.form1.submit();" class="inputbut"/>
-        &nbsp; </td>
-    </tr>
-  </form>
-  <tr> 
-    <td height="20" colspan="2" bgcolor="#F9FCEF"> <table width="100%">
-        <tr> 
-          <td width="74%">进行状态： </td>
-          <td width="26%" align="right"> <script language='javascript'>
-            	function ResizeDiv(obj,ty)
-            	{
-            		if(ty=="+") document.all[obj].style.pixelHeight += 50;
-            		else if(document.all[obj].style.pixelHeight>80) document.all[obj].style.pixelHeight = document.all[obj].style.pixelHeight - 50;
-            	}
-            	</script>
-            [<a href='#' onClick="ResizeDiv('mdv','+');">增大</a>] [<a href='#' onClick="ResizeDiv('mdv','-');">缩小</a>] 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr bgcolor="#FFFFFF"> 
-    <td colspan="2" id="mtd"> <div id='mdv' style='width:100%;height:100;'> 
-        <iframe name="stafrm" frameborder="0" id="stafrm" width="100%" height="100%"></iframe>
-      </div>
-      <script language="JavaScript">
-	  document.all.mdv.style.pixelHeight = screen.height - 360;
-	  </script> </td>
-  </tr>
-</table>
+  </table>
 </body>
-</html>
+
+</html>

src/include/arc.freelist.class.php

@@ -5,6 +5,7 @@
  * @version        $Id: arc.freelist.class.php 3 15:15 2010年7月7日Z tianya $
  * @package        DedeCMS.Libraries
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */
@@ -85,7 +86,7 @@ class FreeList
         //设置一些全局参数的值
         $this->Fields['aid'] = $this->FLInfos['aid'];
         $this->Fields['title'] = $this->FLInfos['title'];
-        $this->Fields['position'] = $this->FLInfos['title'];
+        $this->Fields['position'] = "<li class=\"breadcrumb-item\">{$this->FLInfos['title']}</li>";
         $this->Fields['keywords'] = $this->FLInfos['keywords'];
         $this->Fields['description'] = $this->FLInfos['description'];
         $channelid = $this->ListObj->GetAtt('channel');
@@ -298,7 +299,7 @@ class FreeList
 
             //保存文件
             $this->dtp->SaveTo($makeFile);
-            echo "成功创建：<a href='".preg_replace("#\/{1,}#", "/", $murl)."' target='_blank'>".preg_replace("#\/{1,}#", "/", $murl)."</a><br/>";
+            echo "<div class=\"alert alert-success\" role=\"alert\">成功创建：<a href='".preg_replace("#\/{1,}#", "/", $murl)."' target='_blank'>".preg_replace("#\/{1,}#", "/", $murl)."</a></div><br/>";
         }
         if($this->FLInfos['nodefault']==0)
         {
@@ -306,7 +307,7 @@ class FreeList
             $murl .= '/'.$this->FLInfos['defaultpage'];
             $indexfile = $GLOBALS['cfg_basedir'].$murl;
             $murl = preg_replace("#\/{1,}#", "/", $murl);
-            echo "复制：$firstFile 为 ".$this->FLInfos['defaultpage']." <br/>";
+            echo "<div class=\"alert alert-success\" role=\"alert\">复制：$firstFile 为 ".$this->FLInfos['defaultpage']."</div><br/>";
             copy($firstFile,$indexfile);
         }
         $this->Close();

src/include/arc.specview.class.php

@@ -166,8 +166,8 @@ class SpecView
      */
     function Display()
     {
-        if($this->TypeLink->TypeInfos['ispart']==1
-        ||$this->TypeLink->TypeInfos['ispart']==2)
+        if(isset($this->TypeLink->TypeInfos) && ($this->TypeLink->TypeInfos['ispart']==1
+        ||$this->TypeLink->TypeInfos['ispart']==2))
         {
             $this->DisplayPartTemplets();
         }

src/include/common.func.php

@@ -282,7 +282,7 @@ function ShowMsg($msg, $gourl, $onlymsg=0, $limittime=0)
     if(empty($GLOBALS['cfg_plus_dir'])) $GLOBALS['cfg_plus_dir'] = '..';
 
     $htmlhead  = "<html>\r\n<head>\r\n<title>DedeCMS提示信息</title>\r\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset={$cfg_soft_lang}\" />\r\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\">";
-    $htmlhead .= "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><link href=\"{$cfg_cmsurl}/static/font-awesome/css/font-awesome.min.css\" rel=\"stylesheet\">";
+    $htmlhead .= "<link rel=\"stylesheet\" href=\"{$cfg_cmsurl}/static/css/bootstrap.min.css\"><style>.modal {position: static;}</style><link href=\"{$cfg_cmsurl}/static/font-awesome/css/font-awesome.min.css\" rel=\"stylesheet\">";
     $htmlhead .= "<base target='_self'/></head>\r\n<body leftmargin='0' topmargin='0' bgcolor='#FFFFFF'>".(isset($GLOBALS['ucsynlogin']) ? $GLOBALS['ucsynlogin'] : '')."\r\n<center>\r\n<script>\r\n";
     $htmlfoot  = "</script>\r\n</center>\r\n</body>\r\n</html>\r\n";
 

src/include/dedetag.class.php

@@ -5,6 +5,7 @@
  * @version        $Id: dedetag.class.php 1 10:33 2010年7月6日Z tianya $
  * @package        DedeCMS.Libraries
  * @copyright      Copyright (c) 2007 - 2020, DesDev, Inc.
+ * @copyright      Copyright (c) 2020, DedeBIZ.COM
  * @license        http://help.dedecms.com/usersguide/license.html
  * @link           http://www.dedecms.com
  */

src/static/css/dede.css

@@ -624,6 +624,11 @@ nav.location .dede li.active .nav-link {
     height: 160px;
 }
 
+.list-image img {
+    width: 130px;
+    max-width: 130px!important;
+}
+
 @media only screen and (max-width: 1199px) {
     .ddcard > .card-header .caption span {
         font-size: 14px;

src/templets/default/article_spec.htm

@@ -45,7 +45,6 @@
 					<small>时间：</small>{dede:field.pubdate function="MyDate('Y-m-d',@me)"/}
 					<small>来源：</small>{dede:field.source/}
 					<small>作者：</small>{dede:field.writer/}
-					<small>点击：</small><span id="_count">...</span>次
 				</div>
 
 				<div class="speciallist row pt-2">

src/templets/default/list_article.htm

@@ -42,7 +42,7 @@
                         <div class="media-body row mt-2 py-2">
                             <div class="col-12 caption">
                                 <a href="[field:arcurl/]">
-                                    <h4 class="title">[field:code/] [field:title/]</h4>
+                                    <h4 class="title">[field:title/]</h4>
                                 </a>
                             </div>
                             <div class="col-12 description">

src/templets/default/list_free.htm

@@ -1,63 +1,68 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
-<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
-<meta name="keywords" content="{dede:field name='keywords'/}" />
-<meta name="description" content="{dede:field name='description' function='html2text(@me)'/}" />
-<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
+    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
+    <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <title>{dede:field.title/}_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
+    <meta name="keywords" content="{dede:field.keywords/}" />
+    <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
 </head>
-<body class="articlelist">
-{dede:include filename="head.htm"/}
-<!-- /header -->
-
-<div class="w960 center clear mt1">
-	<div class="pleft">
-		<div class="place">
-			<strong>当前位置:</strong> {dede:field name='position'/}
-		</div><!-- /place -->
-		<div class="listbox">
-			<ul class="e2">
- {dede:freelist/}
-			</ul>
-		</div><!-- /listbox -->
-		<div class="dede_pages">
-			<ul class="pagelist">
-             {dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="5"/}
-			</ul>
-		</div><!-- /pages -->
-	</div><!-- /pleft -->
-	
-	<div class="pright">
-		<div class="commend">
-			<dl class="tbox">
-				<dt><strong>推荐内容</strong></dt>
-				<dd>
-					<ul class="d4">
-           {dede:arclist flag='c' titlelen=42 row=6}
-          	<li><a href="[field:arcurl/]">[field:title/]</a>
-            	<p>[field:description function='cn_substr(@me,80)'/]...</p>
-            </li>{/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
-		</div><!-- /commend -->
-		<div class="hot mt1">
-			<dl class="tbox">
-				<dt><strong>热点内容</strong></dt>
-				<dd>
-					<ul class="c1 ico2">
-                    {dede:arclist row=10 orderby=click}
-                    	<li><a href="[field:arcurl/]">[field:title/]</a></li>
-                    {/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
-		</div>
-	</div><!-- /pright -->
-</div>
-{dede:include filename="footer.htm"/}
-<!-- /footer -->
 
+<body>
+    {dede:include filename="top.htm"/}
+    
+    {dede:include filename="header.htm"/}
+
+    {dede:include filename="navbar.htm"/}
+
+    <div class="container">
+        <div class="position">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb mb-0">
+                    <li class="breadcrumb-item">当前位置</li>
+                    {dede:field name='position'/}
+                </ol>
+            </nav>
+        </div>
+        <!-- /.position -->
+    </div>
+
+    <main class="container">
+        <div class="row">
+            <div class="col-md-8 list-main">
+                <ul class="list-unstyled items">
+                    {dede:freelist/}
+                </ul>
+                <nav>
+                    <ul class="pagination justify-content-center py-3">
+                        {dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="1"/}
+                    </ul>
+                </nav>
+
+            </div>
+            <!-- /.list-main -->
+
+            <aside class="col-md-4 article-sidebar">
+
+                {dede:include comment='栏目列表' filename="widget_channels.htm"/}
+
+                {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
+
+                {dede:include comment='热点内容' filename="widget_hot.htm"/}
+
+            </aside>
+            <!-- /.article-sidebar -->
+
+        </div>
+    </main>
+    <!-- /main -->
+
+    {dede:include filename="footer.htm"/}
 </body>
+
 </html>

src/templets/default/list_spec.htm

@@ -1,76 +1,90 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!doctype html>
+<html lang="zh-CN">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset={dede:global.cfg_soft_lang/}" />
-<title>专题_{dede:global.cfg_webname/}</title>
-<meta name="keywords" content="{dede:field name='keywords'/}" />
-<meta name="description" content="{dede:field name='description' function='html2text(@me)'/}" />
-<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <script src="{dede:global.cfg_cmsurl/}/static/js/jquery.min.js"></script>
+    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/bootstrap.min.css">
+    <link href="{dede:global.cfg_cmsurl/}/static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="{dede:global.cfg_cmsurl/}/static/css/dede.css">
+    <link rel="shortcut icon" href="{dede:global.cfg_cmsurl/}/static/img/favicon.png">
+    <title>专题_{dede:global.cfg_webname/} - {dede:global.cfg_welcome/}</title>
+    <meta name="keywords" content="{dede:field.keywords/}" />
+    <meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
 </head>
-<body class="articlelist">
-{dede:include filename="head.htm"/}
-<!-- /header -->
 
-<div class="w960 center clear mt1">
-	<div class="pleft">
-		<div class="place">
-			<strong>当前位置:</strong> 专题列表
-		</div><!-- /place -->
-		<div class="listbox">
-			<ul class="e2">
-{dede:list pagesize='10'}
-				<li>
-      				[field:array runphp='yes']@me = (empty(@me['litpic']) ? "" : "<a href='{@me['arcurl']}' class='preview'><img src='{@me['litpic']}'/></a>"); [/field:array]
-					<a href="[field:arcurl/]" class="title">[field:title/]</a>
-					<span class="info">
-						<small>日期：</small>[field:pubdate function="GetDateTimeMK(@me)"/]
-						<small>点击：</small>[field:click/]
-					</span>
-					<p class="intro">
-						[field:description/]...
-					</p>
-				</li>
-{/dede:list}
-			</ul>
-		</div><!-- /listbox -->
-		<div class="dede_pages">
-			<ul class="pagelist">
-             {dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="5"/}
-			</ul>
-		</div><!-- /pages -->
-	</div><!-- /pleft -->
-	
-	<div class="pright">
-		<div class="commend">
-			<dl class="tbox">
-				<dt><strong>推荐专题</strong></dt>
-				<dd>
-					<ul class="d4">
-           {dede:arclist flag='c' channelid='-1' titlelen=42 row=6}
-          	<li><a href="[field:arcurl/]">[field:title/]</a>
-            	<p>[field:description function='cn_substr(@me,80)'/]...</p>
-            </li>{/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
-		</div><!-- /commend -->
-		<div class="hot mt1">
-			<dl class="tbox">
-				<dt><strong>热点内容</strong></dt>
-				<dd>
-					<ul class="c1 ico2">
-                    {dede:arclist row=10 orderby=click}
-                    	<li><a href="[field:arcurl/]">[field:title/]</a></li>
-                    {/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
-		</div>
+<body>
+    {dede:include filename="top.htm"/}
+    
+    {dede:include filename="header.htm"/}
 
-	</div><!-- /pright -->
-</div>
+    {dede:include filename="navbar.htm"/}
 
-<!-- /footer -->
+    <div class="container">
+        <div class="position">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb mb-0">
+                    <li class="breadcrumb-item">当前位置</li>
+                    <li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">首页</a></li>
+                    <li class="breadcrumb-item">专题</li>
+                </ol>
+            </nav>
+        </div>
+        <!-- /.position -->
+    </div>
 
+    <main class="container">
+        <div class="row">
+            <div class="col-md-8 list-main">
+                
+                <ul class="list-unstyled items">
+                    {dede:list pagesize='10'}
+                    <li class="media border-bottom-dashed mt-2 py-2 list-image">
+                        <a href="[field:arcurl/]"><img src="[field:litpic/]" class="mr-3" alt="[field:title/]"></a>
+                        <div class="media-body row">
+                            <div class="col-12 title">
+                                <a href="[field:arcurl/]">
+                                    <h4 class="mt-0 mb-3">[field:title/]</h4>
+                                </a>
+                            </div>
+                            <div class="col-12 description py-2">
+                                <a href="[field:arcurl/]">
+                                    [field:description/]...
+                                </a>
+							</div>
+							<div class="col-12 addinfo">
+                            上传日期：[field:pubdate function="MyDate('Y-m-d', @me)"/]
+                            </div>
+                        </div>
+                    </li>
+                    {/dede:list}
+                    
+                </ul>
+                <nav>
+                    <ul class="pagination justify-content-center py-3">
+                        {dede:pagelist listitem="info,index,end,pre,next,pageno" listsize="1"/}
+                    </ul>
+                </nav>
+
+            </div>
+            <!-- /.list-main -->
+
+            <aside class="col-md-4 article-sidebar">
+
+                {dede:include comment='栏目列表' filename="widget_channels.htm"/}
+
+                {dede:include comment='推荐内容' filename="widget_recommend.htm"/}
+
+                {dede:include comment='热点内容' filename="widget_hot.htm"/}
+
+            </aside>
+            <!-- /.article-sidebar -->
+
+        </div>
+    </main>
+    <!-- /main -->
+
+    {dede:include filename="footer.htm"/}
 </body>
-</html>
+
+</html>

src/templets/system/spec_arclist.htm

@@ -1 +1 @@
-<li>[[field:typename/]] <a href="[field:arcurl /]" target="_blank">[field:title /]</a></li>
+<li>[field:typename/] <a href="[field:arcurl /]" target="_blank">[field:title /]</a></li>