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

Merge pull request #354 from thusithak/master

Browse Source 
[EMM-1542],[EMM-1543],[EMM-1549] Defect fixes
revert-70aa11f8
Dilan U. Ariyaratne 8 years ago committed by GitHub
parent 00d79c9ece 144dd92c47
commit ba673d4b6d
4 changed files with 60 additions and 67 deletions
Show Stats Download Patch File Download Diff File

74
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/view.hbs
Unescape View File

@ -16,53 +16,43 @@
under the License. under the License.
}} }}
{{#zone "contentTitle"}}
<div class="row wr-device-board">
<div class="col-lg-12 wr-secondary-bar">
<label class="device-id device-select"
data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
data-appcontext="{{@app.context}}">
Device {{device.name}}
{{#if device.viewModel.vendor}}
<span class="lbl-device">
( {{device.viewModel.vendor}} {{device.viewModel.model}} )
</span>
{{/if}}
</label>
</div>
</div>
{{/zone}}
{{#zone "content"}} {{#zone "content"}}
<div class="row no-gutter add-padding-5x add-margin-top-5x" <h1 class="page-sub-title device-id device-select" data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}">
style="border: 1px solid #e4e4e4;"> Device {{device.name}}
<div class="media"> {{#if device.viewModel.model}}
<div id="device_overview"> <span class="lbl-device">
<div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2"> ( {{device.viewModel.vendor}} {{device.viewModel.model}} )
<div class="thumbnail icon"> </span>
{{#defineZone "device-thumbnail"}} {{/if}}
<i class="square-element text fw fw-mobile"></i> </h1>
{{/defineZone}} <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
<div class="media">
<div id="device_overview">
<div class="media-left media-middle asset-image col-xs-2 col-sm-2 col-md-2 col-lg-2">
<div class="thumbnail icon">
{{#defineZone "device-thumbnail"}}
<i class="square-element text fw fw-mobile"></i>
{{/defineZone}}
</div>
</div> </div>
</div> <div class="media-body asset-desc add-padding-left-5x">
<div class="media-body asset-desc add-padding-left-5x">
<div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
Device Overview - {{label}}</div>
{{unit "cdmf.unit.device.overview-section" device=device}}
{{#defineZone "operation-status"}}{{/defineZone}}
{{#defineZone "device-opetations"}}
<div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px"> <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
Operations Device Overview - {{label}}</div>
</div> {{unit "cdmf.unit.device.overview-section" device=device}}
<div class="add-margin-top-4x" style="height: 90px;"> {{#defineZone "operation-status"}}{{/defineZone}}
{{unit "cdmf.unit.device.operation-bar" device=device}} {{#defineZone "device-opetations"}}
</div> <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
{{/defineZone}} Operations
</div>
<div class="add-margin-top-4x" style="height: 90px;">
{{unit "cdmf.unit.device.operation-bar" device=device}}
</div>
{{/defineZone}}
</div>
</div> </div>
</div> </div>
</div>
{{#defineZone "device-detail-properties"}} {{#defineZone "device-detail-properties"}}
<div class="media"> <div class="media">
<div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2"> <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
<ul class="list-group" role="tablist"> <ul class="list-group" role="tablist">
@ -194,7 +184,7 @@
</div> </div>
</div> </div>
{{/defineZone}} {{/defineZone}}
</div> </div>
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
{{js "js/device-view.js"}} {{js "js/device-view.js"}}

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-theme.css
Unescape View File

@ -488,6 +488,9 @@ form .form-group label{
display: inline-block; display: inline-block;
} }
.panel-default.active .visible-xs .panel-title a {
color:#fff;
}
.panel-body { .panel-body {
background: transparent; background: transparent;
padding: 0; padding: 0;

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/less/theme-variables.less
Unescape View File

@ -6,7 +6,7 @@
@base-dark-color: #11375B; @base-dark-color: #11375B;
@base-light-color: #ffffff; @base-light-color: #ffffff;
@base-success-color: #5cb85c; @base-success-color: #5cb85c;
@base-info-color: #009DA7; @base-info-color: #526A84;
@base-warning-color: #f0ad4e; @base-warning-color: #f0ad4e;
@base-danger-color: #d9534f; @base-danger-color: #d9534f;

48
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
Unescape View File

@ -777,7 +777,7 @@ a.text-success:focus {
} }
.text-info { .text-info {
color: #009DA7; color: #526A84;
} }
a.text-info:hover, a.text-info:hover,
@ -826,7 +826,7 @@ a.bg-success:focus {
} }
.bg-info { .bg-info {
background-color: #009DA7; background-color: #526A84;
} }
a.bg-info:hover, a.bg-info:hover,
@ -2088,7 +2088,7 @@ table th[class*="col-"] {
.table > tfoot > tr > th.info, .table > tfoot > tr > th.info,
.table > tfoot > tr.info > td, .table > tfoot > tr.info > td,
.table > tfoot > tr.info > th { .table > tfoot > tr.info > th {
background-color: #009DA7; background-color: #526A84;
} }
.table-hover > tbody > tr > td.info:hover, .table-hover > tbody > tr > td.info:hover,
@ -4283,7 +4283,7 @@ a.label:hover, a.label:focus {
} }
.label-info { .label-info {
background-color: #009DA7; background-color: #526A84;
} }
.label-info[href]:hover, .label-info[href]:focus { .label-info[href]:hover, .label-info[href]:focus {
background-color: #006d74; background-color: #006d74;
@ -4519,8 +4519,8 @@ a.thumbnail.active {
} }
.alert-info { .alert-info {
background-color: #009DA7; background-color: #526A84;
border-color: #009DA7; border-color: #526A84;
color: #fff; color: #fff;
} }
.alert-info hr { .alert-info hr {
@ -4655,7 +4655,7 @@ a.thumbnail.active {
} }
.progress-bar-info { .progress-bar-info {
background-color: #009DA7; background-color: #526A84;
} }
.progress-striped .progress-bar-info { .progress-striped .progress-bar-info {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@ -4843,13 +4843,13 @@ button.list-group-item-success.active:focus {
} }
.list-group-item-info { .list-group-item-info {
color: #009DA7; color: #526A84;
background-color: #009DA7; background-color: #526A84;
} }
a.list-group-item-info, a.list-group-item-info,
button.list-group-item-info { button.list-group-item-info {
color: #009DA7; color: #526A84;
} }
a.list-group-item-info .list-group-item-heading, a.list-group-item-info .list-group-item-heading,
button.list-group-item-info .list-group-item-heading { button.list-group-item-info .list-group-item-heading {
@ -4858,7 +4858,7 @@ button.list-group-item-info .list-group-item-heading {
a.list-group-item-info:hover, a.list-group-item-info:focus, a.list-group-item-info:hover, a.list-group-item-info:focus,
button.list-group-item-info:hover, button.list-group-item-info:hover,
button.list-group-item-info:focus { button.list-group-item-info:focus {
color: #009DA7; color: #526A84;
background-color: #00858e; background-color: #00858e;
} }
a.list-group-item-info.active, a.list-group-item-info.active:hover, a.list-group-item-info.active:focus, a.list-group-item-info.active, a.list-group-item-info.active:hover, a.list-group-item-info.active:focus,
@ -4866,8 +4866,8 @@ button.list-group-item-info.active,
button.list-group-item-info.active:hover, button.list-group-item-info.active:hover,
button.list-group-item-info.active:focus { button.list-group-item-info.active:focus {
color: #fff; color: #fff;
background-color: #009DA7; background-color: #526A84;
border-color: #009DA7; border-color: #526A84;
} }
.list-group-item-warning { .list-group-item-warning {
@ -5246,22 +5246,22 @@ button.list-group-item-danger.active:focus {
} }
.panel-info { .panel-info {
border-color: #009DA7; border-color: #526A84;
} }
.panel-info > .panel-heading { .panel-info > .panel-heading {
color: #009DA7; color: #526A84;
background-color: #009DA7; background-color: #526A84;
border-color: #009DA7; border-color: #526A84;
} }
.panel-info > .panel-heading + .panel-collapse > .panel-body { .panel-info > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #009DA7; border-top-color: #526A84;
} }
.panel-info > .panel-heading .badge { .panel-info > .panel-heading .badge {
color: #009DA7; color: #526A84;
background-color: #009DA7; background-color: #526A84;
} }
.panel-info > .panel-footer + .panel-collapse > .panel-body { .panel-info > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #009DA7; border-bottom-color: #526A84;
} }
.panel-warning { .panel-warning {
@ -5416,10 +5416,10 @@ button.close {
color: #5cb85c; color: #5cb85c;
} }
.message-info { .message-info {
border-left-color: #009DA7; border-left-color: #526A84;
} }
.message-info h4 { .message-info h4 {
color: #009DA7; color: #526A84;
} }
.message-warning { .message-warning {
border-left-color: #f0ad4e; border-left-color: #f0ad4e;
@ -6871,7 +6871,7 @@ button.close {
} }
.icon-info { .icon-info {
color: #009DA7; color: #526A84;
} }
.icon-warning { .icon-warning {

Write Preview
Loading…
Cancel
Save