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 f635d3a6c..939c2d63f 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -953,9 +953,6 @@ public class FessLabels extends ActionMessages { /** The key of the message: Create new job */ public static final String LABELS_web_crawling_button_create_job = "{labels.web_crawling_button_create_job}"; - /** The key of the message: Create New */ - public static final String LABELS_web_crawling_link_create_new = "{labels.web_crawling_link_create_new}"; - /** The key of the message: Create New */ public static final String LABELS_web_crawling_link_create = "{labels.web_crawling_link_create}"; @@ -1817,11 +1814,17 @@ public class FessLabels extends ActionMessages { public static final String LABELS_suggest_elevate_word_link_list = "{labels.suggest_elevate_word_link_list}"; /** The key of the message: Create New */ - public static final String LABELS_suggest_elevate_word_link_create_new = "{labels.suggest_elevate_word_link_create_new}"; - - /** The key of the message: Create */ public static final String LABELS_suggest_elevate_word_link_create = "{labels.suggest_elevate_word_link_create}"; + /** The key of the message: Edit */ + public static final String LABELS_suggest_elevate_word_link_edit = "{labels.suggest_elevate_word_link_edit}"; + + /** The key of the message: Delete */ + public static final String LABELS_suggest_elevate_word_link_delete = "{labels.suggest_elevate_word_link_delete}"; + + /** The key of the message: Details */ + public static final String LABELS_suggest_elevate_word_link_details = "{labels.suggest_elevate_word_link_details}"; + /** The key of the message: Download */ public static final String LABELS_suggest_elevate_word_link_download = "{labels.suggest_elevate_word_link_download}"; @@ -1865,11 +1868,17 @@ public class FessLabels extends ActionMessages { public static final String LABELS_suggest_bad_word_link_list = "{labels.suggest_bad_word_link_list}"; /** The key of the message: Create New */ - public static final String LABELS_suggest_bad_word_link_create_new = "{labels.suggest_bad_word_link_create_new}"; - - /** The key of the message: Create */ public static final String LABELS_suggest_bad_word_link_create = "{labels.suggest_bad_word_link_create}"; + /** The key of the message: Edit */ + public static final String LABELS_suggest_bad_word_link_edit = "{labels.suggest_bad_word_link_edit}"; + + /** The key of the message: Delete */ + public static final String LABELS_suggest_bad_word_link_delete = "{labels.suggest_bad_word_link_delete}"; + + /** The key of the message: Details */ + public static final String LABELS_suggest_bad_word_link_details = "{labels.suggest_bad_word_link_details}"; + /** The key of the message: Download */ public static final String LABELS_suggest_bad_word_link_download = "{labels.suggest_bad_word_link_download}"; diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 133f44419..8d97cbad1 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -315,7 +315,6 @@ labels.excluded_doc_urls=Excluded URLs For Indexing labels.user_agent=User Agent labels.web_crawling_button_create=Create labels.web_crawling_button_create_job=Create new job -labels.web_crawling_link_create_new=Create New labels.web_crawling_link_create=Create New labels.web_crawling_job_title=Web Crawler - {0} labels.crawler_configuration=General Configuration @@ -603,8 +602,10 @@ labels.boost_document_rule_sort_order=Sort Order labels.suggest_elevate_word_configuration=Additional Word labels.suggest_elevate_word_title_details=Additional Word labels.suggest_elevate_word_link_list=List -labels.suggest_elevate_word_link_create_new=Create New -labels.suggest_elevate_word_link_create=Create +labels.suggest_elevate_word_link_create=Create New +labels.suggest_elevate_word_link_edit=Edit +labels.suggest_elevate_word_link_delete=Delete +labels.suggest_elevate_word_link_details=Details labels.suggest_elevate_word_link_download=Download labels.suggest_elevate_word_link_upload=Upload labels.suggest_elevate_word_button_download=Download @@ -619,8 +620,10 @@ labels.suggest_elevate_word_file=Additional Word File labels.suggest_bad_word_configuration=Bad Word labels.suggest_bad_word_title_details=Bad Word labels.suggest_bad_word_link_list=List -labels.suggest_bad_word_link_create_new=Create New -labels.suggest_bad_word_link_create=Create +labels.suggest_bad_word_link_create=Create New +labels.suggest_bad_word_link_edit=Edit +labels.suggest_bad_word_link_delete=Delete +labels.suggest_bad_word_link_details=Details labels.suggest_bad_word_link_download=Download labels.suggest_bad_word_link_upload=Upload labels.suggest_bad_word_button_download=Download 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 1189b520a..728c5a784 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 @@ -18,32 +18,42 @@

- +
    +
  1. + +
    2. +
- <%-- Box Header --%>
- +

+ +

+ - + + + +
+
<%-- Message --%>
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 7907d0afb..13a81eed4 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 @@ -18,7 +18,13 @@

- +
    +
  1. + +
    2. +
    3. +
@@ -33,11 +39,51 @@
box-successbox-warningbox-dangerbox-primary"> - <%-- Box Header --%>
- +

+ + + + + + + + + + + + +

+
+ + + + + + + + + + + + + + + + +
- <%-- Box Body --%> +
<%-- Message --%>
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 76879d58e..e8b20926b 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 @@ -18,7 +18,6 @@

-
  1. @@ -28,49 +27,58 @@
-
-
-
-
- -
- - - - - - - + +
+
+
+
+

- - - - +

+
+ + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ +
+ +
+
- -
- - - - - - - - -
" - type="submit" />
- -
- +
-
-
+
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp index 347c70e05..9364707b5 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp @@ -18,10 +18,22 @@

- +
    +
  1. + +
    2. + +
    3. +     + +
    4. +     +
- + @@ -35,9 +47,42 @@ class="box box-successbox-warning"> <%-- Box Header --%>
- +

+ + + + + + +

+
+ + + + + + + + + + + + + + + + +
- <%-- Box Body --%> +
<%-- Message --%>
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 97af45105..04ee2eb76 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 @@ -13,15 +13,11 @@ -
- - <%-- Content Header --%>

-
  1. @@ -30,28 +26,33 @@ key="labels.suggest_bad_word_link_upload" />
-
-
- <%-- Box Header --%>
- +

+ +

+ - - + + + - + - + +
@@ -62,7 +63,7 @@ - @@ -70,8 +71,9 @@ diff --git a/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp b/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp index 8c6f614db..cda2893aa 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp @@ -19,10 +19,7 @@
    -
  1. - -
    2. -
    3. +
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 330a44148..34ae8900f 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 @@ -25,7 +25,8 @@
    • -
    • +
    • @@ -56,26 +57,27 @@
    - + - - - - 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 8da246e7a..c9e04d8a9 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 @@ -22,7 +22,7 @@
    • -
  • +
    • -
    -
    -
    -
    -

    - -

    -
    - - - - - - - - - - - - - - + + +
    +
    +
    +
    +

    - - - - - -

    -
    - -
    - <%-- Message --%> -
    - -
    ${msg}
    -     - -
    - -
    - -
    -
    - - - - - - -
    ${f:h(path)} - -
    + +
    + + + + + + + + + + + + + + + + + + + +
    - +
    + +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    +
    + +
    +
    + +
    + +
    +
    - +
    -
    -
    +
    diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp index 673099428..ea22d6422 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp @@ -27,10 +27,11 @@
    • + key="labels.dict_kuromoji_link_create" />     -
    • +
    • @@ -56,26 +57,27 @@
    - + - - - - diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp index 1864ea79c..8b9acd162 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp @@ -30,82 +30,75 @@
    -
    -
    -
    -
    -

    - -

    -
    - - - - - - - - - - - - - - - - - - + + +
    +
    +
    +
    +

    - -

    -
    - -
    - <%-- Message --%> -
    - -
    ${msg}
    -     - -
    - -
    - - - - - - - - - - - - - - - - -
    ${f:h(filename)}
    - -
    + +
    + + + + + + + + + + + + + + + + + + + +
    - +
    + +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    - +
    -
    -
    +
    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 dffd2e21e..ec5f468e4 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 @@ -25,7 +25,8 @@
    • -
    • +
    • @@ -61,22 +62,22 @@ - - - - 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 564ebd63a..0fb0d0edf 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 @@ -30,74 +30,70 @@
    -
    -
    -
    -
    -

    - -

    -
    - - - - - - - - - - - - - - + + +
    +
    +
    +
    +

    - - - - - -

    -
    - -
    - <%-- Message --%> -
    - -
    ${msg}
    -     - -
    - -
    - - - - - - - - -
    ${f:h(path)} - -
    + +
    + + + + + + + + + + + + + + + + + + + +
    - +
    + +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    +
    + +
    +
    + +
    + +
    +
    - +
    -
    -
    +
    diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp index eae6f9308..47d836878 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp @@ -30,7 +30,8 @@ key="labels.dict_synonym_link_create" /> -
    • +
    • @@ -45,7 +46,6 @@
    box-successbox-warning"> - <%-- Box Header --%>

    @@ -56,33 +56,34 @@

    - + - - - -
    - <%-- Box Body --%> +
    <%-- Message --%>
    diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp index 429825669..1571cd26e 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp @@ -18,7 +18,6 @@

    -
    1. @@ -31,82 +30,74 @@
    -
    -
    -
    -
    -

    - -

    -
    - - - - - - - - - - - - - - - - - - + + +
    +
    +
    +
    +

    - -

    -
    - -
    - <%-- Message --%> -
    - -
    ${msg}
    -     - -
    - -
    - - - - - - - - - - - - - - - - -
    ${f:h(filename)}
    - -
    + +
    + + + + + + + + + + + + + + + + + + + +
    - +
    + +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    - +
    -
    -
    +
    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 58e8e7a0d..66263dd8a 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 @@ -18,27 +18,37 @@

    - +
      +
    1. + +
      2. +
    - +

    + +

    + - + + + +
    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 09d604f10..bcac787d5 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 @@ -18,7 +18,13 @@

    - +
      +
    1. + +
      2. +
      3. +
    @@ -33,11 +39,45 @@
    box-successbox-warningbox-dangerbox-primary"> - <%-- Box Header --%>
    - +

    + + + + + + + + + + + + +

    +
    + + + + + + + + + + + + + + + + +
    - <%-- Box Body --%> +
    <%-- Message --%>
    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 f4e88ddde..193a6e92e 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 @@ -18,7 +18,6 @@

    -
    1. @@ -28,50 +27,59 @@
    -
    -
    -
    - <%-- Box Header --%> -
    - -
    - - - - - - - + +
    +
    +
    + <%-- Box Header --%> +
    +

    - - - - +

    +
    + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    + +
    + +
    +
    - -
    - - - - - - - - -
    " - type="submit" />
    -     -
    - +
    -
    -
    +
    diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp index 4aa5e4de9..a89c810af 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp @@ -18,7 +18,19 @@

    - +
      +
    1. + +
      2. + +
      3. +       + +
      4. +       +
    @@ -34,20 +46,33 @@
    box-successbox-warning">
    - +

    + + + + + + +

    + - - + + + - + - + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp index d1df87404..17afc4d69 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp @@ -18,7 +18,6 @@

    -
    1. @@ -32,31 +31,40 @@
      - +

      + +

      + - - + + + - + - + +
      - + - @@ -64,8 +72,9 @@
      - diff --git a/src/main/webapp/WEB-INF/view/common/admin/crud/breadcrumb.jsp b/src/main/webapp/WEB-INF/view/common/admin/crud/breadcrumb.jsp index 4508a00f8..aa05c8e8f 100644 --- a/src/main/webapp/WEB-INF/view/common/admin/crud/breadcrumb.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin/crud/breadcrumb.jsp @@ -1,6 +1,6 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
        -
      1. +
        3. diff --git a/src/main/webapp/WEB-INF/view/common/admin/crud/header.jsp b/src/main/webapp/WEB-INF/view/common/admin/crud/header.jsp index 91806f89a..0218e0c91 100644 --- a/src/main/webapp/WEB-INF/view/common/admin/crud/header.jsp +++ b/src/main/webapp/WEB-INF/view/common/admin/crud/header.jsp @@ -21,11 +21,11 @@ - + - +