github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix some page problem

pull/137/head
ruibaby 2019-03-15 11:55:33 +08:00
parent c159353b68
commit 3ff6dcecb4
11 changed files with 292 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pom.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>cc.ryanc</groupId>
@ -8,7 +8,7 @@
<name>halo</name>
<!-- 虽然Halo使用了宽松的GPL协议，但开发不易，希望您可以保留一下版权声明。笔芯~ -->
<description>
halo，一个基于SpringBoot的博客系统，最求轻快，易用，以内容为中心。
Halo，一个基于 SpringBoot 的博客系统，最求轻快，易用，以内容为中心。
</description>
<organization>
@ -33,7 +33,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.1.3.RELEASE</version>
<relativePath/>
</parent>
@ -88,14 +88,14 @@
<optional>true</optional>
</dependency>
<!-- mysql-->
<!-- MySQL Driver-->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<!-- H2Database -->
<!-- H2Database Driver -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@ -107,13 +107,13 @@
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<!-- freemarker依赖 -->
<!-- Freemarker -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<!-- 邮件 -->
<!-- Oh My Email -->
<dependency>
<groupId>io.github.biezhi</groupId>
<artifactId>oh-my-email</artifactId>
@ -134,7 +134,7 @@
<artifactId>ehcache</artifactId>
</dependency>
<!-- hutool工具包 -->
<!-- Hutool tool pack -->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
@ -156,14 +156,14 @@
<version>${hutool.version}</version>
</dependency>
<!-- 又拍云SDK -->
<!-- Upyun SDK -->
<dependency>
<groupId>com.upyun</groupId>
<artifactId>java-sdk</artifactId>
<version>${upyun-java-sdk.version}</version>
</dependency>
<!-- 七牛云SDK -->
<!-- Qiniu SDK -->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
@ -176,14 +176,14 @@
</exclusions>
</dependency>
<!-- 图片操作 -->
<!-- Thumbnailator -->
<dependency>
<groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId>
<version>${thumbnailator.version}</version>
</dependency>
<!-- Markdown渲染 -->
<!-- Markdown render kit -->
<dependency>
<groupId>com.atlassian.commonmark</groupId>
<artifactId>commonmark</artifactId>

1
src/main/resources/i18n/messages.properties
View File

@ -77,7 +77,6 @@ admin.index.widgets.text.all-logs = 所有日志
admin.index.blog-data.title = 博客数据
admin.index.blog-data.days-count-before = 已经运行
admin.index.blog-data.days-count-after = 天了。
admin.index.blog-data.motto = 加油！不要因为走的太远，而忘了当初为什么出发。
admin.index.blog-data.during = 在此期间：
admin.index.blog-data.posts-count-before = 累计发表了
admin.index.blog-data.posts-count-after = 篇文章。

1
src/main/resources/i18n/messages_en_US.properties
View File

@ -77,7 +77,6 @@ admin.index.widgets.text.all-logs = All logs
admin.index.blog-data.title = Blog data
admin.index.blog-data.days-count-before = Has been running for 5 days
admin.index.blog-data.days-count-after = days.
admin.index.blog-data.motto = Come on! Don’t forget why you left because you’re too far away.
admin.index.blog-data.during = During this period:
admin.index.blog-data.posts-count-before = Accumulated
admin.index.blog-data.posts-count-after = articles.

1
src/main/resources/i18n/messages_zh_CN.properties
View File

@ -77,7 +77,6 @@ admin.index.widgets.text.all-logs = 所有日志
admin.index.blog-data.title = 博客数据
admin.index.blog-data.days-count-before = 已经运行
admin.index.blog-data.days-count-after = 天了。
admin.index.blog-data.motto = 加油！不要因为走的太远，而忘了当初为什么出发。
admin.index.blog-data.during = 在此期间：
admin.index.blog-data.posts-count-before = 累计发表了
admin.index.blog-data.posts-count-after = 篇文章。

8
src/main/resources/static/halo-admin/css/style.css
View File

@ -199,3 +199,11 @@
.subbutton a.current {
color: #000;
}
/**
TODO 默认皮肤
*/
.skin-default{
}

16
src/main/resources/templates/admin/admin_index.ftl
View File

