diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java index 68b7a027b..93122611f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java @@ -76,7 +76,7 @@ public class AdminBadwordAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("suggestBadWord")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameBadword())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java index 2ae9fabdc..92ae0e02a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java @@ -54,7 +54,7 @@ public class AdminBoostdocAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("boostDocumentRule")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameBoostdoc())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java index 206157d79..a4702d7f1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java @@ -54,7 +54,7 @@ public class AdminCrawlinginfoAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("crawlingInfo")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameCrawlinginfo())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java index 91a22695c..d52924c1d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java @@ -46,7 +46,7 @@ public class AdminDashboardAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("dashboard")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDashboard())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java index b567dd885..ca21f9e2b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java @@ -72,7 +72,7 @@ public class AdminDataconfigAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("dataConfig")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDataconfig())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java index 712ec19f1..943074496 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java @@ -80,7 +80,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable { super.setupHtmlData(runtime); runtime.registerData("editable", cannotEdit()); runtime.registerData("fileNameItems", loadFileNameItems()); - runtime.registerData("helpLink", systemHelper.getHelpLink("design")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDesign())); } private boolean cannotEdit() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java index 2a468bec7..f15176387 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java @@ -45,7 +45,7 @@ public class AdminDictAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("dict")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDict())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java index b0cc18692..18475abb1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java @@ -66,7 +66,7 @@ public class AdminDictKuromojiAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("kuromoji")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDictKuromoji())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java index 5571bf0a4..651e7a7e9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java @@ -68,7 +68,7 @@ public class AdminDictSynonymAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("synonym")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDictSynonym())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java index 2a2d32df7..0db5ea57d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java @@ -55,7 +55,7 @@ public class AdminDuplicatehostAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("duplicateHost")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameDuplicatehost())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java index 0755da0cb..d26b6d3d1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java @@ -73,7 +73,7 @@ public class AdminElevatewordAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("suggestElevateWord")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameElevateword())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java index dfd6a6467..83991bb1f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java @@ -51,7 +51,7 @@ public class AdminFailureurlAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("failureUrl")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameFailureurl())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java index 8a701048f..181e650bb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java @@ -67,7 +67,7 @@ public class AdminFileauthAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("fileAuthentication")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameFileauth())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java index aa7d1075c..b205354ac 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java @@ -64,7 +64,7 @@ public class AdminFileconfigAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("fileConfig")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameFileconfig())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index 80ac6987c..24b35e7bb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -53,7 +53,7 @@ public class AdminGeneralAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("general")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameGeneral())); runtime.registerData("supportedSearchItems", getSupportedSearchItems()); runtime.registerData("dayItems", getDayItems()); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 91cde26d8..47a6491b1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -57,7 +57,7 @@ public class AdminGroupAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("group")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameGroup())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java index 943fcf256..8f1ad9fbb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java @@ -51,7 +51,7 @@ public class AdminJoblogAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("jobLog")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameJoblog())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java index 2e6732683..5c99d2b75 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java @@ -56,7 +56,7 @@ public class AdminKeymatchAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("keyMatch")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameKeymatch())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java index 1b2fb9c06..36707bdf2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java @@ -59,7 +59,7 @@ public class AdminLabeltypeAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("labelType")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameLabeltype())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java index b3e02126e..f3718f382 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/log/AdminLogAction.java @@ -54,7 +54,7 @@ public class AdminLogAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("log")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameLog())); } @Execute diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java index de3c7757b..4545e88da 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java @@ -56,7 +56,7 @@ public class AdminPathmapAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("pathMapping")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNamePathmap())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java index 18edd26da..14dc41f64 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java @@ -68,7 +68,7 @@ public class AdminReqheaderAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("requestHeader")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameReqheader())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 5fc51ce44..77f90f80e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -57,7 +57,7 @@ public class AdminRoleAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("role")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameRole())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java index ca7bf259e..59ff0c026 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java @@ -55,7 +55,7 @@ public class AdminRoletypeAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("roleType")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameRoletype())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java index 6bc42f768..5f401cec9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java @@ -60,7 +60,7 @@ public class AdminSchedulerAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("scheduledJob")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameScheduler())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java index 22c73443e..995f56dc1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java @@ -101,7 +101,7 @@ public class AdminSearchlistAction extends FessAdminAction { protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("searchList")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameSearchlist())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java index 187b6f38a..3e792eedf 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java @@ -55,7 +55,7 @@ public class AdminSysteminfoAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("systemInfo")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameSysteminfo())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index fa83fd0e8..54f34a660 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -69,7 +69,7 @@ public class AdminUserAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("user")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameUser())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java index abbf1bbcd..2fcdb297f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java @@ -68,7 +68,7 @@ public class AdminWebauthAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("webAuthentication")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameWebauth())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java index 53d759473..ec69f367e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java @@ -68,7 +68,7 @@ public class AdminWebconfigAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("webConfig")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameWebconfig())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 31c3700cf..674ea667d 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -78,7 +78,7 @@ public class AdminWizardAction extends FessAdminAction { @Override protected void setupHtmlData(final ActionRuntime runtime) { super.setupHtmlData(runtime); - runtime.registerData("helpLink", systemHelper.getHelpLink("wizard")); + runtime.registerData("helpLink", systemHelper.getHelpLink(fessConfig.getOnlineHelpNameWizard())); } // =================================================================================== diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index cb6e4e61e..1c9f12673 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -69,8 +69,6 @@ public class SystemHelper implements Serializable { private boolean useOwnTmpDir = true; - private String baseHelpLink = "http://fess.codelibs.org/{lang}/" + Constants.MAJOR_VERSION + "." + Constants.MINOR_VERSION + "/admin/"; - private String[] supportedHelpLangs = new String[] { "ja" }; private final Map designJspFileNameMap = new HashMap(); @@ -170,17 +168,22 @@ public class SystemHelper implements Serializable { } public String getHelpLink(final String name) { - final Locale locale = LaRequestUtil.getRequest().getLocale(); - if (locale != null) { - final String lang = locale.getLanguage(); - for (final String l : supportedHelpLangs) { - if (l.equals(lang)) { - final String url = baseHelpLink + name + "-guide.html"; - return url.replaceAll("\\{lang\\}", lang); - } - } - } - return null; + return LaRequestUtil + .getOptionalRequest() + .map(request -> { + final Locale locale = request.getLocale(); + if (locale != null) { + final String lang = locale.getLanguage(); + for (final String l : supportedHelpLangs) { + if (l.equals(lang)) { + final String url = ComponentUtil.getFessConfig().getOnlineHelpBaseLink() + name + "-guide.html"; + return url.replaceFirst("\\{lang\\}", lang).replaceFirst("\\{version\\}", + Constants.MAJOR_VERSION + "." + Constants.MINOR_VERSION); + } + } + } + return null; + }).orElseGet(() -> null); } public void addDesignJspFileName(final String key, final String value) { @@ -258,20 +261,6 @@ public class SystemHelper implements Serializable { this.useOwnTmpDir = useOwnTmpDir; } - /** - * @return the baseHelpLink - */ - public String getBaseHelpLink() { - return baseHelpLink; - } - - /** - * @param baseHelpLink the baseHelpLink to set - */ - public void setBaseHelpLink(final String baseHelpLink) { - this.baseHelpLink = baseHelpLink; - } - /** * @return the supportedHelpLangs */ diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java index 1b83fa52b..92dd33fa1 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java @@ -56,9 +56,6 @@ public interface FessHtmlPath { /** The path of the HTML: /admin/dashboard/admin_dashboard.jsp */ HtmlNext path_AdminDashboard_AdminDashboardJsp = new HtmlNext("/admin/dashboard/admin_dashboard.jsp"); - /** The path of the HTML: /admin/data/admin_data.jsp */ - HtmlNext path_AdminData_AdminDataJsp = new HtmlNext("/admin/data/admin_data.jsp"); - /** The path of the HTML: /admin/dataconfig/admin_dataconfig.jsp */ HtmlNext path_AdminDataconfig_AdminDataconfigJsp = new HtmlNext("/admin/dataconfig/admin_dataconfig.jsp"); diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index 4f19fe5d4..6c85ad48a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -148,6 +148,102 @@ public interface FessConfig extends FessEnv { /** The key of the configuration. e.g. root@localhost */ String MAIL_FROM_ADDRESS = "mail.from.address"; + /** The key of the configuration. e.g. http://fess.codelibs.org/{lang}/{version}/admin/ */ + String ONLINE_HELP_BASE_LINK = "online.help.base.link"; + + /** The key of the configuration. e.g. failureurl */ + String ONLINE_HELP_NAME_FAILUREURL = "online.help.name.failureurl"; + + /** The key of the configuration. e.g. elevateword */ + String ONLINE_HELP_NAME_ELEVATEWORD = "online.help.name.elevateword"; + + /** The key of the configuration. e.g. reqheader */ + String ONLINE_HELP_NAME_REQHEADER = "online.help.name.reqheader"; + + /** The key of the configuration. e.g. roletype */ + String ONLINE_HELP_NAME_ROLETYPE = "online.help.name.roletype"; + + /** The key of the configuration. e.g. synonym */ + String ONLINE_HELP_NAME_DICT_SYNONYM = "online.help.name.dict.synonym"; + + /** The key of the configuration. e.g. dict */ + String ONLINE_HELP_NAME_DICT = "online.help.name.dict"; + + /** The key of the configuration. e.g. kuromoji */ + String ONLINE_HELP_NAME_DICT_KUROMOJI = "online.help.name.dict.kuromoji"; + + /** The key of the configuration. e.g. webconfig */ + String ONLINE_HELP_NAME_WEBCONFIG = "online.help.name.webconfig"; + + /** The key of the configuration. e.g. searchlist */ + String ONLINE_HELP_NAME_SEARCHLIST = "online.help.name.searchlist"; + + /** The key of the configuration. e.g. log */ + String ONLINE_HELP_NAME_LOG = "online.help.name.log"; + + /** The key of the configuration. e.g. general */ + String ONLINE_HELP_NAME_GENERAL = "online.help.name.general"; + + /** The key of the configuration. e.g. role */ + String ONLINE_HELP_NAME_ROLE = "online.help.name.role"; + + /** The key of the configuration. e.g. joblog */ + String ONLINE_HELP_NAME_JOBLOG = "online.help.name.joblog"; + + /** The key of the configuration. e.g. keymatch */ + String ONLINE_HELP_NAME_KEYMATCH = "online.help.name.keymatch"; + + /** The key of the configuration. e.g. wizard */ + String ONLINE_HELP_NAME_WIZARD = "online.help.name.wizard"; + + /** The key of the configuration. e.g. badword */ + String ONLINE_HELP_NAME_BADWORD = "online.help.name.badword"; + + /** The key of the configuration. e.g. pathmap */ + String ONLINE_HELP_NAME_PATHMAP = "online.help.name.pathmap"; + + /** The key of the configuration. e.g. boostdoc */ + String ONLINE_HELP_NAME_BOOSTDOC = "online.help.name.boostdoc"; + + /** The key of the configuration. e.g. dataconfig */ + String ONLINE_HELP_NAME_DATACONFIG = "online.help.name.dataconfig"; + + /** The key of the configuration. e.g. systeminfo */ + String ONLINE_HELP_NAME_SYSTEMINFO = "online.help.name.systeminfo"; + + /** The key of the configuration. e.g. user */ + String ONLINE_HELP_NAME_USER = "online.help.name.user"; + + /** The key of the configuration. e.g. group */ + String ONLINE_HELP_NAME_GROUP = "online.help.name.group"; + + /** The key of the configuration. e.g. design */ + String ONLINE_HELP_NAME_DESIGN = "online.help.name.design"; + + /** The key of the configuration. e.g. dashboard */ + String ONLINE_HELP_NAME_DASHBOARD = "online.help.name.dashboard"; + + /** The key of the configuration. e.g. webauth */ + String ONLINE_HELP_NAME_WEBAUTH = "online.help.name.webauth"; + + /** The key of the configuration. e.g. fileconfig */ + String ONLINE_HELP_NAME_FILECONFIG = "online.help.name.fileconfig"; + + /** The key of the configuration. e.g. fileauth */ + String ONLINE_HELP_NAME_FILEAUTH = "online.help.name.fileauth"; + + /** The key of the configuration. e.g. labeltype */ + String ONLINE_HELP_NAME_LABELTYPE = "online.help.name.labeltype"; + + /** The key of the configuration. e.g. duplicatehost */ + String ONLINE_HELP_NAME_DUPLICATEHOST = "online.help.name.duplicatehost"; + + /** The key of the configuration. e.g. scheduler */ + String ONLINE_HELP_NAME_SCHEDULER = "online.help.name.scheduler"; + + /** The key of the configuration. e.g. crawlinginfo */ + String ONLINE_HELP_NAME_CRAWLINGINFO = "online.help.name.crawlinginfo"; + /** * Get the value of property as {@link String}. * @param propertyKey The key of the property. (NotNull) @@ -537,6 +633,231 @@ public interface FessConfig extends FessEnv { */ String getMailFromAddress(); + /** + * Get the value for the key 'online.help.base.link'.
+ * The value is, e.g. http://fess.codelibs.org/{lang}/{version}/admin/
+ * comment: ------ + * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpBaseLink(); + + /** + * Get the value for the key 'online.help.name.failureurl'.
+ * The value is, e.g. failureurl
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameFailureurl(); + + /** + * Get the value for the key 'online.help.name.elevateword'.
+ * The value is, e.g. elevateword
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameElevateword(); + + /** + * Get the value for the key 'online.help.name.reqheader'.
+ * The value is, e.g. reqheader
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameReqheader(); + + /** + * Get the value for the key 'online.help.name.roletype'.
+ * The value is, e.g. roletype
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameRoletype(); + + /** + * Get the value for the key 'online.help.name.dict.synonym'.
+ * The value is, e.g. synonym
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDictSynonym(); + + /** + * Get the value for the key 'online.help.name.dict'.
+ * The value is, e.g. dict
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDict(); + + /** + * Get the value for the key 'online.help.name.dict.kuromoji'.
+ * The value is, e.g. kuromoji
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDictKuromoji(); + + /** + * Get the value for the key 'online.help.name.webconfig'.
+ * The value is, e.g. webconfig
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameWebconfig(); + + /** + * Get the value for the key 'online.help.name.searchlist'.
+ * The value is, e.g. searchlist
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameSearchlist(); + + /** + * Get the value for the key 'online.help.name.log'.
+ * The value is, e.g. log
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameLog(); + + /** + * Get the value for the key 'online.help.name.general'.
+ * The value is, e.g. general
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameGeneral(); + + /** + * Get the value for the key 'online.help.name.role'.
+ * The value is, e.g. role
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameRole(); + + /** + * Get the value for the key 'online.help.name.joblog'.
+ * The value is, e.g. joblog
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameJoblog(); + + /** + * Get the value for the key 'online.help.name.keymatch'.
+ * The value is, e.g. keymatch
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameKeymatch(); + + /** + * Get the value for the key 'online.help.name.wizard'.
+ * The value is, e.g. wizard
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameWizard(); + + /** + * Get the value for the key 'online.help.name.badword'.
+ * The value is, e.g. badword
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameBadword(); + + /** + * Get the value for the key 'online.help.name.pathmap'.
+ * The value is, e.g. pathmap
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNamePathmap(); + + /** + * Get the value for the key 'online.help.name.boostdoc'.
+ * The value is, e.g. boostdoc
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameBoostdoc(); + + /** + * Get the value for the key 'online.help.name.dataconfig'.
+ * The value is, e.g. dataconfig
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDataconfig(); + + /** + * Get the value for the key 'online.help.name.systeminfo'.
+ * The value is, e.g. systeminfo
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameSysteminfo(); + + /** + * Get the value for the key 'online.help.name.user'.
+ * The value is, e.g. user
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameUser(); + + /** + * Get the value for the key 'online.help.name.group'.
+ * The value is, e.g. group
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameGroup(); + + /** + * Get the value for the key 'online.help.name.design'.
+ * The value is, e.g. design
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDesign(); + + /** + * Get the value for the key 'online.help.name.dashboard'.
+ * The value is, e.g. dashboard
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDashboard(); + + /** + * Get the value for the key 'online.help.name.webauth'.
+ * The value is, e.g. webauth
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameWebauth(); + + /** + * Get the value for the key 'online.help.name.fileconfig'.
+ * The value is, e.g. fileconfig
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameFileconfig(); + + /** + * Get the value for the key 'online.help.name.fileauth'.
+ * The value is, e.g. fileauth
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameFileauth(); + + /** + * Get the value for the key 'online.help.name.labeltype'.
+ * The value is, e.g. labeltype
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameLabeltype(); + + /** + * Get the value for the key 'online.help.name.duplicatehost'.
+ * The value is, e.g. duplicatehost
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDuplicatehost(); + + /** + * Get the value for the key 'online.help.name.scheduler'.
+ * The value is, e.g. scheduler
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameScheduler(); + + /** + * Get the value for the key 'online.help.name.crawlinginfo'.
+ * The value is, e.g. crawlinginfo
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameCrawlinginfo(); + /** * The simple implementation for configuration. * @author FreeGen @@ -745,5 +1066,133 @@ public interface FessConfig extends FessEnv { public String getMailFromAddress() { return get(FessConfig.MAIL_FROM_ADDRESS); } + + public String getOnlineHelpBaseLink() { + return get(FessConfig.ONLINE_HELP_BASE_LINK); + } + + public String getOnlineHelpNameFailureurl() { + return get(FessConfig.ONLINE_HELP_NAME_FAILUREURL); + } + + public String getOnlineHelpNameElevateword() { + return get(FessConfig.ONLINE_HELP_NAME_ELEVATEWORD); + } + + public String getOnlineHelpNameReqheader() { + return get(FessConfig.ONLINE_HELP_NAME_REQHEADER); + } + + public String getOnlineHelpNameRoletype() { + return get(FessConfig.ONLINE_HELP_NAME_ROLETYPE); + } + + public String getOnlineHelpNameDictSynonym() { + return get(FessConfig.ONLINE_HELP_NAME_DICT_SYNONYM); + } + + public String getOnlineHelpNameDict() { + return get(FessConfig.ONLINE_HELP_NAME_DICT); + } + + public String getOnlineHelpNameDictKuromoji() { + return get(FessConfig.ONLINE_HELP_NAME_DICT_KUROMOJI); + } + + public String getOnlineHelpNameWebconfig() { + return get(FessConfig.ONLINE_HELP_NAME_WEBCONFIG); + } + + public String getOnlineHelpNameSearchlist() { + return get(FessConfig.ONLINE_HELP_NAME_SEARCHLIST); + } + + public String getOnlineHelpNameLog() { + return get(FessConfig.ONLINE_HELP_NAME_LOG); + } + + public String getOnlineHelpNameGeneral() { + return get(FessConfig.ONLINE_HELP_NAME_GENERAL); + } + + public String getOnlineHelpNameRole() { + return get(FessConfig.ONLINE_HELP_NAME_ROLE); + } + + public String getOnlineHelpNameJoblog() { + return get(FessConfig.ONLINE_HELP_NAME_JOBLOG); + } + + public String getOnlineHelpNameKeymatch() { + return get(FessConfig.ONLINE_HELP_NAME_KEYMATCH); + } + + public String getOnlineHelpNameWizard() { + return get(FessConfig.ONLINE_HELP_NAME_WIZARD); + } + + public String getOnlineHelpNameBadword() { + return get(FessConfig.ONLINE_HELP_NAME_BADWORD); + } + + public String getOnlineHelpNamePathmap() { + return get(FessConfig.ONLINE_HELP_NAME_PATHMAP); + } + + public String getOnlineHelpNameBoostdoc() { + return get(FessConfig.ONLINE_HELP_NAME_BOOSTDOC); + } + + public String getOnlineHelpNameDataconfig() { + return get(FessConfig.ONLINE_HELP_NAME_DATACONFIG); + } + + public String getOnlineHelpNameSysteminfo() { + return get(FessConfig.ONLINE_HELP_NAME_SYSTEMINFO); + } + + public String getOnlineHelpNameUser() { + return get(FessConfig.ONLINE_HELP_NAME_USER); + } + + public String getOnlineHelpNameGroup() { + return get(FessConfig.ONLINE_HELP_NAME_GROUP); + } + + public String getOnlineHelpNameDesign() { + return get(FessConfig.ONLINE_HELP_NAME_DESIGN); + } + + public String getOnlineHelpNameDashboard() { + return get(FessConfig.ONLINE_HELP_NAME_DASHBOARD); + } + + public String getOnlineHelpNameWebauth() { + return get(FessConfig.ONLINE_HELP_NAME_WEBAUTH); + } + + public String getOnlineHelpNameFileconfig() { + return get(FessConfig.ONLINE_HELP_NAME_FILECONFIG); + } + + public String getOnlineHelpNameFileauth() { + return get(FessConfig.ONLINE_HELP_NAME_FILEAUTH); + } + + public String getOnlineHelpNameLabeltype() { + return get(FessConfig.ONLINE_HELP_NAME_LABELTYPE); + } + + public String getOnlineHelpNameDuplicatehost() { + return get(FessConfig.ONLINE_HELP_NAME_DUPLICATEHOST); + } + + public String getOnlineHelpNameScheduler() { + return get(FessConfig.ONLINE_HELP_NAME_SCHEDULER); + } + + public String getOnlineHelpNameCrawlinginfo() { + return get(FessConfig.ONLINE_HELP_NAME_CRAWLINGINFO); + } } } diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index c77a52d87..f0c452ef9 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -94,3 +94,39 @@ mail.from.name = Administrator mail.from.address = root@localhost +# ---------------------------------------------------------- +# OnlineHelp +# ------ +online.help.base.link=http://fess.codelibs.org/{lang}/{version}/admin/ +online.help.name.failureurl=failureurl +online.help.name.elevateword=elevateword +online.help.name.reqheader=reqheader +online.help.name.roletype=roletype +online.help.name.dict.synonym=synonym +online.help.name.dict=dict +online.help.name.dict.kuromoji=kuromoji +online.help.name.webconfig=webconfig +online.help.name.searchlist=searchlist +online.help.name.log=log +online.help.name.general=general +online.help.name.role=role +online.help.name.joblog=joblog +online.help.name.keymatch=keymatch +online.help.name.wizard=wizard +online.help.name.badword=badword +online.help.name.pathmap=pathmap +online.help.name.boostdoc=boostdoc +online.help.name.dataconfig=dataconfig +online.help.name.systeminfo=systeminfo +online.help.name.user=user +online.help.name.group=group +online.help.name.design=design +online.help.name.dashboard=dashboard +online.help.name.webauth=webauth +online.help.name.fileconfig=fileconfig +online.help.name.fileauth=fileauth +online.help.name.labeltype=labeltype +online.help.name.duplicatehost=duplicatehost +online.help.name.scheduler=scheduler +online.help.name.crawlinginfo=crawlinginfo +