From 52bd0edff6436496edf8bbf377b12b7fd97cb6e9 Mon Sep 17 00:00:00 2001
From: tianya <tianya@imcollege.cn>
Date: Wed, 16 Sep 2020 15:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=8A=9F=E8=83=BD=E3=80=81?=
=?UTF-8?q?=E8=BD=AF=E4=BB=B6=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 26 +-
src/dede/inc/inc_action_info.php | 2 +-
src/include/common.inc.php | 2 -
src/include/taglib/channel/softlinks.lib.php | 5 +-
src/index.php | 2 +-
src/static/css/dede.css | 10 +-
src/static/defaultpic.jpg | Bin 0 -> 10652 bytes
src/static/js/dede.js | 88 ++++-
src/templets/default/article_article.htm | 68 +---
src/templets/default/article_article1.htm | 230 ------------
src/templets/default/article_article2.htm | 229 ------------
src/templets/default/article_soft.htm | 372 ++++++-------------
src/templets/default/list_soft.htm | 171 +++++----
13 files changed, 293 insertions(+), 912 deletions(-)
create mode 100644 src/static/defaultpic.jpg
delete mode 100755 src/templets/default/article_article1.htm
delete mode 100755 src/templets/default/article_article2.htm
diff --git a/README.md b/README.md
index a90967f3..97e89a7f 100644
--- a/README.md
+++ b/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)
\ No newline at end of file
+- [代码托管](https://git.dedebiz.com/)
diff --git a/src/dede/inc/inc_action_info.php b/src/dede/inc/inc_action_info.php
index 12719355..84a9985a 100755
--- a/src/dede/inc/inc_action_info.php
+++ b/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'
diff --git a/src/include/common.inc.php b/src/include/common.inc.php
index be4e187e..31e79f8f 100755
--- a/src/include/common.inc.php
+++ b/src/include/common.inc.php
@@ -7,8 +7,6 @@
* @link http://www.dedecms.com
*/
-
-
// 生产环境使用production
define('DEDE_ENVIRONMENT', 'dev');
diff --git a/src/include/taglib/channel/softlinks.lib.php b/src/include/taglib/channel/softlinks.lib.php
index ccbc932f..ba9b96cf 100755
--- a/src/include/taglib/channel/softlinks.lib.php
+++ b/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);
}
}
diff --git a/src/index.php b/src/index.php
index 3eece6f9..be266931 100755
--- a/src/index.php
+++ b/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']);
diff --git a/src/static/css/dede.css b/src/static/css/dede.css
index a935aa54..69435ef9 100644
--- a/src/static/css/dede.css
+++ b/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;
diff --git a/src/static/defaultpic.jpg b/src/static/defaultpic.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6fb3bdcd94273144c64bb846458864a6d5a9be18
GIT binary patch
literal 10652
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
G`@aAk1~B~q
literal 0
HcmV?d00001
diff --git a/src/static/js/dede.js b/src/static/js/dede.js
index b39419eb..617bc5c3 100644
--- a/src/static/js/dede.js
+++ b/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 () {
diff --git a/src/templets/default/article_article.htm b/src/templets/default/article_article.htm
index edfb5cc5..b56f6d01 100755
--- a/src/templets/default/article_article.htm
+++ b/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>
diff --git a/src/templets/default/article_article1.htm b/src/templets/default/article_article1.htm
deleted file mode 100755
index 42b80b36..00000000
--- a/src/templets/default/article_article1.htm
+++ /dev/null
@@ -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>
diff --git a/src/templets/default/article_article2.htm b/src/templets/default/article_article2.htm
deleted file mode 100755
index afb2aad6..00000000
--- a/src/templets/default/article_article2.htm
+++ /dev/null
@@ -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>
diff --git a/src/templets/default/article_soft.htm b/src/templets/default/article_soft.htm
index 9c2b96a1..aeea7c99 100755
--- a/src/templets/default/article_soft.htm
+++ b/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>
diff --git a/src/templets/default/list_soft.htm b/src/templets/default/list_soft.htm
index 21944f50..76e152aa 100755
--- a/src/templets/default/list_soft.htm
+++ b/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>
\ No newline at end of file