Fix bug where the second time you opened a +/- table a - would not be shown and make the rest of the CSS line up right

This commit is contained in:
hankhill19580
2020-04-26 09:29:42 +00:00
parent 1083d2939b
commit c14541f4a3
5 changed files with 23 additions and 14 deletions

View File

@ -37,7 +37,7 @@
<input type="submit" class="default" name="action" value="Save changes" /> <input type="submit" class="default" name="action" value="Save changes" />
<table id="clientTunnelEdit" class="tunnelConfig"> <table id="clientTunnelEdit" class="tunnelConfig">
<tr> <tr>
<th> <th class="tunnelName excludeBackgroundImage">
<%=intl._t("Name")%> <%=intl._t("Name")%>
</th><th class="excludeBackgroundImage"> </th><th class="excludeBackgroundImage">
<%=intl._t("Type")%> <%=intl._t("Type")%>

View File

@ -36,7 +36,7 @@
<input type="submit" class="default" name="action" value="Save changes" /> <input type="submit" class="default" name="action" value="Save changes" />
<table id="serverTunnelEdit" class="tunnelConfig"> <table id="serverTunnelEdit" class="tunnelConfig">
<tr> <tr>
<th> <th class="tunnelName excludeBackgroundImage">
<%=intl._t("Name")%> <%=intl._t("Name")%>
</th><th class="excludeBackgroundImage"> </th><th class="excludeBackgroundImage">
<%=intl._t("Type")%> <%=intl._t("Type")%>

View File

@ -23,8 +23,6 @@ hideableTables.forEach(function(configTable) {
) { ) {
row.style.visibility = "collapse"; row.style.visibility = "collapse";
} }
} else {
row.firstElementChild.classList.remove('tunnelConfigExpanded');
} }
} else if (row.style.visibility == "visible") { } else if (row.style.visibility == "visible") {
if (row.firstElementChild.localName != "th") { if (row.firstElementChild.localName != "th") {
@ -34,14 +32,17 @@ hideableTables.forEach(function(configTable) {
row.style.visibility = "collapse"; row.style.visibility = "collapse";
collapseme = true; collapseme = true;
} }
} else {
row.firstElementChild.classList.remove('tunnelConfigExpanded');
} }
row.querySelectorAll("th").forEach(function(configRow) {
configRow.classList.toggle('tunnelConfigExpanded');
});
configTable.classList.remove('tunnelConfigExpanded');
} else { } else {
row.style.visibility = "visible"; row.style.visibility = "visible";
if (row.firstElementChild.localName == 'th') { row.querySelectorAll("th").forEach(function(configRow) {
row.firstElementChild.classList.add('tunnelConfigExpanded'); configRow.classList.add('tunnelConfigExpanded');
} });
configTable.classList.add('tunnelConfigExpanded');
} }
} }
} }
@ -56,9 +57,9 @@ hideableTables.forEach(function(configTable) {
} }
for (var i = 0, row; (row = hideableTables[0].offsetParent.rows[i]); i++) { for (var i = 0, row; (row = hideableTables[0].offsetParent.rows[i]); i++) {
row.style.visibility = "visible"; row.style.visibility = "visible";
if (row.firstElementChild.localName == 'th') { row.querySelectorAll("th").forEach(function(configRow) {
row.firstElementChild.classList.add('tunnelConfigExpanded'); configRow.classList.add('tunnelConfigExpanded');
} });
} }
}); });

View File

@ -353,7 +353,7 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
.tunnelConfigExpanded { .tunnelConfigExpanded {
background: url(images/dropdown_active.png) #433e47 !important; background: url(images/dropdown_active.png) #433e47 !important;
padding-left: 0px !important; padding-left: 30px;
} }
.tunnelConfigContracted { .tunnelConfigContracted {
@ -363,7 +363,11 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
.excludeBackgroundImage { .excludeBackgroundImage {
background-image: none !important; background-image: none !important;
padding-left: 30px; padding-left: 0px !important;
}
.tunnelName {
padding-left: 30px !important;
} }
#clientTunnels tr, #serverTunnels tr, .tunnelConfig tr { #clientTunnels tr, #serverTunnels tr, .tunnelConfig tr {

View File

@ -538,6 +538,10 @@ html body#tunnelEditPage form div.panel table#serverTunnelEdit.tunnelConfig tbod
padding-left: 0px !important; padding-left: 0px !important;
} }
.tunnelName {
padding-left: 30px !important;
}
.tunnelProperties { .tunnelProperties {
background: #fafaff !important; background: #fafaff !important;
} }