Update dialog for delete all

src/main/resources/fess_label.properties

@@ -527,6 +527,7 @@ labels.crawling_session_created_time=Created
 labels.crawling_session_expired_time=Expired
 labels.crawling_session_delete_all_link=Delete All
 labels.crawling_session_delete_all_confirmation=Do you want to delete all?
+labels.crawling_session_delete_all_cancel=Cancel
 labels.crawling_session_CrawlerStatus=Crawling Status
 labels.crawling_session_CrawlerStartTime=Start Time (Crawling)
 labels.crawling_session_CrawlerEndTime=End Time (Crawling)
@@ -852,6 +853,7 @@ labels.failure_url_last_access_time=Last Access
 labels.failure_url_link_confirm=Confirm
 labels.failure_url_delete_all_link=Delete All
 labels.failure_url_delete_all_confirmation=Do you want to delete all?
+labels.failure_url_delete_all_cancel=Cancel
 labels.failure_url_error_count=Error Count
 labels.failure_url_title_confirm=Failure URL Details
 labels.failure_url_id=ID
@@ -1235,7 +1237,7 @@ labels.crud_link_delete=Delete
 labels.crud_link_back=Back
 labels.crud_link_edit=Edit
 labels.crud_link_next_page=Next
-labels.crud_link_prev_page=Back
+labels.crud_link_prev_page=Previous
 labels.crud_title_details=Details
 labels.crud_title_confirm=Confirmation
 labels.admin_brand_title=Fess

src/main/webapp/WEB-INF/view/admin/crawlingsession/index.jsp

@@ -28,7 +28,7 @@
 			</section>
 			<section class="content">
 				<div class="row">
-					<div class="col-md-12">
+					<div class="col-xs-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
@@ -49,10 +49,11 @@
 									<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>
+												<c:set var="ph_session_id">
+													<la:message key="labels.crawling_session_session_id_search" />
+												</c:set>
 												<la:text styleId="sessionIdSearchBtn" property="sessionId"
-													styleClass="form-control"></la:text>
+													styleClass="form-control" placeholder="${ph_session_id}"></la:text>
 											</div>
 											<div class="form-group">
 												<button type="submit" class="btn btn-primary" name="search"
@@ -67,102 +68,137 @@
 										</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>
+								<div class="data-wrapper">
+									<%-- List --%>
+									<c:if test="${crawlingSessionPager.allRecordCount == 0}">
+										<div class="row top10">
+											<div class="col-sm-12">
+												<p class="callout callout-info">
+													<la:message key="labels.list_could_not_find_crud_table" />
+												</p>
+											</div>
+										</div>
+									</c:if>
+									<c:if test="${crawlingSessionPager.allRecordCount > 0}">
+										<div class="row">
+											<div class="col-sm-12">
+												<table class="table table-bordered table-striped dataTable">
+													<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>
+											</div>
+										</div>
+										<%-- Paging Info --%>
+										<div class="row">
+											<div class="col-sm-5">
+												<span><la:message
+														key="labels.pagination_page_guide_msg"
+														arg0="${f:h(crawlingSessionPager.currentPageNumber)}"
+														arg1="${f:h(crawlingSessionPager.allPageCount)}"
+														arg2="${f:h(crawlingSessionPager.allRecordCount)}" /></span>
+											</div>
+											<div class="col-sm-7">
+												<%-- Paging Navigation --%>
+												<ul class="pagination pagination-sm no-margin pull-right">
+													<c:if test="${crawlingSessionPager.existPrePage}">
+														<li class="prev"><la:link
+																href="list/${crawlingSessionPager.currentPageNumber - 1}">
+																<la:message key="labels.crud_link_prev_page" />
+															</la:link></li>
+													</c:if>
+													<c:if test="${!crawlingSessionPager.existPrePage}">
+														<li class="prev disabled"><a href="#"><la:message
+																	key="labels.crud_link_prev_page" /></a></li>
+													</c:if>
+													<c:forEach var="p" varStatus="s"
+														items="${crawlingSessionPager.pageNumberList}">
+														<li
+															<c:if test="${p == crawlingSessionPager.currentPageNumber}">class="active"</c:if>><la:link
+																href="list/${p}">${p}</la:link></li>
 													</c:forEach>
