nmelone/ABB-Flowmeter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved notes from NodeDetailHeader to Dashboard

Browse Source
This commit is contained in:
Patrick McDonagh
2017-02-10 10:20:31 -06:00
parent 3badad56b8
commit ec72749c2a
2 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
NodeDetailHeader.html
View File

@@ -4,34 +4,3 @@
<div class='col-xs-6'> <div class='col-xs-6'>
<h3><%= node.vanityname %></h3> <h3><%= node.vanityname %></h3>
</div> </div>
<div class='col-xs-4'>
<div class="text-center">
<h2>Last Note</h2>
<p class="note-text"><%= channels['advvfdipp.notes'].value %></p>
<p> at <%= channels["advvfdipp.notes"].timestamp %></p>
<button href="#" data-channelId="<%= channels['advvfdipp.notes'].channelId %>" class="data-table btn btn-theme note-btn" title="Note History"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-th-list icon-theme"></i> All Notes</button>
<br />
<button type="button" class="btn btn-theme note-btn" data-toggle="modal" data-target="#note-modal"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-pencil icon-theme"></i> New Note</button>
</div>
</div>
<style>
#note-modal{
position: absolute;
}
.modal-backdrop {
position: relative;
}
.modal-dialog {
top:5%;
}
.note-btn {
margin-top: 10px;
width: 75%;
}
.note-text {
font-size: 1.5em;
font-style: italic;
}
</style>

37
Overview.html
View File

@@ -26,6 +26,24 @@
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
<div class="row row-flex box-me">
<div class='col-xs-8'>
<div class="text-center">
<h2>Last Note</h2>
<p class="note-text"><%= channels['abbflow.notes'].value %></p>
<p> at <%= channels["abbflow.notes"].timestamp %></p>
</div>
</div>
<div class="col-xs-4">
<div class="text-center">
<button href="#" data-channelId="<%= channels['abbflow.notes'].channelId %>" class="data-table btn btn-theme note-btn" title="Note History"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-th-list icon-theme"></i> All Notes</button>
<br />
<button type="button" class="btn btn-theme note-btn" data-toggle="modal" data-target="#note-modal"><i style='margin-left: 0.5em; cursor: pointer' class="fa fa-pencil icon-theme"></i> New Note</button>
</div>
</div>
</div>
</div>
<div class='row row-flex box-me'> <div class='row row-flex box-me'>
<div class='col-xs-4 text-center'> <div class='col-xs-4 text-center'>
<h2>Volume Flow</h2> <h2>Volume Flow</h2>
@@ -373,4 +391,23 @@
letter-spacing: 1px; letter-spacing: 1px;
z-index: 100; z-index: 100;
} }
#note-modal{
position: absolute;
}
.modal-backdrop {
position: relative;
}
.modal-dialog {
top:5%;
}
.note-btn {
margin-top: 10px;
width: 75%;
}
.note-text {
font-size: 1.5em;
font-style: italic;
}
</style> </style>