Skip to content
This repository has been archived by the owner on Feb 23, 2018. It is now read-only.

Commit

Permalink
#3 additional search instances
Browse files Browse the repository at this point in the history
  • Loading branch information
@michael-conway
michael-conway committed Nov 30, 2017
1 parent aaa1f5d commit ee7206e
Show file tree
Hide file tree
Showing 13 changed files with 162 additions and 150 deletions.
1 change: 1 addition & 0 deletions src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ <h1 class="page-header pull-left">
"language": i18n,
"destroy": true,
"autoWidth": false,
"searching": false,
"ajax": {
url: '/emc-metalnx-web/userBookmarks/bookmarksPaginated/',
},
Expand Down
1 change: 1 addition & 0 deletions src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,7 @@ <h4 class="modal-title" th:text="#{upload.label}"></h4>
"language": i18n,
"destroy": true,
"autoWidth": false,
"searching": false,
"ajax": {
url: urlService,
"data": function ( d ) {
Expand Down
1 change: 1 addition & 0 deletions ...-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ <h4 class="modal-title" id="myCopyModalLabel">Step 2 - Fill-in the values</h4>
"language": i18n,
"stateSave": true,
"autoWidth": false,
"searching": false,
"stateSaveParams": function (settings, data) {
data.search.search = "";
},
Expand Down
1 change: 1 addition & 0 deletions src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ <h1 class="page-header pull-left">
"language": i18n,
"destroy": true,
"autoWidth": false,
"searching": false,
"ajax": {
url: '/emc-metalnx-web/favorites/favoritesPaginated/',
},
Expand Down
1 change: 1 addition & 0 deletions src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ <h4 class="modal-title" th:text="#{permissions.modal.user.add.title}"></h4>
"language": i18n,
"stateSave": true,
"autoWidth": false,
"searching": false,
"stateSaveParams": function (settings, data) {
data.search.search = "";
},
Expand Down
75 changes: 38 additions & 37 deletions src/emc-metalnx-shared/src/main/resources/views/template/templateList.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</head>
<body>
<div th:fragment="templateList" class="row">

<div class="col-sm-12">
<div class="">
<table class="table table-hover" id="templatesListTable">
Expand All @@ -42,21 +42,21 @@
<th th:text="#{templates.management.table.action.label}"></th>
</tr>
</thead>

<tbody id="fBody">
<tr th:each="template : ${templates}">
<td class="tableCheckBoxCol" th:id="${template.templateName}">
<input
type="checkbox"
name="selectedTemplates"
th:id="${'template_' + template.id }"
<input
type="checkbox"
name="selectedTemplates"
th:id="${'template_' + template.id }"
th:value="${ template.id }" />
</td>
<td>
<span th:if="${template.accessType == 'private'}" class="fa fa-lock"></span>
<span th:if="${template.accessType == 'system'}" class="fa fa-globe"></span>
</td>
<td th:title="${template.templateName}">
<td th:title="${template.templateName}">
<span th:text="${template.templateName}"></span>
</td>
<td th:text="${template.version}" th:title="${template.version}"></td>
Expand All @@ -65,8 +65,8 @@
<td class="hidden-xs hidden-sm" th:text="${template.createTs}" th:title="${template.createTs}"></td>
<td th:text="${template.modifyTs}" th:title="${template.modifyTs}"></td>
<td >
<a type="button" class="btn btn-default btn-xs" title="Edit"
th:id="${'btn_modify_' + template.templateName}"
<a type="button" class="btn btn-default btn-xs" title="Edit"
th:id="${'btn_modify_' + template.templateName}"
th:href="'/emc-metalnx-web/templates/modify/?templateId='+${template.id}">
<i class="fa fa-pencil"></i><span th:text="#{templates.edit.button}"></span>
</a>
Expand All @@ -76,7 +76,7 @@
</table>
</div>
</div>

<!-- Modal -->
<div class="modal fade" id="removalModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
Expand All @@ -91,26 +91,26 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
<div class="alert alert-info" role="alert" id="templatesToBeRemoved"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal"
<button type="button" class="btn btn-default" data-dismiss="modal"
th:text="#{confirmation.message.cancel}">
</button>
<button type="button" class="btn btn-primary" onclick="removeElement();"
<button type="button" class="btn btn-primary" onclick="removeElement();"
th:text="#{confirmation.message.yes}" id="removeTemplatesConfBtn">
</button>
</div>
</div>
</div>
</div>


<script type="text/javascript" th:src="@{/js/jquery.tablesorter.min.js}"></script>
<!-- User removal confirmation -->
<script th:inline="javascript">
/*<![CDATA[*/
$(function(){
// Handle select all checkboxes
$("input[name=selectAllCheckboxes]").change(function(){

//select all collections
if($(this).is(":checked")){
url = "/emc-metalnx-web/templates/selectTemplate/";
Expand All @@ -119,7 +119,7 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
$(this).prop("checked", true);
ajaxEncapsulation(url, "POST", {id: id}, null, null, null);
});

//hiding the rename button
var totalCheckboxesChecked = $("#fBody input[type=checkbox]:checked").length;
if(totalCheckboxesChecked >= 1) {
Expand All @@ -129,7 +129,7 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
$("#actions button").prop("disabled", true);
}
}

//unselect all collections
else {
$("#actions button").prop("disabled", true);
Expand All @@ -138,20 +138,20 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
var id = $(this).attr("value");
$(this).prop("checked", false);
ajaxEncapsulation(url, "POST", {id: id}, handleRemoveTemplatePermission, null, null);
});
});
}
});

