修改文案

b8f12705 · 智布道 · 752c2ef2 · b8f12705 · b8f12705 · b8f12705
7 changed file
--- a/blog-admin/src/main/resources/templates/config.ftl
+++ b/blog-admin/src/main/resources/templates/config.ftl
@@ -27,7 +27,7 @@
                                <a href="#tab_contact" role="tab" id="contact-tab" data-toggle="tab" aria-expanded="false">联系方式</a>
                            </li>
                            <li role="presentation" class="">
-                                <a href="#tab_setting" role="tab" id="setting-tab" data-toggle="tab" aria-expanded="false">系统配置</a>
+                                <a href="#tab_setting" role="tab" id="setting-tab" data-toggle="tab" aria-expanded="false">其他配置</a>
                            </li>
                        </ul>
                        <div id="myTabContent" class="tab-content">
@@ -269,7 +269,7 @@
                                    </div>
                                    <div class="clear"></div>
                                    <div class="item form-group">
-                                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="maintenance">首页显示维护通知</label>
+                                        <label class="control-label col-md-3 col-sm-3 col-xs-12" for="maintenance">维护通知</label>
                                        <div class="col-md-6 col-sm-6 col-xs-12">
                                            <ul class="list-unstyled list-inline">
                                                <li><input type="radio" class="square" checked name="maintenance" value="1"> 显示</li>

--- a/blog-admin/src/main/resources/templates/include/macros.ftl
+++ b/blog-admin/src/main/resources/templates/include/macros.ftl
@@ -7,7 +7,7 @@
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>${config.siteName}后台系统</title>
+    <title>${config.siteName}后台管理系统</title>
    <link href="/assets/images/favicon.ico" rel="shortcut icon" type="image/x-icon">
    <link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
    <link href="https://cdn.bootcss.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
@@ -30,7 +30,7 @@
        <div class="col-md-3 left_col">
            <div class="left_col scroll-view">
                <div class="navbar nav_title" style="border: 0;">
-                    <a href="/" class="site_title"><i class="fa fa-coffee"></i> <span>${config.siteName}后台</span></a>
+                    <a href="/" class="site_title"><i class="fa fa-coffee"></i> <span>${config.siteName}</span></a>
                </div>
                <div class="clearfix"></div>
                <@shiro.user>

--- a/blog-admin/src/main/resources/templates/index.ftl
+++ b/blog-admin/src/main/resources/templates/index.ftl
@@ -11,7 +11,7 @@
        <div class="x_panel">
            <div class="x_title">
                <h2>欢迎光临
-                    <small>DBlog${config.siteName}后台</small>
+                    <small>${config.siteName}后台管理系统</small>
                </h2>
                <div class="clearfix"></div>
            </div>
@@ -31,6 +31,7 @@
                                </ul>
                                <h2>获取帮助</h2>
                                <ul>
+                                    <li><i class="fa fa-fire red"></i>在线文档：<a href="http://dblog-docs.zhyd.me/" target="_blank">http://dblog-docs.zhyd.me/</a></li>
                                    <li>相关Wiki：<a href="https://gitee.com/yadong.zhang/DBlog/wikis" target="_blank">https://gitee.com/yadong.zhang/DBlog/wikis</a></li>
                                    <li>提issue：<a href="https://gitee.com/yadong.zhang/DBlog/issues" target="_blank">https://gitee.com/yadong.zhang/DBlog/issues</a></li>
                                    <li>留言：<a href="https://www.zhyd.me/guestbook" target="_blank">https://www.zhyd.me/guestbook</a></li>