-												</tbody>
-											</table>
-										</c:if>
-									</div>
-								</div>
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<div class="span12 center">
-									<script>
-									<!--
-										function confirmToDeleteAll() {
-											if (confirm('<la:message key="labels.crawling_session_delete_all_confirmation"/>')) {
-												return true;
-											} else {
-												return false;
-											}
-										}
-									// -->
-									</script>
-									<la:link href="deleteall"
-										onclick="return confirmToDeleteAll();"
-										styleClass="btn btn-danger">
-										<la:message key="labels.crawling_session_delete_all_link" />
-									</la:link>
-								</div>
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(crawlingSessionPager.currentPageNumber)}"
-										arg1="${f:h(crawlingSessionPager.allPageCount)}"
-										arg2="${f:h(crawlingSessionPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${crawlingSessionPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${crawlingSessionPager.currentPageNumber - 1}">
-												<la:message key="labels.crud_link_prev_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!crawlingSessionPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.crud_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${crawlingSessionPager.pageNumberList}">
-										<li
-											<c:if test="${p == crawlingSessionPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${crawlingSessionPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${crawlingSessionPager.currentPageNumber + 1}">
-												<la:message key="labels.crud_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!crawlingSessionPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.crud_link_next_page" /></a></li>
+													<c:if test="${crawlingSessionPager.existNextPage}">
+														<li class="next"><la:link
+																href="list/${crawlingSessionPager.currentPageNumber + 1}">
+																<la:message key="labels.crud_link_next_page" />
+															</la:link></li>
+													</c:if>
+													<c:if test="${!crawlingSessionPager.existNextPage}">
+														<li class="next disabled"><a href="#"><la:message
+																	key="labels.crud_link_next_page" /></a></li>
+													</c:if>
+												</ul>
+											</div>
+										</div>
+										<div class="row">
+											<div class="col-sm-12 center">
+												<button type="button" class="btn btn-danger"
+													data-toggle="modal" data-target="#confirmToDeleteAll">
+													<la:message key="labels.crawling_session_delete_all_link" />
+												</button>
+											</div>
+											<div class="modal modal-danger fade" id="confirmToDeleteAll"
+												tabindex="-1" role="dialog">
+												<div class="modal-dialog">
+													<div class="modal-content">
+														<div class="modal-header">
+															<button type="button" class="close" data-dismiss="modal"
+																aria-label="Close">
+																<span aria-hidden="true">×</span>
+															</button>
+															<h4 class="modal-title">
+																<la:message
+																	key="labels.crawling_session_delete_all_link" />
+															</h4>
+														</div>
+														<div class="modal-body">
+															<p>
+																<la:message
+																	key="labels.crawling_session_delete_all_confirmation" />
+															</p>
+														</div>
+														<div class="modal-footer">
+															<button type="button" class="btn btn-outline pull-left"
+																data-dismiss="modal">
+																<la:message
+																	key="labels.crawling_session_delete_all_cancel" />
+															</button>
+															<la:link href="deleteall" styleClass="btn btn-outline"
+																data-dismiss="modal">
+																<la:message
+																	key="labels.crawling_session_delete_all_link" />
+															</la:link>
+														</div>
+													</div>
+												</div>
+											</div>
+										</div>
 									</c:if>
-								</ul>
-
+								</div>
+								<!-- /.data-wrapper -->
 							</div>
+							<!-- /.box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
 

src/main/webapp/WEB-INF/view/admin/failureurl/index.jsp

@@ -27,11 +27,9 @@
 						</la:link></li>
 				</ol>
 			</section>
-
 			<section class="content">
-
 				<div class="row">
-					<div class="col-md-12">
+					<div class="col-xs-12">
 						<div class="box box-primary">
 							<%-- Box Header --%>
 							<div class="box-header with-border">
@@ -41,10 +39,16 @@
 							</div>
 							<%-- Box Body --%>
 							<div class="box-body">
+								<%-- Message --%>
+								<div>
+									<la:info id="msg" message="true">
+										<div class="alert alert-info">${msg}</div>
+									</la:info>
+									<la:errors />
+								</div>
 								<la:form styleClass="form-horizontal">
 									<div class="form-group">
-										<label for="searchParams.url"
-											class="col-sm-2 control-label"><la:message
+										<label for="searchParams.url" 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"
@@ -87,112 +91,136 @@
 										</div>
 									</div>
 								</la:form>
