diff --git a/src/main/java/org/codelibs/fess/Constants.java b/src/main/java/org/codelibs/fess/Constants.java index a108f6056..44400796d 100644 --- a/src/main/java/org/codelibs/fess/Constants.java +++ b/src/main/java/org/codelibs/fess/Constants.java @@ -117,6 +117,8 @@ public class Constants extends CoreLibConstants { public static final String LOGIN_LINK_ENALBED_PROPERTY = "login.link.enabled"; + public static final String THUMBNAIL_ENALBED_PROPERTY = "thumbnail.enabled"; + public static final String IGNORE_FAILURE_TYPE_PROPERTY = "failure.ignoretype"; public static final String FAILURE_COUNT_THRESHOLD_PROPERTY = "failure.countthreshold"; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java index c493b23ce..ee619a0c8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java @@ -119,6 +119,7 @@ public class AdminGeneralAction extends FessAdminAction { fessConfig.setLoginRequired(Constants.ON.equalsIgnoreCase(form.loginRequired)); fessConfig.setLoginLinkEnabled(Constants.ON.equalsIgnoreCase(form.loginLink)); + fessConfig.setThumbnailEnabled(Constants.ON.equalsIgnoreCase(form.thumbnail)); fessConfig.setIncrementalCrawling(Constants.ON.equalsIgnoreCase(form.incrementalCrawling)); fessConfig.setDayForCleanup(form.dayForCleanup); fessConfig.setCrawlingThreadCount(form.crawlingThreadCount); @@ -156,6 +157,7 @@ public class AdminGeneralAction extends FessAdminAction { protected void updateForm(final EditForm form) { form.loginRequired = fessConfig.isLoginRequired() ? Constants.TRUE : Constants.FALSE; form.loginLink = fessConfig.isLoginLinkEnabled() ? Constants.TRUE : Constants.FALSE; + form.thumbnail = fessConfig.isThumbnailEnabled() ? Constants.TRUE : Constants.FALSE; form.incrementalCrawling = fessConfig.isIncrementalCrawling() ? Constants.TRUE : Constants.FALSE; form.dayForCleanup = fessConfig.getDayForCleanup(); form.crawlingThreadCount = fessConfig.getCrawlingThreadCount(); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java index 5d3741a86..27bf70992 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java @@ -70,6 +70,9 @@ public class EditForm { @Size(max = 10) public String loginLink; + @Size(max = 10) + public String thumbnail; + @Size(max = 1000) public String ignoreFailureType; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java index e9fad84a6..bd60cf814 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -995,6 +995,9 @@ public class FessLabels extends ActionMessages { /** The key of the message: Login Link */ public static final String LABELS_login_link = "{labels.login_link}"; + /** The key of the message: Thumbnail View */ + public static final String LABELS_THUMBNAIL = "{labels.thumbnail}"; + /** The key of the message: Excluded Failure Type */ public static final String LABELS_ignore_failure_type = "{labels.ignore_failure_type}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java index a6276912d..e0f9c8e17 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java @@ -249,6 +249,14 @@ public interface FessProp { return getSystemPropertyAsBoolean(Constants.LOGIN_LINK_ENALBED_PROPERTY, true); } + public default void setThumbnailEnabled(final boolean value) { + setSystemPropertyAsBoolean(Constants.THUMBNAIL_ENALBED_PROPERTY, value); + } + + public default boolean isThumbnailEnabled() { + return getSystemPropertyAsBoolean(Constants.THUMBNAIL_ENALBED_PROPERTY, false); + } + public default void setIncrementalCrawling(final boolean value) { setSystemPropertyAsBoolean(Constants.INCREMENTAL_CRAWLING_PROPERTY, value); } diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 9e34bc256..2c59844df 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -322,6 +322,7 @@ labels.default_sort_value=Default Sort Value labels.append_query_param_enabled=Append Params to URL labels.login_required=Login Required labels.login_link=Login Link +labels.thumbnail=Thumbnail View labels.ignore_failure_type=Excluded Failure Type labels.failure_count_threshold=Failure Count Threshold labels.popular_word_word_enabled=Popular Word Response diff --git a/src/main/resources/fess_label_en.properties b/src/main/resources/fess_label_en.properties index 282e1ca16..d2b15e210 100644 --- a/src/main/resources/fess_label_en.properties +++ b/src/main/resources/fess_label_en.properties @@ -322,6 +322,7 @@ labels.default_sort_value=Default Sort Value labels.append_query_param_enabled=Append Params to URL labels.login_required=Login Required labels.login_link=Login Link +labels.thumbnail=Thumbnail View labels.ignore_failure_type=Excluded Failure Type labels.failure_count_threshold=Failure Count Threshold labels.popular_word_word_enabled=Popular Word Response diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index fb655ee9b..289b4e867 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -318,6 +318,7 @@ labels.default_sort_value=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30bd\u30fc\u30c8 labels.append_query_param_enabled=\u691c\u7d22\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u8ffd\u52a0 labels.login_required=\u30ed\u30b0\u30a4\u30f3\u304c\u5fc5\u8981 labels.login_link=\u30ed\u30b0\u30a4\u30f3\u30ea\u30f3\u30af\u8868\u793a +labels.thumbnail=\u30b5\u30e0\u30cd\u30a4\u30eb\u8868\u793a labels.ignore_failure_type=\u9664\u5916\u3059\u308b\u30a8\u30e9\u30fc\u306e\u7a2e\u985e labels.failure_count_threshold=\u969c\u5bb3\u6570\u306e\u3057\u304d\u3044\u5024 labels.popular_word_word_enabled=\u4eba\u6c17\u30ef\u30fc\u30c9\u306e\u30ec\u30b9\u30dd\u30f3\u30b9 diff --git a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp index e6bb11d0f..8bfde078f 100644 --- a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp +++ b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp @@ -69,6 +69,18 @@ +
+ +
+ +
+ +
+
+