叙述、别离
1 year ago
45 changed files with 121 additions and 143 deletions
Split View
Diff Options
-
+1 -1src/admin/ad_edit.php
-
+2 -2src/admin/inc/inc_action_info.php
-
+1 -1src/admin/index_body.php
-
+2 -2src/admin/login.php
-
+2 -2src/admin/makehtml_all.php
-
+1 -1src/admin/makehtml_archives_action.php
-
+1 -1src/admin/sys_repair.php
-
+9 -29src/admin/task_do.php
-
+1 -1src/admin/templets/content_att.htm
-
+1 -1src/admin/templets/freelist_add.htm
-
+1 -1src/admin/templets/freelist_edit.htm
-
+1 -1src/admin/templets/index.htm
-
+1 -1src/admin/templets/tag_test.htm
-
+1 -1src/apps/ad_js.php
-
+1 -1src/apps/list.php
-
+1 -1src/apps/mytag_js.php
-
+2 -0src/apps/tags.php
-
+1 -2src/apps/view.php
-
+4 -1src/index.php
-
+1 -1src/install/config.cache.inc.php
-
+6 -6src/install/sql-dfdata.txt
-
+2 -0src/robots.txt
-
+17 -14src/static/web/css/style.css
-
+2 -2src/system/archive/freelist.class.php
-
+8 -11src/system/archive/listview.class.php
-
+1 -1src/system/archive/searchview.class.php
-
+2 -2src/system/archive/sglistview.class.php
-
+1 -1src/system/archive/specview.class.php
-
+1 -1src/system/archive/taglist.class.php
-
+9 -9src/system/helpers/channelunit.helper.php
-
+1 -1src/system/taglib/arclist.lib.php
-
+0 -1src/system/taglib/sonchannel.lib.php
-
+8 -16src/system/typelink/typelink.class.php
-
+10 -9src/theme/dedebiz/index.htm
-
+2 -2src/theme/dedebiz/index_article.htm
-
+2 -2src/theme/dedebiz/index_default.htm
-
+2 -2src/theme/dedebiz/index_default_sg.htm
-
+3 -3src/theme/dedebiz/index_image.htm
-
+2 -2src/theme/dedebiz/index_infos.htm
-
+2 -2src/theme/dedebiz/index_soft.htm
-
+1 -1src/theme/dedebiz/list_image.htm
-
+1 -1src/theme/dedebiz/search.htm
-
+1 -1src/theme/dedebiz/singlepage.htm
-
+1 -1src/theme/templet-filelist.inc
-
+1 -1src/user/index_do.php
+ 1
- 1
src/admin/ad_edit.php
View File
| @@ -25,7 +25,7 @@ if ($dopost == 'delete') { | |||
| $showhtml .= "预览：<iframe name='testfrm' frameborder='0' src='ad_edit.php?aid={$aid}&dopost=testjs' id='testfrm' width='100%' height='200'></iframe>"; | |||
| $row = $dsql->GetOne("SELECT tagname from `#@__myad` WHERE aid='$aid' "); | |||
| $showtag = '{'."dede:myad name='{$row['tagname']}'/".'}'; | |||
| $info = "说明：如果嵌入的是Dede广告标签，那会解析成标签中的文档到页面，广告修改后需要重新生成<br>如果不希望重新生成所有页面，则直接调用js代码即可"; | |||
| $info = "广告标签会解析成标签中文档到页面，广告修改后需要重新生成<br>如果不希望重新生成所有页面，则直接js调用代码即可"; | |||
| $wintitle = "广告管理-获取广告标签"; | |||
| $wecome_info = "<a href='ad_main.php'>广告管理</a>::获取js"; | |||
| $win = new OxWindow(); | |||
+ 2
- 2
src/admin/inc/inc_action_info.php
View File
| @@ -250,8 +250,8 @@ $actionSearch[7] = array( | |||
| 'linkurl' => 'makehtml_all.php' | |||
| ), | |||
| 1 => array( | |||
| 'title' => '更新主页', | |||
| 'description' => '生成网站主页面', | |||
| 'title' => '更新首页', | |||
| 'description' => '生成网站首页面', | |||
| 'purview' => 'sys_MakeHtml', | |||
| 'linkurl' => 'makehtml_homepage.php' | |||
| ), | |||
+ 1
- 1
src/admin/index_body.php
View File
| @@ -11,7 +11,7 @@ | |||
| require(dirname(__FILE__).'/config.php'); | |||
| require(DEDEINC.'/image.func.php'); | |||
| require(DEDEINC.'/dedetag.class.php'); | |||
| //默认主页 | |||
| //默认首页 | |||
| if (empty($dopost)) { | |||
| require(DEDEINC.'/inc/inc_fun_funAdmin.php'); | |||
| $verLockFile = DEDEDATA.'/admin/ver.txt'; | |||
+ 2
- 2
src/admin/login.php
View File
| @@ -54,10 +54,10 @@ if ($dopost == 'login') { | |||
| if ($res == 1) { | |||
| $cuserLogin->keepUser(); | |||
| if (!empty($gotopage)) { | |||
| ShowMsg('成功登录，正在跳转管理管理主页', $gotopage); | |||
| ShowMsg('成功登录，正在跳转管理首页', $gotopage); | |||
| exit(); | |||
| } else { | |||
| ShowMsg('成功登录，正在跳转管理管理主页', 'index.php'); | |||
| ShowMsg('成功登录，正在跳转管理首页', 'index.php'); | |||
| exit(); | |||
| } | |||
| } else if ($res == -1) { | |||
+ 2
- 2
src/admin/makehtml_all.php
View File
| @@ -15,7 +15,7 @@ if ($action == '') { | |||
| require_once(DEDEADMIN."/templets/makehtml_all.htm"); | |||
| exit(); | |||
| } else if ($action == 'make') { | |||
| //step = 1 更新主页、step = 2 更新文档、step = 3 更新栏目 | |||
| //step = 1 更新首页、step = 2 更新文档、step = 3 更新栏目 | |||
| if (empty($step)) $step = 1; | |||
| //更新文档前优化数据 | |||
| /*------------------- | |||
| @@ -36,7 +36,7 @@ else if ($step == 2) { | |||
| include_once(DEDEADMIN."/makehtml_archives_action.php"); | |||
| exit(); | |||
| } | |||
| //更新主页 | |||
| //更新首页 | |||
| /*------------------------- | |||
| function _3_MakeHomePage() | |||
| -------------------*/ | |||
+ 1
- 1
src/admin/makehtml_archives_action.php
View File
| @@ -95,7 +95,7 @@ if ($tjnum < $totalnum) { | |||
| if ($uptype == '') { | |||
| ShowMsg("更新文档<span class='text-primary'>$totalnum</span>，用时<span class='text-primary'>{$ttime}</span>分钟，完成所有文档更新", "javascript:;"); | |||
| } else { | |||
| ShowMsg("完成所有文档更新，开始更新主页", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); | |||
| ShowMsg("完成所有文档更新，开始更新首页", "makehtml_all.php?action=make&step=3&uptype=$uptype&mkvalue=$mkvalue"); | |||
| } | |||
| } | |||
| } | |||
+ 1
- 1
src/admin/sys_repair.php
View File
| @@ -15,7 +15,7 @@ if (empty($dopost)) { | |||
| $win = new OxWindow(); | |||
| $win->Init("sys_repair.php", "js/blank.js", "POST' enctype='multipart/form-data' "); | |||
| $win->mainTitle = "系统修复工具"; | |||
| $wecome_info = "<a href='index_body.php'>系统主页</a> > 系统错误修复"; | |||
| $wecome_info = "<a href='index_body.php'>系统首页</a> > 系统错误修复"; | |||
| $win->AddTitle('本工具用于检测和修复您的系统可能存在的错误'); | |||
| $msg = " | |||
| <table> | |||
+ 9
- 29
src/admin/task_do.php
View File
| @@ -10,14 +10,7 @@ | |||
| */ | |||
| require(dirname(__FILE__).'/config.php'); | |||
| $dopost = (!isset($dopost) ? '' : $dopost); | |||
| /****************************** | |||
| 返回到下一任务的URL | |||
| 特殊变量，除非知道作用，否则不能在任务传递中占用 | |||
| f 临时，仅为了方便网址结构 | |||
| dopost 当前任务(指向下一个任务)，由用户自行处理或在 nextdo 中自动获得 | |||
| del 上一次任务删除的变量 | |||
| morejob，设定后，表示当前任务需请求多次，会把 dopost 和 nextdo 处理后转为 doposttmp, nextdotmp，然后由用户自行处理 | |||
| ******************************/ | |||
| //返回到下一任务链接，特殊变量，除非知道作用，否则不能在任务传递中占用：f临时，仅为了方便网址结构，dopost当前任务指向下一个任务，由用户自行处理或在nextdo中自动获得，del上一次任务删除的变量，morejob设定后，表示当前任务需请求多次，会把 dopost和nextdo处理后转为doposttmp和nextdotmp，然后由用户自行处理 | |||
| function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) | |||
| { | |||
| $reurl = "task_do.php?f=0"; | |||
| @@ -47,10 +40,7 @@ function GetNextUrl($notallowArr = array('dopost', 'f', 'del')) | |||
| } | |||
| return $reurl; | |||
| } | |||
| /****************************** | |||
| //更新上一篇和下一篇 | |||
| function makeprenext() { } | |||
| ******************************/ | |||
| if ($dopost == 'makeprenext') { | |||
| require_once(DEDEINC.'/archive/archives.class.php'); | |||
| $aid = intval($aid); | |||
| @@ -75,10 +65,7 @@ if ($dopost == 'makeprenext') { | |||
| exit(); | |||
| } | |||
| } | |||
| /****************************** | |||
| //更新主页的任务 | |||
| function makeindex() { } | |||
| ******************************/ | |||
| //更新首页的任务 | |||
| if ($dopost == 'makeindex') { | |||
| require_once(DEDEINC.'/archive/partview.class.php'); | |||
| $envs = $_sys_globals = array(); | |||
| @@ -88,37 +75,32 @@ if ($dopost == 'makeindex') { | |||
| $templet = str_replace("{style}", $cfg_df_style, $row['templet']); | |||
| $homeFile = dirname(__FILE__).'/'.$row['position']; | |||
| $homeFile = str_replace("//", "/", str_replace("\\", "/", $homeFile)); | |||
| $fp = fopen($homeFile, 'w') or die("无法更新网站主页到：$homeFile 位置"); | |||
| $fp = fopen($homeFile, 'w') or die("无法更新网站首页到：$homeFile 位置"); | |||
| fclose($fp); | |||
| $tpl = $cfg_basedir.$cfg_templets_dir.'/'.$templet; | |||
| if (!file_exists($tpl)) { | |||
| $tpl = $cfg_basedir.$cfg_templets_dir.'/default/index.htm'; | |||
| if (!file_exists($tpl)) exit("无法找到主页模板：$tpl "); | |||
| if (!file_exists($tpl)) exit("无法找到首页模板：$tpl "); | |||
| } | |||
| $GLOBALS['_arclistEnv'] = 'index'; | |||
| $pv->SetTemplet($tpl); | |||
| $pv->SaveToHtml($homeFile); | |||
| $pv->Close(); | |||
| if (empty($nextdo)) { | |||
| ShowMsg("完成主页更新任务完成所有更新任务", "close::tgtable"); | |||
| ShowMsg("完成首页更新任务完成所有更新任务", "close::tgtable"); | |||
| exit(); | |||
| } else { | |||
| $jumpurl = GetNextUrl(); | |||
| ShowMsg("完成主页更新 现在跳转其它更新任务", $jumpurl, 0, 500); | |||
| ShowMsg("完成首页更新 现在跳转其它更新任务", $jumpurl, 0, 500); | |||
| exit(); | |||
| } | |||
| } | |||
| /****************************** | |||
| //更新所有关连的栏目 | |||
| function makeparenttype() { } | |||
| ******************************/ | |||
| else if ($dopost == 'makeparenttype') { | |||
| require_once(DEDEDATA."/cache/inc_catalog_base.inc"); | |||
| require_once(DEDEINC.'/archive/listview.class.php'); | |||
| $notallowArr = array('dopost', 'f', 'del', 'curpage', 'morejob'); | |||
| $jumpurl = GetNextUrl($notallowArr); | |||
| if (empty($typeid)) { | |||
| ShowMsg("完成栏目更新任务完成所有更新任务", "close::tgtable"); | |||
| exit(); | |||
| @@ -126,7 +108,6 @@ else if ($dopost == 'makeparenttype') { | |||
| $topids = explode(',', GetTopids($typeid)); | |||
| if (empty($curpage)) $curpage = 0; | |||
| $tid = $topids[$curpage]; | |||
| if (isset($cfg_Cs[$tid]) && $cfg_Cs[$tid][1] > 0) { | |||
| require_once(DEDEINC."/archive/listview.class.php"); | |||
| $lv = new ListView($tid); | |||
| @@ -140,21 +121,20 @@ else if ($dopost == 'makeparenttype') { | |||
| $lv->MakeHtml(); | |||
| $lv->Close(); | |||
| } | |||
| if ($curpage >= count($topids) - 1) { | |||
| if (!empty($doposttmp)) { | |||
| $jumpurl = preg_replace("#doposttmp|nextdotmp#", 'del', $jumpurl); | |||
| $jumpurl .= "&dopost={$doposttmp}&nextdo={$nextdotmp}"; | |||
| ShowMsg("完成栏目:{$tid} 更新<br>完成栏目更新任务，继续执行后续任务", $jumpurl, 0, 500); | |||
| ShowMsg("完成栏目：{$tid}更新<br>完成栏目更新任务，继续执行后续任务", $jumpurl, 0, 500); | |||
| exit(); | |||
| } else { | |||
| ShowMsg("完成栏目:{$tid} 更新<br>完成栏目更新任务，完成所有更新任务", "close::tgtable"); | |||
| ShowMsg("完成栏目：{$tid}更新<br>完成栏目更新任务，完成所有更新任务", "close::tgtable"); | |||
| exit(); | |||
| } | |||
| } else { | |||
| $curpage++; | |||
| $jumpurl .= "&curpage={$curpage}&dopost=makeparenttype"; | |||
| ShowMsg("完成栏目:{$tid} 更新，继续更新其它栏目", $jumpurl, 0, 500); | |||
| ShowMsg("完成栏目：{$tid}更新，继续更新其它栏目", $jumpurl, 0, 500); | |||
| exit(); | |||
| } | |||
| } | |||
+ 1
- 1
src/admin/templets/content_att.htm
View File
| @@ -17,7 +17,7 @@ | |||
| </tr> | |||
| <tr> | |||
| <td colspan="3"> | |||
| <div class="alert alert-info mb-0">自定义属性使用说明：以往的版本中，网站主页、封面栏目的设计，都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来，这样做法存在很大的不足，例如，我希望在最顶部的地方显示我想要的文档，在以往的版本中是无法做到的，但使用自定义属性之后，只要给arclist标记加上att='自定义属性的id'的属性，然后在发布的时候对适合的文档选择专门的属性，那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项：这个版本中att对应的字段是SET类型字段，因此为了数据安全起见不允许用户增加其它类型，但调用时允许使用组合条件att='c,p'表示推荐图片</div> | |||
| <div class="alert alert-info mb-0">自定义属性使用说明：以往的版本中，网站首页、封面栏目的设计，都只能单调的用arclist标记把某栏目最新或按特定排序方式的文档无选择的读出来，这样做法存在很大的不足，例如，我希望在最顶部的地方显示我想要的文档，在以往的版本中是无法做到的，但使用自定义属性之后，只要给arclist标记加上att='自定义属性的id'的属性，然后在发布的时候对适合的文档选择专门的属性，那么使用arclist的地方就会按您的意愿显示指定的文档。注意事项：这个版本中att对应的字段是SET类型字段，因此为了数据安全起见不允许用户增加其它类型，但调用时允许使用组合条件att='c,p'表示推荐图片</div> | |||
| </td> | |||
| </tr> | |||
| <tr bgcolor="#e9ecef"> | |||
+ 1
- 1
src/admin/templets/freelist_add.htm
View File
| @@ -85,7 +85,7 @@ | |||
| <td>目录默认页名称：</td> | |||
| <td> | |||
| <input type="text" name="defaultpage" id="defaultpage" value="index.html" class="admin-input-md"> | |||
| <label><input type="checkbox" name="nodefault" id="nodefault" value="1"> 不使用目录默认主页</label> | |||
| <label><input type="checkbox" name="nodefault" id="nodefault" value="1"> 不使用目录默认首页</label> | |||
| </td> | |||
| </tr> | |||
| <tr> | |||
+ 1
- 1
src/admin/templets/freelist_edit.htm
View File
| @@ -43,7 +43,7 @@ | |||
| <td>目录默认页名称：</td> | |||
| <td> | |||
| <input type="text" name="defaultpage" id="defaultpage" value="<?php echo $row['defaultpage']?>" class="admin-input-md"> | |||
| <label><input type="checkbox" name="nodefault" id="nodefault" value="1" <?php if ($row['nodefault']==1) echo "checked";?>> 不使用目录默认主页</label> | |||
| <label><input type="checkbox" name="nodefault" id="nodefault" value="1" <?php if ($row['nodefault']==1) echo "checked";?>> 不使用目录默认首页</label> | |||
| </td> | |||
| </tr> | |||
| <tr> | |||
+ 1
- 1
src/admin/templets/index.htm
View File
| @@ -39,7 +39,7 @@ | |||
| <?php if (!DEDEBIZ_SAFE_MODE) {?><li><a href="templets_main.php" target="main" title="模板管理"><i class="fa fa-cube"></i></a></li><?php }?> | |||
| <li><a href="makehtml_all.php" target="main" title="更新整站"><i class="fa fa-repeat"></i></a></li> | |||
| <?php echo ($cfg_mb_open=='Y')?'<li><a href="../user" target="_blank" title="会员中心"><i class="fa fa-user-circle"></i></a></li>':'';?> | |||
| <li><a href="../" target="_blank" title="预览主页"><i class="fa fa-eye"></i></a></li> | |||
| <li><a href="../" target="_blank" title="预览首页"><i class="fa fa-eye"></i></a></li> | |||
| <li> | |||
| <form action="action_search.php" method="post" target="main"> | |||
| <input type="text" name="keyword" placeholder="功能搜索" class="search-input"> | |||
+ 1
- 1
src/admin/templets/tag_test.htm
View File
| @@ -24,7 +24,7 @@ | |||
| </tr> | |||
| <tr> | |||
| <td colspan="2"> | |||
| <div class="alert alert-info mb-0">全局标记应用在网站主页、单独页面、封面栏目使用的单独模板标记，在列表或文档模板中，一般只允许调用channel、arclist标记（hotart、coolart、imglist等都是这个标记延伸出来的标记），但是环境变量限定为文档或列表所在的栏目，如果您要测试的标记是在列表或文档中使用，请指定环境变量（栏目id）各标记的具体含义和用途</div> | |||
| <div class="alert alert-info mb-0">全局标记应用在网站首页、单独页面、封面栏目使用的单独模板标记，在列表或文档模板中，一般只允许调用channel、arclist标记（hotart、coolart、imglist等都是这个标记延伸出来的标记），但是环境变量限定为文档或列表所在的栏目，如果您要测试的标记是在列表或文档中使用，请指定环境变量（栏目id）各标记的具体含义和用途</div> | |||
| </td> | |||
| </tr> | |||
| <tr> | |||
+ 1
- 1
src/apps/ad_js.php
View File
| @@ -1,6 +1,6 @@ | |||
| <?php | |||
| /** | |||
| * 广告js调用方式 | |||
| * 广告js调用 | |||
| * | |||
| * @version $id:ad_js.php 20:30 2010年7月8日 tianya $ | |||
| * @package DedeBIZ.Site | |||
+ 1
- 1
src/apps/list.php
View File
| @@ -1,6 +1,6 @@ | |||
| <?php | |||
| /** | |||
| * 栏目列表和栏目动态页 | |||
| * 栏目预览 | |||
| * | |||
| * @version $id:list.php$ | |||
| * @package DedeBIZ.Site | |||
+ 1
- 1
src/apps/mytag_js.php
View File
| @@ -1,6 +1,6 @@ | |||
| <?php | |||
| /** | |||
| * 自定义标签js调用方式 | |||
| * 自定义标签js调用 | |||
| * | |||
| * @version $id:mytag_js.php$ | |||
| * @package DedeBIZ.Site | |||
+ 2
- 0
src/apps/tags.php
View File
| @@ -1,5 +1,7 @@ | |||
| <?php | |||
| /** | |||
| * 标签 | |||
| * | |||
| * @version $id:tags.php 2010-06-30 11:43:09 tianya $ | |||
| * @package DedeBIZ.Site | |||
| * @copyright Copyright (c) 2022 DedeBIZ.COM | |||
+ 1
- 2
src/apps/view.php
View File
| @@ -1,7 +1,6 @@ | |||
| <?php | |||
| /** | |||
| * 关于文档权限设置的说明 | |||
| * 文档权限设置限制形式：如果指定了会员等级，那么必须到达这个等级才能浏览，如果指定了金币，浏览时会扣指点的点数，并保存记录到用户业务记录中，如果两者同时指定，那么必须同时满足两个条件 | |||
| * 文档预览 | |||
| * | |||
| * @version $id:view.php$ | |||
| * @package DedeBIZ.Site | |||
+ 4
- 1
src/index.php
View File
| @@ -1,5 +1,7 @@ | |||
| <?php | |||
| /** | |||
| * 首页 | |||
| * | |||
| * @version $id:index.php 9:23 2022-05-16 tianya $ | |||
| * @package DedeBIZ.Site | |||
| * @copyright Copyright (c) 2022 DedeBIZ.COM | |||
| @@ -31,4 +33,5 @@ if (isset($_GET['upcache']) || !file_exists('index.html')) { | |||
| } else { | |||
| header('HTTP/1.1 301 Moved Permanently'); | |||
| header('Location:index.html'); | |||
| } | |||
| } | |||
| ?> | |||
+ 1
- 1
src/install/config.cache.inc.php
View File
| @@ -4,7 +4,7 @@ $cfg_cmspath = '~basepath~'; | |||
| $cfg_cookie_encode = '~cookieEncode~'; | |||
| $cfg_indexurl = '~indexurl~'; | |||
| $cfg_backup_dir = 'backupdata'; | |||
| $cfg_indexname = '网站主页'; | |||
| $cfg_indexname = '网站首页'; | |||
| $cfg_indexseo = ''; | |||
| $cfg_webname = '~webname~'; | |||
| $cfg_adminemail = '~adminmail~'; | |||
+ 6
- 6
src/install/sql-dfdata.txt
View File
| @@ -3938,10 +3938,10 @@ INSERT INTO `#@__sys_enum` VALUES ('139','cms制作','503','vocation','503','0') | |||
| INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','string',''), | |||
| ('2','cfg_cmspath','安装目录','2','string',''), | |||
| ('3','cfg_cookie_encode','Cookies加密码','2','string',''), | |||
| ('4','cfg_indexurl','主页链接','1','string','/'), | |||
| ('4','cfg_indexurl','首页链接','1','string','/'), | |||
| ('5','cfg_backup_dir','数据备份目录，存data文件夹里','2','string','backupdata'), | |||
| ('6','cfg_indexname','主页链接名','1','string','网站主页'), | |||
| ('7','cfg_indexseo','主页SEO标题','1','string',''), | |||
| ('6','cfg_indexname','首页链接名','1','string','网站首页'), | |||
| ('7','cfg_indexseo','首页SEO标题','1','string',''), | |||
| ('8','cfg_webname','网站名称','1','string','某某公司'), | |||
| ('9','cfg_adminemail','网站发信邮箱','2','string','support@dedebiz.com'), | |||
| ('10','cfg_html_editor','富文本，默认CKEditor可自行更换其它富文本','2','string','ckeditor'), | |||
| @@ -3987,7 +3987,7 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin | |||
| ('50','cfg_mb_addontype','会员附件许可的类型','4','bstring','swf|rm|rmvb|mpg|mp3|mp4|wmv|wma|wav|mid|mov|zip|rar|doc|xsl|ppt|wps'), | |||
| ('51','cfg_mb_max','会员附件总大小限制（MB）','4','number','500'), | |||
| ('52','cfg_replacestr','禁用关键词替换成*，用“|”分开，但不要在结尾加“|”','5','bstring','草你妈|你妈的|你妹的'), | |||
| ('53','cfg_makeindex','发布文档后马上更新网站主页','6','bool','N'), | |||
| ('53','cfg_makeindex','发布文档后马上更新网站首页','6','bool','N'), | |||
| ('54','cfg_keyword_like','使用关键词关连文档','6','bool','Y'), | |||
| ('55','cfg_index_max','首页调用函数最大索引文档数，不适用于经常单栏目采集过多文档网站，不启用本项此值设置为0即可','6','number','10000'), | |||
| ('56','cfg_index_cache','arclist标签调用缓存（0不启用，大于0值为多少秒）','6','number','86400'), | |||
| @@ -4036,8 +4036,8 @@ INSERT INTO `#@__sysconfig` VALUES ('1','cfg_basehost','站点网址','1','strin | |||
| ('100','cfg_fck_xhtml','是否使用富文本','2','bool','N'), | |||
| ('101','cfg_allsearch_limit','网站全局搜索时间限制（秒）','2','string','1'), | |||
| ('102','cfg_delete','是否开启文档回收站','2','bool','Y'), | |||
| ('103','cfg_keywords','主页关键词','1','string',''), | |||
| ('104','cfg_description','主页描述','1','bstring',''), | |||
| ('103','cfg_keywords','首页关键词','1','string',''), | |||
| ('104','cfg_description','首页描述','1','bstring',''), | |||
| ('105','cfg_beian','网站备案号','1','string',''), | |||
| ('106','cfg_need_typeid2','是否启用副栏目','6','bool','Y'), | |||
| ('107','cfg_mb_pwdtype','前台密码验证类型32—32位md5，可选l16—前16位、r16—后16位、m16—中间16位','4','string','32'), | |||
+ 2
- 0
src/robots.txt
View File
| @@ -1,5 +1,7 @@ | |||
| User-agent: * | |||
| Disallow: /data | |||
| Disallow: /static/ckeditor | |||
| Disallow: /static/enums | |||
| Disallow: /system | |||
| Disallow: /theme | |||
| Disallow: /user | |||
+ 17
- 14
src/static/web/css/style.css
View File
| @@ -55,14 +55,23 @@ form.search { | |||
| font-size:16px | |||
| } | |||
| .spec .card { | |||
| background:#f5f5f5; | |||
| text-align:center | |||
| } | |||
| .spec .card img { | |||
| max-width:200px; | |||
| margin:0 auto | |||
| height:160px; | |||
| border-radius:.25rem .25rem 0 0 | |||
| } | |||
| .spec .card-body { | |||
| padding:.25rem | |||
| padding:.65rem | |||
| } | |||
| .spec .card-title { | |||
| margin-bottom:0; | |||
| font-size:14px; | |||
| font-weight:400; | |||
| overflow:hidden; | |||
| text-overflow:ellipsis; | |||
| white-space:nowrap | |||
| } | |||
| .spec .border-bottom-dashed { | |||
| border-bottom:dashed 1px #929292 | |||
| @@ -95,10 +104,6 @@ form.search { | |||
| background:#fff; | |||
| border-bottom:0 | |||
| } | |||
| .ddcard-normal > .card-header .caption,.ddcard > .card-header .caption { | |||
| font-size:18px; | |||
| font-weight:600 | |||
| } | |||
| .ddcard > .card-header .more a,.ddcard-normal > .card-header .more a { | |||
| font-size:14px; | |||
| color:#1eb867 | |||
| @@ -119,6 +124,8 @@ form.search { | |||
| .ddcard > .card-header .caption span { | |||
| display:inline-block; | |||
| padding:6px 12px; | |||
| font-size:18px; | |||
| font-weight:600; | |||
| color:#fff; | |||
| background:#1eb867; | |||
| border-radius:.2rem .2rem 0 0 | |||
| @@ -133,13 +140,6 @@ form.search { | |||
| .ddcard-normal ul { | |||
| padding:10px | |||
| } | |||
| .title::before { | |||
| margin-right:10px; | |||
| padding:2px; | |||
| content:" "; | |||
| background:#1eb867; | |||
| border-radius:.2rem | |||
| } | |||
| .breadcrumb { | |||
| margin-bottom:0 | |||
| } | |||
| @@ -329,4 +329,7 @@ form.search { | |||
| .m-pb-2 { | |||
| padding-bottom:2rem | |||
| } | |||
| .spec .card img { | |||
| height:130px | |||
| } | |||
| } | |||
+ 2
- 2
src/system/archive/freelist.class.php
View File
| @@ -649,7 +649,7 @@ class FreeList | |||
| $purl = $this->GetCurUrl(); | |||
| $tnamerule = $this->GetMakeFileRule(); | |||
| $tnamerule = preg_replace("#^(.*)\/#", '', $tnamerule); | |||
| //获得上一页和主页的链接 | |||
| //获得上一页和首页的链接 | |||
| if ($this->PageNo != 1) { | |||
| $prepage .= "<li class='page-item'><a class='page-link' href='".str_replace("{page}", $prepagenum, $tnamerule)."'>上一页</a></li>\r\n"; | |||
| $indexpage = "<li class='page-item'><a class='page-link' href='".str_replace("{page}", 1, $tnamerule)."'>首页</a></li>\r\n"; | |||
| @@ -844,7 +844,7 @@ class FreeList | |||
| ); | |||
| } | |||
| /** | |||
| * 获得当前的页面文件的url | |||
| * 获得当前的页面文件链接 | |||
| * | |||
| * @access public | |||
| * @return void | |||
+ 8
- 11
src/system/archive/listview.class.php
View File
| @@ -633,12 +633,10 @@ class ListView | |||
| { | |||
| $nfields[$v] = $k; | |||
| } | |||
| if (is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields)) | |||
| { | |||
| if (is_array($this->ChannelUnit->ChannelFields) && !empty($this->ChannelUnit->ChannelFields)) { | |||
| foreach($this->ChannelUnit->ChannelFields as $k=>$arr) | |||
| { | |||
| if (isset($nfields[$k])) | |||
| { | |||
| if (isset($nfields[$k])) { | |||
| if (!empty($arr['rename'])) { | |||
| $addField .= ','.$addtable.'.'.$k.' as '.$arr['rename']; | |||
| } | |||
| @@ -798,7 +796,7 @@ class ListView | |||
| */ | |||
| function GetPageListST($list_len, $listitem = "index,end,pre,next,pageno") | |||
| { | |||
| global $cfg_rewrite,$cfg_cmspath; | |||
| global $cfg_cmspath, $cfg_rewrite; | |||
| $prepage = $nextpage = ''; | |||
| $prepagenum = $this->PageNo - 1; | |||
| $nextpagenum = $this->PageNo + 1; | |||
| @@ -815,7 +813,7 @@ class ListView | |||
| $purl = $this->GetCurUrl(); | |||
| $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>\r\n"; | |||
| $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']); | |||
| //获得上一页和主页的链接 | |||
| //获得上一页和首页的链接 | |||
| if ($this->PageNo != 1) { | |||
| $prepage .= "<li class='page-item'><a class='page-link' href='".str_replace("{page}", $prepagenum, $tnamerule)."'>上一页</a></li>\r\n"; | |||
| $indexpage = "<li class='page-item'><a class='page-link' href='".str_replace("{page}", 1, $tnamerule)."'>首页</a></li>\r\n"; | |||
| @@ -886,7 +884,7 @@ class ListView | |||
| */ | |||
| function GetPageListDM($list_len, $listitem = "index,end,pre,next,pageno") | |||
| { | |||
| global $cfg_rewrite,$cfg_cmspath; | |||
| global $cfg_cmspath, $cfg_rewrite; | |||
| $prepage = $nextpage = ''; | |||
| $prepagenum = $this->PageNo - 1; | |||
| $nextpagenum = $this->PageNo + 1; | |||
| @@ -959,18 +957,17 @@ class ListView | |||
| if (preg_match('/option/i', $listitem)) $plist .= $optionlist; | |||
| if (preg_match('/info/i', $listitem)) $plist .= $maininfo; | |||
| //伪静态分页 | |||
| if ($cfg_rewrite == 'Y') | |||
| { | |||
| if ($cfg_rewrite == 'Y') { | |||
| $plist = str_replace('.php?tid=','-',$plist); | |||
| $plist = preg_replace("/&TotalResult=(\d+)/i","",$plist);//去掉总结果数值 | |||
| //目录版 | |||
| //目录版默认 | |||
| $plist = preg_replace("/&PageNo=(\d+)/i",'-\\1',$plist); | |||
| //网页版$plist = preg_replace("/&PageNo=(\d+)/i",'-\\1.html',$plist); | |||
| } | |||
| return $plist; | |||
| } | |||
| /** | |||
| * 获得当前的页面文件的url | |||
| * 获得当前的页面文件链接 | |||
| * | |||
| * @access public | |||
| * @return string | |||
+ 1
- 1
src/system/archive/searchview.class.php
View File
| @@ -720,7 +720,7 @@ class SearchView | |||
| return $plist; | |||
| } | |||
| /** | |||
| * 获得当前的页面文件的url | |||
| * 获得当前的页面文件链接 | |||
| * | |||
| * @access public | |||
| * @return string | |||
+ 2
- 2
src/system/archive/sglistview.class.php
View File
| @@ -695,7 +695,7 @@ class SgListView | |||
| $maininfo = "<li class='page-item disabled'><span class='page-link'>{$totalpage}页".$this->TotalResult."条</span></li>"; | |||
| $tnamerule = $this->GetMakeFileRule($this->Fields['id'], "list", $this->Fields['typedir'], $this->Fields['defaultname'], $this->Fields['namerule2']); | |||
| $tnamerule = preg_replace("/^(.*)\//", '', $tnamerule); | |||
| //获得上一页和主页的链接 | |||
| //获得上一页和首页的链接 | |||
| if ($this->PageNo != 1) { | |||
| $prepage .= "<li class='page-item'><a class='page-link' href='".str_replace("{page}", $prepagenum, $tnamerule)."'>上一页</a></li>\r\n"; | |||
| $indexpage = "<li class='page-item'><a class='page-link' href='".str_replace("{page}", 1, $tnamerule)."'>首页</a></li>\r\n"; | |||
| @@ -846,7 +846,7 @@ class SgListView | |||
| return $plist; | |||
| } | |||
| /** | |||
| * 获得当前的页面文件的url | |||
| * 获得当前的页面文件链接 | |||
| * | |||
| * @access private | |||
| * @return string | |||
+ 1
- 1
src/system/archive/specview.class.php
View File
| @@ -555,7 +555,7 @@ class SpecView | |||
| return $plist; | |||
| } | |||
| /** | |||
| * 获得当前的页面文件的url | |||
| * 获得当前的页面文件链接 | |||
| * | |||
| * @access private | |||
| * @return string | |||
+ 1
- 1
src/system/archive/taglist.class.php
View File
| @@ -648,7 +648,7 @@ class TagList | |||
| return GetFileUrl($aid, $typeid, $timetag, $title, $ismake, $rank, $namerule, $artdir, $money, $filename); | |||
| } | |||
| /** | |||
| * 获得当前的页面文件的url | |||
| * 获得当前的页面文件链接 | |||
| * | |||
| * @access private | |||
| * @return string | |||
+ 9
- 9
src/system/helpers/channelunit.helper.php
View File
| @@ -139,7 +139,7 @@ if (!function_exists('GetFileNewName')) { | |||
| if (!function_exists('GetFileName')) { | |||
| function GetFileName($aid, $typeid, $timetag, $title, $ismake = 0, $rank = 0, $namerule = '', $typedir = '', $money = 0, $filename = '') | |||
| { | |||
| global $cfg_rewrite, $cfg_cmspath, $cfg_arcdir, $cfg_special, $cfg_arc_dirname; | |||
| global $cfg_cmspath, $cfg_arcdir, $cfg_special, $cfg_arc_dirname, $cfg_rewrite; | |||
| //没指定栏目时用固定专题规则 | |||
| if (empty($namerule)) { | |||
| $namerule = $cfg_special.'/{aid}.html'; | |||
| @@ -149,7 +149,7 @@ if (!function_exists('GetFileName')) { | |||
| if ($rank != 0 || $ismake == -1 || $typeid == 0 || $money > 0) { | |||
| if ($cfg_rewrite == 'Y') { | |||
| //目录版return "/article/".$aid.""; | |||
| //网页版 | |||
| //网页版默认，文档形式：域名/1.html、域名/2.html，分页形式：域名/1-1.html、域名/1-2.html | |||
| return "/".$aid.".html"; | |||
| } else { | |||
| return $GLOBALS['cfg_phpurl']."/view.php?aid=$aid"; | |||
| @@ -184,7 +184,7 @@ if (!function_exists('GetFileName')) { | |||
| } | |||
| } | |||
| /** | |||
| * 获得指定栏目的URL链接 | |||
| * 获得指定栏目链接 | |||
| * 对于使用封面文件和单独页面的情况，强制使用默认页名称 | |||
| * | |||
| * @param int $typeid 栏目id | |||
| @@ -201,15 +201,15 @@ if (!function_exists('GetFileName')) { | |||
| if (!function_exists('GetTypeUrl')) { | |||
| function GetTypeUrl($typeid, $typedir, $isdefault, $defaultname, $ispart, $namerule2, $moresite = 0, $siteurl = '', $sitepath = '') | |||
| { | |||
| global $cfg_typedir_df,$cfg_rewrite; | |||
| global $cfg_typedir_df, $cfg_rewrite; | |||
| $typedir = MfTypedir($typedir); | |||
| $sitepath = MfTypedir($sitepath); | |||
| //伪静态栏目 | |||
| if ($isdefault==-1) { | |||
| //动态 | |||
| if ($cfg_rewrite == 'Y') { | |||
| //目录版return "/article/".$aid.""; | |||
| //网页版 | |||
| //网页版return $GLOBALS['cfg_cmspath']."/list-".$typeid.".html"; | |||
| //目录版默认，栏目形式：域名/list-1、域名/list-2，分页形式：域名/list-1-1、域名/list-1-2 | |||
| return $GLOBALS['cfg_cmspath']."/list-".$typeid.""; | |||
| } else { | |||
| $reurl = $GLOBALS['cfg_phpurl']."/list.php?tid=".$typeid; | |||
| @@ -486,7 +486,7 @@ function MakeOneTag(&$dtp, &$refObj, $parfield = 'Y') | |||
| } | |||
| } | |||
| /** | |||
| * 获取某栏目的url | |||
| * 获取某栏目链接 | |||
| * | |||
| * @param array $typeinfos 栏目信息 | |||
| * @return string | |||
| @@ -532,9 +532,9 @@ function SetSysEnv($typeid = 0, $typename = '', $aid = 0, $title = '', $curfile | |||
| } | |||
| } | |||
| /** | |||
| * 获得图书的URL | |||
| * 获得图书链接 | |||
| * | |||
| * @param string $bid 书籍ID | |||
| * @param string $bid 书籍id | |||
| * @param string $title 标题 | |||
| * @param string $gdir | |||
| * @return string | |||
+ 1
- 1
src/system/taglib/arclist.lib.php
View File
| @@ -172,7 +172,7 @@ function lib_arclistDone (&$refObj, &$ctag, $typeid=0, $row=10, $col=1, $titlele | |||
| if (!empty($typeid) && $typeid != 'top') { | |||
| //指定了多个栏目时，不再获取子类的id | |||
| if (preg_match('#,#', $typeid)) { | |||
| //指定了getall属性或主页模板例外 | |||
| //指定了getall属性或首页模板例外 | |||
| if ($getall == 1 || empty($refObj->Fields['typeid'])) { | |||
| $typeids = explode(',', $typeid); | |||
| foreach ($typeids as $ttid) { | |||
+ 0
- 1
src/system/taglib/sonchannel.lib.php
View File
| @@ -20,7 +20,6 @@ function lib_sonchannel(&$ctag, &$refObj) | |||
| return $ctag->GetAtt('nosonmsg'); | |||
| } | |||
| $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl,sitepath FROM `#@__arctype` WHERE reid='$typeid' AND ishidden<>1 ORDER BY sortrank ASC LIMIT 0,$row"; | |||
| //And id<>'$typeid' | |||
| $dtp2 = new DedeTagParse(); | |||
| $dtp2->SetNameSpace("field", "[", "]"); | |||
| $dtp2->LoadSource($innertext); | |||
+ 8
- 16
src/system/typelink/typelink.class.php
View File
| @@ -56,8 +56,7 @@ class TypeLink | |||
| } | |||
| } | |||
| } | |||
| //对于使用默认构造函数的情况 | |||
| //GetPositionLink()不可用 | |||
| //对于使用默认构造函数的情况GetPositionLink()不可用 | |||
| function TypeLink($typeid) | |||
| { | |||
| $this->__construct($typeid); | |||
| @@ -88,8 +87,7 @@ class TypeLink | |||
| return $this->TypeInfos['typedir']; | |||
| } | |||
| } | |||
| //获得某栏目的链接列表 如：栏目一>>栏目二>> 这样的形式 | |||
| //islink 表示返回的列表是否带连接 | |||
| //获得某栏目的链接列表：栏目一>栏目二>形式，islink表示返回的列表是否带连接 | |||
| function GetPositionLink($islink = true) | |||
| { | |||
| $indexpage = "<li class='breadcrumb-item'><a href='".$this->indexUrl."'>".$this->indexName."</a></li>"; | |||
| @@ -150,7 +148,7 @@ class TypeLink | |||
| $typelink = "<li class='breadcrumb-item'><a href='".$typepage."'>".$typeinfos['typename']."</a></li>"; | |||
| return $typelink; | |||
| } | |||
| //获得某分类连接的URL | |||
| //获得某分类连接链接 | |||
| function GetOneTypeUrl($typeinfos) | |||
| { | |||
| return GetTypeUrl( | |||
| @@ -165,10 +163,7 @@ class TypeLink | |||
| $typeinfos['sitepath'] | |||
| ); | |||
| } | |||
| //获得类别列表 | |||
| //hid是指默认选中栏目，0表示“请选择栏目”或“不限栏目” | |||
| //oper是用户允许管理的栏目，0表示所有栏目 | |||
| //channeltype是指栏目的文档类型，0表示不限栏目 | |||
| //获得类别列表：hid是指默认选中栏目，0表示请选择栏目或不限栏目，oper是用户允许管理的栏目，0表示所有栏目，channeltype是指栏目的文档类型，0表示不限栏目 | |||
| function GetOptionArray($hid = 0, $oper = 0, $channeltype = 0, $usersg = 0) | |||
| { | |||
| return $this->GetOptionList($hid, $oper, $channeltype, $usersg); | |||
| @@ -254,8 +249,7 @@ class TypeLink | |||
| } | |||
| } | |||
| /** | |||
| * 获得与该类相关的栏目，本函数应用于模板标记{dede:channel}{/dede:channel}中 | |||
| * $typetype 的值为：sun下级分类 self同级分类 top顶级分类 | |||
| * 获得与该类相关的栏目，本函数应用于模板标记{dede:channel}{/dede:channel}中$typetype的值为：sun下级分类，self同级分类，top顶级分类 | |||
| * | |||
| * @access public | |||
| * @param int $typeid 栏目id | |||
| @@ -304,7 +298,6 @@ class TypeLink | |||
| } else if ($typetype == "self") { | |||
| $sql = "SELECT id,typename,typedir,isdefault,ispart,defaultname,namerule2,moresite,siteurl FROM `#@__arctype` WHERE reid='$reid' AND ishidden<>1 ORDER BY sortrank ASC limit 0,$row"; | |||
| } | |||
| //AND ID<>'$typeid' | |||
| $dtp2 = new DedeTagParse(); | |||
| $dtp2->SetNameSpace("field", "[", "]"); | |||
| $dtp2->LoadSource($innertext); | |||
| @@ -346,20 +339,19 @@ class TypeLink | |||
| $likeType .= " </td>\r\n"; | |||
| } | |||
| $GLOBALS['autoindex']++; | |||
| } //Loop Col | |||
| }//Loop Col | |||
| if ($col > 1) { | |||
| $i += $col - 1; | |||
| } | |||
| if ($col > 1) { | |||
| $likeType .= " </tr>\r\n"; | |||
| } | |||
| } //Loop for $i | |||
| }//Loop for $i | |||
| if ($col > 1) { | |||
| $likeType .= " </table>\r\n"; | |||
| } | |||
| $this->dsql->FreeResult(); | |||
| return $likeType; | |||
| } //GetChannel | |||
| }//GetChannel | |||
| }//End Class | |||
| ?> | |||
+ 10
- 9
src/theme/dedebiz/index.htm
View File
| @@ -49,8 +49,8 @@ | |||
| <div class="card ddcard-normal"> | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-md-12 caption"> | |||
| <span>推荐头条</span> | |||
| <div class="col-md-12"> | |||
| <h4>推荐头条</h4> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| @@ -76,10 +76,11 @@ | |||
| <div class="row row-cols-2 row-cols-md-4"> | |||
| {dede:arclist row='4' orderby='pubdate' type='image.'} | |||
| <div class="col"> | |||
| <div class="card border-0 image-item"> | |||
| <a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link"><img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]"> | |||
| <div class="card-body"><h6 class="card-title">[field:title/]</h6></div> | |||
| </a> | |||
| <div class="card image-item border-0 mb-3"> | |||
| <a href="[field:arcurl/]" class="text-body stretched-link"><img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]"></a> | |||
| <div class="card-body"> | |||
| <h5 class="card-title"><a href="[field:arcurl/]">[field:title/]</a></h5> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| {/dede:arclist} | |||
| @@ -92,10 +93,10 @@ | |||
| <div class="card ddcard-normal"> | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-md-6 caption"> | |||
| <a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a> | |||
| <div class="col-md-6"> | |||
| <h4>{dede:field.typename/}</h4> | |||
| </div> | |||
| <div class="col-md-6 d-flex justify-content-end more"><a href="{dede:field name='typeurl'/}">更多</a></div> | |||
| <div class="col-md-6 d-flex justify-content-end more"><a href="{dede:field.typeurl/}">更多</a></div> | |||
| </div> | |||
| </div> | |||
| <ul class="list-group list-group-flush"> | |||
+ 2
- 2
src/theme/dedebiz/index_article.htm
View File
| @@ -39,10 +39,10 @@ | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-6 caption"> | |||
| <span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span> | |||
| <span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span> | |||
| </div> | |||
| <div class="col-6 d-flex justify-content-end more"> | |||
| <a href="{dede:field name='typeurl'/}">更多</a> | |||
| <a href="{dede:field.typeurl/}">更多</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
+ 2
- 2
src/theme/dedebiz/index_default.htm
View File
| @@ -39,10 +39,10 @@ | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-6 caption"> | |||
| <span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span> | |||
| <span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span> | |||
| </div> | |||
| <div class="col-6 d-flex justify-content-end more"> | |||
| <a href="{dede:field name='typeurl'/}">更多</a> | |||
| <a href="{dede:field.typeurl/}">更多</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
+ 2
- 2
src/theme/dedebiz/index_default_sg.htm
View File
| @@ -39,10 +39,10 @@ | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-6 caption"> | |||
| <span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span> | |||
| <span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span> | |||
| </div> | |||
| <div class="col-6 d-flex justify-content-end more"> | |||
| <a href="{dede:field name='typeurl'/}">更多</a> | |||
| <a href="{dede:field.typeurl/}">更多</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
+ 3
- 3
src/theme/dedebiz/index_image.htm
View File
| @@ -39,17 +39,17 @@ | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-6 caption"> | |||
| <span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span> | |||
| <span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span> | |||
| </div> | |||
| <div class="col-6 d-flex justify-content-end more"> | |||
| <a href="{dede:field name='typeurl'/}">更多</a> | |||
| <a href="{dede:field.typeurl/}">更多</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| <div class="row row-cols-2 row-cols-md-4 pt-3"> | |||
| {dede:arclist row='4'} | |||
| <div class="col"> | |||
| <div class="card border-0 image-item"> | |||
| <div class="card image-item border-0 mb-3"> | |||
| <a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link"> | |||
| <img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]"> | |||
| <div class="card-body"> | |||
+ 2
- 2
src/theme/dedebiz/index_infos.htm
View File
| @@ -39,10 +39,10 @@ | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-6 caption"> | |||
| <span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span> | |||
| <span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span> | |||
| </div> | |||
| <div class="col-6 d-flex justify-content-end more"> | |||
| <a href="{dede:field name='typeurl'/}">更多</a> | |||
| <a href="{dede:field.typeurl/}">更多</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
+ 2
- 2
src/theme/dedebiz/index_soft.htm
View File
| @@ -39,10 +39,10 @@ | |||
| <div class="card-header"> | |||
| <div class="row"> | |||
| <div class="col-6 caption"> | |||
| <span><a href="{dede:field name='typeurl'/}">{dede:field name='typename'/}</a></span> | |||
| <span><a href="{dede:field.typeurl/}">{dede:field.typename/}</a></span> | |||
| </div> | |||
| <div class="col-6 d-flex justify-content-end more"> | |||
| <a href="{dede:field name='typeurl'/}">更多</a> | |||
| <a href="{dede:field.typeurl/}">更多</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
+ 1
- 1
src/theme/dedebiz/list_image.htm
View File
| @@ -35,7 +35,7 @@ | |||
| <div class="row row-cols-2 row-cols-md-4"> | |||
| {dede:list pagesize='12'} | |||
| <div class="col"> | |||
| <div class="card border-0 image-item"> | |||
| <div class="card image-item border-0 mb-3"> | |||
| <a href="[field:arcurl/]" title="[field:fulltitle/]" class="text-body stretched-link"> | |||
| <img src="[field:litpic/]" class="card-img-top" alt="[field:fulltitle/]"> | |||
| <div class="card-body"> | |||
+ 1
- 1
src/theme/dedebiz/search.htm
View File
| @@ -22,7 +22,7 @@ | |||
| <nav aria-label="breadcrumb"> | |||
| <ol class="breadcrumb"> | |||
| <li class="breadcrumb-item">当前位置</li> | |||
| <li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">主页</a></li> | |||
| <li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">首页</a></li> | |||
| <li class="breadcrumb-item">搜索{dede:global name='keyword' function='RemoveXSS(@me)'/}的结果</li> | |||
| </ol> | |||
| </nav> | |||
+ 1
- 1
src/theme/dedebiz/singlepage.htm
View File
| @@ -22,7 +22,7 @@ | |||
| <nav aria-label="breadcrumb"> | |||
| <ol class="breadcrumb"> | |||
| <li class="breadcrumb-item">当前位置</li> | |||
| <li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">主页</a></li> | |||
| <li class="breadcrumb-item"><a href="{dede:global.cfg_cmsurl/}/">首页</a></li> | |||
| <li class="breadcrumb-item">{dede:field name='title'/}</li> | |||
| </ol> | |||
| </nav> | |||
+ 1
- 1
src/theme/templet-filelist.inc
View File
| @@ -9,7 +9,7 @@ article_soft.htm,软件文档模板 | |||
| article_spec.htm,专题文档模板 | |||
| foot.htm,底部模板 | |||
| head.htm,头部模板 | |||
| index.htm,主页模板 | |||
| index.htm,首页模板 | |||
| index_article.htm,文档封面模板 | |||
| index_default.htm,默认封面模板 | |||
| index_default_sg.htm,默认表单封面模板 | |||
+ 1
- 1
src/user/index_do.php
View File
| @@ -207,7 +207,7 @@ else if ($fmdo == 'login') { | |||
| //清除会员缓存 | |||
| $cfg_ml->DelCache($cfg_ml->M_ID); | |||
| if (empty($gourl) || preg_match("#action|_do#i", $gourl)) { | |||
| ShowMsg("成功登录，正在跳转用户主页", "index.php", 0, 2000); | |||
| ShowMsg("成功登录，正在跳转用户首页", "index.php", 0, 2000); | |||
| } else { | |||
| $gourl = str_replace('^', '&', $gourl); | |||
| ShowMsg("成功登录，正在跳转指定页面", $gourl, 0, 2000); | |||