Skip to content

Commit

Permalink
Merge pull request thiagoralves#184 from r2k-in-the-vortex/fixes
Browse files Browse the repository at this point in the history
inconsistent whitespace fixed
  • Loading branch information
thiagoralves authored Nov 11, 2022
2 parents 0503195 + b159874 commit f8fa47f
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 55 deletions.
98 changes: 49 additions & 49 deletions webserver/pages.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}
.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}
.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
Expand Down Expand Up @@ -749,58 +749,58 @@
}
.form-inline
{
display: flex;
flex-flow: row wrap;
align-items: center;
}
{
display: flex;
flex-flow: row wrap;
align-items: center;
}
.form-inline label
{
margin: 5px 10px 5px 0;
width: 130px;
}
.form-inline label
{
margin: 5px 10px 5px 0;
width: 130px;
}
.form-inline input
{
vertical-align: middle;
margin: 5px 10px 5px 0;
padding: 10px;
width: calc(100% - 250px);
background-color: #fff;
border: 1px solid #ddd;
}
.form-inline input
{
vertical-align: middle;
margin: 5px 10px 5px 0;
padding: 10px;
width: calc(100% - 250px);
background-color: #fff;
border: 1px solid #ddd;
}
.form-inline button
{
padding: 10px 20px;
background-color: #E02222;
width: 100px;
border: 1px solid #1F1F1F;
color: white;
cursor: pointer;
font-size: 14px;
.form-inline button
{
padding: 10px 20px;
background-color: #E02222;
width: 100px;
border: 1px solid #1F1F1F;
color: white;
cursor: pointer;
font-size: 14px;
font-family: "Roboto", sans-serif;
}
}
.form-inline button:hover
{
background-color: #B51A1A;
}
.form-inline button:hover
{
background-color: #B51A1A;
}
@media (max-width: 800px)
{
.form-inline input
{
margin: 10px 0;
}
@media (max-width: 800px)
{
.form-inline input
{
margin: 10px 0;
}
.form-inline
{
flex-direction: column;
align-items: stretch;
}
}
.form-inline
{
flex-direction: column;
align-items: stretch;
}
}
</style>
<body onload='loadData()'>"""

Expand Down Expand Up @@ -847,14 +847,14 @@
function updateRefreshRate()
{
html_refresh_text = document.getElementById('refresh_rate');
html_refresh_text = document.getElementById('refresh_rate');
refresh_rate = parseInt(html_refresh_text.value);
if (refresh_rate < 100)
{
refresh_rate = 100
}
html_refresh_text.value = refresh_rate;
html_refresh_text.value = refresh_rate;
}
function processReqChange()
Expand Down
12 changes: 6 additions & 6 deletions webserver/webserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -1412,11 +1412,11 @@ def monitoring():
<br>
<h2>Monitoring</h2>
<form class="form-inline">
<label for="refresh_rate">Refresh Rate (ms):</label>
<input type="text" id="refresh_rate" value="100" name="refresh_rate">
<button type="button" onclick="updateRefreshRate()">Update</button>
</form>
<br>
<label for="refresh_rate">Refresh Rate (ms):</label>
<input type="text" id="refresh_rate" value="100" name="refresh_rate">
<button type="button" onclick="updateRefreshRate()">Update</button>
</form>
<br>
<div id='monitor_table'>
<table>
<col width="50"><col width="10"><col width="10"><col width="10"><col width="100">
Expand Down Expand Up @@ -2401,7 +2401,7 @@ def main():
openplc_runtime.start_runtime()
time.sleep(1)
configure_runtime()
monitor.parse_st(openplc_runtime.project_file)
monitor.parse_st(openplc_runtime.project_file)

app.run(debug=False, host='0.0.0.0', threaded=True, port=8080)

Expand Down

0 comments on commit f8fa47f

Please sign in to comment.