--- a/blog-admin/src/main/resources/templates/layout/header.ftl
+++ b/blog-admin/src/main/resources/templates/layout/header.ftl
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>DBlog${config.siteName}后台系统</title>
-    <link href="/assets/images/favicon.ico" rel="shortcut icon" type="image/x-icon">
-    <link href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
-    <link href="https://cdn.bootcss.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/jquery-confirm/2.5.1/jquery-confirm.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/fancybox/2.1.5/jquery.fancybox.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/nprogress/0.2.0/nprogress.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/toastr.js/2.0.3/css/toastr.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/iCheck/1.0.2/skins/square/green.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/bootstrap-table/1.11.1/bootstrap-table.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/bootstrap-daterangepicker/2.1.24/daterangepicker.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" rel="stylesheet">
-    <link href="https://cdn.bootcss.com/zTree.v3/3.5.29/css/metroStyle/metroStyle.min.css" rel="stylesheet">
-
-    <link href="/assets/css/zhyd.core.css" rel="stylesheet">
-</head>
-<body class="nav-md">
-<div class="container body">
-    <div class="main_container">
-        <div class="col-md-3 left_col">
-            <div class="left_col scroll-view">
-                <div class="navbar nav_title" style="border: 0;">
-                    <a href="/" class="site_title"><i class="fa fa-coffee"></i> <span>${config.siteName}后台</span></a>
-                </div>
-                <div class="clearfix"></div>
-                <div class="profile clearfix">
-                    <div class="profile_pic">
-                        <img src="/assets/images/loading.gif" alt="..." class="img-circle profile_img">
-                    </div>
-                    <div class="profile_info">
-                        <span id="hello_msg">&nbsp;</span>
-                        <h2>尊敬的管理员</h2>
-                    </div>
-                </div>
-                <br />
-            <#include "/layout/sidebar.ftl"/>
-            </div>
-        </div>
-        <#include "/layout/setting.ftl"/>
-        <div class="right_col" role="main">
\ No newline at end of file
--- a/blog-admin/src/main/resources/templates/login.ftl
+++ b/blog-admin/src/main/resources/templates/login.ftl
@@ -44,8 +44,8 @@
                                <div class="separator">
                                    <div class="clearfix"></div>
                                    <div>
-                                        <h1><i class="fa fa-coffee"></i> 博客后台管理系统</h1>
-                                        <p>Copyright © 2018 zhyd.me. All Rights Reserved. </p>
+                                        <h1><i class="fa fa-coffee"></i> ${config.siteName}后台管理系统</h1>
+                                        <p>Copyright © 2018 <a href="https://www.zhyd.me" target="_blank" style="margin: 0">yadong.zhang</a>. All Rights Reserved. </p>
                                    </div>
                                </div>
                            </form>

--- a/blog-web/src/main/resources/templates/index.ftl
+++ b/blog-web/src/main/resources/templates/index.ftl
@@ -67,7 +67,7 @@
                        <figure class="thumbnail">
                            <a href="${config.siteUrl}/article/${item.id?c}">
                                <#if item.coverImage?exists && (item.coverImage?length > 7)>
-                                    <img width="150" height="150" data-original="${config.qiuniuBasePath}${item.coverImage}-img_150x150" class="img-responsive lazy-img" alt="${item.title?if_exists}">
+                                    <img width="150" height="150" data-original="${config.qiuniuBasePath}${item.coverImage}" class="img-responsive lazy-img" alt="${item.title?if_exists}">
                                <#else>
                                    <img width="150" height="150" data-original="${config.staticWebSite}/img/user/11.jpg" class="img-responsive lazy-img" alt="${item.title?if_exists}">
                                </#if>

--- a/blog-web/src/main/resources/templates/layout/header.ftl
+++ b/blog-web/src/main/resources/templates/layout/header.ftl
@@ -28,8 +28,8 @@
        </div>
        <div id="navbar" class="navbar-collapse collapse">
            <div class="pull-left site-desc" style="line-height: 0.9;">
-                <h1 style="font-size: 20px;font-weight: 700;" class="auto-shake"><a href="${config.siteUrl}" data-original-title="写博客、记日志、闲聊扯淡鼓捣技术" data-toggle="tooltip" data-placement="bottom">${config.siteName}</a></h1>
-                <p class="site-description">写博客、记日志、闲聊扯淡鼓捣技术</p>
+                <h1 style="font-size: 20px;font-weight: 700;" class="auto-shake"><a href="${config.siteUrl}" data-original-title="${config.siteDesc}" data-toggle="tooltip" data-placement="bottom">${config.siteName}</a></h1>
+                <p class="site-description">${config.siteDesc}</p>
            </div>
            <ul class="nav navbar-nav ">
                <li>