软件功能、软件模板调整

README.md

@@ -1,12 +1,12 @@
-# DedeCMS v5
+# DedeCMS v6
 
 国内专业的PHP网站内容管理系统-织梦内容管理系统
 
 ## 版本说明
 
-DedeCMS v5.x是一个LTS版本，支持将到2022年10月截止，目前最新版本为v5.7SP2，开发版本为v5.8
+DedeCMS v6.x是一个LTS版本，支持将到2022年10月截止
 
-## v5.8 Roadmap
+## v6 Roadmap
 
 状态 ✅ 已完成 🔨 进行中 ❌ 未完成
 
@@ -18,13 +18,13 @@ DedeCMS v5.x是一个LTS版本，支持将到2022年10月截止，目前最新
 
 - ✅ 升级内置编辑器ckeditor4为最新版本；
 
-- ✅ v5.8以后仅发布UTF-8版本的程序，不再提供GBK编码的版本；
+- ✅ v6以后仅发布UTF-8版本的程序，不再提供GBK编码的版本；
 
 - ✅ jQuery升级到3.5.X，并逐步淘汰过于陈旧的浏览器支持；
 
 - ✅ 后台界面样式调整；
 
-- ✅ 支持TAG标签静态化，增加内容呈现维度，更利于SEO；
+- ✅ 支持Tag标签静态化，增加内容呈现维度，更利于SEO；
 
 - 🔨 优化内置的模块插件，增强用户体验；
 
@@ -32,7 +32,7 @@ DedeCMS v5.x是一个LTS版本，支持将到2022年10月截止，目前最新
 
 - ✅ 移除对Flash的依赖支持，今后版本采用HTML5相关特性；
 
-- ❌ 调整v5.8版本程序升级相关功能；
+- ❌ 调整v6版本程序升级相关功能；
 
 - 🔨 兼容PHP7.4，DedeCMS未来的版本以PHP7.X为主，实验性支持PHP8.X；
 
@@ -42,6 +42,8 @@ DedeCMS v5.x是一个LTS版本，支持将到2022年10月截止，目前最新
 
 - ❌ 官方网站页面调整，调整部分内容以适应未来的版本更新；
 
+- 🔨 增加DedeBIZ商业支持，构建更安全、稳定的DedeCMS生态；
+
 ## 平台需求
 
 1.Windows 平台