$("#fBody input[type=checkbox]").change(function(){

id = $(this).attr("value");

if($(this).is(":checked")){
$("#actions button").prop("disabled", false);
url = "/emc-metalnx-web/templates/selectTemplate/";
var totalCheckboxesChecked = $("#fBody input[type=checkbox]:checked").length;
}
else {
else {
url = "/emc-metalnx-web/templates/unselectTemplate/";
var totalCheckboxesChecked = $("#fBody input[type=checkbox]:checked").length;
if(totalCheckboxesChecked >= 1) {
Expand All @@ -169,15 +169,16 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
}
ajaxEncapsulation(url, "POST", {id: id}, handleRemoveTemplatePermission, null, null);
});

var datatable = $("#templatesListTable").DataTable({
"dom": dtPatternMlxTemplatesList,
"language": i18n,
"stateSave": true,
"searching": false,
"autoWidth": false,
"stateSaveParams": function (settings, data) {
data.search.search = "";
},
},
"initComplete": function(settings){
$('#templatesListTable tbody td').each(function () {
$(this).attr('title', $(this).text().trim());
Expand All @@ -198,44 +199,44 @@ <h4 class="modal-title" id="myModalLabel" th:text="#{confirmation.removal.title}
});
addTemplateActionBtn('templatesListTable',datatable);
});

function handleRemoveTemplatePermission(canRemove){
if(canRemove){
$('#removeTemplatesBtn').parent().removeClass('hideElement');
}else{
$('#removeTemplatesBtn').parent().addClass('hideElement');
}
}

function removeElement() {
window.location = [[${urlMap.URL_DELETE_TEMPLATE}]];
}
}

function confirmTemplateRemoval() {
var itemsToBeRemoved = "";
var itemsToBeRemoved = "";
var checkboxesSelected = $("#templatesListTable #fBody input[name=selectedTemplates]:checked");

checkboxesSelected.each(function(){
console.log($(this));
itemsToBeRemoved += "<span>" + getSelectedTemplate($(this)) + "</span><br />";
});
});

$("#removalModal #templatesToBeRemoved").html(itemsToBeRemoved);
$("#removalModal").modal("show");
}

function exportFilesToXML() {
$("input[type=checkbox]").prop("checked", false);
$("#actions a").hide();
$("#actions a").hide();
window.location = "/emc-metalnx-web/templates/exportTemplatesToXMLFile/";
}

function getSelectedTemplate(checkbox) {
return checkbox.parent().siblings().eq(1).text().trim();
}

/*]]>*/
</script>
</div>
</body>
</html>
</html>
1 change: 1 addition & 0 deletions src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ <h4 class="modal-title" th:text="#{tickets.delete.selected.label}"></h4>
"language": i18n,
"destroy": false,
"autoWidth": false,
"searching": false,
"processing": true,
"stateSaveParams": function (settings, data) {
data.search.search = "";
Expand Down
Loading

0 comments on commit ee7206e

Please sign in to comment.