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 f113693ede47cb565fc617417be9c5b0ce274326..45d2f8519e1fbd0f3b67c2eea0240b6c34003ce2 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.boost_document_rule_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/boostdocumentrule"> - <la:message key="labels.boost_document_rule_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/boostdocumentrule" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.boost_document_rule_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 77ee233d25f4c08276cac6937bbb1decbf0b3ded..65d6b518a55214fe6054ad59acb83547ab2ade0a 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/edit.jsp @@ -65,11 +65,11 @@ <la:message key="labels.boost_document_rule_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/boostdocumentrule"> - <la:message key="labels.boost_document_rule_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/boostdocumentrule" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.boost_document_rule_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 9543b42770306adcdfb5ebdc3fa3d00b4f33d22f..0ffbe7d02dae83eed9068a2e60bf2403edec6ee5 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.boost_document_rule_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.boost_document_rule_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -12,7 +13,7 @@ <jsp:param name="menuCategoryType" value="crawl" /> <jsp:param name="menuType" value="boostDocumentRule" /> </jsp:include> - + <div class="content-wrapper"> <%-- Content Header --%> <section class="content-header"> @@ -36,10 +37,10 @@ <h3 class="box-title"> <la:message key="labels.boost_document_rule_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.boost_document_rule_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.boost_document_rule_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -47,9 +48,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -63,12 +62,15 @@ <table class="table table-bordered table-striped"> <thead> <tr> - <th><la:message key="labels.boost_document_rule_list_url_expr" /></th> + <th><la:message + key="labels.boost_document_rule_list_url_expr" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${boostDocumentRuleItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/boostdocumentrule/confirmpage/4/${f:u(data.id)}"> + <c:forEach var="data" varStatus="s" + items="${boostDocumentRuleItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/boostdocumentrule/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.urlExpr)}</td> </tr> </c:forEach> @@ -80,31 +82,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(boostDocumentRulePager.currentPageNumber)}" - arg1="${f:h(boostDocumentRulePager.allPageCount)}" arg2="${f:h(boostDocumentRulePager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(boostDocumentRulePager.currentPageNumber)}" + arg1="${f:h(boostDocumentRulePager.allPageCount)}" + arg2="${f:h(boostDocumentRulePager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${boostDocumentRulePager.existPrePage}"> - <li class="prev"><la:link href="list/${boostDocumentRulePager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${boostDocumentRulePager.currentPageNumber - 1}"> <la:message key="labels.boost_document_rule_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!boostDocumentRulePager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.boost_document_rule_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.boost_document_rule_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${boostDocumentRulePager.pageNumberList}"> - <li <c:if test="${p == boostDocumentRulePager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${boostDocumentRulePager.pageNumberList}"> + <li + <c:if test="${p == boostDocumentRulePager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${boostDocumentRulePager.existNextPage}"> - <li class="next"><la:link href="list/${boostDocumentRulePager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${boostDocumentRulePager.currentPageNumber + 1}"> <la:message key="labels.boost_document_rule_link_next_page" /> </la:link></li> </c:if> <c:if test="${!boostDocumentRulePager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.boost_document_rule_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.boost_document_rule_link_next_page" /></a></li> </c:if> </ul> @@ -112,7 +121,7 @@ </div> </div> </div> - + </section> </div> 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 ea2c8016299d628db90d9c6ca1dbc2f2bb1e107c..f5e3532843a23a5a1e24924cf92bee8c6bafb8f6 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/confirm.jsp @@ -72,11 +72,11 @@ <la:message key="labels.crawling_session_link_details" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/crawlingsession"> - <la:message key="labels.crawling_session_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/crawlingsession" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.crawling_session_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 fb14af5b81523fc7126c99a99a2f6035dd7b34d5..4dbd6cc3e20452ec2e91f3c95e18b8c99c8a2551 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp @@ -15,7 +15,6 @@ </jsp:include> <div class="content-wrapper"> - <%-- Content Header --%> <section class="content-header"> <h1> @@ -27,9 +26,7 @@ </la:link></li> </ol> </section> - <section class="content"> - <div class="row"> <div class="col-md-12"> <div class="box box-primary"> @@ -41,24 +38,6 @@ </div> <%-- Box Body --%> <div class="box-body"> - <la:form styleClass="form-inline"> - <div class="form-group"> - <label for="sessionIdSearchBtn"><la:message - key="labels.crawling_session_session_id_search" /></label> - <la:text styleId="sessionIdSearchBtn" - property="sessionId" styleClass="form-control"></la:text> - </div> - <div class="form-group"> - <button type="submit" class="btn btn-primary" name="search" - value="<la:message key="labels.crawling_session_search" />"> - <la:message key="labels.crawling_session_search" /> - </button> - <button type="submit" class="btn btn-secondary" name="reset" - value="<la:message key="labels.crawling_session_reset" />"> - <la:message key="labels.crawling_session_reset" /> - </button> - </div> - </la:form> <%-- Message --%> <div> <la:info id="msg" message="true"> @@ -66,36 +45,62 @@ </la:info> <la:errors /> </div> - - <%-- List --%> - <c:if test="${crawlingSessionPager.allRecordCount == 0}"> - <p class="callout callout-info"> - <la:message key="labels.list_could_not_find_crud_table" /> - </p> - </c:if> - <c:if test="${crawlingSessionPager.allRecordCount > 0}"> - <table class="table table-bordered table-striped"> - <thead> - <tr> - <th><la:message - key="labels.crawling_session_session_id" /></th> - <th><la:message - key="labels.crawling_session_created_time" /></th> - </tr> - </thead> - <tbody> - <c:forEach var="data" varStatus="s" - items="${crawlingSessionItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" - data-href="${contextPath}/admin/crawlingsession/confirmpage/4/${f:u(data.id)}"> - <td>${f:h(data.sessionId)}</td> - <td><fmt:formatDate value="${fe:date(data.createdTime)}" pattern="yyyy-MM-dd'T'HH:mm:ss" /></td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - + <div class="row"> + <div class="col-sm-12"> + <la:form styleClass="form-inline"> + <div class="form-group"> + <label for="sessionIdSearchBtn"><la:message + key="labels.crawling_session_session_id_search" /></label> + <la:text styleId="sessionIdSearchBtn" property="sessionId" + styleClass="form-control"></la:text> + </div> + <div class="form-group"> + <button type="submit" class="btn btn-primary" name="search" + value="<la:message key="labels.crawling_session_search" />"> + <la:message key="labels.crawling_session_search" /> + </button> + <button type="submit" class="btn btn-secondary" name="reset" + value="<la:message key="labels.crawling_session_reset" />"> + <la:message key="labels.crawling_session_reset" /> + </button> + </div> + </la:form> + </div> + </div> + <div class="row"> + <div class="col-sm-12"> + <%-- List --%> + <c:if test="${crawlingSessionPager.allRecordCount == 0}"> + <p class="callout callout-info"> + <la:message key="labels.list_could_not_find_crud_table" /> + </p> + </c:if> + <c:if test="${crawlingSessionPager.allRecordCount > 0}"> + <table class="table table-bordered table-striped"> + <thead> + <tr> + <th><la:message + key="labels.crawling_session_session_id" /></th> + <th><la:message + key="labels.crawling_session_created_time" /></th> + </tr> + </thead> + <tbody> + <c:forEach var="data" varStatus="s" + items="${crawlingSessionItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/crawlingsession/confirmpage/4/${f:u(data.id)}"> + <td>${f:h(data.sessionId)}</td> + <td><fmt:formatDate + value="${fe:date(data.createdTime)}" + pattern="yyyy-MM-dd'T'HH:mm:ss" /></td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + </div> + </div> </div> <%-- Box Footer --%> <div class="box-footer"> 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 2bfbccc485bd1143bc1118a15b94b1ae9201d58b..8110c7fee3edff770109e7f3ecf27d90bd0d2517 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/confirm.jsp @@ -76,11 +76,11 @@ <la:message key="labels.data_crawling_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/dataconfig"> - <la:message key="labels.data_crawling_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/dataconfig" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.data_crawling_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 cd935345b9640a8b4147ab5e289469e0a91983bb..9770fc0f2cc41628bccadedbf02d461d4b745be6 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/edit.jsp @@ -70,11 +70,11 @@ <la:message key="labels.data_crawling_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/dataconfig"> - <la:message key="labels.data_crawling_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/dataconfig" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.data_crawling_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 aecf1c0485d29bd2e1a777ba6ff84ea3d3f47f08..e2ca517c315df265bc8fcc96d1eda5a04561dbad 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/index.jsp @@ -37,10 +37,11 @@ <h3 class="box-title"> <la:message key="labels.data_crawling_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.data_crawling_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.data_crawling_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> 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 626cc8eb6569c8027c7f02c4737b6d985120800b..840213b7323f402f7c5e4bfb6f0f023537f968e3 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 @@ -182,7 +182,7 @@ </div> <%-- Box Footer --%> <div class="box-footer"> - <button type="submit" class="btn btn-success" name="update" + <button type="submit" class="btn btn-success" name="upload" value="<la:message key="labels.design_button_upload" />"> <la:message key="labels.design_button_upload" /> </button> @@ -190,8 +190,6 @@ </la:form> </div> </div> - <div class="col-md-6"> - </div> </div> </section> 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 9ef431bab57144e7a30a5b07e971b2d022beb791..b9fa0f9d7eb73678c4aff4192ea86005ce58b4da 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 @@ -22,7 +22,7 @@ <la:message key="labels.dict_kuromoji_title" /> </h1> <ol class="breadcrumb"> - <li><la:link href="list"> + <li><la:link href="list/1?dictId=${f:u(dictId)}"> <la:message key="labels.dict_kuromoji_list_link" /> </la:link></li> <c:if test="${crudMode == 1}"> @@ -73,49 +73,27 @@ <la:message key="labels.dict_kuromoji_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="../list"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/1?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_list_link" /> - </la:link> - </span> - <c:if test="${crudMode == 1}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_create" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 2}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_update" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 3}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_delete" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 4}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_confirm" /> - </a> - </span> - </c:if> - <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_download" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="../" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/1?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_create" /> + </la:link> + <la:link href="downloadpage/${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 32ea6b8768bb375b5e72d858042ac0461a0f985f..770f7e334034aa37d4ef2c6ef24d63aedd3e09c9 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 @@ -38,27 +38,25 @@ <h3 class="box-title"> <la:message key="labels.dict_kuromoji_link_download" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="/admin/dict/"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/0/?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="createpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_create" /> - </la:link> - </span> <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_download" /> - </a> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/0/?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-create btn-xs"> + <la:message key="labels.dict_kuromoji_link_create" /> + </la:link> + <la:link href="#" styleClass="btn btn-primary btn-xs disabled"> + <la:message key="labels.dict_kuromoji_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 15b3f1d85e5345b889ed18f3a839e6dbb5033c8e..cf05abf4ee4643d2e35768ac9d5e3d4e52d0c70d 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 @@ -45,49 +45,26 @@ <la:message key="labels.dict_kuromoji_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="../list"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/1?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_list_link" /> - </la:link> - </span> - <c:if test="${crudMode == 1}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_create" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 2}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_update" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 3}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_delete" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 4}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_confirm" /> - </a> - </span> - </c:if> - <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_download" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="../" styleClass="btn btn-default btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/1?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_create" /> + </la:link> + <la:link href="downloadpage/${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 e974358c1ee7bbfc7022611103801af9515d3bfe..3dac33283154f4a82d9d4737358634d83744eae6 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 @@ -38,27 +38,27 @@ <h3 class="box-title"> <la:message key="labels.dict_kuromoji_list_link" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="/admin/dict/"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_list_link" /> - </a> - </span> <span class="label label-default"> <la:link - href="createpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_create" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_download" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/1?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_create" /> + </la:link> + <la:link href="downloadpage/${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_kuromoji_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 5e5d5b3db84762b23832ac0e9f8314c0b9ba5819..095c6ef6eff5933066babaf7b0498227ad5a2a98 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 @@ -38,27 +38,25 @@ <h3 class="box-title"> <la:message key="labels.dict_kuromoji_link_upload" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="/admin/dict/"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/0/?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="createpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_create" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_kuromoji_link_download" /> - </la:link> - </span> <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_kuromoji_link_upload" /> - </a> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/0/?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-create btn-xs"> + <la:message key="labels.dict_kuromoji_link_create" /> + </la:link> + <la:link href="#" styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_kuromoji_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs disabled"> + <la:message key="labels.dict_kuromoji_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 42cb9a3a7e4ce2a2c0d2dab891986372acd82d23..23986ebcb43cf3bb09cdd36b1d8aa8d6b151a0be 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 @@ -22,7 +22,7 @@ <la:message key="labels.dict_synonym_title" /> </h1> <ol class="breadcrumb"> - <li><la:link href="list"> + <li><la:link href="list/1?dictId=${f:u(dictId)}"> <la:message key="labels.dict_synonym_list_link" /> </la:link></li> <c:if test="${crudMode == 1}"> @@ -73,49 +73,27 @@ <la:message key="labels.dict_synonym_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="../list"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/1?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_synonym_list_link" /> - </la:link> - </span> - <c:if test="${crudMode == 1}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_create" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 2}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_update" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 3}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_delete" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 4}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_confirm" /> - </a> - </span> - </c:if> - <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_download" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/1?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_create" /> + </la:link> + <la:link href="downloadpage/${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 501f642901d150c5e03a7555822bbd2127686776..7670fec85d4cf38ffae600e0b5f0ff7b62313a78 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 @@ -38,27 +38,25 @@ <h3 class="box-title"> <la:message key="labels.dict_synonym_link_download" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="/admin/dict/"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/0/?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_synonym_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="createpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_create" /> - </la:link> - </span> <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_download" /> - </a> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/0/?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-create btn-xs"> + <la:message key="labels.dict_synonym_link_create" /> + </la:link> + <la:link href="#" styleClass="btn btn-primary btn-xs disabled"> + <la:message key="labels.dict_synonym_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 ea166cbd64669a8a4cf843b3211dd2976c5b7243..3c0d5b7a72768a6fc78b017ae430a3ffbe88ce84 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 @@ -45,49 +45,26 @@ <la:message key="labels.dict_synonym_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="../list"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/1?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_synonym_list_link" /> - </la:link> - </span> - <c:if test="${crudMode == 1}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_create" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 2}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_update" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 3}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_delete" /> - </a> - </span> - </c:if> - <c:if test="${crudMode == 4}"> - <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_confirm" /> - </a> - </span> - </c:if> - <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_download" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="../" styleClass="btn btn-default btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/1?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_create" /> + </la:link> + <la:link href="downloadpage/${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 80ed8fff255adabe0a63720c3cf08f23c74bd599..760582d1e77dbccf1ea9c734ea2c6d75b5334069 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 @@ -38,27 +38,27 @@ <h3 class="box-title"> <la:message key="labels.dict_synonym_list_link" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="/admin/dict/"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_list_link" /> - </a> - </span> <span class="label label-default"> <la:link - href="createpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_create" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_download" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="uploadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_upload" /> - </la:link> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/1?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_create" /> + </la:link> + <la:link href="downloadpage/${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.dict_synonym_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 30ec2bd0985d72e108bf6b94fa79c6511ddc0529..9f3a5907fbdb3a9214bad5bea3e801a8b39628c5 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 @@ -38,27 +38,25 @@ <h3 class="box-title"> <la:message key="labels.dict_synonym_link_upload" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"> <la:link - href="/admin/dict/"> - <la:message key="labels.dict_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="list/0/?dictId=${f:u(dictId)}"> - <la:message key="labels.dict_synonym_list_link" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="createpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_create" /> - </la:link> - </span> <span class="label label-default"> <la:link - href="downloadpage/${f:u(dictId)}"> - <la:message key="labels.dict_synonym_link_download" /> - </la:link> - </span> <span class="label label-default"> <a href="#"> <la:message - key="labels.dict_synonym_link_upload" /> - </a> - </span> + <div class="btn-group pull-right"> + <la:link href="/admin/dict" styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_list_link" /> + </la:link> + <la:link href="list/0/?dictId=${f:u(dictId)}" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_list_link" /> + </la:link> + <la:link href="createpage/${f:u(dictId)}" + styleClass="btn btn-create btn-xs"> + <la:message key="labels.dict_synonym_link_create" /> + </la:link> + <la:link href="#" styleClass="btn btn-primary btn-xs"> + <la:message key="labels.dict_synonym_link_download" /> + </la:link> + <la:link href="uploadpage/${f:u(dictId)}" + styleClass="btn btn-success btn-xs disabled"> + <la:message key="labels.dict_synonym_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 35feba11bddb03cfd7a531c274698e9555791de9..c6224ce458febd757e9c09226b0cc02b6c15712a 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.failure_url_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/failureurl"> - <la:message key="labels.failure_url_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/failureurl" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.failure_url_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 b97430cbdea04e0384403ab901d3abdb377009a3..038c255a263cf23d044f87ea8b71627587aa0ddc 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp @@ -44,7 +44,7 @@ <la:form styleClass="form-horizontal"> <div class="form-group"> <label for="searchParams.url" - class="col-sm-2 form-control-label"><la:message + class="col-sm-2 control-label"><la:message key="labels.failure_url_search_url" /></label> <div class="col-sm-10"> <la:text property="searchParams.url" @@ -53,7 +53,7 @@ </div> <div class="form-group row"> <label for="searchParams.errorCountMin" - class="col-sm-2 form-control-label"><la:message + class="col-sm-2 control-label"><la:message key="labels.failure_url_search_error_count" /></label> <div class="col-xs-2"> <la:text property="searchParams.errorCountMin" size="2" @@ -67,7 +67,7 @@ </div> <div class="form-group"> <label for="searchParams.errorName" - class="col-sm-2 form-control-label"><la:message + class="col-sm-2 control-label"><la:message key="labels.failure_url_search_error_name" /></label> <div class="col-sm-10"> <la:text property="searchParams.errorName" @@ -131,24 +131,28 @@ </div> <%-- Box Footer --%> <div class="box-footer"> - <div class="span12 center"> - <script> - <!-- - function confirmToDeleteAll() { - if (confirm('<la:message key="labels.failure_url_delete_all_confirmation"/>')) { - return true; - } else { - return false; - } - } - // --> - </script> - <la:link href="deleteall" - onclick="return confirmToDeleteAll();" - styleClass="btn btn-danger"> - <la:message key="labels.failure_url_delete_all_link" /> - </la:link> - </div> + <c:if test="${failureUrlPager.allRecordCount != 0}"> + <div class="row"> + <div class="col-md-12"> + <script> + <!-- + function confirmToDeleteAll() { + if (confirm('<la:message key="labels.failure_url_delete_all_confirmation"/>')) { + return true; + } else { + return false; + } + } + // --> + </script> + <la:link href="deleteall" + onclick="return confirmToDeleteAll();" + styleClass="btn btn-danger"> + <la:message key="labels.failure_url_delete_all_link" /> + </la:link> + </div> + </div> + </c:if> <%-- Paging Info --%> <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(failureUrlPager.currentPageNumber)}" 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 37d245298c21aeb0a8bf6b11e43b8e669f50b26e..272c9c3a70998d867eb68c77007aabac045e8929 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.file_authentication_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/fileauthentication"> - <la:message key="labels.file_authentication_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/fileauthentication" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.file_authentication_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 d431efc687426956490f763342cd0db09f013a78..0f965e5e86903471fc3695ae922dc0678fd516df 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/edit.jsp @@ -70,11 +70,11 @@ <la:message key="labels.file_authentication_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/fileauthentication"> - <la:message key="labels.file_authentication_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/fileauthentication" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.file_authentication_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 65147888812985c44bfab4907f54eb45c0b264fd..c00ff8955c0f4c2b8a710623b864714c960a9934 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauthentication/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.file_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -43,10 +44,10 @@ <h3 class="box-title"> <la:message key="labels.file_authentication_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.file_authentication_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.file_authentication_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -54,9 +55,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -71,23 +70,25 @@ <table class="table table-bordered table-striped"> <thead> <tr> - <th><la:message key="labels.file_authentication_list_hostname" /></th> - <th><la:message key="labels.file_authentication_list_file_crawling_config" /></th> + <th><la:message + key="labels.file_authentication_list_hostname" /></th> + <th><la:message + key="labels.file_authentication_list_file_crawling_config" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${fileAuthenticationItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/fileauthentication/confirmpage/4/${f:u(data.id)}"> - <td><c:if test="${data.hostname==null||data.hostname==''}"> + <c:forEach var="data" varStatus="s" + items="${fileAuthenticationItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/fileauthentication/confirmpage/4/${f:u(data.id)}"> + <td><c:if + test="${data.hostname==null||data.hostname==''}"> <la:message key="labels.file_authentication_any" /> - </c:if> - ${f:h(data.hostname)}: - <c:if test="${data.port==-1}"> + </c:if> ${f:h(data.hostname)}: <c:if test="${data.port==-1}"> <la:message key="labels.file_authentication_any" /> </c:if> <c:if test="${data.port!=-1}"> ${f:h(data.port)} - </c:if> - </td> + </c:if></td> <td>${f:h(data.fileConfig.name)}</td> </tr> </c:forEach> @@ -99,31 +100,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(fileAuthenticationPager.currentPageNumber)}" - arg1="${f:h(fileAuthenticationPager.allPageCount)}" arg2="${f:h(fileAuthenticationPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(fileAuthenticationPager.currentPageNumber)}" + arg1="${f:h(fileAuthenticationPager.allPageCount)}" + arg2="${f:h(fileAuthenticationPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${fileAuthenticationPager.existPrePage}"> - <li class="prev"><la:link href="list/${fileAuthenticationPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${fileAuthenticationPager.currentPageNumber - 1}"> <la:message key="labels.file_authentication_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!fileAuthenticationPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.file_authentication_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.file_authentication_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${fileAuthenticationPager.pageNumberList}"> - <li <c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${fileAuthenticationPager.pageNumberList}"> + <li + <c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${fileAuthenticationPager.existNextPage}"> - <li class="next"><la:link href="list/${fileAuthenticationPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${fileAuthenticationPager.currentPageNumber + 1}"> <la:message key="labels.file_authentication_link_next_page" /> </la:link></li> </c:if> <c:if test="${!fileAuthenticationPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.file_authentication_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.file_authentication_link_next_page" /></a></li> </c:if> </ul> 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 728ea1e0b7b2437a1015e9cf12e1ccd15fc4d425..f175d138ad8861ecb680a2692ff5a5a0f68ce590 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/confirm.jsp @@ -76,11 +76,11 @@ <la:message key="labels.file_crawling_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/fileconfig"> - <la:message key="labels.file_crawling_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/fileconfig" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.file_crawling_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 9cc5d18f8aeec609ec720b1d5e57cfa715cac787..d6d8201fc7a31cf69f180b782da3bf2c44ae9cae 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/edit.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.file_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -25,16 +26,20 @@ <la:message key="labels.file_crawling_link_list" /> </la:link></li> <c:if test="${crudMode == 1}"> - <li class="active"><a href="#"><la:message key="labels.file_crawling_link_create" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.file_crawling_link_create" /></a></li> </c:if> <c:if test="${crudMode == 2}"> - <li class="active"><a href="#"><la:message key="labels.file_crawling_link_update" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.file_crawling_link_update" /></a></li> </c:if> <c:if test="${crudMode == 3}"> - <li class="active"><a href="#"><la:message key="labels.file_crawling_link_delete" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.file_crawling_link_delete" /></a></li> </c:if> <c:if test="${crudMode == 4}"> - <li class="active"><a href="#"><la:message key="labels.file_crawling_link_confirm" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.file_crawling_link_confirm" /></a></li> </c:if> </ol> </section> @@ -50,7 +55,7 @@ </c:if> <la:hidden property="createdBy" /> <la:hidden property="createdTime" /> - <la:hidden property="sortOrder"/> + <la:hidden property="sortOrder" /> <div class="row"> <div class="col-md-12"> <div @@ -65,10 +70,11 @@ <la:message key="labels.file_crawling_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/fileconfig"> - <la:message key="labels.file_crawling_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/fileconfig" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.file_crawling_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -76,9 +82,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -92,26 +96,36 @@ </div> <div class="form-group"> <label for="paths"><la:message key="labels.paths" /></label> - <la:textarea property="paths" styleClass="form-control" rows="5" /> + <la:textarea property="paths" styleClass="form-control" + rows="5" /> </div> <div class="form-group"> - <label for="includedPaths"><la:message key="labels.included_paths" /></label> - <la:textarea property="includedPaths" styleClass="form-control" rows="5" /> + <label for="includedPaths"><la:message + key="labels.included_paths" /></label> + <la:textarea property="includedPaths" + styleClass="form-control" rows="5" /> </div> <div class="form-group"> - <label for="excludedPaths"><la:message key="labels.excluded_paths" /></label> - <la:textarea property="excludedPaths" styleClass="form-control" rows="5" /> + <label for="excludedPaths"><la:message + key="labels.excluded_paths" /></label> + <la:textarea property="excludedPaths" + styleClass="form-control" rows="5" /> </div> <div class="form-group"> - <label for="includedDocPaths"><la:message key="labels.included_doc_paths" /></label> - <la:textarea property="includedDocPaths" styleClass="form-control" rows="5" /> + <label for="includedDocPaths"><la:message + key="labels.included_doc_paths" /></label> + <la:textarea property="includedDocPaths" + styleClass="form-control" rows="5" /> </div> <div class="form-group"> - <label for="excludedDocPaths"><la:message key="labels.excluded_doc_paths" /></label> - <la:textarea property="excludedDocPaths" styleClass="form-control" rows="5" /> + <label for="excludedDocPaths"><la:message + key="labels.excluded_doc_paths" /></label> + <la:textarea property="excludedDocPaths" + styleClass="form-control" rows="5" /> </div> <div class="form-group"> - <label for="configParameter"><la:message key="labels.config_parameter" /></label> + <label for="configParameter"><la:message + key="labels.config_parameter" /></label> <la:text property="configParameter" styleClass="form-control" /> </div> <div class="form-group"> @@ -119,15 +133,18 @@ <la:text property="depth" styleClass="form-control" /> </div> <div class="form-group"> - <label for="maxAccessCount"><la:message key="labels.max_access_count" /></label> + <label for="maxAccessCount"><la:message + key="labels.max_access_count" /></label> <la:text property="maxAccessCount" styleClass="form-control" /> </div> <div class="form-group"> - <label for="numOfThread"><la:message key="labels.number_of_thread" /></label> + <label for="numOfThread"><la:message + key="labels.number_of_thread" /></label> <la:text property="numOfThread" styleClass="form-control" /> </div> <div class="form-group"> - <label for="intervalTime"><la:message key="labels.interval_time" /></label> + <label for="intervalTime"><la:message + key="labels.interval_time" /></label> <div class="form-inline"> <la:text property="intervalTime" styleClass="form-control" /> <la:message key="labels.millisec" /> @@ -138,23 +155,28 @@ <la:text property="boost" styleClass="form-control" /> </div> <div class="form-group"> - <label for="roleTypeIds"><la:message key="labels.role_type" /></label> - <la:select property="roleTypeIds" multiple="true" styleClass="form-control"> + <label for="roleTypeIds"><la:message + key="labels.role_type" /></label> + <la:select property="roleTypeIds" multiple="true" + styleClass="form-control"> <c:forEach var="rt" varStatus="s" items="${roleTypeItems}"> <la:option value="${f:u(rt.id)}">${f:h(rt.name)}</la:option> </c:forEach> </la:select> </div> <div class="form-group"> - <label for="roleTypeIds"><la:message key="labels.label_type" /></label> - <la:select property="labelTypeIds" multiple="true" styleClass="form-control"> + <label for="roleTypeIds"><la:message + key="labels.label_type" /></label> + <la:select property="labelTypeIds" multiple="true" + styleClass="form-control"> <c:forEach var="l" varStatus="s" items="${labelTypeItems}"> <la:option value="${f:u(l.id)}">${f:h(l.name)}</la:option> </c:forEach> </la:select> </div> <div class="form-group"> - <label for="available"><la:message key="labels.available" /></label> + <label for="available"><la:message + key="labels.available" /></label> <la:select property="available" styleClass="form-control"> <la:option value="true"> <la:message key="labels.enabled" /> 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 aea2c30421076a407e9392f57771fed0905e7412..6d96b62b6d539c2205668cc67a22fefd7ea596d0 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.file_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.file_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.file_crawling_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.file_crawling_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.file_crawling_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,16 +69,17 @@ </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${fileConfigItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/fileconfig/confirmpage/4/${f:u(data.id)}"> + <c:forEach var="data" varStatus="s" + items="${fileConfigItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/fileconfig/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> - <td style="text-align: center;"> - <c:if test="${data.available=='true'}"> + <td style="text-align: center;"><c:if + test="${data.available=='true'}"> <la:message key="labels.enabled" /> </c:if> <c:if test="${data.available=='false'}"> <la:message key="labels.disabled" /> - </c:if> - </td> + </c:if></td> </tr> </c:forEach> </tbody> @@ -90,31 +90,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(fileConfigPager.currentPageNumber)}" - arg1="${f:h(fileConfigPager.allPageCount)}" arg2="${f:h(fileConfigPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(fileConfigPager.currentPageNumber)}" + arg1="${f:h(fileConfigPager.allPageCount)}" + arg2="${f:h(fileConfigPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${fileConfigPager.existPrePage}"> - <li class="prev"><la:link href="list/${fileConfigPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${fileConfigPager.currentPageNumber - 1}"> <la:message key="labels.file_crawling_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!fileConfigPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.file_crawling_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.file_crawling_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${fileConfigPager.pageNumberList}"> - <li <c:if test="${p == fileConfigPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${fileConfigPager.pageNumberList}"> + <li + <c:if test="${p == fileConfigPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${fileConfigPager.existNextPage}"> - <li class="next"><la:link href="list/${fileConfigPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${fileConfigPager.currentPageNumber + 1}"> <la:message key="labels.file_crawling_link_next_page" /> </la:link></li> </c:if> <c:if test="${!fileConfigPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.file_crawling_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.file_crawling_link_next_page" /></a></li> </c:if> </ul> 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 285107806430f020785cb3ee9cc9917531c88d19..97c575c5762e09b2da0b1707e71ddaa045607c7c 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/confirm.jsp @@ -73,11 +73,11 @@ <la:message key="labels.group_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/group"> - <la:message key="labels.group_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/group" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.group_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 f22ae544d709c5e7a42e4fef1543d359b18126d5..cae487cabe2f61cd26dc6828a38106617e7a2b01 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/edit.jsp @@ -67,11 +67,11 @@ <la:message key="labels.group_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/group"> - <la:message key="labels.group_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/group" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.group_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 98929e95bf9c9c2f5d23bc5cec5512adb06d3fb5..4c3c4fc78fd4b147bc9bc91f964db2aa97d7751c 100644 --- a/src/main/webapp/WEB-INF/view/admin/group/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/group/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.group_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.group_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.group_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.group_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.group_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,7 +69,8 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${groupItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/group/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/group/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> </tr> </c:forEach> @@ -82,31 +82,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(groupPager.currentPageNumber)}" - arg1="${f:h(groupPager.allPageCount)}" arg2="${f:h(groupPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(groupPager.currentPageNumber)}" + arg1="${f:h(groupPager.allPageCount)}" + arg2="${f:h(groupPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${groupPager.existPrePage}"> - <li class="prev"><la:link href="list/${groupPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${groupPager.currentPageNumber - 1}"> <la:message key="labels.group_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!groupPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.group_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.group_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${groupPager.pageNumberList}"> - <li <c:if test="${p == groupPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${groupPager.pageNumberList}"> + <li + <c:if test="${p == groupPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${groupPager.existNextPage}"> - <li class="next"><la:link href="list/${groupPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${groupPager.currentPageNumber + 1}"> <la:message key="labels.group_link_next_page" /> </la:link></li> </c:if> <c:if test="${!groupPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.group_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.group_link_next_page" /></a></li> </c:if> </ul> 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 fa591c29c7ffce7b78033ca48cfc2b0a9f15ec04..b8cc4aa9b9a946eec43eba70dfb909a136550d94 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/confirm.jsp @@ -72,11 +72,11 @@ <la:message key="labels.joblog_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/joblog"> - <la:message key="labels.joblog_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/joblog" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.joblog_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 6f52b69381c21949fc9c8fd96514e62800739540..bc86234ba0bb817ac07d777004ed5673387a3f87 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.key_match_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/keymatch"> - <la:message key="labels.key_match_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/keymatch" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.key_match_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 f3aaecfa653194c83ab2352233bf58829fd7ecd1..bdf0f3a98fd18a0295cdcb871508677d4eaeb15d 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/edit.jsp @@ -69,11 +69,11 @@ <la:message key="labels.key_match_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/keymatch"> - <la:message key="labels.key_match_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/keymatch" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.key_match_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 b9b8e4f30f7b8b3726f4592f7c1b8ffad14d4709..cc63467161eb2396387b79d9dd5d37b1eff3fd20 100644 --- a/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/keymatch/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.key_match_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.key_match_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.key_match_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.key_match_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.key_match_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -71,7 +70,8 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${keyMatchItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/keymatch/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/keymatch/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.term)}</td> <td style="overflow-x: auto;">${f:h(data.query)}</td> </tr> @@ -84,31 +84,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(keyMatchPager.currentPageNumber)}" - arg1="${f:h(keyMatchPager.allPageCount)}" arg2="${f:h(keyMatchPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(keyMatchPager.currentPageNumber)}" + arg1="${f:h(keyMatchPager.allPageCount)}" + arg2="${f:h(keyMatchPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${keyMatchPager.existPrePage}"> - <li class="prev"><la:link href="list/${keyMatchPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${keyMatchPager.currentPageNumber - 1}"> <la:message key="labels.key_match_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!keyMatchPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.key_match_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.key_match_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${keyMatchPager.pageNumberList}"> - <li <c:if test="${p == keyMatchPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${keyMatchPager.pageNumberList}"> + <li + <c:if test="${p == keyMatchPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${keyMatchPager.existNextPage}"> - <li class="next"><la:link href="list/${keyMatchPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${keyMatchPager.currentPageNumber + 1}"> <la:message key="labels.key_match_link_next_page" /> </la:link></li> </c:if> <c:if test="${!keyMatchPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.key_match_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.key_match_link_next_page" /></a></li> </c:if> </ul> 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 0af31ccd4e89fd8f400a4cd3b0281b83a7281b03..9763fbc9977df5af6e775124953e32897271c348 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.labeltype_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/labeltype"> - <la:message key="labels.labeltype_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/labeltype" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.labeltype_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 4ebaf55c9184ed42e4e1e9b895926f6a3cf00408..652de3ca5efd7464907be4386ec54df0309fda63 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/edit.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.labeltype_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -25,16 +26,20 @@ <la:message key="labels.labeltype_link_list" /> </la:link></li> <c:if test="${crudMode == 1}"> - <li class="active"><a href="#"><la:message key="labels.labeltype_link_create" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.labeltype_link_create" /></a></li> </c:if> <c:if test="${crudMode == 2}"> - <li class="active"><a href="#"><la:message key="labels.labeltype_link_update" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.labeltype_link_update" /></a></li> </c:if> <c:if test="${crudMode == 3}"> - <li class="active"><a href="#"><la:message key="labels.labeltype_link_delete" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.labeltype_link_delete" /></a></li> </c:if> <c:if test="${crudMode == 4}"> - <li class="active"><a href="#"><la:message key="labels.labeltype_link_confirm" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.labeltype_link_confirm" /></a></li> </c:if> </ol> </section> @@ -64,10 +69,11 @@ <la:message key="labels.labeltype_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/labeltype"> - <la:message key="labels.labeltype_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/labeltype" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.labeltype_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -75,40 +81,47 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> <%-- Form Fields --%> <div class="form-group"> - <label for="name"><la:message key="labels.labeltype_name" /></label> + <label for="name"><la:message + key="labels.labeltype_name" /></label> <la:text property="name" styleClass="form-control" /> </div> <div class="form-group"> - <label for="paths"><la:message key="labels.labeltype_value" /></label> + <label for="paths"><la:message + key="labels.labeltype_value" /></label> <la:text property="value" styleClass="form-control" /> </div> <div class="form-group"> - <label for="includedPaths"><la:message key="labels.labeltype_included_paths" /></label> - <la:textarea property="includedPaths" styleClass="form-control" rows="5" /> + <label for="includedPaths"><la:message + key="labels.labeltype_included_paths" /></label> + <la:textarea property="includedPaths" + styleClass="form-control" rows="5" /> </div> <div class="form-group"> - <label for="excludedPaths"><la:message key="labels.labeltype_excluded_paths" /></label> - <la:textarea property="excludedPaths" styleClass="form-control" rows="5" /> + <label for="excludedPaths"><la:message + key="labels.labeltype_excluded_paths" /></label> + <la:textarea property="excludedPaths" + styleClass="form-control" rows="5" /> </div> <div class="form-group"> - <label for="roleTypeIds"><la:message key="labels.role_type" /></label> - <la:select property="roleTypeIds" multiple="true" styleClass="form-control"> + <label for="roleTypeIds"><la:message + key="labels.role_type" /></label> + <la:select property="roleTypeIds" multiple="true" + styleClass="form-control"> <c:forEach var="rt" varStatus="s" items="${roleTypeItems}"> <la:option value="${f:u(rt.id)}">${f:h(rt.name)}</la:option> </c:forEach> </la:select> </div> <div class="form-group"> - <label for="sortOrder"><la:message key="labels.sortOrder" /></label> + <label for="sortOrder"><la:message + key="labels.sortOrder" /></label> <la:text property="sortOrder" styleClass="form-control" /> </div> </div> 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 96fcf10ebafef6dac554d3ece1f0998519de4c72..0c16d04332aeb4370243b9c7892cfe45931c80be 100644 --- a/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/labeltype/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.labeltype_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.labeltype_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.labeltype_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.labeltype_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.labeltype_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,7 +69,8 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${labelTypeItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/labeltype/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/labeltype/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> </tr> </c:forEach> @@ -82,31 +82,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(labelTypePager.currentPageNumber)}" - arg1="${f:h(labelTypePager.allPageCount)}" arg2="${f:h(labelTypePager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(labelTypePager.currentPageNumber)}" + arg1="${f:h(labelTypePager.allPageCount)}" + arg2="${f:h(labelTypePager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${labelTypePager.existPrePage}"> - <li class="prev"><la:link href="list/${labelTypePager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${labelTypePager.currentPageNumber - 1}"> <la:message key="labels.labeltype_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!labelTypePager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.labeltype_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.labeltype_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${labelTypePager.pageNumberList}"> - <li <c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${labelTypePager.pageNumberList}"> + <li + <c:if test="${p == labelTypePager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${labelTypePager.existNextPage}"> - <li class="next"><la:link href="list/${labelTypePager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${labelTypePager.currentPageNumber + 1}"> <la:message key="labels.labeltype_link_next_page" /> </la:link></li> </c:if> <c:if test="${!labelTypePager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.labeltype_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.labeltype_link_next_page" /></a></li> </c:if> </ul> 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 0ef44bbda6144cd075e91a04b8fc6511bf9b1bd2..f9aaa4e6f9b2f51e25304afb7b902efadd79c629 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/confirm.jsp @@ -71,10 +71,11 @@ <la:message key="labels.overlapping_host_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/overlappinghost"> - <la:message key="labels.overlapping_host_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/overlappinghost" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.overlapping_host_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 02fb32128340a4f6d42153e9cc284a1c97f9d473..0df9e9f7190ce23e14c4f1075dbcc790ebac2102 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/edit.jsp @@ -70,11 +70,11 @@ <la:message key="labels.overlapping_host_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/overlappinghost"> - <la:message key="labels.overlapping_host_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/overlappinghost" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.overlapping_host_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 993af2cd0912eb32b5a9f7bbc4cd1e844b7ac671..ed293cff4be506ddf6722d5b74f75fd027e2dc2b 100644 --- a/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/overlappinghost/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.overlapping_host_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.overlapping_host_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.overlapping_host_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.overlapping_host_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.overlapping_host_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,8 +69,10 @@ </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${overlappingHostItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/overlappinghost/confirmpage/4/${f:u(data.id)}"> + <c:forEach var="data" varStatus="s" + items="${overlappingHostItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/overlappinghost/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.regularName)}</td> <td>${f:h(data.overlappingName)}</td> </tr> @@ -84,31 +85,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(overlappingHostPager.currentPageNumber)}" - arg1="${f:h(overlappingHostPager.allPageCount)}" arg2="${f:h(overlappingHostPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(overlappingHostPager.currentPageNumber)}" + arg1="${f:h(overlappingHostPager.allPageCount)}" + arg2="${f:h(overlappingHostPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${overlappingHostPager.existPrePage}"> - <li class="prev"><la:link href="list/${overlappingHostPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${overlappingHostPager.currentPageNumber - 1}"> <la:message key="labels.overlapping_host_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!overlappingHostPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.overlapping_host_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.overlapping_host_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${overlappingHostPager.pageNumberList}"> - <li <c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${overlappingHostPager.pageNumberList}"> + <li + <c:if test="${p == overlappingHostPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${overlappingHostPager.existNextPage}"> - <li class="next"><la:link href="list/${overlappingHostPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${overlappingHostPager.currentPageNumber + 1}"> <la:message key="labels.overlapping_host_link_next_page" /> </la:link></li> </c:if> <c:if test="${!overlappingHostPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.overlapping_host_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.overlapping_host_link_next_page" /></a></li> </c:if> </ul> 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 a5487384b9052894c899a6622fda92224f7bc99c..5848a0f863d24cb507ee75fd71b5646a81c24854 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.path_mapping_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/pathmapping"> - <la:message key="labels.path_mapping_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/pathmapping" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.path_mapping_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 9b601e2e7f169993f6f321336152b789a970725a..d81ee0de6f9f1c8b18e3ea30de76391c50c291f9 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/edit.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.path_mapping_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -12,7 +13,7 @@ <jsp:param name="menuCategoryType" value="crawl" /> <jsp:param name="menuType" value="pathMapping" /> </jsp:include> - + <div class="content-wrapper"> <%-- Content Header --%> <section class="content-header"> @@ -20,21 +21,25 @@ <la:message key="labels.path_mapping_title_details" /> </h1> <ol class="breadcrumb"> - + <li><la:link href="/admin/pathmapping"> <la:message key="labels.path_mapping_link_list" /> </la:link></li> <c:if test="${crudMode == 1}"> - <li class="active"><a href="#"><la:message key="labels.path_mapping_link_create" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.path_mapping_link_create" /></a></li> </c:if> <c:if test="${crudMode == 2}"> - <li class="active"><a href="#"><la:message key="labels.path_mapping_link_update" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.path_mapping_link_update" /></a></li> </c:if> <c:if test="${crudMode == 3}"> - <li class="active"><a href="#"><la:message key="labels.path_mapping_link_delete" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.path_mapping_link_delete" /></a></li> </c:if> <c:if test="${crudMode == 4}"> - <li class="active"><a href="#"><la:message key="labels.path_mapping_link_confirm" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.path_mapping_link_confirm" /></a></li> </c:if> </ol> </section> @@ -63,10 +68,11 @@ <la:message key="labels.path_mapping_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/pathmapping"> - <la:message key="labels.path_mapping_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/pathmapping" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.path_mapping_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -74,9 +80,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -86,25 +90,28 @@ <la:text property="regex" styleClass="form-control" /> </div> <div class="form-group"> - <label for="replacement"><la:message key="labels.replacement" /></label> + <label for="replacement"><la:message + key="labels.replacement" /></label> <la:text property="replacement" styleClass="form-control" /> </div> <div class="form-group"> - <label for="processType"><la:message key="labels.processType" /></label> - <la:select property="processType" styleClass="form-control"> - <la:option value="C"> - <la:message key="labels.path_mapping_pt_crawling" /> - </la:option> - <la:option value="D"> - <la:message key="labels.path_mapping_pt_displaying" /> - </la:option> - <la:option value="B"> - <la:message key="labels.path_mapping_pt_both" /> - </la:option> - </la:select> - </div> + <label for="processType"><la:message + key="labels.processType" /></label> + <la:select property="processType" styleClass="form-control"> + <la:option value="C"> + <la:message key="labels.path_mapping_pt_crawling" /> + </la:option> + <la:option value="D"> + <la:message key="labels.path_mapping_pt_displaying" /> + </la:option> + <la:option value="B"> + <la:message key="labels.path_mapping_pt_both" /> + </la:option> + </la:select> + </div> <div class="form-group"> - <label for="sortOrder"><la:message key="labels.sortOrder" /></label> + <label for="sortOrder"><la:message + key="labels.sortOrder" /></label> <la:text property="sortOrder" styleClass="form-control" /> </div> </div> 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 c9b1554302fa2cb8eea7a1523a791749ae355499..3c81e1984d6a620ed0f863a024521bc3ffc8f19b 100644 --- a/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/pathmapping/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.path_mapping_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.path_mapping_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -12,7 +13,7 @@ <jsp:param name="menuCategoryType" value="crawl" /> <jsp:param name="menuType" value="pathMapping" /> </jsp:include> - + <div class="content-wrapper"> <%-- Content Header --%> <section class="content-header"> @@ -35,10 +36,10 @@ <h3 class="box-title"> <la:message key="labels.path_mapping_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.path_mapping_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.path_mapping_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -46,9 +47,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -67,8 +66,10 @@ </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${pathMappingItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/pathmapping/confirmpage/4/${f:u(data.id)}"> + <c:forEach var="data" varStatus="s" + items="${pathMappingItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/pathmapping/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.regex)}</td> <td>${f:h(data.replacement)}</td> </tr> @@ -80,40 +81,47 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(pathMappingPager.currentPageNumber)}" - arg1="${f:h(pathMappingPager.allPageCount)}" arg2="${f:h(pathMappingPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(pathMappingPager.currentPageNumber)}" + arg1="${f:h(pathMappingPager.allPageCount)}" + arg2="${f:h(pathMappingPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${pathMappingPager.existPrePage}"> - <li class="prev"><la:link href="list/${pathMappingPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${pathMappingPager.currentPageNumber - 1}"> <la:message key="labels.path_mapping_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!pathMappingPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.path_mapping_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.path_mapping_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${pathMappingPager.pageNumberList}"> - <li <c:if test="${p == pathMappingPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${pathMappingPager.pageNumberList}"> + <li + <c:if test="${p == pathMappingPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${pathMappingPager.existNextPage}"> - <li class="next"><la:link href="list/${pathMappingPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${pathMappingPager.currentPageNumber + 1}"> <la:message key="labels.path_mapping_link_next_page" /> </la:link></li> </c:if> <c:if test="${!pathMappingPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.path_mapping_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.path_mapping_link_next_page" /></a></li> </c:if> </ul> </div> </div> </div> </div> - + </section> - </div> + </div> <jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include> </div> <jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include> 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 8456cf6c07caf365f26891a30dfa309f75ee0a8c..1cac31be348ff650cbeb436845ca402713ec790b 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.request_header_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/requestheader"> - <la:message key="labels.request_header_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/requestheader" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.request_header_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 9173869de2bd1a62da646a36e6950b1a4b17e007..71bc62ddeafe284cdbc1683c4b0172d69fdcfb94 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/edit.jsp @@ -70,11 +70,11 @@ <la:message key="labels.request_header_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/requestheader"> - <la:message key="labels.request_header_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/requestheader" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.request_header_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 866bdd81a0c35a33d2172be1dfc7f2ba75accce5..6bf16f8f8de8ecccdade920043f08e0d06eecd99 100644 --- a/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/requestheader/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.request_header_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.request_header_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -43,10 +44,10 @@ <h3 class="box-title"> <la:message key="labels.request_header_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.request_header_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.request_header_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -54,9 +55,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -72,16 +71,19 @@ <thead> <tr> <th><la:message key="labels.request_header_list_name" /></th> - <th><la:message key="labels.request_header_list_web_crawling_config" /></th> + <th><la:message + key="labels.request_header_list_web_crawling_config" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${requestHeaderItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/requestheader/confirmpage/4/${f:u(data.id)}"> - <td>${f:h(data.name)}</td> - <td>${f:h(data.webConfig.name)}</td> - </tr> - </c:forEach> + <c:forEach var="data" varStatus="s" + items="${requestHeaderItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/requestheader/confirmpage/4/${f:u(data.id)}"> + <td>${f:h(data.name)}</td> + <td>${f:h(data.webConfig.name)}</td> + </tr> + </c:forEach> </tbody> </table> </c:if> @@ -90,31 +92,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(requestHeaderPager.currentPageNumber)}" - arg1="${f:h(requestHeaderPager.allPageCount)}" arg2="${f:h(requestHeaderPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(requestHeaderPager.currentPageNumber)}" + arg1="${f:h(requestHeaderPager.allPageCount)}" + arg2="${f:h(requestHeaderPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${requestHeaderPager.existPrePage}"> - <li class="prev"><la:link href="list/${requestHeaderPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${requestHeaderPager.currentPageNumber - 1}"> <la:message key="labels.request_header_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!requestHeaderPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.request_header_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.request_header_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${requestHeaderPager.pageNumberList}"> - <li <c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${requestHeaderPager.pageNumberList}"> + <li + <c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${requestHeaderPager.existNextPage}"> - <li class="next"><la:link href="list/${requestHeaderPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${requestHeaderPager.currentPageNumber + 1}"> <la:message key="labels.request_header_link_next_page" /> </la:link></li> </c:if> <c:if test="${!requestHeaderPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.request_header_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.request_header_link_next_page" /></a></li> </c:if> </ul> 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 68e2d5188056df550994901e0ac782e415d23779..27451ee75ac11e354f1dcc29aeea5daa5aaf8126 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/confirm.jsp @@ -73,11 +73,11 @@ <la:message key="labels.role_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/role"> - <la:message key="labels.role_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/role" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.role_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 719df92253c3a8f39783ec4e9e5a2e1cc3921643..6333cd230b82ffb64c1634b1c3d2a8334242bee6 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/edit.jsp @@ -67,11 +67,11 @@ <la:message key="labels.role_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/role"> - <la:message key="labels.role_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/role" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.role_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 54cf5c1dc082c518804995ccaa7cf589a5a2d9a9..8457e6fba4dd9f2bc8a4488e01e5790909e0dbae 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.role_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.role_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.role_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.role_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.role_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,7 +69,8 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${roleItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/role/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/role/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> </tr> </c:forEach> @@ -82,31 +82,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(rolePager.currentPageNumber)}" - arg1="${f:h(rolePager.allPageCount)}" arg2="${f:h(rolePager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(rolePager.currentPageNumber)}" + arg1="${f:h(rolePager.allPageCount)}" + arg2="${f:h(rolePager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${rolePager.existPrePage}"> - <li class="prev"><la:link href="list/${rolePager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${rolePager.currentPageNumber - 1}"> <la:message key="labels.role_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!rolePager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.role_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.role_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${rolePager.pageNumberList}"> - <li <c:if test="${p == rolePager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${rolePager.pageNumberList}"> + <li + <c:if test="${p == rolePager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${rolePager.existNextPage}"> - <li class="next"><la:link href="list/${rolePager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${rolePager.currentPageNumber + 1}"> <la:message key="labels.role_link_next_page" /> </la:link></li> </c:if> <c:if test="${!rolePager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.role_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.role_link_next_page" /></a></li> </c:if> </ul> 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 4f8c31d63b48d9c3b5312ba3a6d5a332a1c3f2f2..88819f49373931e27a12fb7f042943c8c2b2c1de 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/confirm.jsp @@ -76,11 +76,11 @@ <la:message key="labels.roletype_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/roletype"> - <la:message key="labels.roletype_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/roletype" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.roletype_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 cabe73229fa0263f170db94c5dcc2e3097942a65..471c2b20678f8c6f20d8cd9bb83fa91ef07d596f 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/edit.jsp @@ -70,11 +70,11 @@ <la:message key="labels.roletype_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/roletype"> - <la:message key="labels.roletype_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/roletype" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.roletype_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 b821e865641b937ddee1dba96e309c01fe931768..4eae2fbcbd2637675cb2aecdccd74a096e63804d 100644 --- a/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/roletype/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.roletype_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.roletype_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.roletype_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.roletype_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.roletype_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,7 +69,8 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${roleTypeItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/roletype/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/roletype/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> </tr> </c:forEach> @@ -82,31 +82,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(roleTypePager.currentPageNumber)}" - arg1="${f:h(roleTypePager.allPageCount)}" arg2="${f:h(roleTypePager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(roleTypePager.currentPageNumber)}" + arg1="${f:h(roleTypePager.allPageCount)}" + arg2="${f:h(roleTypePager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${roleTypePager.existPrePage}"> - <li class="prev"><la:link href="list/${roleTypePager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${roleTypePager.currentPageNumber - 1}"> <la:message key="labels.roletype_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!roleTypePager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.roletype_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.roletype_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${roleTypePager.pageNumberList}"> - <li <c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${roleTypePager.pageNumberList}"> + <li + <c:if test="${p == roleTypePager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${roleTypePager.existNextPage}"> - <li class="next"><la:link href="list/${roleTypePager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${roleTypePager.currentPageNumber + 1}"> <la:message key="labels.roletype_link_next_page" /> </la:link></li> </c:if> <c:if test="${!roleTypePager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.roletype_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.roletype_link_next_page" /></a></li> </c:if> </ul> 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 1b07bad0a83094ce7f4457da068c13701c2d7d4c..7864c17f5a4dfba96d0ed0fa94d1bc5ce8d8b928 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.scheduledjob_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/scheduledjob"> - <la:message key="labels.scheduledjob_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/scheduledjob" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.scheduledjob_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 f39b211165b9fc78aaf3888f2d3763f54e1d67d2..05920c6e8d4e94e8d5ca50af879da1a111aeb558 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/edit.jsp @@ -69,11 +69,11 @@ <la:message key="labels.scheduledjob_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/scheduledjob"> - <la:message key="labels.scheduledjob_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/scheduledjob" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.scheduledjob_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 19590c7b8b1196e15a1ea3302fc7afa5ef2ab95d..dd0224df6f8090f912fbb4be6d3c284d9a1b326d 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduledjob/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.scheduledjob_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.scheduledjob_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.scheduledjob_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.scheduledjob_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.scheduledjob_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -68,26 +67,29 @@ <th><la:message key="labels.scheduledjob_name" /></th> <th><la:message key="labels.scheduledjob_status" /></th> <th><la:message key="labels.scheduledjob_target" /></th> - <th><la:message key="labels.scheduledjob_cronExpression" /></th> + <th><la:message + key="labels.scheduledjob_cronExpression" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${scheduledJobItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/scheduledjob/confirmpage/4/${f:u(data.id)}"> - <td>${f:h(data.name)}</td> - <td> - <c:if test="${data.running}"> - <la:message key="labels.scheduledjob_running" /> - </c:if><c:if test="${!data.running}"> - <c:if test="${data.available=='T'}"> - <la:message key="labels.scheduledjob_active" /> - </c:if><c:if test="${data.available!='T'}"> - <la:message key="labels.scheduledjob_nojob" /> - </c:if> - </c:if> - </td> - <td>${f:h(data.target)}</td> - <td>${f:h(data.cronExpression)}</td> + <c:forEach var="data" varStatus="s" + items="${scheduledJobItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/scheduledjob/confirmpage/4/${f:u(data.id)}"> + <td>${f:h(data.name)}</td> + <td><c:if test="${data.running}"> + <la:message key="labels.scheduledjob_running" /> + </c:if> + <c:if test="${!data.running}"> + <c:if test="${data.available=='T'}"> + <la:message key="labels.scheduledjob_active" /> + </c:if> + <c:if test="${data.available!='T'}"> + <la:message key="labels.scheduledjob_nojob" /> + </c:if> + </c:if></td> + <td>${f:h(data.target)}</td> + <td>${f:h(data.cronExpression)}</td> </tr> </c:forEach> </tbody> @@ -98,31 +100,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(scheduledJobPager.currentPageNumber)}" - arg1="${f:h(scheduledJobPager.allPageCount)}" arg2="${f:h(scheduledJobPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(scheduledJobPager.currentPageNumber)}" + arg1="${f:h(scheduledJobPager.allPageCount)}" + arg2="${f:h(scheduledJobPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${scheduledJobPager.existPrePage}"> - <li class="prev"><la:link href="list/${scheduledJobPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${scheduledJobPager.currentPageNumber - 1}"> <la:message key="labels.scheduledjob_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!scheduledJobPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.scheduledjob_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.scheduledjob_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${scheduledJobPager.pageNumberList}"> - <li <c:if test="${p == scheduledJobPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${scheduledJobPager.pageNumberList}"> + <li + <c:if test="${p == scheduledJobPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${scheduledJobPager.existNextPage}"> - <li class="next"><la:link href="list/${scheduledJobPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${scheduledJobPager.currentPageNumber + 1}"> <la:message key="labels.scheduledjob_link_next_page" /> </la:link></li> </c:if> <c:if test="${!scheduledJobPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.scheduledjob_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.scheduledjob_link_next_page" /></a></li> </c:if> </ul> 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 c62a608adf819152a71aec1f556d92e7b4b7392c..0ce040f08699eaa62c32fc663351003a9ae52e6d 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.suggest_bad_word_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/suggestbadword"> - <la:message key="labels.suggest_bad_word_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestbadword" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.suggest_bad_word_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 1ea8b11cebe897acb5a6eef7f3866de45d88e5e2..55b6d02582843f07f00f6535596c38bcdfc9fb6d 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/download.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_bad_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_bad_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -24,7 +25,8 @@ <li class="active"><la:link href="/admin/suggestbadword"> <la:message key="labels.suggest_bad_word_link_list" /> </la:link></li> - <li class="active"><a href="#"><la:message key="labels.suggest_bad_word_link_download" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.suggest_bad_word_link_download" /></a></li> </ol> </section> @@ -38,19 +40,21 @@ <h3 class="box-title"> <la:message key="labels.suggest_bad_word_link_download" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/suggestbadword"> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestbadword" + styleClass="btn btn-default btn-xs"> <la:message key="labels.suggest_bad_word_link_list" /> - </la:link></span> - <span class="label label-default"><la:link href="createpage"> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_bad_word_link_create_new" /> - </la:link></span> - <span class="label label-default"><la:link href="downloadpage"> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> <la:message key="labels.suggest_bad_word_link_download" /> - </la:link></span> - <span class="label label-default"><la:link href="uploadpage"> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_bad_word_link_upload" /> - </la:link></span> + </la:link> </div> </div> <%-- Box Body --%> @@ -59,8 +63,11 @@ <table class="table table-bordered"> <tbody> <tr> - <th class="col-xs-2"><la:message key="labels.suggest_bad_word_file" /></th> - <td><input name="download" value="<la:message key="labels.suggest_bad_word_button_download"/>" type="submit" /></td> + <th class="col-xs-2"><la:message + key="labels.suggest_bad_word_file" /></th> + <td><input name="download" + value="<la:message key="labels.suggest_bad_word_button_download"/>" + type="submit" /></td> </tr> </tbody> </table> @@ -68,9 +75,7 @@ </div> <%-- Box Footer --%> - <div class="box-footer"> - - </div> + <div class="box-footer"></div> </div> </div> </div> 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 356ae39ad33da44042f812e706544ead933f6434..23dc2eb68096f540c999455ec477ef0818381741 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/edit.jsp @@ -69,20 +69,21 @@ <la:message key="labels.suggest_bad_word_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/suggestbadword"> - <la:message key="labels.suggest_bad_word_link_list" /> - </la:link></span> <span class="label label-default"><la:link - href="createpage"> - <la:message key="labels.suggest_bad_word_link_create_new" /> - </la:link></span> <span class="label label-default"><la:link - href="downloadpage"> - <la:message key="labels.suggest_bad_word_link_download" /> - </la:link></span> <span class="label label-default"><la:link - href="uploadpage"> - <la:message key="labels.suggest_bad_word_link_upload" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestbadword" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.suggest_bad_word_link_list" /> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_bad_word_link_create_new" /> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.suggest_bad_word_link_download" /> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_bad_word_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 b552a2df300f5f09e8c2ed95e9d38233ef2ac8b6..c0af9f25da531db8113eb73715b0605053ff8aa9 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_bad_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_bad_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,19 +38,21 @@ <h3 class="box-title"> <la:message key="labels.suggest_bad_word_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/suggestbadword"> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestbadword" + styleClass="btn btn-default btn-xs"> <la:message key="labels.suggest_bad_word_link_list" /> - </la:link></span> - <span class="label label-default"><la:link href="createpage"> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_bad_word_link_create_new" /> - </la:link></span> - <span class="label label-default"><la:link href="downloadpage"> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> <la:message key="labels.suggest_bad_word_link_download" /> - </la:link></span> - <span class="label label-default"><la:link href="uploadpage"> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_bad_word_link_upload" /> - </la:link></span> + </la:link> </div> </div> <%-- Box Body --%> @@ -57,9 +60,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -74,12 +75,15 @@ <table class="table table-bordered table-striped"> <thead> <tr> - <th><la:message key="labels.suggest_bad_word_list_suggest_word" /></th> + <th><la:message + key="labels.suggest_bad_word_list_suggest_word" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${suggestBadWordItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/suggestbadword/confirmpage/4/${f:u(data.id)}"> + <c:forEach var="data" varStatus="s" + items="${suggestBadWordItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/suggestbadword/confirmpage/4/${f:u(data.id)}"> <td style="overflow-x: auto;">${f:h(data.suggestWord)}</td> </tr> </c:forEach> @@ -91,31 +95,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(suggestBadWordPager.currentPageNumber)}" - arg1="${f:h(suggestBadWordPager.allPageCount)}" arg2="${f:h(suggestBadWordPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(suggestBadWordPager.currentPageNumber)}" + arg1="${f:h(suggestBadWordPager.allPageCount)}" + arg2="${f:h(suggestBadWordPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${suggestBadWordPager.existPrePage}"> - <li class="prev"><la:link href="list/${suggestBadWordPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${suggestBadWordPager.currentPageNumber - 1}"> <la:message key="labels.suggest_bad_word_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!suggestBadWordPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.suggest_bad_word_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.suggest_bad_word_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${suggestBadWordPager.pageNumberList}"> - <li <c:if test="${p == suggestBadWordPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${suggestBadWordPager.pageNumberList}"> + <li + <c:if test="${p == suggestBadWordPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${suggestBadWordPager.existNextPage}"> - <li class="next"><la:link href="list/${suggestBadWordPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${suggestBadWordPager.currentPageNumber + 1}"> <la:message key="labels.suggest_bad_word_link_next_page" /> </la:link></li> </c:if> <c:if test="${!suggestBadWordPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.suggest_bad_word_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.suggest_bad_word_link_next_page" /></a></li> </c:if> </ul> 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 a2c1334d45ba73176fe301c9b9d206e512bba36c..cd4646599c4c265b23f4b798f1b68bb39a7288c6 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestbadword/upload.jsp @@ -40,20 +40,21 @@ <h3 class="box-title"> <la:message key="labels.suggest_bad_word_link_upload" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/suggestbadword"> - <la:message key="labels.suggest_bad_word_link_list" /> - </la:link></span> <span class="label label-default"><la:link - href="createpage"> - <la:message key="labels.suggest_bad_word_link_create_new" /> - </la:link></span> <span class="label label-default"><la:link - href="downloadpage"> - <la:message key="labels.suggest_bad_word_link_download" /> - </la:link></span> <span class="label label-default"><la:link - href="uploadpage"> - <la:message key="labels.suggest_bad_word_link_upload" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestbadword" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.suggest_bad_word_link_list" /> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_bad_word_link_create_new" /> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.suggest_bad_word_link_download" /> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_bad_word_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 6385b7e18ed0cf7559960f077bc336abba21a84d..f0a22d19260853785ba19c60fbe0c775e5323d3a 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.suggest_elevate_word_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/suggestelevateword"> - <la:message key="labels.suggest_elevate_word_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestelevateword" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.suggest_elevate_word_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 ac1684f8ae9376cee32d782b83e618191ed02eba..794c9d378525817ce3e87f79d53a8b96aec09638 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/download.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -24,7 +25,8 @@ <li class="active"><la:link href="/admin/suggestelevateword"> <la:message key="labels.suggest_elevate_word_link_list" /> </la:link></li> - <li class="active"><a href="#"><la:message key="labels.suggest_elevate_word_link_download" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.suggest_elevate_word_link_download" /></a></li> </ol> </section> @@ -38,19 +40,21 @@ <h3 class="box-title"> <la:message key="labels.suggest_elevate_word_link_download" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/suggestelevateword"> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestelevateword" + styleClass="btn btn-default btn-xs"> <la:message key="labels.suggest_elevate_word_link_list" /> - </la:link></span> - <span class="label label-default"><la:link href="createpage"> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_elevate_word_link_create_new" /> - </la:link></span> - <span class="label label-default"><la:link href="downloadpage"> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> <la:message key="labels.suggest_elevate_word_link_download" /> - </la:link></span> - <span class="label label-default"><la:link href="uploadpage"> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_elevate_word_link_upload" /> - </la:link></span> + </la:link> </div> </div> <%-- Box Body --%> @@ -59,8 +63,11 @@ <table class="table table-bordered"> <tbody> <tr> - <th class="col-xs-2"><la:message key="labels.suggest_elevate_word_file" /></th> - <td><input name="download" value="<la:message key="labels.suggest_elevate_word_button_download"/>" type="submit" /></td> + <th class="col-xs-2"><la:message + key="labels.suggest_elevate_word_file" /></th> + <td><input name="download" + value="<la:message key="labels.suggest_elevate_word_button_download"/>" + type="submit" /></td> </tr> </tbody> </table> @@ -68,9 +75,7 @@ </div> <%-- Box Footer --%> - <div class="box-footer"> - - </div> + <div class="box-footer"></div> </div> </div> </div> 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 732b584229f095e5d07624f012a8d643b29ba966..f33c3d9266f69d827d55d2992f963ca70df1bac3 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/edit.jsp @@ -69,21 +69,21 @@ <la:message key="labels.suggest_elevate_word_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/suggestelevateword"> - <la:message key="labels.suggest_elevate_word_link_list" /> - </la:link></span> <span class="label label-default"><la:link - href="createpage"> - <la:message - key="labels.suggest_elevate_word_link_create_new" /> - </la:link></span> <span class="label label-default"><la:link - href="downloadpage"> - <la:message key="labels.suggest_elevate_word_link_download" /> - </la:link></span> <span class="label label-default"><la:link - href="uploadpage"> - <la:message key="labels.suggest_elevate_word_link_upload" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestelevateword" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.suggest_elevate_word_link_list" /> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_elevate_word_link_create_new" /> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.suggest_elevate_word_link_download" /> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_elevate_word_link_upload" /> + </la:link> </div> </div> <%-- Box Body --%> 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 7ebae50592655cd0ab57560f662219b32a9350f7..e22f7ddab495d1ab1f09b87201c5a750548a8e26 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.suggest_elevate_word_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.suggest_elevate_word_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,19 +38,21 @@ <h3 class="box-title"> <la:message key="labels.suggest_elevate_word_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/suggestelevateword"> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestelevateword" + styleClass="btn btn-default btn-xs"> <la:message key="labels.suggest_elevate_word_link_list" /> - </la:link></span> - <span class="label label-default"><la:link href="createpage"> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_elevate_word_link_create_new" /> - </la:link></span> - <span class="label label-default"><la:link href="downloadpage"> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> <la:message key="labels.suggest_elevate_word_link_download" /> - </la:link></span> - <span class="label label-default"><la:link href="uploadpage"> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> <la:message key="labels.suggest_elevate_word_link_upload" /> - </la:link></span> + </la:link> </div> </div> <%-- Box Body --%> @@ -57,9 +60,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -74,12 +75,15 @@ <table class="table table-bordered table-striped"> <thead> <tr> - <th><la:message key="labels.suggest_elevate_word_list_suggest_word" /></th> + <th><la:message + key="labels.suggest_elevate_word_list_suggest_word" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${suggestElevateWordItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/suggestelevateword/confirmpage/4/${f:u(data.id)}"> + <c:forEach var="data" varStatus="s" + items="${suggestElevateWordItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/suggestelevateword/confirmpage/4/${f:u(data.id)}"> <td style="overflow-x: auto;">${f:h(data.suggestWord)}</td> </tr> </c:forEach> @@ -91,31 +95,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(suggestElevateWordPager.currentPageNumber)}" - arg1="${f:h(suggestElevateWordPager.allPageCount)}" arg2="${f:h(suggestElevateWordPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(suggestElevateWordPager.currentPageNumber)}" + arg1="${f:h(suggestElevateWordPager.allPageCount)}" + arg2="${f:h(suggestElevateWordPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${suggestElevateWordPager.existPrePage}"> - <li class="prev"><la:link href="list/${suggestElevateWordPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${suggestElevateWordPager.currentPageNumber - 1}"> <la:message key="labels.suggest_elevate_word_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!suggestElevateWordPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.suggest_elevate_word_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.suggest_elevate_word_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${suggestElevateWordPager.pageNumberList}"> - <li <c:if test="${p == suggestElevateWordPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${suggestElevateWordPager.pageNumberList}"> + <li + <c:if test="${p == suggestElevateWordPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${suggestElevateWordPager.existNextPage}"> - <li class="next"><la:link href="list/${suggestElevateWordPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${suggestElevateWordPager.currentPageNumber + 1}"> <la:message key="labels.suggest_elevate_word_link_next_page" /> </la:link></li> </c:if> <c:if test="${!suggestElevateWordPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.suggest_elevate_word_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.suggest_elevate_word_link_next_page" /></a></li> </c:if> </ul> 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 83268c189c71109a106e49b9b87c36b833f19bee..10aa7d7e8b1f861aa47e70c37975f43d6232d9c5 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggestelevateword/upload.jsp @@ -40,20 +40,21 @@ <h3 class="box-title"> <la:message key="labels.suggest_elevate_word_link_upload" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/suggestelevateword"> - <la:message key="labels.suggest_elevate_word_link_list" /> - </la:link></span> <span class="label label-default"><la:link - href="createpage"> - <la:message key="labels.suggest_elevate_word_link_create_new" /> - </la:link></span> <span class="label label-default"><la:link - href="downloadpage"> - <la:message key="labels.suggest_elevate_word_link_download" /> - </la:link></span> <span class="label label-default"><la:link - href="uploadpage"> - <la:message key="labels.suggest_elevate_word_link_upload" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/suggestelevateword" + styleClass="btn btn-default btn-xs"> + <la:message key="labels.suggest_elevate_word_link_list" /> + </la:link> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_elevate_word_link_create_new" /> + </la:link> + <la:link href="downloadpage" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.suggest_elevate_word_link_download" /> + </la:link> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.suggest_elevate_word_link_upload" /> + </la:link> </div> </div> <%-- 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 c8d46cc66484c8143b86571d96c7542dfa14c689..31b11d99ec3b40a6f90a94a9372b4df3340821a4 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/confirm.jsp @@ -73,11 +73,11 @@ <la:message key="labels.user_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/user"> - <la:message key="labels.user_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/user" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.user_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 4ee9047f0ab72cd765789679e84a38a1c3007929..f3c8b99b3a7bb1fb210cde9c0b1dd1dfecaec250 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/edit.jsp @@ -67,11 +67,11 @@ <la:message key="labels.user_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/user"> - <la:message key="labels.user_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/user" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.user_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 de7f96d38afc428b5e2a0a857511cd5c4cb8651a..1148f68f8f4d125f440c0940d1123102004e47c3 100644 --- a/src/main/webapp/WEB-INF/view/admin/user/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/user/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.user_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.user_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,10 @@ <h3 class="box-title"> <la:message key="labels.user_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.user_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.user_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +49,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -70,7 +69,8 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${userItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/user/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/user/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> </tr> </c:forEach> @@ -82,31 +82,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(userPager.currentPageNumber)}" - arg1="${f:h(userPager.allPageCount)}" arg2="${f:h(userPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(userPager.currentPageNumber)}" + arg1="${f:h(userPager.allPageCount)}" + arg2="${f:h(userPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${userPager.existPrePage}"> - <li class="prev"><la:link href="list/${userPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${userPager.currentPageNumber - 1}"> <la:message key="labels.user_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!userPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.user_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.user_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${userPager.pageNumberList}"> - <li <c:if test="${p == userPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${userPager.pageNumberList}"> + <li + <c:if test="${p == userPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${userPager.existNextPage}"> - <li class="next"><la:link href="list/${userPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${userPager.currentPageNumber + 1}"> <la:message key="labels.user_link_next_page" /> </la:link></li> </c:if> <c:if test="${!userPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.user_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.user_link_next_page" /></a></li> </c:if> </ul> 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 c63db0a4753fae3434a713b899fa6acc27f573fd..193e7cf9e658db8440d8412e2020d7575167feba 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/confirm.jsp @@ -75,11 +75,11 @@ <la:message key="labels.web_authentication_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/webauthentication"> - <la:message key="labels.web_authentication_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/webauthentication" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.web_authentication_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 5adfe80d26acd195a5b13073edbad28c3bc47a70..f99da20972f62b70fb6451e3a040ff20b44618bf 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/edit.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.web_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -25,16 +26,20 @@ <la:message key="labels.web_authentication_link_list" /> </la:link></li> <c:if test="${crudMode == 1}"> - <li class="active"><a href="#"><la:message key="labels.web_authentication_link_create" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.web_authentication_link_create" /></a></li> </c:if> <c:if test="${crudMode == 2}"> - <li class="active"><a href="#"><la:message key="labels.web_authentication_link_update" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.web_authentication_link_update" /></a></li> </c:if> <c:if test="${crudMode == 3}"> - <li class="active"><a href="#"><la:message key="labels.web_authentication_link_delete" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.web_authentication_link_delete" /></a></li> </c:if> <c:if test="${crudMode == 4}"> - <li class="active"><a href="#"><la:message key="labels.web_authentication_link_confirm" /></a></li> + <li class="active"><a href="#"><la:message + key="labels.web_authentication_link_confirm" /></a></li> </c:if> </ol> </section> @@ -65,10 +70,11 @@ <la:message key="labels.web_authentication_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="/admin/webauthentication"> - <la:message key="labels.web_authentication_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/webauthentication" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.web_authentication_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -76,52 +82,59 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> <%-- Form Fields --%> <div class="form-group"> - <label for="hostname"><la:message key="labels.web_authentication_hostname" /></label> + <label for="hostname"><la:message + key="labels.web_authentication_hostname" /></label> <la:text property="hostname" styleClass="form-control" /> </div> <div class="form-group"> - <label for="port"><la:message key="labels.web_authentication_port" /></label> + <label for="port"><la:message + key="labels.web_authentication_port" /></label> <la:text property="port" styleClass="form-control" /> </div> <div class="form-group"> - <label for="authRealm"><la:message key="labels.web_authentication_realm" /></label> + <label for="authRealm"><la:message + key="labels.web_authentication_realm" /></label> <la:text property="authRealm" styleClass="form-control" /> </div> <div class="form-group"> - <label for="protocolScheme"><la:message key="labels.web_authentication_scheme" /></label> + <label for="protocolScheme"><la:message + key="labels.web_authentication_scheme" /></label> <la:select property="protocolScheme" styleClass="form-control"> - <c:forEach var="item" items="${protocolSchemeItems}"> - <la:option value="${f:u(item.value)}">${f:h(item.label)}</la:option> - </c:forEach> + <c:forEach var="item" items="${protocolSchemeItems}"> + <la:option value="${f:u(item.value)}">${f:h(item.label)}</la:option> + </c:forEach> </la:select> </div> <div class="form-group"> - <label for="username"><la:message key="labels.web_authentication_username" /></label> + <label for="username"><la:message + key="labels.web_authentication_username" /></label> <la:text property="username" styleClass="form-control" /> </div> <div class="form-group"> - <label for="password"><la:message key="labels.web_authentication_password" /></label> + <label for="password"><la:message + key="labels.web_authentication_password" /></label> <la:password property="password" styleClass="form-control" /> </div> <div class="form-group"> - <label for="parameters"><la:message key="labels.web_authentication_parameters" /></label> - <la:textarea property="parameters" styleClass="form-control" rows="5" /> + <label for="parameters"><la:message + key="labels.web_authentication_parameters" /></label> + <la:textarea property="parameters" styleClass="form-control" + rows="5" /> </div> <div class="form-group"> - <label for="webConfigId"><la:message key="labels.web_authentication_web_crawling_config" /></label> + <label for="webConfigId"><la:message + key="labels.web_authentication_web_crawling_config" /></label> <la:select property="webConfigId" styleClass="form-control"> - <c:forEach var="item" items="${webConfigItems}"> - <la:option value="${f:u(item.value)}">${f:h(item.label)}</la:option> - </c:forEach> + <c:forEach var="item" items="${webConfigItems}"> + <la:option value="${f:u(item.value)}">${f:h(item.label)}</la:option> + </c:forEach> </la:select> </div> </div> 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 9a8b138ac6fb02c3d55d7d9b19a170ec56cd1df1..674150016209bcaa6c81a8b6779ac090649a761e 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauthentication/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_authentication_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.web_authentication_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -43,10 +44,10 @@ <h3 class="box-title"> <la:message key="labels.web_authentication_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.web_authentication_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" styleClass="btn btn-success btn-xs"> + <la:message key="labels.web_authentication_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -54,9 +55,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -71,23 +70,25 @@ <table class="table table-bordered table-striped"> <thead> <tr> - <th><la:message key="labels.web_authentication_list_hostname" /></th> - <th><la:message key="labels.web_authentication_list_web_crawling_config" /></th> + <th><la:message + key="labels.web_authentication_list_hostname" /></th> + <th><la:message + key="labels.web_authentication_list_web_crawling_config" /></th> </tr> </thead> <tbody> - <c:forEach var="data" varStatus="s" items="${webAuthenticationItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/webauthentication/confirmpage/4/${f:u(data.id)}"> - <td><c:if test="${data.hostname==null||data.hostname==''}"> + <c:forEach var="data" varStatus="s" + items="${webAuthenticationItems}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/webauthentication/confirmpage/4/${f:u(data.id)}"> + <td><c:if + test="${data.hostname==null||data.hostname==''}"> <la:message key="labels.web_authentication_any" /> - </c:if> - ${f:h(data.hostname)}: - <c:if test="${data.port==-1}"> + </c:if> ${f:h(data.hostname)}: <c:if test="${data.port==-1}"> <la:message key="labels.web_authentication_any" /> </c:if> <c:if test="${data.port!=-1}"> ${f:h(data.port)} - </c:if> - </td> + </c:if></td> <td>${f:h(data.webConfig.name)}</td> </tr> </c:forEach> @@ -99,31 +100,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(webAuthenticationPager.currentPageNumber)}" - arg1="${f:h(webAuthenticationPager.allPageCount)}" arg2="${f:h(webAuthenticationPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(webAuthenticationPager.currentPageNumber)}" + arg1="${f:h(webAuthenticationPager.allPageCount)}" + arg2="${f:h(webAuthenticationPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${webAuthenticationPager.existPrePage}"> - <li class="prev"><la:link href="list/${webAuthenticationPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${webAuthenticationPager.currentPageNumber - 1}"> <la:message key="labels.web_authentication_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!webAuthenticationPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.web_authentication_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.web_authentication_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${webAuthenticationPager.pageNumberList}"> - <li <c:if test="${p == webAuthenticationPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${webAuthenticationPager.pageNumberList}"> + <li + <c:if test="${p == webAuthenticationPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${webAuthenticationPager.existNextPage}"> - <li class="next"><la:link href="list/${webAuthenticationPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${webAuthenticationPager.currentPageNumber + 1}"> <la:message key="labels.web_authentication_link_next_page" /> </la:link></li> </c:if> <c:if test="${!webAuthenticationPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.web_authentication_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.web_authentication_link_next_page" /></a></li> </c:if> </ul> 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 1a0d8b741f4f5b7b415d706fd0ae36a72c85282a..6563bb1558a02655863a1b3e3289db5f7b8d156b 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/confirm.jsp @@ -76,11 +76,11 @@ <la:message key="labels.web_crawling_link_confirm" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/webconfig"> - <la:message key="labels.web_crawling_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/webconfig" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.web_crawling_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 44b988f619a364d3a8b5da7784156461247775e8..3476385f30ceb405aeda8e204ebc53ad9f327523 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/edit.jsp @@ -70,11 +70,11 @@ <la:message key="labels.web_crawling_link_update" /> </c:if> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link - href="/admin/webconfig"> - <la:message key="labels.web_crawling_link_list" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="/admin/webconfig" + styleClass="btn btn-primary btn-xs"> + <la:message key="labels.web_crawling_link_list" /> + </la:link> </div> </div> <%-- Box Body --%> 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 6ed6434dccc18f835881a75692d82606c65a974d..f6c18ad588359cbf263381ce2e137f0069f7b405 100644 --- a/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webconfig/index.jsp @@ -2,7 +2,8 @@ <html> <head> <meta charset="UTF-8"> -<title><la:message key="labels.admin_brand_title"/> | <la:message key="labels.web_crawling_configuration" /></title> +<title><la:message key="labels.admin_brand_title" /> | <la:message + key="labels.web_crawling_configuration" /></title> <jsp:include page="/WEB-INF/view/common/admin/head.jsp"></jsp:include> </head> <body class="skin-blue sidebar-mini"> @@ -37,10 +38,11 @@ <h3 class="box-title"> <la:message key="labels.web_crawling_link_list" /> </h3> - <div class="box-tools pull-right"> - <span class="label label-default"><la:link href="createpage"> - <la:message key="labels.web_crawling_link_create_new" /> - </la:link></span> + <div class="btn-group pull-right"> + <la:link href="createpage" + styleClass="btn btn-success btn-xs"> + <la:message key="labels.web_crawling_link_create_new" /> + </la:link> </div> </div> <%-- Box Body --%> @@ -48,9 +50,7 @@ <%-- Message --%> <div> <la:info id="msg" message="true"> - <div class="alert alert-info"> - ${msg} - </div> + <div class="alert alert-info">${msg}</div> </la:info> <la:errors /> </div> @@ -71,15 +71,15 @@ </thead> <tbody> <c:forEach var="data" varStatus="s" items="${webConfigItems}"> - <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="${contextPath}/admin/webconfig/confirmpage/4/${f:u(data.id)}"> + <tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" + data-href="${contextPath}/admin/webconfig/confirmpage/4/${f:u(data.id)}"> <td>${f:h(data.name)}</td> - <td style="text-align: center;"> - <c:if test="${data.available=='true'}"> + <td style="text-align: center;"><c:if + test="${data.available=='true'}"> <la:message key="labels.enabled" /> </c:if> <c:if test="${data.available=='false'}"> <la:message key="labels.disabled" /> - </c:if> - </td> + </c:if></td> </tr> </c:forEach> </tbody> @@ -90,31 +90,38 @@ <%-- Box Footer --%> <div class="box-footer"> <%-- Paging Info --%> - <span><la:message key="labels.pagination_page_guide_msg" arg0="${f:h(webConfigPager.currentPageNumber)}" - arg1="${f:h(webConfigPager.allPageCount)}" arg2="${f:h(webConfigPager.allRecordCount)}" - /></span> + <span><la:message key="labels.pagination_page_guide_msg" + arg0="${f:h(webConfigPager.currentPageNumber)}" + arg1="${f:h(webConfigPager.allPageCount)}" + arg2="${f:h(webConfigPager.allRecordCount)}" /></span> <%-- Paging Navigation --%> <ul class="pagination pagination-sm no-margin pull-right"> <c:if test="${webConfigPager.existPrePage}"> - <li class="prev"><la:link href="list/${webConfigPager.currentPageNumber - 1}"> + <li class="prev"><la:link + href="list/${webConfigPager.currentPageNumber - 1}"> <la:message key="labels.web_crawling_link_prev_page" /> </la:link></li> </c:if> <c:if test="${!webConfigPager.existPrePage}"> - <li class="prev disabled"><a href="#"><la:message key="labels.web_crawling_link_prev_page" /></a></li> + <li class="prev disabled"><a href="#"><la:message + key="labels.web_crawling_link_prev_page" /></a></li> </c:if> - <c:forEach var="p" varStatus="s" items="${webConfigPager.pageNumberList}"> - <li <c:if test="${p == webConfigPager.currentPageNumber}">class="active"</c:if>><la:link href="list/${p}">${p}</la:link> - </li> + <c:forEach var="p" varStatus="s" + items="${webConfigPager.pageNumberList}"> + <li + <c:if test="${p == webConfigPager.currentPageNumber}">class="active"</c:if>><la:link + href="list/${p}">${p}</la:link></li> </c:forEach> <c:if test="${webConfigPager.existNextPage}"> - <li class="next"><la:link href="list/${webConfigPager.currentPageNumber + 1}"> + <li class="next"><la:link + href="list/${webConfigPager.currentPageNumber + 1}"> <la:message key="labels.web_crawling_link_next_page" /> </la:link></li> </c:if> <c:if test="${!webConfigPager.existNextPage}"> - <li class="next disabled"><a href="#"><la:message key="labels.web_crawling_link_next_page" /></a></li> + <li class="next disabled"><a href="#"><la:message + key="labels.web_crawling_link_next_page" /></a></li> </c:if> </ul>