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 c1c823161..21bc1e9e3 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java @@ -3029,13 +3029,13 @@ public class FessLabels extends ActionMessages { public static final String LABELS_dict_synonym_link_create = "{labels.dict_synonym_link_create}"; /** The key of the message: Edit */ - public static final String LABELS_dict_synonym_link_update = "{labels.dict_synonym_link_update}"; + public static final String LABELS_dict_synonym_link_edit = "{labels.dict_synonym_link_edit}"; /** The key of the message: Delete */ public static final String LABELS_dict_synonym_link_delete = "{labels.dict_synonym_link_delete}"; - /** The key of the message: Confirm */ - public static final String LABELS_dict_synonym_link_confirm = "{labels.dict_synonym_link_confirm}"; + /** The key of the message: Details */ + public static final String LABELS_dict_synonym_link_details = "{labels.dict_synonym_link_details}"; /** The key of the message: Download */ public static final String LABELS_dict_synonym_link_download = "{labels.dict_synonym_link_download}"; @@ -3089,13 +3089,13 @@ public class FessLabels extends ActionMessages { public static final String LABELS_dict_kuromoji_link_create = "{labels.dict_kuromoji_link_create}"; /** The key of the message: Edit */ - public static final String LABELS_dict_kuromoji_link_update = "{labels.dict_kuromoji_link_update}"; + public static final String LABELS_dict_kuromoji_link_edit = "{labels.dict_kuromoji_link_edit}"; /** The key of the message: Delete */ public static final String LABELS_dict_kuromoji_link_delete = "{labels.dict_kuromoji_link_delete}"; - /** The key of the message: Confirm */ - public static final String LABELS_dict_kuromoji_link_confirm = "{labels.dict_kuromoji_link_confirm}"; + /** The key of the message: Details */ + public static final String LABELS_dict_kuromoji_link_details = "{labels.dict_kuromoji_link_details}"; /** The key of the message: Download */ public static final String LABELS_dict_kuromoji_link_download = "{labels.dict_kuromoji_link_download}"; diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index d1983d1ad..355e4dfc3 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -1032,9 +1032,9 @@ labels.dict_synonym_configuration=Synonym List labels.dict_synonym_title=Synonym List labels.dict_synonym_list_link=List labels.dict_synonym_link_create=Create New -labels.dict_synonym_link_update=Edit +labels.dict_synonym_link_edit=Edit labels.dict_synonym_link_delete=Delete -labels.dict_synonym_link_confirm=Confirm +labels.dict_synonym_link_details=Details labels.dict_synonym_link_download=Download labels.dict_synonym_link_upload=Upload labels.dict_synonym_source=Source @@ -1052,9 +1052,9 @@ labels.dict_kuromoji_configuration=Kuromoji List labels.dict_kuromoji_title=Kuromoji List labels.dict_kuromoji_list_link=List labels.dict_kuromoji_link_create=Create New -labels.dict_kuromoji_link_update=Edit +labels.dict_kuromoji_link_edit=Edit labels.dict_kuromoji_link_delete=Delete -labels.dict_kuromoji_link_confirm=Confirm +labels.dict_kuromoji_link_details=Details labels.dict_kuromoji_link_download=Download labels.dict_kuromoji_link_upload=Upload labels.dict_kuromoji_token=Token diff --git a/src/main/webapp/WEB-INF/view/admin/dict/index.jsp b/src/main/webapp/WEB-INF/view/admin/dict/index.jsp index 9b5b8a1e3..8c6f614db 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/index.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_configuration" /> @@ -12,39 +13,36 @@ -
- - <%-- Content Header --%>

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

- <%-- Box Body --%> +
<%-- Message --%>
-
- ${msg} -
+
${msg}
- <%-- List --%>

@@ -62,8 +60,9 @@ - ${f:h(data.type)} - ${f:h(data.path)} + ${f:h(data.type)} + ${f:h(data.path)} diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/details.jsp index d45c40ae0..f041d4cbe 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/details.jsp @@ -18,7 +18,15 @@

- +
    +
  1. + +
    2. +
  2. + +
    3. +
    4. +
@@ -38,33 +46,38 @@ - + - +
+ + - + + +
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp index eca3fafe7..8ed9d2b13 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/download.jsp @@ -13,54 +13,57 @@ -
- - <%-- Content Header --%>

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

- + + + - + + + +
- <%-- Box Body --%> +
<%-- Message --%>
@@ -69,8 +72,6 @@
- - <%-- Edit Form: BEGIN --%>
@@ -82,6 +83,7 @@ @@ -90,16 +92,14 @@
- <%-- Edit Form: END --%> -
+
+
-
-
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp index 596be5952..e83ab885f 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/edit.jsp @@ -18,6 +18,21 @@

+
    +
  1. + +
    2. +
  2. + +
    3. + +
    4. +     + +
    5. +     +
@@ -37,27 +52,32 @@ - +
+ + - + + +
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp index 945169ebf..d0bc6e8ff 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/index.jsp @@ -18,7 +18,12 @@

- +
    +
  1. + +
    2. +
    3. +
@@ -31,22 +36,27 @@
+ + - + + +
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp index d2bbbb19b..5ef454f18 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/upload.jsp @@ -13,54 +13,57 @@ -
- - <%-- Content Header --%>

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

- + + + - + + - + + - + +
- <%-- Box Body --%> +
<%-- Message --%>
@@ -69,8 +72,6 @@
- - <%-- Edit Form: BEGIN --%>
@@ -87,9 +88,10 @@ - @@ -98,16 +100,14 @@
- <%-- Edit Form: END --%> -
+
+
-
-
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/details.jsp index 7deaac074..dead57d14 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/details.jsp @@ -18,7 +18,15 @@

- +
    +
  1. + +
    2. +
  2. + +
    3. +
    4. +
@@ -38,34 +46,39 @@ - + - +
+ + - + + +
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp index c61990ef1..3287899a8 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/download.jsp @@ -13,54 +13,57 @@ -
- - <%-- Content Header --%>

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

- + + + - + + + +
- <%-- Box Body --%> +
<%-- Message --%>
@@ -69,8 +72,6 @@
- - <%-- Edit Form: BEGIN --%>
@@ -82,6 +83,7 @@ @@ -90,16 +92,14 @@
- <%-- Edit Form: BEGIN --%> -
+
+
-
- diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp index 4c0247f50..47ad58d55 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/edit.jsp @@ -18,6 +18,21 @@

+
    +
  1. + +
    2. +
  2. + +
    3. + +
    4. +     + +
    5. +     +
@@ -37,27 +52,32 @@ - +
+ + - + + +
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp index c59287709..cb515ef5c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/index.jsp @@ -18,40 +18,49 @@

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

+ + - + + +
- <%-- Box Body --%> +
<%-- Message --%>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp index bb9daacd2..85e1cb531 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/upload.jsp @@ -13,54 +13,58 @@ -
- - <%-- Content Header --%>

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

- + + + - + + + +
- <%-- Box Body --%> +
<%-- Message --%>
@@ -69,8 +73,6 @@
- - <%-- Edit Form: BEGIN --%>
@@ -87,9 +89,10 @@ - @@ -98,16 +101,14 @@
- <%-- Edit Form: BEGIN --%> -
+
+
-
-
diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp index 8997b4dc4..38aadbb66 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp @@ -13,10 +13,7 @@ -
- - <%-- Content Header --%>

@@ -30,13 +27,10 @@ key="labels.suggest_bad_word_link_download" />

-
-
- <%-- Box Header --%>
@@ -44,7 +38,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%> +
@@ -71,17 +65,14 @@
-
- <%-- Box Footer --%> -
+
+
-
-
diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp index 82984f20a..b6fd4e342 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp @@ -32,7 +32,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%>
<%-- Message --%>
diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp index e9a4775a4..5a4b5b1a5 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp @@ -44,7 +44,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%> +
@@ -79,17 +79,14 @@
-
- <%-- Box Footer --%> -
+
+ -
- diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp index 1e957a52c..c6562eb64 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp @@ -13,10 +13,7 @@ -
- - <%-- Content Header --%>

@@ -30,9 +27,7 @@ key="labels.suggest_elevate_word_link_download" />

-
-
@@ -44,7 +39,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%> +
@@ -71,17 +66,14 @@
-
- <%-- Box Footer --%> -
+
+
- - diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp index b2b36bb1d..cc5b5790c 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp @@ -33,7 +33,6 @@
box-successbox-warning"> - <%-- Box Header --%>
@@ -41,7 +40,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%> +
<%-- Message --%>
diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp index f2974aed6..36c8153e4 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp @@ -24,7 +24,6 @@
- <%-- Box Header --%>
@@ -32,7 +31,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%> +
<%-- Message --%>
diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp index 8ba1b1679..e5f8d507b 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp @@ -13,10 +13,7 @@ -
- - <%-- Content Header --%>

@@ -30,13 +27,10 @@ key="labels.suggest_elevate_word_link_upload" />

-
-
- <%-- Box Header --%>
@@ -44,7 +38,7 @@ styleClass="btn btn-default btn-xs"> - +
- <%-- Box Body --%> +
@@ -80,17 +74,14 @@
-
- <%-- Box Footer --%> -
+
+
-
-
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 adc837dc3..4508a00f8 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 @@ -4,19 +4,15 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • \ No newline at end of file