@ -356,14 +356,14 @@
<h4 class="modal-title" id="blog-data"><@spring.message code='admin.index.blog-data.title' /></h4>
</div>
<div class="modal-body">
<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay">${hadDays!}</span><@spring.message code='admin.index.blog-data.days-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.during' /></p>
<p><@spring.message code='admin.index.blog-data.posts-count-before' />&nbsp;${postsCount!0}&nbsp;<@spring.message code='admin.index.blog-data.posts-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.tags-count-before' />&nbsp;<@commonTag method="tags">${tags?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.tags-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.comments-count-before' />&nbsp;${commentsCount!}&nbsp;<@spring.message code='admin.index.blog-data.comments-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.links-count-before' />&nbsp;<@commonTag method="links">${links?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.links-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.views-count-before' />&nbsp;${postViewsSum!0}&nbsp;<@spring.message code='admin.index.blog-data.views-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.motto' /></p>
<#--<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay">${hadDays!}</span><@spring.message code='admin.index.blog-data.days-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.during' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.posts-count-before' />&nbsp;${postsCount!0}&nbsp;<@spring.message code='admin.index.blog-data.posts-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.tags-count-before' />&nbsp;<@commonTag method="tags">${tags?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.tags-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.comments-count-before' />&nbsp;${commentsCount!}&nbsp;<@spring.message code='admin.index.blog-data.comments-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.links-count-before' />&nbsp;<@commonTag method="links">${links?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.links-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.views-count-before' />&nbsp;${postViewsSum!0}&nbsp;<@spring.message code='admin.index.blog-data.views-count-after' /></p>-->
开发中...
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal"><@spring.message code='common.btn.define' /></button>

3
src/main/resources/templates/admin/admin_option.ftl
View File

@ -14,7 +14,8 @@
<ol class="breadcrumb">
<li>
<a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
</a>
</li>
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.setting.bread.setting' /></a></li>
<li class="active"><@spring.message code='admin.setting.title' /></li>

7
src/main/resources/templates/admin/admin_page_md_editor.ftl
View File

@ -4,13 +4,6 @@
<div class="content-wrapper">
<link rel="stylesheet" href="/static/halo-admin/plugins/easymde/easymde.min.css">
<link rel="stylesheet" href="/static/halo-admin/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css">
<style type="text/css">
#postTitle{font-weight: 400;}
.CodeMirror .cm-spell-error:not(.cm-url):not(.cm-comment):not(.cm-tag):not(.cm-word) {background: none;}
.CodeMirror-fullscreen,.editor-toolbar.fullscreen{z-index: 1030;}
.CodeMirror, .CodeMirror-scroll {min-height: 480px;}
.editor-preview-active img,.editor-preview-active-side img{width: 100%;}
</style>
<section class="content-header" id="animated-header">
<h1 style="display: inline-block;">
<@spring.message code='admin.pages.edit.title' />

5
src/main/resources/templates/admin/admin_profile.ftl
View File

@ -9,8 +9,9 @@
</h1>
<ol class="breadcrumb">
<li>
<a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
<a data-pjax="true" href="/admin/">
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
</a>
</li>
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.user.profile.bread.user' /></a></li>
<li class="active"><@spring.message code='admin.user.profile.title' /></li>

3
src/main/resources/templates/admin/admin_tag.ftl
View File

@ -13,7 +13,8 @@
<ol class="breadcrumb">
<li>
<a data-pjax="true" href="javascript:void(0)">
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
</a>
</li>
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.posts.title' /></a></li>
<li class="active"><@spring.message code='admin.tags.title' /></li>

5
src/main/resources/templates/admin/admin_tools.ftl
View File

@ -6,8 +6,9 @@
<h1 style="display: inline-block;"><@spring.message code='admin.tools.title' /></h1>
<ol class="breadcrumb">
<li>
<a data-pjax="true" href="/admin">
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' /></a>
<a data-pjax="true" href="/admin/">
<i class="fa fa-dashboard"></i> <@spring.message code='admin.index.bread.index' />
</a>
</li>
<li><a data-pjax="true" href="javascript:void(0)"><@spring.message code='admin.setting.bread.setting' /></a></li>
<li class="active"><@spring.message code='admin.tools.title' /></li>