0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update buttons

Browse source
This commit is contained in:
Kaoru FUZITA 2015-11-06 14:57:43 +09:00
parent e79090e95e
commit a86f4b9f6e
9 changed files with 155 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java
View file

@ -2971,11 +2971,11 @@ public class FessLabels extends ActionMessages {
/** The key of the message: Job Log List */
public static final String LABELS_joblog_title_list = "{labels.joblog_title_list}";
/** The key of the message: Delete All */
public static final String LABELS_joblog_delete_all_link = "{labels.joblog_delete_all_link}";
/** The key of the message: Delete */
public static final String LABELS_joblog_delete_link = "{labels.joblog_delete_link}";
/** The key of the message: Do you really want to delete all? */
public static final String LABELS_joblog_delete_all_confirmation = "{labels.joblog_delete_all_confirmation}";
/** The key of the message: Do you really want to delete? */
public static final String LABELS_joblog_delete_confirmation = "{labels.joblog_delete_confirmation}";
/** The key of the message: Dictionary List */
public static final String LABELS_dict_configuration = "{labels.dict_configuration}";

4
src/main/resources/fess_label.properties
View file

@ -1012,8 +1012,8 @@ labels.joblog_target=Target
labels.joblog_title_confirm=Confirm Job Log
labels.joblog_title_details=Job Log Details
labels.joblog_title_list=Job Log List
labels.joblog_delete_all_link=Delete All
labels.joblog_delete_all_confirmation=Do you really want to delete all?
labels.joblog_delete_link=Delete
labels.joblog_delete_confirmation=Do you really want to delete?
labels.dict_configuration=Dictionary List
labels.dict_list_title=Dictionary List
labels.dict_list_link=Dictionaries

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

@ -56,6 +56,7 @@
<div class="form-group">
<button type="submit" class="btn btn-primary" name="search"
value="<la:message key="labels.crawling_session_search" />">
<i class="fa fa-search"></i>
<la:message key="labels.crawling_session_search" />
</button>
<button type="submit" class="btn btn-secondary" name="reset"
@ -66,131 +67,128 @@
</la:form>
</div>
</div>
<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>
<%-- 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>
</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>
</div>
</c:if>
<c:if test="${crawlingSessionPager.allRecordCount > 0}">
<div class="row top10">
<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/details/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>
</thead>
<tbody>
<c:forEach var="data" varStatus="s"
items="${crawlingSessionItems}">
<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}"
data-href="${contextPath}/admin/crawlingsession/details/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>
<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>
</tbody>
</table>
</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>
<%-- 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>
<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">
<i class="fa fa-trash"></i>
<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">
<i class="fa fa-trash"></i>
<la:message key="labels.crawling_session_delete_all_link" />
</la:link>
</div>
</div>
</div>
</div>
</c:if>
</div>
<!-- /.data-wrapper -->
</div>
</c:if>
</div>
<!-- /.box-body -->
</div>

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

@ -13,10 +13,7 @@
<jsp:param name="menuCategoryType" value="log" />
<jsp:param name="menuType" value="failureUrl" />
</jsp:include>
<div class="content-wrapper">
<%-- Content Header --%>
<section class="content-header">
<h1>
<la:message key="labels.failure_url_configuration" />
@ -78,6 +75,7 @@
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary" name="search"
value="<la:message key="labels.crud_button_search" />">
<i class="fa fa-search"></i>
<la:message key="labels.crud_button_search" />
</button>
<button type="reset" class="btn btn-secondary" name="reset"
@ -117,8 +115,10 @@
<td>${f:h(data.lastAccessTimeForList)}</td>
<td style="overflow-x: auto;"><la:link
href="details/4/${f:u(data.id)}">
<i class="fa fa-check"></i>
<la:message key="labels.failure_url_link_confirm" />
</la:link> <la:link href="deletepage/3/${f:u(data.id)}">
<i class="fa fa-trash"></i>
<la:message key="labels.crud_link_delete" />
</la:link></td>
</tr>
@ -219,7 +219,6 @@
</div>
</section>
</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>

7
src/main/webapp/WEB-INF/view/admin/joblog/index.jsp
View file

@ -76,10 +76,13 @@
</c:if> <c:if test="${data.endTime==null}">
<la:message key="labels.none" />
</c:if></td>
<td style="overflow-x: auto;"><la:link
<td><la:link styleClass="btn btn-xs btn-primary"
href="details/4/${f:u(data.id)}">
<i class="fa fa-check"></i>
<la:message key="labels.joblog_link_details" />
</la:link> <la:link href="deletepage/3/${f:u(data.id)}">
</la:link> <la:link styleClass="btn btn-xs btn-danger"
href="deletepage/3/${f:u(data.id)}">
<i class="fa fa-trash"></i>
<la:message key="labels.joblog_link_delete" />
</la:link></td>
</tr>

