Merge pull request #916 from menakaj/master

Fixes product-iots#745
revert-70aa11f8
Milan Perera 7 years ago committed by GitHub
commit 672b556937

@ -12,6 +12,7 @@
specific language governing permissions and limitations
under the License.
-->
{{unit "cdmf.unit.ui.title" pageTitle="Advanced Search"}}
{{unit "cdmf.unit.ui.modal"}}
{{unit "cdmf.unit.data-tables-extended"}}
{{#zone "breadcrumbs"}}
@ -81,7 +82,7 @@
required.</label>
</div>
<div class="col-md-2 form-group wr-input-control col-fixed-right">
<button id="device-search-btn" class="wr-btn-search ">Search</button>
<button id="device-search-btn add-custom-param" class="wr-btn">Search</button>
</div>
</div>

@ -501,7 +501,7 @@ function loadDevices(searchType, searchParam) {
if ($('.advance-search').length < 1) {
$(this).closest('.dataTables_wrapper').find('div[id$=_filter] input')
.after('<a href="' + context + '/devices/search"' +
' class="advance-search add-padding-3x">Advance Search</a>');
' class="advance-search add-padding-3x">Advanced Search</a>');
}
}, {

@ -6876,10 +6876,11 @@ select > option:hover {
}
.dynamic-search-param {
background-color: lightgrey;
background-color: #ffffff;
padding: 25px;
border: 5px solid navy;
border: 1px solid #bdbdbd;
margin: 25px;
border-radius: 10px;
}
.close-button-div {

Loading…
Cancel
Save