Merge pull request #453 from ruwany/release-3.0.x

Bug Fixes and changes to descriptor
merge-requests/1/head
Rasika Perera 8 years ago committed by GitHub
commit 5a71e03564

@ -36,60 +36,51 @@
</div> </div>
{{/zone}} {{/zone}}
{{#zone "device-detail-properties"}} {{#zone "device-view-tabs"}}
<div class="media"> <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
<div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2"> data-toggle="tab" aria-controls="device_statistics">Device
<ul class="list-group" role="tablist"> Statistics</a>
<li class="active"><a class="list-group-item" href="#device_statistics" role="tab" </li>
data-toggle="tab" aria-controls="device_statistics">Device <li><a class="list-group-item" href="#device_location" role="tab" data-toggle="tab"
Statistics</a> aria-controls="device_location">Device Location</a></li>
</li> <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
<li><a class="list-group-item" href="#device_location" role="tab" data-toggle="tab" aria-controls="event_log">Operations Log</a></li>
aria-controls="device_location">Device Location</a></li> {{/zone}}
<li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
aria-controls="event_log">Operations Log</a></li>
</ul>
</div>
<div class="media-body add-padding-left-5x remove-padding-xs tab-content">
<div class="panel-group tab-content">
<div class="panel panel-default tab-pane active"
id="device_statistics" role="tabpanel" aria-labelledby="device_statistics">
<div class="panel-heading">Device Statistics</div>
{{unit "cdmf.unit.device.type.android_sense.realtime.analytics-view" device=device}}
</div>
<div class="panel panel-default tab-pane" id="device_location" role="tabpanel"
aria-labelledby="device_location">
<div class="panel-heading">Device Location</div>
<div class="panel-body">
<div id="map" style="height: 400px;">
</div>
<br class="c-both"/>
</div>
</div>
<div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
aria-labelledby="event_log">
<div class="panel-heading">Operations Log <span><a href="#"
id="refresh-operations"><i
class="fw fw-refresh"></i></a></span></div>
<div class="panel-body">
<div id="operations-spinner" class="wr-advance-operations-init hidden">
<br>
<i class="fw fw-settings fw-spin fw-2x"></i> {{#zone "device-view-tab-contents"}}
<div class="panel panel-default tab-pane active"
id="device_statistics" role="tabpanel" aria-labelledby="device_statistics">
<div class="panel-heading">Device Statistics</div>
{{unit "cdmf.unit.device.type.android_sense.realtime.analytics-view" device=device}}
</div>
<div class="panel panel-default tab-pane" id="device_location" role="tabpanel"
aria-labelledby="device_location">
<div class="panel-heading">Device Location</div>
<div class="panel-body">
<div id="map" style="height: 400px;">
</div>
<br class="c-both"/>
</div>
</div>
<div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
aria-labelledby="event_log">
<div class="panel-heading">Operations Log <span><a href="#"
id="refresh-operations"><i
class="fw fw-refresh"></i></a></span></div>
<div class="panel-body">
<div id="operations-spinner" class="wr-advance-operations-init hidden">
<br>
Loading Operations Log . . . <i class="fw fw-settings fw-spin fw-2x"></i>
<br> Loading Operations Log . . .
<br> <br>
</div> <br>
<div id="operations-log-container"> </div>
<div class="panel-body"> <div id="operations-log-container">
Not available yet <div class="panel-body">
</div> Not available yet
<br class="c-both"/>
</div>
</div>
</div> </div>
<br class="c-both"/>
</div> </div>
</div> </div>
</div> </div>

@ -37,49 +37,41 @@
</div> </div>
{{/zone}} {{/zone}}
{{#zone "device-detail-properties"}} {{#zone "device-view-tabs"}}
<div class="media"> <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
<div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2"> data-toggle="tab" aria-controls="device_statistics">Device
<ul class="list-group" role="tablist"> Statistics</a>
<li class="active"><a class="list-group-item" href="#device_statistics" role="tab" </li>
data-toggle="tab" aria-controls="device_statistics">Device <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
Statistics</a> aria-controls="event_log">Operations Log</a></li>
</li> {{/zone}}
<li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
aria-controls="event_log">Operations Log</a></li>
</ul>
</div>
<div class="media-body add-padding-left-5x remove-padding-xs tab-content">
<div class="panel-group tab-content">
<div class="panel panel-default tab-pane active" {{#zone "device-view-tab-contents"}}
id="device_statistics" role="tabpanel" aria-labelledby="device_statistics"> <div class="panel panel-default tab-pane active"
<div class="panel-heading">Device Statistics</div> id="device_statistics" role="tabpanel" aria-labelledby="device_statistics">
{{unit "cdmf.unit.device.type.arduino.realtime.analytics-view" device=device}} <div class="panel-heading">Device Statistics</div>
</div> {{unit "cdmf.unit.device.type.arduino.realtime.analytics-view" device=device}}
<div class="panel panel-default tab-pane" id="event_log" role="tabpanel" </div>
aria-labelledby="event_log"> <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
<div class="panel-heading">Operations Log <span><a href="#" aria-labelledby="event_log">
id="refresh-operations"><i <div class="panel-heading">Operations Log <span><a href="#"
class="fw fw-refresh"></i></a></span></div> id="refresh-operations"><i
<div class="panel-body"> class="fw fw-refresh"></i></a></span></div>
<div id="operations-spinner" class="wr-advance-operations-init hidden"> <div class="panel-body">
<br> <div id="operations-spinner" class="wr-advance-operations-init hidden">
<br>
<i class="fw fw-settings fw-spin fw-2x"></i> <i class="fw fw-settings fw-spin fw-2x"></i>
Loading Operations Log . . . Loading Operations Log . . .
<br> <br>
<br> <br>
</div> </div>
<div id="operations-log-container"> <div id="operations-log-container">
<div class="panel-body"> <div class="panel-body">
Not available yet Not available yet
</div>
<br class="c-both"/>
</div>
</div>
</div> </div>
<br class="c-both"/>
</div> </div>
</div> </div>
</div> </div>

@ -37,49 +37,41 @@
</div> </div>
{{/zone}} {{/zone}}
{{#zone "device-detail-properties"}} {{#zone "device-view-tabs"}}
<div class="media"> <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
<div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2"> data-toggle="tab" aria-controls="device_statistics">Device
<ul class="list-group" role="tablist"> Statistics</a>
<li class="active"><a class="list-group-item" href="#device_statistics" role="tab" </li>
data-toggle="tab" aria-controls="device_statistics">Device <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
Statistics</a> aria-controls="event_log">Operations Log</a></li>
</li> {{/zone}}
<li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
aria-controls="event_log">Operations Log</a></li>
</ul>
</div>
<div class="media-body add-padding-left-5x remove-padding-xs tab-content">
<div class="panel-group tab-content">
<div class="panel panel-default tab-pane active" {{#zone "device-view-tab-contents"}}
id="device_statistics" role="tabpanel" aria-labelledby="device_statistics"> <div class="panel panel-default tab-pane active"
<div class="panel-heading">Device Statistics</div> id="device_statistics" role="tabpanel" aria-labelledby="device_statistics">
{{unit "cdmf.unit.device.type.raspberrypi.realtime.analytics-view" device=device}} <div class="panel-heading">Device Statistics</div>
</div> {{unit "cdmf.unit.device.type.raspberrypi.realtime.analytics-view" device=device}}
<div class="panel panel-default tab-pane" id="event_log" role="tabpanel" </div>
aria-labelledby="event_log"> <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
<div class="panel-heading">Operations Log <span><a href="#" aria-labelledby="event_log">
id="refresh-operations"><i <div class="panel-heading">Operations Log <span><a href="#"
class="fw fw-refresh"></i></a></span></div> id="refresh-operations"><i
<div class="panel-body"> class="fw fw-refresh"></i></a></span></div>
<div id="operations-spinner" class="wr-advance-operations-init hidden"> <div class="panel-body">
<br> <div id="operations-spinner" class="wr-advance-operations-init hidden">
<br>
<i class="fw fw-settings fw-spin fw-2x"></i> <i class="fw fw-settings fw-spin fw-2x"></i>
Loading Operations Log . . . Loading Operations Log . . .
<br> <br>
<br> <br>
</div> </div>
<div id="operations-log-container"> <div id="operations-log-container">
<div class="panel-body"> <div class="panel-body">
Not available yet Not available yet
</div>
<br class="c-both"/>
</div>
</div>
</div> </div>
<br class="c-both"/>
</div> </div>
</div> </div>
</div> </div>

@ -21,42 +21,22 @@
<hr> <hr>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li class="padding-top-double"><span class="badge">STEP 01</span> Android <li class="padding-top-double"><span class="badge">STEP 01</span> Android
Mobile. Mobile.
</li> </li>
<li><span class="badge">STEP 02</span> Go ahead <li><span class="badge">STEP 02</span> Go ahead
and click [Enroll Device]. and click [Enroll Device].
</li> </li>
<li><span class="badge">STEP 03</span> Proceed <li><span class="badge">STEP 03</span> Proceed
to the [Prepare] section. to the [Prepare] section.
</li> </li>
</ul> </ul>
<br> <br>
<a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a> <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
<p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android" <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android"
target="_blank">here</a> for latest instructions and troubleshooting.</p> target="_blank">here</a> for latest instructions and troubleshooting.</p>
<br/><br/> <br/><br/>
</div> </div>
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
<h3 class="uppercase">Prepare</h3><hr>
<ul class="list-unstyled">
<li class="padding-top-double"><span class="circle">01</span> Download Device Agent into your Android Mobile.</li>
<li class="padding-top-double"><span class="circle">02</span> Install Agent APK file.</li>
<li class="padding-top-double"><span class="circle">03</span> Configure Agent App</li>
</ul>
<br>
</div>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
<p class="grey margin-top">Click on the image to zoom</p>
<center>
<a href="{{@unit.publicUri}}/images/android_device.png" target="_blank">
<img src="{{@unit.publicUri}}/images/android_device.png" class="img-responsive">
</a>
</center>
</div>
<br/> <br/>
{{#zone "topCss"}} {{#zone "topCss"}}

@ -24,7 +24,12 @@
<License> <License>
<Language>en_US</Language> <Language>en_US</Language>
<Version>1.0.0</Version> <Version>1.0.0</Version>
<Text>This is license text</Text> <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and WSO2, Inc., regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile device management program, and the loading to and removal from Your Device and Your use of certain applications and any associated software and user documentation, whether provided in "online" or electronic format, used in connection with the operation of or provision of services to WSO2, Inc., BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND THEREBY AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS DESCRIBED IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS A BINDING CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.
IF YOU DO NOT ACCEPT THESE TERMS, DO NOT ENROLL YOUR DEVICE AND DO NOT PROCEED ANY FURTHER.
You agree that: (1) You understand and agree to be bound by the terms and conditions contained in this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter into this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right, without prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of Your Device, or (iii) the functioning of the Apps in the event of a violation of this Agreement or the cessation of Your relationship with SoR (including termination of Your employment if You are an employee or expiration or termination of Your applicable franchise or supply agreement if You are a franchisee of or supplier to the WSO2 WSO2, Inc., system). SoR expressly reserves all rights not expressly granted herein.
</Text>
</License> </License>
<ProvisioningConfig> <ProvisioningConfig>
@ -32,10 +37,10 @@
</ProvisioningConfig> </ProvisioningConfig>
<DataSource> <DataSource>
<jndiConfig> <JndiConfig>
<name>jdbc/MobileAndroidDM_DS</name> <Name>jdbc/MobileAndroidDM_DS</Name>
</jndiConfig> </JndiConfig>
<tableConfig> <TableConfig>
<Table name="AD_DEVICE"> <Table name="AD_DEVICE">
<PrimaryKey>DEVICE_ID</PrimaryKey> <PrimaryKey>DEVICE_ID</PrimaryKey>
<Attributes> <Attributes>
@ -54,7 +59,7 @@
<Attribute>OS_BUILD_DATE</Attribute> <Attribute>OS_BUILD_DATE</Attribute>
</Attributes> </Attributes>
</Table> </Table>
</tableConfig> </TableConfig>
</DataSource> </DataSource>
<Features> <Features>

@ -24,7 +24,12 @@
<License> <License>
<Language>en_US</Language> <Language>en_US</Language>
<Version>1.0.0</Version> <Version>1.0.0</Version>
<Text>This is license text</Text> <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and WSO2, Inc., regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile device management program, and the loading to and removal from Your Device and Your use of certain applications and any associated software and user documentation, whether provided in "online" or electronic format, used in connection with the operation of or provision of services to WSO2, Inc., BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND THEREBY AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS DESCRIBED IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS A BINDING CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.
IF YOU DO NOT ACCEPT THESE TERMS, DO NOT ENROLL YOUR DEVICE AND DO NOT PROCEED ANY FURTHER.
You agree that: (1) You understand and agree to be bound by the terms and conditions contained in this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter into this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right, without prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of Your Device, or (iii) the functioning of the Apps in the event of a violation of this Agreement or the cessation of Your relationship with SoR (including termination of Your employment if You are an employee or expiration or termination of Your applicable franchise or supply agreement if You are a franchisee of or supplier to the WSO2 WSO2, Inc., system). SoR expressly reserves all rights not expressly granted herein.
</Text>
</License> </License>
<ProvisioningConfig> <ProvisioningConfig>
@ -32,10 +37,10 @@
</ProvisioningConfig> </ProvisioningConfig>
<DataSource> <DataSource>
<jndiConfig> <JndiConfig>
<name>jdbc/MobileWindowsDM_DS</name> <Name>jdbc/MobileWindowsDM_DS</Name>
</jndiConfig> </JndiConfig>
<tableConfig> <TableConfig>
<Table name="WIN_DEVICE"> <Table name="WIN_DEVICE">
<PrimaryKey>DEVICE_ID</PrimaryKey> <PrimaryKey>DEVICE_ID</PrimaryKey>
<Attributes> <Attributes>
@ -53,7 +58,7 @@
<Attribute>DEVICE_NAME</Attribute> <Attribute>DEVICE_NAME</Attribute>
</Attributes> </Attributes>
</Table> </Table>
</tableConfig> </TableConfig>
</DataSource> </DataSource>
<Features> <Features>

Loading…
Cancel
Save