From 15ac481aff30defb152e5635924cb40d1f5d9023 Mon Sep 17 00:00:00 2001 From: ruibaby Date: Wed, 7 Nov 2018 10:43:40 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86ui?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/admin_backup.ftl | 18 ++-- .../templates/admin/admin_category.ftl | 62 ++++++------ .../templates/admin/admin_comment.ftl | 18 ++-- .../resources/templates/admin/admin_index.ftl | 30 +++--- .../resources/templates/admin/admin_menu.ftl | 58 ++++++----- .../resources/templates/admin/admin_page.ftl | 96 +++++++++---------- .../templates/admin/admin_page_link.ftl | 14 ++- .../resources/templates/admin/admin_post.ftl | 22 ++--- .../templates/admin/widget/_logs-all.ftl | 6 +- 9 files changed, 150 insertions(+), 174 deletions(-) diff --git a/src/main/resources/templates/admin/admin_backup.ftl b/src/main/resources/templates/admin/admin_backup.ftl index 232bccb9a..25adb725c 100644 --- a/src/main/resources/templates/admin/admin_backup.ftl +++ b/src/main/resources/templates/admin/admin_backup.ftl @@ -69,17 +69,15 @@
- - - - - - - - - - +
<@spring.message code='common.th.file-name' /><@spring.message code='common.th.date' /><@spring.message code='common.th.file-size' /><@spring.message code='common.th.file-type' /><@spring.message code='common.th.control' />
+ + + + + + + <#if backups?size gt 0> <#list backups?sort_by("createAt")?reverse as backup> diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl index d071b1375..6ec544aef 100755 --- a/src/main/resources/templates/admin/admin_category.ftl +++ b/src/main/resources/templates/admin/admin_category.ftl @@ -83,39 +83,37 @@

<@spring.message code='admin.categories.text.all-categories' />

-
<@spring.message code='common.th.file-name' /><@spring.message code='common.th.date' /><@spring.message code='common.th.file-size' /><@spring.message code='common.th.file-type' /><@spring.message code='common.th.control' />
- - - - - - - - - +
<@spring.message code='common.th.name' /><@spring.message code='common.th.url' /><@spring.message code='common.th.desc' /><@spring.message code='common.th.posts-count' /><@spring.message code='common.th.control' />
- <@commonTag method="categories"> - <#if categories?? && categories?size gt 0> - <#list categories as cate> - - - - - - - - - - + + + + + + + + <@commonTag method="categories"> + <#if categories?? && categories?size gt 0> + <#list categories as cate> + + + + + + + + + +
${cate.cateName}${cate.cateUrl}${(cate.cateDesc)!} - ${cate.posts?size} - - <#if updateCategory?? && updateCategory.cateId?c==cate.cateId?c> - <@spring.message code='common.btn.editing' /> - <#else > - <@spring.message code='common.btn.modify' /> - - -
<@spring.message code='common.th.name' /><@spring.message code='common.th.url' /><@spring.message code='common.th.desc' /><@spring.message code='common.th.posts-count' /><@spring.message code='common.th.control' />
${cate.cateName}${cate.cateUrl}${(cate.cateDesc)!} + ${cate.posts?size} + + <#if updateCategory?? && updateCategory.cateId?c==cate.cateId?c> + <@spring.message code='common.btn.editing' /> + <#else > + <@spring.message code='common.btn.modify' /> + + +
diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl index b851a561d..7f76f0d7d 100755 --- a/src/main/resources/templates/admin/admin_comment.ftl +++ b/src/main/resources/templates/admin/admin_comment.ftl @@ -30,17 +30,15 @@
- - - - - - - - - - +
<@spring.message code='common.th.comment-author' /><@spring.message code='common.th.content' /><@spring.message code='common.th.comment-page' /><@spring.message code='common.th.date' /><@spring.message code='common.th.control' />
+ + + + + + + <#if comments.content?size gt 0> <#list comments.content as comment> diff --git a/src/main/resources/templates/admin/admin_index.ftl b/src/main/resources/templates/admin/admin_index.ftl index 2805c286f..4469717fe 100755 --- a/src/main/resources/templates/admin/admin_index.ftl +++ b/src/main/resources/templates/admin/admin_index.ftl @@ -204,15 +204,13 @@
-
<@spring.message code='common.th.comment-author' /><@spring.message code='common.th.content' /><@spring.message code='common.th.comment-page' /><@spring.message code='common.th.date' /><@spring.message code='common.th.control' />
- +
+ - - <#if postTopFive??> <#list postTopFive as post> @@ -254,17 +252,15 @@
-
<@spring.message code='common.th.title' /> <@spring.message code='common.th.status' /> <@spring.message code='common.th.date' />
- - - - - - - - - +
<@spring.message code='common.th.comment-author' /><@spring.message code='common.th.comment-page' /><@spring.message code='common.th.content' /><@spring.message code='common.th.status' /><@spring.message code='common.th.date' />
+ + + + + + + <#if comments??> <#list comments as comment> @@ -334,16 +330,14 @@
-
<@spring.message code='common.th.comment-author' /><@spring.message code='common.th.comment-page' /><@spring.message code='common.th.content' /><@spring.message code='common.th.status' /><@spring.message code='common.th.date' />
- +
+ - - <#if logs??> <#list logs as log> diff --git a/src/main/resources/templates/admin/admin_menu.ftl b/src/main/resources/templates/admin/admin_menu.ftl index 4a35d4ea6..9036de05e 100644 --- a/src/main/resources/templates/admin/admin_menu.ftl +++ b/src/main/resources/templates/admin/admin_menu.ftl @@ -101,37 +101,35 @@