-								<hr />
-								<%-- Message --%>
-								<div>
-									<la:info id="msg" message="true">
-										<div class="alert alert-info">${msg}</div>
-									</la:info>
-									<la:errors />
-								</div>
-
-								<%-- List --%>
-								<c:if test="${failureUrlPager.allRecordCount == 0}">
-									<p class="callout callout-info">
-										<la:message key="labels.list_could_not_find_crud_table" />
-									</p>
-								</c:if>
-								<c:if test="${failureUrlPager.allRecordCount > 0}">
-									<table class="bordered-table zebra-striped">
-										<thead>
-											<tr>
-												<th><la:message key="labels.failure_url_url" /></th>
-												<th><la:message
-														key="labels.failure_url_last_access_time" /></th>
-											</tr>
-										</thead>
-										<tbody>
-											<c:forEach var="data" varStatus="s"
-												items="${failureUrlItems}">
-												<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-													<td><div style="width: 380px; overflow-x: auto;">${f:h(data.url)}</div></td>
-													<td>${f:h(data.lastAccessTimeForList)}</td>
-													<td style="overflow-x: auto;"><la:link
-															href="confirmpage/4/${f:u(data.id)}">
-															<la:message key="labels.failure_url_link_confirm" />
-														</la:link> <la:link href="deletepage/3/${f:u(data.id)}">
-															<la:message key="labels.crud_link_delete" />
-														</la:link></td>
-												</tr>
-											</c:forEach>
-										</tbody>
-									</table>
-								</c:if>
-							</div>
-							<%-- Box Footer --%>
-							<div class="box-footer">
-								<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 class="data-wrapper">
+									<%-- List --%>
+									<c:if test="${failureUrlPager.allRecordCount == 0}">
+										<div class="row top10">
+											<div class="col-sm-12">
+												<p class="callout callout-info">
+													<la:message key="labels.list_could_not_find_crud_table" />
+												</p>
+											</div>
 										</div>
-									</div>
-								</c:if>
-								<%-- Paging Info --%>
-								<span><la:message key="labels.pagination_page_guide_msg"
-										arg0="${f:h(failureUrlPager.currentPageNumber)}"
-										arg1="${f:h(failureUrlPager.allPageCount)}"
-										arg2="${f:h(failureUrlPager.allRecordCount)}" /></span>
-
-								<%-- Paging Navigation --%>
-								<ul class="pagination pagination-sm no-margin pull-right">
-									<c:if test="${failureUrlPager.existPrePage}">
-										<li class="prev"><la:link
-												href="list/${failureUrlPager.currentPageNumber - 1}">
-												<la:message key="labels.crud_link_prev_page" />
-											</la:link></li>
 									</c:if>
