AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Console: Fix HTML error, forms can't be in tables

Browse Source 
split table up into two, put forms outside, fixup CSS to match
This commit is contained in:
zzz
2018-02-24 12:43:58 +00:00
parent fa740e8271
commit 9d989c6a67
8 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/routerconsole/jsp/configplugins.jsp
View File

@@ -46,6 +46,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
if (clientshelper.isPluginInstallEnabled()) {
%>
<h3 id="pluginmanage"><a name="plugin"></a><%=intl._t("Plugin Installation")%></h3><p>
<form action="configplugins" method="POST">
<table id="plugininstall" class="configtable">
<tr><td class="infohelp" colspan="2">
<%=intl._t("Look for available plugins on {0}.", "<a href=\"http://i2pwiki.i2p/index.php?title=Plugins\" target=\"_blank\">i2pwiki.i2p</a>")%>
@@ -54,7 +55,6 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<%=intl._t("Installation from URL")%>
</th></tr>
<tr>
<form action="configplugins" method="POST">
<td>
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
<b>URL:</b>
@@ -65,13 +65,14 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin")%>" />
</td>
</form>
</tr>
</table></form>
<form action="configplugins" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
<table id="plugininstall2" class="configtable">
<tr><th colspan="2">
<a name="plugin"></a><%=intl._t("Installation from File")%>
</th></tr>
<tr>
<form action="configplugins" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
<td>
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
<b><%=intl._t("Select xpi2p or su3 file")%>:</b>
@@ -80,9 +81,9 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
<td class="optionsave" align="right">
<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin from File")%>" />
</td>
</form>
</tr>
</table>
</form>
<%
} // pluginInstallEnabled
if (clientshelper.isPluginUpdateEnabled()) {

6
installer/resources/themes/console/classic/console.css
View File

@@ -6068,7 +6068,7 @@ p#pluginconfigtext {
background-size: 28px 28px;
}
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
background: #fff url(/themes/console/images/info/from_file.png) 12px center no-repeat;
padding: 15px 15px 15px 50px;
background-size: 28px 28px;
@@ -7036,7 +7036,7 @@ input[name="pluginURL"] {
padding-left: 5px !important;
}
#plugininstall .optionsave {
#plugininstall .optionsave, #plugininstall2 .optionsave {
padding-right: 0 !important;
}
@@ -7085,7 +7085,7 @@ input[name="pluginURL"] {
width: 260px;
}
#plugininstall tr:nth-child(3) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
#plugininstall tr:nth-child(3) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
background-size: 20px 20px;
padding: 15px 0 15px 36px;
background-position: 10px center;

8
installer/resources/themes/console/dark/console.css
View File

@@ -5669,7 +5669,7 @@ table.configtable tr:last-child {
border-top: 1px solid #494;
}
table#netconfig th, table#externali2cp th, table#plugininstall th, .configtable th, th.th_title {
table#netconfig th, table#externali2cp th, table#plugininstall th, table#plugininstall2 th, .configtable th, th.th_title {
text-align: left;
padding: 5px 10px !important;
text-transform: uppercase;
@@ -5741,7 +5741,7 @@ td.optionsave {
background: #000;
}
#floodfillconfig form, #plugininstall form, #updateplugins form, .configtable form {
#floodfillconfig form, #plugininstall form, #plugininstall2 form, #updateplugins form, .configtable form {
margin-bottom: 0;
}
@@ -6185,7 +6185,7 @@ form[action="events"] {
background-size: 28px 28px;
}
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
background: #000 url(/themes/console/images/info/from_file.png) 12px center no-repeat;
padding: 15px 15px 15px 50px;
background-size: 28px 28px;
@@ -7798,7 +7798,7 @@ th.options, table#externali2cp th {
box-shadow: none;
}
#plugininstall, #reseedconfig, #oldhome {
#plugininstall, #plugininstall2, #reseedconfig, #oldhome {
margin-bottom: 10px !important;
}

4
installer/resources/themes/console/dark/console_ar.css
View File

