فهرست منبع

Remove confirmation pages

Kaoru FUZITA 9 سال پیش
والد
کامیت
e732a50f70
100فایلهای تغییر یافته به همراه2389 افزوده شده و 6899 حذف شده
  1. 1 1
      src/main/java/org/codelibs/fess/app/web/CrudMode.java
  2. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java
  3. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java
  4. 29 115
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java
  5. 28 89
      src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java
  6. 37 81
      src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java
  7. 28 115
      src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java
  8. 29 109
      src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java
  9. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java
  10. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java
  11. 29 95
      src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java
  12. 29 109
      src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java
  13. 0 3
      src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java
  14. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java
  15. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java
  16. 28 115
      src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java
  17. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java
  18. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java
  19. 30 92
      src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java
  20. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java
  21. 28 94
      src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java
  22. 28 121
      src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
  23. 28 115
      src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java
  24. 29 109
      src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java
  25. 46 46
      src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java
  26. 10 2
      src/main/resources/fess_label.properties
  27. 0 177
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp
  28. 87 0
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/details.jsp
  29. 6 68
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp
  30. 28 75
      src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp
  31. 1 20
      src/main/webapp/WEB-INF/view/admin/crawlingsession/details.jsp
  32. 1 4
      src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp
  33. 7 99
      src/main/webapp/WEB-INF/view/admin/dataconfig/details.jsp
  34. 7 69
      src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp
  35. 37 82
      src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp
  36. 2 6
      src/main/webapp/WEB-INF/view/admin/dict/index.jsp
  37. 6 80
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/details.jsp
  38. 1 0
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp
  39. 4 32
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp
  40. 1 5
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp
  41. 28 72
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp
  42. 1 0
      src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp
  43. 5 78
      src/main/webapp/WEB-INF/view/admin/dict/synonym/details.jsp
  44. 1 0
      src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp
  45. 4 32
      src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp
  46. 1 5
      src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp
  47. 28 71
      src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp
  48. 1 0
      src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp
  49. 1 21
      src/main/webapp/WEB-INF/view/admin/failureurl/details.jsp
  50. 2 6
      src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp
  51. 0 203
      src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp
  52. 111 0
      src/main/webapp/WEB-INF/view/admin/fileauthentication/details.jsp
  53. 6 69
      src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp
  54. 8 62
      src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp
  55. 9 102
      src/main/webapp/WEB-INF/view/admin/fileconfig/details.jsp
  56. 7 70
      src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp
  57. 34 82
      src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp
  58. 0 169
      src/main/webapp/WEB-INF/view/admin/group/confirm.jsp
  59. 75 0
      src/main/webapp/WEB-INF/view/admin/group/details.jsp
  60. 6 68
      src/main/webapp/WEB-INF/view/admin/group/edit.jsp
  61. 25 76
      src/main/webapp/WEB-INF/view/admin/group/index.jsp
  62. 1 21
      src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp
  63. 45 76
      src/main/webapp/WEB-INF/view/admin/joblog/index.jsp
  64. 0 181
      src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp
  65. 88 0
      src/main/webapp/WEB-INF/view/admin/keymatch/details.jsp
  66. 7 70
      src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp
  67. 67 79
      src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp
  68. 0 202
      src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp
  69. 110 0
      src/main/webapp/WEB-INF/view/admin/labeltype/details.jsp
  70. 7 70
      src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp
  71. 65 77
      src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp
  72. 1 5
      src/main/webapp/WEB-INF/view/admin/log/index.jsp
  73. 0 169
      src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp
  74. 83 0
      src/main/webapp/WEB-INF/view/admin/overlappinghost/details.jsp
  75. 8 70
      src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp
  76. 29 79
      src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp
  77. 0 183
      src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp
  78. 94 0
      src/main/webapp/WEB-INF/view/admin/pathmapping/details.jsp
  79. 6 64
      src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp
  80. 28 73
      src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp
  81. 0 179
      src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp
  82. 87 0
      src/main/webapp/WEB-INF/view/admin/requestheader/details.jsp
  83. 6 69
      src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp
  84. 8 62
      src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp
  85. 0 168
      src/main/webapp/WEB-INF/view/admin/role/confirm.jsp
  86. 74 0
      src/main/webapp/WEB-INF/view/admin/role/details.jsp
  87. 6 68
      src/main/webapp/WEB-INF/view/admin/role/edit.jsp
  88. 25 76
      src/main/webapp/WEB-INF/view/admin/role/index.jsp
  89. 0 173
      src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp
  90. 81 0
      src/main/webapp/WEB-INF/view/admin/roletype/details.jsp
  91. 7 68
      src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp
  92. 26 76
      src/main/webapp/WEB-INF/view/admin/roletype/index.jsp
  93. 0 228
      src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp
  94. 123 0
      src/main/webapp/WEB-INF/view/admin/scheduledjob/details.jsp
  95. 6 68
      src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp
  96. 42 94
      src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp
  97. 0 1
      src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp
  98. 0 170
      src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp
  99. 78 0
      src/main/webapp/WEB-INF/view/admin/suggestbadword/details.jsp
  100. 2 3
      src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/CrudMode.java

@@ -24,7 +24,7 @@ public class CrudMode {
 
     public static final int DELETE = 3;
 
-    public static final int CONFIRM = 4;
+    public static final int DETAILS = 4;
 
     protected CrudMode() {
         // nothing

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java

@@ -25,9 +25,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -67,8 +69,12 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        boostDocumentRulePager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            boostDocumentRulePager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            boostDocumentRulePager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -90,13 +96,6 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocumentRulePager)); // page navi
 
@@ -111,7 +110,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -121,86 +120,35 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminBoostdocumentrule_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminBoostdocumentrule_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminBoostdocumentrule_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminBoostdocumentrule_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminBoostdocumentrule_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminBoostdocumentrule_EditJsp;
+            break;
+        }
         final String id = form.id;
         boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminBoostdocumentrule_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminBoostdocumentrule_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminBoostdocumentrule_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -214,24 +162,10 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminBoostdocumentrule_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminBoostdocumentrule_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -245,7 +179,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java

