diff --git a/src/main/java/cc/ryanc/halo/config/WebMvcAutoConfiguration.java b/src/main/java/cc/ryanc/halo/config/WebMvcAutoConfiguration.java index 55e717112..2315d0ee1 100644 --- a/src/main/java/cc/ryanc/halo/config/WebMvcAutoConfiguration.java +++ b/src/main/java/cc/ryanc/halo/config/WebMvcAutoConfiguration.java @@ -98,7 +98,7 @@ public class WebMvcAutoConfiguration implements WebMvcConfigurer { registry.addResourceHandler("/upload/**") .addResourceLocations("file:///" + System.getProperties().getProperty("user.home") + "/halo/upload/"); registry.addResourceHandler("/favicon.ico") - .addResourceLocations("classpath:/static/halo-backend/images/favicon.ico"); + .addResourceLocations("classpath:/static/halo-admin/images/favicon.ico"); registry.addResourceHandler("/backup/**") .addResourceLocations("file:///" + System.getProperties().getProperty("user.home") + "/halo/backup/"); diff --git a/src/main/java/cc/ryanc/halo/model/enums/BlogPropertiesEnum.java b/src/main/java/cc/ryanc/halo/model/enums/BlogPropertiesEnum.java index 4a9176b2e..79bc07083 100644 --- a/src/main/java/cc/ryanc/halo/model/enums/BlogPropertiesEnum.java +++ b/src/main/java/cc/ryanc/halo/model/enums/BlogPropertiesEnum.java @@ -138,7 +138,7 @@ public enum BlogPropertiesEnum { /** * 默认缩略图地址 */ - DEFAULT_THUMBNAIL("/static/halo-frontend/images/thumbnail/thumbnail.png"), + DEFAULT_THUMBNAIL("/static/halo-content/images/thumbnail/thumbnail.png"), /** * 自动备份 diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java index a485ec6ff..0c6d12cbb 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java @@ -260,7 +260,7 @@ public class PageController { post.setPostContent(MarkdownUtils.renderMarkdown(post.getPostContentMd())); //当没有选择文章缩略图的时候,自动分配一张内置的缩略图 if (StrUtil.equals(post.getPostThumbnail(), BlogPropertiesEnum.DEFAULT_THUMBNAIL.getProp())) { - post.setPostThumbnail(OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/static/halo-frontend/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); + post.setPostThumbnail(OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/static/halo-content/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); } postService.create(post); logsService.save(LogsRecord.PUSH_PAGE, post.getPostTitle(), request); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java index ffc9a7ac1..0a5bc3bab 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java @@ -162,7 +162,7 @@ public class PostController extends BaseController { } //当没有选择文章缩略图的时候,自动分配一张内置的缩略图 if (StrUtil.equals(post.getPostThumbnail(), BlogPropertiesEnum.DEFAULT_THUMBNAIL.getProp())) { - post.setPostThumbnail(OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/static/halo-frontend/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); + post.setPostThumbnail(OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/static/halo-content/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); } postService.create(post); logsService.save(LogsRecord.PUSH_POST, post.getPostTitle(), request); @@ -200,7 +200,7 @@ public class PostController extends BaseController { } //当没有选择文章缩略图的时候,自动分配一张内置的缩略图 if (StrUtil.equals(post.getPostThumbnail(), BlogPropertiesEnum.DEFAULT_THUMBNAIL.getProp())) { - post.setPostThumbnail(OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/static/halo-frontend/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); + post.setPostThumbnail(OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/static/halo-content/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); } post = postService.create(post); if (null != post) { diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java index 44be65ed6..8339fffab 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java @@ -142,7 +142,7 @@ public class InstallController { post.setUser(user); post.setCategories(categories); post.setAllowComment(AllowCommentEnum.ALLOW.getCode()); - post.setPostThumbnail("/static/halo-frontend/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); + post.setPostThumbnail("/static/halo-content/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 11) + ".jpg"); postService.create(post); //第一个评论 diff --git a/src/main/resources/static/halo-backend/css/AdminLTE.css b/src/main/resources/static/halo-admin/css/AdminLTE.css similarity index 100% rename from src/main/resources/static/halo-backend/css/AdminLTE.css rename to src/main/resources/static/halo-admin/css/AdminLTE.css diff --git a/src/main/resources/static/halo-backend/css/AdminLTE.min.css b/src/main/resources/static/halo-admin/css/AdminLTE.min.css similarity index 100% rename from src/main/resources/static/halo-backend/css/AdminLTE.min.css rename to src/main/resources/static/halo-admin/css/AdminLTE.min.css diff --git a/src/main/resources/static/halo-backend/css/skins/_all-skins.css b/src/main/resources/static/halo-admin/css/skins/_all-skins.css similarity index 100% rename from src/main/resources/static/halo-backend/css/skins/_all-skins.css rename to src/main/resources/static/halo-admin/css/skins/_all-skins.css diff --git a/src/main/resources/static/halo-backend/css/skins/_all-skins.min.css b/src/main/resources/static/halo-admin/css/skins/_all-skins.min.css similarity index 100% rename from src/main/resources/static/halo-backend/css/skins/_all-skins.min.css rename to src/main/resources/static/halo-admin/css/skins/_all-skins.min.css diff --git a/src/main/resources/static/halo-backend/css/style.css b/src/main/resources/static/halo-admin/css/style.css similarity index 100% rename from src/main/resources/static/halo-backend/css/style.css rename to src/main/resources/static/halo-admin/css/style.css diff --git a/src/main/resources/static/halo-backend/css/style.min.css b/src/main/resources/static/halo-admin/css/style.min.css similarity index 100% rename from src/main/resources/static/halo-backend/css/style.min.css rename to src/main/resources/static/halo-admin/css/style.min.css diff --git a/src/main/resources/static/halo-backend/images/boxed-bg.jpg b/src/main/resources/static/halo-admin/images/boxed-bg.jpg similarity index 100% rename from src/main/resources/static/halo-backend/images/boxed-bg.jpg rename to src/main/resources/static/halo-admin/images/boxed-bg.jpg diff --git a/src/main/resources/static/halo-backend/images/boxed-bg.png b/src/main/resources/static/halo-admin/images/boxed-bg.png similarity index 100% rename from src/main/resources/static/halo-backend/images/boxed-bg.png rename to src/main/resources/static/halo-admin/images/boxed-bg.png diff --git a/src/main/resources/static/halo-backend/images/default.png b/src/main/resources/static/halo-admin/images/default.png similarity index 100% rename from src/main/resources/static/halo-backend/images/default.png rename to src/main/resources/static/halo-admin/images/default.png diff --git a/src/main/resources/static/halo-backend/images/favicon.ico b/src/main/resources/static/halo-admin/images/favicon.ico similarity index 100% rename from src/main/resources/static/halo-backend/images/favicon.ico rename to src/main/resources/static/halo-admin/images/favicon.ico diff --git a/src/main/resources/static/halo-backend/js/adminlte.js b/src/main/resources/static/halo-admin/js/adminlte.js similarity index 100% rename from src/main/resources/static/halo-backend/js/adminlte.js rename to src/main/resources/static/halo-admin/js/adminlte.js diff --git a/src/main/resources/static/halo-backend/js/adminlte.min.js b/src/main/resources/static/halo-admin/js/adminlte.min.js similarity index 100% rename from src/main/resources/static/halo-backend/js/adminlte.min.js rename to src/main/resources/static/halo-admin/js/adminlte.min.js diff --git a/src/main/resources/static/halo-backend/js/halo.js b/src/main/resources/static/halo-admin/js/halo.js similarity index 100% rename from src/main/resources/static/halo-backend/js/halo.js rename to src/main/resources/static/halo-admin/js/halo.js diff --git a/src/main/resources/static/halo-backend/js/halo.min.js b/src/main/resources/static/halo-admin/js/halo.min.js similarity index 100% rename from src/main/resources/static/halo-backend/js/halo.min.js rename to src/main/resources/static/halo-admin/js/halo.min.js diff --git a/src/main/resources/static/halo-backend/js/login.js b/src/main/resources/static/halo-admin/js/login.js similarity index 100% rename from src/main/resources/static/halo-backend/js/login.js rename to src/main/resources/static/halo-admin/js/login.js diff --git a/src/main/resources/static/halo-backend/js/login.min.js b/src/main/resources/static/halo-admin/js/login.min.js similarity index 100% rename from src/main/resources/static/halo-backend/js/login.min.js rename to src/main/resources/static/halo-admin/js/login.min.js diff --git a/src/main/resources/static/halo-backend/plugins/animate/animate.min.css b/src/main/resources/static/halo-admin/plugins/animate/animate.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/animate/animate.min.css rename to src/main/resources/static/halo-admin/plugins/animate/animate.min.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.css b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.css rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.css.map b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.css.map rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.css.map diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.min.css b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.min.css rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.min.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.min.css.map b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.min.css.map similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap-theme.min.css.map rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap-theme.min.css.map diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.css b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.css rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.css.map b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.css.map similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.css.map rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.css.map diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.min.css b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.min.css rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.min.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.min.css.map b/src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/css/bootstrap.min.css.map rename to src/main/resources/static/halo-admin/plugins/bootstrap/css/bootstrap.min.css.map diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot b/src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot rename to src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg b/src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg rename to src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf b/src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff b/src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff rename to src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to src/main/resources/static/halo-admin/plugins/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/js/bootstrap.js b/src/main/resources/static/halo-admin/plugins/bootstrap/js/bootstrap.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/js/bootstrap.js rename to src/main/resources/static/halo-admin/plugins/bootstrap/js/bootstrap.js diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/js/bootstrap.min.js b/src/main/resources/static/halo-admin/plugins/bootstrap/js/bootstrap.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/js/bootstrap.min.js rename to src/main/resources/static/halo-admin/plugins/bootstrap/js/bootstrap.min.js diff --git a/src/main/resources/static/halo-backend/plugins/bootstrap/js/npm.js b/src/main/resources/static/halo-admin/plugins/bootstrap/js/npm.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrap/js/npm.js rename to src/main/resources/static/halo-admin/plugins/bootstrap/js/npm.js diff --git a/src/main/resources/static/halo-backend/plugins/bootstrapvalidator/css/bootstrapValidator.css b/src/main/resources/static/halo-admin/plugins/bootstrapvalidator/css/bootstrapValidator.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrapvalidator/css/bootstrapValidator.css rename to src/main/resources/static/halo-admin/plugins/bootstrapvalidator/css/bootstrapValidator.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrapvalidator/css/bootstrapValidator.min.css b/src/main/resources/static/halo-admin/plugins/bootstrapvalidator/css/bootstrapValidator.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrapvalidator/css/bootstrapValidator.min.css rename to src/main/resources/static/halo-admin/plugins/bootstrapvalidator/css/bootstrapValidator.min.css diff --git a/src/main/resources/static/halo-backend/plugins/bootstrapvalidator/js/bootstrapValidator.js b/src/main/resources/static/halo-admin/plugins/bootstrapvalidator/js/bootstrapValidator.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrapvalidator/js/bootstrapValidator.js rename to src/main/resources/static/halo-admin/plugins/bootstrapvalidator/js/bootstrapValidator.js diff --git a/src/main/resources/static/halo-backend/plugins/bootstrapvalidator/js/bootstrapValidator.min.js b/src/main/resources/static/halo-admin/plugins/bootstrapvalidator/js/bootstrapValidator.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrapvalidator/js/bootstrapValidator.min.js rename to src/main/resources/static/halo-admin/plugins/bootstrapvalidator/js/bootstrapValidator.min.js diff --git a/src/main/resources/static/halo-backend/plugins/bootstrapvalidator/js/language/zh_CN.js b/src/main/resources/static/halo-admin/plugins/bootstrapvalidator/js/language/zh_CN.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/bootstrapvalidator/js/language/zh_CN.js rename to src/main/resources/static/halo-admin/plugins/bootstrapvalidator/js/language/zh_CN.js diff --git a/src/main/resources/static/halo-backend/plugins/clipboard/clipboard.min.js b/src/main/resources/static/halo-admin/plugins/clipboard/clipboard.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/clipboard/clipboard.min.js rename to src/main/resources/static/halo-admin/plugins/clipboard/clipboard.min.js diff --git a/src/main/resources/static/halo-backend/plugins/datetimepicker/css/bootstrap-datetimepicker.css b/src/main/resources/static/halo-admin/plugins/datetimepicker/css/bootstrap-datetimepicker.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/datetimepicker/css/bootstrap-datetimepicker.css rename to src/main/resources/static/halo-admin/plugins/datetimepicker/css/bootstrap-datetimepicker.css diff --git a/src/main/resources/static/halo-backend/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css b/src/main/resources/static/halo-admin/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css rename to src/main/resources/static/halo-admin/plugins/datetimepicker/css/bootstrap-datetimepicker.min.css diff --git a/src/main/resources/static/halo-backend/plugins/datetimepicker/js/bootstrap-datetimepicker.js b/src/main/resources/static/halo-admin/plugins/datetimepicker/js/bootstrap-datetimepicker.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/datetimepicker/js/bootstrap-datetimepicker.js rename to src/main/resources/static/halo-admin/plugins/datetimepicker/js/bootstrap-datetimepicker.js diff --git a/src/main/resources/static/halo-backend/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js b/src/main/resources/static/halo-admin/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js rename to src/main/resources/static/halo-admin/plugins/datetimepicker/js/bootstrap-datetimepicker.min.js diff --git a/src/main/resources/static/halo-backend/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js b/src/main/resources/static/halo-admin/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js rename to src/main/resources/static/halo-admin/plugins/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js diff --git a/src/main/resources/static/halo-backend/plugins/easymde/easymde.min.css b/src/main/resources/static/halo-admin/plugins/easymde/easymde.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/easymde/easymde.min.css rename to src/main/resources/static/halo-admin/plugins/easymde/easymde.min.css diff --git a/src/main/resources/static/halo-backend/plugins/easymde/easymde.min.js b/src/main/resources/static/halo-admin/plugins/easymde/easymde.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/easymde/easymde.min.js rename to src/main/resources/static/halo-admin/plugins/easymde/easymde.min.js diff --git a/src/main/resources/static/halo-backend/plugins/fileinput/fileinput.min.css b/src/main/resources/static/halo-admin/plugins/fileinput/fileinput.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/fileinput/fileinput.min.css rename to src/main/resources/static/halo-admin/plugins/fileinput/fileinput.min.css diff --git a/src/main/resources/static/halo-backend/plugins/fileinput/fileinput.min.js b/src/main/resources/static/halo-admin/plugins/fileinput/fileinput.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/fileinput/fileinput.min.js rename to src/main/resources/static/halo-admin/plugins/fileinput/fileinput.min.js diff --git a/src/main/resources/static/halo-backend/plugins/fileinput/loading-sm.gif b/src/main/resources/static/halo-admin/plugins/fileinput/loading-sm.gif similarity index 100% rename from src/main/resources/static/halo-backend/plugins/fileinput/loading-sm.gif rename to src/main/resources/static/halo-admin/plugins/fileinput/loading-sm.gif diff --git a/src/main/resources/static/halo-backend/plugins/fileinput/loading.gif b/src/main/resources/static/halo-admin/plugins/fileinput/loading.gif similarity index 100% rename from src/main/resources/static/halo-backend/plugins/fileinput/loading.gif rename to src/main/resources/static/halo-admin/plugins/fileinput/loading.gif diff --git a/src/main/resources/static/halo-backend/plugins/fileinput/zh.min.js b/src/main/resources/static/halo-admin/plugins/fileinput/zh.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/fileinput/zh.min.js rename to src/main/resources/static/halo-admin/plugins/fileinput/zh.min.js diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/css/font-awesome.css b/src/main/resources/static/halo-admin/plugins/font-awesome/css/font-awesome.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/css/font-awesome.css rename to src/main/resources/static/halo-admin/plugins/font-awesome/css/font-awesome.css diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/css/font-awesome.css.map b/src/main/resources/static/halo-admin/plugins/font-awesome/css/font-awesome.css.map similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/css/font-awesome.css.map rename to src/main/resources/static/halo-admin/plugins/font-awesome/css/font-awesome.css.map diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/css/font-awesome.min.css b/src/main/resources/static/halo-admin/plugins/font-awesome/css/font-awesome.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/css/font-awesome.min.css rename to src/main/resources/static/halo-admin/plugins/font-awesome/css/font-awesome.min.css diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/fonts/FontAwesome.otf b/src/main/resources/static/halo-admin/plugins/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/fonts/FontAwesome.otf rename to src/main/resources/static/halo-admin/plugins/font-awesome/fonts/FontAwesome.otf diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.eot b/src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.eot rename to src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.eot diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.svg b/src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.svg rename to src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.svg diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.ttf b/src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.ttf rename to src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.woff b/src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.woff rename to src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.woff diff --git a/src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.woff2 b/src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from src/main/resources/static/halo-backend/plugins/font-awesome/fonts/fontawesome-webfont.woff2 rename to src/main/resources/static/halo-admin/plugins/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/src/main/resources/static/halo-backend/plugins/inline-attachment/codemirror-4.inline-attachment.min.js b/src/main/resources/static/halo-admin/plugins/inline-attachment/codemirror-4.inline-attachment.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/inline-attachment/codemirror-4.inline-attachment.min.js rename to src/main/resources/static/halo-admin/plugins/inline-attachment/codemirror-4.inline-attachment.min.js diff --git a/src/main/resources/static/halo-backend/plugins/jquery-tageditor/jquery.tag-editor.css b/src/main/resources/static/halo-admin/plugins/jquery-tageditor/jquery.tag-editor.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/jquery-tageditor/jquery.tag-editor.css rename to src/main/resources/static/halo-admin/plugins/jquery-tageditor/jquery.tag-editor.css diff --git a/src/main/resources/static/halo-backend/plugins/jquery-tageditor/jquery.tag-editor.js b/src/main/resources/static/halo-admin/plugins/jquery-tageditor/jquery.tag-editor.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/jquery-tageditor/jquery.tag-editor.js rename to src/main/resources/static/halo-admin/plugins/jquery-tageditor/jquery.tag-editor.js diff --git a/src/main/resources/static/halo-backend/plugins/jquery-tageditor/jquery.tag-editor.min.js b/src/main/resources/static/halo-admin/plugins/jquery-tageditor/jquery.tag-editor.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/jquery-tageditor/jquery.tag-editor.min.js rename to src/main/resources/static/halo-admin/plugins/jquery-tageditor/jquery.tag-editor.min.js diff --git a/src/main/resources/static/halo-backend/plugins/layer/layer.js b/src/main/resources/static/halo-admin/plugins/layer/layer.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/layer.js rename to src/main/resources/static/halo-admin/plugins/layer/layer.js diff --git a/src/main/resources/static/halo-backend/plugins/layer/theme/default/icon-ext.png b/src/main/resources/static/halo-admin/plugins/layer/theme/default/icon-ext.png similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/theme/default/icon-ext.png rename to src/main/resources/static/halo-admin/plugins/layer/theme/default/icon-ext.png diff --git a/src/main/resources/static/halo-backend/plugins/layer/theme/default/icon.png b/src/main/resources/static/halo-admin/plugins/layer/theme/default/icon.png similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/theme/default/icon.png rename to src/main/resources/static/halo-admin/plugins/layer/theme/default/icon.png diff --git a/src/main/resources/static/halo-backend/plugins/layer/theme/default/layer.css b/src/main/resources/static/halo-admin/plugins/layer/theme/default/layer.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/theme/default/layer.css rename to src/main/resources/static/halo-admin/plugins/layer/theme/default/layer.css diff --git a/src/main/resources/static/halo-backend/plugins/layer/theme/default/loading-0.gif b/src/main/resources/static/halo-admin/plugins/layer/theme/default/loading-0.gif similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/theme/default/loading-0.gif rename to src/main/resources/static/halo-admin/plugins/layer/theme/default/loading-0.gif diff --git a/src/main/resources/static/halo-backend/plugins/layer/theme/default/loading-1.gif b/src/main/resources/static/halo-admin/plugins/layer/theme/default/loading-1.gif similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/theme/default/loading-1.gif rename to src/main/resources/static/halo-admin/plugins/layer/theme/default/loading-1.gif diff --git a/src/main/resources/static/halo-backend/plugins/layer/theme/default/loading-2.gif b/src/main/resources/static/halo-admin/plugins/layer/theme/default/loading-2.gif similarity index 100% rename from src/main/resources/static/halo-backend/plugins/layer/theme/default/loading-2.gif rename to src/main/resources/static/halo-admin/plugins/layer/theme/default/loading-2.gif diff --git a/src/main/resources/static/halo-backend/plugins/pace/pace.css b/src/main/resources/static/halo-admin/plugins/pace/pace.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pace/pace.css rename to src/main/resources/static/halo-admin/plugins/pace/pace.css diff --git a/src/main/resources/static/halo-backend/plugins/pace/pace.js b/src/main/resources/static/halo-admin/plugins/pace/pace.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pace/pace.js rename to src/main/resources/static/halo-admin/plugins/pace/pace.js diff --git a/src/main/resources/static/halo-backend/plugins/pace/pace.min.css b/src/main/resources/static/halo-admin/plugins/pace/pace.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pace/pace.min.css rename to src/main/resources/static/halo-admin/plugins/pace/pace.min.css diff --git a/src/main/resources/static/halo-backend/plugins/pace/pace.min.js b/src/main/resources/static/halo-admin/plugins/pace/pace.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pace/pace.min.js rename to src/main/resources/static/halo-admin/plugins/pace/pace.min.js diff --git a/src/main/resources/static/halo-backend/plugins/pjax/pjax.min.js b/src/main/resources/static/halo-admin/plugins/pjax/pjax.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pjax/pjax.min.js rename to src/main/resources/static/halo-admin/plugins/pjax/pjax.min.js diff --git a/src/main/resources/static/halo-backend/plugins/pretty-checkbox/maps/pretty-checkbox.css.map b/src/main/resources/static/halo-admin/plugins/pretty-checkbox/maps/pretty-checkbox.css.map similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pretty-checkbox/maps/pretty-checkbox.css.map rename to src/main/resources/static/halo-admin/plugins/pretty-checkbox/maps/pretty-checkbox.css.map diff --git a/src/main/resources/static/halo-backend/plugins/pretty-checkbox/pretty-checkbox.css b/src/main/resources/static/halo-admin/plugins/pretty-checkbox/pretty-checkbox.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pretty-checkbox/pretty-checkbox.css rename to src/main/resources/static/halo-admin/plugins/pretty-checkbox/pretty-checkbox.css diff --git a/src/main/resources/static/halo-backend/plugins/pretty-checkbox/pretty-checkbox.min.css b/src/main/resources/static/halo-admin/plugins/pretty-checkbox/pretty-checkbox.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/pretty-checkbox/pretty-checkbox.min.css rename to src/main/resources/static/halo-admin/plugins/pretty-checkbox/pretty-checkbox.min.css diff --git a/src/main/resources/static/halo-backend/plugins/toast/css/jquery.toast.min.css b/src/main/resources/static/halo-admin/plugins/toast/css/jquery.toast.min.css similarity index 100% rename from src/main/resources/static/halo-backend/plugins/toast/css/jquery.toast.min.css rename to src/main/resources/static/halo-admin/plugins/toast/css/jquery.toast.min.css diff --git a/src/main/resources/static/halo-backend/plugins/toast/js/jquery.toast.min.js b/src/main/resources/static/halo-admin/plugins/toast/js/jquery.toast.min.js similarity index 100% rename from src/main/resources/static/halo-backend/plugins/toast/js/jquery.toast.min.js rename to src/main/resources/static/halo-admin/plugins/toast/js/jquery.toast.min.js diff --git a/src/main/resources/static/halo-frontend/css/comment.css b/src/main/resources/static/halo-content/css/comment.css similarity index 100% rename from src/main/resources/static/halo-frontend/css/comment.css rename to src/main/resources/static/halo-content/css/comment.css diff --git a/src/main/resources/static/halo-frontend/css/comment.min.css b/src/main/resources/static/halo-content/css/comment.min.css similarity index 100% rename from src/main/resources/static/halo-frontend/css/comment.min.css rename to src/main/resources/static/halo-content/css/comment.min.css diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-1.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-1.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-1.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-1.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-10.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-10.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-10.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-10.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-2.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-2.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-2.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-2.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-3.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-3.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-3.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-3.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-4.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-4.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-4.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-4.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-5.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-5.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-5.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-5.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-6.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-6.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-6.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-6.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-7.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-7.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-7.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-7.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-8.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-8.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-8.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-8.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-9.jpg b/src/main/resources/static/halo-content/images/thumbnail/thumbnail-9.jpg similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail-9.jpg rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail-9.jpg diff --git a/src/main/resources/static/halo-frontend/images/thumbnail/thumbnail.png b/src/main/resources/static/halo-content/images/thumbnail/thumbnail.png similarity index 100% rename from src/main/resources/static/halo-frontend/images/thumbnail/thumbnail.png rename to src/main/resources/static/halo-content/images/thumbnail/thumbnail.png diff --git a/src/main/resources/static/halo-frontend/js/comment.js b/src/main/resources/static/halo-content/js/comment.js similarity index 100% rename from src/main/resources/static/halo-frontend/js/comment.js rename to src/main/resources/static/halo-content/js/comment.js diff --git a/src/main/resources/static/halo-frontend/js/comment.min.js b/src/main/resources/static/halo-content/js/comment.min.js similarity index 100% rename from src/main/resources/static/halo-frontend/js/comment.min.js rename to src/main/resources/static/halo-content/js/comment.min.js diff --git a/src/main/resources/static/halo-frontend/plugins/activate-power-mode/activate-power-mode.js b/src/main/resources/static/halo-content/plugins/activate-power-mode/activate-power-mode.js similarity index 100% rename from src/main/resources/static/halo-frontend/plugins/activate-power-mode/activate-power-mode.js rename to src/main/resources/static/halo-content/plugins/activate-power-mode/activate-power-mode.js diff --git a/src/main/resources/static/halo-frontend/plugins/md5/md5.min.js b/src/main/resources/static/halo-content/plugins/md5/md5.min.js similarity index 100% rename from src/main/resources/static/halo-frontend/plugins/md5/md5.min.js rename to src/main/resources/static/halo-content/plugins/md5/md5.min.js diff --git a/src/main/resources/static/halo-frontend/plugins/ua-parser/ua-parser.min.js b/src/main/resources/static/halo-content/plugins/ua-parser/ua-parser.min.js similarity index 100% rename from src/main/resources/static/halo-frontend/plugins/ua-parser/ua-parser.min.js rename to src/main/resources/static/halo-content/plugins/ua-parser/ua-parser.min.js diff --git a/src/main/resources/templates/admin/admin_attachment.ftl b/src/main/resources/templates/admin/admin_attachment.ftl index b9b4be376..e69e3c71b 100755 --- a/src/main/resources/templates/admin/admin_attachment.ftl +++ b/src/main/resources/templates/admin/admin_attachment.ftl @@ -2,7 +2,7 @@ <#include "module/_macro.ftl"> <@head>${options.blog_title!} | <@spring.message code='admin.attachments.title' />@head>