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 61b9434a7fc0360633909a41608a9f8d97081027..164429e895a0206494a2e769f13ae8ffa4b27ee8 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 @@ -32,6 +32,7 @@ import org.codelibs.fess.app.service.ScheduledJobService; import org.codelibs.fess.app.service.WebConfigService; import org.codelibs.fess.app.web.admin.system.AdminSystemAction; import org.codelibs.fess.app.web.base.FessAdminAction; +import org.codelibs.fess.crawler.util.CharUtil; import org.codelibs.fess.es.exentity.FileConfig; import org.codelibs.fess.es.exentity.ScheduledJob; import org.codelibs.fess.es.exentity.WebConfig; @@ -39,7 +40,6 @@ import org.codelibs.fess.helper.JobHelper; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.job.TriggeredJob; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.util.CharUtil; import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java index 5a8799d1a8167e72089b9439aa21c3fd60c1813c..dadb603cbcaa55fa3f748fe093981c305f3ca4c8 100644 --- a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java @@ -29,12 +29,12 @@ import org.codelibs.core.lang.StringUtil; import org.codelibs.core.net.URLUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.web.base.FessSearchAction; +import org.codelibs.fess.crawler.util.CharUtil; import org.codelibs.fess.es.exentity.ClickLog; import org.codelibs.fess.helper.SearchLogHelper; import org.codelibs.fess.helper.ViewHelper; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocumentUtil; -import org.codelibs.fess.crawler.util.CharUtil; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.TermQueryBuilder; import org.lastaflute.web.Execute; diff --git a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java index 932960dc7f88a34e78b8a8e41fc1ab040162385d..d0027088e0bff07ae30574d6d8d458a041c09970 100644 --- a/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java +++ b/src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java @@ -28,6 +28,13 @@ import java.util.Set; import org.apache.commons.io.IOUtils; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; +import org.codelibs.fess.crawler.builder.RequestDataBuilder; +import org.codelibs.fess.crawler.client.CrawlerClient; +import org.codelibs.fess.crawler.client.smb.SmbClient; +import org.codelibs.fess.crawler.entity.RequestData; +import org.codelibs.fess.crawler.entity.ResponseData; +import org.codelibs.fess.crawler.entity.UrlQueue; +import org.codelibs.fess.crawler.log.LogType; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.es.exentity.CrawlingConfig; import org.codelibs.fess.helper.CrawlingConfigHelper; @@ -36,14 +43,6 @@ import org.codelibs.fess.helper.FieldHelper; import org.codelibs.fess.helper.IndexingHelper; import org.codelibs.fess.helper.SambaHelper; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.CrawlerThread; -import org.codelibs.fess.crawler.builder.RequestDataBuilder; -import org.codelibs.fess.crawler.client.CrawlerClient; -import org.codelibs.fess.crawler.client.smb.SmbClient; -import org.codelibs.fess.crawler.entity.RequestData; -import org.codelibs.fess.crawler.entity.ResponseData; -import org.codelibs.fess.crawler.entity.UrlQueue; -import org.codelibs.fess.crawler.log.LogType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java b/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java index 25739895bad0fd69d2b887b93f637db05723202f..acdbe58602b57ae236780f3f34f9edf08a676e9c 100644 --- a/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java +++ b/src/main/java/org/codelibs/fess/crawler/interval/FessIntervalController.java @@ -16,9 +16,9 @@ package org.codelibs.fess.crawler.interval; +import org.codelibs.fess.crawler.interval.impl.DefaultIntervalController; import org.codelibs.fess.helper.IntervalControlHelper; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.interval.impl.DefaultIntervalController; public class FessIntervalController extends DefaultIntervalController { diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java index cdb501869ddccc68da8d6dee956860a1da6d403c..6bbc883acad87b5adb73bc89fe6fc6cb0ce0ed73 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java @@ -37,6 +37,17 @@ import org.codelibs.core.io.SerializeUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; +import org.codelibs.fess.crawler.client.smb.SmbClient; +import org.codelibs.fess.crawler.entity.AccessResult; +import org.codelibs.fess.crawler.entity.AccessResultData; +import org.codelibs.fess.crawler.entity.ExtractData; +import org.codelibs.fess.crawler.entity.ResponseData; +import org.codelibs.fess.crawler.entity.ResultData; +import org.codelibs.fess.crawler.entity.UrlQueue; +import org.codelibs.fess.crawler.exception.CrawlerSystemException; +import org.codelibs.fess.crawler.exception.CrawlingAccessException; +import org.codelibs.fess.crawler.extractor.Extractor; +import org.codelibs.fess.crawler.util.CrawlingParameterUtil; import org.codelibs.fess.es.exentity.CrawlingConfig; import org.codelibs.fess.es.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.helper.CrawlingConfigHelper; @@ -48,17 +59,6 @@ import org.codelibs.fess.helper.PathMappingHelper; import org.codelibs.fess.helper.SambaHelper; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.client.smb.SmbClient; -import org.codelibs.fess.crawler.entity.AccessResult; -import org.codelibs.fess.crawler.entity.AccessResultData; -import org.codelibs.fess.crawler.entity.ExtractData; -import org.codelibs.fess.crawler.entity.ResponseData; -import org.codelibs.fess.crawler.entity.ResultData; -import org.codelibs.fess.crawler.entity.UrlQueue; -import org.codelibs.fess.crawler.exception.CrawlingAccessException; -import org.codelibs.fess.crawler.exception.CrawlerSystemException; -import org.codelibs.fess.crawler.extractor.Extractor; -import org.codelibs.fess.crawler.util.CrawlingParameterUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessXpathTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessXpathTransformer.java index 7be789a4c969437f19215813cb65df21b7296e60..8a40b0a4cf37408cb465b7fcc32668d7986153b3 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessXpathTransformer.java @@ -23,9 +23,9 @@ import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.codelibs.core.lang.StringUtil; +import org.codelibs.fess.crawler.transformer.impl.XpathTransformer; import org.codelibs.fess.helper.FieldHelper; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.transformer.impl.XpathTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java index e5c13e0d46ad54184910ec6a87ec09183c077d02..ac2293e2ecc786cbb7cdebb327cb5d9019f8b596 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessFileTransformer.java @@ -16,11 +16,11 @@ package org.codelibs.fess.crawler.transformer; -import org.codelibs.fess.exception.FessSystemException; -import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.crawler.entity.ResponseData; import org.codelibs.fess.crawler.extractor.Extractor; import org.codelibs.fess.crawler.extractor.ExtractorFactory; +import org.codelibs.fess.exception.FessSystemException; +import org.codelibs.fess.util.ComponentUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessTikaTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessTikaTransformer.java index b3d58154a9c66e6c6900bb201c56331c1dc167e7..ad9617b46f2b39759466eb60c6653bfd7f0d32a7 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessTikaTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessTikaTransformer.java @@ -16,9 +16,9 @@ package org.codelibs.fess.crawler.transformer; -import org.codelibs.fess.exception.FessSystemException; import org.codelibs.fess.crawler.entity.ResponseData; import org.codelibs.fess.crawler.extractor.Extractor; +import org.codelibs.fess.exception.FessSystemException; import org.lastaflute.di.core.SingletonLaContainer; public class FessTikaTransformer extends AbstractFessFileTransformer { diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java index d626061a2d7166b98c81a582d2ab61e1fdcff422..54dcedc04f346d21e6d872a8dce7b3fcfc391c5b 100644 --- a/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java +++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java @@ -39,6 +39,17 @@ import org.codelibs.core.io.InputStreamUtil; import org.codelibs.core.io.SerializeUtil; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; +import org.codelibs.fess.crawler.builder.RequestDataBuilder; +import org.codelibs.fess.crawler.entity.AccessResultData; +import org.codelibs.fess.crawler.entity.RequestData; +import org.codelibs.fess.crawler.entity.ResponseData; +import org.codelibs.fess.crawler.entity.ResultData; +import org.codelibs.fess.crawler.entity.UrlQueue; +import org.codelibs.fess.crawler.exception.ChildUrlsException; +import org.codelibs.fess.crawler.exception.CrawlerSystemException; +import org.codelibs.fess.crawler.exception.CrawlingAccessException; +import org.codelibs.fess.crawler.util.CrawlingParameterUtil; +import org.codelibs.fess.crawler.util.ResponseDataUtil; import org.codelibs.fess.es.exentity.CrawlingConfig; import org.codelibs.fess.es.exentity.CrawlingConfig.ConfigName; import org.codelibs.fess.helper.CrawlingConfigHelper; @@ -50,17 +61,6 @@ import org.codelibs.fess.helper.OverlappingHostHelper; import org.codelibs.fess.helper.PathMappingHelper; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.builder.RequestDataBuilder; -import org.codelibs.fess.crawler.entity.AccessResultData; -import org.codelibs.fess.crawler.entity.RequestData; -import org.codelibs.fess.crawler.entity.ResponseData; -import org.codelibs.fess.crawler.entity.ResultData; -import org.codelibs.fess.crawler.entity.UrlQueue; -import org.codelibs.fess.crawler.exception.ChildUrlsException; -import org.codelibs.fess.crawler.exception.CrawlingAccessException; -import org.codelibs.fess.crawler.exception.CrawlerSystemException; -import org.codelibs.fess.crawler.util.CrawlingParameterUtil; -import org.codelibs.fess.crawler.util.ResponseDataUtil; import org.cyberneko.html.parsers.DOMParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java index 53f1cb38e61180b7c27b325f61472224b2458551..236533099b458a462a4d500ec1f8663b134cc037 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java @@ -32,12 +32,12 @@ import org.apache.commons.io.IOUtils; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.FailureUrlService; +import org.codelibs.fess.crawler.exception.CrawlingAccessException; +import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException; import org.codelibs.fess.ds.DataStoreCrawlingException; import org.codelibs.fess.ds.DataStoreException; import org.codelibs.fess.ds.IndexUpdateCallback; import org.codelibs.fess.es.exentity.DataConfig; -import org.codelibs.fess.crawler.exception.CrawlingAccessException; -import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException; import org.lastaflute.di.core.SingletonLaContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java index ea3a8215c2a7431a73c9aaed57f071d9db4e6c40..2e8499eeebdc0cb1907235825c98fc48700e1218 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/FileListDataStoreImpl.java @@ -25,15 +25,6 @@ import java.util.Map; import org.codelibs.core.collection.LruHashMap; import org.codelibs.core.io.SerializeUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.ds.DataStoreCrawlingException; -import org.codelibs.fess.ds.DataStoreException; -import org.codelibs.fess.ds.IndexUpdateCallback; -import org.codelibs.fess.es.client.FessEsClient; -import org.codelibs.fess.es.exentity.DataConfig; -import org.codelibs.fess.helper.CrawlingSessionHelper; -import org.codelibs.fess.helper.FieldHelper; -import org.codelibs.fess.helper.IndexingHelper; -import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.crawler.builder.RequestDataBuilder; import org.codelibs.fess.crawler.client.CrawlerClient; import org.codelibs.fess.crawler.client.CrawlerClientFactory; @@ -45,6 +36,15 @@ import org.codelibs.fess.crawler.processor.impl.DefaultResponseProcessor; import org.codelibs.fess.crawler.rule.Rule; import org.codelibs.fess.crawler.rule.RuleManager; import org.codelibs.fess.crawler.transformer.Transformer; +import org.codelibs.fess.ds.DataStoreCrawlingException; +import org.codelibs.fess.ds.DataStoreException; +import org.codelibs.fess.ds.IndexUpdateCallback; +import org.codelibs.fess.es.client.FessEsClient; +import org.codelibs.fess.es.exentity.DataConfig; +import org.codelibs.fess.helper.CrawlingSessionHelper; +import org.codelibs.fess.helper.FieldHelper; +import org.codelibs.fess.helper.IndexingHelper; +import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.di.core.SingletonLaContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/es/exentity/DataConfig.java b/src/main/java/org/codelibs/fess/es/exentity/DataConfig.java index b498e81aed223e00abce430b2c342451849acf71..4118fc048c796fb44014c0868c0d29ccf697a55f 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/DataConfig.java +++ b/src/main/java/org/codelibs/fess/es/exentity/DataConfig.java @@ -17,13 +17,6 @@ import org.apache.http.impl.auth.DigestScheme; import org.apache.http.impl.auth.NTLMScheme; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.es.bsentity.BsDataConfig; -import org.codelibs.fess.es.exbhv.FileConfigToLabelBhv; -import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv; -import org.codelibs.fess.es.exbhv.LabelTypeBhv; -import org.codelibs.fess.es.exbhv.RoleTypeBhv; -import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.util.ParameterUtil; import org.codelibs.fess.crawler.client.CrawlerClientFactory; import org.codelibs.fess.crawler.client.http.Authentication; import org.codelibs.fess.crawler.client.http.HcHttpClient; @@ -31,6 +24,13 @@ import org.codelibs.fess.crawler.client.http.impl.AuthenticationImpl; import org.codelibs.fess.crawler.client.http.ntlm.JcifsEngine; import org.codelibs.fess.crawler.client.smb.SmbAuthentication; import org.codelibs.fess.crawler.client.smb.SmbClient; +import org.codelibs.fess.es.bsentity.BsDataConfig; +import org.codelibs.fess.es.exbhv.FileConfigToLabelBhv; +import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv; +import org.codelibs.fess.es.exbhv.LabelTypeBhv; +import org.codelibs.fess.es.exbhv.RoleTypeBhv; +import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.fess.util.ParameterUtil; import org.dbflute.cbean.result.ListResultBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/es/exentity/FileConfig.java b/src/main/java/org/codelibs/fess/es/exentity/FileConfig.java index be64db551e044d1e75b523ae4e18b194fc1f71fc..4da2759967af20f72ede330fa6777e7cb4e3adcb 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/FileConfig.java +++ b/src/main/java/org/codelibs/fess/es/exentity/FileConfig.java @@ -10,6 +10,9 @@ import java.util.regex.Pattern; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.FileAuthenticationService; +import org.codelibs.fess.crawler.client.CrawlerClientFactory; +import org.codelibs.fess.crawler.client.smb.SmbAuthentication; +import org.codelibs.fess.crawler.client.smb.SmbClient; import org.codelibs.fess.es.bsentity.BsFileConfig; import org.codelibs.fess.es.exbhv.FileConfigToLabelBhv; import org.codelibs.fess.es.exbhv.FileConfigToRoleBhv; @@ -18,9 +21,6 @@ import org.codelibs.fess.es.exbhv.RoleTypeBhv; import org.codelibs.fess.helper.SystemHelper; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.ParameterUtil; -import org.codelibs.fess.crawler.client.CrawlerClientFactory; -import org.codelibs.fess.crawler.client.smb.SmbAuthentication; -import org.codelibs.fess.crawler.client.smb.SmbClient; import org.dbflute.cbean.result.ListResultBean; import org.lastaflute.di.core.SingletonLaContainer; diff --git a/src/main/java/org/codelibs/fess/es/exentity/WebAuthentication.java b/src/main/java/org/codelibs/fess/es/exentity/WebAuthentication.java index fd220bacb727394ecb306b930c86db51c62f0dc2..45a3b086ed6fd3e8ac620160235d2cde9669e571 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/WebAuthentication.java +++ b/src/main/java/org/codelibs/fess/es/exentity/WebAuthentication.java @@ -13,13 +13,13 @@ import org.apache.http.impl.auth.NTLMScheme; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.WebConfigService; -import org.codelibs.fess.es.bsentity.BsWebAuthentication; -import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.util.ParameterUtil; import org.codelibs.fess.crawler.client.http.Authentication; import org.codelibs.fess.crawler.client.http.impl.AuthenticationImpl; import org.codelibs.fess.crawler.client.http.ntlm.JcifsEngine; import org.codelibs.fess.crawler.exception.CrawlerSystemException; +import org.codelibs.fess.es.bsentity.BsWebAuthentication; +import org.codelibs.fess.util.ComponentUtil; +import org.codelibs.fess.util.ParameterUtil; /** * @author FreeGen diff --git a/src/main/java/org/codelibs/fess/es/exentity/WebConfig.java b/src/main/java/org/codelibs/fess/es/exentity/WebConfig.java index 6bd97f37f9c4ccde77498270aa25cbe9c07dc306..248bdeb8132893f54cbb3be70c88a2816b94e4f8 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/WebConfig.java +++ b/src/main/java/org/codelibs/fess/es/exentity/WebConfig.java @@ -11,6 +11,9 @@ import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.RequestHeaderService; import org.codelibs.fess.app.service.WebAuthenticationService; +import org.codelibs.fess.crawler.client.CrawlerClientFactory; +import org.codelibs.fess.crawler.client.http.Authentication; +import org.codelibs.fess.crawler.client.http.HcHttpClient; import org.codelibs.fess.es.bsentity.BsWebConfig; import org.codelibs.fess.es.exbhv.LabelTypeBhv; import org.codelibs.fess.es.exbhv.RoleTypeBhv; @@ -18,9 +21,6 @@ import org.codelibs.fess.es.exbhv.WebConfigToLabelBhv; import org.codelibs.fess.es.exbhv.WebConfigToRoleBhv; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.ParameterUtil; -import org.codelibs.fess.crawler.client.CrawlerClientFactory; -import org.codelibs.fess.crawler.client.http.Authentication; -import org.codelibs.fess.crawler.client.http.HcHttpClient; import org.dbflute.cbean.result.ListResultBean; import org.lastaflute.di.core.SingletonLaContainer; diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java index 5573a2ba7ec5f1387b498be4d4756c9bd71ff6a4..15c759886b1341259472a2a42c9e4b1e7d3c87e9 100644 --- a/src/main/java/org/codelibs/fess/exec/Crawler.java +++ b/src/main/java/org/codelibs/fess/exec/Crawler.java @@ -36,6 +36,7 @@ import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.CrawlingSessionService; import org.codelibs.fess.app.service.PathMappingService; +import org.codelibs.fess.crawler.client.EsClient; import org.codelibs.fess.es.client.FessEsClient; import org.codelibs.fess.helper.CrawlingSessionHelper; import org.codelibs.fess.helper.DataIndexHelper; @@ -46,7 +47,6 @@ import org.codelibs.fess.helper.PathMappingHelper; import org.codelibs.fess.helper.WebFsIndexHelper; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.ResourceUtil; -import org.codelibs.fess.crawler.client.EsClient; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.kohsuke.args4j.CmdLineException; diff --git a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java index 8f6570a3d3c3aeb3d491cf1a4e5429b17aac46c5..52ae6784ae40a99e57ef05c545a87ce0441ab97b 100644 --- a/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java @@ -17,13 +17,13 @@ package org.codelibs.fess.helper; import org.codelibs.fess.app.service.FailureUrlService; -import org.codelibs.fess.es.exentity.CrawlingConfig; -import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.crawler.CrawlerContext; import org.codelibs.fess.crawler.entity.UrlQueue; import org.codelibs.fess.crawler.exception.MultipleCrawlingAccessException; import org.codelibs.fess.crawler.helper.impl.LogHelperImpl; import org.codelibs.fess.crawler.log.LogType; +import org.codelibs.fess.es.exentity.CrawlingConfig; +import org.codelibs.fess.util.ComponentUtil; import org.lastaflute.di.core.SingletonLaContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index 485c87672d451660b552f145ababd8df4921d8be..531a48bb73094b6313a04327f896acf750cc1f00 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -40,9 +40,9 @@ import org.apache.commons.lang3.StringUtils; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.RoleTypeService; +import org.codelibs.fess.crawler.util.CharUtil; import org.codelibs.fess.es.exentity.RoleType; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.util.CharUtil; import org.lastaflute.di.core.SingletonLaContainer; import org.lastaflute.web.util.LaRequestUtil; diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java index 95e95f9afa4437fb207d86e04651af752c894c95..ec4c9a52251dfa659434c85481928dff33451860 100644 --- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java +++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java @@ -48,6 +48,11 @@ import org.codelibs.fess.Constants; import org.codelibs.fess.app.service.DataConfigService; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.service.WebConfigService; +import org.codelibs.fess.crawler.builder.RequestDataBuilder; +import org.codelibs.fess.crawler.client.CrawlerClient; +import org.codelibs.fess.crawler.client.CrawlerClientFactory; +import org.codelibs.fess.crawler.entity.ResponseData; +import org.codelibs.fess.crawler.util.CharUtil; import org.codelibs.fess.entity.FacetQueryView; import org.codelibs.fess.es.exentity.CrawlingConfig; import org.codelibs.fess.es.exentity.CrawlingConfig.ConfigType; @@ -56,11 +61,6 @@ import org.codelibs.fess.helper.UserAgentHelper.UserAgentType; import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.util.DocumentUtil; import org.codelibs.fess.util.ResourceUtil; -import org.codelibs.fess.crawler.builder.RequestDataBuilder; -import org.codelibs.fess.crawler.client.CrawlerClient; -import org.codelibs.fess.crawler.client.CrawlerClientFactory; -import org.codelibs.fess.crawler.entity.ResponseData; -import org.codelibs.fess.crawler.util.CharUtil; import org.lastaflute.di.core.SingletonLaContainer; import org.lastaflute.taglib.function.LaFunctions; import org.lastaflute.web.response.StreamResponse; diff --git a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java index bf2f7d008ab64a3c28dd2cd4526726716c2e985c..e631399f9a848b29592b870d4595e18d4c943424 100644 --- a/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java +++ b/src/main/java/org/codelibs/fess/helper/WebFsIndexHelper.java @@ -31,17 +31,17 @@ import org.codelibs.fess.app.service.FailureUrlService; import org.codelibs.fess.app.service.FileAuthenticationService; import org.codelibs.fess.app.service.FileConfigService; import org.codelibs.fess.app.service.WebConfigService; +import org.codelibs.fess.crawler.Crawler; +import org.codelibs.fess.crawler.CrawlerContext; import org.codelibs.fess.crawler.interval.FessIntervalController; +import org.codelibs.fess.crawler.service.DataService; +import org.codelibs.fess.crawler.service.UrlFilterService; +import org.codelibs.fess.crawler.service.UrlQueueService; import org.codelibs.fess.es.exentity.BoostDocumentRule; import org.codelibs.fess.es.exentity.FileConfig; import org.codelibs.fess.es.exentity.WebConfig; import org.codelibs.fess.indexer.IndexUpdater; import org.codelibs.fess.util.ComponentUtil; -import org.codelibs.fess.crawler.Crawler; -import org.codelibs.fess.crawler.CrawlerContext; -import org.codelibs.fess.crawler.service.DataService; -import org.codelibs.fess.crawler.service.UrlFilterService; -import org.codelibs.fess.crawler.service.UrlQueueService; import org.lastaflute.di.core.SingletonLaContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java index 2010e3e611be422b95d21bc3fc8ad24cac554545..3fdad776bd84f4ce10057e2576e2a840c4e161d9 100644 --- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java +++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java @@ -26,16 +26,6 @@ import javax.annotation.Resource; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; -import org.codelibs.fess.es.client.FessEsClient; -import org.codelibs.fess.es.exbhv.ClickLogBhv; -import org.codelibs.fess.es.exbhv.FavoriteLogBhv; -import org.codelibs.fess.exception.FessSystemException; -import org.codelibs.fess.helper.FieldHelper; -import org.codelibs.fess.helper.IndexingHelper; -import org.codelibs.fess.helper.IntervalControlHelper; -import org.codelibs.fess.helper.SearchLogHelper; -import org.codelibs.fess.helper.SystemHelper; -import org.codelibs.fess.util.ComponentUtil; import org.codelibs.fess.crawler.Crawler; import org.codelibs.fess.crawler.entity.AccessResult; import org.codelibs.fess.crawler.entity.AccessResultData; @@ -47,6 +37,16 @@ import org.codelibs.fess.crawler.service.UrlQueueService; import org.codelibs.fess.crawler.service.impl.EsDataService; import org.codelibs.fess.crawler.transformer.Transformer; import org.codelibs.fess.crawler.util.EsResultList; +import org.codelibs.fess.es.client.FessEsClient; +import org.codelibs.fess.es.exbhv.ClickLogBhv; +import org.codelibs.fess.es.exbhv.FavoriteLogBhv; +import org.codelibs.fess.exception.FessSystemException; +import org.codelibs.fess.helper.FieldHelper; +import org.codelibs.fess.helper.IndexingHelper; +import org.codelibs.fess.helper.IntervalControlHelper; +import org.codelibs.fess.helper.SearchLogHelper; +import org.codelibs.fess.helper.SystemHelper; +import org.codelibs.fess.util.ComponentUtil; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilder; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index f0c2979ccc390fa42ac0eccb94f42d75d544f4c5..fb077800f591907f08f1f8ff56328df29df10e0a 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -509,7 +509,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: General */ public static final String LABELS_menu_crawl_config = "{labels.menu_crawl_config}"; - /** The key of the message: Scheduled Jobs */ + /** The key of the message: Scheduled Job */ public static final String LABELS_menu_scheduled_job_config = "{labels.menu_scheduled_job_config}"; /** The key of the message: System */ @@ -932,7 +932,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: Accessing {0}<br>At a first time starting, it might take a little more time to open the file. */ public static final String LABELS_open_uri = "{labels.open_uri}"; - /** The key of the message: File Crawling Configuration */ + /** The key of the message: File Crawling */ public static final String LABELS_file_crawling_configuration = "{labels.file_crawling_configuration}"; /** The key of the message: File Crawling Configuration */ @@ -1016,7 +1016,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: Next */ public static final String LABELS_file_crawling_link_next_page = "{labels.file_crawling_link_next_page}"; - /** The key of the message: Web Crawling Configuration */ + /** The key of the message: Web Crawling */ public static final String LABELS_web_crawling_configuration = "{labels.web_crawling_configuration}"; /** The key of the message: Web Crawling Configuration */ @@ -1199,7 +1199,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: Notification Email */ public static final String LABELS_notification_to = "{labels.notification_to}"; - /** The key of the message: Path Mapping Configuration */ + /** The key of the message: Path Mapping */ public static final String LABELS_path_mapping_configuration = "{labels.path_mapping_configuration}"; /** The key of the message: Path Mapping */ @@ -1274,7 +1274,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: Next */ public static final String LABELS_path_mapping_link_next_page = "{labels.path_mapping_link_next_page}"; - /** The key of the message: Overlapping Host Configuration */ + /** The key of the message: Overlapping Host */ public static final String LABELS_overlapping_host_configuration = "{labels.overlapping_host_configuration}"; /** The key of the message: Overlapping Host */ @@ -2141,7 +2141,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: Back */ public static final String LABELS_design_button_back = "{labels.design_button_back}"; - /** The key of the message: Data Crawling Configuration */ + /** The key of the message: Data Crawling */ public static final String LABELS_data_crawling_configuration = "{labels.data_crawling_configuration}"; /** The key of the message: Data Crawling Configuration */ @@ -2216,13 +2216,13 @@ public class FessLabels extends ActionMessages { /** The key of the message: Configuration Wizard */ public static final String LABELS_wizard_title_configuration = "{labels.wizard_title_configuration}"; - /** The key of the message: Configuration Wizard */ + /** The key of the message: Quick Setup */ public static final String LABELS_wizard_start_title = "{labels.wizard_start_title}"; /** The key of the message: Using Configuration Wizard, you can create crawling settings easily. */ public static final String LABELS_wizard_start_desc = "{labels.wizard_start_desc}"; - /** The key of the message: Start */ + /** The key of the message: Start Configuration */ public static final String LABELS_wizard_start_button = "{labels.wizard_start_button}"; /** The key of the message: Crawling Schedule */ @@ -2273,6 +2273,9 @@ public class FessLabels extends ActionMessages { /** The key of the message: Crawling Configuration */ public static final String LABELS_wizard_crawling_config_title = "{labels.wizard_crawling_config_title}"; + /** The key of the message: Crawling Setting */ + public static final String LABELS_wizard_crawling_setting_title = "{labels.wizard_crawling_setting_title}"; + /** The key of the message: Name */ public static final String LABELS_wizard_crawling_config_name = "{labels.wizard_crawling_config_name}"; @@ -2282,7 +2285,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: Create again */ public static final String LABELS_wizard_button_register_again = "{labels.wizard_button_register_again}"; - /** The key of the message: Create/Next */ + /** The key of the message: Create and Next */ public static final String LABELS_wizard_button_register_next = "{labels.wizard_button_register_next}"; /** The key of the message: Sun */ @@ -2318,13 +2321,16 @@ public class FessLabels extends ActionMessages { /** The key of the message: Start Crawling */ public static final String LABELS_wizard_start_crawling_title = "{labels.wizard_start_crawling_title}"; + /** The key of the message: Crawler */ + public static final String LABELS_wizard_start_crawler_title = "{labels.wizard_start_crawler_title}"; + /** The key of the message: To click "Start Crawling" button, you can start a crawling now. */ public static final String LABELS_wizard_start_crawling_desc = "{labels.wizard_start_crawling_desc}"; /** The key of the message: Start Crawling */ public static final String LABELS_wizard_button_start_crawling = "{labels.wizard_button_start_crawling}"; - /** The key of the message: Finish */ + /** The key of the message: Skip */ public static final String LABELS_wizard_button_finish = "{labels.wizard_button_finish}"; /** The key of the message: Search Result */ @@ -2749,7 +2755,7 @@ public class FessLabels extends ActionMessages { /** The key of the message: ID */ public static final String LABELS_favorite_log_id = "{labels.favorite_log_id}"; - /** The key of the message: Managed Jobs */ + /** The key of the message: Job Scheduler */ public static final String LABELS_scheduledjob_configuration = "{labels.scheduledjob_configuration}"; /** The key of the message: Jobs */ @@ -3598,6 +3604,15 @@ public class FessLabels extends ActionMessages { /** The key of the message: Confirmation */ public static final String LABELS_crud_title_confirm = "{labels.crud_title_confirm}"; + /** The key of the message: Fess */ + public static final String LABELS_admin_brand_title = "{labels.admin_brand_title}"; + + /** The key of the message: Fess Dashboard */ + public static final String LABELS_admin_dashboard_title = "{labels.admin_dashboard_title}"; + + /** The key of the message: Toggle navigation */ + public static final String LABELS_admin_toggle_navi = "{labels.admin_toggle_navi}"; + /** The key of the message: */ public static final String LABELS_LABEL_TYPE_IDS = "{labels.labelTypeIds}"; diff --git a/src/main/java/org/codelibs/fess/util/ComponentUtil.java b/src/main/java/org/codelibs/fess/util/ComponentUtil.java index 13c4b015b68c4cfcaf5f19dc8943e5b08fc33ab2..267d09ef40edc22b36360d970ffa01276177296e 100644 --- a/src/main/java/org/codelibs/fess/util/ComponentUtil.java +++ b/src/main/java/org/codelibs/fess/util/ComponentUtil.java @@ -20,6 +20,9 @@ import org.codelibs.core.crypto.CachedCipher; import org.codelibs.core.misc.DynamicProperties; import org.codelibs.fess.api.WebApiManagerFactory; import org.codelibs.fess.app.web.base.login.FessLoginAssist; +import org.codelibs.fess.crawler.entity.EsAccessResult; +import org.codelibs.fess.crawler.extractor.ExtractorFactory; +import org.codelibs.fess.crawler.service.DataService; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.ds.DataStoreFactory; import org.codelibs.fess.es.client.FessEsClient; @@ -45,9 +48,6 @@ import org.codelibs.fess.helper.UserAgentHelper; import org.codelibs.fess.helper.ViewHelper; import org.codelibs.fess.indexer.IndexUpdater; import org.codelibs.fess.job.JobExecutor; -import org.codelibs.fess.crawler.entity.EsAccessResult; -import org.codelibs.fess.crawler.extractor.ExtractorFactory; -import org.codelibs.fess.crawler.service.DataService; import org.lastaflute.core.message.MessageManager; import org.lastaflute.di.core.SingletonLaContainer; import org.lastaflute.di.core.factory.SingletonLaContainerFactory; diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index d94db1b5d825a3de74456c17f64cfe4ee58318e9..d19d75373c6a493652d2ae3cfedbebb48afc3a86 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -170,7 +170,7 @@ labels.suggestBadWordFile=Bad Word File labels.menu_system=System labels.menu_wizard=Wizard labels.menu_crawl_config=General -labels.menu_scheduled_job_config=Scheduled Jobs +labels.menu_scheduled_job_config=Scheduled Job labels.menu_system_config=System labels.menu_document_config=Index labels.menu_design=Design @@ -312,7 +312,7 @@ labels.footer_back_to_top=Back to top labels.header_brand_name=Fess labels.header_form_option_btn=Options labels.open_uri=Accessing {0}<br>At a first time starting, it might take a little more time to open the file. -labels.file_crawling_configuration=File Crawling Configuration +labels.file_crawling_configuration=File Crawling labels.file_crawling_title_details=File Crawling Configuration labels.included_paths=Included Paths For Crawling labels.excluded_paths=Excluded Paths For Crawling @@ -343,7 +343,7 @@ labels.file_crawling_link_edit=Edit labels.file_crawling_link_delete=Delete labels.file_crawling_link_prev_page=Prev labels.file_crawling_link_next_page=Next -labels.web_crawling_configuration=Web Crawling Configuration +labels.web_crawling_configuration=Web Crawling labels.web_crawling_title_details=Web Crawling Configuration labels.included_urls=Included URLs For Crawling labels.excluded_urls=Excluded URLs For Crawling @@ -405,7 +405,7 @@ labels.purge_user_info_day=Purge User Before labels.purge_by_bots=Bots Name For Purge labels.csv_file_encoding=Encoding for CSV labels.notification_to=Notification Email -labels.path_mapping_configuration=Path Mapping Configuration +labels.path_mapping_configuration=Path Mapping labels.path_mapping_title_details=Path Mapping labels.path_mapping_button_create=Create labels.path_mapping_button_back=Back @@ -433,7 +433,7 @@ labels.path_mapping_link_edit=Edit labels.path_mapping_link_delete=Delete labels.path_mapping_link_prev_page=Prev labels.path_mapping_link_next_page=Next -labels.overlapping_host_configuration=Overlapping Host Configuration +labels.overlapping_host_configuration=Overlapping Host labels.overlapping_host_title_details=Overlapping Host labels.overlapping_host_button_create=Create labels.overlapping_host_button_back=Back @@ -734,7 +734,7 @@ labels.design_delete_confirmation=Do you want to delete it? labels.design_title_edit_content=Edit Page View File labels.design_button_update=Update labels.design_button_back=Back -labels.data_crawling_configuration=Data Crawling Configuration +labels.data_crawling_configuration=Data Crawling labels.data_crawling_title_details=Data Crawling Configuration labels.handler_name=Handler Name labels.handler_parameter=Parameter @@ -760,9 +760,9 @@ labels.data_crawling_link_delete=Delete labels.data_crawling_link_prev_page=Prev labels.data_crawling_link_next_page=Next labels.wizard_title_configuration=Configuration Wizard -labels.wizard_start_title=Configuration Wizard +labels.wizard_start_title=Quick Setup labels.wizard_start_desc=Using Configuration Wizard, you can create crawling settings easily. -labels.wizard_start_button=Start +labels.wizard_start_button=Start Configuration labels.wizard_schedule_title=Crawling Schedule labels.wizard_schedule_enabled=Use Schedule labels.wizard_schedule=Schedule @@ -779,10 +779,11 @@ labels.wizard_button_skip=Skip labels.wizard_button_cancel=Cancel labels.wizard_button_back=Back labels.wizard_crawling_config_title=Crawling Configuration +labels.wizard_crawling_setting_title=Crawling Setting labels.wizard_crawling_config_name=Name labels.wizard_crawling_config_path=Crawling Path labels.wizard_button_register_again=Create again -labels.wizard_button_register_next=Create/Next +labels.wizard_button_register_next=Create and Next labels.wizard_schedule_day_sun=Sun labels.wizard_schedule_day_mon=Mon labels.wizard_schedule_day_tue=Tue @@ -794,9 +795,10 @@ labels.wizard_schedule_day_m_f=Mon-Fri labels.wizard_schedule_day_mwf=Mon,Wed,Fri labels.wizard_schedule_day_tt=Tue,Thu labels.wizard_start_crawling_title=Start Crawling +labels.wizard_start_crawler_title=Crawler labels.wizard_start_crawling_desc=To click "Start Crawling" button, you can start a crawling now. labels.wizard_button_start_crawling=Start Crawling -labels.wizard_button_finish=Finish +labels.wizard_button_finish=Skip labels.search_list_configuration=Search Result labels.search_list_index_page=Type a search query. labels.search_list_title_confirm_delete=Delete Confirmation @@ -940,7 +942,7 @@ labels.favorite_log_download_csv=Download (CSV) labels.favorite_log_search_term=Term labels.favorite_log_title_confirm=Details labels.favorite_log_id=ID -labels.scheduledjob_configuration=Managed Jobs +labels.scheduledjob_configuration=Job Scheduler labels.scheduledjob_title_details=Jobs labels.scheduledjob_button_create=Create labels.scheduledjob_button_back=Back @@ -1232,3 +1234,6 @@ labels.crud_link_next_page=Next labels.crud_link_prev_page=Back labels.crud_title_details=Details labels.crud_title_confirm=Confirmation +labels.admin_brand_title=Fess +labels.admin_dashboard_title=Fess Dashboard +labels.admin_toggle_navi=Toggle navigation \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp index f3cf7dad4294e78b7bada9d995e664c16efd7334..4330a5d0e146838b4815a0cbfb5f86eac4605642 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp index b077bf1fcc5212e038a0e0e2740cc097c27c4afd..be15044903ba53a7b663ee284f9cb8e9df7365a9 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/error.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/error.jsp index 53ec92bf2433706ab2cdb17d0854c4f7d8a33f18..e964a23d66833e113c997a844536ec4d7c4f28e0 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp index 4b21c4f45a2c88e9499b484f74097c5c8ab4207d..0d18b0dfccef79681654e2a83ecd3f1308cfdfb3 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.boost_document_rule_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp b/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp index 7389604947c1caa84be2485202935d1e4faa607f..05240db7d85c605f8a4dd443a5943220dd40431e 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawl/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.crawler_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawler_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp index c119f3273fe9c48303777a23177042ce88f3b4c2..8c6a105fb6ecf219b83f6b770aeb1c7cb38e2cfa 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.crawling_session_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp b/src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp index 32764e9c4daa6eab326feaa191e7b892e414b25d..86de29af16e12479cf14bab336c9471a2d325ac7 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.crawling_session_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp b/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp index 2d5eb2100c8a4c08c5b81d71c8d28eae30140d8f..9dd42955179cb16cae97db66e04cd0846eb544e7 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.crawling_session_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp index 6301d30fcc0b28e1ac60cbbff7192014b72b20be..ea0d4b0d36f9dc71481db32e8dd07caaa19be848 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp index a52c894a216ca4add3d2c0f04cca4b360cff118b..e92d0155d629dd52e631259633c73af31459f946 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/error.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/error.jsp index 138960ee2982deaf7d88ef93ee842c5c25dbd6a4..350065171a78b4c5d56f0a67f7c99c556b839f9d 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp index b9c42ac9b6493418e93eb7b8126e98aa5d8add4f..c9be073d4c2b606b99812b3a5cb23a5f19312b33 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp b/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp index 6669b7664cf9219a0399bba65620d1693856217f..e2b0b77bad7c3325f6d8ea1f3810acf928187ec3 100644 --- a/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp +++ b/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.design_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.design_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp b/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp index 3c63bf83acc1ffa9308a9ef8df6b074d83f79e3f..d4837064f60a9d84cab85c2f71d4592796520713 100644 --- a/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.design_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.design_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/error.jsp b/src/main/webapp/WEB-INF/view/admin/dict/error.jsp index 501a0d288f1eb7795bde3407917fa537c9452bde..b0c8f75910a0d4cf5d3111af72a4ac2e250fe688 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/index.jsp b/src/main/webapp/WEB-INF/view/admin/dict/index.jsp index 9e484f298a4aec9e5a2960bae9ed20c28b2e769d..ed75b41332540b325675222eaaf8da83bcb8befc 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp index 4223ab8cb7e683e2ae28578dd5c101d2cc7f97a2..cfff1f3b0f638c35f8abd7f9a2b388f1722416d0 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp index 3460186c19435c9670926279237cb0fa4096e829..618cb5fc506b055ec34b400bdc12166b13df6a72 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp index 806b1edccaabf58d415c54fa04e3bc0266832b1f..c143430cce42c0d8c0c2fc22417c96a7a94dcc7c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp index 11e00dead894cde6bd52d342cd4fa403d055270f..56a125f99e96dd0045a07132e8277e95ab18f280 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp index c2abcd5549367d272b51c939961f8387708604a9..d4c713bfaa17dc4f5fd0db04b5e6ae986b79f4fc 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp index 1739001d5897cdaa1757c445c917a2d118d5e969..6de40afc397777dcab7f79bf41d9a9f5c2089186 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_kuromoji_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp index f6b2264f8976e39cb5b05677c6d6a348c416c1c8..c7a42654cc6af23d430c9fb57c5e533b058e5509 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp index 2bd0256c0199a8258a0b87dcaaab3293fe3063b8..c91048ac38e3d2b124483972dddec5cced4313ee 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp index 6f43e8e75f1c7387eb858e754443bfc7266752d9..d7f54f3ce1dc45ec1c74aae04c585fe4ff6f67bd 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp index 1c84aa81f53d1a8337cb75e1cb365a360da43f69..cf0fe67c0c7979612978425b27942676eb6812e5 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp index 16fcb78e31753199e6d768775a977421e2f10792..8a48e7f5b4466811c8e441fd11b71450e66bd96f 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp index 7cc8e62dbf09b9478683033a54e4abe1f5b5649f..7115699db8a15202d7f86865faf4b7dd777522ab 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.dict_synonym_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp index 37058b275a75c87e9691985e19c9b4c79dc78e15..e9d195f377e63f14c6b0ecdafb9968a27c797614 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.failure_url_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/error.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/error.jsp index 39a5c798d80cddab11eb7eb885cb756076cbf5e7..cf52b8b9bddd71537d4a2c037e5f469ca77828c1 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.failure_url_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp index 2f624d919eebe83d53292fabc3140c9551c96f09..9f0bfb38f53f58b63e05b1124f4a700cb2d9246b 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.failure_url_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp index ec2d340c18f98b1bffe3ec7c7c4c6167e133a134..f0619b9e6c3d8021cbcc74298a5c53d6d72d0a30 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_authentication_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp index 8e095ace5d3105579e032f349b41bf0ae29fde1c..34628f25cd2d0d5eacd3a4487ce3f807f0940ede 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_authentication_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/error.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/error.jsp index ef7a0d3569f1502e34d18c62d392a31997b1653a..fe4f4a2aba4c716001514835fed19813829acaff 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_authentication_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp index 9acc91748bcceac3a3d92aacc99f8427c9a844d2..9f8e0372f85c6d96fbfef8445f07069cde62ad2a 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_authentication_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp index f39cf6926dbe806c6f55fec9b279864e5e352fce..6a4e9ff117a492f897ac1fc08f38fd0ddd3f0599 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp index 4d5d700005624eb188297b730387d51d4eb53379..0e4fbc75e8e9ead9198544ee0f3cd59e7a8db5da 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/error.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/error.jsp index fca3b6a101c813cd48370d1fea71eb30b964749c..83bdd17e7e566dfb0a30b402c0d8325b61973b77 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp index 7ccd2cfa654aec1e3795262d3ec60a311e8a7678..cd3df318c94d911c10eabf6a54c6f832ce5d7518 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.file_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp index 81df383a49e3743181a479e6a75f09d73a8b6ba1..b0dcf379679cd1354ddc0a46ecdcf0ee7c94b211 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.group_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/group/edit.jsp b/src/main/webapp/WEB-INF/view/admin/group/edit.jsp index e1ce7672de3e58c3fc06c3ba2e290ba9aefc59fb..70e4744aae1154bdf41d16e3e6404d31d9390494 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.group_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/group/error.jsp b/src/main/webapp/WEB-INF/view/admin/group/error.jsp index 3e48bf69d4d1e3dcf1b92e2537521d1e3ea3dfe0..a7faf873d54bab6045241e9c7b350981cecfbc83 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.group_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/group/index.jsp b/src/main/webapp/WEB-INF/view/admin/group/index.jsp index 24a987f107fb4791b5e8adfcd4c7878bab6a101d..9065f054905baa87bead04c56079bb9611858cca 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.group_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp index f8762b004013a84ccf10fc6a561f2c6b4573b1fc..00c9ce873bfdceedd7411cd9641dc92e8a943c31 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/error.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/error.jsp index 5a74f1bdb9893324f5b03be227e35563954a6cf1..2538b651c9bf527c3ad8f34872be4ae0ff2e5b0b 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp index d4964b329fd93702f9cf9f5512b658414f648742..9296e28a03226f3ee77d190f03c502df4eebf2e5 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <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"> diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp index 4e770226a3b1b5c8cfc6ff6aead17733508c87b1..252e04eb79abda187bd584088757b35f7be1ee00 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.key_match_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp index 2f07576f1f3a6c01c66955e64f9bf6d6d366066a..5aa07b3e2134004ee5f8a197272da31d4f238b68 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.key_match_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp index 76f9335444ef18e6b48c4b0eee068ef6dd806b1b..4e0e708aecf31ab724713b6d6ecbc30f29bc0bce 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.key_match_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp index 695879a0d260d9d2827f876cf9c5374d0893575a..04908081a13a86b3f3df306cac608f3545824569 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.key_match_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp index a83d9e48d891743680901a1f82586e82dddb158f..b1ff40d0c3ca34ada55d610c63992a315b3023f1 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.labeltype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp index 1abda820958ebf7bd1a063c1579e93cb1ee88cb1..30c300d0cb49fd05ec7b796d87e330e8f4e96959 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.labeltype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/error.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/error.jsp index 07e60e9ee3846e955866fd9e14d2aa8223f11517..8e1c520911a7411c56d1f15c7abb1f5c142ff992 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.labeltype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp index 3d43f12ff30911761167f31ae5ee571f836b68d6..7a1b5f498529efb50dc4c477041913a4aa347e5b 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.labeltype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/log/index.jsp b/src/main/webapp/WEB-INF/view/admin/log/index.jsp index e6ce361fc6520235b85dc4322fa01772f4bc0f85..036f236f4abb68934265743e760dd4f6d0fffab9 100644 --- a/src/main/webapp/WEB-INF/view/admin/log/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/log/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.log_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.log_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp index 7321ea91fc4c57ace4a8ee6a891d2fae82015fa7..577f1f4836735bd6e753ec8cc4ee04d79479b40e 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp index 1e891f3b0a2c7b5cec4c2abe811f1996b0a9feea..cb02ddf085594e724f849789ff4958c8d817e025 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/error.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/error.jsp index a05715c8197a67dc5cb89a5dd2cdc66f836cea63..7962e85fddc59c4dc0e9a31b2550f6186b3f216b 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp index 85c379b0db33d4b834a81476e80be2a4cf7d802a..cd9ac88dd6764020a1bc7be43b35340fdcadde4e 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.overlapping_host_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp index c4b91ecc51a66f50a656f422f58a958a728d53e5..a89b9fa04546dbbde7358d9150e735369aecd3d8 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.path_mapping_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp index 9bcea2ae7cd55c2c142a3bd9edae956cdaca08f4..55b7cf7139a9b385d142c7313daab93af5d82f3f 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.path_mapping_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/error.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/error.jsp index ec95714f08da895a1e621ff5977ea3919cbd9fcb..20c5bc1460d92d9686621ef2dadddcf1df842540 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.path_mapping_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp index 61016406cd4b92dc601f3f25d2d6ffe57f533ffb..f45d18f352f7546a7b393d3b7d251a51f95c8c46 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.path_mapping_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp index 3f1a31b754d1e585e4c3a072ed51f2f0e21779d8..bfed83b19ce84d2fb54e0c59b72bdf41c8818ce0 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.request_header_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp index 7d4dab560b14cf9e95fce0be6fb9526b5490c08d..bf63fcaec294eba85274f4a6df03eedfebb6e0be 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.request_header_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/error.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/error.jsp index 957746871ae8152ab39b2d6b91d8bed1002ee1de..d9567e388f8fc5e1cca2b48679dfbe9d3cd98b2c 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.request_header_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp index 0a3b6a0733063cc5fcff67ebfbfc4fc59f439cfa..897285a6c0142618701d21911a27e4a8b09bfb7c 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.request_header_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp index 2f65974134cc678a4299be7c246635c72fa6fc92..777d92d7b32b6e06372f04b3c80f1ccbca84d069 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.role_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/role/edit.jsp b/src/main/webapp/WEB-INF/view/admin/role/edit.jsp index 73e47f7be08ef24f6d2748241e3fdefa62c84dee..88a5e437734e0ca9c4c93ab21adfee93b5ac994d 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.role_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/role/error.jsp b/src/main/webapp/WEB-INF/view/admin/role/error.jsp index 7a4fc8b912e63d43e739b1eabfffd68d2d20aa08..f3d3c58a9b056aa0c3fbb67e1929ca170a9b3eda 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.role_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/role/index.jsp b/src/main/webapp/WEB-INF/view/admin/role/index.jsp index 18d9c3f2c88e791a92050aa8803bb685ecb2d298..0fd1d6cff8263a28c239b0adc1e48993aae3ba92 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.role_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp index f6a4daf56b18d541cf0d519b8ad0f5d6cbf09a9d..6be32a20095fbe26bf3d934783f93f716d959b51 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.roletype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp index 3b5ae34a033ef4eae4ed259a0665bf27082bbf9d..c7b3184e1b68bc75f701f8249ae1dcf22b8b7030 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.roletype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/error.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/error.jsp index ae376d03e09d9061571fe7758d67117bd1d1a19b..3d9c78b9b69ac4bae11e996cd7b366a627590a22 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.roletype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp index c6df9fc0f1aa243abd2fbc79098c87b807113b67..8cac48e25378331a301837303befffce1f3f50c3 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.roletype_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp index ce06f6adad797dc7990956d3f8ea6e38f94c6759..c7e1ec493bdf415cba4b291d9d25c142b512c62b 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.scheduledjob_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp index fed0641c31b726c69a11ea34a4e99c460785e656..c539ecc957e5b6bda23037c59ce0c841a854a07c 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.scheduledjob_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/error.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/error.jsp index 1f391f51739a86babded79ffe214bda3b2e5f814..d02638ca8e455b09fde754f21b56c89bb01fd43a 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.scheduledjob_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp index 6f25849bf4668233be4f84e8d1ad4590cb396589..1ed58641a15b8e4a4f539d9dc4de2cf938e3fa11 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.scheduledjob_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp index acb238e709c0117402940e4778db25a100907b1e..3184347b5d7260b8d989068d8592b4030d0e5f18 100644 --- a/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp +++ b/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.search_list_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.search_list_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp index 7ea49d011171431e1554b5eebc69d79ea834badb..ecaeb11f8f0fc3ba49aa55ecf4068b0daa5f94da 100644 --- a/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.search_list_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.search_list_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp index 2cc79cac1a93ebd865c6190738e4fb3cfadf585f..5f81c86fce259627e5e46a38c0c0383b78c6df80 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_bad_word_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp index a94fd8110587e98e7d80dc3b9526fb0a6fb46b9e..9a00615cb57c7d50e4985e4632338a3babe13e4a 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_bad_word_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp index 6c1e281badebfe49226ca88a681f39ef9bc19eba..95308c9572f4d7744e1929141bd24fafbbeac59c 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_bad_word_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/error.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/error.jsp index 6ba2df560019899c5010f16d976006cc5592a676..4a414d93cc74df5f07a9ab4b0959a73cccfba7a2 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_bad_word_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp index 45776e2d75ab52dcc4a91eb9b71f92042656f0a2..e338736bdc79a40a153c7f023856d5a4f73f979d 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_bad_word_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp index 12456743fee5317c19b87920cdbf93891deca7d2..49315a2d0ebd15de9be1cbeadb402bd0b2b0813f 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_bad_word_configuration" /></title> +<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"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp index 3459e88cea429211406faf80aa06f45f079700fd..5eedecff3a59a56591d87ca7c35c795e9a4027e3 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp index 8da01d03323db0cb255a332337f2b6bbc723919e..ddd080fe63f3dc9d80594d53c20e2548ecd004f7 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp index cae302b84e3d1eb7c94b97036fcc7f7321267684..7413e56f7234212846ba21d6e569bb199c773f12 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/error.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/error.jsp index 73423158996f0e877cd34f1b9477e3b347ed72d2..2281e90e5fbc50245641da8830c06eb0e014d198 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp index 5466494cbd5852a8f79a9c3c05e3b2319eb58c3d..6c7b2bb4875ac40ab2381daadf9178192b5bf330 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp index 325b45e98ab374196003105bfc23d2077af63b77..937f57db224ccc7c79cfdf405909c37adcfee285 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/system/index.jsp b/src/main/webapp/WEB-INF/view/admin/system/index.jsp index 512d66608a220b6d879d9335a885f15992b2e010..111c376b83d6fe750a0ebdb5058f764e750c0d4a 100644 --- a/src/main/webapp/WEB-INF/view/admin/system/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/system/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.system_title_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.system_title_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp b/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp index e071bbffde0bb58ae0600c9283afd97fd0a476c9..0c3baa1d0812a43d1de4e29727ce7a827547617d 100644 --- a/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.system_info_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.system_info_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp index 3a25ec6c7a13f473aee1f737dce5670a8885a7aa..7320f867b33cb5e4dd51b8a2781cb5063d2c95dc 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.user_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/user/edit.jsp b/src/main/webapp/WEB-INF/view/admin/user/edit.jsp index 666f2ed4cca10e96774288f62060065865841727..b369aebf4805ebc4631422078c3781f7d897241c 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.user_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/user/error.jsp b/src/main/webapp/WEB-INF/view/admin/user/error.jsp index 13e0b20fe28e0acf0ceded35eb0829bc0174bedf..999607dce4946aa6491d104e501b70770353ce2e 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.user_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/user/index.jsp b/src/main/webapp/WEB-INF/view/admin/user/index.jsp index 4b0b33f006854e280041de241ceeeb690335c99f..519d089d11cb08c907fc48cd66a3a5a58af64f59 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.user_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp index ac2c8f4a5fdfb0e63babd399c16ac3f19d449e62..7c6a24b8061cdb7f79e1c99eee48b1384f0717e4 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp index 7d0ee97463bd05e46696165096b312a714612bdf..e1ca900ee3b614f0535eb440aa38fd9ddc1c8336 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/error.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/error.jsp index d9c3c0f3ca5168030b61dbbfcffa16b8f3a0ba5d..04fa6218d447684503bf5c262e6b3df24cb0fb22 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp index 3b15d9de5c1d3c9bc4c1ef8f06c95b75f85863b1..8e11e7c043255118ff06241fc25f5c260f7720f5 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp index 59017b6da1009f896915bb59a687bd731e600050..3d93ad3385bd452b9d10ad95ecbf89f2997563a2 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp index affba650db91bc4f8b0ca96ee71bfa3654680d49..453c6f0caaed80f3b7979df594384aa71fe72596 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/error.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/error.jsp index d09237902a3b0f2c952338d752c027f723785f47..ffabadd1f3a8074174446f5f103ecac0f1bac0f4 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp index f8e7abb6c1ab29d09ab47b9558d5e9333fff72fb..d6ede5ae20f6b1662ca4c41bb518b7b1e7f1aab8 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.web_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp index e30d6806bcc912533011507d2e17f922dd041ce2..9a9dcd9b8ebfcd985d518df7042e350071218883 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.wizard_title_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -16,7 +16,7 @@ <div class="content-wrapper"> <section class="content-header"> <h1> - <la:message key="labels.wizard_start_title" /> + <la:message key="labels.wizard_crawling_config_title" /> </h1> <ol class="breadcrumb"> <li><la:link href="/admin/wizard/"> @@ -34,7 +34,7 @@ <div class="box"> <div class="box-header with-border"> <h3 class="box-title"> - <la:message key="labels.wizard_crawling_config_title" /> + <la:message key="labels.wizard_crawling_setting_title" /> </h3> </div> <div class="box-body"> diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/error.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/error.jsp index fadf0228310b9d3d806bdbe86f2b21e8eae77fc3..dd2de90a1164159951e90092cbb6b0cd45afd7cc 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/error.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/error.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.wizard_title_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp index 2b5c83aa339e316f14134441711b994bc0098eb2..6af9f51ddfe9249b990fa6e445edb1a91c08dea2 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.wizard_title_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp index d111900c52973d3c4f9efce5fd63342bf268c197..0dd19a0ccdb745745b6cfbbf32754f5bb8748d1f 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> -<title>Fess | <la:message key="labels.wizard_title_configuration" /></title> +<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -35,7 +35,7 @@ <div class="col-md-12"> <div class="box"> <div class="box-header with-border"> - <h3 class="box-title">Start Crawling</h3> + <h3 class="box-title"><la:message key="labels.wizard_start_crawler_title" /></h3> </div> <div class="box-body"> <%-- Message: BEGIN --%> @@ -54,9 +54,10 @@ </p> </div> <div class="box-footer"> - <input type="submit" class="btn btn-primary" name="startCrawling" + <input type="submit" class="btn" name="index" value="<la:message key="labels.wizard_button_finish"/>" /> <input + type="submit" class="btn btn-primary" name="startCrawling" value="<la:message key="labels.wizard_button_start_crawling"/>" - /> <input type="submit" class="btn" name="index" value="<la:message key="labels.wizard_button_finish"/>" /> + /> </div> </div> </div> diff --git a/src/main/webapp/WEB-INF/view/common/admin/header.jsp b/src/main/webapp/WEB-INF/view/common/admin/header.jsp index a75c2fb2e51aeb8b129d2dc6c4db306bd5239fe6..71558c9e461a134389ef2f30a060901271e4ded3 100644 --- a/src/main/webapp/WEB-INF/view/common/admin/header.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin/header.jsp @@ -3,16 +3,16 @@ <header class="main-header"> <!-- Logo --> - <a href="/admin/" class="logo"> + <la:link href="/admin/" styleClass="logo"> <span class="logo-mini"><la:message key="labels.header.logo_alt" /></span> - <span class="logo-lg">Fess Dashboard</span> - </a> + <span class="logo-lg"><la:message key="labels.admin_dashboard_title" /></span> + </la:link> <!-- Header Navbar --> <nav class="navbar navbar-static-top" role="navigation"> <!-- Sidebar toggle button--> <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button"> - <span class="sr-only">Toggle navigation</span> + <span class="sr-only"><la:message key="labels.admin_toggle_navi" /></span> </a> <!-- Navbar Right Menu --> <div class="navbar-custom-menu">