<@spring.message code='admin.menus.text.all-menus' />

-
<@spring.message code='common.th.action' /> <@spring.message code='common.th.result' /> IP <@spring.message code='common.th.date' />
- - - - - - - - - +
<@spring.message code='common.th.name' /><@spring.message code='common.th.url' /><@spring.message code='common.th.sort' /><@spring.message code='common.th.icon' /><@spring.message code='common.th.name' />
- <@commonTag method="menus"> - <#if menus?? && menus?size gt 0> - <#list menus as menu> - - - - - - - - - - + + + + + + + + <@commonTag method="menus"> + <#if menus?? && menus?size gt 0> + <#list menus as menu> + + + + + + + + + +
${menu.menuName}${menu.menuUrl}${(menu.menuSort)!}${menu.menuIcon} - <#if updateMenu?? && menu.menuId?c==updateMenu.menuId?c> - <@spring.message code='common.btn.editing' /> - <#else> - <@spring.message code='common.btn.modify' /> - - -
<@spring.message code='common.th.name' /><@spring.message code='common.th.url' /><@spring.message code='common.th.sort' /><@spring.message code='common.th.icon' /><@spring.message code='common.th.name' />
${menu.menuName}${menu.menuUrl}${(menu.menuSort)!}${menu.menuIcon} + <#if updateMenu?? && menu.menuId?c==updateMenu.menuId?c> + <@spring.message code='common.btn.editing' /> + <#else> + <@spring.message code='common.btn.modify' /> + + +
diff --git a/src/main/resources/templates/admin/admin_page.ftl b/src/main/resources/templates/admin/admin_page.ftl index be76e129e..9d7caa854 100755 --- a/src/main/resources/templates/admin/admin_page.ftl +++ b/src/main/resources/templates/admin/admin_page.ftl @@ -30,39 +30,37 @@
- - - - - - - - +
<@spring.message code='common.th.title' /><@spring.message code='common.th.url' /><@spring.message code='common.th.control' />
- - - - - - - - - - + + + + + + + + + + + + + + +
<@spring.message code='admin.pages.links' />/links - <@spring.message code='common.btn.view' /> - <@spring.message code='common.btn.edit' /> -
<@spring.message code='admin.pages.gallery' />/gallery - <@spring.message code='common.btn.view' /> - <@spring.message code='common.btn.edit' /> -
<@spring.message code='common.th.title' /><@spring.message code='common.th.url' /><@spring.message code='common.th.control' />
<@spring.message code='admin.pages.links' />/links + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> +
<@spring.message code='admin.pages.gallery' />/gallery + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> +
- - +
+ @@ -71,32 +69,30 @@ - - - <#if pages?size gt 0> - <#list pages as page> + <#if pages?size gt 0> + <#list pages as page> + + + + + + + + + + <#else> - - - - - - + - - <#else> - - - - +
<@spring.message code='common.th.title' /> <@spring.message code='common.th.url' /><@spring.message code='common.th.date' /> <@spring.message code='common.th.control' />
${page.postTitle}/p/${page.postUrl} + ${page.comments?size} + + ${page.postViews} + ${page.postDate?string("yyyy-MM-dd HH:mm")} + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> + +
${page.postTitle}/p/${page.postUrl} - ${page.comments?size} - - ${page.postViews} - ${page.postDate?string("yyyy-MM-dd HH:mm")} - <@spring.message code='common.btn.view' /> - <@spring.message code='common.btn.edit' /> - - <@spring.message code='common.text.no-data' />
<@spring.message code='common.text.no-data' />
diff --git a/src/main/resources/templates/admin/admin_page_link.ftl b/src/main/resources/templates/admin/admin_page_link.ftl index 6e3cca8fc..479a83af5 100755 --- a/src/main/resources/templates/admin/admin_page_link.ftl +++ b/src/main/resources/templates/admin/admin_page_link.ftl @@ -82,15 +82,13 @@

