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

Merge branch 'master' into 'master'

Browse Source 
Fix footer floating issue

See merge request entgra/carbon-device-mgt!397
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
parent 28e3aaf91e 016ff9bee0
commit d240c05b9b
2 changed files with 75 additions and 77 deletions
Show Stats Download Patch File Download Diff File

148
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.event.edit/edit.hbs
Unescape View File

@ -48,89 +48,91 @@
<div class="col-md-12"> <div class="col-md-12">
<!-- content --> <!-- content -->
<div id="devicetype-create-form" class="container col-centered wr-content"> <div id="devicetype-create-form" class="container col-centered wr-content">
<div class="wr-form"> <div class="wr-form">
<p class="page-sub-title">{{name}}</p> <p class="page-sub-title">{{name}}</p>
<hr/> <hr/>
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">
<div id="devicetype-create-error-msg" class="alert alert-danger hidden" role="alert"> <div id="devicetype-create-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<br> <br>
<input aria-describedby="basic-addon1" type="text" id="deviceTypeName" <input aria-describedby="basic-addon1" type="text" id="deviceTypeName"
data-error-msg="invalid device type name" class="form-control hidden-input" value="{{name}}"/> data-error-msg="invalid device type name" class="form-control hidden-input" value="{{name}}"/>
<label class="wr-input-label">Transport</label> <label class="wr-input-label">Transport</label>
<div class="wr-input-control"> <div class="wr-input-control">
<!--suppress HtmlFormInputWithoutLabel --> <!--suppress HtmlFormInputWithoutLabel -->
<select id="transport" class="form-control select"> <select id="transport" class="form-control select">
{{#if event}} {{#if event}}
<option {{selected event.transport "HTTP"}}>HTTP</option> <option {{selected event.transport "HTTP"}}>HTTP</option>
<option {{selected event.transport "MQTT"}}>MQTT</option> <option {{selected event.transport "MQTT"}}>MQTT</option>
{{else}} {{else}}
<option>HTTP</option> <option>HTTP</option>
<option>MQTT</option> <option>MQTT</option>
{{/if}} {{/if}}
</select> </select>
</div> </div>
<label class="wr-input-label"> <label class="wr-input-label">
Event Attributes (eg: alarm_status, temperature) Event Attributes (eg: alarm_status, temperature)
</label> </label>
<br> <br>
<div class="form-group event_field_wrapper"> <div class="form-group event_field_wrapper">
{{#if event.eventAttributes}} {{#if event.eventAttributes}}
{{#each event.eventAttributes.attributes}} {{#each event.eventAttributes.attributes}}
<div class="row"> <div class="row">
<div class="dontfloat" name="deviceEvent"> <div class="dontfloat" name="deviceEvent">
<div class="col-xs-3"> <div class="col-xs-3">
<input type="text" class="form-control" id="event-name" placeholder="name" value="{{this.name}}"/> <input type="text" class="form-control" id="event-name" placeholder="name" value="{{this.name}}"/>
</div> </div>
<div class="col-xs-4"> <div class="col-xs-4">
<select class="form-control select" id="event-type"> <select class="form-control select" id="event-type">
<option {{selected this.type "STRING"}}>STRING</option> <option {{selected this.type "STRING"}}>STRING</option>
<option {{selected this.type "LONG"}}>LONG</option> <option {{selected this.type "LONG"}}>LONG</option>
<option {{selected this.type "BOOL"}}>BOOL</option> <option {{selected this.type "BOOL"}}>BOOL</option>
<option {{selected this.type "INT"}}>INT</option> <option {{selected this.type "INT"}}>INT</option>
<option {{selected this.type "FLOAT"}}>FLOAT</option> <option {{selected this.type "FLOAT"}}>FLOAT</option>
<option {{selected this.type "DOUBLE"}}>DOUBLE</option> <option {{selected this.type "DOUBLE"}}>DOUBLE</option>
</select> </select>
</div>
<button type="button" class="wr-btn wr-btn-horizontal remove_event_button"><i class="fa fa-minus"></i></button>
</div> </div>
<button type="button" class="wr-btn wr-btn-horizontal remove_event_button"><i class="fa fa-minus"></i></button>
</div> </div>
{{/each}}
{{/if}}
<div class="row">
<div class="dontfloat event-wrapper" name="deviceEvent">
<div class="col-xs-3">
<input type="text" class="form-control" id="event-name" placeholder="name"/>
</div>
<div class="col-xs-4">
<select class="form-control select" id="event-type">
<option>STRING</option>
<option>LONG</option>
<option>BOOL</option>
<option>INT</option>
<option>FLOAT</option>
<option>DOUBLE</option>
</select>
</div>
<button type="button" class="wr-btn wr-btn-horizontal add_event_button"><i class="fa fa-plus"></i></button>
</div> </div>
{{/each}}
{{/if}}
<div class="row">
<div class="dontfloat event-wrapper" name="deviceEvent">
<div class="col-xs-3">
<input type="text" class="form-control" id="event-name" placeholder="name"/>
</div>
<div class="col-xs-4">
<select class="form-control select" id="event-type">
<option>STRING</option>
<option>LONG</option>
<option>BOOL</option>
<option>INT</option>
<option>FLOAT</option>
<option>DOUBLE</option>
</select>
</div>
<button type="button" class="wr-btn wr-btn-horizontal add_event_button"><i class="fa fa-plus"></i></button>
</div> </div>
</div> </div>
</div>
<br> <br>
{{#if event}} {{#if event}}
<button id="add-event-btn" class="wr-btn">Update</button> <button id="add-event-btn" class="wr-btn">Update</button>
{{else}} {{else}}
<button id="add-event-btn" class="wr-btn">Add</button> <button id="add-event-btn" class="wr-btn">Add</button>
{{/if}} {{/if}}
<div id="devicetype-create-success-msg" class="alert hidden" role="alert"> <div id="devicetype-create-success-msg" class="alert hidden" role="alert">
<i class="icon fw fw-success"></i><span></span> <i class="icon fw fw-success"></i><span></span>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.event.edit/public/css/devicetype.css
Unescape View File

@ -23,7 +23,3 @@
.wr-btn-secondary{ .wr-btn-secondary{
background-color: #617d8b; background-color: #617d8b;
} }
.page-content-wrapper{
height: calc(100vh - 50px);
}
Write Preview
Loading…
Cancel
Save