rajitha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved conflicts in device type-vies files.

Browse Source
revert-dabc3590
Harshan Liyanage 8 years ago
parent 26bbb55af5
commit f55cd20a73
3 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File

38
components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
Unescape View File

@ -1,13 +1,10 @@
{{! {{!
Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
WSO2 Inc. licenses this file to you under the Apache License, WSO2 Inc. licenses this file to you under the Apache License,
Version 2.0 (the "License"); you may not use this file except Version 2.0 (the "License"); you may not use this file except
in compliance with the License. in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,17 +17,15 @@
<hr> <hr>
</div> </div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top"> <div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
<img src="{{@unit.publicUri}}/images/ardunio-icon.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/ardunio-icon.png" class="img-responsive">
</div> </div>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top"> <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Arduino"
target="_blank">[ here ]</a> for latest instructions and
troubleshooting.</h4>
</div> </div>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top"> <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor
@ -40,34 +35,37 @@
<hr> <hr>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li class="padding-top-double"> <li class="padding-top-double">
<span class="circle">ITEM 01</span> <span class="badge">ITEM 01</span>
Arduino UNO Board. Arduino UNO Board.
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">ITEM 02</span> <span class="badge">ITEM 02</span>
Adafruit Wifi Shield for Arduino. Adafruit Wifi Shield for Arduino.
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">ITEM 03</span> <span class="badge">ITEM 03</span>
LED bulb connected to Pin 13. LED bulb connected to Pin 13.
<i>(If not available, will use the one on the board.)</i> <i>(If not available, will use the one on the board.)</i>
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">ITEM 04</span> <span class="badge">ITEM 04</span>
Resistor( e.g 330 ohms ) Resister( e.g 330 ohms )
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">STEP 05</span> <span class="badge">STEP 05</span>
Proceed to [Prepare] section. Proceed to [Prepare] section.
</ul> </ul>
<br> <br>
<a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
class="btn-operations" target="_blank"> class="btn-operations" target="_blank">
<i class="fw fw-api"></i> View API <i class="fw fw-api add-margin-1x"></i> View API
</a> </a>
<a href="#" class="download-link btn-operations"> <a href="#" class="download-link btn-operations">
<i class="fw fw-download"></i>Download Sketch <i class="fw fw-download add-margin-1x"></i>Download Sketch
</a> </a>
<p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Arduino"
target="_blank">here</a> for latest instructions and
troubleshooting.</p>
<div id="download-device-modal-content" class="hide"> <div id="download-device-modal-content" class="hide">
<div class="modal-content"> <div class="modal-content">
<div class="row"> <div class="row">

39
components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
Unescape View File

@ -1,13 +1,10 @@
{{! {{!
Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
WSO2 Inc. licenses this file to you under the Apache License, WSO2 Inc. licenses this file to you under the Apache License,
Version 2.0 (the "License"); you may not use this file except Version 2.0 (the "License"); you may not use this file except
in compliance with the License. in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,17 +17,12 @@
<hr> <hr>
</div> </div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top"> <div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
<img src="{{@unit.publicUri}}/images/respberry-icon.png" class="img-responsive"> <img src="{{@unit.publicUri}}/images/respberry-icon.png" class="img-responsive">
</div> </div>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Raspberry+Pi"
target="_blank">[ here ]</a> for latest instructions and
troubleshooting.</h4>
</div>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top"> <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
<h3 class="uppercase">What it Does</h3> <h3 class="uppercase">What it Does</h3>
<hr> <hr>
<p class="grey margin-top">Connect a RaspberryPi to WSO2 IoT Server and manage it.</p> <p class="grey margin-top">Connect a RaspberryPi to WSO2 IoT Server and manage it.</p>
@ -39,33 +31,36 @@
<hr> <hr>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li class="padding-top-double"> <li class="padding-top-double">
<span class="circle">ITEM 01</span> <span class="badge">ITEM 01</span>
Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]). Raspberry Pi with SD Card(Internet Enabled [Wifi or Ethernet]).
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">ITEM 02</span> <span class="badge">ITEM 02</span>
Adafruit DHT11 Temperature Sensor. Adafruit DHT11 Temperature Sensor.
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">ITEM 03</span> <span class="badge">ITEM 03</span>
LED Bulb. LED Bulb.
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">ITEM 04</span> <span class="badge">ITEM 04</span>
Resistor (eg : 470 ohm). Resister (eg : 470 ohm).
</li> </li>
<li class="padding-top-double"> <li>
<span class="circle">STEP 05</span> <span class="badge">STEP 05</span>
Proceed to [Prepare] section. Proceed to [Prepare] section.
</ul> </ul>
<br> <br>
<a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin" <a href="/api-store/apis/info?name={{@uriParams.deviceType}}&version=1.0.0&provider=admin"
class="btn-operations" class="btn-operations"
target="_blank"><i class="fw fw-api"></i> View API</i> target="_blank"><i class="fw fw-api add-margin-1x"></i> View API</i>
</a> </a>
<a href="#" class="download-link btn-operations"> <a href="#" class="download-link btn-operations">
<i class="fw fw-download"></i>Download Agent <i class="fw fw-download add-margin-1x"></i>Download Agent
</a> </a>
<p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Raspberry+Pi"
target="_blank">here</a> for latest instructions and
troubleshooting.</p>
<div id="download-device-modal-content" class="hide"> <div id="download-device-modal-content" class="hide">
<div class="modal-content"> <div class="modal-content">
<div class="row"> <div class="row">

6
pom.xml
Unescape View File

@ -417,11 +417,6 @@
<artifactId>org.wso2.carbon.device.mgt.input.adapter.xmpp</artifactId> <artifactId>org.wso2.carbon.device.mgt.input.adapter.xmpp</artifactId>
<version>${carbon.devicemgt.plugins.version}</version> <version>${carbon.devicemgt.plugins.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
<version>${jsonpath.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId> <artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId>
@ -1312,7 +1307,6 @@
<commons-io.version>2.4</commons-io.version> <commons-io.version>2.4</commons-io.version>
<apache-felix.version>1.0.8</apache-felix.version> <apache-felix.version>1.0.8</apache-felix.version>
<googlecode.plist.version>1.8</googlecode.plist.version> <googlecode.plist.version>1.8</googlecode.plist.version>
<jsonpath.version>0.9.1</jsonpath.version>
<commons.lang.version>2.2</commons.lang.version> <commons.lang.version>2.2</commons.lang.version>

Write Preview
Loading…
Cancel
Save