@@ -107,14 +109,6 @@ MySQL扩展库
 
 - [DedeCMS官方主站](http://www.dedecms.com)
 
-- [DedeCMS问题反馈](https://github.com/dedetech/issues)
-
-- [DedeCMS Github](https://github.com/dedetech/)
-
-- [织梦维基](http://docs.dedecms.com)
-
-- [客服中心](http://service.dedecms.com)
-
-- [技术支持论坛](http://bbs.dedecms.com)
+- [DedeBIZ商业支持](https://www.dedebiz.com)
 
-- [上海卓卓网络科技](http://www.desdev.cn)
+- [代码托管](https://git.dedebiz.com/)

src/dede/inc/inc_action_info.php

@@ -166,7 +166,7 @@ $actionSearch[4] = array(
             'linkurl' =>'article_description_main.php'
         ),
         6  =>  array(
-            'title' =>'TAG标签管理 ',
+            'title' =>'Tag标签管理 ',
             'description' =>'对整个网站的tag进行批量的维护',
             'purview' =>'sys_Keyword',
             'linkurl' =>'tags_main.php'

src/include/common.inc.php

@@ -7,8 +7,6 @@
  * @link           http://www.dedecms.com
  */
 
-
-
 // 生产环境使用production
 define('DEDE_ENVIRONMENT', 'dev');
 

src/include/taglib/channel/softlinks.lib.php

@@ -42,7 +42,7 @@ function ch_softlinks($fvalue, &$ctag, &$refObj, $fname='', $downloadpage=false)
 //读取所有链接地址
 function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row)
 {
-    global $dsql, $cfg_phpurl;
+    global $cfg_phpurl;
     $phppath = $cfg_phpurl;
     $islinktype = false;
     if(!empty($link_type)) $islinktype = true;
@@ -62,7 +62,8 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row)
         foreach($sites as $site)
         {
             if(trim($site)=='') continue;
-            list($link,$serverName,$serverType) = explode('|', $site);
+            
+            @list($link,$serverName,$serverType) = explode('|', $site);
             $sertype_arr[trim($serverName)] = trim($serverType);
         }
     }

src/index.php

@@ -18,7 +18,7 @@ if(isset($_GET['upcache']) || !file_exists('index.html'))
     require_once (dirname(__FILE__) . "/include/common.inc.php");
     require_once DEDEINC."/arc.partview.class.php";
     $GLOBALS['_arclistEnv'] = 'index';
-    $row = $dsql->GetOne("Select * From `#@__homepageset`");
+    $row = $dsql->GetOne("SELECT * FROM `#@__homepageset`");
     $row['templet'] = MfTemplet($row['templet']);
     $pv = new PartView();
     $pv->SetTemplet($cfg_basedir . $cfg_templets_dir . "/" . $row['templet']);

src/static/css/dede.css

@@ -82,7 +82,7 @@ ul.items > li .title,ul.items > li .caption a {
     color: #212529;
 }
 
-ul.items > li .description, ul.items > li .description a {
+ul.items > li .description, ul.items > li .description a, ul.items > li .addinfo {
     color: #868686;
     display: -webkit-box;
     -webkit-line-clamp: 3;
@@ -92,10 +92,18 @@ ul.items > li .description, ul.items > li .description a {
     word-break:break-all;
 }
 
+ul.items > li .addinfo {
+    font-size: 14px;
+}
+
 ul.items .border-bottom-dashed {
     border-bottom: dashed 1px #929292;
 }
 
+ul.items img {
+    max-width: 100px;
+}
+
 ul.items > li .label {
     border: 1px solid #FF8400;
     color: #FF8400;

src/static/js/dede.js

@@ -1,36 +1,31 @@
-/* Copyright 2020 The ZiXue.CN Authors. All rights reserved.
+/* Copyright 2020 The DedeBIZ.COM Authors. All rights reserved.
 license that can be found in the LICENSE file. */
 
 // 滚动到页面顶部
 function gotop() {
-    $('html, body').animate({ scrollTop: 0 }, 'slow'); 
+    $('html, body').animate({ scrollTop: 0 }, 'slow');
 }
 
 //读写cookie函数
-function GetCookie(c_name)
-{
-    if (document.cookie.length > 0)
-    {
+function GetCookie(c_name) {
+    if (document.cookie.length > 0) {
         c_start = document.cookie.indexOf(c_name + "=")
-        if (c_start != -1)
-        {
+        if (c_start != -1) {
             c_start = c_start + c_name.length + 1;
-            c_end   = document.cookie.indexOf(";",c_start);
-            if (c_end == -1)
-            {
+            c_end = document.cookie.indexOf(";", c_start);
+            if (c_end == -1) {
                 c_end = document.cookie.length;
             }
-            return unescape(document.cookie.substring(c_start,c_end));
+            return unescape(document.cookie.substring(c_start, c_end));
         }
     }
     return null
 }
 
-function SetCookie(c_name,value,expiredays)
-{
+function SetCookie(c_name, value, expiredays) {
     var exdate = new Date();
     exdate.setDate(exdate.getDate() + expiredays);
-    document.cookie = c_name + "=" +escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); //使设置的有效时间正确。增加toGMTString()
+    document.cookie = c_name + "=" + escape(value) + ((expiredays == null) ? "" : ";expires=" + exdate.toGMTString()); //使设置的有效时间正确。增加toGMTString()
 }
 
 //-------------------------------------------------------------------------------------------
@@ -123,6 +118,69 @@ function ShowAlert(ele, content, type, showtime = 3000) {
     }, showtime);
 }
 
+//-------------------------------------------------------------------------------------------
+// 纠错扩展
+//-------------------------------------------------------------------------------------------
+// 提交纠错信息
+function ErrAddSaveDo(modalID) {
+    let aid = $("#iptID").val();
+    let title = $("#iptTitle").val();
+    let type = $("#selType").val();
+    let err = $("#iptErr").val();
+    let erradd = $("#iptErradd").val();
+    let parms = {
+        format: "json",
+        dopost: "saveedit",
+        aid: aid,
+        title: title,
+        type: type,
+        err: err,
+        erradd: erradd,
+    };
+    $("#btnSubmit").attr("disabled", "disabled");
+    $.post("{dede:field name='phpurl'/}/erraddsave.php", parms, function () {
+        CloseModal(modalID);
+    });
+}
+
+// 错误提示
+function ErrorAddSave(id, title) {
+    let content = `
+    <input type="hidden" value="${id}" class="form-control" id="iptID">
+    <div class="form-group">
+    <label for="iptTitle" class="col-form-label">标题：</label>
+    <input type="text" disabled=true value="${title}" class="form-control" id="iptTitle">
+    </div>
+    <div class="form-group">
+    <label for="message-text" class="col-form-label">错误类型：</label>
+    <select id="selType" class="form-control">
+            <option value="1">错别字(除的、地、得)</option>
+            <option value="2">成语运用不当</option>
+            <option value="3">专业术语写法不规则</option>
+            <option value="4">产品与图片不符</option>
+            <option value="5">事实年代以及内容错误</option>
+            <option value="6">技术参数错误</option>
+            <option value="7">其他</option>
+    </select>
+    </div>
+    <div class="form-group">
+    <label for="message-text" class="col-form-label">错误内容：</label>
+    <textarea name="iptErr" class="form-control" id="iptErr"></textarea>
+    </div>
+    <div class="form-group">
+    <label for="message-text" class="col-form-label">修正建议：</label>
+    <textarea name="optErradd" class="form-control" id="iptErradd"></textarea>
+    </div>
+        `;
+    let footer = `
+        <button type="button" id="btnSubmit" class="btn btn-success" onClick="ErrAddSaveDo('DedeModal~modalID~')">提交</button>
+        <button type="button" class="btn btn-outline-success" onClick="CloseModal('DedeModal~modalID~')">确定</button>
+        `;
+    ShowMsg(content, {
+        'footer': footer,
+    });
+}
+
 
 // 页面加载触发
 $(document).ready(function () {

src/templets/default/article_article.htm

@@ -44,9 +44,6 @@
                 </div>
 
                 <div class="body py-2">
-                    {dede:arccontent aid=84}
-                    [field:body/]
-                    {/dede:arccontent}
                     {dede:field.body/} (责任编辑：{dede:adminname/})
                 </div>
                 <!-- /.body -->
@@ -105,78 +102,15 @@
 
     {dede:include filename="footer.htm"/}
     <script>
-        //-------------------------------------------------------------------------------------------
-        // 纠错扩展
-        //-------------------------------------------------------------------------------------------
-        // 提交纠错信息
-        function ErrAddSaveDo(modalID) {
-            let aid = $("#iptID").val();
-            let title = $("#iptTitle").val();
-            let type = $("#selType").val();
-            let err = $("#iptErr").val();
-            let erradd = $("#iptErradd").val();
-            let parms = {
-                format: "json",
-                dopost: "saveedit",
-                aid: aid,
-                title: title,
-                type: type,
-                err: err,
-                erradd: erradd,
-            };
-            $("#btnSubmit").attr("disabled", "disabled");
-            $.post("{dede:field name='phpurl'/}/erraddsave.php", parms, function () {
-                CloseModal(modalID);
-            });
-        }
-
-        // 错误提示
-        function ErrorAddSave(id, title) {
-            let content = `
-    <input type="hidden" value="${id}" class="form-control" id="iptID">
-    <div class="form-group">
-    <label for="iptTitle" class="col-form-label">标题：</label>
-    <input type="text" disabled=true value="${title}" class="form-control" id="iptTitle">
-    </div>
-    <div class="form-group">
-    <label for="message-text" class="col-form-label">错误类型：</label>
-    <select id="selType" class="form-control">
-            <option value="1">错别字(除的、地、得)</option>
-            <option value="2">成语运用不当</option>
-            <option value="3">专业术语写法不规则</option>
-            <option value="4">产品与图片不符</option>
-            <option value="5">事实年代以及内容错误</option>
-            <option value="6">技术参数错误</option>
-            <option value="7">其他</option>
-    </select>
-    </div>
-    <div class="form-group">
-    <label for="message-text" class="col-form-label">错误内容：</label>
-    <textarea name="iptErr" class="form-control" id="iptErr"></textarea>
-    </div>
-    <div class="form-group">
-    <label for="message-text" class="col-form-label">修正建议：</label>
-    <textarea name="optErradd" class="form-control" id="iptErradd"></textarea>
-    </div>
-        `;
-            let footer = `
-        <button type="button" id="btnSubmit" class="btn btn-success" onClick="ErrAddSaveDo('DedeModal~modalID~')">提交</button>
-        <button type="button" class="btn btn-outline-success" onClick="CloseModal('DedeModal~modalID~')">确定</button>
-        `;
-            ShowMsg(content, {
-                'footer': footer,
-            });
-        }
+
 
         // 页面加载触发
         $(document).ready(function () {
-
             // 获取文档点击数统计
             $.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1", function (data) {
                 let result = JSON.parse(data);
                 $("#_count").html(result.data.click);
             })
-
         });
     </script>
 </body>

src/templets/default/article_article1.htm

@@ -1,230 +0,0 @@
-<!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={dede:global.cfg_soft_lang/}" />
-<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
-<meta name="keywords" content="{dede:field.keywords/}" />
-<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
-<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
-<script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
-<script language="javascript" type="text/javascript">
-<!--
-function CheckLogin(){
-	  var taget_obj = document.getElementById('_ajax_feedback');
-	  myajax = new DedeAjax(taget_obj,false,false,'','','');
-	  myajax.SendGet2("{dede:global.cfg_cmsurl/}/member/ajax_feedback.php");
-}
-function postBadGood(ftype,fid)
-{
-	var taget_obj = document.getElementById(ftype+fid);
-	var saveid = GetCookie('badgoodid');
-	if(saveid != null)
-	{
-		var saveids = saveid.split(',');
-		var hasid = false;
-		saveid = '';
-		j = 1;
-		for(i=saveids.length-1;i>=0;i--)
-		{
-			if(saveids[i]==fid && hasid) continue;
-			else {
-				if(saveids[i]==fid && !hasid) hasid = true;
-				saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-				j++;
-				if(j==10 && hasid) break;
-				if(j==9 && !hasid) break;
-			}
-		}
-		if(hasid) { alert('您刚才已表决过了喔！'); return false;}
-		else saveid += ','+fid;
-		SetCookie('badgoodid',saveid,1);
-	}
-	else
-	{
-		SetCookie('badgoodid',fid,1);
-	}
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:field name='phpurl'/}/feedback.php?aid="+fid+"&action="+ftype+"&fid="+fid);
-}
-function postDigg(ftype,aid)
-{
-	var taget_obj = document.getElementById('newdigg');
-	var saveid = GetCookie('diggid');
-	if(saveid != null)
-	{
-		var saveids = saveid.split(',');
-		var hasid = false;
-		saveid = '';
-		j = 1;
-		for(i=saveids.length-1;i>=0;i--)
-		{
-			if(saveids[i]==aid && hasid) continue;
-			else {
-				if(saveids[i]==aid && !hasid) hasid = true;
-				saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-				j++;
-				if(j==20 && hasid) break;
-				if(j==19 && !hasid) break;
-			}
-		}
-		if(hasid) { alert("您已经顶过该帖，请不要重复顶帖 ！"); return; }
-		else saveid += ','+aid;
-		SetCookie('diggid',saveid,1);
-	}
-	else
-	{
-		SetCookie('diggid',aid,1);
-	}
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	var url = "{dede:global.cfg_phpurl/}/digg_ajax.php?action="+ftype+"&id="+aid;
-	myajax.SendGet2(url);
-}
-function getDigg(aid)
-{
-	var taget_obj = document.getElementById('newdigg');
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:global.cfg_phpurl/}/digg_ajax.php?id="+aid);
-}
--->
-
-</script>
-</head>
-<body class="articleview">
-{dede:include filename="head2.htm"/}
-<!-- /header -->
-
-<div class="channel-nav w960 center clear">
-	<div class='sonnav'>
-	{dede:channel type='self' currentstyle="<span><a href='~typelink~' class='thisclass'>~typename~</a></span>"}
-		<span><a href='[field:typeurl/]'>[field:typename/]</a></span>{/dede:channel}
-	</div>
-</div><!-- /channel-nav -->
-
-<div class="w960 center clear mt1">
-	<div class="pleft">
-		<div class="place">
-			<strong>当前位置:</strong> {dede:field name='position'/}
-		</div><!-- /place -->
-		<div class="viewbox">
-			<div class="title">
-				<h2>{dede:field.title/}</h2>
-			</div><!-- /title -->
-			<div class="info">
-				<small>时间:</small>{dede:field.pubdate function="MyDate('Y-m-d H:i',@me)"/}<small>来源:</small>{dede:field.source/} <small>作者:</small>{dede:field.writer/} <small>点击:</small><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}" type='text/javascript' language="javascript"></script>次</div><!-- /info -->
-
-            	{dede:field.description runphp='yes'}
-                if(@me<>'' )@me = '<div class="intro">'.@me.'</div>';
-                {/dede:field.description}
-			<div class="content">
-                <div id="contentMidPicAD" style="float:right; clear:both; top:0; vertical-align:top;">{dede:myad name='contentMidPicAD'/}</div>
-			　　{dede:field.body/}(责任编辑：{dede:adminname/})
-			</div><!-- /content -->
-			<div class="dede_pages">
-				<ul class="pagelist">
-          {dede:pagebreak/}
-				</ul>
-			</div><!-- /pages -->
-			
-			<!-- //顶踩 -->
-			<div class="newdigg" id="newdigg">
-				<div class="diggbox digg_good" onmousemove="this.style.backgroundPosition='left bottom';" onmouseout="this.style.backgroundPosition='left top';" onclick="javascript:postDigg('good',{dede:field.id/})">
-					<div class="digg_act">顶一下</div>
-					<div class="digg_num">({dede:field.goodpost/})</div>
-					<div class="digg_percent">
-						<div class="digg_percent_bar"><span style="width:{dede:field.goodper/}%"></span></div>
-						<div class="digg_percent_num">{dede:field.goodper/}%</div>
-					</div>
-				</div>
-				<div class="diggbox digg_bad" onmousemove="this.style.backgroundPosition='right bottom';" onmouseout="this.style.backgroundPosition='right top';" onclick="javascript:postDigg('bad',{dede:field.id/})">
-					<div class="digg_act">踩一下</div>
-					<div class="digg_num">({dede:field.badpost/})</div>
-					<div class="digg_percent">
-						<div class="digg_percent_bar"><span style="width:{dede:field.badper/}%"></span></div>
-						<div class="digg_percent_num">{dede:field.badper/}%</div>
-					</div>
-				</div>
-			</div>
-			<script language="javascript" type="text/javascript">getDigg({dede:field.id/});</script>
-			<!-- //顶踩部份的源码结束 -->
-			
-			<div class="boxoff">
-				<strong>------分隔线----------------------------</strong>
-			</div>
-			<div class="handle">
-				<div class="context">
-					<ul>
-						<li>{dede:prenext get='pre'/}</li>
-						<li>{dede:prenext get='next'/}</li>
-					</ul>
-				</div><!-- /context -->
-				<div class="actbox">
-					<ul>
-						<li id="act-fav"><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-						<li id="act-err"><a href="{dede:field name='phpurl'/}/erraddsave.php?aid={dede:field.id/}&title={dede:field.title/}" target="_blank">挑错</a></li>
-						<li id="act-pus"><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-						<li id="act-pnt"><a href="#" onClick="window.print();">打印</a></li>
-					</ul>
-				</div><!-- /actbox -->
-			</div><!-- /handle -->
-		</div><!-- /viewbox -->
-
-<!-- //AJAX评论区 -->
-{dede:include file='ajaxfeedback.htm' /}
-
-</div><!-- //左边内容结束 -->
-
-<!-- //右边内容开始 -->
-<div class="pright">
- 		{dede:memberinfos}
- 			<div class="infos_userinfo">
-			<dl class="tbox light">
-				<dt class='light'><strong>发布者资料</strong></dt>
-				<dd class='light'>
-					<a href="[field:spaceurl /]" class="userface"><img src="[field:face/]" width="52" height="52" /></a>
-					<a href='[field:spaceurl /]' class="username">[field:uname/]</a>
-					<span class="useract">
-						<a href="[field:spaceurl /]" class="useract-vi">查看详细资料</a>
-                        <a href="[field:spaceurl /]&action=guestbook" class="useract-pm">发送留言</a>
-						<a href="[field:spaceurl /]&action=newfriend" class="useract-af">加为好友</a>
-					</span>
-					<span class="userinfo-sp"><small>用户等级:</small>[field:rankname /]</span>
-					<span class="userinfo-sp"><small>注册时间:</small>[field:jointime function="MyDate('Y-m-d H:m',@me)"/]</span>
-					<span class="userinfo-sp"><small>最后登录:</small>[field:logintime function="MyDate('Y-m-d H:m',@me)"/]</span>
-				</dd>
-			</dl>
-			</div>
-		{/dede:memberinfos}
-		<div class="commend mt1">
-			<dl class="tbox light">
-				<dt class='light'><strong>推荐内容</strong></dt>
-				<dd class='light'>
-					<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 light">
-				<dt class='light'><strong>热点内容</strong></dt>
-				<dd class='light'>
-					<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>
-</html>

src/templets/default/article_article2.htm

@@ -1,229 +0,0 @@
-<!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={dede:global.cfg_soft_lang/}" />
-<title>{dede:field.title/}_{dede:global.cfg_webname/}</title>
-<meta name="keywords" content="{dede:field.keywords/}" />
-<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
-<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
-<script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
-<script language="javascript" type="text/javascript">
-<!--
-function CheckLogin(){
-	  var taget_obj = document.getElementById('_ajax_feedback');
-	  myajax = new DedeAjax(taget_obj,false,false,'','','');
-	  myajax.SendGet2("{dede:global.cfg_cmsurl/}/member/ajax_feedback.php");
-}
-function postBadGood(ftype,fid)
-{
-	var taget_obj = document.getElementById(ftype+fid);
-	var saveid = GetCookie('badgoodid');
-	if(saveid != null)
-	{
-		var saveids = saveid.split(',');
-		var hasid = false;
-		saveid = '';
-		j = 1;
-		for(i=saveids.length-1;i>=0;i--)
-		{
-			if(saveids[i]==fid && hasid) continue;
-			else {
-				if(saveids[i]==fid && !hasid) hasid = true;
-				saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-				j++;
-				if(j==10 && hasid) break;
-				if(j==9 && !hasid) break;
-			}
-		}
-		if(hasid) { alert('您刚才已表决过了喔！'); return false;}
-		else saveid += ','+fid;
-		SetCookie('badgoodid',saveid,1);
-	}
-	else
-	{
-		SetCookie('badgoodid',fid,1);
-	}
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:field name='phpurl'/}/feedback.php?aid="+fid+"&action="+ftype+"&fid="+fid);
-}
-function postDigg(ftype,aid)
-{
-	var taget_obj = document.getElementById('newdigg');
-	var saveid = GetCookie('diggid');
-	if(saveid != null)
-	{
-		var saveids = saveid.split(',');
-		var hasid = false;
-		saveid = '';
-		j = 1;
-		for(i=saveids.length-1;i>=0;i--)
-		{
-			if(saveids[i]==aid && hasid) continue;
-			else {
-				if(saveids[i]==aid && !hasid) hasid = true;
-				saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-				j++;
-				if(j==20 && hasid) break;
-				if(j==19 && !hasid) break;
-			}
-		}
-		if(hasid) { alert("您已经顶过该帖，请不要重复顶帖 ！"); return; }
-		else saveid += ','+aid;
-		SetCookie('diggid',saveid,1);
-	}
-	else
-	{
-		SetCookie('diggid',aid,1);
-	}
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	var url = "{dede:global.cfg_phpurl/}/digg_ajax.php?action="+ftype+"&id="+aid;
-	myajax.SendGet2(url);
-}
-function getDigg(aid)
-{
-	var taget_obj = document.getElementById('newdigg');
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:global.cfg_phpurl/}/digg_ajax.php?id="+aid);
-}
--->
-</script>
-</head>
-<body class="articleview">
-{dede:include filename="head2.htm"/}
-<!-- /header -->
-
-<div class="channel-nav w960 center clear">
-	<div class='sonnav'>
-	{dede:channel type='self' currentstyle="<span><a href='~typelink~' class='thisclass'>~typename~</a></span>"}
-		<span><a href='[field:typeurl/]'>[field:typename/]</a></span>{/dede:channel}
-	</div>
-</div><!-- /channel-nav -->
-
-<div class="w960 center clear mt1">
-	<div class="pleft">
-		<div class="place">
-			<strong>当前位置:</strong> {dede:field name='position'/}
-		</div><!-- /place -->
-		<div class="viewbox">
-			<div class="title">
-				<h2>{dede:field.title/}</h2>
-			</div><!-- /title -->
-			<div class="info">
-				<small>时间:</small>{dede:field.pubdate function="MyDate('Y-m-d H:i',@me)"/}<small>来源:</small>{dede:field.source/} <small>作者:</small>{dede:field.writer/} <small>点击:</small><script src="{dede:field name='phpurl'/}/count.php?view=yes&aid={dede:field name='id'/}&mid={dede:field name='mid'/}" type='text/javascript' language="javascript"></script>次</div><!-- /info -->
-
-            	{dede:field.description runphp='yes'}
-                if(@me<>'' )@me = '<div class="intro">'.@me.'</div>';
-                {/dede:field.description}
-			<div class="content">
-                <div id="contentMidPicAD" style="float:right; clear:both; top:0; vertical-align:top;">{dede:myad name='contentMidPicAD'/}</div>
-			　　{dede:field.body/}(责任编辑：{dede:adminname/})
-			</div><!-- /content -->
-			<div class="dede_pages">
-				<ul class="pagelist">
-          {dede:pagebreak/}
-				</ul>
-			</div><!-- /pages -->
-			
-			<!-- //顶踩 -->
-			<div class="newdigg" id="newdigg">
-				<div class="diggbox digg_good" onmousemove="this.style.backgroundPosition='left bottom';" onmouseout="this.style.backgroundPosition='left top';" onclick="javascript:postDigg('good',{dede:field.id/})">
-					<div class="digg_act">顶一下</div>
-					<div class="digg_num">({dede:field.goodpost/})</div>
-					<div class="digg_percent">
-						<div class="digg_percent_bar"><span style="width:{dede:field.goodper/}%"></span></div>
-						<div class="digg_percent_num">{dede:field.goodper/}%</div>
-					</div>
-				</div>
-				<div class="diggbox digg_bad" onmousemove="this.style.backgroundPosition='right bottom';" onmouseout="this.style.backgroundPosition='right top';" onclick="javascript:postDigg('bad',{dede:field.id/})">
-					<div class="digg_act">踩一下</div>
-					<div class="digg_num">({dede:field.badpost/})</div>
-					<div class="digg_percent">
-						<div class="digg_percent_bar"><span style="width:{dede:field.badper/}%"></span></div>
-						<div class="digg_percent_num">{dede:field.badper/}%</div>
-					</div>
-				</div>
-			</div>
-			<script language="javascript" type="text/javascript">getDigg({dede:field.id/});</script>
-			<!-- //顶踩部份的源码结束 -->
-			
-			<div class="boxoff">
-				<strong>------分隔线----------------------------</strong>
-			</div>
-			<div class="handle">
-				<div class="context">
-					<ul>
-						<li>{dede:prenext get='pre'/}</li>
-						<li>{dede:prenext get='next'/}</li>
-					</ul>
-				</div><!-- /context -->
-				<div class="actbox">
-					<ul>
-						<li id="act-fav"><a href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-						<li id="act-err"><a href="{dede:field name='phpurl'/}/erraddsave.php?aid={dede:field.id/}&title={dede:field.title/}" target="_blank">挑错</a></li>
-						<li id="act-pus"><a href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-						<li id="act-pnt"><a href="#" onClick="window.print();">打印</a></li>
-					</ul>
-				</div><!-- /actbox -->
-			</div><!-- /handle -->
-		</div><!-- /viewbox -->
-
-<!-- //AJAX评论区 -->
-{dede:include file='ajaxfeedback.htm' /}
-
-</div><!-- //左边内容结束 -->
-
-<!-- //右边内容开始 -->
-<div class="pright">
- 		{dede:memberinfos}
- 			<div class="infos_userinfo">
-			<dl class="tbox light">
-				<dt class='light'><strong>发布者资料</strong></dt>
-				<dd class='light'>
-					<a href="[field:spaceurl /]" class="userface"><img src="[field:face/]" width="52" height="52" /></a>
-					<a href='[field:spaceurl /]' class="username">[field:uname/]</a>
-					<span class="useract">
-						<a href="[field:spaceurl /]" class="useract-vi">查看详细资料</a>
-                        <a href="[field:spaceurl /]&action=guestbook" class="useract-pm">发送留言</a>
-						<a href="[field:spaceurl /]&action=newfriend" class="useract-af">加为好友</a>
-					</span>
-					<span class="userinfo-sp"><small>用户等级:</small>[field:rankname /]</span>
-					<span class="userinfo-sp"><small>注册时间:</small>[field:jointime function="MyDate('Y-m-d H:m',@me)"/]</span>
-					<span class="userinfo-sp"><small>最后登录:</small>[field:logintime function="MyDate('Y-m-d H:m',@me)"/]</span>
-				</dd>
-			</dl>
-			</div>
-		{/dede:memberinfos}
-		<div class="commend mt1">
-			<dl class="tbox light">
-				<dt class='light'><strong>推荐内容</strong></dt>
-				<dd class='light'>
-					<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 light">
-				<dt class='light'><strong>热点内容</strong></dt>
-				<dd class='light'>
-					<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>
-</html>

src/templets/default/article_soft.htm

@@ -1,276 +1,128 @@
-<!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.keywords/}" />
-<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
-<link href="{dede:global.cfg_templets_skin/}/style/dedecms.css" rel="stylesheet" media="screen" type="text/css" />
-<meta http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}">
-<script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/view.php?aid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
-<script language="javascript" type="text/javascript" src="{dede:global.cfg_cmsurl/}/static/js/dedeajax2.js"></script>
-<script language="javascript" type="text/javascript">
-<!--
-function CheckLogin()
-{
-	var taget_obj = document.getElementById('_ajax_feedback');
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:global.cfg_cmsurl/}/member/ajax_feedback.php");
-	DedeXHTTP = null;
-}
-function postBadGood(ftype,fid)
-{
-	var taget_obj = document.getElementById(ftype+fid);
-	var saveid = GetCookie('badgoodid');
-	if(saveid != null)
-	{
-		var saveids = saveid.split(',');
-		var hasid = false;
-		saveid = '';
-		j = 1;
-		for(i=saveids.length-1;i>=0;i--)
-		{
-			if(saveids[i]==fid && hasid) continue;
-			else {
-				if(saveids[i]==fid && !hasid) hasid = true;
-				saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-				j++;
-				if(j==10 && hasid) break;
-				if(j==9 && !hasid) break;
-			}
-		}
-		if(hasid) { alert('您刚才已表决过了喔！'); return false;}
-		else saveid += ','+fid;
-		SetCookie('badgoodid',saveid,1);
-	}
-	else
-	{
-		SetCookie('badgoodid',fid,1);
-	}
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:global name='cfg_phpurl'/}/feedback.php?aid="+fid+"&action="+ftype+"&fid="+fid);
-	DedeXHTTP = null;
-}
-function postDigg(ftype,aid)
-{
-	var taget_obj = document.getElementById('newdigg');
-	var saveid = GetCookie('diggid');
-	if(saveid != null)
-	{
-		var saveids = saveid.split(',');
-		var hasid = false;
-		saveid = '';
-		j = 1;
-		for(i=saveids.length-1;i>=0;i--)
-		{
-			if(saveids[i]==aid && hasid) continue;
-			else {
-				if(saveids[i]==aid && !hasid) hasid = true;
-				saveid += (saveid=='' ? saveids[i] : ','+saveids[i]);
-				j++;
-				if(j==20 && hasid) break;
-				if(j==19 && !hasid) break;
-			}
-		}
-		if(hasid) { alert("您已经顶过该帖，请不要重复顶帖 ！"); return; }
-		else saveid += ','+aid;
-		SetCookie('diggid',saveid,1);
-	}
-	else
-	{
-		SetCookie('diggid',aid,1);
-	}
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	var url = "{dede:global.cfg_phpurl/}/digg_ajax.php?action="+ftype+"&id="+aid;
-	myajax.SendGet2(url);
-	DedeXHTTP = null;
-}
-function getDigg(aid)
-{
-	var taget_obj = document.getElementById('newdigg');
-	myajax = new DedeAjax(taget_obj,false,false,'','','');
-	myajax.SendGet2("{dede:global.cfg_phpurl/}/digg_ajax.php?id="+aid);
-	DedeXHTTP = null;
-}
--->
-</script>
+	<meta charset="{dede:global.cfg_soft_lang/}">
+	<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/}</title>
+	<meta name="keywords" content="{dede:field.keywords/}" />
+	<meta name="description" content="{dede:field.description function='html2text(@me)'/}" />
 </head>
-<body class="downlist">
-{dede:include filename="head2.htm"/}
-<!-- /header -->
 
-<div class="w960 center clear mt1">
-	<div class="pleft">
-		<div class="place">
-			<strong>当前位置:</strong> {dede:field name='position'/}
-		</div><!-- /place -->
-		<div class="viewbox">
-			<div class="title">
-				<h2>{dede:field.title /}</h2>
-			</div><!-- /title -->
-			<div class="infolist">
-				<small>软件类型：</small><span>{dede:field.softtype/}</span>
-				<small>授权方式：</small><span>{dede:field.accredit/}</span>
-				<small>界面语言：</small><span>{dede:field.language/}</span>
-				<small>软件大小：</small><span>{dede:field.softsize/}</span>
-				<small>文件类型：</small><span>{dede:field.filetype/}</span>
-				<small>运行环境：</small><span>{dede:field.os/}</span>
-				<small>软件等级：</small><span>{dede:field.softrank function='GetRankStar(@me)'/}</span>
-				<small>发布时间：</small><span>{dede:field.pubdate function="GetDateMk('@me')"/}</span>
-				<small>官方网址：</small><span>{dede:field.officialurl/}</span>
-        <small>演示网址：</small><span>{dede:field.officialdemo/}</span>
-        <small>下载次数：</small><span><script src="{dede:field.phpurl/}/disdls.php?aid={dede:field.id/}" language="javascript"></script></span>
-			</div><!-- /info -->
-			<div class="picview">
-				{dede:field name='image'/}
-			</div><!-- /info -->
-			<div class="labeltitle">
-				<strong>软件介绍</strong>
-			</div>
-			<div class="content"><div id="contentMidPicAD" style="float:right; clear:both; top:0; vertical-align:top;">{dede:mda name='250x250'/}</div>
-				{dede:field.introduce/}
-			</div>
-			<div class="labeltitle">
-				<strong>下载地址</strong>
-			</div>
-			<div class="content">
-				<ul class="downurllist">
-                	{dede:field name='softlinks'/}
-                </ul>
-			</div>
-			<div class="labeltitle">
-				<strong>下载说明</strong>
-			</div>
-			<div class="intro">
-				{dede:softmsg/}
-			</div>
-			<div class="newdigg" id="newdigg">
-				<div class="diggbox digg_good" onmousemove="this.style.backgroundPosition='left bottom';" onmouseout="this.style.backgroundPosition='left top';" onclick="javascript:postDigg('good',{dede:field.id/})">
-					<div class="digg_act">顶一下</div>
-					<div class="digg_num">({dede:field.goodpost/})</div>
-					<div class="digg_percent">
-						<div class="digg_percent_bar"><span style="width:{dede:field.goodper/}%"></span></div>
-						<div class="digg_percent_num">{dede:field.goodper/}%</div>
+<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 article-main">
+				<h2 class="mt-0 mb-3 zixue">{dede:field.title/}</h2>
+				<div class="body py-2">
+					<div class="float-right">{dede:field name='image'/}</div>
+					<p><small>软件类型：</small><span>{dede:field.softtype/}</span></p>
+					<p><small>授权方式：</small><span>{dede:field.accredit/}</span></p>
+					<p><small>界面语言：</small><span>{dede:field.language/}</span></p>
+					<p><small>软件大小：</small><span>{dede:field.softsize/}</span></p>
+					<p><small>文件类型：</small><span>{dede:field.filetype/}</span></p>
+					<p><small>运行环境：</small><span>{dede:field.os/}</span></p>
+					<p><small>软件等级：</small><span>{dede:field.softrank function='GetRankStar(@me)'/}</span></p>
+					<p><small>发布时间：</small><span>{dede:field.pubdate function="GetDateMk('@me')"/}</span></p>
+					<p><small>官方网址：</small><span>{dede:field.officialurl/}</span></p>
+					<p><small>演示网址：</small><span>{dede:field.officialdemo/}</span></p>
+					<p><small>下载次数：</small><span><script src="{dede:field.phpurl/}/disdls.php?aid={dede:field.id/}"
+						language="javascript"></script></span></p>
+					<p>下载地址</p>
+					<p>
+						<ul class="downurllist">
+							{dede:field name='softlinks'/}
+						</ul>
+					</p>
+					<p>下载说明</p>
+					<div class="alert alert-success" role="alert">
+						{dede:softmsg/}
 					</div>
 				</div>
-				<div class="diggbox digg_bad" onmousemove="this.style.backgroundPosition='right bottom';" onmouseout="this.style.backgroundPosition='right top';" onclick="javascript:postDigg('bad',{dede:field.id/})">
-					<div class="digg_act">踩一下</div>
-					<div class="digg_num">({dede:field.badpost/})</div>
-					<div class="digg_percent">
-						<div class="digg_percent_bar"><span style="width:{dede:field.badper/}%"></span></div>
-						<div class="digg_percent_num">{dede:field.badper/}%</div>
+				<!-- /.body -->
+
+				<div class="clearfix"></div>
+
+				{dede:include comment='文档顶踩模块' filename="widget_article_digg.htm"/}
+
+				<div class="row">
+					<div class="col-md-4 prenext pt-2">
+						<div class="pagination-previous">{dede:prenext get='pre'/}</div>
+						<div class="pagination-next mt-2">{dede:prenext get='next'/}</div>
+					</div>
+					<div class="col-md-8">
+						<div class="row actbox">
+							<ul>
+								<li><i class="fa fa-star-o" aria-hidden="true"></i> <a
+										href="{dede:field name='phpurl'/}/stow.php?aid={dede:field.id/}"
+										target="_blank">收藏</a></li>
+								<li><i class="fa fa-bug" aria-hidden="true"></i> <a
+										href="javascript:ErrorAddSave({dede:field.id/}, '{dede:field.title/}');">挑错</a>
+								</li>
+								<li><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <a
+										href="{dede:field name='phpurl'/}/recommend.php?aid={dede:field.id/}"
+										target="_blank">推荐</a></li>
+								<li><i class="fa fa-print" aria-hidden="true"></i> <a href="#"
+										onClick="window.print();">打印</a></li>
+							</ul>
+						</div><!-- /actbox -->
 					</div>
 				</div>
+
+				{dede:include comment='文档评论模块' file='widget_article_feedback.htm' /}
+
 			</div>
-			 <script language="javascript" type="text/javascript">getDigg({dede:field.id/});</script>
-			<div class="boxoff">
-				<strong>------分隔线----------------------------</strong>
-			</div>
-			<div class="handle">
-				<div class="context">
-					<ul>
-						<li>{dede:prenext get='pre'/}</li>
-						<li>{dede:prenext get='next'/}</li>
-					</ul>
-				</div><!-- /context -->
-				<div class="actbox">
-					<ul>
-						<li id="act-fav"><a href="{dede:global name='cfg_phpurl'/}/stow.php?aid={dede:field.id/}" target="_blank">收藏</a></li>
-						<li id="act-err"><a href="{dede:global name='cfg_phpurl'/}/erraddsave.php?aid={dede:field.id/}&title={dede:field.title/}" target="_blank">挑错</a></li>
-						<li id="act-pus"><a href="{dede:global name='cfg_phpurl'/}/recommend.php?aid={dede:field.id/}" target="_blank">推荐</a></li>
-						<li id="act-pnt"><a href="#" onClick="window.print();">打印</a></li>
-					</ul>
-				</div><!-- /actbox -->
-			</div><!-- /handle -->
-		</div><!-- /viewbox -->
+			<!-- /.article-main -->
+
+			<aside class="col-md-4 article-sidebar">
 
-<!-- //AJAX评论区 -->
-{dede:include file='ajaxfeedback.htm' /}
-	
-	</div><!-- /pleft -->
+				{dede:include comment='推荐内容' filename="widget_recommend.htm"/}
 
-	<div class="pright">
-        <div>
-          <dl class="tbox">
-				<dt><strong>栏目列表</strong></dt>
-				<dd>
-					<ul class="d6">
-                      {dede:channel type='son' currentstyle="<li><a href='~typelink~' class='thisclass'>~typename~</a></li>"}
-		<li><a href='[field:typeurl/]'>[field:typename/]</a></li>{/dede:channel}
-					</ul>
-				</dd>
-			</dl>
-        </div>
-        	<div class="infos_userinfo">
- 			{dede:memberinfos}
-			<dl class="tbox">
-				<dt><strong>发布者资料</strong></dt>
-				<dd>
-					<a href="[field:spaceurl /]" class="userface"><img src="[field:face/]" width="52" height="52" /></a>
-					<a href='[field:spaceurl /]' class="username">[field:uname/]</a>
-					<span class="useract">
-						<a href="[field:spaceurl /]" class="useract-vi">查看详细资料</a>
-                        <a href="[field:spaceurl /]&action=guestbook" class="useract-pm">发送留言</a>
-						<a href="[field:spaceurl /]&action=newfriend" class="useract-af">加为好友</a>
-					</span>
-					<span class="userinfo-sp"><small>用户等级:</small>[field:rankname /]</span>
-					<span class="userinfo-sp"><small>注册时间:</small>[field:jointime function="MyDate('Y-m-d H:m',@me)"/]</span>
-					<span class="userinfo-sp"><small>最后登录:</small>[field:logintime function="MyDate('Y-m-d H:m',@me)"/]</span>
-				</dd>
-			</dl>
-			{/dede:memberinfos}
-   	 	</div>
+				{dede:include comment='热点内容' filename="widget_hot.htm"/}
 
-		<div class="downrange mt1">
-			<dl class="tbox">
-				<dt><strong>推荐软件</strong></dt>
-				<dd>
-					<ul class="f1">
-                    {dede:arclist flag='c' titlelen=42 row=8}
-						<li>
-							<a href="[field:arcurl/]">[field:title/]</a>
-							<span><small>好评:</small>[field:scores/]</span>
-							<span><small>人气:</small>[field:click/]</span>
-						</li>
-                    {/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
-		</div><!-- /downrange -->
+			</aside>
+			<!-- /.article-sidebar -->
 
-		<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 -->
-<script src="{dede:global name='cfg_phpurl'/}/count.php?aid={dede:field name='id'/}&mid={dede:field name='mid'/}" language="javascript"></script>
-<script type="text/javascript">
-var contentRtPicAD2      = document.getElementById("contentRtPicAD2");
-var   stop      = contentRtPicAD2.offsetTop - 60,
-    docBody   = document.documentElement || document.body.parentNode || document.body,
-    hasOffset = window.pageYOffset !== undefined,
-    scrollTop;
-window.onscroll = function (e) {
-  // cross-browser compatible scrollTop.
-  scrollTop = hasOffset ? window.pageYOffset : docBody.scrollTop;
+	</main>
+	<!-- /main -->
+
+	{dede:include filename="footer.htm"/}
+	<script>
 
-  if (scrollTop >= stop) {
-    contentRtPicAD2.className = 'stick';
-  } else {
-    contentRtPicAD2.className = ''; 
-  }
-}
-</script>
+
+		// 页面加载触发
+		$(document).ready(function () {
+			// 获取文档点击数统计
+			$.get("{dede:field name='phpurl'/}/count.php?format=json&view=yes&aid={dede:field.id/}&mid=1", function (data) {
+				let result = JSON.parse(data);
+				$("#_count").html(result.data.click);
+			})
+		});
+	</script>
 </body>
+
 </html>

src/templets/default/list_soft.htm

@@ -1,94 +1,89 @@
-<!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 http-equiv="mobile-agent" content="format=xhtml;url={dede:global.cfg_mobileurl/}/list.php?tid={dede:field.id/}">
-<script type="text/javascript">if(window.location.toString().indexOf('pref=padindex') != -1){}else{if(/AppleWebKit.*Mobile/i.test(navigator.userAgent) || (/MIDP|SymbianOS|NOKIA|SAMSUNG|LG|NEC|TCL|Alcatel|BIRD|DBTEL|Dopod|PHILIPS|HAIER|LENOVO|MOT-|Nokia|SonyEricsson|SIE-|Amoi|ZTE/.test(navigator.userAgent))){if(window.location.href.indexOf("?mobile")<0){try{if(/Android|Windows Phone|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){window.location.href="{dede:global.cfg_mobileurl/}/list.php?tid={dede:field.id/}";}else if(/iPad/i.test(navigator.userAgent)){}else{}}catch(e){}}}}</script>
+    <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="downlist">
-{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: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:softrank function='GetRankStar(@me)'/]
-						<small>软件语言：</small>[field:language/]
-						<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="pright">
-        <div>
-          <dl class="tbox">
-				<dt><strong>栏目列表</strong></dt>
-				<dd>
-					<ul class="d6">
-                      {dede:channel type='son' currentstyle="<li><a href='~typelink~' class='thisclass'>~typename~</a></li>"}
-		<li><a href='[field:typeurl/]'>[field:typename/]</a></li>{/dede:channel}
-					</ul>
-				</dd>
-			</dl>
+<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:list pagesize='10'}
+                    <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:softrank function='GetRankStar(@me)'/] 软件语言：[field:language/]
+                            </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>
-		<div class="downrange">
-			<dl class="tbox">
-				<dt><strong>推荐软件</strong></dt>
-				<dd>
-					<ul class="f1">
-                    {dede:arclist flag='c' titlelen=42 row=8}
-						<li>
-							<a href="[field:arcurl/]">[field:title/]</a>
-							<span><small>好评:</small>[field:scores/]</span>
-							<span><small>人气:</small>[field:click/]</span>
-						</li>
-                    {/dede:arclist}
-					</ul>
-				</dd>
-			</dl>
-		</div><!-- /downrange -->
-		<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 -->
+    </main>
+    <!-- /main -->
 
+    {dede:include filename="footer.htm"/}
 </body>
-</html>
+
+</html>