From e2ee7974622ef5108695c9c634cfdd0bdbd42c89 Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 6 Oct 2016 12:20:07 +0530 Subject: [PATCH 01/22] Fix for EMM-1700 --- .../cdmf.page.notification.listing/listing.hbs | 13 ++++++++++++- .../cdmf.unit.notification.listing/listing.hbs | 8 ++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.notification.listing/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.notification.listing/listing.hbs index b2b78e87c8..bcac7b4af2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.notification.listing/listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.notification.listing/listing.hbs @@ -16,7 +16,18 @@ under the License. }} {{unit "cdmf.unit.ui.title" pageTitle="Notification Listing"}} - +{{#zone "breadcrumbs"}} +
  • + + + +
    • +
  • + + Notifications + +
    • +{{/zone}} {{#zone "content"}} {{unit "cdmf.unit.notification.listing"}} {{/zone}} \ No newline at end of file diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs index b542e9037c..9e05b2c4ca 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.notification.listing/listing.hbs @@ -21,10 +21,10 @@
    -
    -

    Device Notifications

    -
    -
    +

    + Device Notifications +

    +
    From c022f51467b90e661f370fcd6950ec64394a7b48 Mon Sep 17 00:00:00 2001 From: Megala Date: Thu, 6 Oct 2016 15:44:53 +0530 Subject: [PATCH 02/22] Fixing EMM-1587 --- .../email/sender/core/service/EmailSenderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java index 393350445f..ba21fd81fd 100644 --- a/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java +++ b/components/email-sender/org.wso2.carbon.email.sender.core/src/main/java/org/wso2/carbon/email/sender/core/service/EmailSenderServiceImpl.java @@ -109,7 +109,7 @@ public class EmailSenderServiceImpl implements EmailSenderService { Options options = new Options(); options.setProperty(MessageContext.TRANSPORT_HEADERS, headerMap); options.setProperty("FORCE_CONTENT_TYPE_BASED_FORMATTER", "true"); - options.setProperty(Constants.Configuration.MESSAGE_TYPE, "text/html"); + options.setProperty(Constants.Configuration.MESSAGE_TYPE, "application/xml"); options.setProperty(Constants.Configuration.CONTENT_TYPE, "text/html"); options.setTo(new EndpointReference(EMAIL_URI_SCHEME + to)); From 4bbb378d268e3ad2819f5a4f4cdd1ef06784d6e8 Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 6 Oct 2016 16:26:50 +0530 Subject: [PATCH 03/22] conicting solving --- .../public/js/notification-listing.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/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 b/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 index 29026b8278..a68e69d7bb 100644 --- a/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 +++ b/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 @@ -65,7 +65,6 @@ function loadNotifications() { function showAdvanceOperation(operation, button) { $(button).addClass('selected'); $(button).siblings().removeClass('selected'); - if ($(button).attr("id") == 'allNotifications') { $("#ast-container").html('
    You do not have any unread notifications
    '); } else if ($(button).attr("id") == 'unReadNotifications') { @@ -73,7 +72,6 @@ function showAdvanceOperation(operation, button) { } else { $("#ast-container").html('
    You do not have any notifications
    '); } - var hiddenOperation = ".wr-hidden-operations-content > div"; $(hiddenOperation + '[data-operation="' + operation + '"]').show(); $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide(); @@ -91,7 +89,7 @@ $(document).ready(function () { loadNotifications(); - $("#ast-container").on("click", ".new-notification", function (e) { + $("#ast-container").on("click", ".new-notification", function(e) { var notificationId = $(this).data("id"); // var redirectUrl = $(this).data("url"); var query = deviceMgtAPIBaseURI + "/notifications" + "/" + notificationId + "/mark-checked"; From 909e7836cac8f8ccf206e0baac9137f2905f9dc3 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Thu, 6 Oct 2016 16:41:31 +0530 Subject: [PATCH 04/22] Header nav menu responsiveness improvements --- .../app/units/uuf.unit.navbar/navbar.hbs | 6 ++-- .../uuf.unit.theme/public/css/theme-wso2.css | 29 ++++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs index e151b8a534..db9488ed02 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs @@ -30,13 +30,11 @@ {{defineZone "navbarHeader"}}
    - {{defineZone "navbarBelow"}} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css index 7e81de65e0..02283db595 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css @@ -3054,7 +3054,7 @@ tbody.collapse.in { right: auto; } } -@media (max-width : 480px) { +@media (max-width : 768px) { .navbar-right .dropdown-menu-right { left: auto; right: 0; @@ -3901,6 +3901,33 @@ tbody.collapse.in { margin-right: 0; } } +@media (max-width: 768px) { + .navbar-right { + margin-right: -15px; + } + .navbar-default .navbar-toggle{ + + } + .navbar-default .navbar-toggle .icon-bar{ + background-color:#fff!important; + } + .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus{ + background-color:#526a84!important; + } + .navbar-default .navbar-toggle:hover .icon-bar, .navbar-default .navbar-toggle:focus .icon-bar{ + background-color:#798EA5!important; + } + .navbar-toggle { + margin-right: 10px; + padding: 13px; + margin-top: 0px; + margin-bottom: 0px; + } + #navbar .navbar-nav{ + margin:0px; + border-bottom:1px solid #798EA5; + } +} .navbar-default { background-color: #f8f8f8; border-color: #e7e7e7; From fc902ba602285344a09c5e4bcda7fabc0c04d44c Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 6 Oct 2016 17:25:47 +0530 Subject: [PATCH 05/22] fix database extended issue --- .../public/js/dataTables.extended.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/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 b/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 index 339b60f069..394a679f07 100644 --- a/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 +++ b/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 @@ -186,14 +186,14 @@ $.fn.datatables_extended = function(settings){ $(button).addClass("active").html('Cancel'); $(button).parent().next().children("button").removeClass("disabled"); // EMM related code - $(".viewEnabledIcon").unbind("click"); + $(document).off('click','.viewEnabledIcon'); //--- End of EMM related codes } else if ($(button).html() == 'Cancel'){ thisTable.removeClass("table-selectable"); $(button).addClass("active").html('Select'); $(button).parent().next().children().addClass("disabled"); // EMM related function - $(".viewEnabledIcon").bind("click", InitiateViewOption); + $(document).on('click','.viewEnabledIcon',InitiateViewOption); //--- End of EMM related codes } }); From ac27349dae2c0291d0dd2dba808bcd6d79c0f512 Mon Sep 17 00:00:00 2001 From: thusithakalugamage Date: Thu, 6 Oct 2016 17:45:55 +0530 Subject: [PATCH 06/22] Header nav menu responsiveness improvements --- .../app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs index d2aba63fdc..60ac43c41e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs @@ -31,12 +31,8 @@ {{/if}} -