community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x

Browse Source
This commit is contained in:
ayyoob 2017-01-16 22:40:03 +05:30
commit dad3a34a27
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
View File

@ -285,23 +285,7 @@
</li>--> </li>-->
<!-- Advanced --> <!-- 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> </ul>
</div> </div>
@ -894,4 +878,4 @@
</body> </body>
]]> ]]>
</Content> </Content>
</Module> </Module>

4
components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
View File

@ -120,6 +120,8 @@ function initializeMap() {
} }
}); });
//setting the sidebar to be opened when page loads
$("a[href='#left_side_pannel']").trigger('click');
} }
/* Attribution control */ /* Attribution control */
@ -417,4 +419,4 @@ function clearFocus() {
spatialObject.removeFromMap(); spatialObject.removeFromMap();
selectedSpatialObject = null; selectedSpatialObject = null;
} }
} }

4
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
View File

@ -338,12 +338,12 @@
data-long="{{device.location.longitude}}"> data-long="{{device.location.longitude}}">
</div> </div>
<br/> <br/>
<a class="padding-left" <a class="padding-left" target="_blank"
href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{deviceId}},{{deviceType}}"> href="{{portalUrl}}/portal/dashboards/geo-dashboard/?GLOBAL-STATE={{deviceId}},{{deviceType}}">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-circle-outline fw-stack-2x"></i> <i class="fw fw-circle-outline fw-stack-2x"></i>
<i class="fw fw-map-location fw-stack-1x"></i> <i class="fw fw-map-location fw-stack-1x"></i>
</span>View device on the map </span> Add Geo Fencing
</a> </a>
{{else}} {{else}}
<div id="map-error" class="message message-warning"> <div id="map-error" class="message message-warning">