From 737d1da07b24d17f14b5b585662051e8fcf2499b Mon Sep 17 00:00:00 2001 From: Rasika Perera Date: Thu, 19 Jan 2017 17:04:01 +0530 Subject: [PATCH 1/5] Changed webapps title [EMM] into [IoT Server] --- .../app/units/mdm.unit.ui.theme/public/css/custom-common.css | 4 ++-- .../app/units/mdm.unit.ui.theme/public/css/custom-common.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css index cc768351b7..fbb2d80832 100755 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/android-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css @@ -171,7 +171,7 @@ h2.app-title { margin:0; padding:3px 0 0 0; color:#fafafa; - text-transform: uppercase; + /*text-transform: uppercase;*/ } .wr-global-header { @@ -208,7 +208,7 @@ h2.app-title { @media (max-width: 570px) { h2.app-title:after { - content: "EMM"; + content: "IoT Server"; } h2.app-title span { display: none; diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css index cc768351b7..fbb2d80832 100755 --- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css +++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/windows-web-agent/app/units/mdm.unit.ui.theme/public/css/custom-common.css @@ -171,7 +171,7 @@ h2.app-title { margin:0; padding:3px 0 0 0; color:#fafafa; - text-transform: uppercase; + /*text-transform: uppercase;*/ } .wr-global-header { @@ -208,7 +208,7 @@ h2.app-title { @media (max-width: 570px) { h2.app-title:after { - content: "EMM"; + content: "IoT Server"; } h2.app-title span { display: none; From 86a3b18464b2e0b780952e7e5e0b64c52ee42d60 Mon Sep 17 00:00:00 2001 From: kamidu Date: Thu, 19 Jan 2017 17:41:08 +0530 Subject: [PATCH 2/5] adding location history to map view --- .../device-view.hbs | 45 ++++++++++----- .../device-view.js | 15 ++--- .../public/js/load-map.js | 57 +++++++++++++++++++ 3 files changed, 96 insertions(+), 21 deletions(-) create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/public/js/load-map.js diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs index 980ee95c75..63edd3ba21 100644 --- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs +++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs @@ -15,6 +15,7 @@ specific language governing permissions and limitations under the License. }} +{{unit "cdmf.unit.device.type.android_sense.leaflet"}} {{#zone "topCss"}}