diff --git a/src/main/resources/fess_label.properties b/src/main/resources/fess_label.properties index c20a00bb4..207f6c1a4 100644 --- a/src/main/resources/fess_label.properties +++ b/src/main/resources/fess_label.properties @@ -173,7 +173,7 @@ labels.menu_crawl_config=General labels.menu_scheduled_job_config=Scheduled Job labels.menu_system_config=System labels.menu_document_config=Index -labels.menu_design=Design +labels.menu_design=Page Design labels.menu_dict=Dictionary labels.menu_data=Backup/Restore labels.menu_crawl=Crawler @@ -517,7 +517,7 @@ labels.crawling_session_link_details=Details labels.crawling_session_link_delete=Delete labels.crawling_session_prev_page=Prev labels.crawling_session_next_page=Next -labels.crawling_session_session_id_search=Session ID: +labels.crawling_session_session_id_search=Session ID labels.crawling_session_session_id=Session ID labels.crawling_session_name=Name labels.crawling_session_created_time=Created @@ -704,7 +704,7 @@ labels.key_match_title_confirm=Confirm Key Match labels.key_match_button_update=Update labels.key_match_button_delete=Delete labels.key_match_button_edit=Edit -labels.design_configuration=Design +labels.design_configuration=Page Design labels.design_title_file_upload=File Upload labels.design_title_file=File Manager labels.design_file=Upload File @@ -779,7 +779,7 @@ labels.wizard_button_skip=Skip labels.wizard_button_cancel=Cancel labels.wizard_button_back=Back labels.wizard_crawling_config_title=Crawling Configuration -labels.wizard_crawling_setting_title=Crawling Setting +labels.wizard_crawling_setting_title=Crawling Settings labels.wizard_crawling_config_name=Name labels.wizard_crawling_config_path=Crawling Path labels.wizard_button_register_again=Create again @@ -799,7 +799,7 @@ labels.wizard_start_crawler_title=Crawler labels.wizard_start_crawling_desc=To click "Start Crawling" button, you can start a crawling now. labels.wizard_button_start_crawling=Start Crawling labels.wizard_button_finish=Skip -labels.search_list_configuration=Search Result +labels.search_list_configuration=Search labels.search_list_index_page=Type a search query. labels.search_list_title_confirm_delete=Delete Confirmation labels.search_list_url=URL @@ -847,6 +847,7 @@ labels.failure_url_search_error_name=Type labels.failure_url_url=URL labels.failure_url_last_access_time=Last Access labels.failure_url_link_confirm=Confirm +labels.failure_url_delete_all_link=Delete All labels.failure_url_delete_all_confirmation=Do you want to delete all? labels.failure_url_error_count=Error Count labels.failure_url_title_confirm=Failure URL Details diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp index 7066b40d4..63a81f5b5 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.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" /> @@ -12,7 +13,7 @@ - +
<%-- Content Header --%> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,15 +95,18 @@ - + - + - + @@ -109,31 +116,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 84fa0c356..ba98ea32a 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp @@ -53,7 +53,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -75,7 +75,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -99,16 +99,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp index c8eb12762..9543b4277 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp @@ -30,7 +30,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -47,7 +47,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -55,7 +55,7 @@
    <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp index 71a0c8359..db5f3ecd1 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.crawling_session_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -49,7 +54,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -67,7 +72,8 @@

    - +
    @@ -77,9 +83,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -88,8 +92,10 @@

    ${f:h(urlExpr)}
    ${f:h(boostExpr)}
    ${f:h(sortOrder)}
    - - + @@ -109,18 +115,36 @@ <%-- Box Footer --%>
    - " /> + - " /> + - " /> - " /> + + - " /> - " /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp b/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp index 1b0ed210f..3ee8d4529 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawling_session_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.crawling_session_configuration" /> @@ -31,38 +32,44 @@
    -
    +
    <%-- Box Header --%>

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

    +

    @@ -70,28 +77,31 @@
    ${f:h(sessionId)} + ${f:h(sessionId)}
    - - - + + + - - + + - - + @@ -103,47 +113,55 @@
    - + + +
    <%-- Paging Info --%> - + <%-- Paging Navigation --%>
      - - + - -
    • class="active">${p} -
      • + +
    • class="active">${p}
      •  - - +
    diff --git a/src/main/webapp/WEB-INF/view/admin/data/index.jsp b/src/main/webapp/WEB-INF/view/admin/data/index.jsp index 058e2581c..e854287e3 100644 --- a/src/main/webapp/WEB-INF/view/admin/data/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/data/index.jsp @@ -1,5 +1,8 @@ -<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> + + + @@ -7,92 +10,89 @@ -
    +
    + + <%-- Message: BEGIN --%> +
    + +
    ${msg}
    +     + +
    + <%-- Message: END --%> + + +
    +

    + +

    +
    ${f:h(data.sessionId)} ${f:h(data.createdTime)} - - ${f:h(data.expiredTime)} + + + ${f:h(data.expiredTime)} - + - - + - -
    + + + + + + + + + + + + + + + + + + +
    + +
    + +
    + +
    + +
    +
    + + +
    +

    + +

    + + + + + + + + + + + + + + + + +
    +
    + +
    +
    +     - <%-- Message: BEGIN --%> -
    - -
    ${msg}
    -     -
    - <%-- Message: END --%> - - -
    -

    - - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    -
    -     - -
    -

    - - - - - - - - - - - - - - - - -
    - - - -
    - - - -
    - "/> -
    -
    -     - -
    diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp index de15d6918..0e24f67ce 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.data_crawling_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,10 +55,10 @@ - +
    -
    +
    <%-- Box Header --%>

    @@ -71,7 +76,8 @@

    - +
    @@ -81,41 +87,41 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%> - - - - + + + + + + - + - + - + @@ -123,44 +129,45 @@ - + + + ${f:h(rt.name)} + + - + - - + +
    ${f:h(id)}
    ${f:h(id)}
    ${f:h(name)}
    - + - ${f:h(hn.label)}
    + ${f:h(hn.label)}
     -     - -
    ${f:br(f:h(handlerParameter))}${f:br(f:h(handlerParameter))}
    ${f:br(f:h(handlerScript))}${f:br(f:h(handlerScript))}
    - - - - ${f:h(rt.name)}
    -     -     +     		+ + + ${f:h(rt.name)}
    +     - - - ${f:h(rt.name)} - - -
    - - + + - ${f:h(l.name)}
    + ${f:h(l.name)}
         -     - + ${f:h(l.name)} - -
    - - - + + + +
    @@ -169,31 +176,50 @@ <%-- 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 d57488b10..32e8e9e2c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.data_crawling_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.data_crawling_configuration" /> @@ -18,23 +19,27 @@ <%-- Content Header --%>

    - +

      2. -
      3. +
      4. -
      5. +
      6. -
      7. +
      8. -
      9. +
    @@ -50,10 +55,10 @@ - +
    -
    +
    <%-- Box Header --%>

    @@ -65,7 +70,8 @@

    - +
    @@ -75,9 +81,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -87,43 +91,54 @@
    - - - - ${f:h(hn.label)} - - + + + + ${f:h(hn.label)} + +
    - - + +
    - - + +
    - - + + ${f:h(rt.name)}
    - - + + ${f:h(l.name)}
    - + @@ -138,16 +153,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp index d8f6f371a..aecf1c048 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp b/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp index e2b0b77ba..626cc8eb6 100644 --- a/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp +++ b/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.design_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.design_configuration" /> @@ -21,22 +22,22 @@

    - -
    - + +
    +
    -
    - -
    ${msg}
    -     - -
    -
    + +
    ${msg}
    +     + +
    +
    +
    <%-- Box Header --%>
    -

    +

    @@ -53,96 +54,146 @@ } // --> - - - ${f:h(item)} - - +
    + + + ${f:h(item)} + + +
    <%-- Box Footer --%>
    - " /> - " /> + +
    -
    - - <%-- Box Header --%> -
    -

    - -

    -
    - <%-- Box Body --%> -
    - - - - - - - - - -
    - - - -
    - - - -
    -
    - <%-- Box Footer --%> -
    - " /> -
    -     -
    -
    +
    <%-- Box Header --%>
    -

    +

    <%-- Box Body --%>
    - - - - - - - - - - <%-- Error --%> - - - - - - - - +
    + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- Error --%> + + + + + + + + + + + + + + + + + + + + + + +
    <%-- Box Footer --%>
    - " /> - "> + + +
    +
    +
    + + <%-- Box Header --%> +
    +

    + +

    +
    + <%-- Box Body --%> +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + <%-- Box Footer --%> +
    + +
    +     +
    +
    +
    +
    - +
    diff --git a/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp b/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp index d4837064f..2cdab3313 100644 --- a/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.design_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.design_configuration" /> @@ -14,16 +15,16 @@
    - + <%-- Content Header --%>

    - +
    - +
    @@ -32,7 +33,7 @@
    -
    +
    <%-- Box Header --%> @@ -45,13 +46,20 @@

    ${f:h(fileName)}

    - +
    <%-- Box Footer --%>
    - " /> - " /> + +
    @@ -59,7 +67,7 @@
    - +
    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 ed75b4133..2d3bd294d 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/index.jsp @@ -26,7 +26,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -38,7 +38,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -47,7 +47,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp index cfff1f3b0..bcb809876 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/confirm.jsp @@ -2,197 +2,214 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_kuromoji_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

    -
      -
    1. - -
      2. - -
      3. -       - -
      4. -       - -
      5. -       - -
      6. -       -
    -
    - -
    - - <%-- Form --%> - - - - - - -
    -
    -
    - <%-- Box Header --%> -
    -

    + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. + +
      2. - +
      3. - +
      4. - +
      5. - +
      6. -

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

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

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    + + <%-- Form Fields --%> + + + + + + + + + + + + + + + + + + + +
    ${f:h(token)}
    ${f:h(segmentation)}
    ${f:h(reading)}
    ${f:h(pos)}
    +
    + + <%-- Box Footer --%> +
    + + + + + + + + + + + + + + + + + +
    +
    - -
    + - <%-- Form Fields --%> - - - - - - - - - - - - - - - - - - - -
    ${f:h(token)}
    ${f:h(segmentation)}
    ${f:h(reading)}
    ${f:h(pos)}
    -
    + +
    - <%-- Box Footer --%> -
    - - " /> - " - /> - - - " /> - " - /> - - - " /> - " - /> - - - " /> - " - /> - " - /> - -
    -
    -
    -
    - - - -
    - - +

    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 618cb5fc5..32ea6b876 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 @@ -2,110 +2,106 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_kuromoji_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

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

    + +

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

    - -

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

    + +

    +
    + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    + + <%-- Edit Form: BEGIN --%> + +
    + + + + + + + + +
    ${f:h(path)} + +
    +
    +     + <%-- Edit Form: END --%> + +
    +
    - -
    - <%-- Edit Form: BEGIN --%> - -
    - - - - - - - - -
    ${f:h(path)} - " /> -
    -
    -     - <%-- Edit Form: BEGIN --%> - -
    -
    -
    +
    - -
    - - +
    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 c143430cc..201577545 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 @@ -2,153 +2,160 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_kuromoji_configuration" /> -
    - - - - - -
    +
    + + + + + +
    - <%-- Content Header --%> -
    -

    - -

    -
    + <%-- Content Header --%> +
    +

    + +

    +
    -
    +
    - <%-- Form --%> - - - - - - -
    -
    -
    - <%-- Box Header --%> -
    -

    - - + <%-- Form --%> + + + + + - - - -

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

    + + + + + + +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    - <%-- Form Fields --%> -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - <%-- Box Footer --%> -
    - - " /> - " - /> - - - " /> - " - /> - -
    -
    -
    -
    - + <%-- Form Fields --%> +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + <%-- Box Footer --%> +
    + + + + + + + + +
    +
    +
    +
    +     -
    +
    +
    + +
    - - -
    - + 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 d4c713bfa..e974358c1 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 @@ -2,150 +2,149 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_kuromoji_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

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

    + +

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

    - -

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

    + +

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

    + +

    +     + + + + + + + + + + + + + + + + + +
    ${f:h(data.token)}${f:h(data.reading)}
    +     +
    + <%-- Box Footer --%> +
    + <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
      + + + + + + + +
    • class="active">${p}
      • +       + + + + + + +
    + +
    +
    - -
    - <%-- List --%> - -

    - -

    -     - - - - - - - - - - - - - - - - - -
    - -
    ${f:h(data.token)}${f:h(data.reading)}
    -     -
    - <%-- Box Footer --%> -
    - <%-- Paging Info --%> - - <%-- Paging Navigation --%> -
      - - - - - - - -
    • class="active">${p} -
      • -       - - - - - - -
    - -
    -
    -
    +
    - -
    - - +
    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 6de40afc3..5e5d5b3db 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 @@ -2,121 +2,114 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_kuromoji_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_kuromoji_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

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

    + +

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

    - -

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

    + +

    +
    + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    + + <%-- Edit Form: BEGIN --%> + +
    + + + + + + + + + + + + + + + + +
    ${f:h(filename)}
    + +
    +
    +     + <%-- Edit Form: END --%> + +
    +
    - -
    - <%-- Edit Form: BEGIN --%> - -
    - - - - - - - - - - - - - - - - -
    ${f:h(filename)}
    - - - -
    - " /> -
    -
    -     - <%-- Edit Form: BEGIN --%> - -
    -
    -
    +
    - -
    - - +
    diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp index c7a42654c..7a0a4231d 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/confirm.jsp @@ -2,190 +2,205 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_synonym_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

    -
      -
    1. - -
      2. - -
      3. -       - -
      4. -       - -
      5. -       - -
      6. -       -
    -
    - -
    - - <%-- Form --%> - - - - - - -
    -
    -
    - <%-- Box Header --%> -
    -

    + <%-- Content Header --%> +
    +

    + +

    +
      +
    1. + +
      2. - +
      3. - +
      4. - +
      5. - +
      6. -

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

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

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    + + <%-- Form Fields --%> + + + + + + + + + + + +
    ${f:br(f:h(inputs))}
    ${f:br(f:h(outputs))}
    +
    + + <%-- Box Footer --%> +
    + + + + + + + + + + + + + + + + + +
    +
    - -
    + - <%-- Form Fields --%> - - - - - - - - - - - -
    - - ${f:br(f:h(inputs))}
    ${f:br(f:h(outputs))}
    -
    + +
    - <%-- Box Footer --%> -
    - - " /> - " - /> - - - " /> - " - /> - - - " /> - " - /> - - - " /> - " - /> - " - /> - -
    -
    -
    -
    - - - -
    - - +
    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 c91048ac3..501f64290 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 @@ -2,110 +2,106 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_synonym_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

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

    + +

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

    - -

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

    + +

    +
    + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    + + <%-- Edit Form: BEGIN --%> + +
    + + + + + + + + +
    ${f:h(path)} + +
    +
    +     + <%-- Edit Form: BEGIN --%> + +
    +
    - -
    - <%-- Edit Form: BEGIN --%> - -
    - - - - - - - - -
    ${f:h(path)} - " /> -
    -
    -     - <%-- 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 d7f54f3ce..39d8195e8 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 @@ -2,145 +2,152 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_synonym_configuration" /> -
    - - - - - -
    +
    + + + + + +
    - <%-- Content Header --%> -
    -

    - -

    -
    + <%-- Content Header --%> +
    +

    + +

    +
    -
    +
    - <%-- Form --%> - - - - - - -
    -
    -
    - <%-- Box Header --%> -
    -

    - - + <%-- Form --%> + + + + + - - - -

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

    + + + + + + +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    - <%-- Form Fields --%> -
    - - -
    -
    - - -
    -
    - <%-- Box Footer --%> -
    - - " /> - " - /> - - - " /> - " - /> - -
    -
    -
    -
    - + <%-- Form Fields --%> +
    + + +
    +
    + + +
    +
    + <%-- Box Footer --%> +
    + + + + + + + + +
    +
    +
    +
    +     -
    +
    +
    + +
    - - -
    - + 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 8a48e7f5b..80ed8fff2 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 @@ -2,145 +2,148 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_synonym_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

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

    + +

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

    - -

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

    + +

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

    + +

    +     + + + + + + + + + + + + + + + + +
    ${f:h(data.inputs)}${f:h(data.outputs)}
    +     +
    + <%-- Box Footer --%> +
    + <%-- Paging Info --%> + + + <%-- Paging Navigation --%> +
      + + + + + + + +
    • class="active">${p}
      • +       + + + + + + +
    + +
    +
    - -
    - <%-- List --%> - -

    - -

    -     - - - - - - - - - - - - - - - - -
    ${f:h(data.inputs)}${f:h(data.outputs)}
    -     -
    - <%-- Box Footer --%> -
    - <%-- Paging Info --%> - - <%-- Paging Navigation --%> -
      - - - - - - - -
    • class="active">${p} -
      • -       - - - - - - -
    - -
    -
    -
    +
    - -
    - - +
    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 7115699db..30ec2bd09 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 @@ -2,121 +2,114 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.dict_synonym_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.dict_synonym_configuration" />
    - - - - - + + + + + -
    +
    - <%-- Content Header --%> -
    -

    - -

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

    + +

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

    - -

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

    + +

    +
    + + + + + + + + + + + + + + + +
    +
    + <%-- Box Body --%> +
    + <%-- Message --%> +
    + +
    ${msg}
    +     + +
    + + <%-- Edit Form: BEGIN --%> + +
    + + + + + + + + + + + + + + + + +
    ${f:h(filename)}
    + +
    +
    +     + <%-- Edit Form: BEGIN --%> + +
    +
    - -
    - <%-- Edit Form: BEGIN --%> - -
    - - - - - - - - - - - - - - - - -
    ${f:h(filename)}
    - - - -
    - " /> -
    -
    -     - <%-- Edit Form: BEGIN --%> - -
    -
    -
    +
    - -
    - - +
    diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp index 90d1ee731..1b20dd3ce 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.failure_url_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -125,16 +129,19 @@ ${f:h(errorCount)} - + ${f:h(lastAccessTime)} - + ${f:h(webConfigName)} - + ${f:h(fileConfigName)} @@ -144,12 +151,25 @@ <%-- Box Footer --%>
    - " /> - " /> + + - " /> - " /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp index 05ef1f932..b97430cbd 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.failure_url_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.failure_url_configuration" /> @@ -31,57 +32,73 @@
    -
    +
    <%-- Box Header --%>

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

    +

    @@ -90,77 +107,83 @@ - + - +
    ${f:h(data.url)}
    ${f:h(data.lastAccessTimeForList)} - - + - - + - - +     -
    <%-- Box Footer --%>
    - - + + + +
    <%-- Paging Info --%> - + <%-- Paging Navigation --%>
      - - + - -
    • class="active">${p} -
      • + +
    • class="active">${p}
      •  - - +
    -
    diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp index 2d1883389..b67c23614 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.file_authentication_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,7 +95,8 @@ - + @@ -99,28 +104,34 @@ - - + - - + + - - + + - - + + - - + @@ -130,31 +141,50 @@ <%-- 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 714f7f969..e52749c78 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.file_authentication_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -53,7 +58,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -65,7 +70,8 @@

    - +
    @@ -75,48 +81,54 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - +
    - + - - ${f:h(item.label)} - + + ${f:h(item.label)} +
    - +
    - +
    - - + +
    - + - - ${f:h(item.label)} - + + ${f:h(item.label)} +
    @@ -124,16 +136,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp index 540745794..651478888 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp @@ -37,7 +37,7 @@ -
    +
    <%-- Box Header --%>

    @@ -54,7 +54,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -63,7 +63,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp index 6693718f5..694058d22 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.file_crawling_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,10 +55,10 @@ - +
    -
    +
    <%-- Box Header --%>

    @@ -71,7 +76,8 @@

    - +
    @@ -81,9 +87,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,10 +95,12 @@ <%-- Form Fields --%>

    ${f:h(hostname)}
    ${f:h(port)}
    - ${f:h(item.label)} + + ${f:h(item.label)}
    ${f:h(username)}${f:h(username)}
    ****** - ******
    ${f:br(f:h(parameters))}${f:br(f:h(parameters))}
    - ${f:h(item.label)} + + ${f:h(item.label)}
    - - - - + + + + + + @@ -105,23 +111,28 @@ - + - + - + - + - + @@ -129,15 +140,19 @@ - + - + - + @@ -145,44 +160,45 @@ - + + + ${f:h(rt.name)} + + - + - - + +
    ${f:h(id)}
    ${f:h(id)}
    ${f:h(name)}
    ${f:br(f:h(includedPaths))}${f:br(f:h(includedPaths))}
    ${f:br(f:h(excludedPaths))}${f:br(f:h(excludedPaths))}
    ${f:br(f:h(includedDocPaths))}${f:br(f:h(includedDocPaths))}
    ${f:br(f:h(excludedDocPaths))}${f:br(f:h(excludedDocPaths))}
    ${f:br(f:h(configParameter))}${f:br(f:h(configParameter))}
    ${f:h(maxAccessCount)}${f:h(maxAccessCount)}
    ${f:h(numOfThread)}${f:h(numOfThread)}
    ${f:h(intervalTime)}${f:h(intervalTime)} +
    - - - - ${f:h(rt.name)}
    -     -     +     		+ + + ${f:h(rt.name)}
    +     - - - ${f:h(rt.name)} - - -
    - - + + - ${f:h(l.name)}
    + ${f:h(l.name)}
         -     - + ${f:h(l.name)} - -
    - - - + + + +
    @@ -191,31 +207,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 c52358cb3..a67918815 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp @@ -53,7 +53,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -75,7 +75,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -168,16 +168,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp index 9d90dbbe3..aea2c3042 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    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 90f3f0db7..9ae03ba43 100644 --- a/src/main/webapp/WEB-INF/view/admin/general/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/general/index.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.crawler_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.crawler_configuration" /> @@ -28,189 +29,223 @@
    -
    +
    <%-- Box Header --%> <%-- Box Body --%>
    <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - - + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - - + +
    - -
    - - - ${f:h(item.label)} - - -
    + +
    + + + ${f:h(item.label)} + + +
    - -
    - - -
    + +
    + + +
    - -
    - -
    + +
    + +
    - -
    - -
    + +
    + +
    - -
    - -
    + +
    + +
    - - + +
    - - + +
    - -
    - -
    + +
    + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - -
    + +
    + +
    - -
    - - - - ${f:h(d)} - - - -
    + +
    + + + + + + ${f:h(d)} + + + +
    - - + +
    - -
    - -
    + +
    + +
    - -
    - - -
    + +
    + + +
    - -
    - -
    + +
    + +
    <%-- Box Footer --%>
    - " - /> +
    diff --git a/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp index 1b26c2927..250daf5a2 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.group_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,7 +55,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -68,7 +73,8 @@

    - +
    @@ -78,9 +84,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -89,7 +93,8 @@ - + @@ -99,33 +104,52 @@ <%-- 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 1d800750c..8cda79cd1 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.group_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,7 +55,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -62,7 +67,8 @@

    - +
    @@ -72,9 +78,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -89,16 +93,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/group/index.jsp b/src/main/webapp/WEB-INF/view/admin/group/index.jsp index e81134c5c..98929e95b 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp index be014c715..57c11ac4c 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.joblog_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.joblog_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -49,7 +54,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -67,7 +72,8 @@

    - +
    @@ -77,9 +83,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -88,7 +92,8 @@

    ${f:h(name)}
    - + @@ -113,11 +118,13 @@ - + - +
    ${f:h(jobName)}
    ${f:br(f:h(scriptData))}${f:br(f:h(scriptData))}
    ${f:br(f:h(scriptResult))}${f:br(f:h(scriptResult))}
    @@ -126,12 +133,25 @@ <%-- Box Footer --%>
    - " /> - " /> + + - " /> - " /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp index 1f89017eb..eddabb5a5 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -43,7 +43,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -52,7 +52,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp index 8e7444180..8bc47d038 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.key_match_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,7 +95,8 @@ - + @@ -113,31 +118,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 1b0c67909..49fef2ed6 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.key_match_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -64,7 +69,8 @@

    - +
    @@ -74,28 +80,30 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - +
    - +
    - +
    @@ -103,16 +111,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp index 9ccf53a6f..b9b8e4f30 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp index a1710f842..e88806577 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.labeltype_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,7 +95,8 @@

    ${f:h(term)}
    - + @@ -100,28 +105,29 @@ - + - + - + + + ${f:h(rt.name)} + + @@ -134,31 +140,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 ef28be1ef..2e2971c84 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp @@ -52,7 +52,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -74,7 +74,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -115,16 +115,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp index 3167954c3..96fcf10eb 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/log/index.jsp b/src/main/webapp/WEB-INF/view/admin/log/index.jsp index 21db42aca..6bc92a0a3 100644 --- a/src/main/webapp/WEB-INF/view/admin/log/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/log/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -43,7 +43,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp index 6f99eed41..2e109b3f8 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp @@ -53,7 +53,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -81,7 +81,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -106,31 +106,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 91af83a9b..6be551c8a 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.overlapping_host_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -53,7 +58,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -65,7 +70,8 @@

    - +
    @@ -75,37 +81,48 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - +
    - <%-- Box Footer --%> -
    - - " /> - " - /> - - - " /> - " - /> - + <%-- Box Footer --%> +
    + + + + + + + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp b/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp index 1b4e6dab4..993af2cd0 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp index 00f1c779e..9354e169b 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.path_mapping_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -47,12 +52,12 @@ - - + +
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -95,22 +99,18 @@

    - + - + @@ -122,31 +122,50 @@ <%-- 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 6ac537c58..8721a6f89 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp @@ -51,7 +51,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -73,7 +73,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -110,16 +110,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp b/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp index 31103412c..c9b155430 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp @@ -29,7 +29,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -46,7 +46,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -54,7 +54,7 @@
    <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp index cdbe19a1f..9169c9f7f 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.request_header_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +

    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,7 +95,8 @@

    ${f:h(name)}
    ${f:br(f:h(includedPaths))}${f:br(f:h(includedPaths))}
    ${f:br(f:h(excludedPaths))}${f:br(f:h(excludedPaths))}
    - - - - ${f:h(rt.name)}
    -     -     +     		+ + + ${f:h(rt.name)}
    +     - - - ${f:h(rt.name)} - - -
    ${f:h(replacement)}${f:h(replacement)}
    - + - - + - - + - - -
    - + @@ -99,9 +104,10 @@ - - + @@ -111,31 +117,50 @@ <%-- 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 4febc3908..b66103b82 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.request_header_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -53,7 +58,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -65,7 +70,8 @@

    - +
    @@ -75,28 +81,29 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - +
    - + - - ${f:h(item.label)} - + + ${f:h(item.label)} +
    @@ -104,16 +111,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp b/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp index ef0cf6f6c..866bdd81a 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp @@ -37,7 +37,7 @@ -
    +
    <%-- Box Header --%>

    @@ -54,7 +54,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -63,7 +63,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp index 1f7a17deb..a332a44f2 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.role_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,7 +55,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -68,7 +73,8 @@

    - +
    @@ -78,9 +84,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -99,33 +103,52 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> + <%-- - " - /> - --%> - " - /> + + --%> +
    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 794047f11..19acee0b9 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.role_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,7 +55,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -62,7 +67,8 @@

    - +
    @@ -72,9 +78,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -89,16 +93,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/role/index.jsp b/src/main/webapp/WEB-INF/view/admin/role/index.jsp index e36a86117..54cf5c1dc 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp index 0a7e960c9..cd9d9f2bb 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.roletype_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -53,7 +58,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -71,7 +76,8 @@

    - +
    @@ -81,9 +87,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -92,7 +96,8 @@

    ${f:h(name)}
    ${f:h(value)}
    - ${f:h(item.label)} + + ${f:h(item.label)}
    - + @@ -106,31 +111,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 7e85a96a2..b50658836 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.roletype_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -53,7 +58,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -65,7 +70,8 @@

    - +
    @@ -75,37 +81,48 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - +
    - <%-- Box Footer --%> -
    - - " /> - " - /> - - - " /> - " - /> - + <%-- Box Footer --%> +
    + + + + + + + + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp b/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp index c17af3e97..b821e8656 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    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 c29577bf0..4375fb8b3 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.scheduledjob_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.scheduledjob_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,8 +75,9 @@

    - - + +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,7 +95,8 @@

    ${f:h(name)}
    - + @@ -99,8 +104,10 @@ - - + + @@ -108,31 +115,32 @@ - + - + - + - + @@ -145,40 +153,61 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + + - " - /> + - " - /> +
    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 8dc4d1f64..cff833f02 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.scheduledjob_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.scheduledjob_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -64,7 +69,8 @@

    - +
    @@ -74,75 +80,92 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - - + +
    - - + +
    - - + +
    - - + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - -
    - - -
    + +
    + + +
    - +
    -
    -
    + <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp b/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp index 9d3b89174..19590c7b8 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp index 1934f3a61..e97d52373 100644 --- a/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp +++ b/src/main/webapp/WEB-INF/view/admin/searchlist/confirmDelete.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.search_list_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.search_list_configuration" /> @@ -33,11 +34,9 @@
    -
    +
    <%-- Box Header --%> -
    - -
    +
    <%-- Box Body --%>
    @@ -54,10 +53,16 @@

    - +
    ${f:h(name)}
    ${f:h(target)}
    ${f:h(cronExpression)}${f:h(cronExpression)}
    ${f:br(f:h(scriptData))}${f:br(f:h(scriptData))}
    - - - - + + + +
    - - - - + + + +
    - - - - + + + +
    " /> " /> + + +
    @@ -65,9 +70,7 @@
    <%-- Box Footer --%> -
    - -
    +
    diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp index c2a4d20fe..53e6e1746 100644 --- a/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.search_list_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.search_list_configuration" /> @@ -31,16 +32,24 @@
    -
    +
    <%-- Box Header --%>

    - -
    - - " name="search" /> + +
    + + +
    +
    +
    @@ -49,9 +58,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -61,9 +68,11 @@
    + <%--

    + --%>
    @@ -113,8 +122,8 @@
      @@ -130,11 +139,12 @@ -
    • disabled"> +
    • disabled"> - +
      • @@ -153,20 +163,17 @@

      - +

      - <%-- Box Footer --%> -
      - + <%-- Box Footer --%> +
    -
    diff --git a/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp index af3922e1b..f128df2c7 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_bad_word_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_bad_word_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,8 +95,10 @@ - - + +
    ${f:h(suggestWord)}${f:h(suggestWord)}
    @@ -101,31 +107,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 5df479ad6..1ea8b11ce 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp @@ -32,7 +32,7 @@
    -
    +
    <%-- Box Header --%>

    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 80fabb197..f6da341a6 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_bad_word_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_bad_word_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -64,17 +69,18 @@

    - + - - - - - - - - - + + + + + +
    @@ -83,32 +89,41 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    <%-- 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 245b4946a..b552a2df3 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -57,7 +57,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -66,7 +66,7 @@ <%-- List --%> -

    +

    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 4da99c603..a2c1334d4 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_bad_word_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_bad_word_configuration" /> @@ -24,7 +25,8 @@
    • -
    • +
    • @@ -32,24 +34,25 @@
    -
    +
    <%-- Box Header --%>

    - - - - - - - - - - - + + + + + + + +
    @@ -59,14 +62,18 @@ - + @@ -75,9 +82,7 @@ <%-- Box Footer --%> -
    - -
    +
    diff --git a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp index f6d629cdd..a92cca7a2 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_elevate_word_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,20 +95,26 @@
    - " /> +
    - - + + - + - + - - + + @@ -117,31 +127,50 @@ <%-- 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 7fee8e475..ac1684f8a 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp @@ -32,7 +32,7 @@
    -
    +
    <%-- Box Header --%>

    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 8c7c4ff09..fb6cb8564 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_elevate_word_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -64,17 +69,19 @@

    - + - - - - - - - - - + + + + + +
    @@ -83,48 +90,61 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Form Fields --%>
    - +
    - +
    - +
    - +
    - +
    <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    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 bda4a2cec..7ebae5059 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -57,7 +57,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -66,7 +66,7 @@ <%-- List --%> -

    +

    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 f8e04fe24..83268c189 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_elevate_word_configuration" /> @@ -24,7 +25,8 @@
    • -
    • +
    • @@ -32,24 +34,25 @@
    -
    +
    <%-- Box Header --%>

    - - - - - - - - - - - + + + + + + + +
    @@ -59,14 +62,19 @@

    ${f:h(suggestWord)}${f:h(suggestWord)}
    ${f:h(reading)}
    ${f:h(targetRole)}
    ${f:h(targetLabel)}${f:h(targetLabel)}
    - + @@ -75,9 +83,7 @@ <%-- Box Footer --%> -
    - -
    +
    diff --git a/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp b/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp index 0c3baa1d0..1249a17bd 100644 --- a/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/systeminfo/index.jsp @@ -25,8 +25,8 @@
    -
    -
    +
    +
    <%-- Box Header --%>

    @@ -35,13 +35,15 @@

    <%-- Box Body --%>
    - +
    -
    +
    +
    +
    <%-- Box Header --%>

    @@ -50,13 +52,17 @@

    <%-- Box Body --%>
    -
    -
    +
    +
    +
    +
    +
    <%-- Box Header --%>

    @@ -66,17 +72,19 @@ <%-- Box Body --%>
    - + -

    -
    +
    +
    +
    <%-- Box Header --%>

    @@ -85,7 +93,7 @@

    <%-- Box Body --%>
    - diff --git a/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp index 307d3a854..854684079 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.user_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,7 +55,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -68,7 +73,8 @@

    - +
    @@ -78,9 +84,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -93,38 +97,36 @@
    - - + + - - + +
    - " /> +
    ${f:h(name)}
    - - - - ${f:h(rt.name)}
    -     -     -     - - - ${f:h(rt.name)} - - -     		+ + + ${f:h(rt.name)}
    +     +     +     + + ${f:h(rt.name)} + +
    - - - - ${f:h(rt.name)}
    -     -     -     - - - ${f:h(rt.name)} - - -     		+ + + ${f:h(rt.name)}
    +     +     +     + + ${f:h(rt.name)} + +
    @@ -133,31 +135,50 @@ <%-- 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 676182b04..47f8ebdfa 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.user_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,7 +55,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -62,7 +67,8 @@

    - +
    @@ -72,9 +78,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,16 +95,20 @@
    - +
    - - + +
    - + ${f:h(l.name)} @@ -108,7 +116,8 @@
    - + ${f:h(l.name)} @@ -119,16 +128,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/user/index.jsp b/src/main/webapp/WEB-INF/view/admin/user/index.jsp index cbdcc668b..de7f96d38 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp index 099697108..2f6335732 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.web_authentication_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -52,7 +57,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -70,7 +75,8 @@

    - +
    @@ -80,9 +86,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,7 +95,8 @@ - + @@ -103,28 +108,34 @@ - - + - - + + - - + + - - + + - - + @@ -134,31 +145,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 225dce348..cdfdd669b 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp @@ -53,7 +53,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -75,7 +75,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -128,16 +128,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp index 0272ceac2..9a8b138ac 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp @@ -37,7 +37,7 @@ -
    +
    <%-- Box Header --%>

    @@ -54,7 +54,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -63,7 +63,7 @@ <%-- List --%> -

    +

    diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp index fca6f17f7..b1b242595 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.web_crawling_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,10 +55,10 @@ - +
    -
    +
    <%-- Box Header --%>

    @@ -71,7 +76,8 @@

    - +
    @@ -81,9 +87,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -91,10 +95,12 @@ <%-- Form Fields --%>

    ${f:h(hostname)}
    ${f:h(authRealm)}
    - ${f:h(item.label)} + + ${f:h(item.label)}
    ${f:h(username)}${f:h(username)}
    ****** - ******
    ${f:br(f:h(parameters))}${f:br(f:h(parameters))}
    - ${f:h(item.label)} + + ${f:h(item.label)}
    - - - - + + + + + + @@ -105,23 +111,28 @@ - + - + - + - + - + @@ -129,7 +140,8 @@ - + @@ -137,56 +149,60 @@ - + - + - - + + - - + + - - + +
    ${f:h(id)}
    ${f:h(id)}
    ${f:h(name)}
    ${f:br(f:h(includedUrls))}${f:br(f:h(includedUrls))}
    ${f:br(f:h(excludedUrls))}${f:br(f:h(excludedUrls))}
    ${f:br(f:h(includedDocUrls))}${f:br(f:h(includedDocUrls))}
    ${f:br(f:h(excludedDocUrls))}${f:br(f:h(excludedDocUrls))}
    ${f:br(f:h(configParameter))}${f:br(f:h(configParameter))}
    ${f:h(maxAccessCount)}${f:h(maxAccessCount)}
    ${f:h(numOfThread)}${f:h(numOfThread)}
    ${f:h(intervalTime)}${f:h(intervalTime)} +
    ${f:h(boost)}
    - - - - ${f:h(rt.name)}
    -     -     -     - - - ${f:h(rt.name)} - - -     		+ + + ${f:h(rt.name)}
    +     +     +     + + ${f:h(rt.name)} + +
    - - - - ${f:h(l.name)}
    -     -     -     - - - ${f:h(l.name)} - - -     		+ + + ${f:h(l.name)}
    +     +     +     + + ${f:h(l.name)} + +
    - - - + + + +
    @@ -195,31 +211,50 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> + + - " /> - " - /> - " - /> + + +
    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 6e0498bcf..c641ff83c 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.web_crawling_configuration" /> @@ -25,16 +26,20 @@ -
    • +
    • -
    • +
    • -
    • +
    • -
    • +
    • @@ -50,10 +55,10 @@ - +
    -
    +
    <%-- Box Header --%>

    @@ -65,7 +70,8 @@

    - +
    @@ -75,9 +81,7 @@ <%-- Message --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -89,26 +93,36 @@
    - +
    - - + +
    - - + +
    - - + +
    - - + +
    - +
    @@ -116,19 +130,23 @@
    - +
    - +
    - +
    - +
    @@ -139,23 +157,28 @@
    - - + + ${f:h(rt.name)}
    - - + + ${f:h(l.name)}
    - + @@ -170,16 +193,26 @@ <%-- Box Footer --%>
    - " /> - " - /> + + - " /> - " - /> + +
    diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp index 5a0766317..6ed6434dc 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp @@ -31,7 +31,7 @@
    -
    +
    <%-- Box Header --%>

    @@ -48,7 +48,7 @@ <%-- Message --%>
    -
    +
    ${msg}
    @@ -57,7 +57,7 @@ <%-- List --%> -

    +

    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 9a9dcd9b8..84fff1a9d 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/crawlingConfig.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.wizard_title_configuration" /> @@ -22,7 +23,8 @@
    • -
    • +
    • @@ -31,7 +33,7 @@
    -
    +

    @@ -42,24 +44,27 @@ <%-- Message: BEGIN --%>
    -
    - ${msg} -
    +
    ${msg}
    <%-- Message: END --%>
    - - + +
    - - + +
    - +
    @@ -68,13 +73,20 @@

    - " /> " - /> " - /> " - /> + + +
    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 6af9f51dd..4e396d36a 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/index.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.wizard_title_configuration" /> @@ -30,7 +31,7 @@
    -
    +

    @@ -40,9 +41,7 @@ <%-- Message: BEGIN --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -52,9 +51,11 @@

    - " - /> +
    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 0dd19a0cc..dbdc3f5a9 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/startCrawling.jsp @@ -2,7 +2,8 @@ -<la:message key="labels.admin_brand_title"/> | <la:message key="labels.wizard_title_configuration" /> +<la:message key="labels.admin_brand_title" /> | <la:message + key="labels.wizard_title_configuration" /> @@ -23,7 +24,8 @@
    • -
    • +
    • @@ -33,17 +35,17 @@
    -
    +
    -

    +

    + +

    <%-- Message: BEGIN --%>
    -
    - ${msg} -
    +
    ${msg}
    @@ -54,10 +56,15 @@

    - " /> " - /> + +