Skip to content

Commit f70ab25

Browse files
authored
Merge pull request #2 from tttttx2/dev_UI_enhancements
improved UI, added home nav button
2 parents 0bf9d4d + 88c3db8 commit f70ab25

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

app/static/main.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@
66
}
77
#sidebar > .btn{
88
width: 100%;
9+
}
10+
a {
11+
cursor: pointer;
912
}

app/static/main.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ String.prototype.niceify = function() {
88
// App Logic
99
$.getJSON('plugins', function(data) {
1010
console.log(data);
11+
document.getElementById("navbar").innerHTML = '<a href="/" class="p-2 border-2 border-danger sat-plugins border-bottom">Home</button>';
1112
data.forEach((element) => {
1213
document.getElementById("navbar").innerHTML +='<a href="#'+element+'" id="nav_item_'+element+'" class="p-2 border-2 border-danger sat-plugins" onclick="load_content(\''+element+'\')">'+element.niceify()+'</a>'
1314
});
@@ -44,10 +45,10 @@ function start_feature_read(plugin, feature, id) {
4445
document.getElementById("results").innerHTML = tablecode
4546
}
4647
else {
47-
tablecode = '<table class="table"><thead><tr>'
48+
tablecode = '<table class="table"><thead><tr><th></th><th></th>'
4849
Object.keys(data['table'][0]).forEach((element) => tablecode+='<th scope="col">'+element+'</th>');
49-
tablecode += '<th></th><th></th></tr></thead><tbody>'
50-
data['table'].forEach((element) => tablecode+='<tr><td>'+Object.values(element).join('</td><td>')+'</td><td><a onclick="start_feature_read(\''+plugin+'\', \''+feature+'\', \''+element['id']+'\')">Edit</a></td><td><a onclick="start_feature_delete(\''+plugin+'\', \''+feature+'\', \''+element['id']+'\')">Delete</a></td></tr>');
50+
tablecode += '</tr></thead><tbody>'
51+
data['table'].forEach((element) => tablecode+='<tr><td><a onclick="start_feature_read(\''+plugin+'\', \''+feature+'\', \''+element['id']+'\')">Edit</a></td><td><a onclick="start_feature_delete(\''+plugin+'\', \''+feature+'\', \''+element['id']+'\')">Delete</a></td><td>'+Object.values(element).join('</td><td>')+'</td></tr>');
5152
// tablecode+='<tr><td>NEW</td>';
5253
// Object.keys(data['table'][0]).forEach((element) => tablecode+='<td></td>');
5354
// tablecode += '<td></td></tr>'

app/templates/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
, filename:'SAT-export.pdf'}).from(document.getElementById('results')).save()">Export</button>-->
5353
</div>
5454

55-
<div id="output" class="d-flex flex-column w-75 mh-100 py-2" style="overflow-y: scroll;;position:fixed;">
55+
<div id="output" class="d-flex flex-column mh-100 py-2">
5656
<!-- <div class="col-10 ps-5 mh-100 overflow-auto py-2"> -->
5757
<pre class="section-to-print" id="results">
5858
<h2>Welcome to SimpleSignageProxy</h2>

0 commit comments

Comments
 (0)