Restructure menus (#2921)

* renamed config pages
* restructured menu
This commit is contained in:
CaCO3
2024-02-17 00:40:46 +01:00
committed by GitHub
parent df72445e79
commit d4a0ad20ff
7 changed files with 17 additions and 17 deletions

View File

@@ -1 +1 @@
edit_config_param.html edit_config.html

View File

@@ -220,7 +220,7 @@
<label for="ExpertModus_enabled">Show Expert Parameters</label> <label for="ExpertModus_enabled">Show Expert Parameters</label>
</td> </td>
<td> <td>
<button style="display:none;" class="button" id="Edit_Config_Direct" onclick="editConfigDirect()">Edit Config file directly</button> <button style="display:none;" class="button" id="Button_Edit_Config_Raw" onclick="editConfigRaw()">Edit Config file in raw mode</button>
</td> </td>
</tr> </tr>
@@ -2508,11 +2508,11 @@ function UpdateExpertModus() {
// _style = ''; // _style = '';
_style_pur = ''; _style_pur = '';
_hidden = false; _hidden = false;
document.getElementById("Edit_Config_Direct").style.display = ""; document.getElementById("Button_Edit_Config_Raw").style.display = "";
firework.launch("Expert view activated. Please use carefully", 'warning', 5000); firework.launch("Expert view activated. Please use carefully", 'warning', 5000);
} }
else { else {
document.getElementById("Edit_Config_Direct").style.display = "none"; document.getElementById("Button_Edit_Config_Raw").style.display = "none";
} }
const expert = document.querySelectorAll(".expert"); const expert = document.querySelectorAll(".expert");
@@ -2568,9 +2568,9 @@ function doReboot() {
} }
function editConfigDirect() { function editConfigRaw() {
if (confirm("Proceed to switch the view? Unsaved changes get lost")) { if (confirm("Proceed to switch to raw edit mode? Unsaved changes will get lost")) {
var stringota = getDomainname() + "/edit_config.html?v=$COMMIT_HASH"; var stringota = getDomainname() + "/edit_config_raw.html?v=$COMMIT_HASH";
window.location = stringota; window.location = stringota;
window.location.href = stringota; window.location.href = stringota;
window.location.assign(stringota); window.location.assign(stringota);

View File

@@ -24,7 +24,7 @@
'channelmode=no,directories=no,fullscreen=no,' + 'channelmode=no,directories=no,fullscreen=no,' +
'location=no,dependent=yes,menubar=no,resizable=no,scrollbars=no,' + 'location=no,dependent=yes,menubar=no,resizable=no,scrollbars=no,' +
'status=no,toolbar=no,titlebar=no,' + 'status=no,toolbar=no,titlebar=no,' +
'left=10,top=250,width=640px,height=480px'; 'left=10,top=260,width=640px,height=480px';
function loadPage(page) { function loadPage(page) {
console.log("loadPage( " + page + " )"); console.log("loadPage( " + page + " )");
@@ -88,21 +88,21 @@
<ul> <ul>
<li><a href="#" onclick="loadPage('overview.html?v=$COMMIT_HASH');">Overview</a></li> <li><a href="#" onclick="loadPage('overview.html?v=$COMMIT_HASH');">Overview</a></li>
<li><a>Settings <i class="arrow down"></i></a> <li><a>Settings <i class="arrow down"></i></a>
<ul class="submenu"> <ul class="submenu" style="width: 260px">
<li><a href="#" onclick="loadPage('prevalue_set.html?v=$COMMIT_HASH');">Set "Previous Value"</a></li> <li style="width: 260px"><a href="#" onclick="loadPage('prevalue_set.html?v=$COMMIT_HASH');">Set "Previous Value"</a></li>
<li><a href="#" onclick="loadPage('edit_config_param.html?v=$COMMIT_HASH');">Configuration</a></li> <li style="width: 260px"><a>Reference <i class="arrow right"></i></a>
<li><a>Alignment <i class="arrow right"></i></a>
<ul style="width: 350px"> <ul style="width: 350px">
<li style="width: 350px"><a href="#" onclick="loadPage('edit_reference.html?v=$COMMIT_HASH');">Reference Image and Camera Settings</a></li> <li style="width: 350px"><a href="#" onclick="loadPage('edit_reference.html?v=$COMMIT_HASH');">Reference Image and Camera Settings</a></li>
<li style="width: 350px"><a href="#" onclick="loadPage('edit_alignment.html?v=$COMMIT_HASH');">Alignment Markers</a></li> <li style="width: 350px"><a href="#" onclick="loadPage('edit_alignment.html?v=$COMMIT_HASH');">Alignment Markers</a></li>
</ul> </ul>
</li> </li>
<li><a><strong>R</strong>egions <strong>O</strong>f <strong>I</strong>nterest <i class="arrow right"></i></a> <li style="width: 260px"><a>Regions of Interest (ROIs)<i class="arrow right"></i></a>
<ul> <ul>
<li><a href="#" onclick="loadPage('edit_digits.html?v=$COMMIT_HASH');">Digit ROI</a></li> <li><a href="#" onclick="loadPage('edit_digits.html?v=$COMMIT_HASH');">Digit ROI</a></li>
<li><a href="#" onclick="loadPage('edit_analog.html?v=$COMMIT_HASH');">Analog ROI</a></li> <li><a href="#" onclick="loadPage('edit_analog.html?v=$COMMIT_HASH');">Analog ROI</a></li>
</ul> </ul>
</li> </li>
<li style="width: 260px"><a href="#" onclick="loadPage('edit_config.html?v=$COMMIT_HASH');">Configuration</a></li>
</ul> </ul>

View File

@@ -202,7 +202,7 @@
if (action_runtime > 10) { // After 10 seconds, start to check if we are up again if (action_runtime > 10) { // After 10 seconds, start to check if we are up again
/* Check if the device is up again and forward to index page if so */ /* Check if the device is up again and forward to index page if so */
fetch('reboot_page.html?v=$COMMIT_HASH&' + Math.random(), {mode: 'no-cors'}).then( fetch('reboot_page.html?v=$COMMIT_HASH&' + Math.random(), {mode: 'no-cors'}).then(
r=>{parent.location.href=('index.html?v=$COMMIT_HASH');} r=>{parent.location.href=('index.html?v=' + Math.random());}
) )
} }

View File

@@ -268,7 +268,7 @@ body, html {
break; break;
case 6: // Config page case 6: // Config page
document.getElementById('maincontent').src = 'edit_config_param.html?v=$COMMIT_HASH#description'; document.getElementById('maincontent').src = 'edit_config.html?v=$COMMIT_HASH#description';
document.getElementById('h_iframe_explain').style.display = ""; document.getElementById('h_iframe_explain').style.display = "";
document.getElementById('h_iframe_explain').style="height:100px;" document.getElementById('h_iframe_explain').style="height:100px;"

View File

@@ -8,8 +8,8 @@ import markdown
parameterDocsFolder = "../../param-docs/parameter-pages" parameterDocsFolder = "../../param-docs/parameter-pages"
docsMainFolder = "../../sd-card/html" docsMainFolder = "../../sd-card/html"
configPageTemplate = "edit_config_param_template.html" configPageTemplate = "edit_config_template.html"
configPage = "edit_config_param.html" configPage = "edit_config.html"
refImagePage = "edit_reference.html" refImagePage = "edit_reference.html"
htmlTooltipPrefix = """ htmlTooltipPrefix = """