modify jsp and migrate to lasta

.gitignore

@@ -19,3 +19,4 @@
 *.iml
 .idea
 .DS_Store
+/plugins/

pom.xml

@@ -61,16 +61,19 @@
 		<tika.version>1.6</tika.version>
 		<poi.version>3.11-beta2</poi.version>
 		<pdfbox.version>1.8.7</pdfbox.version>
-		<!-- Elasticsearch -->
 
-		<elasticsearch.version>1.7.0</elasticsearch.version>
-		<cluster.runner.version>1.7.0.0-SNAPSHOT</cluster.runner.version>
+		<!-- Elasticsearch -->
+		<elasticsearch.version>1.7.1</elasticsearch.version>
+		<cluster.runner.version>1.7.0.0</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.delegate>true</tomcat.delegate>
 		<tomcat.useSeparateTomcatClassLoader>true</tomcat.useSeparateTomcatClassLoader>
 		<maven.tomcat.uriEncoding>UTF-8</maven.tomcat.uriEncoding>
 		<maven.tomcat.tomcatUsers.file>${basedir}/src/test/resources/tomcat-users.xml</maven.tomcat.tomcatUsers.file>
+
+		<maven.snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots</maven.snapshot.repo.url>
+		<maven.release.repo.url>http://central.maven.org/maven2</maven.release.repo.url>
 	</properties>
 	<build>
 		<finalName>fess</finalName>
@@ -197,6 +200,37 @@
 					<dbfluteClientDir>${basedir}/dbflute_fess</dbfluteClientDir>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.8</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.ant</groupId>
+						<artifactId>ant</artifactId>
+						<version>1.9.6</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<tasks>
+						<mkdir dir="${basedir}/target/plugins" />
+						<get dest="${basedir}/target/plugins">
+							<url
+								url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/1.6.0-SNAPSHOT/elasticsearch-configsync-1.6.0-20150716.075532-2.zip" />
+							<url
+								url="${maven.release.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/1.6.0/elasticsearch-analysis-kuromoji-neologd-1.6.0.zip" />
+						</get>
+						<delete dir="${basedir}/plugins" />
+						<mkdir dir="${basedir}/plugins" />
+						<unzip dest="${basedir}/plugins/analysis-kuromoji-neologd"
+							src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-1.6.0.zip" />
+						<unzip dest="${basedir}/plugins/configsync"
+							src="${basedir}/target/plugins/elasticsearch-configsync-1.6.0-20150716.075532-2.zip" />
+					</tasks>
+				</configuration>
+				<goals>
+					<goal>run</goal>
+				</goals>
+			</plugin>
 		</plugins>
 	</build>
 	<pluginRepositories>
@@ -362,7 +396,7 @@
 		<!-- s2robot -->
 		<dependency>
 			<groupId>org.codelibs.robot</groupId>
-			<artifactId>s2robot-lasta</artifactId>
+			<artifactId>s2robot-es</artifactId>
 			<version>${s2robot.version}</version>
 		</dependency>
 		<dependency>

src/main/java/org/codelibs/fess/api/BaseApiManager.java

@@ -16,6 +16,16 @@
 
 package org.codelibs.fess.api;
 
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.codelibs.core.exception.IORuntimeException;
+import org.lastaflute.web.util.LaRequestUtil;
+import org.lastaflute.web.util.LaResponseUtil;
+
 public class BaseApiManager {
     protected static final String FAVORITES_API = "/favoritesApi";
 
@@ -60,4 +70,31 @@ public class BaseApiManager {
         }
     }
 
+    public static void write(String text, String contentType, String encoding) {
+        if (contentType == null) {
+            contentType = "text/plain";
+        }
+        if (encoding == null) {
+            encoding = LaRequestUtil.getRequest().getCharacterEncoding();
+            if (encoding == null) {
+                encoding = "UTF-8";
+            }
+        }
+        HttpServletResponse response = LaResponseUtil.getResponse();
+        response.setContentType(contentType + "; charset=" + encoding);
+        try {
+            PrintWriter out = null;
+            try {
+                out = new PrintWriter(new OutputStreamWriter(response.getOutputStream(), encoding));
+                out.print(text);
+            } finally {
+                if (out != null) {
+                    out.close();
+                }
+            }
+        } catch (IOException e) {
+            throw new IORuntimeException(e);
+        }
+    }
+
 }

src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -548,7 +548,7 @@ public class JsonApiManager extends BaseApiManager implements WebApiManager {
         if (isJsonp) {
             buf.append(')');
         }
-        LaResponseUtil.write(buf.toString(), "text/javascript+json", Constants.UTF_8);
+        write(buf.toString(), "text/javascript+json", Constants.UTF_8);
 
     }
 

src/main/java/org/codelibs/fess/api/xml/XmlApiManager.java

@@ -375,7 +375,7 @@ public class XmlApiManager extends BaseApiManager implements WebApiManager {
             buf.append("</message>");
         }
         buf.append("</response>");
-        LaResponseUtil.write(buf.toString(), "text/xml", Constants.UTF_8);
+        write(buf.toString(), "text/xml", Constants.UTF_8);
 
     }
 

src/main/java/org/codelibs/fess/app/web/RootAction.java

@@ -329,14 +329,16 @@ public class RootAction {
         }
         if (doc == null) {
             errorMessage =
-                    MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", indexForm.docId);
+                    ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found",
+                            new Object[] { indexForm.docId });
             return "error.jsp";
         }
 
         final String content = viewHelper.createCacheContent(doc, indexForm.hq);
         if (content == null) {
             errorMessage =
-                    MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", indexForm.docId);
+                    ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found",
+                            new Object[] { indexForm.docId });
             return "error.jsp";
         }
         LaResponseUtil.write(content, "text/html", Constants.UTF_8);
@@ -359,13 +361,15 @@ public class RootAction {
         }
         if (doc == null) {
             errorMessage =
-                    MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found", indexForm.docId);
+                    ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.docid_not_found",
+                            new Object[] { indexForm.docId });
             return "error.jsp";
         }
         final Object urlObj = doc.get(fieldHelper.urlField);
         if (urlObj == null) {
             errorMessage =
-                    MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.document_not_found", indexForm.docId);
+                    ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(), "errors.document_not_found",
+                            new Object[] { indexForm.docId });
             return "error.jsp";
         }
         final String url = urlObj.toString();
@@ -420,7 +424,8 @@ public class RootAction {
                 } catch (final Exception e) {
                     logger.error("Failed to load: " + doc, e);
                     errorMessage =
-                            MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.not_load_from_server", url);
+                            ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(),
+                                    "errors.not_load_from_server", new Object[] { url });
                     return "error.jsp";
                 }
             } else if (Constants.TRUE.equals(crawlerProperties.getProperty(Constants.SEARCH_DESKTOP_PROPERTY, Constants.FALSE))) {
@@ -428,7 +433,8 @@ public class RootAction {
                 final File file = new File(path);
                 if (!file.exists()) {
                     errorMessage =
-                            MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.not_found_on_file_system", url);
+                            ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(),
+                                    "errors.not_found_on_file_system", new Object[] { url });
                     return "error.jsp";
                 }
                 final Desktop desktop = Desktop.getDesktop();
@@ -436,7 +442,8 @@ public class RootAction {
                     desktop.open(file);
                 } catch (final Exception e) {
                     errorMessage =
-                            MessageResourcesUtil.getMessage(LaRequestUtil.getRequest().getLocale(), "errors.could_not_open_on_system", url);
+                            ComponentUtil.getMessageManager().getMessage(LaRequestUtil.getRequest().getLocale(),
+                                    "errors.could_not_open_on_system", new Object[] { url });
                     logger.warn("Could not open " + path, e);
                     return "error.jsp";
                 }

src/main/java/org/codelibs/fess/app/web/admin/FileAuthenticationForm.java

@@ -62,7 +62,7 @@ public class FileAuthenticationForm implements Serializable {
     public String parameters;
 
     //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    //@LongType
+    //@Maxbytelength(maxbytelength = 1000)
     public String fileConfigId;
 
     //@Required(target = "confirmfromupdate,update,delete")

src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java

@@ -112,7 +112,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
 
     @Execute
     public HtmlResponse upload(DesignForm form) {
-        validate(form, messages -> {} , toMainHtml());
+        validate(form, messages -> {}, toMainHtml());
         final String uploadedFileName = form.designFile.getFileName();
         String fileName = form.designFileName;
         if (StringUtil.isBlank(fileName)) {

src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -172,14 +172,14 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Token(save = false, validate = true, keep = true)
     @Execute
     public HtmlResponse confirmfromcreate(KeyMatchEditForm form) {
-        validate(form, messages -> {} , toEditHtml());
+        validate(form, messages -> {}, toEditHtml());
         return asHtml(path_AdminKeyMatch_ConfirmJsp);
     }
 
     @Token(save = false, validate = true, keep = true)
     @Execute
     public HtmlResponse confirmfromupdate(KeyMatchEditForm form) {
-        validate(form, messages -> {} , toEditHtml());
+        validate(form, messages -> {}, toEditHtml());
         return asHtml(path_AdminKeyMatch_ConfirmJsp);
     }
 
@@ -189,7 +189,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Token(save = false, validate = true)
     @Execute
     public HtmlResponse create(KeyMatchEditForm form) {
-        validate(form, messages -> {} , toEditHtml());
+        validate(form, messages -> {}, toEditHtml());
         keyMatchService.store(createKeyMatch(form));
         saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL));
         ComponentUtil.getKeyMatchHelper().update();
@@ -199,7 +199,7 @@ public class AdminKeymatchAction extends FessAdminAction {
     @Token(save = false, validate = true)
     @Execute
     public HtmlResponse update(KeyMatchEditForm form) {
-        validate(form, messages -> {} , toEditHtml());
+        validate(form, messages -> {}, toEditHtml());
         keyMatchService.store(createKeyMatch(form));
         saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL));
         ComponentUtil.getKeyMatchHelper().update();
@@ -260,7 +260,7 @@ public class AdminKeymatchAction extends FessAdminAction {
         if (form.crudMode != expectedMode) {
             throwValidationError(messages -> {
                 messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode));
-            } , toEditHtml());
+            }, toEditHtml());
         }
     }
 

src/main/java/org/codelibs/fess/client/FessEsClient.java

@@ -2,7 +2,10 @@ package org.codelibs.fess.client;
 
 import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -18,6 +21,8 @@ import org.codelibs.core.io.FileUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner;
 import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.Configs;
+import org.codelibs.elasticsearch.runner.net.Curl;
+import org.codelibs.elasticsearch.runner.net.CurlResponse;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.ResultOffsetExceededException;
 import org.codelibs.fess.entity.FacetInfo;
@@ -160,10 +165,21 @@ public class FessEsClient implements Client {
 
     protected List<String> indexConfigList = new ArrayList<>();
 
+    protected Map<String, List<String>> configListMap = new HashMap<>();
+
     public void addIndexConfig(String path) {
         indexConfigList.add(path);
     }
 
+    public void addConfigFile(String index, String path) {
+        List<String> list = configListMap.get(index);
+        if (list == null) {
+            list = new ArrayList<>();
+            configListMap.put(index, list);
+        }
+        list.add(path);
+    }
+
     public void setSettings(Map<String, String> settings) {
         this.settings = settings;
     }
@@ -215,6 +231,7 @@ public class FessEsClient implements Client {
                     if (settings != null) {
                         settingsBuilder.put(settings);
                     }
+                    settingsBuilder.put("path.plugins", System.getProperty("user.dir") + "/plugins");
                 });
                 runner.build(config);
             }
@@ -264,6 +281,27 @@ public class FessEsClient implements Client {
                     // ignore
             }
             if (!exists) {
+                if (runner != null) {// TODO replace with url
+                    configListMap.getOrDefault(configIndex, Collections.emptyList()).forEach(
+                            path -> {
+                                String source = null;
+                                final String filePath = indexConfigPath + "/" + configIndex + "/" + path;
+                                try {
+                                    source = FileUtil.readUTF8(filePath);
+                                    try (CurlResponse response =
+                                            Curl.post(runner.node(), "_configsync/file").param("path", path).body(source).execute()) {
+                                        if (response.getHttpStatusCode() == 200) {
+                                            logger.info("Register " + path + " to " + configIndex);
+                                        } else {
+                                            logger.warn("Invalid request for " + path);
+                                        }
+                                    }
+                                } catch (final Exception e) {
+                                    logger.warn("Failed to register " + filePath, e);
+                                }
+                            });
+                }
+
                 try {
                     String source = null;
                     final String indexConfigFile = indexConfigPath + "/" + configIndex + ".json";

src/main/java/org/codelibs/fess/crud/util/SAStrutsUtil.java

@@ -1,70 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.crud.util;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.codelibs.fess.util.ActionMessagesUtil;
-import org.lastaflute.web.ruts.message.ActionMessage;
-import org.lastaflute.web.ruts.message.ActionMessages;
-import org.lastaflute.web.util.LaRequestUtil;
-
-public class SAStrutsUtil {
-    protected SAStrutsUtil() {
-        // nothing
-    }
-
-    public static void addMessage(final String key) {
-        addMessage(LaRequestUtil.getRequest(), key);
-    }
-
-    public static void addMessage(final HttpServletRequest request, final String key) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key));
-        ActionMessagesUtil.saveMessages(request, msgs);
-    }
-
-    public static void addMessage(final String key, final Object... values) {
-        addMessage(LaRequestUtil.getRequest(), key, values);
-    }
-
-    public static void addMessage(final HttpServletRequest request, final String key, final Object... values) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values));
-        ActionMessagesUtil.saveMessages(request, msgs);
-    }
-
-    public static void addSessionMessage(final String key) {
-        addSessionMessage(LaRequestUtil.getRequest(), key);
-    }
-
-    public static void addSessionMessage(final HttpServletRequest request, final String key) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key));
-        ActionMessagesUtil.saveMessages(request.getSession(), msgs);
-    }
-
-    public static void addSessionMessage(final String key, final Object... values) {
-        addSessionMessage(LaRequestUtil.getRequest(), key, values);
-    }
-
-    public static void addSessionMessage(final HttpServletRequest request, final String key, final Object... values) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values));
-        ActionMessagesUtil.saveMessages(request.getSession(), msgs);
-    }
-}

src/main/java/org/codelibs/fess/dict/DictionaryExpiredException.java

@@ -16,11 +16,11 @@
 
 package org.codelibs.fess.dict;
 