14
src/main/webapp/WEB-INF/view/admin/scheduledjob/details.jsp
View file

@ -107,6 +107,20 @@
<!-- /.box-body -->
<div class="box-footer">
<jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
<c:if test="${running}">
<button type="submit" class="btn btn-danger" name="stop"
value="<la:message key="labels.scheduledjob_button_stop" />">
<i class="fa fa-stop"></i>
<la:message key="labels.scheduledjob_button_stop" />
</button>
</c:if>
<c:if test="${!running}">
<button type="submit" class="btn btn-success" name="start"
value="<la:message key="labels.scheduledjob_button_start" />">
<i class="fa fa-play-circle"></i>
<la:message key="labels.scheduledjob_button_start" />
</button>
</c:if>
</div>
<!-- /.box-footer -->
</div>

8
src/main/webapp/WEB-INF/view/admin/searchlist/index.jsp
View file

@ -13,10 +13,7 @@
<jsp:param name="menuCategoryType" value="log" />
<jsp:param name="menuType" value="searchList" />
</jsp:include>
<div class="content-wrapper">
<%-- Content Header --%>
<section class="content-header">
<h1>
<la:message key="labels.search_list_configuration" />
@ -27,7 +24,6 @@
</la:link></li>
</ol>
</section>
<section class="content">
<div class="row">
<div class="col-xs-12">
@ -57,6 +53,7 @@
<div class="form-group">
<button type="submit" class="btn btn-primary" name="search"
value="<la:message key="labels.search"/>">
<i class="fa fa-search"></i>
<la:message key="labels.search" />
</button>
</div>
@ -124,8 +121,7 @@
<%-- TODO: doc_id --%>
<la:hidden property="docId"
value="${f:u(doc.doc_id)}" />
<la:hidden property="query"
value="${f:u(query)}" />
<la:hidden property="query" value="${f:u(query)}" />
<button type="submit"
class="btn btn-outline btn-danger">
<i class="fa fa-trash"></i>

8
src/main/webapp/WEB-INF/view/common/admin/crud/buttons.jsp
View file

@ -2,33 +2,40 @@
<c:if test="${crudMode == 1}">
<button type="submit" class="btn" name="list"
value="<la:message key="labels.crud_button_back" />">
<i class="fa fa-arrow-circle-left"></i>
<la:message key="labels.crud_button_back" />
</button>
<button type="submit" class="btn btn-success" name="create"
value="<la:message key="labels.crud_button_create" />">
<i class="fa fa-plus"></i>
<la:message key="labels.crud_button_create" />
</button>
</c:if>
<c:if test="${crudMode == 2}">
<button type="submit" class="btn" name="edit" value="back">
<i class="fa fa-arrow-circle-left"></i>
<la:message key="labels.crud_button_back" />
</button>
<button type="submit" class="btn btn-warning" name="update"
value="<la:message key="labels.crud_button_update" />">
<i class="fa fa-pencil"></i>
<la:message key="labels.crud_button_update" />
</button>
</c:if>
<c:if test="${crudMode == 4}">
<button type="submit" class="btn" name="list" value="back">
<i class="fa fa-arrow-circle-left"></i>
<la:message key="labels.crud_button_back" />
</button>
<button type="submit" class="btn btn-warning" name="edit"
value="<la:message key="labels.crud_button_edit" />">
<i class="fa fa-pencil"></i>
<la:message key="labels.crud_button_edit" />
</button>
<button type="button" class="btn btn-danger" name="delete"
data-toggle="modal" data-target="#confirmToDelete"
value="<la:message key="labels.crud_button_delete" />">
<i class="fa fa-trash"></i>
<la:message key="labels.crud_button_delete" />
</button>
<div class="modal modal-danger fade" id="confirmToDelete" tabindex="-1"
@ -57,6 +64,7 @@
<button type="submit" class="btn btn-outline btn-danger"
name="delete"
value="<la:message key="labels.crud_button_delete" />">
<i class="fa fa-trash"></i>
<la:message key="labels.crud_button_delete" />
</button>
</div>

2
src/main/webapp/WEB-INF/view/common/admin/crud/header.jsp
View file

@ -20,11 +20,13 @@
<c:choose>
<c:when test="${crudMode == null}">
<la:link href="createnew" styleClass="btn btn-success btn-xs">
<i class="fa fa-plus"></i>
<la:message key="labels.web_crawling_link_create_new" />
</la:link>
</c:when>
<c:otherwise>
<la:link href="/admin/webconfig" styleClass="btn btn-primary btn-xs">
<i class="fa fa-th-list"></i>
<la:message key="labels.crud_link_list" />
</la:link>
</c:otherwise>