@@ -317,7 +317,7 @@ table.netdbentry th:last-child, #leasesetdebug td:nth-child(2n+1) {
text-align: right !important;
}
table#netconfig th, table#externali2cp th, table#plugininstall th, .configtable th, th.th_title {
table#netconfig th, table#externali2cp th, table#plugininstall th, table#plugininstall2 th, .configtable th, th.th_title {
text-align: right !important;
}
@@ -446,7 +446,7 @@ select, select:hover, select:focus {
#bandwidthconfig tr:first-child .infohelp, h3#shutdownrouter + p.infohelp, h3#restartrouter + p.infohelp, h3#systray + p.infohelp,
h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp,
#config_reseed.main p.infohelp, #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2),
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp,
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp,
p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp,
#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
table#bugreports td.infohelp {

3
installer/resources/themes/console/light/console.css
View File

@@ -3130,7 +3130,7 @@ p#pluginconfigtext {
padding: 0;
}
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
background: #fafaff url(/themes/console/images/info/from_file.png) 12px center no-repeat;
background: url(/themes/console/images/info/from_file.png) 12px center no-repeat, linear-gradient(to bottom, #fafaff 50%, rgba(220,220,255,0.3)), repeating-linear-gradient(135deg, rgba(255,255,255,0.5) 2px, rgba(221, 221, 255, 0.3) 3px, #fff 5px), #fff !important;
padding: 10px 15px 10px 50px;
@@ -6487,6 +6487,7 @@ h3#ntcpcon, h3#udpcon {
padding-right: 3px;
}
table#plugininstall2 td:first-child,
table#plugininstall td:first-child {
white-space: nowrap !important;
}

10
installer/resources/themes/console/light/console_ar.css
View File

@@ -447,7 +447,7 @@ span.newtab {
background: #fff ;
}
#plugininstall {
#plugininstall, #plugininstall2 {
margin: 0 0 0 -16px;
}
@@ -495,7 +495,7 @@ h3#browseronstart + p.infohelp, .main#config_reseed p.infohelp,
p#enablefullstats, p#gatherstats, #config_family .infohelp,
#consolepass tr:first-child td, form[action="events"],
#plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2),
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2),
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2),
#config_summarybar .configtable td:not(.optionsave) {
background-position: right 12px center !important;
padding: 15px 50px 15px 10px !important;
@@ -554,7 +554,7 @@ div.themechoice, div.langselect {
margin-left: 16px;
}
#plugininstall {
#plugininstall, #plugininstall2 {
margin-right: 0 !important;
}
@@ -1024,7 +1024,7 @@ label {
#bandwidthconfig tr:first-child .infohelp, h3#shutdownrouter + p.infohelp, h3#restartrouter + p.infohelp, h3#systray + p.infohelp,
h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, #addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp,
#config_reseed.main p.infohelp, #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2),
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp,
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp,
p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp,
#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
#bugreports td.infohelp {
@@ -1121,4 +1121,4 @@ body {
margin-left: 0;
margin-right: -49px;
}
}
}

6
installer/resources/themes/console/midnight/console.css
View File

@@ -6447,7 +6447,7 @@ p.sybil_info + a[name] + .sybil_routerinfo, p.hashdist + a[name] + .sybil_router
border-top: 1px solid #443da0;
}
#netconfig th, #externali2cp th, #plugininstall th, .configtable th, th.th_title {
#netconfig th, #externali2cp th, #plugininstall th, #plugininstall2 th, .configtable th, th.th_title {
text-align: left;
padding: 5px 10px !important;
text-transform: uppercase;
@@ -6527,7 +6527,7 @@ td.optionsave {
background: #000;
}
#floodfillconfig form, #plugininstall form, #updateplugins form, .configtable form {
#floodfillconfig form, #plugininstall form, #plugininstall2 form, #updateplugins form, .configtable form {
margin-bottom: 0;
}
@@ -7000,7 +7000,7 @@ form[action="events"] {
background-size: 28px 28px;
}
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
background: #000 url(/themes/console/images/info/from_file.png) 12px center no-repeat;
padding: 15px 15px 15px 50px;
background-size: 28px 28px;

4
installer/resources/themes/console/midnight/console_ar.css
View File

@@ -325,7 +325,7 @@ table#enviro td:first-child {
text-align: right !important;
}
table#netconfig th, table#externali2cp th, table#plugininstall th, .configtable th, th.th_title {
table#netconfig th, table#externali2cp th, table#plugininstall th, table#plugininstall2 th, .configtable th, th.th_title {
text-align: right !important;
}
@@ -457,7 +457,7 @@ select, select:hover, select:focus, select:active {
#bandwidthconfig tr:first-child .infohelp, h3#shutdownrouter + p.infohelp, h3#restartrouter + p.infohelp, h3#systray + p.infohelp,
h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp,
#config_reseed.main p.infohelp, #plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2),
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp,
#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2), #manualreseed tr:nth-last-child(2) td.infohelp,
p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp,
#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
table#bugreports td.infohelp {