@@ -141,7 +141,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction {
     //                                               -------
     @Execute
     public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
         return asHtml(path_AdminCrawlingsession_ConfirmJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 crawlingSessionService.getCrawlingSession(id).ifPresent(entity -> {

+ 29 - 115
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java

@@ -33,9 +33,11 @@ import org.codelibs.fess.ds.DataStoreFactory;
 import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -82,8 +84,12 @@ public class AdminDataconfigAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        dataConfigPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            dataConfigPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            dataConfigPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminDataconfig_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -105,13 +111,6 @@ public class AdminDataconfigAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminDataconfig_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager)); // page navi
 
@@ -126,7 +125,7 @@ public class AdminDataconfigAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminDataconfig_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -139,48 +138,19 @@ public class AdminDataconfigAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminDataconfig_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                dataConfigService.getDataConfig(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminDataconfig_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminDataconfig_EditJsp;
+            break;
+        }
         form.crudMode = CrudMode.EDIT;
         final String id = form.id;
         dataConfigService.getDataConfig(id).ifPresent(entity -> {
@@ -188,55 +158,19 @@ public class AdminDataconfigAction extends FessAdminAction {
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminDataconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminDataconfig_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                dataConfigService.getDataConfig(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
-        final String id = form.id;
-        dataConfigService.getDataConfig(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerRolesAndLabels(data);
             registerHandlerNames(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminDataconfig_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminDataconfig_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 dataConfigService.getDataConfig(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -253,30 +187,10 @@ public class AdminDataconfigAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminDataconfig_ConfirmJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-            registerHandlerNames(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -290,7 +204,7 @@ public class AdminDataconfigAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());
@@ -306,7 +220,7 @@ public class AdminDataconfigAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse delete(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.DELETE);
+        verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
         dataConfigService.getDataConfig(id).ifPresent(entity -> {

+ 28 - 89
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java

@@ -33,10 +33,12 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.dict.kuromoji.KuromojiItem;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.ActionResponse;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -80,9 +82,13 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
-        kuromojiPager.setCurrentPageNumber(pageNumber);
+        pageNumber.ifPresent(num -> {
+            kuromojiPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            kuromojiPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminDictKuromoji_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -106,14 +112,6 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        validate(form, messages -> {}, toIndexHtml());
-        return asHtml(path_AdminDictKuromoji_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         // page navi
         data.register("kuromojiItemItems", kuromojiService.getKuromojiList(form.dictId, kuromojiPager));
@@ -131,7 +129,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage(final String dictId) {
+    public HtmlResponse createnew(final String dictId) {
         return asHtml(path_AdminDictKuromoji_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -142,79 +140,34 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final String dictId, final int crudMode, final long id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminDictKuromoji_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                kuromojiService.getKuromojiItem(dictId, id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-                form.dictId = dictId;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminDictKuromoji_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        kuromojiService.getKuromojiItem(form.dictId, form.id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
-        });
-        return asHtml(path_AdminDictKuromoji_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final String dictId, final int crudMode, final long id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminDictKuromoji_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                kuromojiService.getKuromojiItem(dictId, id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-                form.dictId = dictId;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminDictKuromoji_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminDictKuromoji_EditJsp;
+            break;
+        }
         kuromojiService.getKuromojiItem(form.dictId, form.id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
         });
-        return asHtml(path_AdminDictKuromoji_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final String dictId, final int crudMode, final long id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminDictKuromoji_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final String dictId, final int crudMode, final long id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminDictKuromoji_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 kuromojiService.getKuromojiItem(dictId, id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -229,20 +182,6 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminDictKuromoji_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminDictKuromoji_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                              Download
     //                                               -------
@@ -315,7 +254,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -332,7 +271,7 @@ public class AdminDictKuromojiAction extends FessAdminAction {
         return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 37 - 81
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java

@@ -35,10 +35,12 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.dict.synonym.SynonymItem;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.ActionResponse;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -82,9 +84,13 @@ public class AdminDictSynonymAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         validate(form, messages -> {}, toIndexHtml());
-        synonymPager.setCurrentPageNumber(pageNumber);
+        pageNumber.ifPresent(num -> {
+            synonymPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            synonymPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminDictSynonym_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -108,14 +114,6 @@ public class AdminDictSynonymAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        validate(form, messages -> {}, toIndexHtml());
-        return asHtml(path_AdminDictSynonym_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         // page navi
         data.register("synonymItemItems", synonymService.getSynonymList(form.dictId, synonymPager));
@@ -133,7 +131,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage(final String dictId) {
+    public HtmlResponse createnew(final String dictId) {
         return asHtml(path_AdminDictSynonym_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -144,47 +142,35 @@ public class AdminDictSynonymAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final String dictId, final int crudMode, final long id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminDictSynonym_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                synonymService.getSynonymItem(dictId, id).ifPresent(entity -> {
-                    form.inputs = entity.getInputsValue();
-                    form.outputs = entity.getOutputsValue();
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id), toEditHtml());
-                });
-                form.id = id;
-                form.crudMode = crudMode;
-                form.dictId = dictId;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminDictSynonym_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminDictSynonym_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminDictSynonym_EditJsp;
+            break;
+        }
         synonymService.getSynonymItem(form.dictId, form.id).ifPresent(entity -> {
             form.inputs = entity.getInputsValue();
             form.outputs = entity.getOutputsValue();
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
         });
-        return asHtml(path_AdminDictSynonym_EditJsp);
+        return asHtml(next);
     }
 
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final String dictId, final int crudMode, final long id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminDictSynonym_ConfirmJsp).useForm(EditForm.class, op -> {
+    // -----------------------------------------------------
+    //                                               Details
+    //                                               -------
+    @Execute
+    public HtmlResponse details(final String dictId, final int crudMode, final long id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminDictSynonym_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 synonymService.getSynonymItem(dictId, id).ifPresent(entity -> {
                     form.inputs = entity.getInputsValue();
@@ -199,49 +185,19 @@ public class AdminDictSynonymAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
-        synonymService.getSynonymItem(form.dictId, form.id).ifPresent(entity -> {
-            form.inputs = entity.getInputsValue();
-            form.outputs = entity.getOutputsValue();
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.getDisplayId()), toEditHtml());
-        });
-        return asHtml(path_AdminDictSynonym_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                               Confirm
     //                                               -------
-    @Execute
-    public HtmlResponse confirmpage(final String dictId, final int crudMode, final long id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminDictSynonym_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                synonymService.getSynonymItem(dictId, id).ifPresent(entity -> {
-                    form.inputs = entity.getInputsValue();
-                    form.outputs = entity.getOutputsValue();
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, dictId + ":" + id), toEditHtml());
-                });
-                form.id = id;
-                form.crudMode = crudMode;
-                form.dictId = dictId;
-            });
-        });
-    }
 
     @Execute(token = TxToken.VALIDATE_KEEP)
     public HtmlResponse confirmfromcreate(final CreateForm form) {
         validate(form, messages -> {}, toEditHtml());
         form.crudMode = CrudMode.CREATE;
         final String[] newInputs = splitLine(form.inputs);
-        validateSynonymString(newInputs, () -> createpage(form.dictId));
+        validateSynonymString(newInputs, () -> createnew(form.dictId));
         final String[] newOutputs = splitLine(form.outputs);
-        validateSynonymString(newOutputs, () -> createpage(form.dictId));
-        return asHtml(path_AdminDictSynonym_ConfirmJsp);
+        validateSynonymString(newOutputs, () -> createnew(form.dictId));
+        return asHtml(path_AdminDictSynonym_DetailsJsp);
     }
 
     @Execute(token = TxToken.VALIDATE_KEEP)
@@ -249,10 +205,10 @@ public class AdminDictSynonymAction extends FessAdminAction {
         validate(form, messages -> {}, toEditHtml());
         form.crudMode = CrudMode.EDIT;
         final String[] newInputs = splitLine(form.inputs);
-        validateSynonymString(newInputs, () -> editpage(form.dictId, form.crudMode, form.id));
+        validateSynonymString(newInputs, () -> edit(form));
         final String[] newOutputs = splitLine(form.outputs);
-        validateSynonymString(newOutputs, () -> editpage(form.dictId, form.crudMode, form.id));
-        return asHtml(path_AdminDictSynonym_ConfirmJsp);
+        validateSynonymString(newOutputs, () -> edit(form));
+        return asHtml(path_AdminDictSynonym_DetailsJsp);
     }
 
     // -----------------------------------------------------
@@ -327,7 +283,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -346,7 +302,7 @@ public class AdminDictSynonymAction extends FessAdminAction {
         return redirectWith(getClass(), moreUrl("list/1").params("dictId", form.dictId));
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 115
src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java

@@ -34,9 +34,11 @@ import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.util.LaRequestUtil;
@@ -80,8 +82,12 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        fileAuthenticationPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            fileAuthenticationPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            fileAuthenticationPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminFileauthentication_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -103,13 +109,6 @@ public class AdminFileauthenticationAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminFileauthentication_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("fileAuthenticationItems", fileAuthenticationService.getFileAuthenticationList(fileAuthenticationPager)); // page navi
         data.register("displayCreateLink", !fileConfigService.getAllFileConfigList(false, false, false, null).isEmpty());
@@ -124,7 +123,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminFileauthentication_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -137,104 +136,38 @@ public class AdminFileauthenticationAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminFileauthentication_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminFileauthentication_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminFileauthentication_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminFileauthentication_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminFileauthentication_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminFileauthentication_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminFileauthentication_EditJsp;
+            break;
+        }
         final String id = form.id;
         fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminFileauthentication_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerProtocolSchemeItems(data);
             registerFileConfigItems(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminFileauthentication_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminFileauthentication_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -251,30 +184,10 @@ public class AdminFileauthenticationAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminFileauthentication_ConfirmJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminFileauthentication_ConfirmJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerFileConfigItems(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -288,7 +201,7 @@ public class AdminFileauthenticationAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 29 - 109
src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java

@@ -27,9 +27,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -74,8 +76,12 @@ public class AdminFileconfigAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        fileConfigPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            fileConfigPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            fileConfigPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -97,13 +103,6 @@ public class AdminFileconfigAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminFileconfig_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("fileConfigItems", fileConfigService.getFileConfigList(fileConfigPager)); // page navi
 
@@ -118,7 +117,7 @@ public class AdminFileconfigAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminFileconfig_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -130,98 +129,37 @@ public class AdminFileconfigAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminFileconfig_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                fileConfigService.getFileConfig(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        fileConfigService.getFileConfig(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminFileconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminFileconfig_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                fileConfigService.getFileConfig(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminFileconfig_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminFileconfig_EditJsp;
+            break;
+        }
         final String id = form.id;
         fileConfigService.getFileConfig(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerRolesAndLabels(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminFileconfig_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminFileconfig_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 fileConfigService.getFileConfig(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -237,28 +175,10 @@ public class AdminFileconfigAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminFileconfig_ConfirmJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -272,7 +192,7 @@ public class AdminFileconfigAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());
@@ -288,7 +208,7 @@ public class AdminFileconfigAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse delete(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.DELETE);
+        verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
         fileConfigService.getFileConfig(id).ifPresent(entity -> {

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java

@@ -27,9 +27,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -70,8 +72,12 @@ public class AdminGroupAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        groupPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            groupPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            groupPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminGroup_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -93,13 +99,6 @@ public class AdminGroupAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminGroup_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("groupItems", groupService.getGroupList(groupPager)); // page navi
 
@@ -114,7 +113,7 @@ public class AdminGroupAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminGroup_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -124,86 +123,35 @@ public class AdminGroupAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminGroup_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                groupService.getGroup(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminGroup_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminGroup_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        groupService.getGroup(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminGroup_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminGroup_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                groupService.getGroup(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminGroup_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminGroup_EditJsp;
+            break;
+        }
         final String id = form.id;
         groupService.getGroup(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminGroup_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminGroup_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminGroup_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 groupService.getGroup(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -217,24 +165,10 @@ public class AdminGroupAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminGroup_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminGroup_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -249,7 +183,7 @@ public class AdminGroupAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java

@@ -119,14 +119,14 @@ public class AdminJoblogAction extends FessAdminAction {
         form.id = id;
         verifyCrudMode(form, CrudMode.DELETE);
         loadJobLog(form);
-        return asHtml(path_AdminJoblog_ConfirmJsp);
+        return asHtml(path_AdminJoblog_DetailsJsp);
     }
 
     @Execute(token = TxToken.SAVE)
     public HtmlResponse deletefromconfirm(final JobLogEditForm form) {
         form.crudMode = CrudMode.DELETE;
         loadJobLog(form);
-        return asHtml(path_AdminJoblog_ConfirmJsp);
+        return asHtml(path_AdminJoblog_DetailsJsp);
     }
 
     // -----------------------------------------------------
@@ -136,9 +136,9 @@ public class AdminJoblogAction extends FessAdminAction {
     public HtmlResponse confirmpage(final int crudMode, final String id, final JobLogEditForm form) {
         form.crudMode = crudMode;
         form.id = id;
-        verifyCrudMode(form, CrudMode.CONFIRM);
+        verifyCrudMode(form, CrudMode.DETAILS);
         loadJobLog(form);
-        return asHtml(path_AdminJoblog_ConfirmJsp);
+        return asHtml(path_AdminJoblog_DetailsJsp);
     }
 
     // -----------------------------------------------------

+ 29 - 95
src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -26,9 +26,11 @@ import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -69,8 +71,12 @@ public class AdminKeymatchAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        keyMatchPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            keyMatchPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            keyMatchPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -92,13 +98,6 @@ public class AdminKeymatchAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminKeymatch_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("keyMatchItems", keyMatchService.getKeyMatchList(keyMatchPager)); // page navi
 
@@ -113,7 +112,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminKeymatch_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -123,86 +122,35 @@ public class AdminKeymatchAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminKeymatch_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                keyMatchService.getKeyMatch(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminKeymatch_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminKeymatch_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        keyMatchService.getKeyMatch(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminKeymatch_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminKeymatch_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                keyMatchService.getKeyMatch(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        form.crudMode = CrudMode.DELETE;
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminKeymatch_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminKeymatch_EditJsp;
+            break;
+        }
         final String id = form.id;
         keyMatchService.getKeyMatch(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminKeymatch_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminKeymatch_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminKeymatch_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 keyMatchService.getKeyMatch(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -216,24 +164,10 @@ public class AdminKeymatchAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminKeymatch_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminKeymatch_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -248,7 +182,7 @@ public class AdminKeymatchAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());
@@ -265,7 +199,7 @@ public class AdminKeymatchAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse delete(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.DELETE);
+        verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
         keyMatchService.getKeyMatch(id).ifPresent(entity -> {

+ 29 - 109
src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java

@@ -26,9 +26,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -72,8 +74,12 @@ public class AdminLabeltypeAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        labelTypePager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            labelTypePager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            labelTypePager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminLabeltype_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -95,13 +101,6 @@ public class AdminLabeltypeAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminLabeltype_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("labelTypeItems", labelTypeService.getLabelTypeList(labelTypePager)); // page navi
 
@@ -116,7 +115,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminLabeltype_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -128,98 +127,37 @@ public class AdminLabeltypeAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminLabeltype_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                labelTypeService.getLabelType(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        labelTypeService.getLabelType(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminLabeltype_EditJsp).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminLabeltype_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                labelTypeService.getLabelType(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminLabeltype_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminLabeltype_EditJsp;
+            break;
+        }
         final String id = form.id;
         labelTypeService.getLabelType(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerRoleTypeItems(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminLabeltype_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminLabeltype_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 labelTypeService.getLabelType(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -235,28 +173,10 @@ public class AdminLabeltypeAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminLabeltype_ConfirmJsp).renderWith(data -> {
-            registerRoleTypeItems(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -270,7 +190,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());
@@ -286,7 +206,7 @@ public class AdminLabeltypeAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse delete(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.DELETE);
+        verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
         labelTypeService.getLabelType(id).ifPresent(entity -> {

+ 0 - 3
src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java

@@ -50,15 +50,12 @@ public class CreateForm implements Serializable {
     @Pattern(regexp = "^[a-zA-Z0-9_-| ]+$")
     public String value;
 
-    @Required
     @Size(max = 4000)
     public String includedPaths;
 
-    @Required
     @Size(max = 4000)
     public String excludedPaths;
 
-    @Required
     @Min(value = 0)
     @Max(value = 2147483647)
     @Digits(integer = 10, fraction = 0)

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java

@@ -25,9 +25,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.OverlappingHost;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -68,8 +70,12 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        overlappingHostPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            overlappingHostPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            overlappingHostPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -91,13 +97,6 @@ public class AdminOverlappinghostAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminOverlappinghost_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("overlappingHostItems", overlappingHostService.getOverlappingHostList(overlappingHostPager)); // page navi
 
@@ -112,7 +111,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminOverlappinghost_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -122,86 +121,35 @@ public class AdminOverlappinghostAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminOverlappinghost_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminOverlappinghost_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminOverlappinghost_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminOverlappinghost_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminOverlappinghost_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminOverlappinghost_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminOverlappinghost_EditJsp;
+            break;
+        }
         final String id = form.id;
         overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminOverlappinghost_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminOverlappinghost_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminOverlappinghost_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 overlappingHostService.getOverlappingHost(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -215,24 +163,10 @@ public class AdminOverlappinghostAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminOverlappinghost_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminOverlappinghost_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -246,7 +180,7 @@ public class AdminOverlappinghostAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java

@@ -25,9 +25,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -69,8 +71,12 @@ public class AdminPathmappingAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        pathMappingPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            pathMappingPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            pathMappingPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminPathmapping_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -92,13 +98,6 @@ public class AdminPathmappingAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminPathmapping_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("pathMappingItems", pathMappingService.getPathMappingList(pathMappingPager)); // page navi
 
@@ -113,7 +112,7 @@ public class AdminPathmappingAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminPathmapping_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -123,86 +122,35 @@ public class AdminPathmappingAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminPathmapping_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                pathMappingService.getPathMapping(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminPathmapping_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminPathmapping_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        pathMappingService.getPathMapping(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminPathmapping_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminPathmapping_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                pathMappingService.getPathMapping(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminPathmapping_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminPathmapping_EditJsp;
+            break;
+        }
         final String id = form.id;
         pathMappingService.getPathMapping(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminPathmapping_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminPathmapping_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminPathmapping_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 pathMappingService.getPathMapping(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -216,24 +164,10 @@ public class AdminPathmappingAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminPathmapping_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminPathmapping_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -247,7 +181,7 @@ public class AdminPathmappingAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 115
src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java

@@ -34,9 +34,11 @@ import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.util.LaRequestUtil;
@@ -81,8 +83,12 @@ public class AdminRequestheaderAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        requestHeaderPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            requestHeaderPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            requestHeaderPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -104,13 +110,6 @@ public class AdminRequestheaderAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminRequestheader_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("requestHeaderItems", requestHeaderService.getRequestHeaderList(requestHeaderPager)); // page navi
         data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
@@ -126,7 +125,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminRequestheader_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -139,104 +138,38 @@ public class AdminRequestheaderAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminRequestheader_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminRequestheader_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminRequestheader_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminRequestheader_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminRequestheader_EditJsp;
+            break;
+        }
         final String id = form.id;
         requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerProtocolSchemeItems(data);
             registerWebConfigItems(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminRequestheader_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminRequestheader_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 requestHeaderService.getRequestHeader(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -253,30 +186,10 @@ public class AdminRequestheaderAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminRequestheader_ConfirmJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -290,7 +203,7 @@ public class AdminRequestheaderAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java

@@ -27,9 +27,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.user.exentity.Role;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -70,8 +72,12 @@ public class AdminRoleAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        rolePager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            rolePager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            rolePager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminRole_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -93,13 +99,6 @@ public class AdminRoleAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminRole_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("roleItems", roleService.getRoleList(rolePager)); // page navi
 
@@ -114,7 +113,7 @@ public class AdminRoleAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminRole_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -124,86 +123,35 @@ public class AdminRoleAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminRole_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                roleService.getRole(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminRole_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminRole_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        roleService.getRole(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminRole_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminRole_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                roleService.getRole(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminRole_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminRole_EditJsp;
+            break;
+        }
         final String id = form.id;
         roleService.getRole(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminRole_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminRole_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminRole_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 roleService.getRole(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -217,24 +165,10 @@ public class AdminRoleAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminRole_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminRole_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -249,7 +183,7 @@ public class AdminRoleAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java

@@ -25,9 +25,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.RoleType;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -68,8 +70,12 @@ public class AdminRoletypeAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        roleTypePager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            roleTypePager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            roleTypePager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -91,13 +97,6 @@ public class AdminRoletypeAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminRoletype_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("roleTypeItems", roleTypeService.getRoleTypeList(roleTypePager)); // page navi
 
@@ -112,7 +111,7 @@ public class AdminRoletypeAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminRoletype_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -122,86 +121,35 @@ public class AdminRoletypeAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminRoletype_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                roleTypeService.getRoleType(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminRoletype_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminRoletype_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        roleTypeService.getRoleType(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminRoletype_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminRoletype_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                roleTypeService.getRoleType(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminRoletype_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminRoletype_EditJsp;
+            break;
+        }
         final String id = form.id;
         roleTypeService.getRoleType(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminRoletype_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminRoletype_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminRoletype_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 roleTypeService.getRoleType(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -215,24 +163,10 @@ public class AdminRoletypeAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminRoletype_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminRoletype_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -246,7 +180,7 @@ public class AdminRoletypeAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 30 - 92
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java

@@ -27,9 +27,11 @@ import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.JobExecutor;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.util.LaRequestUtil;
@@ -73,8 +75,12 @@ public class AdminScheduledjobAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        scheduledJobPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            scheduledJobPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            scheduledJobPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -96,13 +102,6 @@ public class AdminScheduledjobAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminScheduledjob_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("scheduledJobItems", scheduledJobService.getScheduledJobList(scheduledJobPager)); // page navi
 
@@ -117,7 +116,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminScheduledjob_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -127,82 +126,35 @@ public class AdminScheduledjobAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminScheduledjob_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
-                    loadScheduledJob(form, entity);
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminScheduledjob_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminScheduledjob_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
-            loadScheduledJob(form, entity);
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminScheduledjob_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminScheduledjob_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
-                    loadScheduledJob(form, entity);
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminScheduledjob_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminScheduledjob_EditJsp;
+            break;
+        }
         final String id = form.id;
         scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
             loadScheduledJob(form, entity);
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminScheduledjob_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminScheduledjob_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminScheduledjob_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
                     loadScheduledJob(form, entity);
@@ -217,24 +169,10 @@ public class AdminScheduledjobAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminScheduledjob_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminScheduledjob_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -251,7 +189,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());
@@ -284,7 +222,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse start(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CONFIRM);
+        verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
         scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
@@ -306,7 +244,7 @@ public class AdminScheduledjobAction extends FessAdminAction {
 
     @Execute
     public HtmlResponse stop(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CONFIRM);
+        verifyCrudMode(form.crudMode, CrudMode.DETAILS);
         validate(form, messages -> {}, toEditHtml());
         final String id = form.id;
         scheduledJobService.getScheduledJob(id).ifPresent(entity -> {

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java

@@ -41,9 +41,11 @@ import org.codelibs.fess.es.config.exentity.SuggestBadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.util.LaResponseUtil;
@@ -86,8 +88,12 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        suggestBadWordPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            suggestBadWordPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            suggestBadWordPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -109,13 +115,6 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminSuggestbadword_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("suggestBadWordItems", suggestBadWordService.getSuggestBadWordList(suggestBadWordPager)); // page navi
 
@@ -130,7 +129,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminSuggestbadword_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -140,86 +139,35 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminSuggestbadword_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminSuggestbadword_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminSuggestbadword_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminSuggestbadword_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminSuggestbadword_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminSuggestbadword_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminSuggestbadword_EditJsp;
+            break;
+        }
         final String id = form.id;
         suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminSuggestbadword_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminSuggestbadword_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminSuggestbadword_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -233,20 +181,6 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminSuggestbadword_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminSuggestbadword_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                              Download
     //                                               -------
@@ -281,7 +215,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -295,7 +229,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 94
src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java

@@ -41,9 +41,11 @@ import org.codelibs.fess.es.config.exentity.SuggestElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.util.LaResponseUtil;
@@ -86,8 +88,12 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        suggestElevateWordPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            suggestElevateWordPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            suggestElevateWordPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminSuggestelevateword_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -109,13 +115,6 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminSuggestelevateword_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("suggestElevateWordItems", suggestElevateWordService.getSuggestElevateWordList(suggestElevateWordPager)); // page navi
 
@@ -130,7 +129,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminSuggestelevateword_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -140,86 +139,35 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminSuggestelevateword_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminSuggestelevateword_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminSuggestelevateword_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminSuggestelevateword_EditJsp);
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminSuggestelevateword_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminSuggestelevateword_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminSuggestelevateword_EditJsp;
+            break;
+        }
         final String id = form.id;
         suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
+        return asHtml(next);
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminSuggestelevateword_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminSuggestelevateword_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -233,20 +181,6 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminSuggestelevateword_ConfirmJsp);
-    }
-
     // -----------------------------------------------------
     //                                              Download
     //                                               -------
@@ -281,7 +215,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -295,7 +229,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 121
src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java

@@ -32,9 +32,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -82,9 +84,13 @@ public class AdminUserAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
         clearStoredPassword();
-        userPager.setCurrentPageNumber(pageNumber);
+        pageNumber.ifPresent(num -> {
+            userPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            userPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminUser_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -108,14 +114,6 @@ public class AdminUserAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        clearStoredPassword();
-        return asHtml(path_AdminUser_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("userItems", userService.getUserList(userPager)); // page navi
         // restore from pager
@@ -134,7 +132,7 @@ public class AdminUserAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         clearStoredPassword();
         return asHtml(path_AdminUser_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
@@ -147,50 +145,19 @@ public class AdminUserAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
+    public HtmlResponse edit(final EditForm form) {
         clearStoredPassword();
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminUser_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                userService.getUser(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-                resetPassword(form);
-            });
-        }).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        clearStoredPassword();
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminUser_EditJsp).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        clearStoredPassword();
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminUser_EditJsp).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        clearStoredPassword();
-        form.crudMode = CrudMode.EDIT;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminUser_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminUser_EditJsp;
+            break;
+        }
         final String id = form.id;
         userService.getUser(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
@@ -199,56 +166,18 @@ public class AdminUserAction extends FessAdminAction {
         });
         resetPassword(form);
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminUser_EditJsp).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        clearStoredPassword();
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminUser_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                userService.getUser(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-                resetPassword(form);
-            });
-        }).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        clearStoredPassword();
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
-        final String id = form.id;
-        userService.getUser(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        resetPassword(form);
-        return asHtml(path_AdminUser_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerForms(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminUser_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminUser_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 userService.getUser(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -265,32 +194,10 @@ public class AdminUserAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        verifyPassword(form);
-        storePassword(form);
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminUser_ConfirmJsp).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        verifyPassword(form);
-        storePassword(form);
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminUser_ConfirmJsp).renderWith(data -> {
-            registerForms(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -305,7 +212,7 @@ public class AdminUserAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 28 - 115
src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java

@@ -34,9 +34,11 @@ import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.util.LaRequestUtil;
@@ -81,8 +83,12 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        webAuthenticationPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            webAuthenticationPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            webAuthenticationPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -104,13 +110,6 @@ public class AdminWebauthenticationAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminWebauthentication_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("webAuthenticationItems", webAuthenticationService.getWebAuthenticationList(webAuthenticationPager)); // page navi
         data.register("displayCreateLink", !webConfigService.getAllWebConfigList(false, false, false, null).isEmpty());
@@ -125,7 +124,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminWebauthentication_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -138,104 +137,38 @@ public class AdminWebauthenticationAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminWebauthentication_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminWebauthentication_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminWebauthentication_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminWebauthentication_EditJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminWebauthentication_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminWebauthentication_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminWebauthentication_EditJsp;
+            break;
+        }
         final String id = form.id;
         webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminWebauthentication_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerProtocolSchemeItems(data);
             registerWebConfigItems(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminWebauthentication_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminWebauthentication_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -252,30 +185,10 @@ public class AdminWebauthenticationAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminWebauthentication_ConfirmJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminWebauthentication_ConfirmJsp).renderWith(data -> {
-            registerProtocolSchemeItems(data);
-            registerWebConfigItems(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -289,7 +202,7 @@ public class AdminWebauthenticationAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 29 - 109
src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java

@@ -27,9 +27,11 @@ import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
 import org.dbflute.optional.OptionalEntity;
+import org.dbflute.optional.OptionalThing;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.callback.ActionRuntime;
 import org.lastaflute.web.response.HtmlResponse;
+import org.lastaflute.web.response.next.HtmlNext;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.token.TxToken;
 import org.lastaflute.web.validation.VaErrorHook;
@@ -75,8 +77,12 @@ public class AdminWebconfigAction extends FessAdminAction {
     }
 
     @Execute
-    public HtmlResponse list(final Integer pageNumber, final SearchForm form) {
-        webConfigPager.setCurrentPageNumber(pageNumber);
+    public HtmlResponse list(final OptionalThing<Integer> pageNumber, final SearchForm form) {
+        pageNumber.ifPresent(num -> {
+            webConfigPager.setCurrentPageNumber(pageNumber.get());
+        }).orElse(() -> {
+            webConfigPager.setCurrentPageNumber(0);
+        });
         return asHtml(path_AdminWebconfig_IndexJsp).renderWith(data -> {
             searchPaging(data, form);
         });
@@ -98,17 +104,10 @@ public class AdminWebconfigAction extends FessAdminAction {
         });
     }
 
-    @Execute
-    public HtmlResponse back(final SearchForm form) {
-        return asHtml(path_AdminWebconfig_IndexJsp).renderWith(data -> {
-            searchPaging(data, form);
-        });
-    }
-
     protected void searchPaging(final RenderData data, final SearchForm form) {
         data.register("webConfigItems", webConfigService.getWebConfigList(webConfigPager)); // page navi
 
-        // restore from pager
+        // restore from webConfigPager
         copyBeanToBean(webConfigPager, form, op -> op.include("id"));
     }
 
@@ -119,7 +118,7 @@ public class AdminWebconfigAction extends FessAdminAction {
     //                                            Entry Page
     //                                            ----------
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse createpage() {
+    public HtmlResponse createnew() {
         return asHtml(path_AdminWebconfig_EditJsp).useForm(CreateForm.class, op -> {
             op.setup(form -> {
                 form.initialize();
@@ -131,98 +130,37 @@ public class AdminWebconfigAction extends FessAdminAction {
     }
 
     @Execute(token = TxToken.SAVE)
-    public HtmlResponse editpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.EDIT);
-        return asHtml(path_AdminWebconfig_EditJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                webConfigService.getWebConfig(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse createagain(final CreateForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.CREATE);
-        validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminWebconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editagain(final EditForm form) {
-        verifyCrudMode(form.crudMode, CrudMode.EDIT);
+    public HtmlResponse edit(final EditForm form) {
         validate(form, messages -> {}, toEditHtml());
-        return asHtml(path_AdminWebconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse editfromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        final String id = form.id;
-        webConfigService.getWebConfig(id).ifPresent(entity -> {
-            copyBeanToBean(entity, form, op -> {});
-        }).orElse(() -> {
-            throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-        });
-        return asHtml(path_AdminWebconfig_EditJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletepage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.DELETE);
-        return asHtml(path_AdminWebconfig_ConfirmJsp).useForm(EditForm.class, op -> {
-            op.setup(form -> {
-                webConfigService.getWebConfig(id).ifPresent(entity -> {
-                    copyBeanToBean(entity, form, copyOp -> {
-                        copyOp.excludeNull();
-                    });
-                }).orElse(() -> {
-                    throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
-                });
-                form.crudMode = crudMode;
-            });
-        }).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.SAVE)
-    public HtmlResponse deletefromconfirm(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.DELETE;
+        HtmlNext next;
+        switch (form.crudMode) {
+        case CrudMode.EDIT: // back
+            form.crudMode = CrudMode.DETAILS;
+            next = path_AdminWebconfig_DetailsJsp;
+            break;
+        default:
+            form.crudMode = CrudMode.EDIT;
+            next = path_AdminWebconfig_EditJsp;
+            break;
+        }
         final String id = form.id;
         webConfigService.getWebConfig(id).ifPresent(entity -> {
             copyBeanToBean(entity, form, op -> {});
         }).orElse(() -> {
             throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
         });
-        return asHtml(path_AdminWebconfig_ConfirmJsp).renderWith(data -> {
+        return asHtml(next).renderWith(data -> {
             registerRolesAndLabels(data);
         });
     }
 
     // -----------------------------------------------------
-    //                                               Confirm
+    //                                               Details
     //                                               -------
     @Execute
-    public HtmlResponse confirmpage(final int crudMode, final String id) {
-        verifyCrudMode(crudMode, CrudMode.CONFIRM);
-        return asHtml(path_AdminWebconfig_ConfirmJsp).useForm(EditForm.class, op -> {
+    public HtmlResponse details(final int crudMode, final String id) {
+        verifyCrudMode(crudMode, CrudMode.DETAILS);
+        return asHtml(path_AdminWebconfig_DetailsJsp).useForm(EditForm.class, op -> {
             op.setup(form -> {
                 webConfigService.getWebConfig(id).ifPresent(entity -> {
                     copyBeanToBean(entity, form, copyOp -> {
@@ -238,28 +176,10 @@ public class AdminWebconfigAction extends FessAdminAction {
         });
     }
 
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromcreate(final CreateForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.CREATE;
-        return asHtml(path_AdminWebconfig_ConfirmJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
-    @Execute(token = TxToken.VALIDATE_KEEP)
-    public HtmlResponse confirmfromupdate(final EditForm form) {
-        validate(form, messages -> {}, toEditHtml());
-        form.crudMode = CrudMode.EDIT;
-        return asHtml(path_AdminWebconfig_ConfirmJsp).renderWith(data -> {
-            registerRolesAndLabels(data);
-        });
-    }
-
     // -----------------------------------------------------
     //                                         Actually Crud
     //                                         -------------
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse create(final CreateForm form) {
         verifyCrudMode(form.crudMode, CrudMode.CREATE);
         validate(form, messages -> {}, toEditHtml());
@@ -273,7 +193,7 @@ public class AdminWebconfigAction extends FessAdminAction {
         return redirect(getClass());
     }
 
-    @Execute(token = TxToken.VALIDATE)
+    @Execute
     public HtmlResponse update(final EditForm form) {
         verifyCrudMode(form.crudMode, CrudMode.EDIT);
         validate(form, messages -> {}, toEditHtml());

+ 46 - 46
src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java

@@ -23,8 +23,8 @@ import org.lastaflute.web.response.next.HtmlNext;
  */
 public interface FessHtmlPath {
 
-    /** The path of the HTML: /admin/boostdocumentrule/confirm.jsp */
-    HtmlNext path_AdminBoostdocumentrule_ConfirmJsp = new HtmlNext("/admin/boostdocumentrule/confirm.jsp");
+    /** The path of the HTML: /admin/boostdocumentrule/details.jsp */
+    HtmlNext path_AdminBoostdocumentrule_DetailsJsp = new HtmlNext("/admin/boostdocumentrule/details.jsp");
 
     /** The path of the HTML: /admin/boostdocumentrule/edit.jsp */
     HtmlNext path_AdminBoostdocumentrule_EditJsp = new HtmlNext("/admin/boostdocumentrule/edit.jsp");
@@ -32,8 +32,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/boostdocumentrule/index.jsp */
     HtmlNext path_AdminBoostdocumentrule_IndexJsp = new HtmlNext("/admin/boostdocumentrule/index.jsp");
 
-    /** The path of the HTML: /admin/crawlingsession/confirm.jsp */
-    HtmlNext path_AdminCrawlingsession_ConfirmJsp = new HtmlNext("/admin/crawlingsession/confirm.jsp");
+    /** The path of the HTML: /admin/crawlingsession/details.jsp */
+    HtmlNext path_AdminCrawlingsession_DetailsJsp = new HtmlNext("/admin/crawlingsession/details.jsp");
 
     /** The path of the HTML: /admin/crawlingsession/index.jsp */
     HtmlNext path_AdminCrawlingsession_IndexJsp = new HtmlNext("/admin/crawlingsession/index.jsp");
@@ -41,8 +41,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/data/index.jsp */
     HtmlNext path_AdminData_IndexJsp = new HtmlNext("/admin/data/index.jsp");
 
-    /** The path of the HTML: /admin/dataconfig/confirm.jsp */
-    HtmlNext path_AdminDataconfig_ConfirmJsp = new HtmlNext("/admin/dataconfig/confirm.jsp");
+    /** The path of the HTML: /admin/dataconfig/details.jsp */
+    HtmlNext path_AdminDataconfig_DetailsJsp = new HtmlNext("/admin/dataconfig/details.jsp");
 
     /** The path of the HTML: /admin/dataconfig/edit.jsp */
     HtmlNext path_AdminDataconfig_EditJsp = new HtmlNext("/admin/dataconfig/edit.jsp");
@@ -59,8 +59,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/dict/index.jsp */
     HtmlNext path_AdminDict_IndexJsp = new HtmlNext("/admin/dict/index.jsp");
 
-    /** The path of the HTML: /admin/dict/kuromoji/confirm.jsp */
-    HtmlNext path_AdminDictKuromoji_ConfirmJsp = new HtmlNext("/admin/dict/kuromoji/confirm.jsp");
+    /** The path of the HTML: /admin/dict/kuromoji/details.jsp */
+    HtmlNext path_AdminDictKuromoji_DetailsJsp = new HtmlNext("/admin/dict/kuromoji/details.jsp");
 
     /** The path of the HTML: /admin/dict/kuromoji/download.jsp */
     HtmlNext path_AdminDictKuromoji_DownloadJsp = new HtmlNext("/admin/dict/kuromoji/download.jsp");
@@ -77,8 +77,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/dict/kuromoji/upload.jsp */
     HtmlNext path_AdminDictKuromoji_UploadJsp = new HtmlNext("/admin/dict/kuromoji/upload.jsp");
 
-    /** The path of the HTML: /admin/dict/synonym/confirm.jsp */
-    HtmlNext path_AdminDictSynonym_ConfirmJsp = new HtmlNext("/admin/dict/synonym/confirm.jsp");
+    /** The path of the HTML: /admin/dict/synonym/details.jsp */
+    HtmlNext path_AdminDictSynonym_DetailsJsp = new HtmlNext("/admin/dict/synonym/details.jsp");
 
     /** The path of the HTML: /admin/dict/synonym/download.jsp */
     HtmlNext path_AdminDictSynonym_DownloadJsp = new HtmlNext("/admin/dict/synonym/download.jsp");
@@ -98,14 +98,14 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/error/error.jsp */
     HtmlNext path_AdminError_ErrorJsp = new HtmlNext("/admin/error/error.jsp");
 
-    /** The path of the HTML: /admin/failureurl/confirm.jsp */
-    HtmlNext path_AdminFailureurl_ConfirmJsp = new HtmlNext("/admin/failureurl/confirm.jsp");
+    /** The path of the HTML: /admin/failureurl/details.jsp */
+    HtmlNext path_AdminFailureurl_DetailsJsp = new HtmlNext("/admin/failureurl/details.jsp");
 
     /** The path of the HTML: /admin/failureurl/index.jsp */
     HtmlNext path_AdminFailureurl_IndexJsp = new HtmlNext("/admin/failureurl/index.jsp");
 
-    /** The path of the HTML: /admin/fileauthentication/confirm.jsp */
-    HtmlNext path_AdminFileauthentication_ConfirmJsp = new HtmlNext("/admin/fileauthentication/confirm.jsp");
+    /** The path of the HTML: /admin/fileauthentication/details.jsp */
+    HtmlNext path_AdminFileauthentication_DetailsJsp = new HtmlNext("/admin/fileauthentication/details.jsp");
 
     /** The path of the HTML: /admin/fileauthentication/edit.jsp */
     HtmlNext path_AdminFileauthentication_EditJsp = new HtmlNext("/admin/fileauthentication/edit.jsp");
@@ -113,8 +113,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/fileauthentication/index.jsp */
     HtmlNext path_AdminFileauthentication_IndexJsp = new HtmlNext("/admin/fileauthentication/index.jsp");
 
-    /** The path of the HTML: /admin/fileconfig/confirm.jsp */
-    HtmlNext path_AdminFileconfig_ConfirmJsp = new HtmlNext("/admin/fileconfig/confirm.jsp");
+    /** The path of the HTML: /admin/fileconfig/details.jsp */
+    HtmlNext path_AdminFileconfig_DetailsJsp = new HtmlNext("/admin/fileconfig/details.jsp");
 
     /** The path of the HTML: /admin/fileconfig/edit.jsp */
     HtmlNext path_AdminFileconfig_EditJsp = new HtmlNext("/admin/fileconfig/edit.jsp");
@@ -125,8 +125,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/general/index.jsp */
     HtmlNext path_AdminGeneral_IndexJsp = new HtmlNext("/admin/general/index.jsp");
 
-    /** The path of the HTML: /admin/group/confirm.jsp */
-    HtmlNext path_AdminGroup_ConfirmJsp = new HtmlNext("/admin/group/confirm.jsp");
+    /** The path of the HTML: /admin/group/details.jsp */
+    HtmlNext path_AdminGroup_DetailsJsp = new HtmlNext("/admin/group/details.jsp");
 
     /** The path of the HTML: /admin/group/edit.jsp */
     HtmlNext path_AdminGroup_EditJsp = new HtmlNext("/admin/group/edit.jsp");
@@ -134,14 +134,14 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/group/index.jsp */
     HtmlNext path_AdminGroup_IndexJsp = new HtmlNext("/admin/group/index.jsp");
 
-    /** The path of the HTML: /admin/joblog/confirm.jsp */
-    HtmlNext path_AdminJoblog_ConfirmJsp = new HtmlNext("/admin/joblog/confirm.jsp");
+    /** The path of the HTML: /admin/joblog/details.jsp */
+    HtmlNext path_AdminJoblog_DetailsJsp = new HtmlNext("/admin/joblog/details.jsp");
 
     /** The path of the HTML: /admin/joblog/index.jsp */
     HtmlNext path_AdminJoblog_IndexJsp = new HtmlNext("/admin/joblog/index.jsp");
 
-    /** The path of the HTML: /admin/keymatch/confirm.jsp */
-    HtmlNext path_AdminKeymatch_ConfirmJsp = new HtmlNext("/admin/keymatch/confirm.jsp");
+    /** The path of the HTML: /admin/keymatch/details.jsp */
+    HtmlNext path_AdminKeymatch_DetailsJsp = new HtmlNext("/admin/keymatch/details.jsp");
 
     /** The path of the HTML: /admin/keymatch/edit.jsp */
     HtmlNext path_AdminKeymatch_EditJsp = new HtmlNext("/admin/keymatch/edit.jsp");
@@ -149,8 +149,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/keymatch/index.jsp */
     HtmlNext path_AdminKeymatch_IndexJsp = new HtmlNext("/admin/keymatch/index.jsp");
 
-    /** The path of the HTML: /admin/labeltype/confirm.jsp */
-    HtmlNext path_AdminLabeltype_ConfirmJsp = new HtmlNext("/admin/labeltype/confirm.jsp");
+    /** The path of the HTML: /admin/labeltype/details.jsp */
+    HtmlNext path_AdminLabeltype_DetailsJsp = new HtmlNext("/admin/labeltype/details.jsp");
 
     /** The path of the HTML: /admin/labeltype/edit.jsp */
     HtmlNext path_AdminLabeltype_EditJsp = new HtmlNext("/admin/labeltype/edit.jsp");
@@ -161,8 +161,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/log/index.jsp */
     HtmlNext path_AdminLog_IndexJsp = new HtmlNext("/admin/log/index.jsp");
 
-    /** The path of the HTML: /admin/overlappinghost/confirm.jsp */
-    HtmlNext path_AdminOverlappinghost_ConfirmJsp = new HtmlNext("/admin/overlappinghost/confirm.jsp");
+    /** The path of the HTML: /admin/overlappinghost/details.jsp */
+    HtmlNext path_AdminOverlappinghost_DetailsJsp = new HtmlNext("/admin/overlappinghost/details.jsp");
 
     /** The path of the HTML: /admin/overlappinghost/edit.jsp */
     HtmlNext path_AdminOverlappinghost_EditJsp = new HtmlNext("/admin/overlappinghost/edit.jsp");
@@ -170,8 +170,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/overlappinghost/index.jsp */
     HtmlNext path_AdminOverlappinghost_IndexJsp = new HtmlNext("/admin/overlappinghost/index.jsp");
 
-    /** The path of the HTML: /admin/pathmapping/confirm.jsp */
-    HtmlNext path_AdminPathmapping_ConfirmJsp = new HtmlNext("/admin/pathmapping/confirm.jsp");
+    /** The path of the HTML: /admin/pathmapping/details.jsp */
+    HtmlNext path_AdminPathmapping_DetailsJsp = new HtmlNext("/admin/pathmapping/details.jsp");
 
     /** The path of the HTML: /admin/pathmapping/edit.jsp */
     HtmlNext path_AdminPathmapping_EditJsp = new HtmlNext("/admin/pathmapping/edit.jsp");
@@ -179,8 +179,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/pathmapping/index.jsp */
     HtmlNext path_AdminPathmapping_IndexJsp = new HtmlNext("/admin/pathmapping/index.jsp");
 
-    /** The path of the HTML: /admin/requestheader/confirm.jsp */
-    HtmlNext path_AdminRequestheader_ConfirmJsp = new HtmlNext("/admin/requestheader/confirm.jsp");
+    /** The path of the HTML: /admin/requestheader/details.jsp */
+    HtmlNext path_AdminRequestheader_DetailsJsp = new HtmlNext("/admin/requestheader/details.jsp");
 
     /** The path of the HTML: /admin/requestheader/edit.jsp */
     HtmlNext path_AdminRequestheader_EditJsp = new HtmlNext("/admin/requestheader/edit.jsp");
@@ -188,8 +188,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/requestheader/index.jsp */
     HtmlNext path_AdminRequestheader_IndexJsp = new HtmlNext("/admin/requestheader/index.jsp");
 
-    /** The path of the HTML: /admin/role/confirm.jsp */
-    HtmlNext path_AdminRole_ConfirmJsp = new HtmlNext("/admin/role/confirm.jsp");
+    /** The path of the HTML: /admin/role/details.jsp */
+    HtmlNext path_AdminRole_DetailsJsp = new HtmlNext("/admin/role/details.jsp");
 
     /** The path of the HTML: /admin/role/edit.jsp */
     HtmlNext path_AdminRole_EditJsp = new HtmlNext("/admin/role/edit.jsp");
@@ -197,8 +197,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/role/index.jsp */
     HtmlNext path_AdminRole_IndexJsp = new HtmlNext("/admin/role/index.jsp");
 
-    /** The path of the HTML: /admin/roletype/confirm.jsp */
-    HtmlNext path_AdminRoletype_ConfirmJsp = new HtmlNext("/admin/roletype/confirm.jsp");
+    /** The path of the HTML: /admin/roletype/details.jsp */
+    HtmlNext path_AdminRoletype_DetailsJsp = new HtmlNext("/admin/roletype/details.jsp");
 
     /** The path of the HTML: /admin/roletype/edit.jsp */
     HtmlNext path_AdminRoletype_EditJsp = new HtmlNext("/admin/roletype/edit.jsp");
@@ -206,8 +206,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/roletype/index.jsp */
     HtmlNext path_AdminRoletype_IndexJsp = new HtmlNext("/admin/roletype/index.jsp");
 
-    /** The path of the HTML: /admin/scheduledjob/confirm.jsp */
-    HtmlNext path_AdminScheduledjob_ConfirmJsp = new HtmlNext("/admin/scheduledjob/confirm.jsp");
+    /** The path of the HTML: /admin/scheduledjob/details.jsp */
+    HtmlNext path_AdminScheduledjob_DetailsJsp = new HtmlNext("/admin/scheduledjob/details.jsp");
 
     /** The path of the HTML: /admin/scheduledjob/edit.jsp */
     HtmlNext path_AdminScheduledjob_EditJsp = new HtmlNext("/admin/scheduledjob/edit.jsp");
@@ -221,8 +221,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/searchlist/index.jsp */
     HtmlNext path_AdminSearchlist_IndexJsp = new HtmlNext("/admin/searchlist/index.jsp");
 
-    /** The path of the HTML: /admin/suggestbadword/confirm.jsp */
-    HtmlNext path_AdminSuggestbadword_ConfirmJsp = new HtmlNext("/admin/suggestbadword/confirm.jsp");
+    /** The path of the HTML: /admin/suggestbadword/details.jsp */
+    HtmlNext path_AdminSuggestbadword_DetailsJsp = new HtmlNext("/admin/suggestbadword/details.jsp");
 
     /** The path of the HTML: /admin/suggestbadword/download.jsp */
     HtmlNext path_AdminSuggestbadword_DownloadJsp = new HtmlNext("/admin/suggestbadword/download.jsp");
@@ -236,8 +236,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/suggestbadword/upload.jsp */
     HtmlNext path_AdminSuggestbadword_UploadJsp = new HtmlNext("/admin/suggestbadword/upload.jsp");
 
-    /** The path of the HTML: /admin/suggestelevateword/confirm.jsp */
-    HtmlNext path_AdminSuggestelevateword_ConfirmJsp = new HtmlNext("/admin/suggestelevateword/confirm.jsp");
+    /** The path of the HTML: /admin/suggestelevateword/details.jsp */
+    HtmlNext path_AdminSuggestelevateword_DetailsJsp = new HtmlNext("/admin/suggestelevateword/details.jsp");
 
     /** The path of the HTML: /admin/suggestelevateword/download.jsp */
     HtmlNext path_AdminSuggestelevateword_DownloadJsp = new HtmlNext("/admin/suggestelevateword/download.jsp");
@@ -257,8 +257,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/systeminfo/index.jsp */
     HtmlNext path_AdminSysteminfo_IndexJsp = new HtmlNext("/admin/systeminfo/index.jsp");
 
-    /** The path of the HTML: /admin/user/confirm.jsp */
-    HtmlNext path_AdminUser_ConfirmJsp = new HtmlNext("/admin/user/confirm.jsp");
+    /** The path of the HTML: /admin/user/details.jsp */
+    HtmlNext path_AdminUser_DetailsJsp = new HtmlNext("/admin/user/details.jsp");
 
     /** The path of the HTML: /admin/user/edit.jsp */
     HtmlNext path_AdminUser_EditJsp = new HtmlNext("/admin/user/edit.jsp");
@@ -266,8 +266,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/user/index.jsp */
     HtmlNext path_AdminUser_IndexJsp = new HtmlNext("/admin/user/index.jsp");
 
-    /** The path of the HTML: /admin/webauthentication/confirm.jsp */
-    HtmlNext path_AdminWebauthentication_ConfirmJsp = new HtmlNext("/admin/webauthentication/confirm.jsp");
+    /** The path of the HTML: /admin/webauthentication/details.jsp */
+    HtmlNext path_AdminWebauthentication_DetailsJsp = new HtmlNext("/admin/webauthentication/details.jsp");
 
     /** The path of the HTML: /admin/webauthentication/edit.jsp */
     HtmlNext path_AdminWebauthentication_EditJsp = new HtmlNext("/admin/webauthentication/edit.jsp");
@@ -275,8 +275,8 @@ public interface FessHtmlPath {
     /** The path of the HTML: /admin/webauthentication/index.jsp */
     HtmlNext path_AdminWebauthentication_IndexJsp = new HtmlNext("/admin/webauthentication/index.jsp");
 
-    /** The path of the HTML: /admin/webconfig/confirm.jsp */
-    HtmlNext path_AdminWebconfig_ConfirmJsp = new HtmlNext("/admin/webconfig/confirm.jsp");
+    /** The path of the HTML: /admin/webconfig/details.jsp */
+    HtmlNext path_AdminWebconfig_DetailsJsp = new HtmlNext("/admin/webconfig/details.jsp");
 
     /** The path of the HTML: /admin/webconfig/edit.jsp */
     HtmlNext path_AdminWebconfig_EditJsp = new HtmlNext("/admin/webconfig/edit.jsp");

+ 10 - 2
src/main/resources/fess_label.properties

@@ -1234,14 +1234,22 @@ labels.crud_button_edit=Edit
 labels.crud_button_confirm=Confirm
 labels.crud_button_search=Search
 labels.crud_button_reset=Reset
-labels.crud_link_create_new=Create New
+labels.crud_button_cancel=Cancel
+labels.crud_link_create=Create New
 labels.crud_link_delete=Delete
 labels.crud_link_back=Back
 labels.crud_link_edit=Edit
+labels.crud_link_details=Details
+labels.crud_link_list=List
 labels.crud_link_next_page=Next
 labels.crud_link_prev_page=Prev
-labels.crud_title_details=Details
+labels.crud_title_list=List
+labels.crud_title_create=Create
+labels.crud_title_edit=Edit
+labels.crud_title_delete=Confirm to delete
 labels.crud_title_confirm=Confirmation
+labels.crud_title_details=Details
+labels.crud_delete_confirmation=Do you really want to delete it?
 labels.admin_brand_title=Fess
 labels.admin_dashboard_title=Dashboard
 labels.admin_toggle_navi=Toggle navigation

+ 0 - 177
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp

@@ -1,177 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.boost_document_rule_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="boostDocumentRule" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.boost_document_rule_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/boostdocumentrule">
-							<la:message key="labels.boost_document_rule_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.boost_document_rule_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.boost_document_rule_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.boost_document_rule_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.boost_document_rule_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/boostdocumentrule"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.boost_document_rule_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.boost_document_rule_url_expr" /></th>
-												<td>${f:h(urlExpr)}<la:hidden property="urlExpr" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.boost_document_rule_boost_expr" /></th>
-												<td>${f:h(boostExpr)}<la:hidden property="boostExpr" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.boost_document_rule_sort_order" /></th>
-												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.boost_document_rule_button_back" />">
-											<la:message key="labels.boost_document_rule_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.boost_document_rule_button_create" />">
-											<la:message key="labels.boost_document_rule_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.boost_document_rule_button_back" />">
-											<la:message key="labels.boost_document_rule_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.boost_document_rule_button_update" />">
-											<la:message key="labels.boost_document_rule_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.boost_document_rule_button_back" />">
-											<la:message key="labels.boost_document_rule_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.boost_document_rule_button_delete" />">
-											<la:message key="labels.boost_document_rule_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.boost_document_rule_button_back" />">
-											<la:message key="labels.boost_document_rule_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.boost_document_rule_button_edit" />">
-											<la:message key="labels.boost_document_rule_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.boost_document_rule_button_delete" />">
-											<la:message key="labels.boost_document_rule_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 87 - 0
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/details.jsp

@@ -0,0 +1,87 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.boost_document_rule_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="boostDocumentRule" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.boost_document_rule_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.boost_document_rule_url_expr" /></th>
+												<td>${f:h(urlExpr)}<la:hidden property="urlExpr" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.boost_document_rule_boost_expr" /></th>
+												<td>${f:h(boostExpr)}<la:hidden property="boostExpr" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.boost_document_rule_sort_order" /></th>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 6 - 68
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp

@@ -13,41 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="boostDocumentRule" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.boost_document_rule_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/boostdocumentrule">
-							<la:message key="labels.boost_document_rule_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.boost_document_rule_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -62,20 +35,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.boost_document_rule_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.boost_document_rule_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/boostdocumentrule"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.boost_document_rule_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -86,7 +46,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="urlExpr" class="col-sm-3 control-label"><la:message
@@ -110,37 +69,16 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.boost_document_rule_button_back" />">
-											<la:message key="labels.boost_document_rule_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.boost_document_rule_button_confirm" />">
-											<la:message key="labels.boost_document_rule_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.boost_document_rule_button_back" />">
-											<la:message key="labels.boost_document_rule_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.boost_document_rule_button_confirm" />">
-											<la:message key="labels.boost_document_rule_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>

+ 28 - 75
src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp

@@ -13,35 +13,21 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="boostDocumentRule" />
 		</jsp:include>
-
 		<div class="content-wrapper">
 			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.boost_document_rule_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/boostdocumentrule">
-							<la:message key="labels.boost_document_rule_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.boost_document_rule_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.boost_document_rule_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -59,72 +45,39 @@
 									</p>
 								</c:if>
 								<c:if test="${boostDocumentRulePager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message
-														key="labels.boost_document_rule_list_url_expr" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${boostDocumentRuleItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/boostdocumentrule/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.urlExpr)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message
+																key="labels.boost_document_rule_list_url_expr" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${boostDocumentRuleItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/boostdocumentrule/details/4/${f:u(data.id)}">
+															<td>${f:h(data.urlExpr)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${boostDocumentRulePager}"
+										scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(boostDocumentRulePager.currentPageNumber)}"
-										arg1="${f:h(boostDocumentRulePager.allPageCount)}"
-										arg2="${f:h(boostDocumentRulePager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${boostDocumentRulePager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${boostDocumentRulePager.currentPageNumber - 1}">
-												<la:message key="labels.boost_document_rule_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!boostDocumentRulePager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.boost_document_rule_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${boostDocumentRulePager.pageNumberList}">
-										<li
-											<c:if test="${p == boostDocumentRulePager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${boostDocumentRulePager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${boostDocumentRulePager.currentPageNumber + 1}">
-												<la:message key="labels.boost_document_rule_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!boostDocumentRulePager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.boost_document_rule_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 20
src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp → src/main/webapp/WEB-INF/view/admin/crawlingsession/details.jsp

@@ -58,26 +58,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.crawling_session_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.crawling_session_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.crawling_session_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.crawling_session_link_details" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/crawlingsession"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.crawling_session_link_list" />
-										</la:link>
-									</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">

+ 1 - 4
src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp

@@ -13,9 +13,7 @@
 			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="crawlingSession" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.crawling_session_configuration" />
@@ -95,7 +93,7 @@
 														<c:forEach var="data" varStatus="s"
 															items="${crawlingSessionItems}">
 															<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-																data-href="${contextPath}/admin/crawlingsession/confirmpage/4/${f:u(data.id)}">
+																data-href="${contextPath}/admin/crawlingsession/details/4/${f:u(data.id)}">
 																<td>${f:h(data.sessionId)}</td>
 																<td><fmt:formatDate
 																		value="${fe:date(data.createdTime)}"
@@ -201,7 +199,6 @@
 				</div>
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 7 - 99
src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp → src/main/webapp/WEB-INF/view/admin/dataconfig/details.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="dataConfig" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.data_crawling_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/dataconfig">
-							<la:message key="labels.data_crawling_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form>
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
@@ -60,30 +34,10 @@
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.data_crawling_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.data_crawling_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.data_crawling_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.data_crawling_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/dataconfig"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.data_crawling_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
-								<%-- Box Body --%>
+								<!-- /.box-header -->
 								<div class="box-body">
 									<%-- Message --%>
 									<div>
@@ -173,64 +127,18 @@
 										</tbody>
 									</table>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.data_crawling_button_back" />">
-											<la:message key="labels.data_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.data_crawling_button_create" />">
-											<la:message key="labels.data_crawling_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.data_crawling_button_back" />">
-											<la:message key="labels.data_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.data_crawling_button_update" />">
-											<la:message key="labels.data_crawling_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.data_crawling_button_back" />">
-											<la:message key="labels.data_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.data_crawling_button_delete" />">
-											<la:message key="labels.data_crawling_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.data_crawling_button_back" />">
-											<la:message key="labels.data_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.data_crawling_button_edit" />">
-											<la:message key="labels.data_crawling_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.data_crawling_button_delete" />">
-											<la:message key="labels.data_crawling_button_delete" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 7 - 69
src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="dataConfig" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.data_crawling_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/dataconfig">
-							<la:message key="labels.data_crawling_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.data_crawling_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -60,24 +34,10 @@
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
-								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.data_crawling_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.data_crawling_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/dataconfig"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.data_crawling_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
-								<%-- Box Body --%>
+								<!-- /.box-header -->
 								<div class="box-body">
 									<%-- Message --%>
 									<div>
@@ -169,40 +129,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.data_crawling_button_back" />">
-											<la:message key="labels.data_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.data_crawling_button_confirm" />">
-											<la:message key="labels.data_crawling_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.data_crawling_button_back" />">
-											<la:message key="labels.data_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.data_crawling_button_confirm" />">
-											<la:message key="labels.data_crawling_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 37 - 82
src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp

@@ -2,7 +2,8 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /></title>
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.data_crawling_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -14,48 +15,28 @@
 		</jsp:include>
 
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.data_crawling_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/dataconfig">
-							<la:message key="labels.data_crawling_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
-							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.data_crawling_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage"
-										styleClass="btn btn-success btn-xs">
-										<la:message key="labels.data_crawling_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
-							<%-- Box Body --%>
+							<!-- /.box-header -->
 							<div class="box-body">
 								<%-- Message --%>
 								<div>
 									<la:info id="msg" message="true">
-										<div class="alert alert-info">
-											${msg}
-										</div>
+										<div class="alert alert-info">${msg}</div>
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${dataConfigPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -63,70 +44,44 @@
 									</p>
 								</c:if>
 								<c:if test="${dataConfigPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.name" /></th>
-												<th><la:message key="labels.available" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${dataConfigItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/dataconfig/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-													<td style="text-align: center;">
-														<c:if test="${data.available=='true'}">
-															<la:message key="labels.enabled" />
-														</c:if> <c:if test="${data.available=='false'}">
-															<la:message key="labels.disabled" />
-														</c:if>
-													</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.name" /></th>
+														<th><la:message key="labels.available" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${dataConfigItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/dataconfig/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+															<td style="text-align: center;"><c:if
+																	test="${data.available=='true'}">
+																	<la:message key="labels.enabled" />
+																</c:if> <c:if test="${data.available=='false'}">
+																	<la:message key="labels.disabled" />
+																</c:if></td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+											<c:set var="pager" value="${dataConfigPager}" scope="request" />
+											<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
+										</div>
+									</div>
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(dataConfigPager.currentPageNumber)}"
-										arg1="${f:h(dataConfigPager.allPageCount)}" arg2="${f:h(dataConfigPager.allRecordCount)}"
-									/></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${dataConfigPager.existPrePage}">
-										<li class="prev"><la:link href="list/${dataConfigPager.currentPageNumber - 1}">
-												<la:message key="labels.data_crawling_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!dataConfigPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message key="labels.data_crawling_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s" items="${dataConfigPager.pageNumberList}">
-										<li <c:if test="${p == dataConfigPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link>
-										</li>
-									</c:forEach>
-									<c:if test="${dataConfigPager.existNextPage}">
-										<li class="next"><la:link href="list/${dataConfigPager.currentPageNumber + 1}">
-												<la:message key="labels.data_crawling_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!dataConfigPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message key="labels.data_crawling_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 2 - 6
src/main/webapp/WEB-INF/view/admin/dict/index.jsp

@@ -69,18 +69,14 @@
 										</tbody>
 									</table>
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 6 - 80
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp → src/main/webapp/WEB-INF/view/admin/dict/kuromoji/details.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="system" />
 			<jsp:param name="menuType" value="dict" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.dict_kuromoji_title" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="list/1?dictId=${f:u(dictId)}">
-							<la:message key="labels.dict_kuromoji_list_link" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_kuromoji_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_kuromoji_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_kuromoji_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_kuromoji_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form>
 					<la:hidden property="crudMode" />
 					<la:hidden property="dictId" />
@@ -74,8 +48,7 @@
 										</c:if>
 									</h3>
 									<div class="btn-group pull-right">
-										<la:link href="../"
-											styleClass="btn btn-default btn-xs">
+										<la:link href="../" styleClass="btn btn-default btn-xs">
 											<la:message key="labels.dict_list_link" />
 										</la:link>
 										<la:link href="list/1?dictId=${f:u(dictId)}"
@@ -105,7 +78,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<table class="table table-bordered">
 										<tbody>
@@ -130,64 +102,18 @@
 										</tbody>
 									</table>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.dict_kuromoji_button_back" />">
-											<la:message key="labels.dict_kuromoji_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.dict_kuromoji_button_create" />">
-											<la:message key="labels.dict_kuromoji_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.dict_kuromoji_button_back" />">
-											<la:message key="labels.dict_kuromoji_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.dict_kuromoji_button_update" />">
-											<la:message key="labels.dict_kuromoji_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_kuromoji_button_back" />">
-											<la:message key="labels.dict_kuromoji_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.dict_kuromoji_button_delete" />">
-											<la:message key="labels.dict_kuromoji_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_kuromoji_button_back" />">
-											<la:message key="labels.dict_kuromoji_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.dict_kuromoji_button_edit" />">
-											<la:message key="labels.dict_kuromoji_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.dict_kuromoji_button_delete" />">
-											<la:message key="labels.dict_kuromoji_button_delete" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp

@@ -21,6 +21,7 @@
 				<h1>
 					<la:message key="labels.dict_kuromoji_title" />
 				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="list/0?dictId=${dictId}">
 							<la:message key="labels.dict_kuromoji_link_download" />

+ 4 - 32
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp

@@ -14,17 +14,12 @@
 			<jsp:param name="menuType" value="dict" />
 		</jsp:include>
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.dict_kuromoji_title" />
 				</h1>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<la:hidden property="dictId" />
@@ -76,7 +71,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="token" class="col-sm-3 control-label"><la:message
@@ -107,40 +101,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_kuromoji_button_back" />">
-											<la:message key="labels.dict_kuromoji_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.dict_kuromoji_button_confirm" />">
-											<la:message key="labels.dict_kuromoji_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_kuromoji_button_back" />">
-											<la:message key="labels.dict_kuromoji_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.dict_kuromoji_button_confirm" />">
-											<la:message key="labels.dict_kuromoji_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 5
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp

@@ -18,11 +18,7 @@
 				<h1>
 					<la:message key="labels.wizard_start_title" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/dict/">
-							<la:message key="labels.dict_kuromoji_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 
 			<section class="content">

+ 28 - 72
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp

@@ -13,23 +13,14 @@
 			<jsp:param name="menuCategoryType" value="system" />
 			<jsp:param name="menuType" value="dict" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.dict_kuromoji_title" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="">
-							<la:message key="labels.dict_kuromoji_list_link" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
@@ -39,8 +30,7 @@
 									<la:message key="labels.dict_kuromoji_list_link" />
 								</h3>
 								<div class="btn-group pull-right">
-									<la:link href="/admin/dict"
-										styleClass="btn btn-default btn-xs">
+									<la:link href="/admin/dict" styleClass="btn btn-default btn-xs">
 										<la:message key="labels.dict_list_link" />
 									</la:link>
 									<la:link href="list/1?dictId=${f:u(dictId)}"
@@ -77,73 +67,39 @@
 									</p>
 								</c:if>
 								<c:if test="${kuromojiPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.dict_kuromoji_token" /></th>
-												<th><la:message key="labels.dict_kuromoji_reading" /></th>
-											</tr>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${kuromojiItemItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/dict/kuromoji/confirmpage/${f:u(dictId)}/4/${f:u(data.id)}">
-													<td>${f:h(data.token)}</td>
-													<td>${f:h(data.reading)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.dict_kuromoji_token" /></th>
+														<th><la:message key="labels.dict_kuromoji_reading" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${kuromojiItemItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/dict/kuromoji/details/${f:u(dictId)}/4/${f:u(data.id)}">
+															<td>${f:h(data.token)}</td>
+															<td>${f:h(data.reading)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${kuromojiPager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
 							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(kuromojiPager.currentPageNumber)}"
-										arg1="${f:h(kuromojiPager.allPageCount)}"
-										arg2="${f:h(kuromojiPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${kuromojiPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${kuromojiPager.currentPageNumber - 1}">
-												<la:message key="labels.dict_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!kuromojiPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.dict_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${kuromojiPager.pageNumberList}">
-										<li
-											<c:if test="${p == kuromojiPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${kuromojiPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${kuromojiPager.currentPageNumber + 1}">
-												<la:message key="labels.dict_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!kuromojiPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.dict_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
-							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp

@@ -21,6 +21,7 @@
 				<h1>
 					<la:message key="labels.dict_kuromoji_title" />
 				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="list/0?dictId=${dictId}">
 							<la:message key="labels.dict_kuromoji_link_upload" />

+ 5 - 78
src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp → src/main/webapp/WEB-INF/view/admin/dict/synonym/details.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="system" />
 			<jsp:param name="menuType" value="dict" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.dict_synonym_title" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="list/1?dictId=${f:u(dictId)}">
-							<la:message key="labels.dict_synonym_list_link" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_synonym_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_synonym_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_synonym_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.dict_synonym_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form>
 					<la:hidden property="crudMode" />
 					<la:hidden property="dictId" />
@@ -105,7 +79,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<table class="table table-bordered">
 										<tbody>
@@ -121,64 +94,18 @@
 										</tbody>
 									</table>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_synonym_button_back" />">
-											<la:message key="labels.dict_synonym_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.dict_synonym_button_create" />">
-											<la:message key="labels.dict_synonym_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_synonym_button_back" />">
-											<la:message key="labels.dict_synonym_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.dict_synonym_button_update" />">
-											<la:message key="labels.dict_synonym_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_synonym_button_back" />">
-											<la:message key="labels.dict_synonym_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.dict_synonym_button_delete" />">
-											<la:message key="labels.dict_synonym_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_synonym_button_back" />">
-											<la:message key="labels.dict_synonym_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.dict_synonym_button_edit" />">
-											<la:message key="labels.dict_synonym_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.dict_synonym_button_delete" />">
-											<la:message key="labels.dict_synonym_button_delete" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp

@@ -21,6 +21,7 @@
 				<h1>
 					<la:message key="labels.dict_synonym_title" />
 				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="list/0?dictId=${dictId}">
 							<la:message key="labels.dict_synonym_link_download" />

+ 4 - 32
src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp

@@ -14,17 +14,12 @@
 			<jsp:param name="menuType" value="dict" />
 		</jsp:include>
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.dict_synonym_title" />
 				</h1>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<la:hidden property="dictId" />
@@ -76,7 +71,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="term" class="col-sm-3 control-label"><la:message
@@ -95,40 +89,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_synonym_button_back" />">
-											<la:message key="labels.dict_synonym_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.dict_synonym_button_confirm" />">
-											<la:message key="labels.dict_synonym_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.dict_synonym_button_back" />">
-											<la:message key="labels.dict_synonym_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.dict_synonym_button_confirm" />">
-											<la:message key="labels.dict_synonym_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 5
src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp

@@ -18,11 +18,7 @@
 				<h1>
 					<la:message key="labels.wizard_start_title" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/dict/">
-							<la:message key="labels.dict_synonym_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 
 			<section class="content">

+ 28 - 71
src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp

@@ -13,23 +13,14 @@
 			<jsp:param name="menuCategoryType" value="system" />
 			<jsp:param name="menuType" value="dict" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.dict_synonym_title" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="">
-							<la:message key="labels.dict_synonym_list_link" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
@@ -39,8 +30,7 @@
 									<la:message key="labels.dict_synonym_list_link" />
 								</h3>
 								<div class="btn-group pull-right">
-									<la:link href="/admin/dict"
-										styleClass="btn btn-default btn-xs">
+									<la:link href="/admin/dict" styleClass="btn btn-default btn-xs">
 										<la:message key="labels.dict_list_link" />
 									</la:link>
 									<la:link href="list/1?dictId=${f:u(dictId)}"
@@ -77,72 +67,39 @@
 									</p>
 								</c:if>
 								<c:if test="${synonymPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.dict_synonym_source" /></th>
-												<th><la:message key="labels.dict_synonym_target" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${synonymItemItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/dict/synonym/confirmpage/${f:u(dictId)}/4/${f:u(data.id)}">
-													<td>${f:h(data.inputs)}</td>
-													<td>${f:h(data.outputs)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.dict_synonym_source" /></th>
+														<th><la:message key="labels.dict_synonym_target" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${synonymItemItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/dict/synonym/details/${f:u(dictId)}/4/${f:u(data.id)}">
+															<td>${f:h(data.inputs)}</td>
+															<td>${f:h(data.outputs)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${synonymPager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
 							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(synonymPager.currentPageNumber)}"
-										arg1="${f:h(synonymPager.allPageCount)}"
-										arg2="${f:h(synonymPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${synonymPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${synonymPager.currentPageNumber - 1}">
-												<la:message key="labels.dict_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!synonymPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.dict_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${synonymPager.pageNumberList}">
-										<li
-											<c:if test="${p == synonymPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${synonymPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${synonymPager.currentPageNumber + 1}">
-												<la:message key="labels.dict_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!synonymPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.dict_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
-							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp

@@ -21,6 +21,7 @@
 				<h1>
 					<la:message key="labels.dict_synonym_title" />
 				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="list/0?dictId=${dictId}">
 							<la:message key="labels.dict_synonym_link_upload" />

+ 1 - 21
src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp → src/main/webapp/WEB-INF/view/admin/failureurl/details.jsp

@@ -21,27 +21,7 @@
 				<h1>
 					<la:message key="labels.failure_url_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/failureurl">
-							<la:message key="labels.failure_url_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.failure_url_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.failure_url_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.failure_url_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.failure_url_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 
 			<section class="content">

+ 2 - 6
src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp

@@ -21,11 +21,7 @@
 				<h1>
 					<la:message key="labels.failure_url_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/failureurl">
-							<la:message key="labels.failure_url_configuration" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 			<section class="content">
 				<div class="row">
@@ -120,7 +116,7 @@
 																<td><div style="width: 380px; overflow-x: auto;">${f:h(data.url)}</div></td>
 																<td>${f:h(data.lastAccessTimeForList)}</td>
 																<td style="overflow-x: auto;"><la:link
-																		href="confirmpage/4/${f:u(data.id)}">
+																		href="details/4/${f:u(data.id)}">
 																		<la:message key="labels.failure_url_link_confirm" />
 																	</la:link> <la:link href="deletepage/3/${f:u(data.id)}">
 																		<la:message key="labels.crud_link_delete" />

+ 0 - 203
src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp

@@ -1,203 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.file_authentication_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="fileAuthentication" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.file_authentication_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/fileauthentication">
-							<la:message key="labels.file_authentication_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.file_authentication_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.file_authentication_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.file_authentication_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.file_authentication_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/fileauthentication"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.file_authentication_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.file_authentication_hostname" /></th>
-												<td>${f:h(hostname)}<la:hidden property="hostname" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.file_authentication_port" /></th>
-												<td>${f:h(port)}<la:hidden property="port" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.file_authentication_scheme" /></th>
-												<td><c:forEach var="item"
-														items="${protocolSchemeItems}">
-														<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <la:hidden property="protocolScheme" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.file_authentication_username" /></th>
-												<td>${f:h(username)}<la:hidden property="username" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.file_authentication_password" /></th>
-												<td><c:if test="${password!=''}">******</c:if> <la:hidden
-														property="password" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.file_authentication_parameters" /></th>
-												<td>${f:br(f:h(parameters))}<la:hidden
-														property="parameters" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.file_authentication_file_crawling_config" /></th>
-												<td><c:forEach var="item" items="${fileConfigItems}">
-														<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <la:hidden property="fileConfigId" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_authentication_button_back" />">
-											<la:message key="labels.file_authentication_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.file_authentication_button_create" />">
-											<la:message key="labels.file_authentication_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_authentication_button_back" />">
-											<la:message key="labels.file_authentication_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.file_authentication_button_update" />">
-											<la:message key="labels.file_authentication_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_authentication_button_back" />">
-											<la:message key="labels.file_authentication_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.file_authentication_button_delete" />">
-											<la:message key="labels.file_authentication_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_authentication_button_back" />">
-											<la:message key="labels.file_authentication_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.file_authentication_button_edit" />">
-											<la:message key="labels.file_authentication_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.file_authentication_button_delete" />">
-											<la:message key="labels.file_authentication_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 111 - 0
src/main/webapp/WEB-INF/view/admin/fileauthentication/details.jsp

@@ -0,0 +1,111 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.file_authentication_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.file_authentication_hostname" /></th>
+												<td>${f:h(hostname)}<la:hidden property="hostname" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.file_authentication_port" /></th>
+												<td>${f:h(port)}<la:hidden property="port" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.file_authentication_scheme" /></th>
+												<td><c:forEach var="item"
+														items="${protocolSchemeItems}">
+														<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <la:hidden property="protocolScheme" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.file_authentication_username" /></th>
+												<td>${f:h(username)}<la:hidden property="username" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.file_authentication_password" /></th>
+												<td><c:if test="${password!=''}">******</c:if> <la:hidden
+														property="password" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.file_authentication_parameters" /></th>
+												<td>${f:br(f:h(parameters))}<la:hidden
+														property="parameters" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.file_authentication_file_crawling_config" /></th>
+												<td><c:forEach var="item" items="${fileConfigItems}">
+														<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <la:hidden property="fileConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 6 - 69
src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="fileAuthentication" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.file_authentication_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/fileauthentication">
-							<la:message key="labels.file_authentication_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_authentication_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -55,27 +29,13 @@
 					</c:if>
 					<la:hidden property="createdBy" />
 					<la:hidden property="createdTime" />
-
 					<div class="row">
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.file_authentication_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.file_authentication_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/fileauthentication"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.file_authentication_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -86,7 +46,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="hostname" class="col-sm-3 control-label"><la:message
@@ -148,40 +107,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_authentication_button_back" />">
-											<la:message key="labels.file_authentication_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.file_authentication_button_confirm" />">
-											<la:message key="labels.file_authentication_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_authentication_button_back" />">
-											<la:message key="labels.file_authentication_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.file_authentication_button_confirm" />">
-											<la:message key="labels.file_authentication_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 8 - 62
src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp

@@ -13,23 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="fileAuthentication" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.file_authentication_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/fileauthentication">
-							<la:message key="labels.file_authentication_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<c:if test="${!displayCreateLink}">
@@ -41,14 +32,7 @@
 							<div class="box box-primary">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<la:message key="labels.file_authentication_link_list" />
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="createpage" styleClass="btn btn-success btn-xs">
-											<la:message key="labels.file_authentication_link_create_new" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -59,7 +43,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- List --%>
 									<c:if test="${fileAuthenticationPager.allRecordCount == 0}">
 										<p class="callout callout-info">
@@ -80,7 +63,7 @@
 												<c:forEach var="data" varStatus="s"
 													items="${fileAuthenticationItems}">
 													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-														data-href="${contextPath}/admin/fileauthentication/confirmpage/4/${f:u(data.id)}">
+														data-href="${contextPath}/admin/fileauthentication/details/4/${f:u(data.id)}">
 														<td><c:if
 																test="${data.hostname==null||data.hostname==''}">
 																<la:message key="labels.file_authentication_any" />
@@ -94,56 +77,19 @@
 												</c:forEach>
 											</tbody>
 										</table>
+										<c:set var="pager" value="${fileAuthenticationPager}"
+											scope="request" />
+										<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 									</c:if>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<%-- Paging Info --%>
-									<span><la:message key="labels.pagination_page_guide_msg"
-											arg0="${f:h(fileAuthenticationPager.currentPageNumber)}"
-											arg1="${f:h(fileAuthenticationPager.allPageCount)}"
-											arg2="${f:h(fileAuthenticationPager.allRecordCount)}" /></span>
-
-									<%-- Paging Navigation --%>
-									<ul class="pagination pagination-sm no-margin pull-right">
-										<c:if test="${fileAuthenticationPager.existPrePage}">
-											<li class="prev"><la:link
-													href="list/${fileAuthenticationPager.currentPageNumber - 1}">
-													<la:message key="labels.file_authentication_link_prev_page" />
-												</la:link></li>
-										</c:if>
-										<c:if test="${!fileAuthenticationPager.existPrePage}">
-											<li class="prev disabled"><a href="#"><la:message
-														key="labels.file_authentication_link_prev_page" /></a></li>
-										</c:if>
-										<c:forEach var="p" varStatus="s"
-											items="${fileAuthenticationPager.pageNumberList}">
-											<li
-												<c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>><la:link
-													href="list/${p}">${p}</la:link></li>
-										</c:forEach>
-										<c:if test="${fileAuthenticationPager.existNextPage}">
-											<li class="next"><la:link
-													href="list/${fileAuthenticationPager.currentPageNumber + 1}">
-													<la:message key="labels.file_authentication_link_next_page" />
-												</la:link></li>
-										</c:if>
-										<c:if test="${!fileAuthenticationPager.existNextPage}">
-											<li class="next disabled"><a href="#"><la:message
-														key="labels.file_authentication_link_next_page" /></a></li>
-										</c:if>
-									</ul>
-
 								</div>
+								<!-- /.box-body -->
 							</div>
+							<!-- /.box -->
 						</c:if>
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 9 - 102
src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp → src/main/webapp/WEB-INF/view/admin/fileconfig/details.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="fileConfig" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.file_crawling_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/fileconfig">
-							<la:message key="labels.file_crawling_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form>
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
@@ -60,30 +34,10 @@
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.file_crawling_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.file_crawling_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.file_crawling_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.file_crawling_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/fileconfig"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.file_crawling_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
-								<%-- Box Body --%>
+								<!-- /.box-header -->
 								<div class="box-body">
 									<%-- Message --%>
 									<div>
@@ -92,7 +46,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<table class="table table-bordered">
 										<tbody>
@@ -152,8 +105,8 @@
 											<tr>
 												<th><la:message key="labels.interval_time" /></th>
 												<td>${f:h(intervalTime)}<la:hidden
-														property="intervalTime" />
-													<la:message key="labels.millisec" /></td>
+														property="intervalTime" /> <la:message
+														key="labels.millisec" /></td>
 											</tr>
 											<tr>
 												<th><la:message key="labels.boost" /></th>
@@ -204,64 +157,18 @@
 										</tbody>
 									</table>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_crawling_button_back" />">
-											<la:message key="labels.file_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.file_crawling_button_create" />">
-											<la:message key="labels.file_crawling_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_crawling_button_back" />">
-											<la:message key="labels.file_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.file_crawling_button_update" />">
-											<la:message key="labels.file_crawling_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_crawling_button_back" />">
-											<la:message key="labels.file_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.file_crawling_button_delete" />">
-											<la:message key="labels.file_crawling_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_crawling_button_back" />">
-											<la:message key="labels.file_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.file_crawling_button_edit" />">
-											<la:message key="labels.file_crawling_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.file_crawling_button_delete" />">
-											<la:message key="labels.file_crawling_button_delete" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 7 - 70
src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="fileConfig" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.file_crawling_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/fileconfig">
-							<la:message key="labels.file_crawling_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.file_crawling_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -60,24 +34,10 @@
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
-								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.file_crawling_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.file_crawling_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/fileconfig"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.file_crawling_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
-								<%-- Box Body --%>
+								<!-- /.box-header -->
 								<div class="box-body">
 									<%-- Message --%>
 									<div>
@@ -86,7 +46,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -217,40 +176,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_crawling_button_back" />">
-											<la:message key="labels.file_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.file_crawling_button_confirm" />">
-											<la:message key="labels.file_crawling_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.file_crawling_button_back" />">
-											<la:message key="labels.file_crawling_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.file_crawling_button_confirm" />">
-											<la:message key="labels.file_crawling_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 34 - 82
src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp

@@ -15,34 +15,20 @@
 		</jsp:include>
 
 		<div class="content-wrapper">
-
 			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.file_crawling_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/fileconfig">
-							<la:message key="labels.file_crawling_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.file_crawling_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.file_crawling_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -53,7 +39,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${fileConfigPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,78 +46,45 @@
 									</p>
 								</c:if>
 								<c:if test="${fileConfigPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.name" /></th>
-												<th><la:message key="labels.available" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${fileConfigItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/fileconfig/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-													<td style="text-align: center;"><c:if
-															test="${data.available=='true'}">
-															<la:message key="labels.enabled" />
-														</c:if> <c:if test="${data.available=='false'}">
-															<la:message key="labels.disabled" />
-														</c:if></td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.name" /></th>
+														<th><la:message key="labels.available" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${fileConfigItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/fileconfig/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+															<td style="text-align: center;"><c:if
+																	test="${data.available=='true'}">
+																	<la:message key="labels.enabled" />
+																</c:if> <c:if test="${data.available=='false'}">
+																	<la:message key="labels.disabled" />
+																</c:if></td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+											<c:set var="pager" value="${fileConfigPager}" scope="request" />
+											<c:import
+												url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
+										</div>
+									</div>
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(fileConfigPager.currentPageNumber)}"
-										arg1="${f:h(fileConfigPager.allPageCount)}"
-										arg2="${f:h(fileConfigPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${fileConfigPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${fileConfigPager.currentPageNumber - 1}">
-												<la:message key="labels.file_crawling_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!fileConfigPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.file_crawling_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${fileConfigPager.pageNumberList}">
-										<li
-											<c:if test="${p == fileConfigPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${fileConfigPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${fileConfigPager.currentPageNumber + 1}">
-												<la:message key="labels.file_crawling_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!fileConfigPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.file_crawling_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 169
src/main/webapp/WEB-INF/view/admin/group/confirm.jsp

@@ -1,169 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.group_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="user" />
-			<jsp:param name="menuType" value="group" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.group_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/group">
-							<la:message key="labels.group_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.group_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.group_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.group_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.group_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/group"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.group_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.group_name" /></th>
-												<td>${f:h(name)}<la:hidden property="name" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.group_button_back" />">
-											<la:message key="labels.group_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.group_button_create" />">
-											<la:message key="labels.group_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.group_button_back" />">
-											<la:message key="labels.group_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.group_button_update" />">
-											<la:message key="labels.group_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.group_button_back" />">
-											<la:message key="labels.group_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.group_button_delete" />">
-											<la:message key="labels.group_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.group_button_back" />">
-											<la:message key="labels.group_button_back" />
-										</button>
-										<%--
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.group_button_edit" />">
-											<la:message key="labels.group_button_edit" />
-										</button>
-										--%>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.group_button_delete" />">
-											<la:message key="labels.group_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>
-

+ 75 - 0
src/main/webapp/WEB-INF/view/admin/group/details.jsp

@@ -0,0 +1,75 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.group_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="user" />
+			<jsp:param name="menuType" value="group" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.group_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.group_name" /></th>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>
+

+ 6 - 68
src/main/webapp/WEB-INF/view/admin/group/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="user" />
 			<jsp:param name="menuType" value="group" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.group_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/group">
-							<la:message key="labels.group_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.group_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -59,20 +33,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.group_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.group_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/group"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.group_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -83,7 +44,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -92,41 +52,19 @@
 											<la:text property="name" styleClass="form-control" />
 										</div>
 									</div>
-
 								</div>
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.group_button_back" />">
-											<la:message key="labels.group_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.group_button_confirm" />">
-											<la:message key="labels.group_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.group_button_back" />">
-											<la:message key="labels.group_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.group_button_confirm" />">
-											<la:message key="labels.group_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 25 - 76
src/main/webapp/WEB-INF/view/admin/group/index.jsp

@@ -13,36 +13,20 @@
 			<jsp:param name="menuCategoryType" value="user" />
 			<jsp:param name="menuType" value="group" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.group_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/group">
-							<la:message key="labels.group_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.group_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.group_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${groupPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,70 +44,36 @@
 									</p>
 								</c:if>
 								<c:if test="${groupPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.group_list_name" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${groupItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/group/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.group_list_name" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s" items="${groupItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/group/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${groupPager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(groupPager.currentPageNumber)}"
-										arg1="${f:h(groupPager.allPageCount)}"
-										arg2="${f:h(groupPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${groupPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${groupPager.currentPageNumber - 1}">
-												<la:message key="labels.group_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!groupPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.group_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${groupPager.pageNumberList}">
-										<li
-											<c:if test="${p == groupPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${groupPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${groupPager.currentPageNumber + 1}">
-												<la:message key="labels.group_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!groupPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.group_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 21
src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp

@@ -21,27 +21,7 @@
 				<h1>
 					<la:message key="labels.joblog_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/joblog">
-							<la:message key="labels.joblog_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.joblog_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.joblog_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.joblog_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.joblog_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 
 			<section class="content">

+ 45 - 76
src/main/webapp/WEB-INF/view/admin/joblog/index.jsp

@@ -2,7 +2,8 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.joblog_configuration" /></title>
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.joblog_configuration" /></title>
 <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
 </head>
 <body class="skin-blue sidebar-mini">
@@ -12,10 +13,7 @@
 			<jsp:param name="menuCategoryType" value="log" />
 			<jsp:param name="menuType" value="jobLog" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.joblog_configuration" />
@@ -26,9 +24,7 @@
 						</la:link></li>
 				</ol>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
@@ -43,13 +39,10 @@
 								<%-- Message --%>
 								<div>
 									<la:info id="msg" message="true">
-										<div class="alert alert-info">
-											${msg}
-										</div>
+										<div class="alert alert-info">${msg}</div>
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${jobLogPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -57,79 +50,55 @@
 									</p>
 								</c:if>
 								<c:if test="${jobLogPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.joblog_jobName" /></th>
-												<th><la:message key="labels.joblog_jobStatus" /></th>
-												<th><la:message key="labels.joblog_startTime" /></th>
-												<th><la:message key="labels.joblog_endTime" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${jobLogItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/joblog/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.jobName)}</td>
-													<td>${f:h(data.jobStatus)}</td>
-													<td><fmt:formatDate value="${fe:date(data.startTime)}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></td>
-													<td>
-														<c:if test="${data.endTime!=null}"><fmt:formatDate value="${fe:date(data.endTime)}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></c:if>
-														<c:if test="${data.endTime==null}"><la:message key="labels.none" /></c:if>
-													</td>
-													<td style="overflow-x: auto;">
-														<la:link href="confirmpage/4/${f:u(data.id)}">
-															<la:message key="labels.joblog_link_details" />
-														</la:link>
-														<la:link href="deletepage/3/${f:u(data.id)}">
-															<la:message key="labels.joblog_link_delete" />
-														</la:link>
-													</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.joblog_jobName" /></th>
+														<th><la:message key="labels.joblog_jobStatus" /></th>
+														<th><la:message key="labels.joblog_startTime" /></th>
+														<th><la:message key="labels.joblog_endTime" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s" items="${jobLogItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/joblog/details/4/${f:u(data.id)}">
+															<td>${f:h(data.jobName)}</td>
+															<td>${f:h(data.jobStatus)}</td>
+															<td><fmt:formatDate
+																	value="${fe:date(data.startTime)}"
+																	pattern="yyyy-MM-dd'T'HH:mm:ss" /></td>
+															<td><c:if test="${data.endTime!=null}">
+																	<fmt:formatDate value="${fe:date(data.endTime)}"
+																		pattern="yyyy-MM-dd'T'HH:mm:ss" />
+																</c:if> <c:if test="${data.endTime==null}">
+																	<la:message key="labels.none" />
+																</c:if></td>
+															<td style="overflow-x: auto;"><la:link
+																	href="details/4/${f:u(data.id)}">
+																	<la:message key="labels.joblog_link_details" />
+																</la:link> <la:link href="deletepage/3/${f:u(data.id)}">
+																	<la:message key="labels.joblog_link_delete" />
+																</la:link></td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${jobLogPager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(jobLogPager.currentPageNumber)}"
-										arg1="${f:h(jobLogPager.allPageCount)}" arg2="${f:h(jobLogPager.allRecordCount)}"
-									/></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${jobLogPager.existPrePage}">
-										<li class="prev"><la:link href="list/${jobLogPager.currentPageNumber - 1}">
-												<la:message key="labels.joblog_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!jobLogPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message key="labels.joblog_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s" items="${jobLogPager.pageNumberList}">
-										<li <c:if test="${p == jobLogPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link>
-										</li>
-									</c:forEach>
-									<c:if test="${jobLogPager.existNextPage}">
-										<li class="next"><la:link href="list/${jobLogPager.currentPageNumber + 1}">
-												<la:message key="labels.joblog_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!jobLogPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message key="labels.joblog_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 181
src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp

@@ -1,181 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.key_match_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="keyMatch" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.key_match_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/keymatch">
-							<la:message key="labels.key_match_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.key_match_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.key_match_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.key_match_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.key_match_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/keymatch"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.key_match_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="aalert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.key_match_term" /></th>
-												<td>${f:h(term)}<la:hidden property="term" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.key_match_query" /></th>
-												<td>${f:h(query)}<la:hidden property="query" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.key_match_size" /></th>
-												<td>${f:h(maxSize)}<la:hidden property="maxSize" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.key_match_boost" /></th>
-												<td>${f:h(boost)}<la:hidden property="boost" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.key_match_button_back" />">
-											<la:message key="labels.key_match_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.key_match_button_create" />">
-											<la:message key="labels.key_match_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.key_match_button_back" />">
-											<la:message key="labels.key_match_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.key_match_button_update" />">
-											<la:message key="labels.key_match_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.key_match_button_back" />">
-											<la:message key="labels.key_match_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.key_match_button_delete" />">
-											<la:message key="labels.key_match_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.key_match_button_back" />">
-											<la:message key="labels.key_match_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.key_match_button_edit" />">
-											<la:message key="labels.key_match_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.key_match_button_delete" />">
-											<la:message key="labels.key_match_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>
-

+ 88 - 0
src/main/webapp/WEB-INF/view/admin/keymatch/details.jsp

@@ -0,0 +1,88 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.key_match_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="keyMatch" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.key_match_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<!-- /.box-header -->
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="aalert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.key_match_term" /></th>
+												<td>${f:h(term)}<la:hidden property="term" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.key_match_query" /></th>
+												<td>${f:h(query)}<la:hidden property="query" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.key_match_size" /></th>
+												<td>${f:h(maxSize)}<la:hidden property="maxSize" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.key_match_boost" /></th>
+												<td>${f:h(boost)}<la:hidden property="boost" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>
+

+ 7 - 70
src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="keyMatch" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.key_match_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/keymatch">
-							<la:message key="labels.key_match_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.key_match_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -59,24 +33,10 @@
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
-								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.key_match_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.key_match_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/keymatch"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.key_match_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
-								<%-- Box Body --%>
+								<!-- /.box-header -->
 								<div class="box-body">
 									<%-- Message --%>
 									<div>
@@ -85,7 +45,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="term" class="col-sm-3 control-label"><la:message
@@ -115,41 +74,19 @@
 											<la:text property="boost" styleClass="form-control" />
 										</div>
 									</div>
-
 								</div>
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.key_match_button_back" />">
-											<la:message key="labels.key_match_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.key_match_button_confirm" />">
-											<la:message key="labels.key_match_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.key_match_button_back" />">
-											<la:message key="labels.key_match_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.key_match_button_confirm" />">
-											<la:message key="labels.key_match_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 67 - 79
src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp

@@ -15,36 +15,20 @@
 		</jsp:include>
 
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.key_match_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/keymatch">
-							<la:message key="labels.key_match_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
-							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.key_match_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.key_match_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
-							<%-- Box Body --%>
+							<!-- /.box-header -->
 							<div class="box-body">
 								<%-- Message --%>
 								<div>
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${keyMatchPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,72 +44,77 @@
 									</p>
 								</c:if>
 								<c:if test="${keyMatchPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.key_match_list_term" /></th>
-												<th><la:message key="labels.key_match_list_query" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${keyMatchItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/keymatch/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.term)}</td>
-													<td style="overflow-x: auto;">${f:h(data.query)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.key_match_list_term" /></th>
+														<th><la:message key="labels.key_match_list_query" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${keyMatchItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/keymatch/details/4/${f:u(data.id)}">
+															<td>${f:h(data.term)}</td>
+															<td style="overflow-x: auto;">${f:h(data.query)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<div class="row">
+										<%-- Paging Info --%>
+										<div class="col-sm-2">
+											<la:message key="labels.pagination_page_guide_msg"
+												arg0="${f:h(webConfigPager.currentPageNumber)}"
+												arg1="${f:h(webConfigPager.allPageCount)}"
+												arg2="${f:h(webConfigPager.allRecordCount)}" />
+										</div>
+										<%-- Paging Navigation --%>
+										<div class="col-sm-10">
+											<ul class="pagination pagination-sm no-margin pull-right">
+												<c:if test="${webConfigPager.existPrePage}">
+													<li class="prev"><la:link
+															href="list/${webConfigPager.currentPageNumber - 1}">
+															<la:message key="labels.prev_page" />
+														</la:link></li>
+												</c:if>
+												<c:if test="${!webConfigPager.existPrePage}">
+													<li class="prev disabled"><a href="#"><la:message
+																key="labels.prev_page" /></a></li>
+												</c:if>
+												<c:forEach var="p" varStatus="s"
+													items="${webConfigPager.pageNumberList}">
+													<li
+														<c:if test="${p == webConfigPager.currentPageNumber}">class="active"</c:if>><la:link
+															href="list/${p}">${p}</la:link></li>
+												</c:forEach>
+												<c:if test="${webConfigPager.existNextPage}">
+													<li class="next"><la:link
+															href="list/${webConfigPager.currentPageNumber + 1}">
+															<la:message key="labels.next_page" />
+														</la:link></li>
+												</c:if>
+												<c:if test="${!webConfigPager.existNextPage}">
+													<li class="next disabled"><a href="#"><la:message
+																key="labels.next_page" /></a></li>
+												</c:if>
+											</ul>
+										</div>
+									</div>
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(keyMatchPager.currentPageNumber)}"
-										arg1="${f:h(keyMatchPager.allPageCount)}"
-										arg2="${f:h(keyMatchPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${keyMatchPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${keyMatchPager.currentPageNumber - 1}">
-												<la:message key="labels.key_match_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!keyMatchPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.key_match_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${keyMatchPager.pageNumberList}">
-										<li
-											<c:if test="${p == keyMatchPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${keyMatchPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${keyMatchPager.currentPageNumber + 1}">
-												<la:message key="labels.key_match_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!keyMatchPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.key_match_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 202
src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp

@@ -1,202 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.labeltype_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="labelType" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.labeltype_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/labeltype">
-							<la:message key="labels.labeltype_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.labeltype_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.labeltype_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.labeltype_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.labeltype_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/labeltype"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.labeltype_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-3"><la:message
-														key="labels.labeltype_name" /></th>
-												<td>${f:h(name)}<la:hidden property="name" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.labeltype_value" /></th>
-												<td>${f:h(value)}<la:hidden property="value" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.labeltype_included_paths" /></th>
-												<td>${f:br(f:h(includedPaths))}<la:hidden
-														property="includedPaths" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.labeltype_excluded_paths" /></th>
-												<td>${f:br(f:h(excludedPaths))}<la:hidden
-														property="excludedPaths" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.role_type" /></th>
-												<td><c:forEach var="rt" varStatus="s"
-														items="${roleTypeItems}">
-														<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
-															<c:if test="${rtid==rt.id}">
-																	${f:h(rt.name)}<br />
-															</c:if>
-														</c:forEach>
-													</c:forEach> <la:select property="roleTypeIds" multiple="true"
-														style="display:none;">
-														<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-															<la:option value="${f:u(rt.id)}">${f:h(rt.name)}</la:option>
-														</c:forEach>
-													</la:select></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.sortOrder" /></th>
-												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.labeltype_button_back" />">
-											<la:message key="labels.labeltype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.labeltype_button_create" />">
-											<la:message key="labels.labeltype_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.labeltype_button_back" />">
-											<la:message key="labels.labeltype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.labeltype_button_update" />">
-											<la:message key="labels.labeltype_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.labeltype_button_back" />">
-											<la:message key="labels.labeltype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.labeltype_button_delete" />">
-											<la:message key="labels.labeltype_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.labeltype_button_back" />">
-											<la:message key="labels.labeltype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.labeltype_button_edit" />">
-											<la:message key="labels.labeltype_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.labeltype_button_delete" />">
-											<la:message key="labels.labeltype_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 110 - 0
src/main/webapp/WEB-INF/view/admin/labeltype/details.jsp

@@ -0,0 +1,110 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.labeltype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="labelType" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.labeltype_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-3"><la:message
+														key="labels.labeltype_name" /></th>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.labeltype_value" /></th>
+												<td>${f:h(value)}<la:hidden property="value" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.labeltype_included_paths" /></th>
+												<td>${f:br(f:h(includedPaths))}<la:hidden
+														property="includedPaths" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.labeltype_excluded_paths" /></th>
+												<td>${f:br(f:h(excludedPaths))}<la:hidden
+														property="excludedPaths" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.role_type" /></th>
+												<td><c:forEach var="rt" varStatus="s"
+														items="${roleTypeItems}">
+														<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
+															<c:if test="${rtid==rt.id}">
+																	${f:h(rt.name)}<br />
+															</c:if>
+														</c:forEach>
+													</c:forEach> <la:select property="roleTypeIds" multiple="true"
+														style="display:none;">
+														<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+															<la:option value="${f:u(rt.id)}">${f:h(rt.name)}</la:option>
+														</c:forEach>
+													</la:select></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.sortOrder" /></th>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 7 - 70
src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="labelType" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.labeltype_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/labeltype">
-							<la:message key="labels.labeltype_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.labeltype_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -59,24 +33,10 @@
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
-								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.labeltype_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.labeltype_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/labeltype"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.labeltype_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
-								<%-- Box Body --%>
+								<!-- /.box-header -->
 								<div class="box-body">
 									<%-- Message --%>
 									<div>
@@ -85,7 +45,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -137,40 +96,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.labeltype_button_back" />">
-											<la:message key="labels.labeltype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.labeltype_button_confirm" />">
-											<la:message key="labels.labeltype_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.labeltype_button_back" />">
-											<la:message key="labels.labeltype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.labeltype_button_confirm" />">
-											<la:message key="labels.labeltype_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 65 - 77
src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp

@@ -15,36 +15,20 @@
 		</jsp:include>
 
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.labeltype_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/labeltype">
-							<la:message key="labels.labeltype_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
-							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.labeltype_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.labeltype_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
-							<%-- Box Body --%>
+							<!-- /.box-header -->
 							<div class="box-body">
 								<%-- Message --%>
 								<div>
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${labelTypePager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,70 +44,75 @@
 									</p>
 								</c:if>
 								<c:if test="${labelTypePager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.labeltype_name" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${labelTypeItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/labeltype/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.labeltype_name" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${labelTypeItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/labeltype/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<div class="row">
+										<%-- Paging Info --%>
+										<div class="col-sm-2">
+											<la:message key="labels.pagination_page_guide_msg"
+												arg0="${f:h(webConfigPager.currentPageNumber)}"
+												arg1="${f:h(webConfigPager.allPageCount)}"
+												arg2="${f:h(webConfigPager.allRecordCount)}" />
+										</div>
+										<%-- Paging Navigation --%>
+										<div class="col-sm-10">
+											<ul class="pagination pagination-sm no-margin pull-right">
+												<c:if test="${webConfigPager.existPrePage}">
+													<li class="prev"><la:link
+															href="list/${webConfigPager.currentPageNumber - 1}">
+															<la:message key="labels.prev_page" />
+														</la:link></li>
+												</c:if>
+												<c:if test="${!webConfigPager.existPrePage}">
+													<li class="prev disabled"><a href="#"><la:message
+																key="labels.prev_page" /></a></li>
+												</c:if>
+												<c:forEach var="p" varStatus="s"
+													items="${webConfigPager.pageNumberList}">
+													<li
+														<c:if test="${p == webConfigPager.currentPageNumber}">class="active"</c:if>><la:link
+															href="list/${p}">${p}</la:link></li>
+												</c:forEach>
+												<c:if test="${webConfigPager.existNextPage}">
+													<li class="next"><la:link
+															href="list/${webConfigPager.currentPageNumber + 1}">
+															<la:message key="labels.next_page" />
+														</la:link></li>
+												</c:if>
+												<c:if test="${!webConfigPager.existNextPage}">
+													<li class="next disabled"><a href="#"><la:message
+																key="labels.next_page" /></a></li>
+												</c:if>
+											</ul>
+										</div>
+									</div>
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(labelTypePager.currentPageNumber)}"
-										arg1="${f:h(labelTypePager.allPageCount)}"
-										arg2="${f:h(labelTypePager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${labelTypePager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${labelTypePager.currentPageNumber - 1}">
-												<la:message key="labels.labeltype_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!labelTypePager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.labeltype_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${labelTypePager.pageNumberList}">
-										<li
-											<c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${labelTypePager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${labelTypePager.currentPageNumber + 1}">
-												<la:message key="labels.labeltype_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!labelTypePager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.labeltype_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 1 - 5
src/main/webapp/WEB-INF/view/admin/log/index.jsp

@@ -20,11 +20,7 @@
 				<h1>
 					<la:message key="labels.log_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/log">
-							<la:message key="labels.log_configuration" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
 
 			<section class="content">

+ 0 - 169
src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp

@@ -1,169 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="overlapping_host" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.overlapping_host_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/overlappinghost">
-							<la:message key="labels.overlapping_host_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message key="labels.overlapping_host_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message key="labels.overlapping_host_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message key="labels.overlapping_host_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message key="labels.overlapping_host_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<la:hidden property="sortOrder" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.overlapping_host_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.overlapping_host_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.overlapping_host_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.overlapping_host_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/overlappinghost"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.overlapping_host_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">
-												${msg}
-											</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-3"><la:message key="labels.regular_name" /></th>
-												<td>${f:h(regularName)}<la:hidden property="regularName" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.overlapping_name" /></th>
-												<td>${f:h(overlappingName)}<la:hidden property="overlappingName" /></td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.overlapping_host_button_back" />">
-											<la:message key="labels.overlapping_host_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.overlapping_host_button_create" />">
-											<la:message key="labels.overlapping_host_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.overlapping_host_button_back" />">
-											<la:message key="labels.overlapping_host_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.overlapping_host_button_update" />">
-											<la:message key="labels.overlapping_host_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.overlapping_host_button_back" />">
-											<la:message key="labels.overlapping_host_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.overlapping_host_button_delete" />">
-											<la:message key="labels.overlapping_host_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.overlapping_host_button_back" />">
-											<la:message key="labels.overlapping_host_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.overlapping_host_button_edit" />">
-											<la:message key="labels.overlapping_host_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.overlapping_host_button_delete" />">
-											<la:message key="labels.overlapping_host_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 83 - 0
src/main/webapp/WEB-INF/view/admin/overlappinghost/details.jsp

@@ -0,0 +1,83 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.overlapping_host_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="overlapping_host" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.overlapping_host_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-3"><la:message
+														key="labels.regular_name" /></th>
+												<td>${f:h(regularName)}<la:hidden
+														property="regularName" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.overlapping_name" /></th>
+												<td>${f:h(overlappingName)}<la:hidden
+														property="overlappingName" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 8 - 70
src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="overlappintHost" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.overlapping_host_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/overlappinghost">
-							<la:message key="labels.overlapping_host_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.overlapping_host_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.overlapping_host_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.overlapping_host_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.overlapping_host_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -62,20 +36,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.overlapping_host_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.overlapping_host_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/overlappinghost"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.overlapping_host_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -86,7 +47,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="regularName" class="col-sm-3 control-label"><la:message
@@ -102,41 +62,19 @@
 											<la:text property="overlappingName" styleClass="form-control" />
 										</div>
 									</div>
-
-									<%-- Box Footer --%>
-									<div class="box-footer">
-										<c:if test="${crudMode == 1}">
-											<button type="submit" class="btn" name="back"
-												value="<la:message key="labels.overlapping_host_button_back" />">
-												<la:message key="labels.overlapping_host_button_back" />
-											</button>
-											<button type="submit" class="btn btn-success"
-												name="confirmfromcreate"
-												value="<la:message key="labels.overlapping_host_button_confirm" />">
-												<la:message key="labels.overlapping_host_button_confirm" />
-											</button>
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<button type="submit" class="btn" name="back"
-												value="<la:message key="labels.overlapping_host_button_back" />">
-												<la:message key="labels.overlapping_host_button_back" />
-											</button>
-											<button type="submit" class="btn btn-warning"
-												name="confirmfromupdate"
-												value="<la:message key="labels.overlapping_host_button_confirm" />">
-												<la:message key="labels.overlapping_host_button_confirm" />
-											</button>
-										</c:if>
-									</div>
 								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 29 - 79
src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp

@@ -13,36 +13,20 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="overlappingHost" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.overlapping_host_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/overlappinghost">
-							<la:message key="labels.overlapping_host_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.overlapping_host_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.overlapping_host_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${overlappingHostPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,73 +44,40 @@
 									</p>
 								</c:if>
 								<c:if test="${overlappingHostPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.regular_name" /></th>
-												<th><la:message key="labels.overlapping_name" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${overlappingHostItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/overlappinghost/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.regularName)}</td>
-													<td>${f:h(data.overlappingName)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.regular_name" /></th>
+														<th><la:message key="labels.overlapping_name" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${overlappingHostItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/overlappinghost/details/4/${f:u(data.id)}">
+															<td>${f:h(data.regularName)}</td>
+															<td>${f:h(data.overlappingName)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${overlappingHostPager}"
+										scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(overlappingHostPager.currentPageNumber)}"
-										arg1="${f:h(overlappingHostPager.allPageCount)}"
-										arg2="${f:h(overlappingHostPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${overlappingHostPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${overlappingHostPager.currentPageNumber - 1}">
-												<la:message key="labels.overlapping_host_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!overlappingHostPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.overlapping_host_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${overlappingHostPager.pageNumberList}">
-										<li
-											<c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${overlappingHostPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${overlappingHostPager.currentPageNumber + 1}">
-												<la:message key="labels.overlapping_host_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!overlappingHostPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.overlapping_host_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 183
src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp

@@ -1,183 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.path_mapping_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="pathMapping" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.path_mapping_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-
-					<li><la:link href="/admin/pathmapping">
-							<la:message key="labels.path_mapping_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.path_mapping_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.path_mapping_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.path_mapping_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.path_mapping_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/pathmapping"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.path_mapping_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message key="labels.regex" /></th>
-												<td>${f:h(regex)}<la:hidden property="regex" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.replacement" /></th>
-												<td>${f:h(replacement)}<la:hidden
-														property="replacement" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.processType" /></th>
-												<td><c:if test="${processType=='C'}">
-														<la:message key="labels.path_mapping_pt_crawling" />
-													</c:if> <c:if test="${processType=='D'}">
-														<la:message key="labels.path_mapping_pt_displaying" />
-													</c:if> <c:if test="${processType=='B'}">
-														<la:message key="labels.path_mapping_pt_both" />
-													</c:if> <la:hidden property="processType" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.sortOrder" /></th>
-												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.path_mapping_button_back" />">
-											<la:message key="labels.path_mapping_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.path_mapping_button_create" />">
-											<la:message key="labels.path_mapping_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.path_mapping_button_back" />">
-											<la:message key="labels.path_mapping_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.path_mapping_button_update" />">
-											<la:message key="labels.path_mapping_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.path_mapping_button_back" />">
-											<la:message key="labels.path_mapping_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.path_mapping_button_delete" />">
-											<la:message key="labels.path_mapping_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.path_mapping_button_back" />">
-											<la:message key="labels.path_mapping_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.path_mapping_button_edit" />">
-											<la:message key="labels.path_mapping_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.path_mapping_button_delete" />">
-											<la:message key="labels.path_mapping_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 94 - 0
src/main/webapp/WEB-INF/view/admin/pathmapping/details.jsp

@@ -0,0 +1,94 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.path_mapping_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="pathMapping" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.path_mapping_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message key="labels.regex" /></th>
+												<td>${f:h(regex)}<la:hidden property="regex" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.replacement" /></th>
+												<td>${f:h(replacement)}<la:hidden
+														property="replacement" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.processType" /></th>
+												<td><c:if test="${processType=='C'}">
+														<la:message key="labels.path_mapping_pt_crawling" />
+													</c:if> <c:if test="${processType=='D'}">
+														<la:message key="labels.path_mapping_pt_displaying" />
+													</c:if> <c:if test="${processType=='B'}">
+														<la:message key="labels.path_mapping_pt_both" />
+													</c:if> <la:hidden property="processType" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.sortOrder" /></th>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 6 - 64
src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp

@@ -13,39 +13,15 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="pathMapping" />
 		</jsp:include>
-
 		<div class="content-wrapper">
 			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.path_mapping_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-
-					<li><la:link href="/admin/pathmapping">
-							<la:message key="labels.path_mapping_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.path_mapping_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -60,20 +36,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.path_mapping_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.path_mapping_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/pathmapping"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.path_mapping_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -124,37 +87,16 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.path_mapping_button_back" />">
-											<la:message key="labels.path_mapping_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.path_mapping_button_confirm" />">
-											<la:message key="labels.path_mapping_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.path_mapping_button_back" />">
-											<la:message key="labels.path_mapping_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.path_mapping_button_confirm" />">
-											<la:message key="labels.path_mapping_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>

+ 28 - 73
src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp

@@ -13,34 +13,20 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="pathMapping" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.path_mapping_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/pathmapping">
-							<la:message key="labels.path_mapping_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.path_mapping_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.path_mapping_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -58,68 +44,37 @@
 									</p>
 								</c:if>
 								<c:if test="${pathMappingPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.regex" /></th>
-												<th><la:message key="labels.replacement" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${pathMappingItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/pathmapping/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.regex)}</td>
-													<td>${f:h(data.replacement)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.regex" /></th>
+														<th><la:message key="labels.replacement" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${pathMappingItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/pathmapping/details/4/${f:u(data.id)}">
+															<td>${f:h(data.regex)}</td>
+															<td>${f:h(data.replacement)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${pathMappingPager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
 							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(pathMappingPager.currentPageNumber)}"
-										arg1="${f:h(pathMappingPager.allPageCount)}"
-										arg2="${f:h(pathMappingPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${pathMappingPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${pathMappingPager.currentPageNumber - 1}">
-												<la:message key="labels.path_mapping_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!pathMappingPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.path_mapping_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${pathMappingPager.pageNumberList}">
-										<li
-											<c:if test="${p == pathMappingPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${pathMappingPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${pathMappingPager.currentPageNumber + 1}">
-												<la:message key="labels.path_mapping_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!pathMappingPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.path_mapping_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>

+ 0 - 179
src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp

@@ -1,179 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.request_header_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="requestHeader" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.request_header_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/requestheader">
-							<la:message key="labels.request_header_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.request_header_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.request_header_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.request_header_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.request_header_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/requestheader"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.request_header_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.request_header_name" /></th>
-												<td>${f:h(name)}<la:hidden property="name" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.request_header_value" /></th>
-												<td>${f:h(value)}<la:hidden property="value" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.request_header_web_crawling_config" /></th>
-												<td><c:forEach var="item" items="${webConfigItems}">
-														<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-													</c:forEach> <la:hidden property="webConfigId" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.request_header_button_back" />">
-											<la:message key="labels.request_header_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.request_header_button_create" />">
-											<la:message key="labels.request_header_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.request_header_button_back" />">
-											<la:message key="labels.request_header_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.request_header_button_update" />">
-											<la:message key="labels.request_header_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.request_header_button_back" />">
-											<la:message key="labels.request_header_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.request_header_button_delete" />">
-											<la:message key="labels.request_header_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.request_header_button_back" />">
-											<la:message key="labels.request_header_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.request_header_button_edit" />">
-											<la:message key="labels.request_header_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.request_header_button_delete" />">
-											<la:message key="labels.request_header_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 87 - 0
src/main/webapp/WEB-INF/view/admin/requestheader/details.jsp

@@ -0,0 +1,87 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.request_header_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.request_header_name" /></th>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.request_header_value" /></th>
+												<td>${f:h(value)}<la:hidden property="value" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.request_header_web_crawling_config" /></th>
+												<td><c:forEach var="item" items="${webConfigItems}">
+														<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <la:hidden property="webConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 6 - 69
src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="requestHeader" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.request_header_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/requestheader">
-							<la:message key="labels.request_header_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.request_header_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -55,27 +29,13 @@
 					</c:if>
 					<la:hidden property="createdBy" />
 					<la:hidden property="createdTime" />
-
 					<div class="row">
 						<div class="col-md-12">
 							<div
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.request_header_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.request_header_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/requestheader"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.request_header_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -86,7 +46,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -114,40 +73,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.request_header_button_back" />">
-											<la:message key="labels.request_header_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.request_header_button_confirm" />">
-											<la:message key="labels.request_header_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.request_header_button_back" />">
-											<la:message key="labels.request_header_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.request_header_button_confirm" />">
-											<la:message key="labels.request_header_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 8 - 62
src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp

@@ -13,23 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="requestHeader" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.request_header_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/requestheader">
-							<la:message key="labels.request_header_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<c:if test="${!displayCreateLink}">
@@ -41,14 +32,7 @@
 							<div class="box box-primary">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<la:message key="labels.request_header_link_list" />
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="createpage" styleClass="btn btn-success btn-xs">
-											<la:message key="labels.request_header_link_create_new" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -59,7 +43,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- List --%>
 									<c:if test="${requestHeaderPager.allRecordCount == 0}">
 										<p class="callout callout-info">
@@ -79,63 +62,26 @@
 												<c:forEach var="data" varStatus="s"
 													items="${requestHeaderItems}">
 													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-														data-href="${contextPath}/admin/requestheader/confirmpage/4/${f:u(data.id)}">
+														data-href="${contextPath}/admin/requestheader/details/4/${f:u(data.id)}">
 														<td>${f:h(data.name)}</td>
 														<td>${f:h(data.webConfig.name)}</td>
 													</tr>
 												</c:forEach>
 											</tbody>
 										</table>
+										<c:set var="pager" value="${requestHeaderPager}"
+											scope="request" />
+										<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 									</c:if>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<%-- Paging Info --%>
-									<span><la:message key="labels.pagination_page_guide_msg"
-											arg0="${f:h(requestHeaderPager.currentPageNumber)}"
-											arg1="${f:h(requestHeaderPager.allPageCount)}"
-											arg2="${f:h(requestHeaderPager.allRecordCount)}" /></span>
-
-									<%-- Paging Navigation --%>
-									<ul class="pagination pagination-sm no-margin pull-right">
-										<c:if test="${requestHeaderPager.existPrePage}">
-											<li class="prev"><la:link
-													href="list/${requestHeaderPager.currentPageNumber - 1}">
-													<la:message key="labels.request_header_link_prev_page" />
-												</la:link></li>
-										</c:if>
-										<c:if test="${!requestHeaderPager.existPrePage}">
-											<li class="prev disabled"><a href="#"><la:message
-														key="labels.request_header_link_prev_page" /></a></li>
-										</c:if>
-										<c:forEach var="p" varStatus="s"
-											items="${requestHeaderPager.pageNumberList}">
-											<li
-												<c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>><la:link
-													href="list/${p}">${p}</la:link></li>
-										</c:forEach>
-										<c:if test="${requestHeaderPager.existNextPage}">
-											<li class="next"><la:link
-													href="list/${requestHeaderPager.currentPageNumber + 1}">
-													<la:message key="labels.request_header_link_next_page" />
-												</la:link></li>
-										</c:if>
-										<c:if test="${!requestHeaderPager.existNextPage}">
-											<li class="next disabled"><a href="#"><la:message
-														key="labels.request_header_link_next_page" /></a></li>
-										</c:if>
-									</ul>
-
 								</div>
+								<!-- /.box-body -->
 							</div>
+							<!-- /.box -->
 						</c:if>
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 168
src/main/webapp/WEB-INF/view/admin/role/confirm.jsp

@@ -1,168 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.role_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="user" />
-			<jsp:param name="menuType" value="role" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.role_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/role">
-							<la:message key="labels.role_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.role_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.role_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.role_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.role_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/role"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.role_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message key="labels.role_name" /></th>
-												<td>${f:h(name)}<la:hidden property="name" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.role_button_back" />">
-											<la:message key="labels.role_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.role_button_create" />">
-											<la:message key="labels.role_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.role_button_back" />">
-											<la:message key="labels.role_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.role_button_update" />">
-											<la:message key="labels.role_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.role_button_back" />">
-											<la:message key="labels.role_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.role_button_delete" />">
-											<la:message key="labels.role_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.role_button_back" />">
-											<la:message key="labels.role_button_back" />
-										</button>
-										<%--
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.role_button_edit" />">
-											<la:message key="labels.role_button_edit" />
-										</button>
-										--%>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.role_button_delete" />">
-											<la:message key="labels.role_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>
-

+ 74 - 0
src/main/webapp/WEB-INF/view/admin/role/details.jsp

@@ -0,0 +1,74 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.role_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="user" />
+			<jsp:param name="menuType" value="role" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.role_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message key="labels.role_name" /></th>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>
+

+ 6 - 68
src/main/webapp/WEB-INF/view/admin/role/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="user" />
 			<jsp:param name="menuType" value="role" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.role_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/role">
-							<la:message key="labels.role_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.role_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -59,20 +33,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.role_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.role_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/role"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.role_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -83,7 +44,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -92,41 +52,19 @@
 											<la:text property="name" styleClass="form-control" />
 										</div>
 									</div>
-
 								</div>
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.role_button_back" />">
-											<la:message key="labels.role_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.role_button_confirm" />">
-											<la:message key="labels.role_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.role_button_back" />">
-											<la:message key="labels.role_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.role_button_confirm" />">
-											<la:message key="labels.role_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 25 - 76
src/main/webapp/WEB-INF/view/admin/role/index.jsp

@@ -13,36 +13,20 @@
 			<jsp:param name="menuCategoryType" value="user" />
 			<jsp:param name="menuType" value="role" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.role_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/role">
-							<la:message key="labels.role_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.role_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.role_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${rolePager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,70 +44,36 @@
 									</p>
 								</c:if>
 								<c:if test="${rolePager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.role_list_name" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${roleItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/role/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.role_list_name" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s" items="${roleItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/role/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${rolePager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(rolePager.currentPageNumber)}"
-										arg1="${f:h(rolePager.allPageCount)}"
-										arg2="${f:h(rolePager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${rolePager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${rolePager.currentPageNumber - 1}">
-												<la:message key="labels.role_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!rolePager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.role_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${rolePager.pageNumberList}">
-										<li
-											<c:if test="${p == rolePager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${rolePager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${rolePager.currentPageNumber + 1}">
-												<la:message key="labels.role_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!rolePager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.role_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 173
src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp

@@ -1,173 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.roletype_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="roletype" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.roletype_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/roletype">
-							<la:message key="labels.roletype_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<la:hidden property="sortOrder" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.roletype_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.roletype_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.roletype_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.roletype_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/roletype"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.roletype_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-3"><la:message
-														key="labels.roletype_name" /></th>
-												<td>${f:h(name)}<la:hidden property="name" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.roletype_value" /></th>
-												<td>${f:h(value)}<la:hidden property="value" /></td>
-											</tr>
-										</tbody>
-									</table>
-								</div>
-
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.roletype_button_back" />">
-											<la:message key="labels.roletype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.roletype_button_create" />">
-											<la:message key="labels.roletype_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.roletype_button_back" />">
-											<la:message key="labels.roletype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.roletype_button_update" />">
-											<la:message key="labels.roletype_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.roletype_button_back" />">
-											<la:message key="labels.roletype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.roletype_button_delete" />">
-											<la:message key="labels.roletype_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.roletype_button_back" />">
-											<la:message key="labels.roletype_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.roletype_button_edit" />">
-											<la:message key="labels.roletype_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.roletype_button_delete" />">
-											<la:message key="labels.roletype_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 81 - 0
src/main/webapp/WEB-INF/view/admin/roletype/details.jsp

@@ -0,0 +1,81 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.roletype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="roletype" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.roletype_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<la:hidden property="sortOrder" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-3"><la:message
+														key="labels.roletype_name" /></th>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.roletype_value" /></th>
+												<td>${f:h(value)}<la:hidden property="value" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 7 - 68
src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="roleType" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.roletype_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/roletype">
-							<la:message key="labels.roletype_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.roletype_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -62,20 +36,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.roletype_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.roletype_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/roletype"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.roletype_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -86,7 +47,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -102,41 +62,20 @@
 											<la:text property="value" styleClass="form-control" />
 										</div>
 									</div>
-
-									<%-- Box Footer --%>
+									<!-- /.box-body -->
 									<div class="box-footer">
-										<c:if test="${crudMode == 1}">
-											<button type="submit" class="btn" name="back"
-												value="<la:message key="labels.roletype_button_back" />">
-												<la:message key="labels.roletype_button_back" />
-											</button>
-											<button type="submit" class="btn btn-success"
-												name="confirmfromcreate"
-												value="<la:message key="labels.roletype_button_confirm" />">
-												<la:message key="labels.roletype_button_confirm" />
-											</button>
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<button type="submit" class="btn" name="back"
-												value="<la:message key="labels.roletype_button_back" />">
-												<la:message key="labels.roletype_button_back" />
-											</button>
-											<button type="submit" class="btn btn-warning"
-												name="confirmfromupdate"
-												value="<la:message key="labels.roletype_button_confirm" />">
-												<la:message key="labels.roletype_button_confirm" />
-											</button>
-										</c:if>
+										<jsp:include
+											page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 									</div>
+									<!-- /.box-footer -->
 								</div>
+								<!-- /.box -->
 							</div>
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 26 - 76
src/main/webapp/WEB-INF/view/admin/roletype/index.jsp

@@ -13,36 +13,20 @@
 			<jsp:param name="menuCategoryType" value="crawl" />
 			<jsp:param name="menuType" value="roleType" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.roletype_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/roletype">
-							<la:message key="labels.roletype_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.roletype_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.roletype_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${roleTypePager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,70 +44,37 @@
 									</p>
 								</c:if>
 								<c:if test="${roleTypePager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.roletype_name" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s" items="${roleTypeItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/roletype/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.roletype_name" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${roleTypeItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/roletype/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${roleTypePager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(roleTypePager.currentPageNumber)}"
-										arg1="${f:h(roleTypePager.allPageCount)}"
-										arg2="${f:h(roleTypePager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${roleTypePager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${roleTypePager.currentPageNumber - 1}">
-												<la:message key="labels.roletype_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!roleTypePager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.roletype_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${roleTypePager.pageNumberList}">
-										<li
-											<c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${roleTypePager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${roleTypePager.currentPageNumber + 1}">
-												<la:message key="labels.roletype_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!roleTypePager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.roletype_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 228
src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp

@@ -1,228 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.scheduledjob_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="system" />
-			<jsp:param name="menuType" value="scheduledJob" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.scheduledjob_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/scheduledjob">
-							<la:message key="labels.scheduledjob_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.scheduledjob_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.scheduledjob_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.scheduledjob_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.scheduledjob_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/scheduledjob"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.scheduledjob_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.scheduledjob_name" /></th>
-												<td>${f:h(name)}<la:hidden property="name" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.scheduledjob_target" /></th>
-												<td>${f:h(target)}<la:hidden property="target" /></td>
-											</tr>
-											<tr>
-												<th><la:message
-														key="labels.scheduledjob_cronExpression" /></th>
-												<td>${f:h(cronExpression)}<la:hidden
-														property="cronExpression" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.scheduledjob_scriptType" /></th>
-												<td>${f:h(scriptType)}<la:hidden property="scriptType" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.scheduledjob_scriptData" /></th>
-												<td>${f:br(f:h(scriptData))}<la:hidden
-														property="scriptData" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.scheduledjob_jobLogging" /></th>
-												<td><c:if test="${jobLogging=='on'}">
-														<la:message key="labels.enabled" />
-													</c:if> <c:if test="${jobLogging!='on'}">
-														<la:message key="labels.disabled" />
-													</c:if> <la:hidden property="jobLogging" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.scheduledjob_crawler" /></th>
-												<td><c:if test="${crawler=='on'}">
-														<la:message key="labels.enabled" />
-													</c:if> <c:if test="${crawler!='on'}">
-														<la:message key="labels.disabled" />
-													</c:if> <la:hidden property="crawler" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.scheduledjob_status" /></th>
-												<td><c:if test="${available=='on'}">
-														<la:message key="labels.enabled" />
-													</c:if> <c:if test="${available!='on'}">
-														<la:message key="labels.disabled" />
-													</c:if> <la:hidden property="available" /></td>
-											</tr>
-											<tr>
-												<th><la:message key="labels.sortOrder" /></th>
-												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.scheduledjob_button_back" />">
-											<la:message key="labels.scheduledjob_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.scheduledjob_button_create" />">
-											<la:message key="labels.scheduledjob_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.scheduledjob_button_back" />">
-											<la:message key="labels.scheduledjob_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.scheduledjob_button_update" />">
-											<la:message key="labels.scheduledjob_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.scheduledjob_button_back" />">
-											<la:message key="labels.scheduledjob_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.scheduledjob_button_delete" />">
-											<la:message key="labels.scheduledjob_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.scheduledjob_button_back" />">
-											<la:message key="labels.scheduledjob_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.scheduledjob_button_edit" />">
-											<la:message key="labels.scheduledjob_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.scheduledjob_button_delete" />">
-											<la:message key="labels.scheduledjob_button_delete" />
-										</button>
-										<c:if test="${running}">
-											<button type="submit" class="btn btn-warning" name="stop"
-												value="<la:message key="labels.scheduledjob_button_stop" />">
-												<la:message key="labels.scheduledjob_button_stop" />
-											</button>
-										</c:if>
-										<c:if test="${!running}">
-											<button type="submit" class="btn btn-success" name="start"
-												value="<la:message key="labels.scheduledjob_button_start" />">
-												<i class="fa fa-play-circle"></i>
-												<la:message key="labels.scheduledjob_button_start" />
-											</button>
-										</c:if>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>

+ 123 - 0
src/main/webapp/WEB-INF/view/admin/scheduledjob/details.jsp

@@ -0,0 +1,123 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.scheduledjob_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="system" />
+			<jsp:param name="menuType" value="scheduledJob" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.scheduledjob_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.scheduledjob_name" /></th>
+												<td>${f:h(name)}<la:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.scheduledjob_target" /></th>
+												<td>${f:h(target)}<la:hidden property="target" /></td>
+											</tr>
+											<tr>
+												<th><la:message
+														key="labels.scheduledjob_cronExpression" /></th>
+												<td>${f:h(cronExpression)}<la:hidden
+														property="cronExpression" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.scheduledjob_scriptType" /></th>
+												<td>${f:h(scriptType)}<la:hidden property="scriptType" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.scheduledjob_scriptData" /></th>
+												<td>${f:br(f:h(scriptData))}<la:hidden
+														property="scriptData" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.scheduledjob_jobLogging" /></th>
+												<td><c:if test="${jobLogging=='on'}">
+														<la:message key="labels.enabled" />
+													</c:if> <c:if test="${jobLogging!='on'}">
+														<la:message key="labels.disabled" />
+													</c:if> <la:hidden property="jobLogging" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.scheduledjob_crawler" /></th>
+												<td><c:if test="${crawler=='on'}">
+														<la:message key="labels.enabled" />
+													</c:if> <c:if test="${crawler!='on'}">
+														<la:message key="labels.disabled" />
+													</c:if> <la:hidden property="crawler" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.scheduledjob_status" /></th>
+												<td><c:if test="${available=='on'}">
+														<la:message key="labels.enabled" />
+													</c:if> <c:if test="${available!='on'}">
+														<la:message key="labels.disabled" />
+													</c:if> <la:hidden property="available" /></td>
+											</tr>
+											<tr>
+												<th><la:message key="labels.sortOrder" /></th>
+												<td>${f:h(sortOrder)}<la:hidden property="sortOrder" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>

+ 6 - 68
src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp

@@ -13,40 +13,14 @@
 			<jsp:param name="menuCategoryType" value="system" />
 			<jsp:param name="menuType" value="scheduledJob" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.scheduledjob_title_details" />
 				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/scheduledjob/">
-							<la:message key="labels.scheduledjob_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.scheduledjob_link_confirm" /></a></li>
-					</c:if>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
-				<%-- Form --%>
 				<la:form styleClass="form-horizontal">
 					<la:hidden property="crudMode" />
 					<c:if test="${crudMode==2}">
@@ -61,20 +35,7 @@
 								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if>">
 								<%-- Box Header --%>
 								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.scheduledjob_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.scheduledjob_link_update" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/scheduledjob"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.scheduledjob_link_list" />
-										</la:link>
-									</div>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								</div>
 								<%-- Box Body --%>
 								<div class="box-body">
@@ -85,7 +46,6 @@
 										</la:info>
 										<la:errors />
 									</div>
-
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name" class="col-sm-3 control-label"><la:message
@@ -164,40 +124,18 @@
 										</div>
 									</div>
 								</div>
-
-								<%-- Box Footer --%>
+								<!-- /.box-body -->
 								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.scheduledjob_button_back" />">
-											<la:message key="labels.scheduledjob_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success"
-											name="confirmfromcreate"
-											value="<la:message key="labels.scheduledjob_button_confirm" />">
-											<la:message key="labels.scheduledjob_button_confirm" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.scheduledjob_button_back" />">
-											<la:message key="labels.scheduledjob_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="confirmfromupdate"
-											value="<la:message key="labels.scheduledjob_button_confirm" />">
-											<la:message key="labels.scheduledjob_button_confirm" />
-										</button>
-									</c:if>
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
 								</div>
+								<!-- /.box-footer -->
 							</div>
+							<!-- /.box -->
 						</div>
 					</div>
 				</la:form>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 42 - 94
src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp

@@ -13,36 +13,20 @@
 			<jsp:param name="menuCategoryType" value="system" />
 			<jsp:param name="menuType" value="scheduledJob" />
 		</jsp:include>
-
 		<div class="content-wrapper">
-
-			<%-- Content Header --%>
 			<section class="content-header">
 				<h1>
 					<la:message key="labels.scheduledjob_configuration" />
 				</h1>
-				<ol class="breadcrumb">
-					<li class="active"><la:link href="/admin/scheduledjob/">
-							<la:message key="labels.scheduledjob_link_list" />
-						</la:link></li>
-				</ol>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
 					<div class="col-md-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.scheduledjob_link_list" />
-								</h3>
-								<div class="btn-group pull-right">
-									<la:link href="createpage" styleClass="btn btn-success btn-xs">
-										<la:message key="labels.scheduledjob_link_create_new" />
-									</la:link>
-								</div>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
@@ -53,7 +37,6 @@
 									</la:info>
 									<la:errors />
 								</div>
-
 								<%-- List --%>
 								<c:if test="${scheduledJobPager.allRecordCount == 0}">
 									<p class="callout callout-info">
@@ -61,88 +44,53 @@
 									</p>
 								</c:if>
 								<c:if test="${scheduledJobPager.allRecordCount > 0}">
-									<table class="table table-bordered table-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.scheduledjob_name" /></th>
-												<th><la:message key="labels.scheduledjob_status" /></th>
-												<th><la:message key="labels.scheduledjob_target" /></th>
-												<th><la:message
-														key="labels.scheduledjob_cronExpression" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${scheduledJobItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
-													data-href="${contextPath}/admin/scheduledjob/confirmpage/4/${f:u(data.id)}">
-													<td>${f:h(data.name)}</td>
-													<td><c:if test="${data.running}">
-															<la:message key="labels.scheduledjob_running" />
-														</c:if>
-														<c:if test="${!data.running}">
-															<c:if test="${data.available}">
-																<la:message key="labels.scheduledjob_active" />
-															</c:if>
-															<c:if test="${!data.available}">
-																<la:message key="labels.scheduledjob_nojob" />
-															</c:if>
-														</c:if></td>
-													<td>${f:h(data.target)}</td>
-													<td>${f:h(data.cronExpression)}</td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
+									<div class="row">
+										<div class="col-sm-12">
+											<table class="table table-bordered table-striped">
+												<thead>
+													<tr>
+														<th><la:message key="labels.scheduledjob_name" /></th>
+														<th><la:message key="labels.scheduledjob_status" /></th>
+														<th><la:message key="labels.scheduledjob_target" /></th>
+														<th><la:message
+																key="labels.scheduledjob_cronExpression" /></th>
+													</tr>
+												</thead>
+												<tbody>
+													<c:forEach var="data" varStatus="s"
+														items="${scheduledJobItems}">
+														<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
+															data-href="${contextPath}/admin/scheduledjob/details/4/${f:u(data.id)}">
+															<td>${f:h(data.name)}</td>
+															<td><c:if test="${data.running}">
+																	<la:message key="labels.scheduledjob_running" />
+																</c:if> <c:if test="${!data.running}">
+																	<c:if test="${data.available}">
+																		<la:message key="labels.scheduledjob_active" />
+																	</c:if>
+																	<c:if test="${!data.available}">
+																		<la:message key="labels.scheduledjob_nojob" />
+																	</c:if>
+																</c:if></td>
+															<td>${f:h(data.target)}</td>
+															<td>${f:h(data.cronExpression)}</td>
+														</tr>
+													</c:forEach>
+												</tbody>
+											</table>
+										</div>
+									</div>
+									<c:set var="pager" value="${scheduledJobPager}" scope="request" />
+									<c:import url="/WEB-INF/view/common/admin/crud/pagination.jsp" />
 								</c:if>
-
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(scheduledJobPager.currentPageNumber)}"
-										arg1="${f:h(scheduledJobPager.allPageCount)}"
-										arg2="${f:h(scheduledJobPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${scheduledJobPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${scheduledJobPager.currentPageNumber - 1}">
-												<la:message key="labels.scheduledjob_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!scheduledJobPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.scheduledjob_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${scheduledJobPager.pageNumberList}">
-										<li
-											<c:if test="${p == scheduledJobPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${scheduledJobPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${scheduledJobPager.currentPageNumber + 1}">
-												<la:message key="labels.scheduledjob_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!scheduledJobPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.scheduledjob_link_next_page" /></a></li>
-									</c:if>
-								</ul>
-
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 1
src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp

@@ -201,7 +201,6 @@
 				</div>
 			</section>
 		</div>
-
 		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
 	</div>
 	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>

+ 0 - 170
src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp

@@ -1,170 +0,0 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title><la:message key="labels.admin_brand_title" /> | <la:message
-		key="labels.suggest_bad_word_configuration" /></title>
-<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
-</head>
-<body class="skin-blue sidebar-mini">
-	<div class="wrapper">
-		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
-		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
-			<jsp:param name="menuCategoryType" value="suggest" />
-			<jsp:param name="menuType" value="suggestBadWord" />
-		</jsp:include>
-
-		<div class="content-wrapper">
-
-			<%-- Content Header --%>
-			<section class="content-header">
-				<h1>
-					<la:message key="labels.suggest_bad_word_title_details" />
-				</h1>
-				<ol class="breadcrumb">
-					<li><la:link href="/admin/suggestbadword">
-							<la:message key="labels.suggest_bad_word_link_list" />
-						</la:link></li>
-					<c:if test="${crudMode == 1}">
-						<li class="active"><a href="#"><la:message
-									key="labels.suggest_bad_word_link_create" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 2}">
-						<li class="active"><a href="#"><la:message
-									key="labels.suggest_bad_word_link_update" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 3}">
-						<li class="active"><a href="#"><la:message
-									key="labels.suggest_bad_word_link_delete" /></a></li>
-					</c:if>
-					<c:if test="${crudMode == 4}">
-						<li class="active"><a href="#"><la:message
-									key="labels.suggest_bad_word_link_confirm" /></a></li>
-					</c:if>
-				</ol>
-			</section>
-
-			<section class="content">
-
-				<%-- Form --%>
-				<la:form>
-					<la:hidden property="crudMode" />
-					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-						<la:hidden property="id" />
-						<la:hidden property="versionNo" />
-					</c:if>
-					<la:hidden property="createdBy" />
-					<la:hidden property="createdTime" />
-					<div class="row">
-						<div class="col-md-12">
-							<div
-								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
-								<%-- Box Header --%>
-								<div class="box-header with-border">
-									<h3 class="box-title">
-										<c:if test="${crudMode == 1}">
-											<la:message key="labels.suggest_bad_word_link_create" />
-										</c:if>
-										<c:if test="${crudMode == 2}">
-											<la:message key="labels.suggest_bad_word_link_update" />
-										</c:if>
-										<c:if test="${crudMode == 3}">
-											<la:message key="labels.suggest_bad_word_link_delete" />
-										</c:if>
-										<c:if test="${crudMode == 4}">
-											<la:message key="labels.suggest_bad_word_link_confirm" />
-										</c:if>
-									</h3>
-									<div class="btn-group pull-right">
-										<la:link href="/admin/suggestbadword"
-											styleClass="btn btn-primary btn-xs">
-											<la:message key="labels.suggest_bad_word_link_list" />
-										</la:link>
-									</div>
-								</div>
-								<%-- Box Body --%>
-								<div class="box-body">
-									<%-- Message --%>
-									<div>
-										<la:info id="msg" message="true">
-											<div class="alert alert-info">${msg}</div>
-										</la:info>
-										<la:errors />
-									</div>
-
-									<%-- Form Fields --%>
-									<table class="table table-bordered">
-										<tbody>
-											<tr>
-												<th class="col-xs-2"><la:message
-														key="labels.suggest_bad_word_suggest_word" /></th>
-												<td>${f:h(suggestWord)}<la:hidden
-														property="suggestWord" /></td>
-											</tr>
-										</tbody>
-									</table>
-
-								</div>
-								<%-- Box Footer --%>
-								<div class="box-footer">
-									<c:if test="${crudMode == 1}">
-										<button type="submit" class="btn" name="createagain"
-											value="<la:message key="labels.suggest_bad_word_button_back" />">
-											<la:message key="labels.suggest_bad_word_button_back" />
-										</button>
-										<button type="submit" class="btn btn-success" name="create"
-											value="<la:message key="labels.suggest_bad_word_button_create" />">
-											<la:message key="labels.suggest_bad_word_button_create" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 2}">
-										<button type="submit" class="btn" name="editagain"
-											value="<la:message key="labels.suggest_bad_word_button_back" />">
-											<la:message key="labels.suggest_bad_word_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning" name="update"
-											value="<la:message key="labels.suggest_bad_word_button_update" />">
-											<la:message key="labels.suggest_bad_word_button_update" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 3}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.suggest_bad_word_button_back" />">
-											<la:message key="labels.suggest_bad_word_button_back" />
-										</button>
-										<button type="submit" class="btn btn-danger" name="delete"
-											value="<la:message key="labels.suggest_bad_word_button_delete" />">
-											<la:message key="labels.suggest_bad_word_button_delete" />
-										</button>
-									</c:if>
-									<c:if test="${crudMode == 4}">
-										<button type="submit" class="btn" name="back"
-											value="<la:message key="labels.suggest_bad_word_button_back" />">
-											<la:message key="labels.suggest_bad_word_button_back" />
-										</button>
-										<button type="submit" class="btn btn-warning"
-											name="editfromconfirm"
-											value="<la:message key="labels.suggest_bad_word_button_edit" />">
-											<la:message key="labels.suggest_bad_word_button_edit" />
-										</button>
-										<button type="submit" class="btn btn-danger"
-											name="deletefromconfirm"
-											value="<la:message key="labels.suggest_bad_word_button_delete" />">
-											<la:message key="labels.suggest_bad_word_button_delete" />
-										</button>
-									</c:if>
-								</div>
-							</div>
-						</div>
-					</div>
-				</la:form>
-
-			</section>
-		</div>
-
-		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
-	</div>
-	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
-</body>
-</html>
-

+ 78 - 0
src/main/webapp/WEB-INF/view/admin/suggestbadword/details.jsp

@@ -0,0 +1,78 @@
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title><la:message key="labels.admin_brand_title" /> | <la:message
+		key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="suggest" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<la:message key="labels.suggest_bad_word_title_details" />
+				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
+			</section>
+			<section class="content">
+				<la:form>
+					<la:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<la:hidden property="id" />
+						<la:hidden property="versionNo" />
+					</c:if>
+					<la:hidden property="createdBy" />
+					<la:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div
+								class="box <c:if test="${crudMode == 1}">box-success</c:if><c:if test="${crudMode == 2}">box-warning</c:if><c:if test="${crudMode == 3}">box-danger</c:if><c:if test="${crudMode == 4}">box-primary</c:if>">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<la:info id="msg" message="true">
+											<div class="alert alert-info">${msg}</div>
+										</la:info>
+										<la:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><la:message
+														key="labels.suggest_bad_word_suggest_word" /></th>
+												<td>${f:h(suggestWord)}<la:hidden
+														property="suggestWord" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<!-- /.box-body -->
+								<div class="box-footer">
+									<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
+								</div>
+								<!-- /.box-footer -->
+							</div>
+							<!-- /.box -->
+						</div>
+					</div>
+				</la:form>
+			</section>
+		</div>
+		<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+</body>
+</html>
+

+ 2 - 3
src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp

@@ -21,6 +21,7 @@
 				<h1>
 					<la:message key="labels.suggest_bad_word_configuration" />
 				</h1>
+				<jsp:include page="/WEB-INF/view/common/admin/crud/breadcrumb.jsp"></jsp:include>
 				<ol class="breadcrumb">
 					<li class="active"><la:link href="/admin/suggestbadword">
 							<la:message key="labels.suggest_bad_word_link_list" />
@@ -37,9 +38,7 @@
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
-								<h3 class="box-title">
-									<la:message key="labels.suggest_bad_word_link_download" />
-								</h3>
+								<jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
 								<div class="btn-group pull-right">
 									<la:link href="/admin/suggestbadword"
 										styleClass="btn btn-default btn-xs">

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است