-									<c:if test="${!failureUrlPager.existPrePage}">
-										<li class="prev disabled"><a href="#"><la:message
-													key="labels.crud_link_prev_page" /></a></li>
-									</c:if>
-									<c:forEach var="p" varStatus="s"
-										items="${failureUrlPager.pageNumberList}">
-										<li
-											<c:if test="${p == failureUrlPager.currentPageNumber}">class="active"</c:if>><la:link
-												href="list/${p}">${p}</la:link></li>
-									</c:forEach>
-									<c:if test="${failureUrlPager.existNextPage}">
-										<li class="next"><la:link
-												href="list/${failureUrlPager.currentPageNumber + 1}">
-												<la:message key="labels.crud_link_next_page" />
-											</la:link></li>
-									</c:if>
-									<c:if test="${!failureUrlPager.existNextPage}">
-										<li class="next disabled"><a href="#"><la:message
-													key="labels.crud_link_next_page" /></a></li>
+									<c:if test="${failureUrlPager.allRecordCount > 0}">
+										<div class="row">
+											<div class="col-sm-12">
+												<table class="bordered-table zebra-striped dataTable">
+													<thead>
+														<tr>
+															<th><la:message key="labels.failure_url_url" /></th>
+															<th><la:message
+																	key="labels.failure_url_last_access_time" /></th>
+														</tr>
+													</thead>
+													<tbody>
+														<c:forEach var="data" varStatus="s"
+															items="${failureUrlItems}">
+															<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
+																<td><div style="width: 380px; overflow-x: auto;">${f:h(data.url)}</div></td>
+																<td>${f:h(data.lastAccessTimeForList)}</td>
+																<td style="overflow-x: auto;"><la:link
+																		href="confirmpage/4/${f:u(data.id)}">
+																		<la:message key="labels.failure_url_link_confirm" />
+																	</la:link> <la:link href="deletepage/3/${f:u(data.id)}">
+																		<la:message key="labels.crud_link_delete" />
+																	</la:link></td>
+															</tr>
+														</c:forEach>
+													</tbody>
+												</table>
+											</div>
+										</div>
+										<%-- Paging Info --%>
+										<div class="row">
+											<div class="col-sm-5">
+												<span><la:message
+														key="labels.pagination_page_guide_msg"
+														arg0="${f:h(failureUrlPager.currentPageNumber)}"
+														arg1="${f:h(failureUrlPager.allPageCount)}"
+														arg2="${f:h(failureUrlPager.allRecordCount)}" /></span>
+											</div>
+											<div class="col-sm-7">
+												<%-- Paging Navigation --%>
+												<ul class="pagination pagination-sm no-margin pull-right">
+													<c:if test="${failureUrlPager.existPrePage}">
+														<li class="prev"><la:link
+																href="list/${failureUrlPager.currentPageNumber - 1}">
+																<la:message key="labels.crud_link_prev_page" />
+															</la:link></li>
+													</c:if>
+													<c:if test="${!failureUrlPager.existPrePage}">
+														<li class="prev disabled"><a href="#"><la:message
+																	key="labels.crud_link_prev_page" /></a></li>
+													</c:if>
+													<c:forEach var="p" varStatus="s"
+														items="${failureUrlPager.pageNumberList}">
+														<li
+															<c:if test="${p == failureUrlPager.currentPageNumber}">class="active"</c:if>><la:link
+																href="list/${p}">${p}</la:link></li>
+													</c:forEach>
+													<c:if test="${failureUrlPager.existNextPage}">
+														<li class="next"><la:link
+																href="list/${failureUrlPager.currentPageNumber + 1}">
+																<la:message key="labels.crud_link_next_page" />
+															</la:link></li>
+													</c:if>
+													<c:if test="${!failureUrlPager.existNextPage}">
+														<li class="next disabled"><a href="#"><la:message
+																	key="labels.crud_link_next_page" /></a></li>
+													</c:if>
+												</ul>
+											</div>
+										</div>
+										<div class="row">
+											<div class="col-sm-12 center">
+												<button type="button" class="btn btn-danger"
+													data-toggle="modal" data-target="#confirmToDeleteAll">
+													<la:message key="labels.failure_url_delete_all_link" />
+												</button>
+											</div>
+											<div class="modal modal-danger fade" id="confirmToDeleteAll"
+												tabindex="-1" role="dialog">
+												<div class="modal-dialog">
+													<div class="modal-content">
+														<div class="modal-header">
+															<button type="button" class="close" data-dismiss="modal"
+																aria-label="Close">
+																<span aria-hidden="true">×</span>
+															</button>
+															<h4 class="modal-title">
+																<la:message key="labels.failure_url_delete_all_link" />
+															</h4>
+														</div>
+														<div class="modal-body">
+															<p>
+																<la:message
+																	key="labels.failure_url_delete_all_confirmation" />
+															</p>
+														</div>
+														<div class="modal-footer">
+															<button type="button" class="btn btn-outline pull-left"
+																data-dismiss="modal">
+																<la:message key="labels.failure_url_delete_all_cancel" />
+															</button>
+															<la:link href="deleteall" styleClass="btn btn-outline"
+																data-dismiss="modal">
+																<la:message key="labels.failure_url_delete_all_link" />
+															</la:link>
+														</div>
+													</div>
+												</div>
+											</div>
+										</div>
 									</c:if>
-								</ul>
+								</div>
+								<!-- /.data-wrapper -->
 							</div>
+							<!-- ./box-body -->
 						</div>
+						<!-- /.box -->
 					</div>
 				</div>
-
 			</section>
 		</div>
 

src/main/webapp/css/admin/style.css

@@ -1,3 +1,27 @@
+.top5 {
+	margin-top: 0.5em;
+}
+
+.top10 {
+	margin-top: 1.0em;
+}
+
+.top15 {
+	margin-top: 1.5em;
+}
+
+.top20 {
+	margin-top: 2.0em;
+}
+
+.top25 {
+	margin-top: 2.5em;
+}
+
+.top30 {
+	margin-top: 3.0em;
+}
+
 .login-page .footer {
 	position: absolute;
 	bottom: 0;