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 75c958cf6..f42a42909 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -719,6 +719,9 @@ public class FessLabels extends UserMessages { /** The key of the message: Viewed ({0}) */ public static final String LABELS_search_click_count = "{labels.search_click_count}"; + /** The key of the message: {0} views */ + public static final String LABELS_search_click_views = "{labels.search_click_views}"; + /** The key of the message: more.. */ public static final String LABELS_search_result_more = "{labels.search_result_more}"; diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index 01b28b8d5..c380597fb 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -301,7 +301,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. 0 */ String CRAWLER_HTTP_thread_pool_SIZE = "crawler.http.thread_pool.size"; - /** The key of the configuration. e.g. 50 */ + /** The key of the configuration. e.g. 100 */ String CRAWLER_DOCUMENT_MAX_SITE_LENGTH = "crawler.document.max.site.length"; /** The key of the configuration. e.g. UTF-8 */ @@ -600,7 +600,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. 50 */ String RESPONSE_MAX_TITLE_LENGTH = "response.max.title.length"; - /** The key of the configuration. e.g. 50 */ + /** The key of the configuration. e.g. 100 */ String RESPONSE_MAX_SITE_PATH_LENGTH = "response.max.site.path.length"; /** The key of the configuration. e.g. true */ @@ -2494,14 +2494,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'crawler.document.max.site.length'.
- * The value is, e.g. 50
+ * The value is, e.g. 100
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getCrawlerDocumentMaxSiteLength(); /** * Get the value for the key 'crawler.document.max.site.length' as {@link Integer}.
- * The value is, e.g. 50
+ * The value is, e.g. 100
* @return The value of found property. (NotNull: if not found, exception but basically no way) * @throws NumberFormatException When the property is not integer. */ @@ -3490,14 +3490,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** * Get the value for the key 'response.max.site.path.length'.
- * The value is, e.g. 50
+ * The value is, e.g. 100
* @return The value of found property. (NotNull: if not found, exception but basically no way) */ String getResponseMaxSitePathLength(); /** * Get the value for the key 'response.max.site.path.length' as {@link Integer}.
- * The value is, e.g. 50
+ * The value is, e.g. 100
* @return The value of found property. (NotNull: if not found, exception but basically no way) * @throws NumberFormatException When the property is not integer. */ @@ -10222,7 +10222,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction defaultMap.put(FessConfig.HTTP_FILEUPLOAD_THRESHOLD_SIZE, "262144"); defaultMap.put(FessConfig.CRAWLER_DEFAULT_SCRIPT, "groovy"); defaultMap.put(FessConfig.CRAWLER_HTTP_thread_pool_SIZE, "0"); - defaultMap.put(FessConfig.CRAWLER_DOCUMENT_MAX_SITE_LENGTH, "50"); + defaultMap.put(FessConfig.CRAWLER_DOCUMENT_MAX_SITE_LENGTH, "100"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_SITE_ENCODING, "UTF-8"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_UNKNOWN_HOSTNAME, "unknown"); defaultMap.put(FessConfig.CRAWLER_DOCUMENT_USE_SITE_ENCODING_ON_ENGLISH, "false"); @@ -10323,7 +10323,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction defaultMap.put(FessConfig.RESPONSE_FIELD_url_link, "url_link"); defaultMap.put(FessConfig.RESPONSE_FIELD_site_path, "site_path"); defaultMap.put(FessConfig.RESPONSE_MAX_TITLE_LENGTH, "50"); - defaultMap.put(FessConfig.RESPONSE_MAX_SITE_PATH_LENGTH, "50"); + defaultMap.put(FessConfig.RESPONSE_MAX_SITE_PATH_LENGTH, "100"); defaultMap.put(FessConfig.RESPONSE_HIGHLIGHT_content_title_ENABLED, "true"); defaultMap.put(FessConfig.INDEX_DOCUMENT_SEARCH_INDEX, "fess.search"); defaultMap.put(FessConfig.INDEX_DOCUMENT_UPDATE_INDEX, "fess.update"); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index f170d4c40..f7814ff79 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -197,7 +197,7 @@ http.fileupload.threshold.size=262144 # common crawler.default.script=groovy crawler.http.thread_pool.size=0 -crawler.document.max.site.length=50 +crawler.document.max.site.length=100 crawler.document.site.encoding=UTF-8 crawler.document.unknown.hostname=unknown crawler.document.use.site.encoding.on.english=false @@ -311,7 +311,7 @@ response.field.content_description=content_description response.field.url_link=url_link response.field.site_path=site_path response.max.title.length=50 -response.max.site.path.length=50 +response.max.site.path.length=100 response.highlight.content_title.enabled=true # document index diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 7e950817a..96391724d 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -231,6 +231,7 @@ labels.search_result_last_modified=Last Modified: labels.search_result_favorite=Like labels.search_result_favorited=Liked labels.search_click_count=Viewed ({0}) +labels.search_click_views={0} views labels.search_result_more=more.. labels.search_result_cache=Cache labels.search_result_similar=Similar Results ({0}) diff --git a/src/main/resources/fess_label_ja.properties b/src/main/resources/fess_label_ja.properties index 3f4d2cb8e..5f24cb492 100644 --- a/src/main/resources/fess_label_ja.properties +++ b/src/main/resources/fess_label_ja.properties @@ -217,12 +217,13 @@ labels.search_result_sort_click_count_desc=クリック数 (降順) labels.search_result_sort_favorite_count_asc=お気に入り数 (昇順) labels.search_result_sort_favorite_count_desc=お気に入り数 (降順) labels.search_result_sort_multiple=複数 -labels.search_result_size={0} バイト +labels.search_result_size={0}バイト labels.search_result_created=登録日時: labels.search_result_last_modified=最終更新日時: labels.search_result_favorite=Like labels.search_result_favorited=Liked labels.search_click_count=クリック数 ({0}) +labels.search_click_views={0}回閲覧 labels.search_result_more=詳細.. labels.search_result_cache=キャッシュ labels.search_result_similar=類似結果 ({0}) diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp index 145d6302e..f094bd320 100644 --- a/src/main/webapp/WEB-INF/view/search.jsp +++ b/src/main/webapp/WEB-INF/view/search.jsp @@ -150,6 +150,7 @@ + diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp index d65073de8..d589bf24f 100644 --- a/src/main/webapp/WEB-INF/view/searchResults.jsp +++ b/src/main/webapp/WEB-INF/view/searchResults.jsp @@ -55,82 +55,53 @@
${doc.content_description}
-
-
- ${f:h(doc.site_path)} - -
-
- - - - - - - - - - - - -
+
+ + ${f:h(doc.site_path)}
- - - - - - -
- - - - - - - - -
- - - - - - - -
- - - - - - - -
- - - - - - (${f:h(doc.favorite_count)}) - (${f:h(doc.favorite_count)}) - - + + + + + +
+   + + + +
+   + + + +
+   + + + + + +
+   + + + + + +
+   + + +
@@ -232,4 +203,3 @@
- diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 21c67247f..43e034f62 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -128,10 +128,26 @@ legend{ display: none; } +#result .info { + font-size: 80%; +} + +#result .url-copy { + color: #007bff; +} + +#result .url-copied { + color: #146ebe; +} + #result .favorited { display: none; } +#result .favorited i { + color: #fab005; +} + #result .thumbnail { width: 100px; min-height: 30px; @@ -159,45 +175,4 @@ legend{ text-overflow: ellipsis; white-space: nowrap; } -} - -.title-container { - display: flex; - align-items: center; -} -.clipboard-copy, .clipboard-copy- { - margin-left: 5px; - cursor: pointer; - color:gray; - position: relative; -} -.clipboard-copy::after, .clipboard-copy-::after { - opacity: 0; - position: absolute; - left: 50%; - transform: translateX(-50%); - bottom: 20px; - display: inline-block; - padding: 5px; - white-space: nowrap; - font-size: 0.8rem; - line-height: 1.3; - background:black; - color:white; - border-radius: 3px; - transition: 0.3s ease-in; -} -.clipboard-copy:hover:after { - content: 'path copy'; - opacity: 1; -} -.clipboard-copy:hover:before { - opacity: 1; -} -.clipboard-copy-copied::after { - content: 'copied!'; - opacity:1; -} -.clipboard-copy-copied::before { - opacity:1; -} +} \ No newline at end of file diff --git a/src/main/webapp/js/search.js b/src/main/webapp/js/search.js index b3940652e..f148d818f 100644 --- a/src/main/webapp/js/search.js +++ b/src/main/webapp/js/search.js @@ -261,16 +261,18 @@ $(function() { loadImage(this, $(this).attr("data-src"), IMG_LOADING_MAX); }); - var clipboard = new ClipboardJS('.clipboard-copy'); - clipboard.on('success', function(e) { - e.trigger.classList.remove('clipboard-copy'); - e.trigger.classList.add('clipboard-copy-'); - e.trigger.classList.add('clipboard-copy-copied'); + var clipboard = new ClipboardJS(".url-copy"); + clipboard.on("success", function(e) { + e.trigger.classList.remove("url-copy"); + e.trigger.classList.remove("far"); + e.trigger.classList.add("url-copied"); + e.trigger.classList.add("fas"); setTimeout(function(){ - e.trigger.classList.remove('clipboard-copy-copied'); - e.trigger.classList.remove('clipboard-copy-'); - e.trigger.classList.add('clipboard-copy'); - },1200); + e.trigger.classList.remove("url-copied"); + e.trigger.classList.remove("fas"); + e.trigger.classList.add("url-copy"); + e.trigger.classList.add("far"); + },3000); e.clearSelection(); }); });