community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #564 from DimalChandrasiri/release-2.0.x

Browse Source 
Release 2.0.x
This commit is contained in:
Rasika Perera 2017-01-20 15:39:48 +05:30 committed by GitHub
commit 2816d374d2
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/search.hbs
View File

@ -50,9 +50,9 @@
<div class="wr-form"> <div class="wr-form">
<p class="page-sub-title">Advanced Device Search</p> <p class="page-sub-title">Advanced Device Search</p>
<hr/> <hr/>
<div id="device-listing-status" class="raw hidden"> <div id="device-listing-status" class="row hidden">
<div class="col-lg-12 col-md-12"> <div class="col-lg-12 col-md-12">
<ul style="list-style-type: none;"> <ul style="list-style-type: none; padding:0px;">
<li class="message message-info"> <li class="message message-info">
<h4> <h4>
<i class="icon fw fw-info"></i> <i class="icon fw fw-info"></i>
@ -90,7 +90,9 @@
<br> <br>
<div id="customSearchParam" class="col-lg-10 col-md-10"> <div id="customSearchParam" class="col-lg-10 col-md-10">
</div> </div>
<div class="row">
<div id="customSearchParam" class="col-lg-12 col-md-12"></div>
</div> </div>
</div> </div>
</div> </div>

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
View File

@ -460,8 +460,12 @@ function loadDevices(searchType, searchParam) {
$("#loading-content").remove(); $("#loading-content").remove();
attachDeviceEvents(); attachDeviceEvents();
$(this).closest('.dataTables_wrapper').find('div[id$=_filter] input') if($('.advance-search').length < 1){
.after('<a href="'+context+'/devices/search" class="add-padding-3x">Advance Search</a>') $(this).closest('.dataTables_wrapper').find('div[id$=_filter] input')
.after('<a href="'+context+'/devices/search"' +
' class="advance-search add-padding-3x">Advance Search</a>');
}
}, { }, {
"placeholder": "Search By Device Name", "placeholder": "Search By Device Name",
"searchKey": "name" "searchKey": "name"