From 08254cb922738120fa89c0832891a34e33a532f7 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Thu, 15 Oct 2015 17:13:21 +0900
Subject: [PATCH] improve messages
---
.../web/admin/wizard/AdminWizardAction.java | 2 +-
.../codelibs/fess/app/web/go/GoAction.java | 2 +-
.../fess/crawler/FessCrawlerThread.java | 15 ++++----
.../interval/FessIntervalController.java | 2 +-
.../AbstractFessFileTransformer.java | 22 +++++------
.../AbstractFessXpathTransformer.java | 2 +-
.../transformer/FessFileTransformer.java | 4 +-
.../transformer/FessTikaTransformer.java | 2 +-
.../transformer/FessXpathTransformer.java | 22 +++++------
.../fess/ds/impl/CsvDataStoreImpl.java | 4 +-
.../fess/ds/impl/FileListDataStoreImpl.java | 18 ++++-----
.../codelibs/fess/es/exentity/DataConfig.java | 14 +++----
.../codelibs/fess/es/exentity/FileConfig.java | 6 +--
.../fess/es/exentity/WebAuthentication.java | 6 +--
.../codelibs/fess/es/exentity/WebConfig.java | 6 +--
.../java/org/codelibs/fess/exec/Crawler.java | 2 +-
.../fess/helper/CrawlerLogHelper.java | 4 +-
.../codelibs/fess/helper/SystemHelper.java | 2 +-
.../org/codelibs/fess/helper/ViewHelper.java | 10 ++---
.../fess/helper/WebFsIndexHelper.java | 10 ++---
.../codelibs/fess/indexer/IndexUpdater.java | 20 +++++-----
.../fess/mylasta/action/FessLabels.java | 37 +++++++++++++------
.../org/codelibs/fess/util/ComponentUtil.java | 6 +--
src/main/resources/fess_label.properties | 27 ++++++++------
.../view/admin/boostdocumentrule/confirm.jsp | 2 +-
.../view/admin/boostdocumentrule/edit.jsp | 2 +-
.../view/admin/boostdocumentrule/error.jsp | 2 +-
.../view/admin/boostdocumentrule/index.jsp | 2 +-
.../webapp/WEB-INF/view/admin/crawl/index.jsp | 2 +-
.../view/admin/crawlingsession/confirm.jsp | 2 +-
.../view/admin/crawlingsession/error.jsp | 2 +-
.../view/admin/crawlingsession/index.jsp | 2 +-
.../WEB-INF/view/admin/dataconfig/confirm.jsp | 2 +-
.../WEB-INF/view/admin/dataconfig/edit.jsp | 2 +-
.../WEB-INF/view/admin/dataconfig/error.jsp | 2 +-
.../WEB-INF/view/admin/dataconfig/index.jsp | 2 +-
.../view/admin/design/admin_design.jsp | 2 +-
.../view/admin/design/admin_design_edit.jsp | 2 +-
.../webapp/WEB-INF/view/admin/dict/error.jsp | 2 +-
.../webapp/WEB-INF/view/admin/dict/index.jsp | 2 +-
.../view/admin/dict/kuromoji/confirm.jsp | 2 +-
.../view/admin/dict/kuromoji/download.jsp | 2 +-
.../WEB-INF/view/admin/dict/kuromoji/edit.jsp | 2 +-
.../view/admin/dict/kuromoji/error.jsp | 2 +-
.../view/admin/dict/kuromoji/index.jsp | 2 +-
.../view/admin/dict/kuromoji/upload.jsp | 2 +-
.../view/admin/dict/synonym/confirm.jsp | 2 +-
.../view/admin/dict/synonym/download.jsp | 2 +-
.../WEB-INF/view/admin/dict/synonym/edit.jsp | 2 +-
.../WEB-INF/view/admin/dict/synonym/error.jsp | 2 +-
.../WEB-INF/view/admin/dict/synonym/index.jsp | 2 +-
.../view/admin/dict/synonym/upload.jsp | 2 +-
.../WEB-INF/view/admin/failureurl/confirm.jsp | 2 +-
.../WEB-INF/view/admin/failureurl/error.jsp | 2 +-
.../WEB-INF/view/admin/failureurl/index.jsp | 2 +-
.../view/admin/fileauthentication/confirm.jsp | 2 +-
.../view/admin/fileauthentication/edit.jsp | 2 +-
.../view/admin/fileauthentication/error.jsp | 2 +-
.../view/admin/fileauthentication/index.jsp | 2 +-
.../WEB-INF/view/admin/fileconfig/confirm.jsp | 2 +-
.../WEB-INF/view/admin/fileconfig/edit.jsp | 2 +-
.../WEB-INF/view/admin/fileconfig/error.jsp | 2 +-
.../WEB-INF/view/admin/fileconfig/index.jsp | 2 +-
.../WEB-INF/view/admin/group/confirm.jsp | 2 +-
.../webapp/WEB-INF/view/admin/group/edit.jsp | 2 +-
.../webapp/WEB-INF/view/admin/group/error.jsp | 2 +-
.../webapp/WEB-INF/view/admin/group/index.jsp | 2 +-
.../WEB-INF/view/admin/joblog/confirm.jsp | 2 +-
.../WEB-INF/view/admin/joblog/error.jsp | 2 +-
.../WEB-INF/view/admin/joblog/index.jsp | 2 +-
.../WEB-INF/view/admin/keymatch/confirm.jsp | 2 +-
.../WEB-INF/view/admin/keymatch/edit.jsp | 2 +-
.../WEB-INF/view/admin/keymatch/error.jsp | 2 +-
.../WEB-INF/view/admin/keymatch/index.jsp | 2 +-
.../WEB-INF/view/admin/labeltype/confirm.jsp | 2 +-
.../WEB-INF/view/admin/labeltype/edit.jsp | 2 +-
.../WEB-INF/view/admin/labeltype/error.jsp | 2 +-
.../WEB-INF/view/admin/labeltype/index.jsp | 2 +-
.../webapp/WEB-INF/view/admin/log/index.jsp | 2 +-
.../view/admin/overlappinghost/confirm.jsp | 2 +-
.../view/admin/overlappinghost/edit.jsp | 2 +-
.../view/admin/overlappinghost/error.jsp | 2 +-
.../view/admin/overlappinghost/index.jsp | 2 +-
.../view/admin/pathmapping/confirm.jsp | 2 +-
.../WEB-INF/view/admin/pathmapping/edit.jsp | 2 +-
.../WEB-INF/view/admin/pathmapping/error.jsp | 2 +-
.../WEB-INF/view/admin/pathmapping/index.jsp | 2 +-
.../view/admin/requestheader/confirm.jsp | 2 +-
.../WEB-INF/view/admin/requestheader/edit.jsp | 2 +-
.../view/admin/requestheader/error.jsp | 2 +-
.../view/admin/requestheader/index.jsp | 2 +-
.../WEB-INF/view/admin/role/confirm.jsp | 2 +-
.../webapp/WEB-INF/view/admin/role/edit.jsp | 2 +-
.../webapp/WEB-INF/view/admin/role/error.jsp | 2 +-
.../webapp/WEB-INF/view/admin/role/index.jsp | 2 +-
.../WEB-INF/view/admin/roletype/confirm.jsp | 2 +-
.../WEB-INF/view/admin/roletype/edit.jsp | 2 +-
.../WEB-INF/view/admin/roletype/error.jsp | 2 +-
.../WEB-INF/view/admin/roletype/index.jsp | 2 +-
.../view/admin/scheduledjob/confirm.jsp | 2 +-
.../WEB-INF/view/admin/scheduledjob/edit.jsp | 2 +-
.../WEB-INF/view/admin/scheduledjob/error.jsp | 2 +-
.../WEB-INF/view/admin/scheduledjob/index.jsp | 2 +-
.../view/admin/searchlist/confirmDelete.jsp | 2 +-
.../WEB-INF/view/admin/searchlist/index.jsp | 2 +-
.../view/admin/suggestbadword/confirm.jsp | 2 +-
.../view/admin/suggestbadword/download.jsp | 2 +-
.../view/admin/suggestbadword/edit.jsp | 2 +-
.../view/admin/suggestbadword/error.jsp | 2 +-
.../view/admin/suggestbadword/index.jsp | 2 +-
.../view/admin/suggestbadword/upload.jsp | 2 +-
.../view/admin/suggestelevateword/confirm.jsp | 2 +-
.../admin/suggestelevateword/download.jsp | 2 +-
.../view/admin/suggestelevateword/edit.jsp | 2 +-
.../view/admin/suggestelevateword/error.jsp | 2 +-
.../view/admin/suggestelevateword/index.jsp | 2 +-
.../view/admin/suggestelevateword/upload.jsp | 2 +-
.../WEB-INF/view/admin/system/index.jsp | 2 +-
.../WEB-INF/view/admin/systeminfo/index.jsp | 2 +-
.../WEB-INF/view/admin/user/confirm.jsp | 2 +-
.../webapp/WEB-INF/view/admin/user/edit.jsp | 2 +-
.../webapp/WEB-INF/view/admin/user/error.jsp | 2 +-
.../webapp/WEB-INF/view/admin/user/index.jsp | 2 +-
.../view/admin/webauthentication/confirm.jsp | 2 +-
.../view/admin/webauthentication/edit.jsp | 2 +-
.../view/admin/webauthentication/error.jsp | 2 +-
.../view/admin/webauthentication/index.jsp | 2 +-
.../WEB-INF/view/admin/webconfig/confirm.jsp | 2 +-
.../WEB-INF/view/admin/webconfig/edit.jsp | 2 +-
.../WEB-INF/view/admin/webconfig/error.jsp | 2 +-
.../WEB-INF/view/admin/webconfig/index.jsp | 2 +-
.../view/admin/wizard/crawlingConfig.jsp | 6 +--
.../WEB-INF/view/admin/wizard/error.jsp | 2 +-
.../WEB-INF/view/admin/wizard/index.jsp | 2 +-
.../view/admin/wizard/startCrawling.jsp | 9 +++--
.../WEB-INF/view/common/admin/header.jsp | 8 ++--
136 files changed, 253 insertions(+), 233 deletions(-)
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 61b9434a7..164429e89 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 5a8799d1a..dadb603cb 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 932960dc7..d0027088e 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 25739895b..acdbe5860 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 cdb501869..6bbc883ac 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 7be789a4c..8a40b0a4c 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 e5c13e0d4..ac2293e2e 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 b3d58154a..ad9617b46 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 d626061a2..54dcedc04 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 53f1cb38e..236533099 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 ea3a8215c..2e8499eee 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 b498e81ae..4118fc048 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 be64db551..4da275996 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 fd220bacb..45a3b086e 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 6bd97f37f..248bdeb81 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 5573a2ba7..15c759886 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 8f6570a3d..52ae6784a 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 485c87672..531a48bb7 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 95e95f9af..ec4c9a522 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 bf2f7d008..e631399f9 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 2010e3e61..3fdad776b 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 f0c2979cc..fb077800f 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 13c4b015b..267d09ef4 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 d94db1b5d..d19d75373 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 f3cf7dad4..4330a5d0e 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 b077bf1fc..be1504490 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 53ec92bf2..e964a23d6 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 4b21c4f45..0d18b0dfc 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 738960494..05240db7d 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 c119f3273..8c6a105fb 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 32764e9c4..86de29af1 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 2d5eb2100..9dd429551 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 6301d30fc..ea0d4b0d3 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 a52c894a2..e92d0155d 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 138960ee2..350065171 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 b9c42ac9b..c9be073d4 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 6669b7664..e2b0b77ba 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 3c63bf83a..d4837064f 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 501a0d288..b0c8f7591 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 9e484f298..ed75b4133 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 4223ab8cb..cfff1f3b0 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 3460186c1..618cb5fc5 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 806b1edcc..c143430cc 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 11e00dead..56a125f99 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 c2abcd554..d4c713bfa 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 1739001d5..6de40afc3 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 f6b2264f8..c7a42654c 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 2bd0256c0..c91048ac3 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 6f43e8e75..d7f54f3ce 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 1c84aa81f..cf0fe67c0 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 16fcb78e3..8a48e7f5b 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 7cc8e62db..7115699db 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 37058b275..e9d195f37 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 39a5c798d..cf52b8b9b 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 2f624d919..9f0bfb38f 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 ec2d340c1..f0619b9e6 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 8e095ace5..34628f25c 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 ef7a0d356..fe4f4a2ab 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 9acc91748..9f8e0372f 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 f39cf6926..6a4e9ff11 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 4d5d70000..0e4fbc75e 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 fca3b6a10..83bdd17e7 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 7ccd2cfa6..cd3df318c 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 81df383a4..b0dcf3796 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 e1ce7672d..70e4744aa 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 3e48bf69d..a7faf873d 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 24a987f10..9065f0549 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 f8762b004..00c9ce873 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 5a74f1bdb..2538b651c 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 d4964b329..9296e28a0 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 4e770226a..252e04eb7 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 2f07576f1..5aa07b3e2 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 76f933544..4e0e708ae 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 695879a0d..04908081a 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 a83d9e48d..b1ff40d0c 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 1abda8209..30c300d0c 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 07e60e9ee..8e1c52091 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 3d43f12ff..7a1b5f498 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 e6ce361fc..036f236f4 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 7321ea91f..577f1f483 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 1e891f3b0..cb02ddf08 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 a05715c81..7962e85fd 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 85c379b0d..cd9ac88dd 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 c4b91ecc5..a89b9fa04 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 9bcea2ae7..55b7cf713 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 ec95714f0..20c5bc146 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 61016406c..f45d18f35 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 3f1a31b75..bfed83b19 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 7d4dab560..bf63fcaec 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 957746871..d9567e388 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 0a3b6a073..897285a6c 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 2f6597413..777d92d7b 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 73e47f7be..88a5e4377 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 7a4fc8b91..f3d3c58a9 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 18d9c3f2c..0fd1d6cff 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 f6a4daf56..6be32a200 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 3b5ae34a0..c7b3184e1 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 ae376d03e..3d9c78b9b 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 c6df9fc0f..8cac48e25 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 ce06f6ada..c7e1ec493 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 fed0641c3..c539ecc95 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 1f391f517..d02638ca8 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 6f25849bf..1ed58641a 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 acb238e70..3184347b5 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 7ea49d011..ecaeb11f8 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 2cc79cac1..5f81c86fc 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 a94fd8110..9a00615cb 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 6c1e281ba..95308c957 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 6ba2df560..4a414d93c 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 45776e2d7..e338736bd 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 12456743f..49315a2d0 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 3459e88ce..5eedecff3 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 8da01d033..ddd080fe6 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 cae302b84..7413e56f7 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 734231589..2281e90e5 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 5466494cb..6c7b2bb48 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 325b45e98..937f57db2 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 512d66608..111c376b8 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 e071bbffd..0c3baa1d0 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 3a25ec6c7..7320f867b 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 666f2ed4c..b369aebf4 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 13e0b20fe..999607dce 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 4b0b33f00..519d089d1 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 ac2c8f4a5..7c6a24b80 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 7d0ee9746..e1ca900ee 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 d9c3c0f3c..04fa6218d 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 3b15d9de5..8e11e7c04 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 59017b6da..3d93ad338 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 affba650d..453c6f0ca 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 d09237902..ffabadd1f 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 f8e7abb6c..d6ede5ae2 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 e30d6806b..9a9dcd9b8 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 fadf02283..dd2de90a1 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 2b5c83aa3..6af9f51dd 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 d111900c5..0dd19a0cc 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 a75c2fb2e..71558c9e4 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">
--
GitLab