-public class DictionaryExpiredException extends ActionMessagesException {
+public class DictionaryExpiredException extends RuntimeException {
 
     private static final long serialVersionUID = 1L;
 
-    public DictionaryExpiredException() {
-        super("errors.expired_dict_id");
-    }
+    //    public DictionaryExpiredException() {
+    //        super("errors.expired_dict_id");
+    //    }
 }

src/main/java/org/codelibs/fess/ds/impl/AbstractDataStoreImpl.java

@@ -33,6 +33,9 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+
 public abstract class AbstractDataStoreImpl implements DataStore {
 
     private static final Logger logger = LoggerFactory.getLogger(AbstractDataStoreImpl.class);
@@ -111,8 +114,7 @@ public abstract class AbstractDataStoreImpl implements DataStore {
         }
 
         try {
-            final Object exp = OgnlUtil.parseExpression(template);
-            final Object value = OgnlUtil.getValue(exp, paramMap);
+            final Object value = new GroovyShell(new Binding(paramMap)).evaluate(template);
             if (value == null) {
                 return null;
             }

src/main/java/org/codelibs/fess/es/exentity/CrawlingSessionInfo.java

@@ -47,7 +47,7 @@ public class CrawlingSessionInfo extends BsCrawlingSessionInfo {
 
     public String getKeyMsg() {
         final Locale locale = LaRequestUtil.getRequest().getLocale();
-        final String message = MessageResourcesUtil.getMessage(locale, "labels.crawling_session_" + getKey());
+        final String message = ComponentUtil.getMessageManager().getMessage(locale, "labels.crawling_session_" + getKey());
         if (message == null || message.startsWith("???")) {
             return getKey();
         }

src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java

@@ -1,6 +1,8 @@
 package org.codelibs.fess.es.exentity;
 
 import org.codelibs.fess.es.bsentity.BsFileAuthentication;
+import org.codelibs.fess.service.FileConfigService;
+import org.codelibs.fess.util.ComponentUtil;
 
 /**
  * @author FreeGen
@@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsFileAuthentication;
 public class FileAuthentication extends BsFileAuthentication {
 
     private static final long serialVersionUID = 1L;
+    private FileConfig fileConfig;
 
     @Override
     public String getId() {
@@ -26,4 +29,12 @@ public class FileAuthentication extends BsFileAuthentication {
     public void setVersionNo(Long version) {
         asDocMeta().version(version);
     }
+
+    public FileConfig getFileConfig() {
+        if (fileConfig == null) {
+            final FileConfigService fileConfigService = ComponentUtil.getComponent(FileConfigService.class);
+            fileConfig = fileConfigService.getFileConfig(getFileConfigId());
+        }
+        return fileConfig;
+    }
 }

src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java

@@ -1,6 +1,8 @@
 package org.codelibs.fess.es.exentity;
 
 import org.codelibs.fess.es.bsentity.BsRequestHeader;
+import org.codelibs.fess.service.WebConfigService;
+import org.codelibs.fess.util.ComponentUtil;
 
 /**
  * @author FreeGen
@@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsRequestHeader;
 public class RequestHeader extends BsRequestHeader {
 
     private static final long serialVersionUID = 1L;
+    private WebConfig webConfig;
 
     @Override
     public String getId() {
@@ -30,4 +33,12 @@ public class RequestHeader extends BsRequestHeader {
     public org.codelibs.robot.client.http.RequestHeader getS2RobotRequestHeader() {
         return new org.codelibs.robot.client.http.RequestHeader(getName(), getValue());
     }
+
+    public WebConfig getWebConfig() {
+        if (webConfig == null) {
+            final WebConfigService webConfigService = ComponentUtil.getComponent(WebConfigService.class);
+            webConfig = webConfigService.getWebConfig(getWebConfigId());
+        }
+        return webConfig;
+    }
 }

src/main/java/org/codelibs/fess/exception/SSCActionMessagesException.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2004-2010 the Seasar Foundation and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.exception;
-
-/**
- * SSCActionMessagesException allows you to pass a root cause.
- * 
- * @author shinsuke
- *
- */
-public class SSCActionMessagesException extends ActionMessagesException {
-
-    /**
-     * A default serial version uid.
-     */
-    private static final long serialVersionUID = 1L;
-
-    public SSCActionMessagesException(final String key, final boolean resource) {
-        super(key, resource);
-    }
-
-    public SSCActionMessagesException(final String key, final Object... values) {
-        super(key, values);
-    }
-
-    public SSCActionMessagesException(final Throwable cause, final String key, final boolean resource) {
-        super(key, resource);
-        initCause(cause);
-    }
-
-    public SSCActionMessagesException(final Throwable cause, final String key, final Object... values) {
-        super(key, values);
-        initCause(cause);
-    }
-
-}

src/main/java/org/codelibs/fess/filter/FessEncodingFilter.java

@@ -36,8 +36,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.net.URLCodec;
 import org.codelibs.core.lang.StringUtil;
+import org.lastaflute.web.LastaFilter;
 
-public class FessEncodingFilter extends EncodingFilter {
+// TODO parent filter
+public class FessEncodingFilter extends LastaFilter {
     public static String ENCODING_MAP = "encodingRules";
 
     protected Map<String, String> encodingMap = new ConcurrentHashMap<>();
@@ -53,7 +55,7 @@ public class FessEncodingFilter extends EncodingFilter {
         super.init(config);
         servletContext = config.getServletContext();
 
-        encoding = config.getInitParameter(ENCODING);
+        encoding = config.getInitParameter(ENCODING_KEY);
         if (encoding == null) {
             encoding = DEFAULT_ENCODING;
         }

src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -36,10 +36,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.PostConstruct;
 
 import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.es.exentity.RoleType;
 import org.codelibs.fess.service.RoleTypeService;
+import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.robot.util.CharUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.lastaflute.web.util.LaRequestUtil;
@@ -99,7 +101,7 @@ public class SystemHelper implements Serializable {
                                 final ULocale uLocale = new ULocale(key);
                                 final Locale displayLocale = uLocale.toLocale();
                                 final List<Map<String, String>> langItems = new ArrayList<>(supportedLanguages.length);
-                                final String msg = MessageResourcesUtil.getMessage(displayLocale, "labels.allLanguages");
+                                final String msg = ComponentUtil.getMessageManager().getMessage(displayLocale, "labels.allLanguages");
                                 final Map<String, String> defaultMap = new HashMap<>(2);
                                 defaultMap.put(Constants.ITEM_LABEL, msg);
                                 defaultMap.put(Constants.ITEM_VALUE, "all");
@@ -349,7 +351,7 @@ public class SystemHelper implements Serializable {
             return langItemsCache.get(localeStr);
         } catch (final ExecutionException e) {
             final List<Map<String, String>> langItems = new ArrayList<>(supportedLanguages.length);
-            final String msg = MessageResourcesUtil.getMessage(locale, "labels.allLanguages");
+            final String msg = ComponentUtil.getMessageManager().getMessage(locale, "labels.allLanguages");
             final Map<String, String> defaultMap = new HashMap<>(2);
             defaultMap.put(Constants.ITEM_LABEL, msg);
             defaultMap.put(Constants.ITEM_VALUE, "all");

src/main/java/org/codelibs/fess/helper/ViewHelper.java

@@ -380,16 +380,16 @@ public class ViewHelper implements Serializable {
         }
         String url = (String) doc.get("urlLink");
         if (url == null) {
-            url = MessageResourcesUtil.getMessage(locale, "labels.search_unknown");
+            url = ComponentUtil.getMessageManager().getMessage(locale, "labels.search_unknown");
         }
         Object created = doc.get(fieldHelper.createdField);
         if (created instanceof Date) {
             final SimpleDateFormat sdf = new SimpleDateFormat(CoreLibConstants.DATE_FORMAT_ISO_8601_EXTEND);
             created = sdf.format((Date) created);
         } else {
-            created = MessageResourcesUtil.getMessage(locale, "labels.search_unknown");
+            created = ComponentUtil.getMessageManager().getMessage(locale, "labels.search_unknown");
         }
-        doc.put("cacheMsg", MessageResourcesUtil.getMessage(locale, "labels.search_cache_msg", url, created));
+        doc.put("cacheMsg", ComponentUtil.getMessageManager().getMessage(locale, "labels.search_cache_msg", new Object[] { url, created }));
 
         doc.put("queries", queries);
 

src/main/java/org/codelibs/fess/helper/impl/SearchLogHelperImpl.java

@@ -25,7 +25,6 @@ import java.util.Queue;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.beans.FessBeans;
 import org.codelibs.fess.client.FessEsClient;
 import org.codelibs.fess.es.exbhv.ClickLogBhv;
 import org.codelibs.fess.es.exbhv.SearchLogBhv;

src/main/java/org/codelibs/fess/interceptor/FessActionMessagesThrowsInterceptor.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.interceptor;
-
-import org.codelibs.fess.UnsupportedSearchException;
-import org.lastaflute.di.core.aop.frame.MethodInvocation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FessActionMessagesThrowsInterceptor extends ActionMessagesThrowsInterceptor {
-    private static final long serialVersionUID = 1L;
-
-    private static final String SYSTEM_ERROR_JSP = "/error/system.jsp";
-
-    private static final Logger logger = LoggerFactory.getLogger(FessActionMessagesThrowsInterceptor.class);
-
-    @Override
-    public Object invoke(final MethodInvocation invocation) throws Throwable {
-        try {
-            return super.invoke(invocation);
-        } catch (final Throwable t) { // NOPMD
-            printLog(t);
-            return SYSTEM_ERROR_JSP;
-        }
-    }
-
-    private void printLog(final Throwable t) {
-        if (t.getClass().getName().endsWith("ClientAbortException")) {
-            // ignore
-            if (logger.isDebugEnabled()) {
-                logger.debug(t.getMessage());
-            }
-        } else if (t instanceof UnsupportedSearchException) {
-            logger.warn(t.getMessage());
-        } else {
-            logger.error("System error occured.", t);
-        }
-    }
-}

src/main/java/org/codelibs/fess/interceptor/TokenInterceptor.java

@@ -42,17 +42,18 @@ public class TokenInterceptor extends AbstractInterceptor {
      */
     @Override
     public Object invoke(final MethodInvocation invocation) throws Throwable {
-        final Token token = invocation.getMethod().getAnnotation(Token.class);
-        if (token != null) {
-            final TokenProcessor processor = TokenProcessor.getInstance();
-            final HttpServletRequest request = LaRequestUtil.getRequest();
-            if (token.save()) {
-                processor.saveToken(request);
-            } else if (token.validate() && !processor.isTokenValid(request, !token.keep())) {
-                processor.resetToken(request);
-                throw new ActionMessagesException("errors.token", new Object[0]);
-            }
-        }
+        // TODO replace with lastaflute?
+        //        final Token token = invocation.getMethod().getAnnotation(Token.class);
+        //        if (token != null) {
+        //            final TokenProcessor processor = TokenProcessor.getInstance();
+        //            final HttpServletRequest request = LaRequestUtil.getRequest();
+        //            if (token.save()) {
+        //                processor.saveToken(request);
+        //            } else if (token.validate() && !processor.isTokenValid(request, !token.keep())) {
+        //                processor.resetToken(request);
+        //                throw new ActionMessagesException("errors.token", new Object[0]);
+        //            }
+        //        }
 
         return invocation.proceed();
     }

src/main/java/org/codelibs/fess/interceptor/UserInfoInterceptor.java

@@ -33,6 +33,7 @@ import org.lastaflute.web.util.LaRequestUtil;
  * @author shinsuke
  * 
  */
+// TODO update?
 public class UserInfoInterceptor extends AbstractInterceptor {
 
     private static final long serialVersionUID = 1L;
@@ -46,6 +47,7 @@ public class UserInfoInterceptor extends AbstractInterceptor {
      */
     @Override
     public Object invoke(final MethodInvocation invocation) throws Throwable {
+        /*
         final HttpServletRequest request = LaRequestUtil.getRequest();
         final HttpSession session = request.getSession(false);
         if (session == null) {
@@ -73,6 +75,7 @@ public class UserInfoInterceptor extends AbstractInterceptor {
                 break;
             }
         }
+        */
         return invocation.proceed();
     }
 

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -2490,7 +2490,8 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_system_info_bug_report_title = "{labels.system_info_bug_report_title}";
 
     /** The key of the message: crawler.properties does not exist. Default values are applied. */
-    public static final String LABELS_system_info_crawler_properties_does_not_exist = "{labels.system_info_crawler_properties_does_not_exist}";
+    public static final String LABELS_system_info_crawler_properties_does_not_exist =
+            "{labels.system_info_crawler_properties_does_not_exist}";
 
     /** The key of the message: File Authentication */
     public static final String LABELS_file_authentication_configuration = "{labels.file_authentication_configuration}";
@@ -2529,7 +2530,8 @@ public class FessLabels extends ActionMessages {
     public static final String LABELS_file_authentication_list_hostname = "{labels.file_authentication_list_hostname}";
 
     /** The key of the message: Config Name */
-    public static final String LABELS_file_authentication_list_file_crawling_config = "{labels.file_authentication_list_file_crawling_config}";
+    public static final String LABELS_file_authentication_list_file_crawling_config =
+            "{labels.file_authentication_list_file_crawling_config}";
 
     /** The key of the message: Any */
     public static final String LABELS_file_authentication_any = "{labels.file_authentication_any}";

src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java

@@ -124,7 +124,8 @@ public class FessMessages extends FessLabels {
     public static final String ERRORS_failed_to_delete_solr_index = "{errors.failed_to_delete_solr_index}";
 
     /** The key of the message: Failed to start a process because of running solr process. */
-    public static final String ERRORS_failed_to_start_solr_process_because_of_running = "{errors.failed_to_start_solr_process_because_of_running}";
+    public static final String ERRORS_failed_to_start_solr_process_because_of_running =
+            "{errors.failed_to_start_solr_process_because_of_running}";
 
     /** The key of the message: Failed to restore data. */
     public static final String ERRORS_failed_to_import_data = "{errors.failed_to_import_data}";

src/main/java/org/codelibs/fess/solr/BoostDocumentRule.java

@@ -21,6 +21,9 @@ import java.util.Map;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+
 public class BoostDocumentRule {
     private static final Logger logger = LoggerFactory.getLogger(BoostDocumentRule.class);
 
@@ -44,8 +47,7 @@ public class BoostDocumentRule {
         }
 
         try {
-            final Object exp = OgnlUtil.parseExpression(matchExpression);
-            final Object value = OgnlUtil.getValue(exp, map);
+            final Object value = new GroovyShell(new Binding(map)).evaluate(matchExpression);
 
             if (value instanceof Boolean) {
                 return ((Boolean) value).booleanValue();
@@ -63,8 +65,7 @@ public class BoostDocumentRule {
         }
 
         try {
-            final Object exp = OgnlUtil.parseExpression(boostExpression);
-            final Object value = OgnlUtil.getValue(exp, map);
+            final Object value = new GroovyShell(new Binding(map)).evaluate(boostExpression);
 
             if (value instanceof Integer) {
                 return ((Integer) value).floatValue();

src/main/java/org/codelibs/fess/solr/IndexUpdater.java

@@ -537,13 +537,11 @@ public class IndexUpdater extends Thread {
         return documentSize;
     }
 
-    @Binding(bindingType = BindingType.MAY)
     @Override
     public void setUncaughtExceptionHandler(final UncaughtExceptionHandler eh) {
         super.setUncaughtExceptionHandler(eh);
     }
 
-    @Binding(bindingType = BindingType.MAY)
     public static void setDefaultUncaughtExceptionHandler(final UncaughtExceptionHandler eh) {
         Thread.setDefaultUncaughtExceptionHandler(eh);
     }

src/main/java/org/codelibs/fess/struts/action/FessRequestProcessor.java

@@ -1,39 +0,0 @@
-/*
- * Copyright 2009-2015 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-package org.codelibs.fess.struts.action;
-
-import java.util.Map;
-
-import org.codelibs.fess.util.SearchParamMap;
-
-public class FessRequestProcessor extends S2RequestProcessor/*ActionRequestProcessor*/{
-    @Override
-    @SuppressWarnings("unchecked")
-    protected void setMapProperty(final Map map, final String name, final Object value) {
-        if (value instanceof String[]) {
-            if (map.get(SearchParamMap.CLASS_NAME) != null) {
-                map.put(name, value);
-            } else {
-                final String[] values = (String[]) value;
-                map.put(name, values.length > 0 ? values[0] : null);
-            }
-        } else {
-            map.put(name, value);
-        }
-    }
-
-}

src/main/java/org/codelibs/fess/struts/action/SSCRequestProcessor.java

@@ -1,80 +0,0 @@
-/*
- * Copyright 2004-2010 the Seasar Foundation and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.struts.action;
-
-import javax.servlet.ServletException;
-
-import org.lastaflute.web.ruts.config.ModuleConfig;
-import org.lastaflute.web.ruts.process.ActionFormMapper.IndexParsedResult;
-
-/**
- * @author shinsuke
- *
- */
-public class SSCRequestProcessor extends S2RequestProcessor {
-    protected static final char NESTED_DELIM = '.';
-
-    protected static final char INDEXED_DELIM = '[';
-
-    protected static final char INDEXED_DELIM2 = ']';
-
-    protected int maxReqParamSize = 100;
-
-    @Override
-    public void init(ActionServlet servlet, ModuleConfig moduleConfig) throws ServletException {
-        super.init(servlet, moduleConfig);
-        final Object value = servlet.getServletContext().getAttribute("sastruts.MAX_REQUEST_PARAMETER_SIZE");
-        if (value != null) {
-            maxReqParamSize = Integer.parseInt(value.toString());
-        }
-    }
-
-    @Override
-    protected IndexParsedResult parseIndex(String name) {
-        final IndexParsedResult result = new SSCIndexParsedResult();
-        while (true) {
-            final int index = name.indexOf(INDEXED_DELIM2);
-            if (index < 0) {
-                throw new IllegalArgumentException(INDEXED_DELIM2 + " is not found in " + name);
-            }
-            final int size = Integer.valueOf(name.substring(0, index)).intValue();
-            if (size > maxReqParamSize) {
-                throw new IllegalArgumentException("The array size exceeds " + maxReqParamSize);
-            }
-            result.indexes = ArrayUtil.add(result.indexes, size);
-            name = name.substring(index + 1);
-            if (name.length() == 0) {
-                break;
-            } else if (name.charAt(0) == INDEXED_DELIM) {
-                name = name.substring(1);
-            } else if (name.charAt(0) == NESTED_DELIM) {
-                name = name.substring(1);
-                break;
-            } else {
-                throw new IllegalArgumentException(name);
-            }
-        }
-        result.name = name;
-        return result;
-    }
-
-    /**
-     *
-     */
-    protected static class SSCIndexParsedResult extends IndexParsedResult {
-    }
-
-}

src/main/java/org/codelibs/fess/struts/servlet/SSCActionServlet.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2012 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.struts.servlet;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * PUT and DELETE supported ActionServlet.
- * 
- * @author shinsuke
- * 
- */
-// TODO Lastafluteでは不要
-public class SSCActionServlet extends ActionServlet {
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    protected void doDelete(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
-        process(request, response);
-    }
-
-    @Override
-    protected void doPut(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
-        process(request, response);
-    }
-
-}

src/main/java/org/codelibs/fess/struts/upload/SSCMultipartRequestHandler.java

@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.struts.upload;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadBase.SizeLimitExceededException;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.FileCleanerCleanup;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.io.FileCleaningTracker;
-import org.lastaflute.web.ruts.config.ModuleConfig;
-import org.lastaflute.web.ruts.multipart.MultipartRequestHandler;
-
-/**
- * This class supports a multipart request handler to support commons-fileupload
- * 1.2.2.
- * 
- * @author shinsuke
- * 
- */
-public class SSCMultipartRequestHandler extends S2MultipartRequestHandler {
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public void handleRequest(final HttpServletRequest request) throws ServletException {
-        final ModuleConfig ac = (ModuleConfig) request.getAttribute(Globals.MODULE_KEY);
-        final FileCleaningTracker fileCleaningTracker = FileCleanerCleanup.getFileCleaningTracker(ServletContextUtil.getServletContext());
-        final DiskFileItemFactory fileItemFactory = new DiskFileItemFactory((int) getSizeThreshold(ac), new File(getRepositoryPath(ac)));
-        request.setAttribute("fileItemFactory", fileItemFactory);
-        fileItemFactory.setFileCleaningTracker(fileCleaningTracker);
-        final ServletFileUpload upload = new ServletFileUpload(fileItemFactory);
-        upload.setHeaderEncoding(request.getCharacterEncoding());
-        upload.setSizeMax(getSizeMax(ac));
-        elementsText = new Hashtable();
-        elementsFile = new Hashtable();
-        elementsAll = new Hashtable();
-        List items = null;
-        try {
-            items = upload.parseRequest(request);
-        } catch (final SizeLimitExceededException e) {
-            request.setAttribute(MultipartRequestHandler.ATTRIBUTE_MAX_LENGTH_EXCEEDED, Boolean.TRUE);
-            request.setAttribute(SIZE_EXCEPTION_KEY, e);
-            try {
-                final InputStream is = request.getInputStream();
-                try {
-                    final byte[] buf = new byte[1024];
-                    while ((is.read(buf)) != -1) { // NOPMD
-                    }
-                } catch (final Exception ignore) {} finally {
-                    try {
-                        is.close();
-                    } catch (final Exception ignore) {}
-                }
-            } catch (final Exception ignore) {}
-            return;
-        } catch (final FileUploadException e) {
-            log.error("Failed to parse multipart request", e);
-            throw new ServletException(e);
-        }
-
-        // Partition the items into form fields and files.
-        final Iterator iter = items.iterator();
-        while (iter.hasNext()) {
-            final FileItem item = (FileItem) iter.next();
-
-            if (item.isFormField()) {
-                addTextParameter(request, item);
-            } else {
-                addFileParameter(item);
-            }
-        }
-    }
-}

src/main/java/org/codelibs/fess/taglib/FessFunctions.java

@@ -30,6 +30,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.entity.FacetQueryView;
@@ -37,6 +38,7 @@ import org.codelibs.fess.helper.HotSearchWordHelper;
 import org.codelibs.fess.helper.HotSearchWordHelper.Range;
 import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.util.ComponentUtil;
+import org.lastaflute.di.util.LdiURLUtil;
 import org.lastaflute.web.util.LaRequestUtil;
 
 public class FessFunctions {
@@ -188,9 +190,9 @@ public class FessFunctions {
                     if (values != null) {
                         for (final String value : values) {
                             buf.append('&');
-                            buf.append(URLEncoderUtil.encode(name));
+                            buf.append(LdiURLUtil.encode(name, Constants.UTF_8));
                             buf.append('=');
-                            buf.append(URLEncoderUtil.encode(value));
+                            buf.append(LdiURLUtil.encode(value, Constants.UTF_8));
                         }
                     }
                 }

src/main/java/org/codelibs/fess/transformer/AbstractFessXpathTransformer.java

@@ -29,6 +29,9 @@ import org.codelibs.robot.transformer.impl.XpathTransformer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+
 public abstract class AbstractFessXpathTransformer extends XpathTransformer {
     private static final Logger logger = LoggerFactory.getLogger(AbstractFessXpathTransformer.class);
 
@@ -177,8 +180,7 @@ public abstract class AbstractFessXpathTransformer extends XpathTransformer {
         }
 
         try {
-            final Object exp = OgnlUtil.parseExpression(template);
-            final Object value = OgnlUtil.getValue(exp, paramMap);
+            final Object value = new GroovyShell(new Binding(paramMap)).evaluate(template);
             if (value == null) {
                 return null;
             }

src/main/java/org/codelibs/fess/util/ActionMessagesUtil.java

@@ -1,296 +0,0 @@
-/*
- * Copyright 2012 the CodeLibs Project and the Others.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.codelibs.fess.util;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.lastaflute.web.ruts.message.ActionMessage;
-import org.lastaflute.web.ruts.message.ActionMessages;
-
-/**
- * ActionMessages Utility.
- * 
- * @author shinsuke
- * 
- */
-public final class ActionMessagesUtil {
-
-    private ActionMessagesUtil() {
-    }
-
-    /**
-     * Add a message by a message key to a request.
-     * 
-     * @param request
-     * @param key
-     */
-    public static void addMessage(final HttpServletRequest request, final String key) {
-        addMessage(request, key, new Object[0]);
-    }
-
-    /**
-     * Add a message by a message key to a request.
-     * 
-     * @param request
-     * @param key
-     * @param values
-     */
-    public static void addMessage(final HttpServletRequest request, final String key, final Object... values) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values));
-        addMessages(request, msgs);
-    }
-
-    /**
-     * Add a message by a message key to a session.
-     * 
-     * @param session
-     * @param key
-     */
-    public static void addMessage(final HttpSession session, final String key) {
-        addMessage(session, key, new Object[0]);
-    }
-
-    /**
-     * Add a message by a message key to a session.
-     * 
-     * @param session
-     * @param key
-     * @param values
-     */
-    public static void addMessage(final HttpSession session, final String key, final Object... values) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values));
-        addMessages(session, msgs);
-    }
-
-    /**
-     * Add an error message by a message key to a request.
-     * 
-     * @param request
-     * @param key
-     */
-    public static void addError(final HttpServletRequest request, final String key) {
-        addError(request, key, new Object[0]);
-    }
-
-    /**
-     * Add an error message by a message key to a request.
-     * 
-     * @param request
-     * @param key
-     * @param values
-     */
-    public static void addError(final HttpServletRequest request, final String key, final Object... values) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values));
-        addErrors(request, msgs);
-    }
-
-    /**
-     * Add an error message by a message key to a session.
-     * 
-     * @param session
-     * @param key
-     */
-    public static void addError(final HttpSession session, final String key) {
-        addError(session, key, new Object[0]);
-    }
-
-    /**
-     * Add an error message by a message key to a session.
-     * 
-     * @param session
-     * @param key
-     * @param values
-     */
-    public static void addError(final HttpSession session, final String key, final Object... values) {
-        final ActionMessages msgs = new ActionMessages();
-        msgs.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(key, values));
-        addErrors(session, msgs);
-    }
-
-    // From SAStruts
-
-    /**
-     * エラーメッセージをリクエストに保存します。
-     * 
-     * @param request
-     *            リクエスト
-     * @param errors
-     *            エラーメッセージ
-     * 
-     */
-    public static void saveErrors(final HttpServletRequest request, final ActionMessages errors) {
-        if (errors == null || errors.isEmpty()) {
-            request.removeAttribute(Globals.ERROR_KEY);
-            return;
-        }
-        request.setAttribute(Globals.ERROR_KEY, errors);
-    }
-
-    /**
-     * エラーメッセージをセッションに保存します。
-     * 
-     * @param session
-     *            セッション
-     * @param errors
-     *            エラーメッセージ
-     * 
-     */
-    public static void saveErrors(final HttpSession session, final ActionMessages errors) {
-        if (errors == null || errors.isEmpty()) {
-            session.removeAttribute(Globals.ERROR_KEY);
-            return;
-        }
-        session.setAttribute(Globals.ERROR_KEY, errors);
-    }
-
-    /**
-     * メッセージをリクエストに保存します。
-     * 
-     * @param request
-     *            リクエスト
-     * @param messages
-     *            メッセージ
-     * 
-     */
-    public static void saveMessages(final HttpServletRequest request, final ActionMessages messages) {
-        if (messages == null || messages.isEmpty()) {
-            request.removeAttribute(Globals.MESSAGE_KEY);
-            return;
-        }
-        request.setAttribute(Globals.MESSAGE_KEY, messages);
-    }
-
-    /**
-     * メッセージをセッションに保存します。
-     * 
-     * @param session
-     *            セッション
-     * @param messages
-     *            メッセージ
-     * 
-     */
-    public static void saveMessages(final HttpSession session, final ActionMessages messages) {
-        if (messages == null || messages.isEmpty()) {
-            session.removeAttribute(Globals.MESSAGE_KEY);
-            return;
-        }
-        session.setAttribute(Globals.MESSAGE_KEY, messages);
-    }
-
-    /**
-     * エラーメッセージをリクエストに追加します。
-     * 
-     * @param request
-     *            リクエスト
-     * @param errors
-     *            エラーメッセージ
-     * 
-     */
-    public static void addErrors(final HttpServletRequest request, final ActionMessages errors) {
-        if (errors == null) {
-            return;
-        }
-        ActionMessages requestErrors = (ActionMessages) request.getAttribute(Globals.ERROR_KEY);
-        if (requestErrors == null) {
-            requestErrors = new ActionMessages();
-        }
-        requestErrors.add(errors);
-        saveErrors(request, requestErrors);
-    }
-
-    /**
-     * エラーメッセージをセッションに追加します。
-     * 
-     * @param session
-     *            セッション
-     * @param errors
-     *            エラーメッセージ
-     * 
-     */
-    public static void addErrors(final HttpSession session, final ActionMessages errors) {
-        if (errors == null) {
-            return;
-        }
-        ActionMessages sessionErrors = (ActionMessages) session.getAttribute(Globals.ERROR_KEY);
-        if (sessionErrors == null) {
-            sessionErrors = new ActionMessages();
-        }
-        sessionErrors.add(errors);
-        saveErrors(session, sessionErrors);
-    }
-
-    /**
-     * エラーメッセージがあるかどうかを返します。
-     * 
-     * @param request
-     *            リクエスト
-     * @return エラーメッセージがあるかどうか
-     * @since 1.0.4
-     */
-    public static boolean hasErrors(final HttpServletRequest request) {
-        final ActionMessages errors = (ActionMessages) request.getAttribute(Globals.ERROR_KEY);
-        if (errors != null && !errors.isEmpty()) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * メッセージをリクエストに追加します。
-     * 
-     * @param request
-     *            リクエスト
-     * @param messages
-     *            メッセージ
-     * 
-     */
-    public static void addMessages(final HttpServletRequest request, final ActionMessages messages) {
-        if (messages == null) {
-            return;
-        }
-        ActionMessages requestMessages = (ActionMessages) request.getAttribute(Globals.MESSAGE_KEY);
-        if (requestMessages == null) {
-            requestMessages = new ActionMessages();
-        }
-        requestMessages.add(messages);
-        saveMessages(request, requestMessages);
-    }
-
-    /**
-     * メッセージをセッションに追加します。
-     * 
-     * @param session
-     *            セッション
-     * @param messages
-     *            メッセージ
-     * 
-     */
-    public static void addMessages(final HttpSession session, final ActionMessages messages) {
-        if (messages == null) {
-            return;
-        }
-        ActionMessages sessionMessages = (ActionMessages) session.getAttribute(Globals.MESSAGE_KEY);
-        if (sessionMessages == null) {
-            sessionMessages = new ActionMessages();
-        }
-        sessionMessages.add(messages);
-        saveMessages(session, sessionMessages);
-    }
-}

src/main/java/org/codelibs/fess/util/ComponentUtil.java

@@ -44,15 +44,16 @@ import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.job.JobExecutor;
 import org.codelibs.fess.solr.IndexUpdater;
 import org.codelibs.robot.extractor.ExtractorFactory;
+import org.lastaflute.core.message.MessageManager;
 import org.lastaflute.di.core.SingletonLaContainer;
 
 public final class ComponentUtil {
+    private static final String MESSAGE_MANAGER = "messageManager";
+
     private static final String USER_AGENT_NAME = "userAgentName";
 
     private static final String INDEX_UPDATER = "indexUpdater";
 
-    private static final String DATABASE_HELPER = "databaseHelper";
-
     private static final String MAIL_HELPER = "mailHelper";
 
     private static final String FILE_TYPE_HELPER = "fileTypeHelper";
@@ -236,6 +237,10 @@ public final class ComponentUtil {
         return SingletonLaContainer.getComponent(ELASTICSEARCH_CLIENT);
     }
 
+    public static MessageManager getMessageManager() {
+        return SingletonLaContainer.getComponent(MESSAGE_MANAGER);
+    }
+
     public static <T> T getComponent(Class<T> clazz) {
         return SingletonLaContainer.getComponent(clazz);
     }

src/main/java/org/codelibs/fess/validator/CronExpressionChecks.java

@@ -22,18 +22,19 @@ import org.codelibs.core.lang.StringUtil;
 import org.lastaflute.web.ruts.message.ActionMessages;
 import org.quartz.CronExpression;
 
-public class CronExpressionChecks extends S2FieldChecks {
+//TODO replace with hibernate validator
+public class CronExpressionChecks /*extends S2FieldChecks*/{
 
     private static final long serialVersionUID = 1L;
-
-    public static boolean validateCronExpression(final Object bean, final ValidatorAction validatorAction, final Field field,
-            final ActionMessages errors, final Validator validator, final HttpServletRequest request) {
-        final String value = getValueAsString(bean, field);
-        if (StringUtil.isNotBlank(value) && !CronExpression.isValidExpression(value)) {
-            addError(errors, field, validator, validatorAction, request);
-            return false;
+    /*
+        public static boolean validateCronExpression(final Object bean, final ValidatorAction validatorAction, final Field field,
+                final ActionMessages errors, final Validator validator, final HttpServletRequest request) {
+            final String value = getValueAsString(bean, field);
+            if (StringUtil.isNotBlank(value) && !CronExpression.isValidExpression(value)) {
+                addError(errors, field, validator, validatorAction, request);
+                return false;
+            }
+            return true;
         }
-        return true;
-    }
-
+    */
 }

src/main/java/org/codelibs/fess/validator/UriTypeChecks.java

@@ -16,32 +16,30 @@
 
 package org.codelibs.fess.validator;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fess.FessSystemException;
-import org.lastaflute.web.ruts.message.ActionMessages;
 
-public class UriTypeChecks extends S2FieldChecks {
+// TODO replace with hibernate validator
+public class UriTypeChecks /*extends S2FieldChecks*/{
 
     private static final long serialVersionUID = 1L;
 
-    public static boolean validateUriType(final Object bean, final ValidatorAction validatorAction, final Field field,
-            final ActionMessages errors, final Validator validator, final HttpServletRequest request) {
-        final String value = getValueAsString(bean, field);
-        if (StringUtil.isNotBlank(value)) {
-            final String protocols = field.getVarValue("protocols");
-            if (StringUtil.isEmpty(protocols)) {
-                throw new FessSystemException("protocols is empty.");
-            }
-            if (!check(protocols, value)) {
-                addError(errors, field, validator, validatorAction, request);
-                return false;
+    /*
+        public static boolean validateUriType(final Object bean, final ValidatorAction validatorAction, final Field field,
+                final ActionMessages errors, final Validator validator, final HttpServletRequest request) {
+            final String value = getValueAsString(bean, field);
+            if (StringUtil.isNotBlank(value)) {
+                final String protocols = field.getVarValue("protocols");
+                if (StringUtil.isEmpty(protocols)) {
+                    throw new FessSystemException("protocols is empty.");
+                }
+                if (!check(protocols, value)) {
+                    addError(errors, field, validator, validatorAction, request);
+                    return false;
+                }
             }
+            return true;
         }
-        return true;
-    }
-
+    */
     protected static boolean check(final String protocols, final String values) {
         final String[] prtcls = protocols.split(",");
         final String[] paths = values.split("[\r\n]");

src/main/resources/esclient.xml

@@ -9,6 +9,18 @@
 		<postConstruct name="addIndexConfig">
 			<arg>"fess/doc"</arg>
 		</postConstruct>
+		<initMethod name="addConfigFile">
+			<arg>"fess"</arg>
+			<arg>"ja/mapping.txt"</arg>
+		</initMethod>
+		<initMethod name="addConfigFile">
+			<arg>"fess"</arg>
+			<arg>"ja/synonym.txt"</arg>
+		</initMethod>
+		<initMethod name="addConfigFile">
+			<arg>"fess"</arg>
+			<arg>"ja/kuromoji.txt"</arg>
+		</initMethod>
 		<postConstruct name="addIndexConfig">
 			<arg>".fess_config/boost_document_rule"</arg>
 		</postConstruct>

src/main/resources/fess_indices/fess/ja/kuromoji.txt

@@ -0,0 +1,3 @@
+日本経済新聞,日本 経済 新聞,ニホン ケイザイ シンブン,カスタム名詞
+関西国際空港,関西 国際 空港,カンサイ コクサイ クウコウ,テスト名詞
+朝青龍,朝青龍,アサショウリュウ,カスタム名詞

src/main/resources/fess_indices/fess/ja/mapping.txt

@@ -0,0 +1,189 @@
+# Half-width Katakana ＝＞ Full-width Katakana
+"ｱ" => "ア"
+"ｲ" => "イ"
+"ｳ" => "ウ"
+"ｴ" => "エ"
+"ｵ" => "オ"
+"ｶ" => "カ"
+"ｷ" => "キ"
+"ｸ" => "ク"
+"ｹ" => "ケ"
+"ｺ" => "コ"
+"ｻ" => "サ"
+"ｼ" => "シ"
+"ｽ" => "ス"
+"ｾ" => "セ"
+"ｿ" => "ソ"
+"ﾀ" => "タ"
+"ﾁ" => "チ"
+"ﾂ" => "ツ"
+"ﾃ" => "テ"
+"ﾄ" => "ト"
+"ﾅ" => "ナ"
+"ﾆ" => "ニ"
+"ﾇ" => "ヌ"
+"ﾈ" => "ネ"
+"ﾉ" => "ノ"
+"ﾊ" => "ハ"
+"ﾋ" => "ヒ"
+"ﾌ" => "フ"
+"ﾍ" => "ヘ"
+"ﾎ" => "ホ"
+"ﾏ" => "マ"
+"ﾐ" => "ミ"
+"ﾑ" => "ム"
+"ﾒ" => "メ"
+"ﾓ" => "モ"
+"ﾔ" => "ヤ"
+"ﾕ" => "ユ"
+"ﾖ" => "ヨ"
+"ﾗ" => "ラ"
+"ﾘ" => "リ"
+"ﾙ" => "ル"
+"ﾚ" => "レ"
+"ﾛ" => "ロ"
+"ﾜ" => "ワ"
+"ｦ" => "ヲ"
+"ﾝ" => "ン"
+"ｯ" => "ッ"
+"ｧ" => "ァ"
+"ｨ" => "ィ"
+"ｩ" => "ゥ"
+"ｪ" => "ェ"
+"ｫ" => "ォ"
+"ｬ" => "ャ"
+"ｭ" => "ュ"
+"ｮ" => "ョ"
+"ｶﾞ" => "ガ"
+"ｷﾞ" => "ギ"
+"ｸﾞ" => "グ"
+"ｹﾞ" => "ゲ"
+"ｺﾞ" => "ゴ"
+"ｻﾞ" => "ザ"
+"ｼﾞ" => "ジ"
+"ｽﾞ" => "ズ"
+"ｾﾞ" => "ゼ"
+"ｿﾞ" => "ゾ"
+"ﾀﾞ" => "ダ"
+"ﾁﾞ" => "ヂ"
+"ﾂﾞ" => "ヅ"
+"ﾃﾞ" => "デ"
+"ﾄﾞ" => "ド"
+"ﾊﾞ" => "バ"
+"ﾋﾞ" => "ビ"
+"ﾌﾞ" => "ブ"
+"ﾍﾞ" => "ベ"
+"ﾎﾞ" => "ボ"
+"ﾊﾟ" => "パ"
+"ﾋﾟ" => "ピ"
+"ﾌﾟ" => "プ"
+"ﾍﾟ" => "ペ"
+"ﾎﾟ" => "ポ"
+
+# Full-width alpha-numeric ＝＞ Half-width alpha-numeric
+"０" => "0"
+"１" => "1"
+"２" => "2"
+"３" => "3"
+"４" => "4"
+"５" => "5"
+"６" => "6"
+"７" => "7"
+"８" => "8"
+"９" => "9"
+
+"Ａ" => "A"
+"Ｂ" => "B"
+"Ｃ" => "C"
+"Ｄ" => "D"
+"Ｅ" => "E"
+"Ｆ" => "F"
+"Ｇ" => "G"
+"Ｈ" => "H"
+"Ｉ" => "I"
+"Ｊ" => "J"
+"Ｋ" => "K"
+"Ｌ" => "L"
+"Ｍ" => "M"
+"Ｎ" => "N"
+"Ｏ" => "O"
+"Ｐ" => "P"
+"Ｑ" => "Q"
+"Ｒ" => "R"
+"Ｓ" => "S"
+"Ｔ" => "T"
+"Ｕ" => "U"
+"Ｖ" => "V"
+"Ｗ" => "W"
+"Ｘ" => "X"
+"Ｙ" => "Y"
+"Ｚ" => "Z"
+
+"ａ" => "a"
+"ｂ" => "b"
+"ｃ" => "c"
+"ｄ" => "d"
+"ｅ" => "e"
+"ｆ" => "f"
+"ｇ" => "g"
+"ｈ" => "h"
+"ｉ" => "i"
+"ｊ" => "j"
+"ｋ" => "k"
+"ｌ" => "l"
+"ｍ" => "m"
+"ｎ" => "n"
+"ｏ" => "o"
+"ｐ" => "p"
+"ｑ" => "q"
+"ｒ" => "r"
+"ｓ" => "s"
+"ｔ" => "t"
+"ｕ" => "u"
+"ｖ" => "v"
+"ｗ" => "w"
+"ｘ" => "x"
+"ｙ" => "y"
+"ｚ" => "z"
+
+# !"#$%&'()=|-^\@[`{;:]+*}/_<>?
+"！" => "!"
+"”" => "\""
+"＃" => "#"
+"＄" => "$"
+"％" => "%"
+"＆" => "&"
+"’" => "'"
+"（" => "("
+"）" => ")"
+"＝" => "="
+"｜" => "|"
+"－" => "-"
+"＾" => "^"
+"￥" => "\\"
+"＠" => "@"
+"［" => "["
+"｀" => "`"
+"｛" => "{"
+"；" => ";"
+"：" => ":"
+"］" => "]"
+"＋" => "+"
+"＊" => "*"
+"｝" => "}"
+"／" => "/"
+"＿" => "_"
+"＜" => "<"
+"＞" => ">"
+"？" => "?"
+"‘" => "`"
+
+"①" => "1"
+"②" => "2"
+"③" => "3"
+"④" => "4"
+"⑤" => "5"
+"⑥" => "6"
+"⑦" => "7"
+"⑧" => "8"
+"⑨" => "9"

src/main/resources/fess_indices/fess/ja/synonym.txt

@@ -0,0 +1 @@
+fess,フェス

src/main/webapp/WEB-INF/view/admin/crawl/index.jsp

@@ -1,240 +1,223 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.crawler_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="crawl" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.crawler_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="crawl" />
+		</jsp:include>
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+		<div class="content-wrapper">
 
-	<s:form>
-	<div>
-        <h3><bean:message key="labels.crawler_title_edit"/></h3>
-		<table class="bordered-table zebra-striped">
-			<tbody>
-				<tr>
-					<th style="width:200px;">
-						<bean:message key="labels.search_log_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="searchLog"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.user_info_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="userInfo"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.user_favorite_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="userFavorite"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.append_query_param_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="appendQueryParameter"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.web_api_xml_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="webApiXml"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.web_api_json_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="webApiJson"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.default_label_value"/>
-					</th>
-					<td>
-						<html:textarea property="defaultLabelValue" styleClass="width:98%"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.supported_search_feature"/>
-					</th>
-					<td>
-						<html:select property="supportedSearch">
-							<c:forEach var="item" items="${supportedSearchItems}">
-								<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-							</c:forEach>
-						</html:select>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.hot_search_word_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="hotSearchWord"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.purge_search_log_day"/>
-					</th>
-					<td>
-						<html:text property="purgeSearchLogDay"  styleClass="small"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.purge_job_log_day"/>
-					</th>
-					<td>
-						<html:text property="purgeJobLogDay"  styleClass="small"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.purge_user_info_day"/>
-					</th>
-					<td>
-						<html:text property="purgeUserInfoDay"  styleClass="small"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.purge_by_bots"/>
-					</th>
-					<td>
-						<html:text property="purgeByBots" style="width:98%"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.notification_to"/>
-					</th>
-					<td>
-						<html:text property="notificationTo" style="width:98%"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.csv_file_encoding"/>
-					</th>
-					<td>
-						<html:text property="csvFileEncoding" styleClass="small"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.diff_crawling"/>
-					</th>
-					<td>
-						<html:checkbox property="diffCrawling"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.use_acl_as_role"/>
-					</th>
-					<td>
-						<html:checkbox property="useAclAsRole"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.server_rotation"/>
-					</th>
-					<td>
-						<html:checkbox property="serverRotation"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.crawling_thread_count"/>
-					</th>
-					<td>
-						<html:text property="crawlingThreadCount" styleClass="small"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.day_for_cleanup"/>
-					</th>
-					<td>
-						<html:select property="dayForCleanup" styleClass="small">
-							<html:option value="-1"><bean:message key="labels.none"/></html:option>
-							<c:forEach var="d" items="${dayItems}">
-								<html:option value="${f:h(d)}">${f:h(d)}</html:option>
-							</c:forEach>
-						</html:select>
-						<bean:message key="labels.day"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.ignore_failure_type"/>
-					</th>
-					<td>
-						<html:text property="ignoreFailureType" style="width:98%"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.failure_count_threshold"/>
-					</th>
-					<td>
-						<html:text property="failureCountThreshold" styleClass="small"/>
-					</td>
-				</tr>
-				<tr>
-					<th style="width:200px;">
-						<bean:message key="labels.suggest_search_log_enabled"/>
-					</th>
-					<td>
-						<html:checkbox property="suggestSearchLog"/><bean:message key="labels.enabled"/>
-					</td>
-				</tr>
-				<tr>
-					<th>
-						<bean:message key="labels.purge_suggest_search_log_day"/>
-					</th>
-					<td>
-						<html:text property="purgeSuggestSearchLogDay" styleClass="small"/>
-					</td>
-				</tr>
-			</tbody>
-			<tfoot>
-				<tr>
-					<td colspan="2">
-						<input type="submit" class="btn small" name="update" value="<bean:message key="labels.crawl_button_update"/>"/>
-					</td>
-				</tr>
-			</tfoot>
-		</table>
-	</div>
-	</s:form>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.crawler_title_edit" />
+				</h1>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
+									<%-- Form Fields --%>
+									<div class="form-group">
+											<label for="searchLog"><bean:message key="labels.search_log_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="searchLog" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="userInfo"><bean:message key="labels.user_info_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="userInfo" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="userFavorite"><bean:message key="labels.user_favorite_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="userFavorite" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="appendQueryParameter"><bean:message key="labels.append_query_param_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="appendQueryParameter" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="webApiXml"><bean:message key="labels.web_api_xml_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="webApiXml" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="webApiJson"><bean:message key="labels.web_api_json_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="webApiJson" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="defaultLabelValue"><bean:message key="labels.default_label_value" /></label>
+											<html:textarea property="defaultLabelValue" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+											<label for="supportedSearch"><bean:message key="labels.supported_search_feature" /></label>
+											<div class="form-inline">
+													<html:select property="supportedSearch" styleClass="form-control">
+															<c:forEach var="item" items="${supportedSearchItems}">
+																	<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+															</c:forEach>
+													</html:select>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="hotSearchWord"><bean:message key="labels.hot_search_word_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="hotSearchWord" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="purgeSearchLogDay"><bean:message key="labels.purge_search_log_day" /></label>
+											<div class="form-inline">
+													<html:text property="purgeSearchLogDay" styleClass="form-control" />
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="purgeJobLogDay"><bean:message key="labels.purge_job_log_day" /></label>
+											<div class="form-inline">
+													<html:text property="purgeJobLogDay" styleClass="form-control" />
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="purgeUserInfoDay"><bean:message key="labels.purge_user_info_day" /></label>
+											<div class="form-inline">
+													<html:text property="purgeUserInfoDay" styleClass="form-control" />
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="purgeByBots"><bean:message key="labels.purge_by_bots" /></label>
+											<html:text property="purgeByBots" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+											<label for="notificationTo"><bean:message key="labels.notification_to" /></label>
+											<html:text property="notificationTo" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+											<label for="csvFileEncoding"><bean:message key="labels.csv_file_encoding" /></label>
+											<div class="form-inline">
+													<html:text property="csvFileEncoding" styleClass="form-control" />
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="diffCrawling"><bean:message key="labels.diff_crawling" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="diffCrawling" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="useAclAsRole"><bean:message key="labels.use_acl_as_role" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="useAclAsRole" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="serverRotation"><bean:message key="labels.server_rotation" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="serverRotation" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="crawlingThreadCount"><bean:message key="labels.crawling_thread_count" /></label>
+											<div class="form-inline">
+													<html:text property="crawlingThreadCount" styleClass="form-control" />
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="dayForCleanup"><bean:message key="labels.day_for_cleanup" /></label>
+											<div class="form-inline">
+													<html:select property="dayForCleanup" styleClass="form-control">
+															<html:option value="-1"><bean:message key="labels.none"/></html:option>
+															<c:forEach var="d" items="${dayItems}">
+																	<html:option value="${f:h(d)}">${f:h(d)}</html:option>
+															</c:forEach>
+													</html:select>
+													<bean:message key="labels.day"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="ignoreFailureType"><bean:message key="labels.ignore_failure_type" /></label>
+											<html:text property="ignoreFailureType" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+											<label for="failureCountThreshold"><bean:message key="labels.failure_count_threshold" /></label>
+											<div class="form-inline">
+													<html:text property="failureCountThreshold" styleClass="form-control" />
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="suggestSearchLog"><bean:message key="labels.suggest_search_log_enabled" /></label>
+											<div styleClass="form-inline" >
+													<html:checkbox property="suggestSearchLog" />
+													<bean:message key="labels.enabled"/>
+											</div>
+									</div>
+									<div class="form-group">
+											<label for="purgeSuggestSearchLogDay"><bean:message key="labels.purge_suggest_search_log_day" /></label>
+											<div class="form-inline">
+													<html:text property="purgeSuggestSearchLogDay" styleClass="form-control" />
+											</div>
+									</div>
 
-	</tiles:put>
-</tiles:insert>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+										<input type="submit" class="btn small btn-primary" name="update"
+													 value="<bean:message key="labels.crawl_button_update"/>"
+										/>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/dataConfig/confirm.jsp

@@ -1,164 +1,211 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.data_crawling_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="dataConfig" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.data_crawling_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="dataConfig" />
+		</jsp:include>
 
-      <div id="main">
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-<%-- Confirm Form: BEGIN --%>
-	<s:form>
-		<html:hidden property="crudMode"/>
-		<div>
-<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-<html:hidden property="id"/>
-<html:hidden property="versionNo"/>
-</c:if>
-<html:hidden property="createdBy"/>
-<html:hidden property="createdTime"/>
-<html:hidden property="sortOrder"/>
-		<h3><bean:message key="labels.data_crawling_title_confirm"/></h3>
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.data_crawling_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.data_crawling_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
-		<table class="bordered-table zebra-striped" style="width:500px;">
-			<tbody>
-                <c:if test="${id != null}"><tr>
-                    <th style="width:150px;"><bean:message key="labels.id" /></th>
-                    <td style="width:345px;word-break:break-all;">${f:h(id)}</td>
-                </tr></c:if>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.name"/></th>
-                    <td style="width:345px;word-break:break-all;">${f:h(name)}<html:hidden property="name"/></td>
-                </tr>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.handler_name"/></th>
-                	<td>
-<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
-<c:if test="${handlerName==hn.value}">
-${f:h(hn.label)}<br/>
-</c:if>
-</c:forEach>
-<html:hidden property="handlerName"/>
-                	</td>
-                </tr>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.handler_parameter"/></th>
-                    <td style="width:345px;word-break:break-all;">${f:br(f:h(handlerParameter))}<html:hidden property="handlerParameter"/></td>
-                </tr>
-                <tr>
-                    <th style="width:150px;"><bean:message key="labels.handler_script"/></th>
-                    <td style="width:345px;word-break:break-all;">${f:br(f:h(handlerScript))}<html:hidden property="handlerScript"/></td>
-                </tr>
-                <tr>
-                    <th><bean:message key="labels.boost"/></th>
-                    <td>${f:h(boost)}<html:hidden property="boost"/></td>
-                </tr>
-                <tr>
-                	<th><bean:message key="labels.role_type" /></th>
-                	<td>
-<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
-<c:if test="${rtid==rt.id}">
-${f:h(rt.name)}<br/>
-</c:if>
-</c:forEach>
-</c:forEach>
-<html:select property="roleTypeIds" multiple="true" style="display:none;">
-<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-	<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
-</c:forEach>
-</html:select>
-                	</td>
-                </tr>                
-                <tr>
-                	<th><bean:message key="labels.label_type" /></th>
-                	<td>
-<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
-<c:forEach var="ltid" varStatus="s" items="${labelTypeIds}">
-<c:if test="${ltid==l.id}">
-${f:h(l.name)}<br/>
-</c:if>
-</c:forEach>
-</c:forEach>
-<html:select property="labelTypeIds" multiple="true" style="display:none;">
-<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
-	<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
-</c:forEach>
-</html:select>
-                	</td>
-                </tr>                
-				<tr>
-                    <th><bean:message key="labels.available"/></th>
-                    <td><html:hidden property="available"/>
-<c:if test="${available=='true'}"><bean:message key="labels.enabled"/></c:if>
-<c:if test="${available=='false'}"><bean:message key="labels.disabled"/></c:if>
-					</td>
-                </tr>
-			     
+				</ol>
+			</section>
 
-			</tbody>
-			<tfoot>
-				<tr>
-					<td colspan="2">
-        <c:if test="${crudMode == 1}">
-            <input type="submit" class="btn small" name="create" value="<bean:message key="labels.data_crawling_button_create"/>"/>
-            <input type="submit" class="btn small" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-        </c:if>
-        <c:if test="${crudMode == 2}">
-            <input type="submit" class="btn small" name="update" value="<bean:message key="labels.data_crawling_button_update"/>"/>
-            <input type="submit" class="btn small" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-        </c:if>
-        <c:if test="${crudMode == 3}">
-            <input type="submit" class="btn small" name="delete" value="<bean:message key="labels.data_crawling_button_delete"/>"/>
-            <input type="submit" class="btn small" name="back" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-        </c:if>
-        <c:if test="${crudMode == 4}">
-            <input type="submit" class="btn small" name="back" value="<bean:message key="labels.data_crawling_button_back"/>"/>
-            <input type="submit" class="btn small" name="editfromconfirm" value="<bean:message key="labels.data_crawling_button_edit"/>"/>
-            <input type="submit" class="btn small" name="deletefromconfirm" value="<bean:message key="labels.data_crawling_button_delete"/>"/>
-        </c:if>
-					</td>
-				</tr>
-			</tfoot>
-		</table>
-		</div>
-	</s:form>
-<%-- Confirm Form: BEGIN --%>
+			<section class="content">
 
-      </div>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.data_crawling_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.data_crawling_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.data_crawling_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.data_crawling_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.data_crawling_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<c:if test="${id != null}"><tr>
+												<th class="col-xs-3"><bean:message key="labels.id" /></th>
+												<td>${f:h(id)}</td>
+											</tr></c:if>
+											<tr>
+												<th class="col-xs-3"><bean:message key="labels.name" /></th>
+												<td>${f:h(name)}<html:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.handler_name" /></th>
+												<td>
+													<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
+														<c:if test="${handlerName==hn.value}">
+															${f:h(hn.label)}<br/>
+														</c:if>
+													</c:forEach>
+													<html:hidden property="handlerName"/>
+												</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.handler_parameter" /></th>
+												<td>${f:br(f:h(handlerParameter))}<html:hidden property="handlerParameter" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.handler_script" /></th>
+												<td>${f:br(f:h(handlerScript))}<html:hidden property="handlerScript" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.boost" /></th>
+												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.role_type" /></th>
+													<td>
+														<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+															<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
+																<c:if test="${rtid==rt.id}">
+																	${f:h(rt.name)}<br/>
+																</c:if>
+															</c:forEach>
+														</c:forEach>
+														<html:select property="roleTypeIds" multiple="true" style="display:none;">
+															<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+																<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
+															</c:forEach>
+														</html:select>
+													</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.label_type" /></th>
+												<td>
+													<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
+														<c:forEach var="ltid" varStatus="s" items="${labelTypeIds}">
+															<c:if test="${ltid==l.id}">
+																${f:h(l.name)}<br/>
+															</c:if>
+														</c:forEach>
+													</c:forEach>
+													<html:select property="labelTypeIds" multiple="true" style="display:none;">
+														<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
+															<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
+														</c:forEach>
+													</html:select>
+												</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.available"/></th>
+												<td><html:hidden property="available"/>
+													<c:if test="${available=='true'}"><bean:message key="labels.enabled"/></c:if>
+													<c:if test="${available=='false'}"><bean:message key="labels.disabled"/></c:if>
+												</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.data_crawling_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.data_crawling_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.data_crawling_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.data_crawling_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.data_crawling_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/dataConfig/edit.jsp

@@ -1,147 +1,165 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.data_crawling_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="dataConfig" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.data_crawling_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="dataConfig" />
+		</jsp:include>
 
-		<div id="main">
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<%-- Edit Form: BEGIN --%>
-			<s:form>
-				<html:hidden property="crudMode" />
-				<div>
-					<c:if test="${crudMode==2}">
-						<html:hidden property="id" />
-						<html:hidden property="versionNo" />
-					</c:if>
-					<html:hidden property="createdBy" />
-					<html:hidden property="createdTime" />
-					<html:hidden property="sortOrder" />
-					<h3>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
 						<bean:message key="labels.data_crawling_title_details" />
-					</h3>
-			<div>
-				<ul class="pills">
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.data_crawling_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.data_crawling_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
-					<table class="bordered-table zebra-striped">
-						<tbody>
-							<tr>
-								<th style="width: 150px;"><bean:message key="labels.name" /></th>
-								<td><html:text property="name"  styleClass="xlarge"/></td>
-							</tr>
-							<tr>
-								<th style="width: 150px;"><bean:message
-										key="labels.handler_name" /></th>
-								<td><html:select property="handlerName" size="1"
-										>
-										<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
-											<html:option value="${f:u(hn.value)}">${f:h(hn.label)}</html:option>
-										</c:forEach>
-									</html:select></td>
-							</tr>
-							<tr>
-								<th style="width: 150px;"><bean:message
-										key="labels.handler_parameter" /></th>
-								<td><html:textarea property="handlerParameter"
-										 rows="5" styleClass="xlarge"/></td>
-							</tr>
-							<tr>
-								<th style="width: 150px;"><bean:message
-										key="labels.handler_script" /></th>
-								<td><html:textarea property="handlerScript"
-										 rows="5" styleClass="xlarge"/></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.boost" /></th>
-								<td><html:text property="boost" styleClass="xlarge" /></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.role_type" /></th>
-								<td><html:select property="roleTypeIds" multiple="true"
-										styleClass="xlarge">
-										<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-											<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
-										</c:forEach>
-									</html:select></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.label_type" /></th>
-								<td><html:select property="labelTypeIds" multiple="true"
-										styleClass="xlarge">
-										<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
-											<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
-										</c:forEach>
-									</html:select></td>
-							</tr>
-							<tr>
-								<th><bean:message key="labels.available" /></th>
-								<td><html:select property="available" styleClass="small">
-										<html:option value="true">
-											<bean:message key="labels.enabled" />
-										</html:option>
-										<html:option value="false">
-											<bean:message key="labels.disabled" />
-										</html:option>
-									</html:select></td>
-							</tr>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.data_crawling_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.data_crawling_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.data_crawling_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="name"><bean:message key="labels.name" /></label>
+										<html:text property="name" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+											<label for="handlerName"><bean:message key="labels.handler_name" /></label>
+											<html:select property="handlerName" size="1" styleClass="form-control">
+													<c:forEach var="hn" varStatus="s" items="${handlerNameItems}">
+															<html:option value="${f:u(hn.value)}">${f:h(hn.label)}</html:option>
+													</c:forEach>
+											</html:select>
+									</div>
+									<div class="form-group">
+										<label for="handlerParameter"><bean:message key="labels.handler_parameter" /></label>
+										<html:textarea property="handlerParameter" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="handlerScript"><bean:message key="labels.handler_script" /></label>
+										<html:textarea property="handlerScript" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="boost"><bean:message key="labels.boost" /></label>
+										<html:text property="boost" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="roleTypeIds"><bean:message key="labels.role_type" /></label>
+										<html:select property="roleTypeIds" multiple="true" styleClass="form-control">
+											<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+												<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
+											</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="roleTypeIds"><bean:message key="labels.label_type" /></label>
+										<html:select property="labelTypeIds" multiple="true" styleClass="form-control">
+											<c:forEach var="l" varStatus="s" items="${labelTypeItems}">
+												<html:option value="${f:u(l.id)}">${f:h(l.name)}</html:option>
+											</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="available"><bean:message key="labels.available" /></label>
+										<html:select property="available" styleClass="form-control">
+											<html:option value="true">
+												<bean:message key="labels.enabled" />
+											</html:option>
+											<html:option value="false">
+												<bean:message key="labels.disabled" />
+											</html:option>
+										</html:select>
+									</div>
+								</div>
 
-						</tbody>
-						<tfoot>
-							<tr>
-								<td colspan="2"><c:if test="${crudMode == 1}">
-										<input type="submit" class="btn small" name="confirmfromcreate"
-											value="<bean:message key="labels.data_crawling_button_create"/>" />
-										<input type="submit" class="btn small" name="back"
-											value="<bean:message key="labels.data_crawling_button_back"/>" />
-									</c:if> <c:if test="${crudMode == 2}">
-										<input type="submit" class="btn small" name="confirmfromupdate"
-											value="<bean:message key="labels.data_crawling_button_confirm"/>" />
-										<input type="submit" class="btn small" name="back"
-											value="<bean:message key="labels.data_crawling_button_back"/>" />
-									</c:if></td>
-							</tr>
-						</tfoot>
-					</table>
-				</div>
-			</s:form>
-			<%-- Edit Form: BEGIN --%>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.data_crawling_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.data_crawling_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.data_crawling_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
 
+			</section>
 		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/dataConfig/error.jsp

@@ -1,19 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.data_crawling_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="dataConfig" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.data_crawling_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="dataConfig" />
+		</jsp:include>
 
-      <div id="main">
-      
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.crud_button_back"/></s:link>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/dataConfig/">
+							<bean:message key="labels.data_crawling_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-      </div>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.data_crawling_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/dataConfig/index.jsp

@@ -1,126 +1,134 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.data_crawling_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="dataConfig" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.data_crawling_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="dataConfig" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.data_crawling_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.data_crawling_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.data_crawling_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-		<%-- List: BEGIN --%>
+			<section class="content">
 
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.data_crawling_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.data_crawling_link_create_new" />
-						</s:link></li>
-				</ul>
-			</div>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.data_crawling_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.data_crawling_link_create_new" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
 
-			<c:if test="${dataConfigPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${dataConfigPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 250px;"><bean:message
-									key="labels.name" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.available" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${dataConfigItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
+								<%-- List --%>
+								<c:if test="${dataConfigPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${dataConfigPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.name" /></th>
+												<th><bean:message key="labels.available" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${dataConfigItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td>${f:h(data.name)}</td>
+													<td style="text-align: center;">
+														<c:if test="${data.available=='true'}">
+															<bean:message key="labels.enabled" />
+														</c:if> <c:if test="${data.available=='false'}">
+															<bean:message key="labels.disabled" />
+														</c:if>
+													</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
 
-								<td>${f:h(data.name)}</td>
-								<td style="text-align: center;"><c:if
-										test="${data.available=='true'}">
-										<bean:message key="labels.enabled" />
-									</c:if> <c:if test="${data.available=='false'}">
-										<bean:message key="labels.disabled" />
-									</c:if></td>
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(dataConfigPager.currentPageNumber)}"
+										arg1="${f:h(dataConfigPager.allPageCount)}" arg2="${f:h(dataConfigPager.allRecordCount)}"
+									/></span>
 
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.data_crawling_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.data_crawling_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.data_crawling_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${dataConfigPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${fileConfigPager.currentPageNumber - 1}">
-										<bean:message key="labels.data_crawling_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!dataConfigPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.data_crawling_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${dataConfigPager.pageNumberList}">
-								<li
-									<c:if test="${p == dataConfigPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${dataConfigPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${dataConfigPager.currentPageNumber + 1}">
-										<bean:message key="labels.data_crawling_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!dataConfigPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.data_crawling_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(dataConfigPager.currentPageNumber)}"
-								arg1="${f:h(dataConfigPager.allPageCount)}"
-								arg2="${f:h(dataConfigPager.allRecordCount)}" /></span>
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${dataConfigPager.existPrePage}">
+										<li class="prev"><s:link href="list/${dataConfigPager.currentPageNumber - 1}">
+												<bean:message key="labels.data_crawling_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!dataConfigPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.data_crawling_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${dataConfigPager.pageNumberList}">
+										<li <c:if test="${p == dataConfigPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${dataConfigPager.existNextPage}">
+										<li class="next"><s:link href="list/${dataConfigPager.currentPageNumber + 1}">
+												<bean:message key="labels.data_crawling_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!dataConfigPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.data_crawling_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
+

src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp

@@ -1,134 +1,172 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.file_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.file_authentication_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.file_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.file_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.file_authentication_hostname" /></th>
-							<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_port" /></th>
-							<td>${f:h(port)}<html:hidden property="port" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_scheme" /></th>
-							<td><c:forEach var="item" items="${protocolSchemeItems}">
-									<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="protocolScheme" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_username" /></th>
-							<td>${f:h(username)}<html:hidden property="username" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_password" /></th>
-							<td><c:if test="${password!=''}">******</c:if> <html:hidden
-									property="password" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_parameters" /></th>
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(parameters))}<html:hidden
-									property="parameters" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_file_crawling_config" /></th>
-							<td><c:forEach var="item" items="${fileConfigItems}">
-									<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="fileConfigId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.file_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.file_authentication_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.file_authentication_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.file_authentication_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.file_authentication_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.file_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.file_authentication_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.file_authentication_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.file_authentication_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.file_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.file_authentication_hostname" /></th>
+												<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.file_authentication_port" /></th>
+												<td>${f:h(port)}<html:hidden property="port" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_scheme" /></th>
+													<td><c:forEach var="item" items="${protocolSchemeItems}">
+															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="protocolScheme" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_username" /></th>
+													<td>${f:h(username)}<html:hidden property="username" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_password" /></th>
+													<td><c:if test="${password!=''}">******</c:if>
+															<html:hidden property="password" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_parameters" /></th>
+													<td>${f:br(f:h(parameters))}<html:hidden property="parameters" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_file_crawling_config" /></th>
+													<td><c:forEach var="item" items="${fileConfigItems}">
+															<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="fileConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.file_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.file_authentication_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.file_authentication_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.file_authentication_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.file_authentication_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp

@@ -1,125 +1,151 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.file_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.file_authentication_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.file_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.file_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.file_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.file_authentication_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.file_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.file_authentication_hostname" /></th>
-							<td><html:text property="hostname" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_port" /></th>
-							<td><html:text property="port" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_scheme" /></th>
-							<td><html:select property="protocolScheme">
-									<c:forEach var="item" items="${protocolSchemeItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_username" /></th>
-							<td><html:text property="username" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_password" /></th>
-							<td><html:password property="password" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_parameters" /></th>
-							<td><html:textarea property="parameters" style="width:98%;"
-									rows="5" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_file_crawling_config" /></th>
-							<td><html:select property="fileConfigId">
-									<c:forEach var="item" items="${fileConfigItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.file_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.file_authentication_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="hostname"><bean:message key="labels.file_authentication_hostname" /></label>
+										<html:text property="hostname" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="port"><bean:message key="labels.file_authentication_port" /></label>
+										<html:text property="port" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="protocolScheme"><bean:message key="labels.file_authentication_scheme" /></label>
+										<html:select property="protocolScheme" styleClass="form-control">
+												<c:forEach var="item" items="${protocolSchemeItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="username"><bean:message key="labels.file_authentication_username" /></label>
+										<html:text property="username" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="password"><bean:message key="labels.file_authentication_password" /></label>
+										<html:password property="password" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="parameters"><bean:message key="labels.file_authentication_parameters" /></label>
+										<html:textarea property="parameters" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="fileConfigId"><bean:message key="labels.file_authentication_file_crawling_config" /></label>
+										<html:select property="fileConfigId" styleClass="form-control">
+												<c:forEach var="item" items="${fileConfigItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+								</div>
 
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.file_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.file_authentication_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp

@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.file_authentication_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.file_authentication_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/fileAuthentication/">
+							<bean:message key="labels.file_authentication_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.file_authentication_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp

@@ -1,130 +1,143 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.file_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.file_authentication_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<c:if test="${displayCreateLink}">
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.file_authentication_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.file_authentication_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.file_authentication_link_list" />
 						</s:link></li>
-				</ul>
-				</c:if>
-				<c:if test="${!displayCreateLink}">
-					<s:link href="../fileConfig/index" styleClass="btn primary">
-						<bean:message key="labels.file_authentication_create_file_config" />
-					</s:link>
-				</c:if>
-			</div>
-			<c:if test="${displayCreateLink && fileAuthenticationPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${displayCreateLink && fileAuthenticationPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 200px;"><bean:message
-									key="labels.file_authentication_list_hostname" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.file_authentication_list_file_crawling_config" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${fileAuthenticationItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td><c:if test="${data.hostname==null||data.hostname==''}">
-										<bean:message key="labels.file_authentication_any" />
-									</c:if>${f:h(data.hostname)}:<c:if test="${data.port==-1}">
-										<bean:message key="labels.file_authentication_any" />
-									</c:if> <c:if test="${data.port!=-1}">${f:h(data.port)}</c:if></td>
-								<td>${f:h(data.fileConfig.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.file_authentication_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.file_authentication_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.file_authentication_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${fileAuthenticationPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${fileAuthenticationPager.currentPageNumber - 1}">
-										<bean:message key="labels.file_authentication_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!fileAuthenticationPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.file_authentication_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${fileAuthenticationPager.pageNumberList}">
-								<li
-									<c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${fileAuthenticationPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${fileAuthenticationPager.currentPageNumber + 1}">
-										<bean:message key="labels.file_authentication_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!fileAuthenticationPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.file_authentication_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<c:if test="${!displayCreateLink}">
+							<s:link href="../fileConfig/index" styleClass="btn btn-primary">
+								<bean:message key="labels.file_authentication_create_file_config" />
+							</s:link>
+						</c:if>
+						<c:if test="${displayCreateLink}">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<bean:message key="labels.file_authentication_link_list" />
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="createpage">
+												<bean:message key="labels.file_authentication_link_create_new" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(fileAuthenticationPager.currentPageNumber)}"
-								arg1="${f:h(fileAuthenticationPager.allPageCount)}"
-								arg2="${f:h(fileAuthenticationPager.allRecordCount)}" /></span>
+									<%-- List --%>
+									<c:if test="${fileAuthenticationPager.allRecordCount == 0}">
+										<p class="alert-message warning">
+											<bean:message key="labels.list_could_not_find_crud_table" />
+										</p>
+									</c:if>
+									<c:if test="${fileAuthenticationPager.allRecordCount > 0}">
+										<table class="table table-bordered table-striped">
+											<thead>
+												<tr>
+													<th><bean:message key="labels.file_authentication_list_hostname" /></th>
+													<th><bean:message key="labels.file_authentication_list_file_crawling_config" /></th>
+												</tr>
+											</thead>
+											<tbody>
+												<c:forEach var="data" varStatus="s" items="${fileAuthenticationItems}">
+													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+														<td><c:if test="${data.hostname==null||data.hostname==''}">
+																<bean:message key="labels.file_authentication_any" />
+															</c:if>
+															${f:h(data.hostname)}:
+															<c:if test="${data.port==-1}">
+																<bean:message key="labels.file_authentication_any" />
+															</c:if> <c:if test="${data.port!=-1}">
+																${f:h(data.port)}
+															</c:if>
+														</td>
+														<td>${f:h(data.fileConfig.name)}</td>
+													</tr>
+												</c:forEach>
+											</tbody>
+										</table>
+									</c:if>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<%-- Paging Info --%>
+									<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(fileAuthenticationPager.currentPageNumber)}"
+											arg1="${f:h(fileAuthenticationPager.allPageCount)}" arg2="${f:h(fileAuthenticationPager.allRecordCount)}"
+										/></span>
+
+									<%-- Paging Navigation --%>
+									<ul class="pagination pagination-sm no-margin pull-right">
+										<c:if test="${fileAuthenticationPager.existPrePage}">
+											<li class="prev"><s:link href="list/${fileAuthenticationPager.currentPageNumber - 1}">
+													<bean:message key="labels.file_authentication_link_prev_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!fileAuthenticationPager.existPrePage}">
+											<li class="prev disabled"><a href="#"><bean:message key="labels.file_authentication_link_prev_page" /></a></li>
+										</c:if>
+										<c:forEach var="p" varStatus="s" items="${fileAuthenticationPager.pageNumberList}">
+											<li <c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+											</li>
+										</c:forEach>
+										<c:if test="${fileAuthenticationPager.existNextPage}">
+											<li class="next"><s:link href="list/${fileAuthenticationPager.currentPageNumber + 1}">
+													<bean:message key="labels.file_authentication_link_next_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!fileAuthenticationPager.existNextPage}">
+											<li class="next disabled"><a href="#"><bean:message key="labels.file_authentication_link_next_page" /></a></li>
+										</c:if>
+									</ul>
+
+								</div>
+							</div>
+						</c:if>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
-		</div>
-		<%-- List: END --%>
 
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/fileConfig/confirm.jsp

@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -230,4 +231,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

src/main/webapp/WEB-INF/view/admin/fileConfig/edit.jsp

@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -82,7 +83,7 @@
 									</div>
 
 									<%-- Form Fields --%>
-									
+
 									<%-- Form Fields --%>
 									<div class="form-group">
 										<label for="name"><bean:message key="labels.name" /></label>
@@ -192,4 +193,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

src/main/webapp/WEB-INF/view/admin/labelType/confirm.jsp

@@ -1,137 +1,176 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.labeltype_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="labelType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.labeltype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="labelType" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.labeltype_title_confirm" />
-		</h3>
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+		<div class="content-wrapper">
 
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.labeltype_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.labeltype_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
+
+			<section class="content">
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.labeltype_name" /></th>
-							<td>${f:h(name)}<html:hidden property="name" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.labeltype_value" /></th>
-							<td>${f:h(value)}<html:hidden property="value" /></td>
-						</tr>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.labeltype_included_paths" /></th>
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(includedPaths))}<html:hidden
-									property="includedPaths" /></td>
-						</tr>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.labeltype_excluded_paths" /></th>
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(excludedPaths))}<html:hidden
-									property="excludedPaths" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.role_type" /></th>
-							<td><c:forEach var="rt" varStatus="s"
-									items="${roleTypeItems}">
-									<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
-										<c:if test="${rtid==rt.id}">${f:h(rt.name)}<br />
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.labeltype_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.labeltype_link_update" />
 										</c:if>
-									</c:forEach>
-								</c:forEach> <html:select property="roleTypeIds" multiple="true"
-									style="display:none;">
-									<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-										<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.sortOrder" /></th>
-							<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
-						</tr>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.labeltype_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.labeltype_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.labeltype_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-3"><bean:message key="labels.labeltype_name" /></th>
+												<td>${f:h(name)}<html:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.labeltype_value" /></th>
+												<td>${f:h(value)}<html:hidden property="value" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.labeltype_included_paths" /></th>
+												<td>${f:br(f:h(includedPaths))}<html:hidden property="includedPaths" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.labeltype_excluded_paths" /></th>
+												<td>${f:br(f:h(excludedPaths))}<html:hidden property="excludedPaths" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.role_type" /></th>
+													<td>
+														<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+															<c:forEach var="rtid" varStatus="s" items="${roleTypeIds}">
+																<c:if test="${rtid==rt.id}">
+																	${f:h(rt.name)}<br/>
+																</c:if>
+															</c:forEach>
+														</c:forEach>
+														<html:select property="roleTypeIds" multiple="true" style="display:none;">
+															<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+																<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
+															</c:forEach>
+														</html:select>
+													</td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.sortOrder" /></th>
+												<td>${f:h(sortOrder)}<html:hidden property="sortOrder" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
 
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.labeltype_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.labeltype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.labeltype_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.labeltype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.labeltype_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.labeltype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.labeltype_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.labeltype_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.labeltype_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.labeltype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.labeltype_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.labeltype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.labeltype_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.labeltype_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.labeltype_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.labeltype_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/labelType/edit.jsp

@@ -1,120 +1,142 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.labeltype_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="labelType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.labeltype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="labelType" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.labeltype_title_details" />
-		</h3>
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+		<div class="content-wrapper">
 
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.labeltype_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.labeltype_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.labeltype_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
+
+			<section class="content">
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped">
-					<tbody>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.labeltype_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.labeltype_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.labeltype_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.labeltype_name" /></th>
-							<td><html:text property="name" styleClass="xlarge" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.labeltype_value" /></th>
-							<td><html:text property="value" styleClass="xlarge" /></td>
-						</tr>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.labeltype_included_paths" /></th>
-							<td><html:textarea property="includedPaths"
-									style="width:345px;" rows="5" /></td>
-						</tr>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.labeltype_excluded_paths" /></th>
-							<td><html:textarea property="excludedPaths"
-									style="width:345px;" rows="5" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.role_type" /></th>
-							<td><html:select property="roleTypeIds" multiple="true"
-									styleClass="xlarge">
-									<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
-										<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.sortOrder" /></th>
-							<td><html:text property="sortOrder"  styleClass="xlarge"/></td>
-						</tr>
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="name"><bean:message key="labels.labeltype_name" /></label>
+										<html:text property="name" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="paths"><bean:message key="labels.labeltype_value" /></label>
+										<html:text property="value" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="includedPaths"><bean:message key="labels.labeltype_included_paths" /></label>
+										<html:textarea property="includedPaths" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="excludedPaths"><bean:message key="labels.labeltype_excluded_paths" /></label>
+										<html:textarea property="excludedPaths" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="roleTypeIds"><bean:message key="labels.role_type" /></label>
+										<html:select property="roleTypeIds" multiple="true" styleClass="form-control">
+											<c:forEach var="rt" varStatus="s" items="${roleTypeItems}">
+												<html:option value="${f:u(rt.id)}">${f:h(rt.name)}</html:option>
+											</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="sortOrder"><bean:message key="labels.sortOrder" /></label>
+										<html:text property="sortOrder" styleClass="form-control" />
+									</div>
+								</div>
 
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.labeltype_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.labeltype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.labeltype_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
 
+			</section>
+		</div>
 
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.labeltype_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.labeltype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.labeltype_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.labeltype_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/labelType/error.jsp

@@ -1,20 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.labeltype_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="labelType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.labeltype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="labelType" />
+		</jsp:include>
 
-      <div id="main">
-      
-<html:errors/>
-<br/>
-<s:link href="index"><bean:message key="labels.labeltype_button_back"/></s:link>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/labelType/">
+							<bean:message key="labels.labeltype_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-      </div>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.labeltype_button_back" />
+						</s:link>
+					</p>
+				</div>
 
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/labelType/index.jsp

@@ -1,116 +1,125 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.labeltype_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="labelType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.labeltype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="labelType" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.labeltype_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.labeltype_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.labeltype_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.labeltype_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.labeltype_link_list" />
 						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-			<c:if test="${labelTypePager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${labelTypePager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;"><bean:message
-									key="labels.labeltype_name" /></th>
+			<section class="content">
 
-							<th style="text-align: center; width: 200px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${labelTypeItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.labeltype_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.labeltype_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.labeltype_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${labelTypePager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${labelTypePager.currentPageNumber - 1}">
-										<bean:message key="labels.labeltype_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!labelTypePager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.labeltype_link_prev_page" /> </a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${labelTypePager.pageNumberList}">
-								<li
-									<c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${labelTypePager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${labelTypePager.currentPageNumber + 1}">
-										<bean:message key="labels.labeltype_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!labelTypePager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.labeltype_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(labelTypePager.currentPageNumber)}"
-								arg1="${f:h(labelTypePager.allPageCount)}"
-								arg2="${f:h(labelTypePager.allRecordCount)}" /></span>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.labeltype_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.labeltype_link_create_new" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
+
+								<%-- List --%>
+								<c:if test="${labelTypePager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${labelTypePager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.labeltype_name" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${labelTypeItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td>${f:h(data.name)}</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(labelTypePager.currentPageNumber)}"
+										arg1="${f:h(labelTypePager.allPageCount)}" arg2="${f:h(labelTypePager.allRecordCount)}"
+									/></span>
+
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${labelTypePager.existPrePage}">
+										<li class="prev"><s:link href="list/${labelTypePager.currentPageNumber - 1}">
+												<bean:message key="labels.labeltype_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!labelTypePager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.labeltype_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${labelTypePager.pageNumberList}">
+										<li <c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${labelTypePager.existNextPage}">
+										<li class="next"><s:link href="list/${labelTypePager.currentPageNumber + 1}">
+												<bean:message key="labels.labeltype_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!labelTypePager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.labeltype_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
-		</div>
-		<%-- List: END --%>
 
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/overlappingHost/confirm.jsp

@@ -1,110 +1,148 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.overlapping_host_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="overlappingHost" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.overlapping_host_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="overlapping_host" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.overlapping_host_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.overlapping_host_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.overlapping_host_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<html:hidden property="sortOrder" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
+			<section class="content">
 
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.regular_name" /></th>
-							<td>${f:h(regularName)}<html:hidden property="regularName" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.overlapping_name" /></th>
-							<td>${f:h(overlappingName)}<html:hidden
-									property="overlappingName" /></td>
-						</tr>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.overlapping_host_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.overlapping_host_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.overlapping_host_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.overlapping_host_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.overlapping_host_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-3"><bean:message key="labels.regular_name" /></th>
+												<td>${f:h(regularName)}<html:hidden property="regularName" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.overlapping_name" /></th>
+												<td>${f:h(overlappingName)}<html:hidden property="overlappingName" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
 
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.overlapping_host_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.overlapping_host_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.overlapping_host_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.overlapping_host_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.overlapping_host_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.overlapping_host_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.overlapping_host_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.overlapping_host_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.overlapping_host_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.overlapping_host_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.overlapping_host_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.overlapping_host_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/overlappingHost/edit.jsp

@@ -1,97 +1,122 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.overlapping_host_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="overlappingHost" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.overlapping_host_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="overlappintHost" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.overlapping_host_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.overlapping_host_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.overlapping_host_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.overlapping_host_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<html:hidden property="sortOrder" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
+			<section class="content">
 
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.regular_name" /></th>
-							<td><html:text property="regularName" style="width:98%" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.overlapping_name" /></th>
-							<td><html:text property="overlappingName" style="width:98%" /></td>
-						</tr>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.overlapping_host_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.overlapping_host_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.overlapping_host_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="regularName"><bean:message key="labels.regular_name" /></label>
+										<html:text property="regularName" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="overlappingName"><bean:message key="labels.overlapping_name" /></label>
+										<html:text property="overlappingName" styleClass="form-control" />
+									</div>
 
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.overlapping_host_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.overlapping_host_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.overlapping_host_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.overlapping_host_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.overlapping_host_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.overlapping_host_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/overlappingHost/error.jsp

@@ -1,20 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.overlapping_host_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileoverlappingHost" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.overlapping_host_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="overlappintHost" />
+		</jsp:include>
 
-      <div id="main">
-      
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.overlapping_host_button_back"/></s:link>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/overlappingHost/">
+							<bean:message key="labels.overlapping_host_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-      </div>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.overlapping_host_button_back" />
+						</s:link>
+					</p>
+				</div>
 
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/overlappingHost/index.jsp

@@ -1,119 +1,127 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.overlapping_host_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="overlappingHost" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.overlapping_host_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="overlappingHost" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.overlapping_host_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.overlapping_host_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.overlapping_host_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.overlapping_host_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.overlapping_host_link_list" />
 						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-			<c:if test="${overlappingHostPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${overlappingHostPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;"><bean:message
-									key="labels.regular_name" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.overlapping_name" /></th>
-							<th style="text-align: center;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${overlappingHostItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.regularName)}</td>
-								<td>${f:h(data.overlappingName)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.overlapping_host_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.overlapping_host_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.overlapping_host_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${overlappingHostPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${overlappingHostPager.currentPageNumber - 1}">
-										<bean:message key="labels.overlapping_host_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!overlappingHostPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.overlapping_host_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${overlappingHostPager.pageNumberList}">
-								<li
-									<c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${overlappingHostPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${overlappingHostPager.currentPageNumber + 1}">
-										<bean:message key="labels.overlapping_host_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!overlappingHostPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.overlapping_host_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.overlapping_host_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.overlapping_host_link_create_new" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(overlappingHostPager.currentPageNumber)}"
-								arg1="${f:h(overlappingHostPager.allPageCount)}"
-								arg2="${f:h(overlappingHostPager.allRecordCount)}" /></span>
+								<%-- List --%>
+								<c:if test="${overlappingHostPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${overlappingHostPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.regular_name" /></th>
+												<th><bean:message key="labels.overlapping_name" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${overlappingHostItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td>${f:h(data.regularName)}</td>
+													<td>${f:h(data.overlappingName)}</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(overlappingHostPager.currentPageNumber)}"
+										arg1="${f:h(overlappingHostPager.allPageCount)}" arg2="${f:h(overlappingHostPager.allRecordCount)}"
+									/></span>
+
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${overlappingHostPager.existPrePage}">
+										<li class="prev"><s:link href="list/${overlappingHostPager.currentPageNumber - 1}">
+												<bean:message key="labels.overlapping_host_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!overlappingHostPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.overlapping_host_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${overlappingHostPager.pageNumberList}">
+										<li <c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${overlappingHostPager.existNextPage}">
+										<li class="next"><s:link href="list/${overlappingHostPager.currentPageNumber + 1}">
+												<bean:message key="labels.overlapping_host_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!overlappingHostPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.overlapping_host_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp

@@ -1,112 +1,153 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.request_header_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.request_header_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.request_header_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.request_header_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.request_header_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.request_header_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.request_header_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.request_header_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.request_header_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.request_header_name" /></th>
+												<td>${f:h(name)}<html:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.request_header_value" /></th>
+												<td>${f:h(value)}<html:hidden property="value" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.request_header_web_crawling_config" /></th>
+													<td><c:forEach var="item" items="${webConfigItems}">
+															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="webConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.request_header_name" /></th>
-							<td>${f:h(name)}<html:hidden property="name" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.request_header_value" /></th>
-							<td>${f:h(value)}<html:hidden property="value" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.request_header_web_crawling_config" /></th>
-							<td><c:forEach var="item" items="${webConfigItems}">
-									<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="webConfigId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.request_header_button_create"/>" />
-									<input type="submit"class="btn small" name="editagain"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.request_header_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.request_header_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.request_header_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.request_header_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.request_header_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.request_header_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.request_header_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.request_header_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.request_header_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp

@@ -1,102 +1,131 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.request_header_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.request_header_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.request_header_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.request_header_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.request_header_name" /></th>
-							<td><html:text property="name" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.request_header_value" /></th>
-							<td><html:text property="value" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.request_header_web_crawling_config" /></th>
-							<td><html:select property="webConfigId">
-									<c:forEach var="item" items="${webConfigItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.request_header_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.request_header_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.request_header_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.request_header_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.request_header_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="name"><bean:message key="labels.request_header_name" /></label>
+										<html:text property="name" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="value"><bean:message key="labels.request_header_value" /></label>
+										<html:text property="value" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="webConfigId"><bean:message key="labels.request_header_web_crawling_config" /></label>
+										<html:select property="webConfigId" styleClass="form-control">
+												<c:forEach var="item" items="${webConfigItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.request_header_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.request_header_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp

@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.request_header_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.request_header_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/requestHeader/">
+							<bean:message key="labels.request_header_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.request_header_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp

@@ -1,124 +1,134 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.request_header_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.request_header_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<c:if test="${displayCreateLink}">
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.request_header_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.request_header_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.request_header_link_list" />
 						</s:link></li>
-				</ul>
-				</c:if>
-				<c:if test="${!displayCreateLink}">
-					<s:link href="../webConfig/index" styleClass="btn primary">
-						<bean:message key="labels.request_header_create_web_config" />
-					</s:link>
-				</c:if>
-			</div>
-			<c:if test="${displayCreateLink && requestHeaderPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${requestHeaderPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 200px;"><bean:message
-									key="labels.request_header_list_name" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.request_header_list_web_crawling_config" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${requestHeaderItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.name)}</td>
-								<td>${f:h(data.webConfig.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.request_header_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.request_header_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.request_header_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${requestHeaderPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${requestHeaderPager.currentPageNumber - 1}">
-										<bean:message key="labels.request_header_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!requestHeaderPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.request_header_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${requestHeaderPager.pageNumberList}">
-								<li
-									<c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${requestHeaderPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${requestHeaderPager.currentPageNumber + 1}">
-										<bean:message key="labels.request_header_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!requestHeaderPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.request_header_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<c:if test="${!displayCreateLink}">
+							<s:link href="../webConfig/index" styleClass="btn btn-primary">
+								<bean:message key="labels.request_header_create_web_config" />
+							</s:link>
+						</c:if>
+						<c:if test="${displayCreateLink}">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<bean:message key="labels.request_header_link_list" />
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="createpage">
+												<bean:message key="labels.request_header_link_create_new" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(requestHeaderPager.currentPageNumber)}"
-								arg1="${f:h(requestHeaderPager.allPageCount)}"
-								arg2="${f:h(requestHeaderPager.allRecordCount)}" /></span>
+									<%-- List --%>
+									<c:if test="${requestHeaderPager.allRecordCount == 0}">
+										<p class="alert-message warning">
+											<bean:message key="labels.list_could_not_find_crud_table" />
+										</p>
+									</c:if>
+									<c:if test="${requestHeaderPager.allRecordCount > 0}">
+										<table class="table table-bordered table-striped">
+											<thead>
+												<tr>
+													<th><bean:message key="labels.request_header_list_name" /></th>
+													<th><bean:message key="labels.request_header_list_web_crawling_config" /></th>
+												</tr>
+											</thead>
+											<tbody>
+													<c:forEach var="data" varStatus="s" items="${requestHeaderItems}">
+															<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+																	<td>${f:h(data.name)}</td>
+																	<td>${f:h(data.webConfig.name)}</td>
+															</tr>
+													</c:forEach>
+											</tbody>
+										</table>
+									</c:if>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<%-- Paging Info --%>
+									<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(requestHeaderPager.currentPageNumber)}"
+											arg1="${f:h(requestHeaderPager.allPageCount)}" arg2="${f:h(requestHeaderPager.allRecordCount)}"
+										/></span>
+
+									<%-- Paging Navigation --%>
+									<ul class="pagination pagination-sm no-margin pull-right">
+										<c:if test="${requestHeaderPager.existPrePage}">
+											<li class="prev"><s:link href="list/${requestHeaderPager.currentPageNumber - 1}">
+													<bean:message key="labels.request_header_link_prev_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!requestHeaderPager.existPrePage}">
+											<li class="prev disabled"><a href="#"><bean:message key="labels.request_header_link_prev_page" /></a></li>
+										</c:if>
+										<c:forEach var="p" varStatus="s" items="${requestHeaderPager.pageNumberList}">
+											<li <c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+											</li>
+										</c:forEach>
+										<c:if test="${requestHeaderPager.existNextPage}">
+											<li class="next"><s:link href="list/${requestHeaderPager.currentPageNumber + 1}">
+													<bean:message key="labels.request_header_link_next_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!requestHeaderPager.existNextPage}">
+											<li class="next disabled"><a href="#"><bean:message key="labels.request_header_link_next_page" /></a></li>
+										</c:if>
+									</ul>
+
+								</div>
+							</div>
+						</c:if>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/roleType/confirm.jsp

@@ -1,109 +1,148 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.roletype_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="roleType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.roletype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="roletype" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.roletype_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.roletype_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.roletype_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<html:hidden property="sortOrder" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
+			<section class="content">
 
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.roletype_name" /></th>
-							<td>${f:h(name)}<html:hidden property="name" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.roletype_value" /></th>
-							<td>${f:h(value)}<html:hidden property="value" /></td>
-						</tr>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.roletype_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.roletype_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.roletype_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.roletype_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.roletype_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-3"><bean:message key="labels.roletype_name" /></th>
+												<td>${f:h(name)}<html:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.roletype_value" /></th>
+												<td>${f:h(value)}<html:hidden property="value" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
 
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.roletype_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.roletype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.roletype_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.roletype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.roletype_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.roletype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.roletype_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.roletype_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.roletype_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.roletype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.roletype_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.roletype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.roletype_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.roletype_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.roletype_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.roletype_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/roleType/edit.jsp

@@ -1,96 +1,122 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.roletype_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="roleType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.roletype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="roleType" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.roletype_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.roletype_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.roletype_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.roletype_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.roletype_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.roletype_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.roletype_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<html:hidden property="sortOrder" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="name"><bean:message key="labels.roletype_name" /></label>
+										<html:text property="name" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="value"><bean:message key="labels.roletype_value" /></label>
+										<html:text property="value" styleClass="form-control" />
+									</div>
 
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.roletype_name" /></th>
-							<td><html:text property="name" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.roletype_value" /></th>
-							<td><html:text property="value" style="width:98%;" /></td>
-						</tr>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.roletype_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.roletype_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.roletype_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
 
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.roletype_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.roletype_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.roletype_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.roletype_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/roleType/error.jsp

@@ -1,20 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.roletype_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="roleType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.roletype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="roleType" />
+		</jsp:include>
 
-      <div id="main">
-      
-<html:errors/>
-<br/>
-<s:link href="index"><bean:message key="labels.roletype_button_back"/></s:link>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/roleType/">
+							<bean:message key="labels.roletype_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-      </div>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.roletype_button_back" />
+						</s:link>
+					</p>
+				</div>
 
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/roleType/index.jsp

@@ -1,117 +1,125 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.roletype_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="roleType" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.roletype_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="roleType" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.roletype_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.roletype_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.roletype_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.roletype_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.roletype_link_list" />
 						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-			<c:if test="${roleTypePager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${roleTypePager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;"><bean:message
-									key="labels.roletype_name" /></th>
+			<section class="content">
 
-							<th style="text-align: center; width: 200px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${roleTypeItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.roletype_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.roletype_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.roletype_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${roleTypePager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${roleTypePager.currentPageNumber - 1}">
-										<bean:message key="labels.roletype_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!roleTypePager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.roletype_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${roleTypePager.pageNumberList}">
-								<li
-									<c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${roleTypePager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${roleTypePager.currentPageNumber + 1}">
-										<bean:message key="labels.roletype_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!roleTypePager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.roletype_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.roletype_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.roletype_link_create_new" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
+
+								<%-- List --%>
+								<c:if test="${roleTypePager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${roleTypePager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.roletype_name" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${roleTypeItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td>${f:h(data.name)}</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(roleTypePager.currentPageNumber)}"
-								arg1="${f:h(roleTypePager.allPageCount)}"
-								arg2="${f:h(roleTypePager.allRecordCount)}" /></span>
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(roleTypePager.currentPageNumber)}"
+										arg1="${f:h(roleTypePager.allPageCount)}" arg2="${f:h(roleTypePager.allRecordCount)}"
+									/></span>
+
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${roleTypePager.existPrePage}">
+										<li class="prev"><s:link href="list/${roleTypePager.currentPageNumber - 1}">
+												<bean:message key="labels.roletype_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!roleTypePager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.roletype_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${roleTypePager.pageNumberList}">
+										<li <c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${roleTypePager.existNextPage}">
+										<li class="next"><s:link href="list/${roleTypePager.currentPageNumber + 1}">
+												<bean:message key="labels.roletype_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!roleTypePager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.roletype_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
-		</div>
-		<%-- List: END --%>
 
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/suggestBadWord/confirm.jsp

@@ -1,107 +1,144 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_bad_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestBadWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_bad_word_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_bad_word_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.suggest_bad_word_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_confirm" /></a></li>
 					</c:if>
-					<li><s:link href="downloadpage">
-							<bean:message key="labels.suggest_elevate_word_link_download" />
-						</s:link></li>
-					<li><s:link href="uploadpage">
-							<bean:message key="labels.suggest_elevate_word_link_upload" />
-						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.suggest_bad_word_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.suggest_bad_word_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.suggest_bad_word_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.suggest_bad_word_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.suggest_bad_word_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.suggest_bad_word_suggest_word" /></th>
+												<td>${f:h(suggestWord)}<html:hidden property="suggestWord" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.suggest_bad_word_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.suggest_bad_word_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.suggest_bad_word_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.suggest_bad_word_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.suggest_bad_word_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.suggest_bad_word_suggest_word" /></th>
-							<td>${f:h(suggestWord)}<html:hidden property="suggestWord" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.suggest_bad_word_button_create"/>" />
-									<input type="submit"class="btn small" name="editagain"
-										value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.suggest_bad_word_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.suggest_bad_word_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.suggest_bad_word_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.suggest_bad_word_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>

src/main/webapp/WEB-INF/view/admin/suggestBadWord/download.jsp

@@ -1,63 +1,86 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_bad_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestBadWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
-
-		<h3>
-			<bean:message key="labels.suggest_bad_word_title_list" />
-		</h3>
-
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
+
+		<div class="content-wrapper">
+
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_bad_word_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.suggest_bad_word_link_list" />
+						</s:link></li>
+					<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_download" /></a></li>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.suggest_bad_word_link_download" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="index">
+										<bean:message key="labels.suggest_bad_word_link_list" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="createpage">
+										<bean:message key="labels.suggest_bad_word_link_create_new" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="downloadpage">
+										<bean:message key="labels.suggest_bad_word_link_download" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="uploadpage">
+										<bean:message key="labels.suggest_bad_word_link_upload" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<s:form>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.suggest_bad_word_file" /></th>
+												<td><input name="download" value="<bean:message key="labels.suggest_bad_word_button_download"/>" type="submit" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</s:form>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</section>
 		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
-					<li><s:link href="index">
-						<bean:message key="labels.suggest_bad_word_link_list" />
-					</s:link></li>
-					<li><s:link href="createpage">
-						<bean:message key="labels.suggest_bad_word_link_create_new" />
-					</s:link></li>
-					<li class="active"><a href="#">
-						<bean:message key="labels.suggest_bad_word_link_download" />
-					</a></li>
-					<li><s:link href="uploadpage">
-						<bean:message key="labels.suggest_bad_word_link_upload" />
-					</s:link></li>
-				</ul>
-			</div>
-
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<div>
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="vertical-align: middle;"><bean:message
-									key="labels.suggest_bad_word_file" /></th>
-							<td style="width: 150px;text-align: center;"><input type="submit"
-								class="btn small" name="download"
-								value="<bean:message key="labels.suggest_bad_word_button_download"/>" />
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
-
-	</tiles:put>
-</tiles:insert>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
+

src/main/webapp/WEB-INF/view/admin/suggestBadWord/edit.jsp

@@ -1,95 +1,127 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_bad_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestBadWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_bad_word_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_bad_word_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.suggest_bad_word_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_confirm" /></a></li>
 					</c:if>
-					<li><s:link href="downloadpage">
-							<bean:message key="labels.suggest_bad_word_link_download" />
-						</s:link></li>
-					<li><s:link href="uploadpage">
-							<bean:message key="labels.suggest_bad_word_link_upload" />
-						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.suggest_bad_word_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.suggest_bad_word_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.suggest_bad_word_link_list" />
+											</s:link></span>
+										<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.suggest_bad_word_link_create_new" />
+											</s:link></span>
+										<span class="label label-default"><s:link href="downloadpage">
+											<bean:message key="labels.suggest_bad_word_link_download" />
+											</s:link></span>
+										<span class="label label-default"><s:link href="uploadpage">
+											<bean:message key="labels.suggest_bad_word_link_upload" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="word"><bean:message key="labels.suggest_bad_word_suggest_word" /></label>
+										<html:text property="suggestWord" styleClass="form-control" />
+									</div>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.suggest_bad_word_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.suggest_bad_word_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.suggest_bad_word_suggest_word" /></th>
-							<td><html:text property="suggestWord" style="width:98%;" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.suggest_bad_word_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.suggest_bad_word_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_bad_word_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>

src/main/webapp/WEB-INF/view/admin/suggestBadWord/error.jsp

@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.suggest_bad_word_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestBadWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.suggest_bad_word_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/suggestBadWord/">
+							<bean:message key="labels.suggest_bad_word_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.suggest_bad_word_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/suggestBadWord/index.jsp

@@ -1,120 +1,135 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_bad_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestBadWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_bad_word_title_list" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_bad_word_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.suggest_bad_word_link_create_new" />
-						</s:link></li>
-					<li><s:link href="downloadpage">
-							<bean:message key="labels.suggest_bad_word_link_download" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_bad_word_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.suggest_bad_word_link_list" />
 						</s:link></li>
-					<li><s:link href="uploadpage">
-							<bean:message key="labels.suggest_bad_word_link_upload" />
-						</s:link></li>
-				</ul>
-			</div>
-			<c:if test="${suggestBadWordPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${suggestBadWordPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;"><bean:message
-									key="labels.suggest_bad_word_list_suggest_word" /></th>
-							<th style="text-align: center; width: 120px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${suggestBadWordItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td style="overflow-x: auto;">${f:h(data.suggestWord)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.suggest_bad_word_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.suggest_bad_word_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.suggest_bad_word_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${suggestBadWordPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${suggestBadWordPager.currentPageNumber - 1}">
-										<bean:message key="labels.suggest_bad_word_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!suggestBadWordPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.suggest_bad_word_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${suggestBadWordPager.pageNumberList}">
-								<li
-									<c:if test="${p == suggestBadWordPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${suggestBadWordPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${suggestBadWordPager.currentPageNumber + 1}">
-										<bean:message key="labels.suggest_bad_word_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!suggestBadWordPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.suggest_bad_word_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
+
+			<section class="content">
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(suggestBadWordPager.currentPageNumber)}"
-								arg1="${f:h(suggestBadWordPager.allPageCount)}"
-								arg2="${f:h(suggestBadWordPager.allRecordCount)}" /></span>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.suggest_bad_word_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="index">
+										<bean:message key="labels.suggest_bad_word_link_list" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="createpage">
+										<bean:message key="labels.suggest_bad_word_link_create_new" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="downloadpage">
+										<bean:message key="labels.suggest_bad_word_link_download" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="uploadpage">
+										<bean:message key="labels.suggest_bad_word_link_upload" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
+
+								<%-- List --%>
+								<c:if test="${suggestBadWordPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${suggestBadWordPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.suggest_bad_word_list_suggest_word" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${suggestBadWordItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td style="overflow-x: auto;">${f:h(data.suggestWord)}</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(suggestBadWordPager.currentPageNumber)}"
+										arg1="${f:h(suggestBadWordPager.allPageCount)}" arg2="${f:h(suggestBadWordPager.allRecordCount)}"
+									/></span>
+
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${suggestBadWordPager.existPrePage}">
+										<li class="prev"><s:link href="list/${suggestBadWordPager.currentPageNumber - 1}">
+												<bean:message key="labels.suggest_bad_word_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!suggestBadWordPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.suggest_bad_word_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${suggestBadWordPager.pageNumberList}">
+										<li <c:if test="${p == suggestBadWordPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${suggestBadWordPager.existNextPage}">
+										<li class="next"><s:link href="list/${suggestBadWordPager.currentPageNumber + 1}">
+												<bean:message key="labels.suggest_bad_word_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!suggestBadWordPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.suggest_bad_word_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
+

src/main/webapp/WEB-INF/view/admin/suggestBadWord/upload.jsp

@@ -1,69 +1,93 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_bad_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestBadWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_bad_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestBadWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_bad_word_title_list" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_bad_word_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.suggest_bad_word_link_list" />
+						</s:link></li>
+					<li class="active"><a href="#"><bean:message key="labels.suggest_bad_word_link_upload" /></a></li>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.suggest_bad_word_link_upload" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="index">
+										<bean:message key="labels.suggest_bad_word_link_list" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="createpage">
+										<bean:message key="labels.suggest_bad_word_link_create_new" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="downloadpage">
+										<bean:message key="labels.suggest_bad_word_link_download" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="uploadpage">
+										<bean:message key="labels.suggest_bad_word_link_upload" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<s:form action="upload" enctype="multipart/form-data">
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.suggest_bad_word_file" /></th>
+												<td><input type="file" name="suggestBadWordFile" /></td>
+											</tr>
+										</tbody>
+										<tfoot>
+											<tr>
+												<td colspan="2">
+													<input type="submit" name="upload" value="<bean:message key="labels.suggest_bad_word_button_upload"/>" />
+												</td>
+											</tr>
+										</tfoot>
+									</table>
+								</s:form>
 
-			<div>
-				<ul class="pills">
-					<li><s:link href="index">
-						<bean:message key="labels.suggest_bad_word_link_list" />
-					</s:link></li>
-					<li><s:link href="createpage">
-						<bean:message key="labels.suggest_bad_word_link_create_new" />
-					</s:link></li>
-					<li><s:link href="downloadpage">
-						<bean:message key="labels.suggest_bad_word_link_download" />
-					</s:link></li>
-					<li class="active"><a href="#">
-						<bean:message key="labels.suggest_bad_word_link_upload" />
-					</a></li>
-				</ul>
-			</div>
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</section>
+		</div>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form action="upload" enctype="multipart/form-data">
-			<div>
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px; vertical-align: middle;"><bean:message
-									key="labels.suggest_bad_word_file" /></th>
-							<td><input type="file"
-									   name="suggestBadWordFile" style="width: 98%;" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2">
-								<input type="submit" class="btn small" name="upload"
-									   value="<bean:message key="labels.suggest_bad_word_button_upload"/>" />
-							</td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>

src/main/webapp/WEB-INF/view/admin/suggestElevateWord/confirm.jsp

@@ -1,123 +1,160 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_elevate_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestElevateWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_elevate_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestElevateWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_elevate_word_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_elevate_word_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.suggest_elevate_word_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_confirm" /></a></li>
 					</c:if>
-					<li><s:link href="downloadpage">
-							<bean:message key="labels.suggest_elevate_word_link_download" />
-						</s:link></li>
-					<li><s:link href="uploadpage">
-							<bean:message key="labels.suggest_elevate_word_link_upload" />
-						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.suggest_elevate_word_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.suggest_elevate_word_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.suggest_elevate_word_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.suggest_elevate_word_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.suggest_elevate_word_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.suggest_elevate_word_suggest_word" /></th>
+												<td>${f:h(suggestWord)}<html:hidden property="suggestWord" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.suggest_elevate_word_reading" /></th>
+												<td>${f:h(reading)}<html:hidden property="reading" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.suggest_elevate_word_target_role" /></th>
+												<td>${f:h(targetRole)}<html:hidden property="targetRole" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.suggest_elevate_word_target_label" /></th>
+												<td>${f:h(targetLabel)}<html:hidden property="targetLabel" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.suggest_elevate_word_boost" /></th>
+												<td>${f:h(boost)}<html:hidden property="boost" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.suggest_elevate_word_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.suggest_elevate_word_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.suggest_elevate_word_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.suggest_elevate_word_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.suggest_elevate_word_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.suggest_elevate_word_suggest_word" /></th>
-							<td>${f:h(suggestWord)}<html:hidden property="suggestWord" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_reading" /></th>
-							<td>${f:h(reading)}<html:hidden property="reading" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_target_role" /></th>
-							<td>${f:h(targetRole)}<html:hidden property="targetRole" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_target_label" /></th>
-							<td>${f:h(targetLabel)}<html:hidden property="targetLabel" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_boost" /></th>
-							<td>${f:h(boost)}<html:hidden property="boost" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.suggest_elevate_word_button_create"/>" />
-									<input type="submit"class="btn small" name="editagain"
-										value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.suggest_elevate_word_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.suggest_elevate_word_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.suggest_elevate_word_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.suggest_elevate_word_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>

src/main/webapp/WEB-INF/view/admin/suggestElevateWord/download.jsp

@@ -1,62 +1,86 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_elevate_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestElevateWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
-
-		<h3>
-			<bean:message key="labels.suggest_elevate_word_title_list" />
-		</h3>
-
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_elevate_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestElevateWord" />
+		</jsp:include>
+
+		<div class="content-wrapper">
+
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_elevate_word_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.suggest_elevate_word_link_list" />
+						</s:link></li>
+					<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_download" /></a></li>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.suggest_elevate_word_link_download" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="index">
+										<bean:message key="labels.suggest_elevate_word_link_list" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="createpage">
+										<bean:message key="labels.suggest_elevate_word_link_create_new" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="downloadpage">
+										<bean:message key="labels.suggest_elevate_word_link_download" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="uploadpage">
+										<bean:message key="labels.suggest_elevate_word_link_upload" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<s:form>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.suggest_elevate_word_file" /></th>
+												<td><input name="download" value="<bean:message key="labels.suggest_elevate_word_button_download"/>" type="submit" /></td>
+											</tr>
+										</tbody>
+									</table>
+								</s:form>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</section>
 		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
-					<li><s:link href="index">
-						<bean:message key="labels.suggest_elevate_word_link_list" />
-					</s:link></li>
-					<li><s:link href="createpage">
-						<bean:message key="labels.suggest_elevate_word_link_create_new" />
-					</s:link></li>
-					<li class="active"><a href="#">
-						<bean:message key="labels.suggest_elevate_word_link_download" />
-					</a></li>
-					<li><s:link href="uploadpage">
-						<bean:message key="labels.suggest_elevate_word_link_upload" />
-					</s:link></li>
-				</ul>
-			</div>
-
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<div>
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="vertical-align: middle;"><bean:message
-									key="labels.suggest_elevate_word_file" /></th>
-							<td style="width: 150px;text-align: center;"><input type="submit"
-								class="btn small" name="download"
-								value="<bean:message key="labels.suggest_elevate_word_button_download"/>" />
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
-	</tiles:put>
-</tiles:insert>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
+

src/main/webapp/WEB-INF/view/admin/suggestElevateWord/edit.jsp

@@ -1,111 +1,143 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_elevate_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestElevateWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_elevate_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestElevateWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_elevate_word_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_elevate_word_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.suggest_elevate_word_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_confirm" /></a></li>
 					</c:if>
-					<li><s:link href="downloadpage">
-							<bean:message key="labels.suggest_elevate_word_link_download" />
-						</s:link></li>
-					<li><s:link href="uploadpage">
-							<bean:message key="labels.suggest_elevate_word_link_upload" />
-						</s:link></li>
-				</ul>
-			</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.suggest_elevate_word_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.suggest_elevate_word_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.suggest_elevate_word_link_list" />
+											</s:link></span>
+										<span class="label label-default"><s:link href="createpage">
+											<bean:message key="labels.suggest_elevate_word_link_create_new" />
+											</s:link></span>
+										<span class="label label-default"><s:link href="downloadpage">
+											<bean:message key="labels.suggest_elevate_word_link_download" />
+											</s:link></span>
+										<span class="label label-default"><s:link href="uploadpage">
+											<bean:message key="labels.suggest_elevate_word_link_upload" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="word"><bean:message key="labels.suggest_elevate_word_suggest_word" /></label>
+										<html:text property="suggestWord" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="reading"><bean:message key="labels.suggest_elevate_word_reading" /></label>
+										<html:text property="reading" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="targetRole"><bean:message key="labels.suggest_elevate_word_target_role" /></label>
+										<html:text property="targetRole" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="targetLabel"><bean:message key="labels.suggest_elevate_word_target_label" /></label>
+										<html:text property="targetLabel" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="boost"><bean:message key="labels.suggest_elevate_word_boost" /></label>
+										<html:text property="boost" styleClass="form-control" />
+									</div>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.suggest_elevate_word_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.suggest_elevate_word_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.suggest_elevate_word_suggest_word" /></th>
-							<td><html:text property="suggestWord" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_reading" /></th>
-							<td><html:text property="reading" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_target_role" /></th>
-							<td><html:text property="targetRole" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_target_label" /></th>
-							<td><html:text property="targetLabel" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.suggest_elevate_word_boost" /></th>
-							<td><html:text property="boost" size="4" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.suggest_elevate_word_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.suggest_elevate_word_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.suggest_elevate_word_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
-	</tiles:put>
-</tiles:insert>

src/main/webapp/WEB-INF/view/admin/suggestElevateWord/error.jsp

@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.suggest_elevate_word_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestElevateWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_elevate_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestElevateWord" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.suggest_elevate_word_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/suggestElevateWord/">
+							<bean:message key="labels.suggest_elevate_word_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.suggest_elevate_word_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/suggestElevateWord/index.jsp

@@ -1,120 +1,135 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_elevate_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestElevateWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_elevate_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestElevateWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_elevate_word_title_list" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.suggest_elevate_word_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.suggest_elevate_word_link_create_new" />
-						</s:link></li>
-					<li><s:link href="downloadpage">
-							<bean:message key="labels.suggest_elevate_word_link_download" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_elevate_word_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.suggest_elevate_word_link_list" />
 						</s:link></li>
-					<li><s:link href="uploadpage">
-							<bean:message key="labels.suggest_elevate_word_link_upload" />
-						</s:link></li>
-				</ul>
-			</div>
-			<c:if test="${suggestElevateWordPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${suggestElevateWordPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center;"><bean:message
-									key="labels.suggest_elevate_word_list_suggest_word" /></th>
-							<th style="text-align: center; width: 120px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${suggestElevateWordItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td style="overflow-x: auto;">${f:h(data.suggestWord)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.suggest_elevate_word_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.suggest_elevate_word_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.suggest_elevate_word_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${suggestElevateWordPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${suggestElevateWordPager.currentPageNumber - 1}">
-										<bean:message key="labels.suggest_elevate_word_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!suggestElevateWordPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.suggest_elevate_word_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${suggestElevateWordPager.pageNumberList}">
-								<li
-									<c:if test="${p == suggestElevateWordPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${suggestElevateWordPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${suggestElevateWordPager.currentPageNumber + 1}">
-										<bean:message key="labels.suggest_elevate_word_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!suggestElevateWordPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.suggest_elevate_word_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
+
+			<section class="content">
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(suggestElevateWordPager.currentPageNumber)}"
-								arg1="${f:h(suggestElevateWordPager.allPageCount)}"
-								arg2="${f:h(suggestElevateWordPager.allRecordCount)}" /></span>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.suggest_elevate_word_link_list" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="index">
+										<bean:message key="labels.suggest_elevate_word_link_list" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="createpage">
+										<bean:message key="labels.suggest_elevate_word_link_create_new" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="downloadpage">
+										<bean:message key="labels.suggest_elevate_word_link_download" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="uploadpage">
+										<bean:message key="labels.suggest_elevate_word_link_upload" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<html:messages id="msg" message="true">
+										<div class="alert-message info">
+											<bean:write name="msg" ignore="true" />
+										</div>
+									</html:messages>
+									<html:errors />
+								</div>
+
+								<%-- List --%>
+								<c:if test="${suggestElevateWordPager.allRecordCount == 0}">
+									<p class="alert-message warning">
+										<bean:message key="labels.list_could_not_find_crud_table" />
+									</p>
+								</c:if>
+								<c:if test="${suggestElevateWordPager.allRecordCount > 0}">
+									<table class="table table-bordered table-striped">
+										<thead>
+											<tr>
+												<th><bean:message key="labels.suggest_elevate_word_list_suggest_word" /></th>
+											</tr>
+										</thead>
+										<tbody>
+											<c:forEach var="data" varStatus="s" items="${suggestElevateWordItems}">
+												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+													<td style="overflow-x: auto;">${f:h(data.suggestWord)}</td>
+												</tr>
+											</c:forEach>
+										</tbody>
+									</table>
+								</c:if>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+								<%-- Paging Info --%>
+								<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(suggestElevateWordPager.currentPageNumber)}"
+										arg1="${f:h(suggestElevateWordPager.allPageCount)}" arg2="${f:h(suggestElevateWordPager.allRecordCount)}"
+									/></span>
+
+								<%-- Paging Navigation --%>
+								<ul class="pagination pagination-sm no-margin pull-right">
+									<c:if test="${suggestElevateWordPager.existPrePage}">
+										<li class="prev"><s:link href="list/${suggestElevateWordPager.currentPageNumber - 1}">
+												<bean:message key="labels.suggest_elevate_word_link_prev_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!suggestElevateWordPager.existPrePage}">
+										<li class="prev disabled"><a href="#"><bean:message key="labels.suggest_elevate_word_link_prev_page" /></a></li>
+									</c:if>
+									<c:forEach var="p" varStatus="s" items="${suggestElevateWordPager.pageNumberList}">
+										<li <c:if test="${p == suggestElevateWordPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+										</li>
+									</c:forEach>
+									<c:if test="${suggestElevateWordPager.existNextPage}">
+										<li class="next"><s:link href="list/${suggestElevateWordPager.currentPageNumber + 1}">
+												<bean:message key="labels.suggest_elevate_word_link_next_page" />
+											</s:link></li>
+									</c:if>
+									<c:if test="${!suggestElevateWordPager.existNextPage}">
+										<li class="next disabled"><a href="#"><bean:message key="labels.suggest_elevate_word_link_next_page" /></a></li>
+									</c:if>
+								</ul>
+
+							</div>
+						</div>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
+

src/main/webapp/WEB-INF/view/admin/suggestElevateWord/upload.jsp

@@ -1,68 +1,93 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.suggest_elevate_word_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="suggestElevateWord" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.suggest_elevate_word_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="suggestElevateWord" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.suggest_elevate_word_title_list" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.suggest_elevate_word_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.suggest_elevate_word_link_list" />
+						</s:link></li>
+					<li class="active"><a href="#"><bean:message key="labels.suggest_elevate_word_link_upload" /></a></li>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.suggest_elevate_word_link_upload" />
+								</h3>
+								<div class="box-tools pull-right">
+									<span class="label label-default"><s:link href="index">
+										<bean:message key="labels.suggest_elevate_word_link_list" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="createpage">
+										<bean:message key="labels.suggest_elevate_word_link_create_new" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="downloadpage">
+										<bean:message key="labels.suggest_elevate_word_link_download" />
+										</s:link></span>
+									<span class="label label-default"><s:link href="uploadpage">
+										<bean:message key="labels.suggest_elevate_word_link_upload" />
+										</s:link></span>
+								</div>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<s:form action="upload" enctype="multipart/form-data">
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.suggest_elevate_word_file" /></th>
+												<td><input type="file" name="suggestElevateWordFile" /></td>
+											</tr>
+										</tbody>
+										<tfoot>
+											<tr>
+												<td colspan="2">
+													<input type="submit" name="upload" value="<bean:message key="labels.suggest_elevate_word_button_upload"/>" />
+												</td>
+											</tr>
+										</tfoot>
+									</table>
+								</s:form>
+
+							</div>
+							<%-- Box Footer --%>
+							<div class="box-footer">
+
+							</div>
+						</div>
+					</div>
+				</div>
+
+			</section>
 		</div>
-		<%-- Message: END --%>
 
-			<div>
-				<ul class="pills">
-					<li><s:link href="index">
-						<bean:message key="labels.suggest_elevate_word_link_list" />
-					</s:link></li>
-					<li><s:link href="createpage">
-						<bean:message key="labels.suggest_elevate_word_link_create_new" />
-					</s:link></li>
-					<li><s:link href="downloadpage">
-						<bean:message key="labels.suggest_elevate_word_link_download" />
-					</s:link></li>
-					<li class="active"><a href="#">
-						<bean:message key="labels.suggest_elevate_word_link_upload" />
-					</a></li>
-				</ul>
-			</div>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
 
- 	 	<%-- Edit Form: BEGIN --%>
-		<s:form action="upload" enctype="multipart/form-data">
-			<div>
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px; vertical-align: middle;"><bean:message
-									key="labels.suggest_elevate_word_file" /></th>
-							<td><input type="file"
-									   name="suggestElevateWordFile" style="width: 98%;" /></td>
-						</tr>
- 	 	 	 	 	</tbody>
- 	 	 	 	 	<tfoot>
-						<tr>
-							<td colspan="2">
-								<input type="submit" class="btn small" name="upload"
-									   value="<bean:message key="labels.suggest_elevate_word_button_upload"/>" />
-							</td>
-						</tr>
- 	 	 	 	 	</tfoot>
- 	 	 	 	</table>
- 	 	 	</div>
- 	 	</s:form>
- 	 	<%-- Edit Form: BEGIN --%>
-	</tiles:put>
-</tiles:insert>

src/main/webapp/WEB-INF/view/admin/system/index.jsp

@@ -1,100 +1,119 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.system_title_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="system" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+		<head>
+				<meta charset="UTF-8">
+				<title>Fess | <bean:message key="labels.system_title_configuration" /></title>
+				<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+		</head>
+		<body class="skin-blue sidebar-mini">
+				<div class="wrapper">
+						<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+						<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+								<jsp:param name="menuCategoryType" value="system" />
+								<jsp:param name="menuType" value="system" />
+						</jsp:include>
 
-		<div id="main">
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+						<div class="content-wrapper">
+								<%-- Content Header --%>
+								<%-- Message --%>
+								<div>
+										<html:messages id="msg" message="true">
+												<div class="alert-message info">
+														<bean:write name="msg" ignore="true" />
+												</div>
+										</html:messages>
+										<html:errors />
+								</div>
 
-			<div>
-				<h3>
-					<bean:message key="labels.system_title_system_status" />
-				</h3>
-				<table class="bordered-table zebra-striped">
-					<tbody>
-						<tr>
-							<th><bean:message key="labels.es_cluster_name" />
-							</th>
-							<td>${f:h(clusterName)} (<c:if
-									test="${clusterStatus=='ACTIVE'}">
-									<bean:message key="labels.es_active" />
-								</c:if> <c:if test="${clusterStatus!='ACTIVE'}">
-									<bean:message key="labels.es_inactive" />
-								</c:if>)
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
+								<section class="content">
+										<div class="row">
+												<div class="col-md-12">
 
-			<s:form>
-				<div>
-					<h3>
-						<bean:message key="labels.crawler_status_title" />
-					</h3>
-					<table class="bordered-table zebra-striped">
-						<tbody>
-							<tr>
-								<th style="width: 200px;"><bean:message
-										key="labels.crawler_process_running" /></th>
-								<td>
-									<span style="margin-right:20px;">
-									<c:if test="${crawlerRunning}">
-										<bean:message key="labels.crawler_running" />
-									</c:if><c:if test="${!crawlerRunning}">
-										<bean:message key="labels.crawler_stopped" />
-									</c:if>
-									</span>
-								</td>
-							</tr>
-							<tr>
-								<th style="width: 200px;"><bean:message
-										key="labels.crawler_process_action" /></th>
-								<td>
-								<c:if test="${!crawlerRunning}">
-									<input type="submit" class="btn" name="start"
-										value="<bean:message key="labels.crawler_button_start"/>" />
-								</c:if>
-								<c:if test="${crawlerRunning}">
-									<html:select property="sessionId" style="width:100px">
-										<option value=""><bean:message key="labels.crawler_sessionid_all"/></option>
-										<c:forEach var="runningSessionId" items="${runningSessionIds}">
-										<option value="${f:h(runningSessionId)}">${f:h(runningSessionId)}</option>
-										</c:forEach>
-									</html:select>
-									<input type="submit" class="btn" name="stop"
-										value="<bean:message key="labels.crawler_button_stop"/>" />
-								</c:if>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</s:form>
+														<div class="box">
+																<%-- Box Header --%>
+																<div class="box-header">
+																		<h3 class="box-title">
+																				<bean:message key="labels.system_title_system_status" />
+																		</h3>
+																</div>
+																<%-- Box Body --%>
+																<div class="box-body">
+																		<table class="table table-bordered table-hover table-striped">
+																				<tbody>
+																						<tr>
+																								<th class="col-xs-3"><bean:message key="labels.es_cluster_name" />
+																								</th>
+																								<td>${f:h(clusterName)}
+																										(<c:if test="${clusterStatus=='ACTIVE'}">
+																										<bean:message key="labels.es_active" />
+																										</c:if> <c:if test="${clusterStatus!='ACTIVE'}">
+																												<bean:message key="labels.es_inactive" />
+																										</c:if>)
+																								</td>
+																						</tr>
+																				</tbody>
+																		</table>
+																</div>
+														</div>
 
-		</div>
-		<c:if test="${crawlerRunning}">
-			<script type="text/javascript">
-			<!--
-				setTimeout(function() {
-					window.location.reload();
-				}, 15000);
-			// -->
-			</script>
-		</c:if>
-	</tiles:put>
-</tiles:insert>
+														<s:form>
+																<div class="box">
+																		<%-- Box Header --%>
+																		<div class="box-header">
+																				<h3 class="box-title">
+																						<bean:message key="labels.crawler_status_title" />
+																				</h3>
+																		</div>
+																		<%-- Box Body --%>
+																		<div class="box-body">
+																				<%-- Message --%>
+																				<table class="table table-bordered table-hover table-striped">
+																						<tbody>
+																								<tr>
+																										<th class="col-xs-3">
+																												<bean:message key="labels.crawler_process_running" /></th>
+																										<td>
+																												<c:if test="${crawlerRunning}">
+																														<bean:message key="labels.crawler_running" />
+																												</c:if><c:if test="${!crawlerRunning}">
+																														<bean:message key="labels.crawler_stopped" />
+																												</c:if>
+																										</td>
+																								</tr>
+																								<tr>
+																										<th>
+																												<bean:message key="labels.crawler_process_action" />
+																										</th>
+																										<td>
+																												<c:if test="${!crawlerRunning}">
+																														<input type="submit" class="btn" name="start"
+																																	 value="<bean:message key="labels.crawler_button_start"/>" />
+																												</c:if>
+																												<c:if test="${crawlerRunning}">
+																														<div class="form-inline">
+																																<html:select property="sessionId" styleClass="form-control">
+																																		<option value=""><bean:message key="labels.crawler_sessionid_all"/></option>
+																																		<c:forEach var="runningSessionId" items="${runningSessionIds}">
+																																				<option value="${f:h(runningSessionId)}">${f:h(runningSessionId)}</option>
+																																		</c:forEach>
+																																</html:select>
+																																<input type="submit" class="btn" name="stop"
+																																			 value="<bean:message key="labels.crawler_button_stop"/>" />
+																														</div>
+																												</c:if>
+																										</td>
+																								</tr>
+																						</tbody>
+																				</table>
+																		</div>
+																</div>
+														</s:form>
+												</div>
+										</div>
+								</section>
+						</div>
+						<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+				</div>
+				<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+		</body>
+</html>

src/main/webapp/WEB-INF/view/admin/systemInfo/index.jsp

@@ -1,103 +1,103 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.system_info_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="systemInfo" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.system_info_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="systemInfo" />
+		</jsp:include>
 
-		<div id="main">
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<h4>
-					<bean:message key="labels.system_info_env_title" />
-				</h4>
-				<table>
-					<tbody>
-						<tr>
-							<td><textarea id="envData"
-									style="height: 300px;" class="xxlarge">
-<c:forEach var="item" items="${envItems}">${f:h(item.label)}=${f:h(item.value)}
-</c:forEach>
-								</textarea></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.system_info_configuration" />
+				</h1>
+			</section>
 
-			<div style="margin-top: 5px;">
-				<h4>
-					<bean:message key="labels.system_info_prop_title" />
-				</h4>
-				<table>
-					<tbody>
-						<tr>
-							<td><textarea id="propData"
-									style="height: 300px;" class="xxlarge">
-<c:forEach var="item" items="${propItems}">${f:h(item.label)}=${f:h(item.value)}
-</c:forEach>
-								</textarea></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
+			<section class="content">
 
-			<div style="margin-top: 5px;">
-				<h4>
-					<bean:message key="labels.system_info_fess_prop_title" />
-				</h4>
-				<table>
-					<tbody>
-						<tr>
-<c:if test="${empty fessPropItems}">
-							<td><textarea id="fessPropData"
-									style="height: 300px;" class="xxlarge">
-<bean:message key="labels.system_info_crawler_properties_does_not_exist" />
-							    </textarea></td>
-</c:if>
-<c:if test="${!empty fessPropItems}">
-							<td><textarea id="fessPropData"
-									style="height: 300px;" class="xxlarge">
-<c:forEach var="item" items="${fessPropItems}">${f:h(item.label)}=${f:h(item.value)}
-</c:forEach>
-								</textarea></td>
-</c:if>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-
-			<div style="margin-top: 5px;">
-				<h4>
-					<bean:message key="labels.system_info_bug_report_title" />
-				</h4>
-				<table>
-					<tbody>
-						<tr>
-							<td><textarea id="bugReportData"
-									style="height: 300px;" class="xxlarge">
-<c:forEach var="item" items="${bugReportItems}">${f:h(item.label)}=${f:h(item.value)}
-</c:forEach>
-								</textarea></td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.system_info_env_title" />
+								</h3>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<textarea id="envData" style="height: 300px;" class="form-control">
+									<c:forEach var="item" items="${envItems}">${f:h(item.label)}=${f:h(item.value)}</c:forEach>
+								</textarea>
+							</div>
+						</div>
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.system_info_prop_title" />
+								</h3>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<textarea id="propData" style="height: 300px;" class="form-control">
+									<c:forEach var="item" items="${propItems}">${f:h(item.label)}=${f:h(item.value)}</c:forEach>
+								</textarea>
+							</div>
+						</div>
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.system_info_fess_prop_title" />
+								</h3>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<c:if test="${empty fessPropItems}">
+									<textarea id="fessPropData" style="height: 300px;" class="form-control">
+										<bean:message key="labels.system_info_crawler_properties_does_not_exist" />
+									</textarea>
+								</c:if>
+								<c:if test="${!empty fessPropItems}">
+									<textarea id="fessPropData" style="height: 300px;" class="form-control">
+										<c:forEach var="item" items="${fessPropItems}">${f:h(item.label)}=${f:h(item.value)}</c:forEach>
+									</textarea>
+								</c:if>
+							</div>
+						</div>
+						<div class="box">
+							<%-- Box Header --%>
+							<div class="box-header with-border">
+								<h3 class="box-title">
+									<bean:message key="labels.system_info_bug_report_title" />
+								</h3>
+							</div>
+							<%-- Box Body --%>
+							<div class="box-body">
+								<textarea id="bugReportData" style="height: 300px;" class="form-control">
+									<c:forEach var="item" items="${bugReportItems}">${f:h(item.label)}=${f:h(item.value)}</c:forEach>
+								</textarea>
+							</div>
+						</div>
+					</div>
+				</div>
 
+			</section>
 		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
+

src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp

@@ -1,136 +1,176 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.web_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.web_authentication_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.web_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.web_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.web_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.web_authentication_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.web_authentication_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.web_authentication_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.web_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.web_authentication_hostname" /></th>
+												<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.web_authentication_port" /></th>
+												<td>${f:h(port)}<html:hidden property="port" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.web_authentication_realm" /></th>
+												<td>${f:h(authRealm)}<html:hidden property="authRealm" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_scheme" /></th>
+													<td><c:forEach var="item" items="${protocolSchemeItems}">
+															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="protocolScheme" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_username" /></th>
+													<td>${f:h(username)}<html:hidden property="username" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_password" /></th>
+													<td><c:if test="${password!=''}">******</c:if>
+															<html:hidden property="password" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_parameters" /></th>
+													<td>${f:br(f:h(parameters))}<html:hidden property="parameters" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_web_crawling_config" /></th>
+													<td><c:forEach var="item" items="${webConfigItems}">
+															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="webConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.web_authentication_hostname" /></th>
-							<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_port" /></th>
-							<td>${f:h(port)}<html:hidden property="port" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_realm" /></th>
-							<td>${f:h(authRealm)}<html:hidden property="authRealm" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_scheme" /></th>
-							<td><c:forEach var="item" items="${protocolSchemeItems}">
-									<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="protocolScheme" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_username" /></th>
-							<td>${f:h(username)}<html:hidden property="username" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_password" /></th>
-							<td><c:if test="${password!=''}">******</c:if> <html:hidden
-									property="password" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_parameters" /></th>
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(parameters))}<html:hidden
-									property="parameters" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.web_authentication_web_crawling_config" /></th>
-							<td><c:forEach var="item" items="${webConfigItems}">
-									<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="webConfigId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.web_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.web_authentication_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.web_authentication_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.web_authentication_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.web_authentication_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.web_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.web_authentication_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.web_authentication_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.web_authentication_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.web_authentication_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp

@@ -1,127 +1,155 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.web_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.web_authentication_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.web_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.web_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_confirm" /></a></li>
+					</c:if>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
 					</c:if>
-				</ul>
-			</div>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.web_authentication_hostname" /></th>
-							<td><html:text property="hostname" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_port" /></th>
-							<td><html:text property="port" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_realm" /></th>
-							<td><html:text property="authRealm" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_scheme" /></th>
-							<td><html:select property="protocolScheme">
-									<c:forEach var="item" items="${protocolSchemeItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_username" /></th>
-							<td><html:text property="username" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_password" /></th>
-							<td><html:password property="password" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_parameters" /></th>
-							<td><html:textarea property="parameters" style="width:98%;"
-									rows="5" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.web_authentication_web_crawling_config" /></th>
-							<td><html:select property="webConfigId">
-									<c:forEach var="item" items="${webConfigItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.web_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.web_authentication_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.web_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.web_authentication_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.web_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="hostname"><bean:message key="labels.web_authentication_hostname" /></label>
+										<html:text property="hostname" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="port"><bean:message key="labels.web_authentication_port" /></label>
+										<html:text property="port" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="authRealm"><bean:message key="labels.web_authentication_realm" /></label>
+										<html:text property="authRealm" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="protocolScheme"><bean:message key="labels.web_authentication_scheme" /></label>
+										<html:select property="protocolScheme" styleClass="form-control">
+												<c:forEach var="item" items="${protocolSchemeItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="username"><bean:message key="labels.web_authentication_username" /></label>
+										<html:text property="username" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="password"><bean:message key="labels.web_authentication_password" /></label>
+										<html:password property="password" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="parameters"><bean:message key="labels.web_authentication_parameters" /></label>
+										<html:textarea property="parameters" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="webConfigId"><bean:message key="labels.web_authentication_web_crawling_config" /></label>
+										<html:select property="webConfigId" styleClass="form-control">
+												<c:forEach var="item" items="${webConfigItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.web_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.web_authentication_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp

@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.web_authentication_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.web_authentication_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/webAuthentication/">
+							<bean:message key="labels.web_authentication_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.web_authentication_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp

@@ -1,129 +1,143 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.web_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.web_authentication_title_details" />
-		</h3>
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+		<div class="content-wrapper">
 
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<c:if test="${displayCreateLink}">
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.web_authentication_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.web_authentication_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.web_authentication_link_list" />
 						</s:link></li>
-				</ul>
-				</c:if>
-				<c:if test="${!displayCreateLink}">
-					<s:link href="../webConfig/index" styleClass="btn primary">
-						<bean:message key="labels.web_authentication_create_web_config" />
-					</s:link>
-				</c:if>
-			</div>
-			<c:if test="${displayCreateLink && webAuthenticationPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${displayCreateLink && webAuthenticationPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 250px;"><bean:message
-									key="labels.web_authentication_list_hostname" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.web_authentication_list_web_crawling_config" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${webAuthenticationItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td><c:if test="${data.hostname==null||data.hostname==''}">
-										<bean:message key="labels.web_authentication_any" />
-									</c:if>${f:h(data.hostname)}:<c:if test="${data.port==-1}">
-										<bean:message key="labels.web_authentication_any" />
-									</c:if> <c:if test="${data.port!=-1}">${f:h(data.port)}</c:if></td>
-								<td>${f:h(data.webConfig.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.web_authentication_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.web_authentication_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.web_authentication_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${webAuthenticationPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${webAuthenticationPager.currentPageNumber - 1}">
-										<bean:message key="labels.web_authentication_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!webAuthenticationPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.web_authentication_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${webAuthenticationPager.pageNumberList}">
-								<li
-									<c:if test="${p == webAuthenticationPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${webAuthenticationPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${webAuthenticationPager.currentPageNumber + 1}">
-										<bean:message key="labels.web_authentication_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!webAuthenticationPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.web_authentication_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
+
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<c:if test="${!displayCreateLink}">
+							<s:link href="../webConfig/index" styleClass="btn btn-primary">
+								<bean:message key="labels.web_authentication_create_web_config" />
+							</s:link>
+						</c:if>
+						<c:if test="${displayCreateLink}">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<bean:message key="labels.web_authentication_link_list" />
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="createpage">
+												<bean:message key="labels.web_authentication_link_create_new" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- List --%>
+									<c:if test="${webAuthenticationPager.allRecordCount == 0}">
+										<p class="alert-message warning">
+											<bean:message key="labels.list_could_not_find_crud_table" />
+										</p>
+									</c:if>
+									<c:if test="${webAuthenticationPager.allRecordCount > 0}">
+										<table class="table table-bordered table-striped">
+											<thead>
+												<tr>
+													<th><bean:message key="labels.web_authentication_list_hostname" /></th>
+													<th><bean:message key="labels.web_authentication_list_web_crawling_config" /></th>
+												</tr>
+											</thead>
+											<tbody>
+												<c:forEach var="data" varStatus="s" items="${webAuthenticationItems}">
+													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+														<td><c:if test="${data.hostname==null||data.hostname==''}">
+																<bean:message key="labels.web_authentication_any" />
+															</c:if>
+															${f:h(data.hostname)}:
+															<c:if test="${data.port==-1}">
+																<bean:message key="labels.web_authentication_any" />
+															</c:if> <c:if test="${data.port!=-1}">
+																${f:h(data.port)}
+															</c:if>
+														</td>
+														<td>${f:h(data.webConfig.name)}</td>
+													</tr>
+												</c:forEach>
+											</tbody>
+										</table>
+									</c:if>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(webAuthenticationPager.currentPageNumber)}"
-								arg1="${f:h(webAuthenticationPager.allPageCount)}"
-								arg2="${f:h(webAuthenticationPager.allRecordCount)}" /></span>
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<%-- Paging Info --%>
+									<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(webAuthenticationPager.currentPageNumber)}"
+											arg1="${f:h(webAuthenticationPager.allPageCount)}" arg2="${f:h(webAuthenticationPager.allRecordCount)}"
+										/></span>
+
+									<%-- Paging Navigation --%>
+									<ul class="pagination pagination-sm no-margin pull-right">
+										<c:if test="${webAuthenticationPager.existPrePage}">
+											<li class="prev"><s:link href="list/${webAuthenticationPager.currentPageNumber - 1}">
+													<bean:message key="labels.web_authentication_link_prev_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!webAuthenticationPager.existPrePage}">
+											<li class="prev disabled"><a href="#"><bean:message key="labels.web_authentication_link_prev_page" /></a></li>
+										</c:if>
+										<c:forEach var="p" varStatus="s" items="${webAuthenticationPager.pageNumberList}">
+											<li <c:if test="${p == webAuthenticationPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+											</li>
+										</c:forEach>
+										<c:if test="${webAuthenticationPager.existNextPage}">
+											<li class="next"><s:link href="list/${webAuthenticationPager.currentPageNumber + 1}">
+													<bean:message key="labels.web_authentication_link_next_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!webAuthenticationPager.existNextPage}">
+											<li class="next disabled"><a href="#"><bean:message key="labels.web_authentication_link_next_page" /></a></li>
+										</c:if>
+									</ul>
+
+								</div>
+							</div>
+						</c:if>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
-		</div>
-		<%-- List: END --%>
 
+			</section>
+		</div>
 
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>

src/main/webapp/WEB-INF/view/admin/webConfig/confirm.jsp

@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -234,4 +235,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

src/main/webapp/WEB-INF/view/admin/webConfig/edit.jsp

@@ -10,7 +10,7 @@
 		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
 		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
 			<jsp:param name="menuCategoryType" value="crawl" />
-			<jsp:param name="menuType" value="keyMatch" />
+			<jsp:param name="menuType" value="webConfig" />
 		</jsp:include>
 
 		<div class="content-wrapper">
@@ -50,6 +50,7 @@
 					</c:if>
 					<html:hidden property="createdBy" />
 					<html:hidden property="createdTime" />
+					<html:hidden property="sortOrder"/>
 					<div class="row">
 						<div class="col-md-12">
 							<div class="box">
@@ -194,4 +195,3 @@
 	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
 </body>
 </html>
-

src/main/webapp/WEB-INF/web.xml

@@ -58,11 +58,6 @@
     <filter-class>org.codelibs.fess.filter.WebApiFilter</filter-class>
   </filter>
 
-  <filter>
-    <filter-name>lastaFilter</filter-name>
-    <filter-class>org.lastaflute.web.LastaFilter</filter-class>
-  </filter>
-
   <!--
   <filter>
     <filter-name>adLoginInfoFilter</filter-name>