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 branch 'master' of https://github.com/wso2/carbon-device-mgt

Browse Source
This commit is contained in:
thusithakalugamage 2016-10-06 17:46:59 +05:30
commit 1a1f79b1b4
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,18 @@
under the License. under the License.
}} }}
{{unit "cdmf.unit.ui.title" pageTitle="Notification Listing"}} {{unit "cdmf.unit.ui.title" pageTitle="Notification Listing"}}
{{#zone "breadcrumbs"}}
<li>
<a href="{{@app.context}}/">
<i class="icon fw fw-home"></i>
</a>
</li>
<li>
<a href="{{@app.context}}/notification-listing">
Notifications
</a>
</li>
{{/zone}}
{{#zone "content"}} {{#zone "content"}}
{{unit "cdmf.unit.notification.listing"}} {{unit "cdmf.unit.notification.listing"}}
{{/zone}} {{/zone}}

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.data-tables-extended/public/js/dataTables.extended.js
View File

@ -186,14 +186,14 @@ $.fn.datatables_extended = function(settings){
$(button).addClass("active").html('Cancel'); $(button).addClass("active").html('Cancel');
$(button).parent().next().children("button").removeClass("disabled"); $(button).parent().next().children("button").removeClass("disabled");
// EMM related code // EMM related code
$(".viewEnabledIcon").unbind("click"); $(document).off('click','.viewEnabledIcon');
//--- End of EMM related codes //--- End of EMM related codes
} else if ($(button).html() == 'Cancel'){ } else if ($(button).html() == 'Cancel'){
thisTable.removeClass("table-selectable"); thisTable.removeClass("table-selectable");
$(button).addClass("active").html('Select'); $(button).addClass("active").html('Select');
$(button).parent().next().children().addClass("disabled"); $(button).parent().next().children().addClass("disabled");
// EMM related function // EMM related function
$(".viewEnabledIcon").bind("click", InitiateViewOption); $(document).on('click','.viewEnabledIcon',InitiateViewOption);
//--- End of EMM related codes //--- End of EMM related codes
} }
}); });

8
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs
View File

@ -21,10 +21,10 @@
<div class="col-md-12"> <div class="col-md-12">
<!-- content --> <!-- content -->
<div id="config-save-form" class="container col-centered wr-content"> <div id="config-save-form" class="container col-centered wr-content">
<br> <h1 class="page-sub-title">
<h4> Device Notifications </h4> Device Notifications
<br> </h1>
<br> </br>
<div class="wr-advance-operations"> <div class="wr-advance-operations">
<div class="row no-gutter"> <div class="row no-gutter">
<div class="wr-hidden-operations-nav col-lg-4"> <div class="wr-hidden-operations-nav col-lg-4">

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/public/js/notification-listing.js
View File

@ -65,7 +65,6 @@ function loadNotifications() {
function showAdvanceOperation(operation, button) { function showAdvanceOperation(operation, button) {
$(button).addClass('selected'); $(button).addClass('selected');
$(button).siblings().removeClass('selected'); $(button).siblings().removeClass('selected');
if ($(button).attr("id") == 'allNotifications') { if ($(button).attr("id") == 'allNotifications') {
$("#ast-container").html('<div class="panel-body">You do not have any unread notifications </div>'); $("#ast-container").html('<div class="panel-body">You do not have any unread notifications </div>');
} else if ($(button).attr("id") == 'unReadNotifications') { } else if ($(button).attr("id") == 'unReadNotifications') {
@ -73,7 +72,6 @@ function showAdvanceOperation(operation, button) {
} else { } else {
$("#ast-container").html('<div class="panel-body">You do not have any notifications </div>'); $("#ast-container").html('<div class="panel-body">You do not have any notifications </div>');
} }
var hiddenOperation = ".wr-hidden-operations-content > div"; var hiddenOperation = ".wr-hidden-operations-content > div";
$(hiddenOperation + '[data-operation="' + operation + '"]').show(); $(hiddenOperation + '[data-operation="' + operation + '"]').show();
$(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide(); $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
@ -91,7 +89,7 @@ $(document).ready(function () {
loadNotifications(); loadNotifications();
$("#ast-container").on("click", ".new-notification", function (e) { $("#ast-container").on("click", ".new-notification", function(e) {
var notificationId = $(this).data("id"); var notificationId = $(this).data("id");
// var redirectUrl = $(this).data("url"); // var redirectUrl = $(this).data("url");
var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked"; var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked";