community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor ui changes

Browse Source
merge-requests/1/head
Rasika Perera 9 years ago
parent 2cec2aba3f
commit 29a96847b9
12 changed files with 75 additions and 59 deletions
Show Stats Download Patch File Download Diff File

4
modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
Unescape View File

@ -18,11 +18,11 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Uno<br><br> </span>Arduino Uno<br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Ethernet / WiFi Shield </span>Arduino Ethernet / WiFi Shield
<br /><br /> <br /><br />
<form method="POST" class="float-left margin-right" <form method="POST" class="float-left margin-right"

2
modules/distribution/src/repository/jaggeryapps/iotserver/units/android_sense/android_sense.hbs
Unescape View File

@ -18,7 +18,7 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Android Phone<br><br> </span>Android Phone<br><br>
<br/><br/> <br/><br/>

4
modules/distribution/src/repository/jaggeryapps/iotserver/units/arduino/arduino.hbs
Unescape View File

@ -18,11 +18,11 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Uno<br><br> </span>Arduino Uno<br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Ethernet / WiFi Shield </span>Arduino Ethernet / WiFi Shield
<br /><br /> <br /><br />
<form method="POST" class="form-login-box" <form method="POST" class="form-login-box"

90
modules/distribution/src/repository/jaggeryapps/iotserver/units/device-detail/device-detail.hbs
Unescape View File

@ -25,7 +25,8 @@
<div class="col-lg-2 ast-desc-image"> <div class="col-lg-2 ast-desc-image">
<div class="row"> <div class="row">
<div class="col-lg-12 col-sm-4"> <div class="col-lg-12 col-sm-4">
<img src="{{self.publicURL}}/img/device_icons/{{device.type}}.png" style="width:200px"/> <img src="{{self.publicURL}}/img/device_icons/{{device.type}}.png"
style="width:200px"/>
</div> </div>
<div class="col-lg-12 col-sm-4 ast-desc"> <div class="col-lg-12 col-sm-4 ast-desc">
<div class="ast-device-desc"><b>Owner:</b> {{device.owner}}</div> <div class="ast-device-desc"><b>Owner:</b> {{device.owner}}</div>
@ -51,8 +52,11 @@
<div class="wr-stats-board-tile"> <div class="wr-stats-board-tile">
<div class="tile-name">BATTERY</div> <div class="tile-name">BATTERY</div>
<div> <div>
<div class="tile-icon"><i class="fw fw-battery"></i></div> <div class="tile-icon"><i class="fw fw-battery"></i>
<div class="tile-stats">{{device.viewModel.BatteryLevel}}%</div> </div>
<div class="tile-stats">{{device.viewModel.BatteryLevel}}
%
</div>
</div> </div>
</div> </div>
</div> </div>
@ -63,7 +67,8 @@
<div class="wr-stats-board-tile"> <div class="wr-stats-board-tile">
<div class="tile-name">STORAGE</div> <div class="tile-name">STORAGE</div>
<div> <div>
<div class="tile-icon"><i class="fw fw-hdd"></i></div> <div class="tile-icon"><i class="fw fw-hdd"></i>
</div>
<div class="tile-stats">{{device.viewModel.DeviceCapacityPercentage}} <div class="tile-stats">{{device.viewModel.DeviceCapacityPercentage}}
%<span class="tile-stats-free">{{device.viewModel.DeviceCapacityUsed}} %<span class="tile-stats-free">{{device.viewModel.DeviceCapacityUsed}}
GB Free</span></div> GB Free</span></div>
@ -76,7 +81,8 @@
<div class="wr-stats-board-tile"> <div class="wr-stats-board-tile">
<div class="tile-name">LOCAL STORAGE</div> <div class="tile-name">LOCAL STORAGE</div>
<div> <div>
<div class="tile-icon"><i class="fw fw-hdd"></i></div> <div class="tile-icon"><i class="fw fw-hdd"></i>
</div>
<div class="tile-stats">{{device.viewModel.internal_memory.DeviceCapacityPercentage}} <div class="tile-stats">{{device.viewModel.internal_memory.DeviceCapacityPercentage}}
%<span class="tile-stats-free">{{device.viewModel.internal_memory.FreeCapacity}} %<span class="tile-stats-free">{{device.viewModel.internal_memory.FreeCapacity}}
GB Free</span></div> GB Free</span></div>
@ -89,7 +95,8 @@
<div class="wr-stats-board-tile"> <div class="wr-stats-board-tile">
<div class="tile-name">EXTERNAL STORAGE</div> <div class="tile-name">EXTERNAL STORAGE</div>
<div> <div>
<div class="tile-icon"><i class="fw fw-hdd"></i></div> <div class="tile-icon"><i class="fw fw-hdd"></i>
</div>
<div class="tile-stats">{{device.viewModel.external_memory.DeviceCapacityPercentage}} <div class="tile-stats">{{device.viewModel.external_memory.DeviceCapacityPercentage}}
%<span class="tile-stats-free">{{device.viewModel.external_memory.FreeCapacity}} %<span class="tile-stats-free">{{device.viewModel.external_memory.FreeCapacity}}
GB Free</span></div> GB Free</span></div>
@ -102,23 +109,52 @@
</div> </div>
<!-- /device summary --> <!-- /device summary -->
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> <div class="panel-group" id="accordion" role="tablist"
aria-multiselectable="true">
<!--device location -->
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h2 class="sub-title panel-title">
<a data-toggle="collapse" data-parent="#accordion"
href="#collapseOne" aria-expanded="true"
aria-controls="collapseOne">
<span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-arrow fw-down fw-stack-1x"></i>
</span>
Device Details
</a>
</h2>
</div>
<div id="collapseOne" class="panel-collapse collapse in"
role="tabpanel" aria-labelledby="headingOne">
<div id="device-location" class="panel-body">
IP Address: 0.0.0.0
</div>
</div>
</div>
<!--/device location -->
<!-- statistics --> <!-- statistics -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingFour"> <div class="panel-heading" role="tab" id="headingFour">
<h2 class="sub-title panel-title"> <h2 class="sub-title panel-title">
<a class="collapsed" data-toggle="collapse" data-parent="#accordion" <a class="collapsed" data-toggle="collapse"
href="#collapseFour" aria-expanded="false" aria-controls="collapseFour"> data-parent="#accordion"
href="#collapseFour" aria-expanded="false"
aria-controls="collapseFour">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i> <i class="fw fw-arrow fw-down fw-stack-1x"></i>
</span> </span>
Device Statistics Device Statistics
</a> </a>
</h2> </h2>
</div> </div>
<div id="collapseFour" class="panel-collapse collapse" role="tabpanel" <div id="collapseFour" class="panel-collapse collapse"
role="tabpanel"
aria-labelledby="headingFour"> aria-labelledby="headingFour">
<div class="panel-body"> <div class="panel-body">
<a href="../../analytics?deviceId={{deviceId}}&deviceType={{deviceType}}"><i <a href="../../analytics?deviceId={{deviceId}}&deviceType={{deviceType}}"><i
@ -128,42 +164,24 @@
</div> </div>
<!-- /statistics --> <!-- /statistics -->
<!-- device location -->
<!--<div class="panel panel-default">-->
<!--<div class="panel-heading" role="tab" id="headingOne">-->
<!--<h2 class="sub-title panel-title">-->
<!--<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">-->
<!--<span class="fw-stack">-->
<!--<i class="fw fw-ring fw-stack-2x"></i>-->
<!--<i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i>-->
<!--</span>-->
<!--Device Location-->
<!--</a>-->
<!--</h2>-->
<!--</div>-->
<!--<div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">-->
<!--<div id="device-location" style="height:400px" class="panel-body">-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!-- /device location -->
<!-- policies --> <!-- policies -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingTwo"> <div class="panel-heading" role="tab" id="headingTwo">
<h2 class="sub-title panel-title"> <h2 class="sub-title panel-title">
<a class="collapsed" data-toggle="collapse" data-parent="#accordion" <a class="collapsed" data-toggle="collapse"
href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo"> data-parent="#accordion"
href="#collapseTwo" aria-expanded="false"
aria-controls="collapseTwo">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
<i class="fw fw-arrow fw-down-arrow fw-stack-1x"></i> <i class="fw fw-arrow fw-down fw-stack-1x"></i>
</span> </span>
Policies Policies
</a> </a>
</h2> </h2>
</div> </div>
<div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" <div id="collapseTwo" class="panel-collapse collapse"
role="tabpanel"
aria-labelledby="headingTwo"> aria-labelledby="headingTwo">
<div class="panel-body"> <div class="panel-body">
Not available yet Not available yet

6
modules/distribution/src/repository/jaggeryapps/iotserver/units/digital_display/digital_display.hbs
Unescape View File

@ -8,8 +8,6 @@
<p class="margin-bottom-double light-grey ">Connect your Digital Display device <p class="margin-bottom-double light-grey ">Connect your Digital Display device
to the WSO2 device cloud. </p> to the WSO2 device cloud. </p>
</div> </div>
</div>
<div class="row margin-bottom-double">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
<img src="{{self.publicURL}}/images/digital_display.png" class="img-responsive"> <img src="{{self.publicURL}}/images/digital_display.png" class="img-responsive">
</div> </div>
@ -20,11 +18,11 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Raspberry Pi<br><br> </span>Raspberry Pi<br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>HDMI Supported Digital Display </span>HDMI Supported Digital Display
<br /><br /> <br /><br />
<form method="POST" class="float-left margin-right" <form method="POST" class="float-left margin-right"

2
modules/distribution/src/repository/jaggeryapps/iotserver/units/operation-bar/operation-bar.hbs
Unescape View File

@ -1,7 +1,7 @@
{{#zone "main"}} {{#zone "main"}}
<a href="javascript:toggleMoreOperations()" class="cu-btn-inner show-operations-btn hidden" id="showOperationsBtn"> <a href="javascript:toggleMoreOperations()" class="cu-btn-inner show-operations-btn hidden" id="showOperationsBtn">
<span class="fw-stack"> <span class="fw-stack">
<i class="fw fw-right-arrow-2 fw-stack-1-5x"></i> <i class="fw fw-right-arrow fw-stack-1-5x"></i>
</span> </span>
<span class="btn-text">Operations</span> <span class="btn-text">Operations</span>
</a> </a>

4
modules/distribution/src/repository/jaggeryapps/iotserver/units/raspberrypi/raspberrypi.hbs
Unescape View File

@ -8,8 +8,6 @@
<p class="margin-bottom-double light-grey ">Connect your Raspberry Pi device <p class="margin-bottom-double light-grey ">Connect your Raspberry Pi device
to the WSO2 Device Cloud. </p> to the WSO2 Device Cloud. </p>
</div> </div>
</div>
<div class="row margin-bottom-double">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
<img src="{{self.publicURL}}/images/raspberrypi.png" class="img-responsive"> <img src="{{self.publicURL}}/images/raspberrypi.png" class="img-responsive">
</div> </div>
@ -20,7 +18,7 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Raspberry Pi<br><br> </span>Raspberry Pi<br><br>
<form method="POST" class="form-login-box" <form method="POST" class="form-login-box"
action="{{sketchPath}}"> action="{{sketchPath}}">

6
modules/distribution/src/repository/jaggeryapps/iotserver/units/sensebot/sensebot.hbs
Unescape View File

@ -8,8 +8,6 @@
<p class="margin-bottom-double light-grey ">Connect your Sensebot <p class="margin-bottom-double light-grey ">Connect your Sensebot
to the WSO2 device cloud. </p> to the WSO2 device cloud. </p>
</div> </div>
</div>
<div class="row margin-bottom-double">
<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top"> <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
<img src="{{self.publicURL}}/images/sensebot.png" class="img-responsive"> <img src="{{self.publicURL}}/images/sensebot.png" class="img-responsive">
</div> </div>
@ -20,11 +18,11 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Uno<br><br> </span>Arduino Uno<br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Ethernet / WiFi Shield </span>Arduino Ethernet / WiFi Shield
<br /><br /> <br /><br />
<form method="POST" class="float-left margin-right" <form method="POST" class="float-left margin-right"

6
modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/custom-desktop.css
Unescape View File

@ -1658,7 +1658,7 @@ a.wr-side-panel-toggle-btn.selected {
.wr-input-control.checkbox input[type="checkbox"]:checked + .helper:after { .wr-input-control.checkbox input[type="checkbox"]:checked + .helper:after {
position: absolute; position: absolute;
display: block; display: block;
content: "\e631"; content: "\e617";
font-size: 7pt; font-size: 7pt;
height: 16px; height: 16px;
width: 16px; width: 16px;
@ -1797,7 +1797,7 @@ a.wr-side-panel-toggle-btn.selected {
} }
.panel-title a.collapsed .fw-arrow:before { .panel-title a.collapsed .fw-arrow:before {
content: "\e634"; content: "\e687";
} }
.footer a { .footer a {
@ -2031,7 +2031,7 @@ a.show-operations-btn.selected {
color: #fff; color: #fff;
} }
a.show-operations-btn.selected .fw-right-arrow-2:before { a.show-operations-btn.selected .fw-right-arrow:before {
content: "\e662"; content: "\e662";
} }

4
modules/distribution/src/repository/jaggeryapps/iotserver/units/theme/public/css/main.css
Unescape View File

@ -170,6 +170,10 @@ a {
vertical-align:baseline; vertical-align:baseline;
background:transparent; background:transparent;
} }
a:hover {
text-decoration: none;
}
/* change colours to suit your needs */ /* change colours to suit your needs */
ins { ins {
background-color:#ff9; background-color:#ff9;

4
modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
Unescape View File

@ -20,11 +20,11 @@
<br><br> <br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Uno<br><br> </span>Arduino Uno<br><br>
<span class="fw-stack fw-lg margin-right"> <span class="fw-stack fw-lg margin-right">
<i class="fw fw-ring fw-stack-2x"> </i> <i class="fw fw-ring fw-stack-2x"> </i>
<i class="fw fw-right-arrow-2 fw-stack-1x"></i> <i class="fw fw-right-arrow fw-stack-1x"></i>
</span>Arduino Ethernet / WiFi Shield </span>Arduino Ethernet / WiFi Shield
<br /><br /> <br /><br />
<form method="POST" class="float-left margin-right" <form method="POST" class="float-left margin-right"

Write Preview
Loading…
Cancel
Save