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

🐛 修复网站名为空时，页面的异常

pull/37/head
ruibaby 2018-10-12 20:55:55 +08:00
parent 8e7e851dec
commit b75c3a4fc6
20 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/templates/admin/admin_attachment.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.attachments.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.attachments.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_backup.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.backup.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.backup.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_category.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.categories.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.categories.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_comment.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.comments.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.comments.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

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

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.index.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.index.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_login.ftl
View File

@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<title>${options.blog_title} | <@spring.message code='login.page.title' /></title>
<title>${options.blog_title!} | <@spring.message code='login.page.title' /></title>
<link rel="stylesheet" href="/static/plugins/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/plugins/animate/animate.min.css">
<link rel="stylesheet" href="/static/plugins/toast/css/jquery.toast.min.css">

2
src/main/resources/templates/admin/admin_menu.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.menus.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.menus.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

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

@ -1,5 +1,5 @@
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.setting.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.setting.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_page.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.pages.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.pages.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_page_gallery.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.pages.galleries.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.pages.galleries.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_page_link.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.pages.links.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.pages.links.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

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

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.pages.edit.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.pages.edit.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_post.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.posts.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.posts.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

4
src/main/resources/templates/admin/admin_post_md_editor.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.posts.edit.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.posts.edit.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">
@ -47,7 +47,7 @@
<div style="display: block;margin-bottom: 10px;">
<span>
<@spring.message code='admin.editor.form.url' />
<a href="#">${options.blog_url}/archives/<span id="postUrl"><#if post??>${post.postUrl}</#if></span>/</a>
<a href="#">${options.blog_url!}/archives/<span id="postUrl"><#if post??>${post.postUrl}</#if></span>/</a>
<button class="btn btn-default btn-sm " id="btn_input_postUrl"><@spring.message code='common.btn.edit' /></button>
<button class="btn btn-default btn-sm " id="btn_change_postUrl" onclick="urlOnBlurAuto()" style="display: none;"><@spring.message code='common.btn.define' /></button>
</span>

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

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.user.profile.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.user.profile.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

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

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.tags.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.tags.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_theme-editor.ftl
View File

@ -1,5 +1,5 @@
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.themes.edit.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.themes.edit.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/admin/admin_theme.ftl
View File

@ -1,6 +1,6 @@
<#compress >
<#include "module/_macro.ftl">
<@head>${options.blog_title} | <@spring.message code='admin.themes.title' /></@head>
<@head>${options.blog_title!} | <@spring.message code='admin.themes.title' /></@head>
<div class="wrapper">
<!-- 顶部栏模块 -->
<#include "module/_header.ftl">

2
src/main/resources/templates/common/error/500.ftl
View File

@ -35,7 +35,7 @@
</div>
<div class="footer">
<span>Copyright © 2018</span>
<a href="${options.blog_title}">${options.blog_title?default('Halo')}</a>
<a href="${options.blog_title!}">${options.blog_title?default('Halo')}</a>
<span style="float: right">
Background image from <a href="https://cn.bing.com/" target="_blank">Bing</a>.
</span>

2
src/main/resources/templates/themes/material/_partial/post-info-share.ftl
View File

@ -50,7 +50,7 @@
<!-- Share QQ -->
<#if options.theme_material_sns_share_qq?if_exists=='true'>
<a class="post_share-link" href="http://connect.qq.com/widget/shareqq/index.html?site=${options.blog_title}&title=${post.postTitle}&summary=${post.postSummary?if_exists}&pics=&url=${options.blog_url}/archives/${post.postUrl}" target="_blank">
<a class="post_share-link" href="http://connect.qq.com/widget/shareqq/index.html?site=${options.blog_title!}&title=${post.postTitle}&summary=${post.postSummary?if_exists}&pics=&url=${options.blog_url}/archives/${post.postUrl}" target="_blank">
<li class="mdl-menu__item">
分享到QQ
</li>