diff --git a/README.md b/README.md index 139fa4f..a766253 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ * 后台：http://adm.aieok.com:888 * 账号：test * 密码：test123 - * 版本：TaoLer 1.7.24 - * 日期：2021.7.22 + * 版本：TaoLer 1.7.25 + * 日期：2021.7.23 #### 项目地址 @@ -41,12 +41,20 @@ 一款至简的社区模板，适合政府机构、教育机构、事业单位、商业企业、个人站长等众多行业领域。 #### 安装教程 - -1. git下载：https://gitee.com/toogee/TaoLer -2. 官网下载：https://www.aieok.com -3. 解压后，项目绑定域名为public目录对外访问，首次安装，访问域名http://www.youdomain.com可自动跳转到/install/index进行引导安装，重新安装需删除根目录下install.lock。 -4. 安装前需要先创建mysql数据库(准备：数据库连接地址，数据库用户名，数据库密码，数据库端口，建好在数据库名) -5. 请牢记安装设置的管理员用户名和密码，默认admin/123456。前后台的管理员密码一致。前后端管理员账户是独立的，前端主要对文章内容的审查管理等操作。 +1. 首选确保满目使用环境要求，php > 7.2, mysql > 5.7.3 +2. git下载：https://gitee.com/toogee/TaoLer + 官网下载：https://www.aieok.com +3. 解压后，项目绑定域名为public目录对外访问，如果使用nginx服务器，首先设置伪静态Nginx.conf。 + ```html + location / { // …..省略部分代码 + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?s=/$1 last; + } + } + ``` +4. 首次安装，访问域名http://www.youdomain.com可自动跳转到/install/index进行引导安装，重新安装需删除public目录下install.lock。 +5. 安装前需要先创建mysql数据库(准备：数据库连接地址，数据库用户名，数据库密码，数据库端口，建好在数据库名) +6. 请牢记安装设置的管理员用户名和密码，默认admin/123456。前后台的管理员密码一致。前后端管理员账户是独立的，前端主要对文章内容的审查管理等操作。 #### 使用说明 diff --git a/app/admin/view/forum/tags.html b/app/admin/view/forum/tags.html index d690c3b..38f049b 100644 --- a/app/admin/view/forum/tags.html +++ b/app/admin/view/forum/tags.html @@ -68,7 +68,7 @@ $.ajax({ type:"post", url:"{:url('admin/Forum/addtags')}", - data:{"sort":sort,"catename":tags,"ename":ename,"icon":cion,"desc":desc}, + data:{"sort":sort,"catename":tags,"ename":ename,"icon":icon,"desc":desc}, daType:"json", success:function (data){ if (data.code == 0) { @@ -96,11 +96,7 @@ //分类热点控制 form.on('checkbox(menu-show)', function(data){ var data = data.elem; - if(data.checked == true){ - data.value = 1; - }else{ - data.value = 0; - } + data.value = data.checked ? 1 : 0; $.ajax({ type:'post', url:"{:url('admin/Forum/tagshot')}", @@ -111,9 +107,7 @@ layer.msg(data.msg,{ icon:6, time:2000 - } - //,function(){location.reload();} - ); + }); } else { layer.open({ title:'修改失败', diff --git a/app/admin/view/set/system/website.html b/app/admin/view/set/system/website.html index 3584800..bebf721 100644 --- a/app/admin/view/set/system/website.html +++ b/app/admin/view/set/system/website.html @@ -172,20 +172,28 @@
-
- -
- +
+ +
+ +
+
是否显示发帖及评论等邮件提醒（需先配置邮箱服务）
-
发件人所在地区简称
-
- +
- +
-
发帖，评论等邮件提醒
+
是否显示列表及详情所属分类
+
+ +
+ +
+
是否显示发件人所在地区简称
+
+
diff --git a/app/index/controller/Article.php b/app/index/controller/Article.php index eb0318a..d63800e 100644 --- a/app/index/controller/Article.php +++ b/app/index/controller/Article.php @@ -261,7 +261,6 @@ class Article extends BaseController public function uploads() { $type = Request::param('type'); - //halt($type); $uploads = new Uploads(); switch ($type){ case 'image': @@ -311,25 +310,35 @@ class Article extends BaseController //文章置顶，状态 public function jieset(){ $data = Request::param(); - $article = ArticleModel::field('id,is_top,is_hot')->find($data['id']); - if($data['field'] === 'top') { - if($data['rank']==1){ - $article->save(['is_top' => 1]); - $res = ['status'=>0,'msg'=>'置顶成功']; - } else { - $article->save(['is_top' => 0]); - $res = ['status'=>0,'msg'=>'已取消置顶']; - } - } else { - if($data['rank']==1){ - $article->save(['is_hot' => 1]); - $res = ['status'=>0,'msg'=>'已设精贴']; - } else { - $article->save(['is_hot' => 0]); - $res = ['status'=>0,'msg'=>'精贴已取消']; - } - } - + $article = ArticleModel::field('id,is_top,is_hot,is_reply')->find($data['id']); + switch ($data['field']){ + case 'top': + if($data['rank']==1){ + $article->save(['is_top' => 1]); + $res = ['status'=>0,'msg'=>'置顶成功']; + } else { + $article->save(['is_top' => 0]); + $res = ['status'=>0,'msg'=>'已取消置顶']; + } + break; + case 'hot': + if($data['rank']==1){ + $article->save(['is_hot' => 1]); + $res = ['status'=>0,'msg'=>'已设精贴']; + } else { + $article->save(['is_hot' => 0]); + $res = ['status'=>0,'msg'=>'精贴已取消']; + } + break; + case 'reply': + if($data['rank']==1){ + $article->save(['is_reply' => 1]); + $res = ['status'=>0,'msg'=>'本帖禁评']; + } else { + $article->save(['is_reply' => 0]); + $res = ['status'=>0,'msg'=>'禁评已取消']; + } + } //删除本贴设置缓存显示编辑后内容 Cache::delete('article_'.$data['id']); //清除文章tag缓存 diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh-cn.php index 89a56bb..1f44ae2 100644 --- a/app/index/lang/zh-cn.php +++ b/app/index/lang/zh-cn.php @@ -62,6 +62,8 @@ return [ 'top' => '置顶', 'cancel hoting' => '精-', 'cancel topping' => '顶-', + 'enable reply' => '开评', + 'disable reply' => '禁评', 'go sign' => '去签到', 'more post' => '更多帖子', 'friendly link' => '友情链接', diff --git a/config/taoler.php b/config/taoler.php index 94a76b6..d2c6ab5 100644 --- a/config/taoler.php +++ b/config/taoler.php @@ -7,15 +7,17 @@ return [ //应用名,此项不可更改 'appname' => 'TaoLer', //版本配置 - 'version' => '1.7.24', + 'version' => '1.7.25', //加盐 'salt' => 'taoler', //数据库备份目录 'databasebackdir' => app()->getRootPath() .'data/', //配置 'config' =>[ - 'area_show' => 0, - 'email_notice' => 1, + 'email_notice' => 1, + 'cate_show' => 0, + 'area_show' => 0, + ] diff --git a/public/static/res/css/global.css b/public/static/res/css/global.css index e83ba46..50c665f 100644 --- a/public/static/res/css/global.css +++ b/public/static/res/css/global.css @@ -3,10 +3,8 @@ @Name: Fly社区 @Author: 贤心 @Site: fly.layui.com - */ - /* 全局 */ html,body{overflow-x: hidden;} html body{margin-top: 61px;} @@ -26,7 +24,7 @@ i{font-style: normal;} @media screen and (max-width: 992px) { - .site-menu{position: fixed; top: 0px; bottom: 0; min-height: 0; overflow-y: auto; overflow-x: hidden; z-index: 10001; left: -300px; background-color: #fff; transition: all .3s;} + .site-menu{position: fixed; top: 0; bottom: 0; min-height: 0; overflow-y: auto; overflow-x: hidden; z-index: 10001; left: -300px; background-color: #fff; transition: all .3s;} /* 头部伸缩菜单栏 */ .site-tree-mobile-top{display: block!important; position: fixed; z-index: 16666668; top: 2px; left: 10px; width: 57px; height: 57px; line-height: 57px; border-radius: 2px; text-align: center; color: #e2e2e2;} .site-home .site-tree-mobile-top{display: none!important;} @@ -41,7 +39,6 @@ i{font-style: normal;} .site-mobile .site-tree-mobile{display: none !important;} .site-mobile .site-mobile-shade{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} .site-tree-mobile i{font-size: 20px;} - .site-mobile .layui-side{left: 0;} .site-mobile .layui-side-child{top: 50%; left: 200px; height: 300px; margin-top: -100px;} @@ -210,12 +207,7 @@ i{font-style: normal;} /* 辅助 */ a:hover{color: #009688; transition: all .3s;} -pre{padding: 10px 15px; margin: 10px 0; font-size: 12px; border-left: 6px solid #009688; background-color: #f8f8f8; font-family: Courier New; overflow: auto;} -a:hover{color: #009688; transition: all .3s;} -pre{padding: 10px 15px; margin: 10px 0; font-size: 12px; border-left: 6px solid #009688; background-color: #f8f8f8; font-family: Courier New; overflow: auto;} - pre{position: relative; margin: 10px 0; padding: 15px; line-height: 20px; border: 1px solid #ddd; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;} -pre{border: none; border-left: 5px solid #ddd;} .layui-container{padding: 0;} .fly-main{width: 1079px; min-height: 600px; margin: 0 auto 15px;} @@ -238,8 +230,9 @@ pre{border: none; border-left: 5px solid #ddd;} .fly-loading{position: absolute; top: 50%; left: 50%; margin: -12px 0 0 -15px; font-size: 30px; color: #c2c2c2;} /* 头像 */ -.fly-avatar{position: absolute; left: 15px; top: 15px;} -.fly-avatar img{display: block; width: 45px; height: 45px; margin: 0; border-radius: 2px;} +.fly-avatar{position: absolute; left: 15px; top: 10px;} +.fly-avatar img{display: block; width: 45px; height: 45px; margin: 0; border-radius: 100%;} +.fly-avatar i{position: absolute; left: 35px; top: 25px; } /* 徽章 */ .fly-badge-vip{height: 16px; line-height: 16px; padding: 0 3px; background-color: #FF5722; color: #fff; border-radius: 2px;} @@ -285,7 +278,7 @@ pre{border: none; border-left: 5px solid #ddd;} .fly-header .layui-nav .layui-nav-bar, .fly-header .fly-nav-user .layui-nav-more{display: none !important;} .fly-header .fly-nav-user .layui-nav-child{left: auto; right: 0; width: 120px; min-width: 0;} - +/* .fly-html-layui .fly-nav-avatar .layui-nav-more{display: none !important;} .fly-header .fly-nav-user .layui-nav-child{left: auto; right: 0; width: 120px; min-width: 0;} .fly-html-layui .fly-nav-msg{left: -30px;} @@ -294,7 +287,7 @@ pre{border: none; border-left: 5px solid #ddd;} .fly-html-layui .layui-header .layui-nav .fly-layui-user{margin: 0; margin-left: 40px;} .fly-html-layui .layui-header .layui-nav .fly-layui-user a{padding: 0;} .fly-layui-user .layui-nav-child{left: auto; right: 0; min-width: 0; width: 120px;} - +*/ /* 底部 */ @@ -444,7 +437,7 @@ body .layui-edit-face .layui-layer-content{padding:0; background-color:#fff; co .fly-rank{padding-bottom: 10px;} .fly-rank dl{position: relative; overflow: hidden; margin-left: 20px; text-align: center; font-size: 0;} .fly-rank dd{position: relative; width: 65px; height: 85px; margin: 10px 25px 5px 0; display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;} -.fly-rank dd a img{width: 65px; height: 65px; border-radius: 2px;} +.fly-rank dd a img{width: 65px; height: 65px; border-radius: 10px;} .fly-rank dd a cite{ position:absolute; bottom: 20px; left: 0; width: 100%; height:20px; line-height:20px; text-align:center; background-color:rgba(0,0,0,.2); color:#fff; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .fly-rank dd a:hover cite{display: block;} .fly-rank dd a i{position:absolute; bottom: 0; left: 0; width: 100%; text-align: center; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-style: normal;} @@ -478,19 +471,20 @@ body .layui-edit-face .layui-layer-content{padding:0; background-color:#fff; co .jie-row li .jie-user img{position:relative; top: 16px; width: 35px; height: 35px;} /* Detail页 */ -.detail-box{padding: 20px;} -.detail h1{font-size: 24px; line-height: 36px;} -.fly-detail-info{position: relative; margin: 10px 0 15px;} -.fly-detail-info .layui-btn{height: 20px; line-height: 20px; vertical-align: top; border-radius: 0;} -.fly-detail-info .layui-btn+.layui-btn{margin-left: 0;} -.fly-admin-box{position: relative; display: inline-block; vertical-align: top; margin-left: 20px;} -.fly-detail-info .fly-list-nums{top: -3px; font-size: 16px;} -.fly-detail-info .fly-list-nums i{padding: 0 3px 0 15px; font-size: 22px; color: #999;} +.detail-box{padding-left: 20px; padding-top: 15px; padding-right: 20px; padding-bottom: 20px;} +.detail-box .fly-list-nums{margin-top: 20px; margin-right: 15px; padding-top: 5px; font-size: 16px;} +.detail-box .fly-list-nums i{padding: 0 3px 0 15px; font-size: 22px; color: #999;} +.detail h1{font-size: 22px; line-height: 36px; padding-bottom:10px;} +.fly-admin-box{position: relative; display: inline-block; vertical-align: top; margin-right: 20px;} -.detail-about{position: relative; line-height: 20px; padding: 15px 15px 15px 75px; font-size: 13px; background-color: #f8f8f8; color: #999;} + +.detail-about{position: relative; line-height: 15px; padding: 15px 15px 15px 75px; font-size: 13px; background-color: #f8f8f8; color: #999;border-radius:5px;} .detail-about .jie-status, .detail-about .jie-status-ok{color:#fff;} .detail-about .fly-jing{padding:0 6px; background-color:#c00; color:#fff;} .detail-about .detail-hits{position: relative; top: 5px; line-height: 20px;} +.detail-about .fly-detail-info{position:absolute; right:0px;top:10px;} +.detail-about .fly-detail-info .layui-btn{height: 20px; line-height: 20px; vertical-align: top; border-radius: 0;} +.detail-about .fly-detail-info .layui-btn+.layui-btn{margin-left: 0;} .fly-detail-user{white-space: nowrap; overflow: hidden;} .fly-detail-user a{padding-right: 10px; font-size: 14px;} .fly-detail-user .icon-renzheng{top: 1px;} @@ -499,7 +493,7 @@ body .layui-edit-face .layui-layer-content{padding:0; background-color:#fff; co .detail-hits .layui-btn{border-radius: 0;} .detail-hits .layui-btn+.layui-btn{margin-left: 5px;} .detail-hits .jie-admin{margin-right: 1px;} -.detail-body{margin: 20px 0 0; min-height: 306px; line-height: 26px; font-size: 16px; color: #333; word-wrap: break-word;} +.detail-body{margin: 10px 0 0; min-height: 306px; line-height: 26px; font-size: 16px; color: #333; word-wrap: break-word;} .detail-body p{margin-bottom:15px;} .detail-body img{max-width: 100%; cursor: pointer;} /* @@ -514,12 +508,20 @@ body .layui-edit-face .layui-layer-content{padding:0; background-color:#fff; co .detail-body ul>li{margin-top: 0;} .detail-body .layui-elem-quote{margin: 10px 0; font-size: 14px; line-height: 26px;} +/* 详情页的底部操作条 */ + .site-tree-mobile-detail-bottom{display: block!important; position: fixed; z-index: 1666666; bottom: 0px; left: 0px; width: 100%; height: 30px; line-height: 30px; border-radius: 2px; text-align: center; color: #e2e2e2;background:#eeeeee} + .site-home .site-tree-mobile-detail-bottom{display: none!important;} + .site-mobile .site-tree-mobile-detail-bottom{display: none !important;} + .site-mobile .site-menu{left: 0;} + .site-mobile .site-tree-mobile-detail-bottom{content: ''; position: fixed; top: 0; bottom: 0; left: 0; right: 0; background-color: rgba(0,0,0,.8); z-index: 999;} + .site-tree-mobile-detail-bottom i{font-size: 30px;} + /*标题颜色展示方式*/ .layui-colorpicker.layui-colorpicker-xs {width: 30px;height: 20px;line-height: 16px;border: 0px solid #e6e6e6;padding: 0;vertical-align: top;border-radius: 0;} .layui-colorpicker-trigger-span {display: block;height: 100%;box-sizing: border-box;border: 1px solid rgba(2, 0, 0, 0.24);border-radius: 2px;text-align: center;} .layui-icon-down:before {font-size: 12px;content: "高亮";} /*扫码阅读*/ -.detail_qrcode{position: absolute;top: 7px;right: 7px;width: 30px;height: 30px;background: url(/static/res/images/detail_qrcode.png) no-repeat;background-size: 30px 30px;} +.detail_qrcode{position: absolute;top: 7px;right: 7px;width: 30px;height: 30px;background: url("/static/res/images/detail_qrcode.png") no-repeat;background-size: 30px 30px;} /* 发帖 */ .layui-form-item.layui-col-space15{margin-bottom: 7.5px;} @@ -668,7 +670,7 @@ body .fly-user-main{position: relative; min-height: 600px;} /* 广告 */ .fly-ad{position: relative; background-color: #f2f2f2; overflow:hidden;} -.fly-ad:before{content: '广告位'; position: absolute; z-index: 0; top: 50%; left: 50%; left: 50%; margin: -10px 0 0 -25px; color: #aaa; font-size: 18px; font-weight: 300;} +.fly-ad:before{content: '广告位'; position: absolute; z-index: 0; top: 50%; left: 50%; margin: -10px 0 0 -25px; color: #aaa; font-size: 18px; font-weight: 300;} .fly-ad div{position: relative; z-index: 1;} /* 友链 */ @@ -712,11 +714,11 @@ body .fly-user-main{position: relative; min-height: 600px;} /* 列表 */ .fly-list li h2 a{max-width: 72%;} - /* Detail 页 */ + /* Detail 页 .fly-admin-box{display: block; margin: 0; margin-top: 10px;} .fly-detail-info .fly-list-nums{top: -2px;} .fly-edit span{border-right: none;} - +*/ /* 案例 */ .fly-case-list, .fly-case-list li{width: 100%; -webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;} @@ -767,7 +769,6 @@ color: #fff; } .pagination .disabled{ display: none; - @media screen and (max-width: 992px) { body .header .layui-nav .layui-nav-item{margin: 0 5px;} } diff --git a/public/static/res/mods/jie.js b/public/static/res/mods/jie.js index 1b9dedb..3239d41 100644 --- a/public/static/res/mods/jie.js +++ b/public/static/res/mods/jie.js @@ -102,7 +102,7 @@ layui.define('fly', function(exports){ }); } - //设置置顶、状态 + //设置置顶、加精、禁评、状态 ,set: function(div){ var othis = $(this); fly.json(articleJieset, { diff --git a/view/taoler/index/article/cate.html b/view/taoler/index/article/cate.html index 57d8db4..0311c12 100644 --- a/view/taoler/index/article/cate.html +++ b/view/taoler/index/article/cate.html @@ -19,7 +19,7 @@ {$art.user.name}

- {:cookie('think_lang') == 'en-us' ? $art.cate.ename : $art.cate.catename} + {if config('taoler.config.cate_show') == 1}{:cookie('think_lang') == 'en-us' ? $art.cate.ename : $art.cate.catename}{/if} {$art.title}

diff --git a/view/taoler/index/article/detail.html b/view/taoler/index/article/detail.html index b567ebc..adffb16 100644 --- a/view/taoler/index/article/detail.html +++ b/view/taoler/index/article/detail.html @@ -8,69 +8,62 @@ {block name="content"}
-
{include file="public/menu" /}
-
-

{$article.title} -
+

{$article.title} +

- -
- - {:cookie('think_lang') == 'en-us' ? $article.cate.ename : $article.cate.catename} - {if ($article.jie == 0)} - {:lang('no finished')} - {else /} - {:lang('finished')} - {/if} - {if ($article.is_top == 1)} - {:lang('top')} - {/if} - {if ($article.is_hot == 1)} - {:lang('hot')} - {/if} + + {$comments->count()} + {$pv} + + +
+ + {$article.user.name} + + +
+ + {if config('taoler.config.area_show') == 1}{:getAsing($article.user.area_id) ?: '无'}{/if} + {$article.user.nickname ?: $article.user.name} + +
+
{if ($user.auth ?? '')} - {:lang('delete')} + {if($article.is_top == 0)} - {:lang('top')} + {else /} {:lang('cancel topping')} {/if} {if($article.is_hot == 0)} - {:lang('hot')} + {else /} {:lang('cancel hoting')} {/if} + {if($article.is_reply == 1)} + + {else /} + {:lang('enable reply')} + {/if} {:lang('title color')} {/if} + {if(session('user_name')==$article.user.name || ($user.auth ?? ''))} + {:lang('edit')} + {/if} +
- - - {$comments->count()} - {$pv} - +
-
- - {$article.user.name} - -
- - {if config('taoler.config.area_show') == 1}{:getAsing($article.user.area_id) ?: '无'}{/if} - {$article.user.nickname ?: $article.user.name} - - {if($article.user.vip > 0)}vip{$article.user.vip}{/if} - -
-
- - - {if(session('user_name')==$article.user.name || ($user.auth ?? ''))} - {:lang('edit')} - {/if} -
+ +
+ + +
+ +
{$article.content|raw}
{notempty name="$article.upzip"} @@ -80,12 +73,9 @@
{/notempty}
- + +{include file="public/menu" /} + +
+
+
+
{/block} {block name="script"} @@ -228,7 +220,7 @@ layui.use(['fly', 'face','colorpicker','plyr'], function(){ othis.text(posttime); //console.log(othis.attr('data')); - }) + }); //预定义颜色项 @@ -248,21 +240,15 @@ layui.use(['fly', 'face','colorpicker','plyr'], function(){ dataType:'json', success:function(data){ if(data.code == 0){ - layer.msg(data.msg,{ - icon:6, - time:2000 + layer.msg(data.msg,{icon:6,time:2000 }); } else { - layer.open({ - content:data.msg, - icon:5, - adim:6 - }) + layer.open({content:data.msg,icon:5,adim:6}); } } - }); - } - }); + }); + } + }); //评论需要登陆 $('#recomment').click(function (){ @@ -275,27 +261,16 @@ layui.use(['fly', 'face','colorpicker','plyr'], function(){ dataType:"json", success:function (data) { if (data.code == 0) { - layer.msg(data.msg,{ - icon:6, - time:2000 - },function () { + layer.msg(data.msg,{icon:6,time:2000},function () { location.reload(true); }); }else { - layer.open({ - title:'评论失败', - content:data.msg, - icon:5, - anim:6 - }); + layer.open({title:'评论失败',content:data.msg,icon:5,anim:6}); } } }); } else { - layer.msg('请先登陆',{ - icon:5, - time:2000 - },function () { + layer.msg('请先登陆',{icon:5,time:2000},function(){ location.href = "{:url('login/index')}"; }); } @@ -319,7 +294,7 @@ layui.use(['fly', 'face','colorpicker','plyr'], function(){ $('.detail-body').each(function(){ var othis = $(this), html = othis.html(); othis.html(fly.content(html)); - }) + }); //加载播放器 plyr.setup(); @@ -345,7 +320,7 @@ $("#rdown").hover(function(){ content: " $article.id])}&size=230'>" }); } - +//推送百度收录服务 (function(){ var bp = document.createElement('script'); var curProtocol = window.location.protocol.split(':')[0]; diff --git a/view/taoler/index/public/index-forumlist.html b/view/taoler/index/public/index-forumlist.html index 6848b1a..148efb4 100644 --- a/view/taoler/index/public/index-forumlist.html +++ b/view/taoler/index/public/index-forumlist.html @@ -3,7 +3,7 @@ {$art.user.name}

- {:cookie('think_lang') == 'en-us' ? $art.cate.ename : $art.cate.catename} + {if config('taoler.config.cate_show') == 1}{:cookie('think_lang') == 'en-us' ? $art.cate.ename : $art.cate.catename}{/if} {$art.title}

diff --git a/view/taoler/index/public/index-topforum.html b/view/taoler/index/public/index-topforum.html index 1deb44d..753335e 100644 --- a/view/taoler/index/public/index-topforum.html +++ b/view/taoler/index/public/index-topforum.html @@ -3,7 +3,7 @@ {$top.user.name}

- {:cookie('think_lang') == 'en-us' ? $top.cate.ename : $top.cate.catename} + {if config('taoler.config.cate_show') == 1}{:cookie('think_lang') == 'en-us' ? $top.cate.ename : $top.cate.catename}{/if} {$top.title}

diff --git a/view/taoler/index/public/menu.html b/view/taoler/index/public/menu.html index 40e312f..853c56d 100644 --- a/view/taoler/index/public/menu.html +++ b/view/taoler/index/public/menu.html @@ -1,6 +1,5 @@
-
- +