diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java index 70295dff7..00b67a00a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java @@ -192,14 +192,14 @@ public class AdminBadwordAction extends FessAdminAction { // Download // ------- @Execute - @Secured({ ROLE }) + @Secured({ ROLE, ROLE + VIEW }) public HtmlResponse downloadpage() { saveToken(); return asDownloadHtml(); } @Execute - @Secured({ ROLE }) + @Secured({ ROLE, ROLE + VIEW }) public ActionResponse download(final DownloadForm form) { verifyToken(() -> asDownloadHtml()); diff --git a/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp b/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp index 854cb5bbe..6969aef8b 100644 --- a/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp +++ b/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp @@ -42,6 +42,7 @@
+
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp index db549083e..af55f36af 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp @@ -34,11 +34,11 @@
+ styleClass="btn btn-default btn-xs "> - + @@ -47,7 +47,7 @@ - + diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp index 8bd1e352b..bd899bc5a 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp @@ -64,7 +64,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -76,7 +76,7 @@ key="labels.bad_word_link_download" /> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp index 9299ac09a..7c27ebade 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp @@ -42,7 +42,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -52,7 +52,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp index 06e6e9186..86019ed20 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp @@ -41,7 +41,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -66,6 +66,7 @@
+
@@ -88,6 +89,7 @@
+
diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp index f32cd053c..7b351a044 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp @@ -111,6 +111,7 @@
+
+
diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp index 51ea2a30c..24669c205 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp @@ -75,8 +75,8 @@ - ${f:h(sessionId)} + + href="${fe:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}" >${f:h(sessionId)} @@ -96,6 +96,7 @@ +
+ + @@ -132,12 +135,14 @@ +
+
- +

@@ -165,14 +170,14 @@ -

+
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp index 455f747be..9926b34ab 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp @@ -44,7 +44,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -54,7 +54,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp index 09353553a..d6d886b71 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp @@ -68,7 +68,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -78,7 +78,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp index 1de2734a5..240e2bfca 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp index bc350e2da..0e75d77e4 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp @@ -44,7 +44,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -54,7 +54,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp index 244182ddd..002b2da61 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp @@ -68,7 +68,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -78,7 +78,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp index fdb213da0..036a2a20e 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp index 179441c3f..2c8f35dbd 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp @@ -44,7 +44,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -54,7 +54,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp index aa30795f6..0aa475b47 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp @@ -68,7 +68,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -78,7 +78,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp index 73d57e3d7..f1473cd5c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp index efdde40d5..cea9bcf84 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp @@ -44,7 +44,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -54,7 +54,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp index fc0567fc5..70ef2bdd4 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp @@ -68,7 +68,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -78,7 +78,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp index 3f239b847..c34ae153d 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp index 14097e52f..87f28e149 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp @@ -44,7 +44,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -54,7 +54,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp index 2e622bb2f..3f4a1914c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp @@ -68,7 +68,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -78,7 +78,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp index ea1d69db0..c54884d2a 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp index 00a697533..d0f59e290 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp @@ -44,7 +44,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -54,7 +54,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp index 883c6ee6c..1d4763088 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp @@ -68,7 +68,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -78,7 +78,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp index 975a7b16d..c626e4574 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp @@ -51,7 +51,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp index d72d866bd..8484a6222 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp index 65787c77b..b7722dac3 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp @@ -61,7 +61,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -71,7 +71,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp index d17a11be1..3144a34f5 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp @@ -43,7 +43,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> @@ -53,7 +53,7 @@ + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> diff --git a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp index 5ed00e809..93b70edac 100644 --- a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp +++ b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp @@ -42,16 +42,17 @@
- -
- -
- -
+ + +
+ +
+ +
diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp index 93fbb8a8f..743ef99e2 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp @@ -130,49 +130,51 @@
- -
- -
-