mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
fixed code conflicts
This commit is contained in:
Hasunie
commit
e030be3d24
@ -285,23 +285,7 @@
|
||||
</li>-->
|
||||
|
||||
<!-- Advanced -->
|
||||
<li class="uk-parent">
|
||||
<a href="#"><i class="fa fa-plus"></i> Advanced Settings</a>
|
||||
<ul class="uk-nav-sub">
|
||||
<br>
|
||||
<li style="color: white"> <strong>Settings</strong></li>
|
||||
<!-- Add new tile server url -->
|
||||
<li>
|
||||
<a data-toggle="modal" data-target="#addTileServer"><i class="fa fa-plus"></i> Add tile server</a>
|
||||
</li>
|
||||
<!-- Add new WMS server url -->
|
||||
<li>
|
||||
<a data-toggle="modal" data-target="#addWmsUrl"><i class="fa fa-globe"></i> Add WMS end point</a>
|
||||
</li>
|
||||
<br>
|
||||
</ul>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
@ -894,4 +878,4 @@
|
||||
</body>
|
||||
]]>
|
||||
</Content>
|
||||
</Module>
|
||||
</Module>
|
||||
|
||||
@ -41,10 +41,24 @@ function initialLoad() {
|
||||
processAfterInitializationMap();
|
||||
//Access gps and make zoom to server location as map center
|
||||
//navigator.geolocation.getCurrentPosition(success, error);
|
||||
setPageTitle();
|
||||
$("#loading").hide();
|
||||
}
|
||||
}
|
||||
|
||||
function setPageTitle() {
|
||||
var hash = window.parent.location.hash;
|
||||
if(hash) {
|
||||
var startIdx = hash.indexOf("/") + 1;
|
||||
var lastIdx = hash.length;
|
||||
var deviceInfoString = hash.substring(startIdx,lastIdx);
|
||||
var deviceInfo = JSON.parse(deviceInfoString);
|
||||
if(deviceInfo) {
|
||||
var newTitle = "[ " + deviceInfo.device.id + "]" + " - Geo Dashboard [" + deviceInfo.device.type + "]";
|
||||
window.parent.document.title = newTitle;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//function success(position) {
|
||||
// var browserLatitude = position.coords.latitude;
|
||||
@ -120,6 +134,8 @@ function initializeMap() {
|
||||
}
|
||||
|
||||
});
|
||||
//setting the sidebar to be opened when page loads
|
||||
$("a[href='#left_side_pannel']").trigger('click');
|
||||
}
|
||||
|
||||
/* Attribution control */
|
||||
@ -417,4 +433,4 @@ function clearFocus() {
|
||||
spatialObject.removeFromMap();
|
||||
selectedSpatialObject = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,5 +21,5 @@ function onRequest(context) {
|
||||
var deviceId = request.getParameter("deviceId");
|
||||
|
||||
//Redirects to the portal app as we do not use the old analytics view.
|
||||
response.sendRedirect(context.app.conf["portalURL"] + "/portal/dashboards/android-iot/real-time?owner=" + user.username + "&deviceId=" + deviceId);
|
||||
response.sendRedirect(context.app.conf["portalURL"] + "/portal/dashboards/android-iot/sensors?owner=" + user.username + "&deviceId=" + deviceId);
|
||||
}
|
||||
Binary file not shown.
@ -67,6 +67,6 @@ function attachEvents() {
|
||||
function toggleEnrollment(){
|
||||
$(modalPopupContent).html($("#qr-code-modal").html());
|
||||
generateQRCode(modalPopupContent + " .qr-code");
|
||||
showPopup();
|
||||
modalDialog.show();
|
||||
}
|
||||
}
|
||||
@ -282,16 +282,5 @@
|
||||
|
||||
{{#zone "bottomJs"}}
|
||||
{{js "/js/download.js"}}
|
||||
<script type="text/javascript">
|
||||
$(".download-link").click(function () {
|
||||
toggleEnrollment();
|
||||
});
|
||||
|
||||
function toggleEnrollment() {
|
||||
$(".modalpopup-content").html($("#qr-code-modal").html());
|
||||
generateQRCode(".modalpopup-content .qr-code");
|
||||
showPopup();
|
||||
}
|
||||
</script>
|
||||
{{js "/js/jquery.validate.js"}}
|
||||
{{/zone}}
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"appName": "WSO2 Enterprise Mobility Manager",
|
||||
"appName": "WSO2 IoT Server",
|
||||
"cachingEnabled": true,
|
||||
"debuggingEnabled": false,
|
||||
"permissionRoot": "/",
|
||||
@ -38,8 +38,8 @@
|
||||
},
|
||||
"generalConfig" : {
|
||||
"host" : "https://localhost:9443",
|
||||
"companyName" : "WSO2 Enterprise Mobility Manager",
|
||||
"browserTitle" : "WSO2 EMM",
|
||||
"companyName" : "WSO2 IoT Server",
|
||||
"browserTitle" : "WSO2 IoT Server",
|
||||
"copyrightPrefix" : "\u00A9 %date-year%, ",
|
||||
"copyrightOwner" : "WSO2 Inc.",
|
||||
"copyrightOwnersSite" : "http://www.wso2.org",
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
"windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/services/federated/bst/authentication",
|
||||
"generalConfig" : {
|
||||
"host" : "%http.ip%",
|
||||
"companyName" : "WSO2 Enterprise Mobility Manager",
|
||||
"browserTitle" : "WSO2 EMM",
|
||||
"companyName" : "WSO2 IoT Server",
|
||||
"browserTitle" : "WSO2 IoT Server",
|
||||
"copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."
|
||||
},
|
||||
"isOAuthEnabled" : true,
|
||||
|
||||
@ -338,12 +338,12 @@
|
||||
data-long="{{device.location.longitude}}">
|
||||
</div>
|
||||
<br/>
|
||||
<a class="padding-left"
|
||||
<a class="padding-left" target="_blank"
|
||||
href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{deviceId}},{{deviceType}}">
|
||||
<span class="fw-stack">
|
||||
<i class="fw fw-circle-outline fw-stack-2x"></i>
|
||||
<i class="fw fw-map-location fw-stack-1x"></i>
|
||||
</span>View device on the map
|
||||
</span> Add Geo Fencing
|
||||
</a>
|
||||
{{else}}
|
||||
<div id="map-error" class="message message-warning">
|
||||
|
||||
@ -73,10 +73,9 @@ function generateQRCode(qrCodeClass) {
|
||||
}
|
||||
|
||||
function toggleEnrollment() {
|
||||
console.log("something happenedfd!");
|
||||
$(".modal-content").html($("#qr-code-modal").html());
|
||||
generateQRCode(".modal-content .qr-code");
|
||||
showPopup();
|
||||
modalDialog.show();
|
||||
}
|
||||
|
||||
var updateNotificationCountOnSuccess = function (data, textStatus, jqXHR) {
|
||||
@ -345,10 +344,6 @@ $.fn.collapse_nav_sub = function () {
|
||||
}
|
||||
};
|
||||
|
||||
$(".download-link").click(function(){
|
||||
toggleEnrollment();
|
||||
});
|
||||
|
||||
$(document).ready(function () {
|
||||
$.sidebar_toggle();
|
||||
if (typeof $.fn.collapse == 'function') {
|
||||
|
||||
@ -75,7 +75,7 @@ function generateQRCode(qrCodeClass) {
|
||||
function toggleEnrollment() {
|
||||
$(".modal-content").html($("#qr-code-modal").html());
|
||||
generateQRCode(".modal-content .qr-code");
|
||||
showPopup();
|
||||
modalDialog.show();
|
||||
}
|
||||
|
||||
var updateNotificationCountOnSuccess = function (data, textStatus, jqXHR) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"appName": "WSO2 IOTS",
|
||||
"appName": "WSO2 IoT Server",
|
||||
"cachingEnabled": true,
|
||||
"debuggingEnabled": false,
|
||||
"permissionRoot": "/",
|
||||
@ -38,8 +38,13 @@
|
||||
},
|
||||
"generalConfig" : {
|
||||
"host" : "https://localhost:9443",
|
||||
<<<<<<< HEAD
|
||||
"companyName" : "WSO2 IOTS",
|
||||
"browserTitle" : "WSO2 IOT",
|
||||
=======
|
||||
"companyName" : "WSO2 IoT Server",
|
||||
"browserTitle" : "WSO2 IoT Server",
|
||||
>>>>>>> 05e2cb7bb8db033166a81e327d1c82c83a5a8178
|
||||
"copyrightPrefix" : "\u00A9 %date-year%, ",
|
||||
"copyrightOwner" : "WSO2 Inc.",
|
||||
"copyrightOwnersSite" : "http://www.wso2.org",
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
"windowsConfigRoot" : "%http.ip%/api/device-mgt/windows/v1.0/federated/bst/authentication",
|
||||
"generalConfig" : {
|
||||
"host" : "%http.ip%",
|
||||
"companyName" : "WSO2 IOT",
|
||||
"browserTitle" : "WSO2 IOT",
|
||||
"companyName" : "WSO2 IoT Server",
|
||||
"browserTitle" : "WSO2 IoT Server",
|
||||
"copyrightText" : "\u00A9 %date-year%, WSO2 Inc. (http://www.wso2.org) All Rights Reserved."
|
||||
},
|
||||
"isOAuthEnabled" : true,
|
||||
|
||||
2
pom.xml
2
pom.xml
@ -1244,7 +1244,7 @@
|
||||
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
|
||||
|
||||
<!-- Carbon Device Management -->
|
||||
<carbon.devicemgt.version>2.0.7</carbon.devicemgt.version>
|
||||
<carbon.devicemgt.version>2.0.8-SNAPSHOT</carbon.devicemgt.version>
|
||||
<carbon.devicemgt.version.range>[2.0.0, 3.0.0)</carbon.devicemgt.version.range>
|
||||
|
||||
<!-- Carbon App Management -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user