diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index 770a6d521..404631d94 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -379,7 +379,7 @@ labels.enabled=Enabled labels.commit=Commit Index labels.server_rotation=Server Rotation labels.day_for_cleanup=Remove Index Before -labels.day=Day +labels.day=Day(s) labels.crawl_button_update=Update labels.none=None labels.commit_per_count=Commit per Document Size diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp index 65d6b518a..9701494c9 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.boost_document_rule_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.boost_document_rule_configuration" /> @@ -26,16 +27,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -43,7 +48,7 @@
    <%-- Form --%> - + @@ -84,21 +89,28 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    + <%-- Box Footer --%>
    diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp index 9770fc0f2..f610a95ed 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -88,66 +88,85 @@
    <%-- Form Fields --%>
    - - + +
    + +
    - - - - ${f:h(hn.label)} - - +
    + + + ${f:h(hn.label)} + + +
    - - +
    + +
    - - +
    + +
    - - + +
    + +
    - - - - ${f:h(rt.name)} - - +
    + + + ${f:h(rt.name)} + + +
    - - - - ${f:h(l.name)} - - +
    + + + ${f:h(l.name)} + + +
    - - - - - - - - - +
    + + + + + + + + +
    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 cf05abf4e..1718bad15 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 @@ -25,7 +25,7 @@
    <%-- Form --%> - + @@ -79,26 +79,35 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    + <%-- Box Footer --%>
    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 3c0d5b7a7..3c084a653 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 @@ -25,7 +25,7 @@
    <%-- Form --%> - + @@ -79,18 +79,23 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    + <%-- Box Footer --%>
    diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp index 0f965e5e8..81b0378d8 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -89,48 +89,63 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(item.label)} - - +
    + + + ${f:h(item.label)} + + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(item.label)} - - +
    + + + ${f:h(item.label)} + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp index d6d8201fc..b8899045b 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -87,104 +87,134 @@ - <%-- Form Fields --%> - <%-- Form Fields --%>
    - - + +
    + +
    - - + +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - + +
    + +
    - - +
    + +
    - - +
    + +
    - -
    +
    - - + +
    + +
    - - - - ${f:h(rt.name)} - - +
    + + + ${f:h(rt.name)} + + +
    - - - - ${f:h(l.name)} - - +
    + + + ${f:h(l.name)} + + +
    - - - - - - - - - +
    + + + + + + + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/general/index.jsp b/src/main/webapp/WEB-INF/view/admin/general/index.jsp index 9ae03ba43..0fea919cd 100644 --- a/src/main/webapp/WEB-INF/view/admin/general/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/general/index.jsp @@ -26,10 +26,10 @@
    <%-- Form --%> - +
    -
    +
    <%-- Box Header --%> <%-- Box Body --%>
    @@ -43,68 +43,91 @@ <%-- Form Fields --%>
    - - +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - - +
    + +
    - -
    +
    @@ -114,89 +137,106 @@
    - -
    - - +
    +
    + +
    - -
    +
    - -
    +
    - -
    +
    - - +
    + +
    - - +
    + +
    - -
    +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    +
    - -
    +
    @@ -209,40 +249,47 @@
    - - +
    + +
    - -
    +
    - -
    - - +
    +
    + +
    - -
    +
    -
    + <%-- Box Footer --%>
    - diff --git a/src/main/webapp/WEB-INF/view/admin/group/edit.jsp b/src/main/webapp/WEB-INF/view/admin/group/edit.jsp index cae487cab..e838dcd58 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -86,8 +86,11 @@ <%-- Form Fields --%>
    - - + +
    + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp index bdf0f3a98..df7a63e44 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -88,24 +88,32 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp index 652de3ca5..1c631799c 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -88,41 +88,53 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(rt.name)} - - +
    + + + ${f:h(rt.name)} + + +
    - - +
    + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp index 0df9e9f71..7bba0ee24 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -89,14 +89,18 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    <%-- Box Footer --%> diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp index d81ee0de6..b5bef9841 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp @@ -46,7 +46,7 @@
    <%-- Form --%> - + @@ -86,35 +86,45 @@
    <%-- Form Fields --%>
    - - + +
    + +
    - - +
    + +
    - - - - - - - - - - - - +
    + + + + + + + + + + + +
    - - +
    + +
    + <%-- Box Footer --%>
    diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp index 71bc62dde..cf99a2de4 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -89,23 +89,29 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(item.label)} - - +
    + + + ${f:h(item.label)} + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/role/edit.jsp b/src/main/webapp/WEB-INF/view/admin/role/edit.jsp index 6333cd230..efbdb4684 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -86,8 +86,11 @@ <%-- Form Fields --%>
    - - + +
    + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp index 471c2b206..ecde460da 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -89,14 +89,18 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    <%-- Box Footer --%> diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp index 7864c17f5..805626077 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp @@ -207,6 +207,7 @@ diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp index 05920c6e8..417fc6fdd 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -88,59 +88,80 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - -
    - - +
    +
    + +
    - - +
    + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp index 23dc2eb68..32c7c723e 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -98,9 +98,11 @@ <%-- Form Fields --%>
    - - +
    + +
    <%-- 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 f33c3d926..ef5fbc616 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -98,29 +98,39 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    <%-- Box Footer --%> diff --git a/src/main/webapp/WEB-INF/view/admin/user/edit.jsp b/src/main/webapp/WEB-INF/view/admin/user/edit.jsp index f3c8b99b3..b28782d10 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -86,43 +86,56 @@ <%-- Form Fields --%>
    - - - - - + +
    + + + + ${f:h(name)} - + +
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(l.name)} - - + +
    + + + ${f:h(l.name)} + + +
    - - - - ${f:h(l.name)} - - + +
    + + + ${f:h(l.name)} + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp index f99da2097..6393106ca 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -89,53 +89,70 @@ <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(item.label)} - - +
    + + + ${f:h(item.label)} + + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - - - ${f:h(item.label)} - - +
    + + + ${f:h(item.label)} + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp index 3476385f3..c6c2f4ed6 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp @@ -47,7 +47,7 @@
    <%-- Form --%> - + @@ -89,105 +89,139 @@ <%-- Form Fields --%>
    - - + +
    + +
    - - + +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - + +
    + +
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - -
    +
    - - + +
    + +
    - - - - ${f:h(rt.name)} - - +
    + + + ${f:h(rt.name)} + + +
    - - - - ${f:h(l.name)} - - +
    + + + ${f:h(l.name)} + + +
    - - - - - - - - - +
    + + + + + + + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp index 84fff1a9d..374a665ad 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp @@ -30,15 +30,17 @@
    - +
    + <%-- Box Header --%>

    + <%-- Box Body --%>
    <%-- Message: BEGIN --%> @@ -50,28 +52,40 @@
    <%-- Message: END --%> + <%-- Form Fields --%>
    - - +
    + +
    - - +
    + +
    - - +
    + +
    - - + +
    + +
    + + <%-- Box Footer --%>
    diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp index 4e396d36a..7df628af0 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp @@ -54,6 +54,7 @@
    diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp index dbdc3f5a9..470547881 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp @@ -56,15 +56,17 @@

    - +
    diff --git a/src/main/webapp/WEB-INF/view/login/index.jsp b/src/main/webapp/WEB-INF/view/login/index.jsp index c65f1fed5..3659b2405 100644 --- a/src/main/webapp/WEB-INF/view/login/index.jsp +++ b/src/main/webapp/WEB-INF/view/login/index.jsp @@ -70,7 +70,7 @@
    diff --git a/src/main/webapp/css/admin/style.css b/src/main/webapp/css/admin/style.css index 603824c7a..1300f77c4 100644 --- a/src/main/webapp/css/admin/style.css +++ b/src/main/webapp/css/admin/style.css @@ -12,4 +12,8 @@ .sidebar-mini.sidebar-collapse .main-header .logo>.logo-mini { font-size: 13px; +} + +button > i { + margin-right: 0.2em; } \ No newline at end of file