From e2ae388567e6e8903128c42dac73ddbfc61d214c Mon Sep 17 00:00:00 2001 From: Koki Igarashi <igarashi.kouki@gmail.com> Date: Tue, 7 Jan 2020 12:42:11 +0900 Subject: [PATCH] Add role permission to jsps (#2349) --- .../web/admin/badword/AdminBadwordAction.java | 4 +- .../view/admin/backup/admin_backup.jsp | 2 + .../view/admin/badword/admin_badword.jsp | 6 +- .../admin/badword/admin_badword_details.jsp | 4 +- .../admin/badword/admin_badword_download.jsp | 4 +- .../admin/badword/admin_badword_upload.jsp | 6 +- .../admin/crawlinginfo/admin_crawlinginfo.jsp | 2 + .../admin_crawlinginfo_details.jsp | 6 +- .../dataconfig/admin_dataconfig_details.jsp | 2 + .../view/admin/design/admin_design.jsp | 19 +- .../dict/kuromoji/admin_dict_kuromoji.jsp | 4 +- .../kuromoji/admin_dict_kuromoji_details.jsp | 4 +- .../kuromoji/admin_dict_kuromoji_download.jsp | 4 +- .../admin/dict/mapping/admin_dict_mapping.jsp | 4 +- .../mapping/admin_dict_mapping_details.jsp | 4 +- .../mapping/admin_dict_mapping_download.jsp | 4 +- .../dict/protwords/admin_dict_protwords.jsp | 4 +- .../admin_dict_protwords_details.jsp | 4 +- .../admin_dict_protwords_download.jsp | 4 +- .../admin_dict_stemmeroverride.jsp | 4 +- .../admin_dict_stemmeroverride_details.jsp | 4 +- .../admin_dict_stemmeroverride_download.jsp | 4 +- .../dict/stopwords/admin_dict_stopwords.jsp | 4 +- .../admin_dict_stopwords_details.jsp | 4 +- .../admin_dict_stopwords_download.jsp | 4 +- .../admin/dict/synonym/admin_dict_synonym.jsp | 4 +- .../synonym/admin_dict_synonym_details.jsp | 4 +- .../synonym/admin_dict_synonym_download.jsp | 4 +- .../admin/elevateword/admin_elevateword.jsp | 4 +- .../elevateword/admin_elevateword_details.jsp | 4 +- .../admin_elevateword_download.jsp | 4 +- .../WEB-INF/view/admin/esreq/admin_esreq.jsp | 21 +- .../admin/failureurl/admin_failureurl.jsp | 82 +++---- .../failureurl/admin_failureurl_details.jsp | 74 +++--- .../view/admin/fileauth/admin_fileauth.jsp | 2 +- .../fileconfig/admin_fileconfig_details.jsp | 3 +- .../view/admin/general/admin_general.jsp | 14 +- .../view/admin/joblog/admin_joblog.jsp | 87 +++---- .../admin/joblog/admin_joblog_details.jsp | 74 +++--- .../admin/maintenance/admin_maintenance.jsp | 184 ++++++++------- .../view/admin/plugin/admin_plugin.jsp | 83 +++---- .../view/admin/reqheader/admin_reqheader.jsp | 2 +- .../view/admin/role/admin_role_details.jsp | 74 +++--- .../scheduler/admin_scheduler_details.jsp | 116 ++++----- .../admin/searchlist/admin_searchlist.jsp | 170 +++++++------- .../searchlog/admin_searchlog_details.jsp | 74 +++--- .../view/admin/storage/admin_storage.jsp | 203 ++++++++-------- .../view/admin/suggest/admin_suggest.jsp | 222 +++++++++--------- .../view/admin/upgrade/admin_upgrade.jsp | 2 +- .../view/admin/webauth/admin_webauth.jsp | 2 +- .../view/admin/wizard/admin_wizard.jsp | 14 +- 51 files changed, 849 insertions(+), 793 deletions(-) diff --git a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java index 70295dff7..00b67a00a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java @@ -192,14 +192,14 @@ public class AdminBadwordAction extends FessAdminAction { // Download // ------- @Execute - @Secured({ ROLE }) + @Secured({ ROLE, ROLE + VIEW }) public HtmlResponse downloadpage() { saveToken(); return asDownloadHtml(); } @Execute - @Secured({ ROLE }) + @Secured({ ROLE, ROLE + VIEW }) public ActionResponse download(final DownloadForm form) { verifyToken(() -> asDownloadHtml()); diff --git a/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp b/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp index 854cb5bbe..6969aef8b 100644 --- a/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp +++ b/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp @@ -42,6 +42,7 @@ <div class="data-wrapper"> <div class="row"> <div class="col-sm-12"> + <c:if test="${editable}"> <la:form action="/admin/backup/upload/" enctype="multipart/form-data" styleClass="form-inline"> <div class="form-group"> <label for="bulkFile"> <la:message key="labels.backup_bulk_file" /> @@ -52,6 +53,7 @@ <la:message key="labels.backup_button_upload" /> </button> </la:form> + </c:if> </div> <div class="col-sm-12"> <table class="table table-bordered table-striped dataTable"> diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp index db549083e..af55f36af 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp @@ -34,11 +34,11 @@ </h3> <div class="btn-group pull-right"> <la:link href="/admin/badword" - styleClass="btn btn-default btn-xs"> + styleClass="btn btn-default btn-xs "> <em class="fa fa-th-list"></em> <la:message key="labels.bad_word_link_list" /> </la:link> - <la:link href="createnew" styleClass="btn btn-success btn-xs"> + <la:link href="createnew" styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.bad_word_link_create" /> </la:link> @@ -47,7 +47,7 @@ <em class="fa fa-download"></em> <la:message key="labels.bad_word_link_download" /> </la:link> - <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.bad_word_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp index 8bd1e352b..bd899bc5a 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp @@ -64,7 +64,7 @@ <la:message key="labels.bad_word_link_list" /> </la:link> <la:link href="../createnew" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.bad_word_link_create" /> @@ -76,7 +76,7 @@ key="labels.bad_word_link_download" /> </la:link> <la:link href="../uploadpage" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.bad_word_link_upload" /> diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp index 9299ac09a..7c27ebade 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp @@ -42,7 +42,7 @@ <la:message key="labels.bad_word_link_list" /> </la:link> <la:link href="../createnew" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.bad_word_link_create" /> </la:link> @@ -52,7 +52,7 @@ <la:message key="labels.bad_word_link_download" /> </la:link> <la:link href="../uploadpage" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.bad_word_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp index 06e6e9186..86019ed20 100644 --- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp +++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp @@ -41,7 +41,7 @@ <la:message key="labels.bad_word_link_list" /> </la:link> <la:link href="../createnew" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.bad_word_link_create" /> </la:link> @@ -51,7 +51,7 @@ <la:message key="labels.bad_word_link_download" /> </la:link> <la:link href="../uploadpage" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.bad_word_link_upload" /> </la:link> @@ -66,6 +66,7 @@ </la:info> <la:errors /> </div> + <c:if test="${editable}"> <la:form action="/admin/badword/upload/" enctype="multipart/form-data"> <table class="table table-bordered"> <tbody> @@ -88,6 +89,7 @@ </tfoot> </table> </la:form> + </c:if> </div> <!-- /.box-body --> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp index f32cd053c..7b351a044 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp @@ -111,6 +111,7 @@ <script>location.href = "${contextPath}/admin/crawlinginfo/list/${pager.allPageCount}";</script> </c:if> <div class="row"> + <c:if test="${editable}"> <la:form action="/admin/crawlinginfo/"> <div class="col-sm-12 center"> <button type="button" class="btn btn-danger" @@ -157,6 +158,7 @@ </div> </div> </la:form> + </c:if> </div> </c:if> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp index 51ea2a30c..24669c205 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp @@ -75,8 +75,8 @@ <tr> <th><la:message key="labels.crawling_info_session_id" /></th> - <td><a - href="${fe:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}">${f:h(sessionId)}</a> + <td><a <c:if test="${fe:permission('admin-searchlist-view')}"> + href="${fe:url('/admin/searchlist/search')}?q=segment:${f:u(sessionId)}" </c:if> >${f:h(sessionId)}</a> <la:hidden property="sessionId" /></td> </tr> <c:forEach var="info" items="${crawlingInfoParamItems}"> @@ -96,6 +96,7 @@ <em class="fa fa-arrow-circle-left"></em> <la:message key="labels.crawling_info_button_back" /> </button> + <c:if test="${editable}"> <button type="button" class="btn btn-danger" name="delete" data-toggle="modal" data-target="#confirmToDelete" value="<la:message key="labels.crawling_info_button_delete" />"> @@ -135,6 +136,7 @@ </div> </div> </div> + </c:if> <c:if test="${running}"> <button type="submit" class="btn btn-warning" name="threaddump" value="<la:message key="labels.crawling_info_thread_dump" />"> diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp index 2155359d5..d8d5429e6 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp @@ -112,11 +112,13 @@ <!-- /.box-body --> <div class="box-footer"> <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include> + <c:if test="${fe:permission('admin-scheduler')}"> <la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/data_crawling/${f:u(id)}/${fe:base64(name)}"> <em class="fa fa-plus-circle"></em> <la:message key="labels.data_crawling_button_create_job" /> </la:link> + </c:if> </div> <!-- /.box-footer --> </div> 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 fa986764a..9a4ce9d7f 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 @@ -53,6 +53,7 @@ <em class="fa fa-download"></em> <la:message key="labels.design_download_button" /> </button> + <c:if test="${editable}"> <button type="button" class="btn btn-danger" name="delete" data-toggle="modal" data-target="#confirmToDelete" value="<la:message key="labels.design_delete_button" />"> @@ -92,11 +93,13 @@ </div> </div> </div> + </c:if> </div> <!-- /.box-footer --> </la:form> </div> <!-- /.box --> + <c:if test="${editable}"> <div class="box box-primary"> <la:form action="/admin/design/"> <div class="box-header with-border"> @@ -118,13 +121,13 @@ <!-- /.box-body --> <div class="box-footer"> <button type="submit" class="btn btn-warning" name="edit" - value="<la:message key="labels.design_edit_button" />"> + value="<la:message key="labels.design_edit_button" />"> <em class="fa fa-pencil-alt"></em> <la:message key="labels.design_edit_button" /> </button> <button type="submit" class="btn btn-danger" - name="editAsUseDefault" - value="<la:message key="labels.design_use_default_button" />"> + name="editAsUseDefault" + value="<la:message key="labels.design_use_default_button" />"> <em class="fa fa-recycle"></em> <la:message key="labels.design_use_default_button" /> </button> @@ -132,12 +135,14 @@ <!-- /.box-footer --> </la:form> </div> + </c:if> <!-- /.box --> </div> <div class="col-md-6"> + <c:if test="${editable}"> <div class="box box-primary"> - <la:form action="/admin/design/upload/" - enctype="multipart/form-data"> + <la:form action="/admin/design/upload/" + enctype="multipart/form-data"> <div class="box-header with-border"> <h3 class="box-title"> <la:message key="labels.design_title_file_upload" /> @@ -165,14 +170,14 @@ <!-- /.box-body --> <div class="box-footer"> <button type="submit" class="btn btn-success" name="upload" - value="<la:message key="labels.design_button_upload" />"> + value="<la:message key="labels.design_button_upload" />"> <em class="fa fa-upload"></em> <la:message key="labels.design_button_upload" /> </button> </div> <!-- /.box-footer --> </la:form> - </div> + </div></c:if> <!-- /.box --> </div> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp index 455f747be..9926b34ab 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp @@ -44,7 +44,7 @@ <la:message key="labels.dict_kuromoji_list_link" /> </la:link> <la:link href="createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_kuromoji_link_create" /> </la:link> @@ -54,7 +54,7 @@ <la:message key="labels.dict_kuromoji_link_download" /> </la:link> <la:link href="uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_kuromoji_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp index 09353553a..d6d886b71 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp @@ -68,7 +68,7 @@ <la:message key="labels.dict_kuromoji_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_kuromoji_link_create" /> </la:link> @@ -78,7 +78,7 @@ <la:message key="labels.dict_kuromoji_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_kuromoji_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp index 1de2734a5..240e2bfca 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp @@ -51,7 +51,7 @@ <la:message key="labels.dict_kuromoji_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_kuromoji_link_create" /> </la:link> @@ -61,7 +61,7 @@ <la:message key="labels.dict_kuromoji_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_kuromoji_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp index bc350e2da..0e75d77e4 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp @@ -44,7 +44,7 @@ <la:message key="labels.dict_mapping_list_link" /> </la:link> <la:link href="createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_mapping_link_create" /> </la:link> @@ -54,7 +54,7 @@ <la:message key="labels.dict_mapping_link_download" /> </la:link> <la:link href="uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_mapping_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp index 244182ddd..002b2da61 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp @@ -68,7 +68,7 @@ <la:message key="labels.dict_mapping_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_mapping_link_create" /> </la:link> @@ -78,7 +78,7 @@ <la:message key="labels.dict_mapping_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_mapping_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp index fdb213da0..036a2a20e 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp @@ -51,7 +51,7 @@ <la:message key="labels.dict_mapping_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_mapping_link_create" /> </la:link> @@ -61,7 +61,7 @@ <la:message key="labels.dict_mapping_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_mapping_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp index 179441c3f..2c8f35dbd 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp @@ -44,7 +44,7 @@ <la:message key="labels.dict_protwords_list_link" /> </la:link> <la:link href="createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_protwords_link_create" /> </la:link> @@ -54,7 +54,7 @@ <la:message key="labels.dict_protwords_link_download" /> </la:link> <la:link href="uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_protwords_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp index aa30795f6..0aa475b47 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp @@ -68,7 +68,7 @@ <la:message key="labels.dict_protwords_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_protwords_link_create" /> </la:link> @@ -78,7 +78,7 @@ <la:message key="labels.dict_protwords_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_protwords_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp index 73d57e3d7..f1473cd5c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp @@ -51,7 +51,7 @@ <la:message key="labels.dict_protwords_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_protwords_link_create" /> </la:link> @@ -61,7 +61,7 @@ <la:message key="labels.dict_protwords_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_protwords_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp index efdde40d5..cea9bcf84 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp @@ -44,7 +44,7 @@ <la:message key="labels.dict_stemmeroverride_list_link" /> </la:link> <la:link href="createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_stemmeroverride_link_create" /> </la:link> @@ -54,7 +54,7 @@ <la:message key="labels.dict_stemmeroverride_link_download" /> </la:link> <la:link href="uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_stemmeroverride_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp index fc0567fc5..70ef2bdd4 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp @@ -68,7 +68,7 @@ <la:message key="labels.dict_stemmeroverride_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_stemmeroverride_link_create" /> </la:link> @@ -78,7 +78,7 @@ <la:message key="labels.dict_stemmeroverride_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_stemmeroverride_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp index 3f239b847..c34ae153d 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp @@ -51,7 +51,7 @@ <la:message key="labels.dict_stemmeroverride_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_stemmeroverride_link_create" /> </la:link> @@ -61,7 +61,7 @@ <la:message key="labels.dict_stemmeroverride_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_stemmeroverride_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp index 14097e52f..87f28e149 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp @@ -44,7 +44,7 @@ <la:message key="labels.dict_stopwords_list_link" /> </la:link> <la:link href="createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_stopwords_link_create" /> </la:link> @@ -54,7 +54,7 @@ <la:message key="labels.dict_stopwords_link_download" /> </la:link> <la:link href="uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_stopwords_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp index 2e622bb2f..3f4a1914c 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp @@ -68,7 +68,7 @@ <la:message key="labels.dict_stopwords_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_stopwords_link_create" /> </la:link> @@ -78,7 +78,7 @@ <la:message key="labels.dict_stopwords_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_stopwords_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp index ea1d69db0..c54884d2a 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp @@ -51,7 +51,7 @@ <la:message key="labels.dict_stopwords_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_stopwords_link_create" /> </la:link> @@ -61,7 +61,7 @@ <la:message key="labels.dict_stopwords_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_stopwords_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp index 00a697533..d0f59e290 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp @@ -44,7 +44,7 @@ <la:message key="labels.dict_synonym_list_link" /> </la:link> <la:link href="createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_synonym_link_create" /> </la:link> @@ -54,7 +54,7 @@ <la:message key="labels.dict_synonym_link_download" /> </la:link> <la:link href="uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_synonym_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp index 883c6ee6c..1d4763088 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp @@ -68,7 +68,7 @@ <la:message key="labels.dict_synonym_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_synonym_link_create" /> </la:link> @@ -78,7 +78,7 @@ <la:message key="labels.dict_synonym_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_synonym_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp index 975a7b16d..c626e4574 100644 --- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp @@ -51,7 +51,7 @@ <la:message key="labels.dict_synonym_list_link" /> </la:link> <la:link href="../createnew/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.dict_synonym_link_create" /> </la:link> @@ -61,7 +61,7 @@ <la:message key="labels.dict_synonym_link_download" /> </la:link> <la:link href="../uploadpage/${f:u(dictId)}" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.dict_synonym_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp index d72d866bd..8484a6222 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp @@ -38,7 +38,7 @@ <em class="fa fa-th-list"></em> <la:message key="labels.elevate_word_link_list" /> </la:link> - <la:link href="createnew" styleClass="btn btn-success btn-xs"> + <la:link href="createnew" styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.elevate_word_link_create" /> </la:link> @@ -47,7 +47,7 @@ <em class="fa fa-download"></em> <la:message key="labels.elevate_word_link_download" /> </la:link> - <la:link href="uploadpage" styleClass="btn btn-success btn-xs"> + <la:link href="uploadpage" styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.elevate_word_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp index 65787c77b..b7722dac3 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp @@ -61,7 +61,7 @@ <la:message key="labels.elevate_word_link_list" /> </la:link> <la:link href="../createnew" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.elevate_word_link_create" /> </la:link> @@ -71,7 +71,7 @@ <la:message key="labels.elevate_word_link_download" /> </la:link> <la:link href="../uploadpage" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.elevate_word_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp index d17a11be1..3144a34f5 100644 --- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp +++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp @@ -43,7 +43,7 @@ <la:message key="labels.elevate_word_link_list" /> </la:link> <la:link href="../createnew" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.elevate_word_link_create" /> </la:link> @@ -53,7 +53,7 @@ <la:message key="labels.elevate_word_link_download" /> </la:link> <la:link href="../uploadpage" - styleClass="btn btn-success btn-xs"> + styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-upload"></em> <la:message key="labels.elevate_word_link_upload" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp index 5ed00e809..93b70edac 100644 --- a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp +++ b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp @@ -42,16 +42,17 @@ <div class="data-wrapper"> <div class="row"> <div class="col-sm-12"> - <la:form action="/admin/esreq/upload/" enctype="multipart/form-data" styleClass="form-inline"> - <div class="form-group"> - <label for="requestFile"> <la:message key="labels.esreq_request_file" /> - </label> <input type="file" name="requestFile" class="form-control" /> - </div> - <button type="submit" class="btn btn-success" name="upload"> - <em class="fa fa-upload"></em> - <la:message key="labels.esreq_button_upload" /> - </button> - </la:form> + <c:if test="${editable}"> + <la:form action="/admin/esreq/upload/" enctype="multipart/form-data" styleClass="form-inline"> + <div class="form-group"> + <label for="requestFile"> <la:message key="labels.esreq_request_file" /> + </label> <input type="file" name="requestFile" class="form-control" /> + </div> + <button type="submit" class="btn btn-success" name="upload"> + <em class="fa fa-upload"></em> + <la:message key="labels.esreq_button_upload" /> + </button> + </la:form></c:if> </div> </div> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp index 93fbb8a8f..743ef99e2 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp @@ -130,49 +130,51 @@ <script>location.href = "${contextPath}/admin/failureurl/list/${pager.allPageCount}";</script> </c:if> <div class="row"> - <la:form action="/admin/failureurl/"> - <div class="col-sm-12 center"> - <button type="button" class="btn btn-danger" - data-toggle="modal" data-target="#confirmToDeleteAll"> - <em class="fa fa-trash"></em> - <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> - <button type="submit" class="btn btn-outline btn-danger" - name="deleteall" - value="<la:message key="labels.failure_url_delete_all_link" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.failure_url_delete_all_link" /> - </button> + <c:if test="${editable}"> + <la:form action="/admin/failureurl/"> + <div class="col-sm-12 center"> + <button type="button" class="btn btn-danger" + data-toggle="modal" data-target="#confirmToDeleteAll"> + <em class="fa fa-trash"></em> + <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> + <button type="submit" class="btn btn-outline btn-danger" + name="deleteall" + value="<la:message key="labels.failure_url_delete_all_link" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.failure_url_delete_all_link" /> + </button> + </div> </div> </div> </div> - </div> - </la:form> + </la:form> + </c:if> </div> </c:if> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp index 6b81489c9..a5bfb08d1 100644 --- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp @@ -112,45 +112,47 @@ <em class="fa fa-arrow-circle-left"></em> <la:message key="labels.crud_button_back" /> </button> - <button type="button" class="btn btn-danger" name="delete" - data-toggle="modal" data-target="#confirmToDelete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> - <div class="modal modal-danger fade" id="confirmToDelete" - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="delete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger" name="delete" + data-toggle="modal" data-target="#confirmToDelete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + <div class="modal modal-danger fade" id="confirmToDelete" + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="delete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </c:if> </div> <!-- /.box-footer --> diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp index 06aafa0fa..27f2a907f 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp @@ -24,7 +24,7 @@ <div class="row"> <div class="col-md-12"> <c:if test="${!displayCreateLink}"> - <la:link href="/admin/fileconfig/" styleClass="btn btn-primary"> + <la:link href="/admin/fileconfig/" styleClass="btn btn-primary ${f:h(editableClass)}"> <em class="fa fa-arrow-circle-right"></em> <la:message key="labels.file_auth_create_file_config" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp index 4892d4c01..607308ce4 100644 --- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp @@ -154,11 +154,12 @@ <!-- /.box-body --> <div class="box-footer"> <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include> + <c:if test="${fe:permission('admin-scheduler')}"> <la:link styleClass="btn btn-success" href="/admin/scheduler/createnewjob/file_crawling/${f:u(id)}/${fe:base64(name)}"> <em class="fa fa-plus-circle"></em> <la:message key="labels.file_crawling_button_create_job" /> - </la:link> + </la:link></c:if> </div> <!-- /.box-footer --> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp index 764604662..6ceb14c0d 100644 --- a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp +++ b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp @@ -170,7 +170,7 @@ <div class="input-group"> <la:text styleId="notificationTo" property="notificationTo" styleClass="form-control" /> <span class="input-group-btn"> - <button type="submit" class="btn btn-default" name="sendmail" value="test"> + <button type="submit" class="btn btn-default ${f:h(editableClass)}" name="sendmail" value="test"> <la:message key="labels.send_testmail" /> </button> </span> @@ -516,11 +516,13 @@ </div> <!-- /.box-body --> <div class="box-footer"> - <button type="submit" class="btn btn-warning" name="update" - value="<la:message key="labels.crawl_button_update" />"> - <em class="fa fa-pencil-alt"></em> - <la:message key="labels.crawl_button_update" /> - </button> + <c:if test="${editable}"> + <button type="submit" class="btn btn-warning" name="update" + value="<la:message key="labels.crawl_button_update" />"> + <em class="fa fa-pencil-alt"></em> + <la:message key="labels.crawl_button_update" /> + </button> + </c:if> </div> <!-- /.box-footer --> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp index e242a16c9..7b8a3fd96 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp @@ -109,52 +109,53 @@ <script>location.href = "${contextPath}/admin/joblog/list/${pager.allPageCount}";</script> </c:if> <div class="row"> - <la:form action="/admin/joblog/"> - <div class="col-sm-12 center"> - <button type="button" class="btn btn-danger" - data-toggle="modal" data-target="#confirmToDeleteAll"> - <em class="fa fa-trash"></em> - <la:message key="labels.joblog_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.joblog_delete_all_link" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message - key="labels.joblog_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.joblog_delete_all_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="deleteall" - value="<la:message key="labels.joblog_delete_all_link" />"> - <em class="fa fa-trash"></em> - <la:message - key="labels.joblog_delete_all_link" /> - </button> + <c:if test="${editable}"> + <la:form action="/admin/joblog/"> + <div class="col-sm-12 center"> + <button type="button" class="btn btn-danger" + data-toggle="modal" data-target="#confirmToDeleteAll"> + <em class="fa fa-trash"></em> + <la:message key="labels.joblog_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.joblog_delete_all_link" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message + key="labels.joblog_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.joblog_delete_all_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="deleteall" + value="<la:message key="labels.joblog_delete_all_link" />"> + <em class="fa fa-trash"></em> + <la:message + key="labels.joblog_delete_all_link" /> + </button> + </div> </div> </div> </div> - </div> - </la:form> + </la:form></c:if> </div> </c:if> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp index 8af14f7ef..ebbc5053a 100644 --- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp @@ -105,45 +105,47 @@ <em class="fa fa-arrow-circle-left"></em> <la:message key="labels.joblog_button_back" /> </button> - <button type="button" class="btn btn-danger" name="delete" - data-toggle="modal" data-target="#confirmToDelete" - value="<la:message key="labels.joblog_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.joblog_button_delete" /> - </button> - <div class="modal modal-danger fade" id="confirmToDelete" - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="delete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger" name="delete" + data-toggle="modal" data-target="#confirmToDelete" + value="<la:message key="labels.joblog_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.joblog_button_delete" /> + </button> + <div class="modal modal-danger fade" id="confirmToDelete" + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="delete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </div> <!-- /.box-footer --> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp index 1df642d2f..c661857d3 100644 --- a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp +++ b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp @@ -29,110 +29,112 @@ </la:info> <la:errors /> </div> - <%-- Message: END --%> - <div class="col-md-12"> - <div class="box box-primary"> - <div class="box-header with-border"> - <h3 class="box-title"> - <la:message key="labels.upgrade_reindex" /> - </h3> - </div> - <!-- /.box-header --> - <div class="box-body"> - <div class="form-group"> - <label for="replaceAliases" class="col-sm-3 control-label"><la:message - key="labels.replace_aliases" /></label> - <div class="col-sm-9"> - <la:errors property="replaceAliases" /> - <div class="checkbox"> - <label> <la:checkbox styleId="replaceAliases" property="replaceAliases" /> <la:message - key="labels.enabled" /> - </label> + <c:if test="${editable}"> + <%-- Message: END --%> + <div class="col-md-12"> + <div class="box box-primary"> + <div class="box-header with-border"> + <h3 class="box-title"> + <la:message key="labels.upgrade_reindex" /> + </h3> + </div> + <!-- /.box-header --> + <div class="box-body"> + <div class="form-group"> + <label for="replaceAliases" class="col-sm-3 control-label"><la:message + key="labels.replace_aliases" /></label> + <div class="col-sm-9"> + <la:errors property="replaceAliases" /> + <div class="checkbox"> + <label> <la:checkbox styleId="replaceAliases" property="replaceAliases" /> <la:message + key="labels.enabled" /> + </label> + </div> </div> </div> - </div> - <div class="form-group"> - <label for="resetDictionaries" class="col-sm-3 control-label"><la:message - key="labels.reset_dictionaries" /></label> - <div class="col-sm-9"> - <la:errors property="resetDictionaries" /> - <div class="checkbox"> - <label> <la:checkbox styleId="resetDictionaries" property="resetDictionaries" /> <la:message - key="labels.enabled" /> - </label> + <div class="form-group"> + <label for="resetDictionaries" class="col-sm-3 control-label"><la:message + key="labels.reset_dictionaries" /></label> + <div class="col-sm-9"> + <la:errors property="resetDictionaries" /> + <div class="checkbox"> + <label> <la:checkbox styleId="resetDictionaries" property="resetDictionaries" /> <la:message + key="labels.enabled" /> + </label> + </div> </div> </div> - </div> - <div class="form-group"> - <label for="numberOfShardsForDoc" class="col-sm-3 control-label"><la:message - key="labels.number_of_shards_for_doc" /></label> - <div class="col-sm-9"> - <la:errors property="numberOfShardsForDoc" /> - <la:text styleId="numberOfShardsForDoc" property="numberOfShardsForDoc" styleClass="form-control" /> + <div class="form-group"> + <label for="numberOfShardsForDoc" class="col-sm-3 control-label"><la:message + key="labels.number_of_shards_for_doc" /></label> + <div class="col-sm-9"> + <la:errors property="numberOfShardsForDoc" /> + <la:text styleId="numberOfShardsForDoc" property="numberOfShardsForDoc" styleClass="form-control" /> + </div> </div> - </div> - <div class="form-group"> - <label for="autoExpandReplicasForDoc" class="col-sm-3 control-label"><la:message - key="labels.auto_expand_replicas_for_doc" /></label> - <div class="col-sm-9"> - <la:errors property="autoExpandReplicasForDoc" /> - <la:text styleId="autoExpandReplicasForDoc" property="autoExpandReplicasForDoc" styleClass="form-control" /> + <div class="form-group"> + <label for="autoExpandReplicasForDoc" class="col-sm-3 control-label"><la:message + key="labels.auto_expand_replicas_for_doc" /></label> + <div class="col-sm-9"> + <la:errors property="autoExpandReplicasForDoc" /> + <la:text styleId="autoExpandReplicasForDoc" property="autoExpandReplicasForDoc" styleClass="form-control" /> + </div> </div> </div> + <!-- /.box-body --> + <div class="box-footer"> + <button type="submit" class="btn btn-primary ${f:h(editableClass)}" + name="reindexOnly" + value="<la:message key="labels.reindex_start_button"/>"> + <em class="fa fa-arrow-circle-right"></em> + <la:message key="labels.reindex_start_button" /> + </button> + </div> + <!-- /.box-footer --> </div> - <!-- /.box-body --> - <div class="box-footer"> - <button type="submit" class="btn btn-primary" - name="reindexOnly" - value="<la:message key="labels.reindex_start_button"/>"> - <em class="fa fa-arrow-circle-right"></em> - <la:message key="labels.reindex_start_button" /> - </button> - </div> - <!-- /.box-footer --> + <!-- /.box --> </div> - <!-- /.box --> - </div> - <div class="col-md-12"> - <div class="box box-primary"> - <div class="box-header with-border"> - <h3 class="box-title"> - <la:message key="labels.reload_doc_index" /> - </h3> - </div> - <!-- /.box-header --> - <div class="box-footer"> - <button type="submit" class="btn btn-primary" - name="reloadDocIndex" - value="<la:message key="labels.reload_doc_index_button"/>"> - <em class="fa fa-arrow-circle-right"></em> - <la:message key="labels.reload_doc_index_button" /> - </button> + <div class="col-md-12"> + <div class="box box-primary"> + <div class="box-header with-border"> + <h3 class="box-title"> + <la:message key="labels.reload_doc_index" /> + </h3> + </div> + <!-- /.box-header --> + <div class="box-footer"> + <button type="submit" class="btn btn-primary" + name="reloadDocIndex" + value="<la:message key="labels.reload_doc_index_button"/>"> + <em class="fa fa-arrow-circle-right"></em> + <la:message key="labels.reload_doc_index_button" /> + </button> + </div> + <!-- /.box-footer --> </div> - <!-- /.box-footer --> + <!-- /.box --> </div> - <!-- /.box --> - </div> - <div class="col-md-12"> - <div class="box box-primary"> - <div class="box-header with-border"> - <h3 class="box-title"> - <la:message key="labels.clear_crawler_index" /> - </h3> - </div> - <!-- /.box-header --> - <div class="box-footer"> - <button type="submit" class="btn btn-primary" - name="clearCrawlerIndex" - value="<la:message key="labels.clear_crawler_index_button"/>"> - <em class="fa fa-arrow-circle-right"></em> - <la:message key="labels.clear_crawler_index_button" /> - </button> + <div class="col-md-12"> + <div class="box box-primary"> + <div class="box-header with-border"> + <h3 class="box-title"> + <la:message key="labels.clear_crawler_index" /> + </h3> + </div> + <!-- /.box-header --> + <div class="box-footer"> + <button type="submit" class="btn btn-primary" + name="clearCrawlerIndex" + value="<la:message key="labels.clear_crawler_index_button"/>"> + <em class="fa fa-arrow-circle-right"></em> + <la:message key="labels.clear_crawler_index_button" /> + </button> + </div> + <!-- /.box-footer --> </div> - <!-- /.box-footer --> + <!-- /.box --> </div> - <!-- /.box --> - </div> + </c:if> <div class="col-md-12"> <div class="box box-primary"> <div class="box-header with-border"> diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp index 5ecb6a61f..be57a21df 100644 --- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp +++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp @@ -28,7 +28,7 @@ <la:message key="labels.crud_title_list" /> </h3> <div class="btn-group pull-right"> - <la:link href="installplugin" styleClass="btn btn-success btn-xs"> + <la:link href="installplugin" styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.plugin_install" /> </la:link> @@ -61,49 +61,50 @@ <td>${f:h(artifact.name)}</td> <td>${f:h(artifact.version)}</td> <td> - <button type="button" class="btn btn-danger btn-xs" name="delete" data-toggle="modal" - data-target='#confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version).replace(".", "\\.")}' - value="<la:message key="labels.design_delete_button" />" - > - <em class="fa fa-trash"></em> - <la:message key="labels.design_delete_button" /> - </button> - <div class="modal modal-danger fade" id='confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version)}' - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <la:form action="/admin/plugin/" styleClass="form-horizontal"> - <input type="hidden" name="name" value="${f:h(artifact.name)}"> - <input type="hidden" name="version" value="${f:h(artifact.version)}"> - <button type="submit" class="btn btn-outline btn-danger" name="delete" - value="<la:message key="labels.crud_button_delete" />" - > - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger btn-xs" name="delete" data-toggle="modal" + data-target='#confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version).replace(".", "\\.")}' + value="<la:message key="labels.design_delete_button" />" + > + <em class="fa fa-trash"></em> + <la:message key="labels.design_delete_button" /> + </button> + <div class="modal modal-danger fade" id='confirmToDelete-${f:h(artifact.name)}-${f:h(artifact.version)}' + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> </button> - </la:form> + <la:form action="/admin/plugin/" styleClass="form-horizontal"> + <input type="hidden" name="name" value="${f:h(artifact.name)}"> + <input type="hidden" name="version" value="${f:h(artifact.version)}"> + <button type="submit" class="btn btn-outline btn-danger" name="delete" + value="<la:message key="labels.crud_button_delete" />" + > + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </la:form> + </div> </div> </div> - </div> - </div> + </div></c:if> </td> </tr> </c:forEach> diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp index 8a072e956..965324e66 100644 --- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp +++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp @@ -24,7 +24,7 @@ <div class="row"> <div class="col-md-12"> <c:if test="${!displayCreateLink}"> - <la:link href="../webconfig/" styleClass="btn btn-primary"> + <la:link href="../webconfig/" styleClass="btn btn-primary ${f:h(editableClass)}"> <la:message key="labels.reqheader_create_web_config" /> </la:link> </c:if> diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp index 297041dc4..4d9b0dd0d 100644 --- a/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp @@ -60,45 +60,47 @@ <em class="fa fa-arrow-circle-left"></em> <la:message key="labels.crud_button_back" /> </button> - <button type="button" class="btn btn-danger" name="delete" - data-toggle="modal" data-target="#confirmToDelete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> - <div class="modal modal-danger fade" id="confirmToDelete" 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="delete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger" name="delete" + data-toggle="modal" data-target="#confirmToDelete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + <div class="modal modal-danger fade" id="confirmToDelete" 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="delete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </div> <!-- /.box-footer --> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp index 53b604c63..fdc3688bb 100644 --- a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp @@ -110,65 +110,67 @@ <em class="fa fa-arrow-circle-left"></em> <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" />"> - <em class="fa fa-pencil-alt"></em> - <la:message key="labels.crud_button_edit" /> - </button> - <c:if test="${!running and !systemJobId}"> - <button type="button" class="btn btn-danger" name="delete" - data-toggle="modal" data-target="#confirmToDelete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> - <div class="modal modal-danger fade" id="confirmToDelete" 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="delete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="submit" class="btn btn-warning" name="edit" + value="<la:message key="labels.crud_button_edit" />"> + <em class="fa fa-pencil-alt"></em> + <la:message key="labels.crud_button_edit" /> + </button> + <c:if test="${!running and !systemJobId}"> + <button type="button" class="btn btn-danger" name="delete" + data-toggle="modal" data-target="#confirmToDelete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + <div class="modal modal-danger fade" id="confirmToDelete" 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="delete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> + </div> </div> </div> - </div> - </div> - </c:if> - <c:if test="${running}"> - <button type="submit" class="btn btn-danger" name="stop" - value="<la:message key="labels.scheduledjob_button_stop" />"> - <em class="fa fa-stop"></em> - <la:message key="labels.scheduledjob_button_stop" /> - </button> - </c:if> - <c:if test="${!running && enabled}"> - <button type="submit" class="btn btn-success" name="start" - value="<la:message key="labels.scheduledjob_button_start" />"> - <em class="fa fa-play-circle"></em> - <la:message key="labels.scheduledjob_button_start" /> - </button> + </c:if> + <c:if test="${running}"> + <button type="submit" class="btn btn-danger" name="stop" + value="<la:message key="labels.scheduledjob_button_stop" />"> + <em class="fa fa-stop"></em> + <la:message key="labels.scheduledjob_button_stop" /> + </button> + </c:if> + <c:if test="${!running && enabled}"> + <button type="submit" class="btn btn-success" name="start" + value="<la:message key="labels.scheduledjob_button_start" />"> + <em class="fa fa-play-circle"></em> + <la:message key="labels.scheduledjob_button_start" /> + </button> + </c:if> </c:if> </div> <!-- /.box-footer --> diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp index e96ec97f9..4b4d298ce 100644 --- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp +++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp @@ -34,7 +34,7 @@ <la:message key="labels.search_list_configuration" /> </h3> <div class="btn-group pull-right"> - <la:link href="/admin/searchlist/createnew?q=${f:u(q)}" styleClass="btn btn-success btn-xs"> + <la:link href="/admin/searchlist/createnew?q=${f:u(q)}" styleClass="btn btn-success btn-xs ${f:h(editableClass)}"> <em class="fa fa-plus"></em> <la:message key="labels.crud_link_create" /> </la:link> @@ -100,20 +100,22 @@ </div> <div class="body col-sm-2 text-right"> <la:message key="labels.doc_score" />${f:h(doc.score)}<br> - <la:link href="/admin/searchlist/edit?crudMode=2&doc.doc_id=${f:u(doc.doc_id)}&q=${f:u(q)}" - styleClass="btn btn-xs btn-warning"> - <em class="fa fa-pencil-alt"></em> - <la:message key="labels.crud_button_update" /> - </la:link> - <button type="button" - class="btn btn-xs btn-danger" - data-toggle="modal" data-target="#confirmToDelete" - data-docid="${f:u(doc.doc_id)}" - data-title="${fe:replace(doc.content_title, '<[^>]+>', '')}" - data-url="${f:h(doc.url_link)}"> - <em class="fa fa-trash"></em> - <la:message key="labels.search_list_button_delete" /> - </button> + <c:if test="${editable}"> + <la:link href="/admin/searchlist/edit?crudMode=2&doc.doc_id=${f:u(doc.doc_id)}&q=${f:u(q)}" + styleClass="btn btn-xs btn-warning"> + <em class="fa fa-pencil-alt"></em> + <la:message key="labels.crud_button_update" /> + </la:link> + <button type="button" + class="btn btn-xs btn-danger" + data-toggle="modal" data-target="#confirmToDelete" + data-docid="${f:u(doc.doc_id)}" + data-title="${fe:replace(doc.content_title, '<[^>]+>', '')}" + data-url="${f:h(doc.url_link)}"> + <em class="fa fa-trash"></em> + <la:message key="labels.search_list_button_delete" /> + </button> + </c:if> </div> </li> </c:forEach> @@ -167,51 +169,54 @@ </div> </c:otherwise> </c:choose> - <div class="modal modal-danger fade" id="confirmToDelete" - 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.search_list_button_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.search_list_delete_confirmation" /> - </p> - <p> - <strong id="delete-doc-title"></strong><br /> <span - id="delete-doc-url"></span> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.search_list_button_cancel" /> - </button> - <la:form action="/admin/searchlist/delete"> - <input type="hidden" name="docId" id="docId" /> - <button type="submit" class="btn btn-outline btn-danger" - name="delete" - value="<la:message key="labels.search_list_button_delete" />"> - <em class="fa fa-trash"></em> + <c:if test="${editable}"> + <div class="modal modal-danger fade" id="confirmToDelete" + 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.search_list_button_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.search_list_delete_confirmation" /> + </p> + <p> + <strong id="delete-doc-title"></strong><br /> <span + id="delete-doc-url"></span> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.search_list_button_cancel" /> </button> - </la:form> + <la:form action="/admin/searchlist/delete"> + <input type="hidden" name="docId" id="docId" /> + <button type="submit" class="btn btn-outline btn-danger" + name="delete" + value="<la:message key="labels.search_list_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.search_list_button_delete" /> + </button> + </la:form> + </div> </div> </div> </div> - </div> + </c:if> </div> <!-- /.box-body --> <div class="box-footer"> <c:if test="${f:h(allRecordCount) > 0}"> <div class="row"> + <c:if test="${editable}"> <div class="col-sm-12 center"> <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#confirmToDeleteAll"> @@ -219,43 +224,44 @@ <la:message key="labels.search_list_button_delete_all" /> </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.search_list_button_delete_all" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message - key="labels.search_list_delete_all_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <la:form action="/admin/searchlist/deleteall"> - <la:hidden property="q" /> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.search_list_button_cancel" /> + <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> - <button type="submit" class="btn btn-outline btn-danger" - name="deleteall" - value="<la:message key="labels.search_list_button_delete_all" />"> - <em class="fa fa-trash"></em> + <h4 class="modal-title"> <la:message key="labels.search_list_button_delete_all" /> - </button> - </la:form> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message + key="labels.search_list_delete_all_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <la:form action="/admin/searchlist/deleteall"> + <la:hidden property="q" /> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.search_list_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="deleteall" + value="<la:message key="labels.search_list_button_delete_all" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.search_list_button_delete_all" /> + </button> + </la:form> + </div> </div> </div> </div> - </div> + </c:if> </div> </c:if> </div> diff --git a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp index 2497f93e9..61e932de3 100644 --- a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp +++ b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp @@ -84,45 +84,47 @@ <em class="fa fa-arrow-circle-left"></em> <la:message key="labels.searchlog_configuration_button_back" /> </button> - <button type="button" class="btn btn-danger" name="delete" - data-toggle="modal" data-target="#confirmToDelete" - value="<la:message key="labels.searchlog_configuration_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.searchlog_configuration_button_delete" /> - </button> - <div class="modal modal-danger fade" id="confirmToDelete" - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="delete" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger" name="delete" + data-toggle="modal" data-target="#confirmToDelete" + value="<la:message key="labels.searchlog_configuration_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.searchlog_configuration_button_delete" /> + </button> + <div class="modal modal-danger fade" id="confirmToDelete" + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="delete" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </c:if> </div> <!-- /.box-footer --> diff --git a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp index 442ed65b9..04d1f6385 100644 --- a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp +++ b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp @@ -30,12 +30,14 @@ <c:forEach var="item" varStatus="s" items="${pathItems}"> / <span><a href="${contextPath}/admin/storage/list/${f:u(item.id)}/">${f:h(item.name)}</a></span> </c:forEach> - / <a data-toggle="modal" data-target="#createDir"> <i class="fas fa-folder" aria-hidden="true"></i></a> + / <c:if test="${editable}"><a data-toggle="modal" data-target="#createDir"> <i class="fas fa-folder" aria-hidden="true"></i></a></c:if> </h3> + <c:if test="${editable}"> <span class="pull-right"> <a data-toggle="modal" data-target="#uploadeFile"><i class="fa fa-upload" - aria-hidden="true" - ></i></a> + aria-hidden="true" + ></i></a> </span> + </c:if> </div> <!-- /.box-header --> <div class="box-body"> @@ -48,71 +50,74 @@ </div> <%-- List --%> <div class="data-wrapper"> - <div class="modal modal-primary" id="createDir" tabindex="-1" role="dialog"> - <div class="modal-dialog"> - <div class="modal-content"> - <la:form action="/admin/storage/createDir/" enctype="multipart/form-data" styleClass="form-inline"> - <input type="hidden" name="path" value="${path}" /> - <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.crud_title_create" /> - </h4> - </div> - <div class="modal-body"> - <div class="form-group"> - <label for="name" class="control-label"><la:message key="labels.storage_folder_name" /></label> - <input type="text" name="name" class="form-control"/> + + <c:if test="${editable}"> + <div class="modal modal-primary" id="createDir" tabindex="-1" role="dialog"> + <div class="modal-dialog"> + <div class="modal-content"> + <la:form action="/admin/storage/createDir/" enctype="multipart/form-data" styleClass="form-inline"> + <input type="hidden" name="path" value="${path}" /> + <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.crud_title_create" /> + </h4> + </div> + <div class="modal-body"> + <div class="form-group"> + <label for="name" class="control-label"><la:message key="labels.storage_folder_name" /></label> + <input type="text" name="name" class="form-control"/> + </div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-success" name="createDir"> + <em class="fa fa-make"></em> + <la:message key="labels.crud_button_create" /> + </button> </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-success" name="createDir"> - <em class="fa fa-make"></em> - <la:message key="labels.crud_button_create" /> - </button> - </div> - </la:form> + </la:form> + </div> </div> </div> - </div> - <div class="modal modal-primary" id="uploadeFile" tabindex="-1" role="dialog"> - <div class="modal-dialog"> - <div class="modal-content"> - <la:form action="/admin/storage/upload/" enctype="multipart/form-data" styleClass="form-inline"> - <input type="hidden" name="path" value="${path}" /> - <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.storage_upload_file" /> - </h4> - </div> - <div class="modal-body"> - <div class="form-group"> - <label for="uploadFile" class="control-label"><la:message key="labels.storage_file" /></label> - <input type="file" name="uploadFile" class="form-control" /> + <div class="modal modal-primary" id="uploadeFile" tabindex="-1" role="dialog"> + <div class="modal-dialog"> + <div class="modal-content"> + <la:form action="/admin/storage/upload/" enctype="multipart/form-data" styleClass="form-inline"> + <input type="hidden" name="path" value="${path}" /> + <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.storage_upload_file" /> + </h4> + </div> + <div class="modal-body"> + <div class="form-group"> + <label for="uploadFile" class="control-label"><la:message key="labels.storage_file" /></label> + <input type="file" name="uploadFile" class="form-control" /> + </div> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-success" name="upload"> + <em class="fa fa-upload"></em> + <la:message key="labels.storage_button_upload" /> + </button> </div> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-success" name="upload"> - <em class="fa fa-upload"></em> - <la:message key="labels.storage_button_upload" /> - </button> - </div> - </la:form> + </la:form> + </div> </div> </div> - </div> + </c:if> <div class="row"> <div class="col-sm-12"> @@ -168,47 +173,49 @@ <em class="fa fa-download"></em> <la:message key="labels.design_download_button" /> </a> - <button type="button" class="btn btn-danger btn-xs" name="delete" data-toggle="modal" - data-target="#confirmToDelete-${f:h(data.hashCode)}" - value="<la:message key="labels.design_delete_button" />" - > - <em class="fa fa-times"></em> - <la:message key="labels.design_delete_button" /> - </button> - <div class="modal modal-danger fade" id="confirmToDelete-${f:h(data.hashCode)}" - 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.crud_title_delete" /> : ${f:h(data.name)} - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <la:form action="${contextPath}/admin/storage/delete/${f:h(data.id)}/" styleClass="form-horizontal"> - <button type="submit" class="btn btn-outline btn-danger" name="delete" - value="<la:message key="labels.crud_button_delete" />" - > - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger btn-xs" name="delete" data-toggle="modal" + data-target="#confirmToDelete-${f:h(data.hashCode)}" + value="<la:message key="labels.design_delete_button" />" + > + <em class="fa fa-times"></em> + <la:message key="labels.design_delete_button" /> + </button> + <div class="modal modal-danger fade" id="confirmToDelete-${f:h(data.hashCode)}" + 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.crud_title_delete" /> : ${f:h(data.name)} + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> </button> - </la:form> + <la:form action="${contextPath}/admin/storage/delete/${f:h(data.id)}/" styleClass="form-horizontal"> + <button type="submit" class="btn btn-outline btn-danger" name="delete" + value="<la:message key="labels.crud_button_delete" />" + > + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </la:form> + </div> </div> </div> </div> - </div> + </c:if> </c:if> </td> </tr> diff --git a/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp b/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp index 686ce0dce..fdb3356c9 100644 --- a/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp +++ b/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp @@ -48,135 +48,141 @@ <td><la:message key="labels.suggest_word_type_all" /></td> <td class="text-right">${f:h(totalWordsNum)}</td> <td class="text-center"> - <button type="button" class="btn btn-danger btn-xs" name="deleteAllWords" - data-toggle="modal" data-target="#confirmToAllDelete" - value="<la:message key="labels.design_delete_button" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.design_delete_button" /> - </button> - <div class="modal modal-danger fade" id="confirmToAllDelete" - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="deleteAllWords" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger btn-xs" name="deleteAllWords" + data-toggle="modal" data-target="#confirmToAllDelete" + value="<la:message key="labels.design_delete_button" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.design_delete_button" /> + </button> + <div class="modal modal-danger fade" id="confirmToAllDelete" + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="deleteAllWords" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </td> </tr> <tr> <td><la:message key="labels.suggest_word_type_document" /></td> <td class="text-right">${f:h(documentWordsNum)}</td> <td class="text-center"> - <button type="button" class="btn btn-danger btn-xs" name="deleteDocumentWords" - data-toggle="modal" data-target="#confirmToDocumentDelete" - value="<la:message key="labels.design_delete_button" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.design_delete_button" /> - </button> - <div class="modal modal-danger fade" id="confirmToDocumentDelete" - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="deleteDocumentWords" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger btn-xs" name="deleteDocumentWords" + data-toggle="modal" data-target="#confirmToDocumentDelete" + value="<la:message key="labels.design_delete_button" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.design_delete_button" /> + </button> + <div class="modal modal-danger fade" id="confirmToDocumentDelete" + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="deleteDocumentWords" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </td> </tr> <tr> <td><la:message key="labels.suggest_word_type_query" /></td> <td class="text-right">${f:h(queryWordsNum)}</td> <td class="text-center"> - <button type="button" class="btn btn-danger btn-xs" name="deleteQueryWords" - data-toggle="modal" data-target="#confirmToQueryDelete" - value="<la:message key="labels.design_delete_button" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.design_delete_button" /> - </button> - <div class="modal modal-danger fade" id="confirmToQueryDelete" - 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.crud_title_delete" /> - </h4> - </div> - <div class="modal-body"> - <p> - <la:message key="labels.crud_delete_confirmation" /> - </p> - </div> - <div class="modal-footer"> - <button type="button" class="btn btn-outline pull-left" - data-dismiss="modal"> - <la:message key="labels.crud_button_cancel" /> - </button> - <button type="submit" class="btn btn-outline btn-danger" - name="deleteQueryWords" - value="<la:message key="labels.crud_button_delete" />"> - <em class="fa fa-trash"></em> - <la:message key="labels.crud_button_delete" /> - </button> + <c:if test="${editable}"> + <button type="button" class="btn btn-danger btn-xs" name="deleteQueryWords" + data-toggle="modal" data-target="#confirmToQueryDelete" + value="<la:message key="labels.design_delete_button" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.design_delete_button" /> + </button> + <div class="modal modal-danger fade" id="confirmToQueryDelete" + 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.crud_title_delete" /> + </h4> + </div> + <div class="modal-body"> + <p> + <la:message key="labels.crud_delete_confirmation" /> + </p> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-outline pull-left" + data-dismiss="modal"> + <la:message key="labels.crud_button_cancel" /> + </button> + <button type="submit" class="btn btn-outline btn-danger" + name="deleteQueryWords" + value="<la:message key="labels.crud_button_delete" />"> + <em class="fa fa-trash"></em> + <la:message key="labels.crud_button_delete" /> + </button> + </div> </div> </div> </div> - </div> + </c:if> </td> </tr> </tbody> diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp index 551b48d17..5e9706e59 100644 --- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp +++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp @@ -63,7 +63,7 @@ </div> <!-- /.box-body --> <div class="box-footer"> - <button type="submit" class="btn btn-primary" + <button type="submit" class="btn btn-primary ${f:h(editableClass)}" name="upgradeFrom" value="<la:message key="labels.upgrade_start_button"/>"> <em class="fa fa-arrow-circle-right"></em> diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp index e0a059c50..0fdf2e47f 100644 --- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp +++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp @@ -24,7 +24,7 @@ <div class="row"> <div class="col-md-12"> <c:if test="${!displayCreateLink}"> - <la:link href="../webconfig/" styleClass="btn btn-primary"> + <la:link href="../webconfig/" styleClass="btn btn-primary ${f:h(editableClass)}"> <em class="fa fa-arrow-circle-right"></em> <la:message key="labels.webauth_create_web_config" /> </la:link> diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp index 33b98b311..089272eb2 100644 --- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp +++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp @@ -50,12 +50,14 @@ </div> <!-- /.box-body --> <div class="box-footer"> - <button type="submit" class="btn btn-primary" - name="crawlingConfigForm" - value="<la:message key="labels.wizard_start_button"/>"> - <em class="fa fa-arrow-circle-right"></em> - <la:message key="labels.wizard_start_button" /> - </button> + <c:if test="${editable}"> + <button type="submit" class="btn btn-primary" + name="crawlingConfigForm" + value="<la:message key="labels.wizard_start_button"/>"> + <em class="fa fa-arrow-circle-right"></em> + <la:message key="labels.wizard_start_button" /> + </button> + </c:if> </div> <!-- /.box-footer --> </div> -- GitLab