<@spring.message code='admin.pages.links.text.all-links' />

- - - - - - - - + + + + + + <@commonTag method="links"> <#if links?? && links?size gt 0> <#list links as link> diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl index d1251e100..c12ca658f 100755 --- a/src/main/resources/templates/admin/admin_post.ftl +++ b/src/main/resources/templates/admin/admin_post.ftl @@ -41,19 +41,17 @@
-
<@spring.message code='common.th.name' /><@spring.message code='common.th.site' /><@spring.message code='common.th.desc' /><@spring.message code='common.th.control' />
<@spring.message code='common.th.name' /><@spring.message code='common.th.site' /><@spring.message code='common.th.desc' /><@spring.message code='common.th.control' />
- - - - - - - - - - - +
<@spring.message code='common.th.title' /><@spring.message code='common.th.categories' /><@spring.message code='common.th.tags' /><@spring.message code='common.th.comments' /><@spring.message code='common.th.views' /><@spring.message code='common.th.date' /><@spring.message code='common.th.control' />
+ + + + + + + + + <#if posts.content?size gt 0> <#list posts.content as post> diff --git a/src/main/resources/templates/admin/widget/_logs-all.ftl b/src/main/resources/templates/admin/widget/_logs-all.ftl index bb5a1cab1..f3cfb990e 100644 --- a/src/main/resources/templates/admin/widget/_logs-all.ftl +++ b/src/main/resources/templates/admin/widget/_logs-all.ftl @@ -12,8 +12,8 @@
-
<@spring.message code='common.th.title' /><@spring.message code='common.th.categories' /><@spring.message code='common.th.tags' /><@spring.message code='common.th.comments' /><@spring.message code='common.th.views' /><@spring.message code='common.th.date' /><@spring.message code='common.th.control' />
- +
+ @@ -21,8 +21,6 @@ - - <#list logs.content as log>
<@spring.message code='admin.logs.th.log-id' /> <@spring.message code='admin.logs.th.log-action' />IP <@spring.message code='admin.logs.th.log-datetime' />
${log.logId}