Changeset 9d989c6


Ignore:
Timestamp:
Feb 24, 2018 12:43:58 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5b0680b
Parents:
fa740e8
Message:

Console: Fix HTML error, forms can't be in tables
split table up into two, put forms outside, fixup CSS to match

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/jsp/configplugins.jsp

    rfa740e8 r9d989c6  
    4747%>
    4848<h3 id="pluginmanage"><a name="plugin"></a><%=intl._t("Plugin Installation")%></h3><p>
     49<form action="configplugins" method="POST">
    4950<table id="plugininstall" class="configtable">
    5051<tr><td class="infohelp" colspan="2">
     
    5556</th></tr>
    5657<tr>
    57 <form action="configplugins" method="POST">
    5858<td>
    5959 <input type="hidden" name="nonce" value="<%=pageNonce%>" >
     
    6666 <input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin")%>" />
    6767</td>
    68 </form>
    6968</tr>
     69</table></form>
     70<form action="configplugins" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
     71<table id="plugininstall2" class="configtable">
    7072<tr><th colspan="2">
    7173<a name="plugin"></a><%=intl._t("Installation from File")%>
    7274</th></tr>
    7375<tr>
    74 <form action="configplugins" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">
    7576<td>
    7677<input type="hidden" name="nonce" value="<%=pageNonce%>" >
     
    8182<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin from File")%>" />
    8283</td>
    83 </form>
    8484</tr>
    8585</table>
     86</form>
    8687<%
    8788       } // pluginInstallEnabled
  • installer/resources/themes/console/classic/console.css

    rfa740e8 r9d989c6  
    60696069}
    60706070
    6071 #manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
     6071#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
    60726072     background: #fff url(/themes/console/images/info/from_file.png) 12px center no-repeat;
    60736073     padding: 15px 15px 15px 50px;
     
    70377037}
    70387038
    7039 #plugininstall .optionsave {
     7039#plugininstall .optionsave, #plugininstall2 .optionsave {
    70407040     padding-right: 0 !important;
    70417041}
     
    70867086}
    70877087
    7088 #plugininstall tr:nth-child(3) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
     7088#plugininstall tr:nth-child(3) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
    70897089     background-size: 20px 20px;
    70907090     padding: 15px 0 15px 36px;
  • installer/resources/themes/console/dark/console.css

    rfa740e8 r9d989c6  
    56705670}
    56715671
    5672 table#netconfig th, table#externali2cp th, table#plugininstall th, .configtable th, th.th_title {
     5672table#netconfig th, table#externali2cp th, table#plugininstall th, table#plugininstall2 th, .configtable th, th.th_title {
    56735673    text-align: left;
    56745674    padding: 5px 10px !important;
     
    57425742}
    57435743
    5744 #floodfillconfig form, #plugininstall form, #updateplugins form, .configtable form {
     5744#floodfillconfig form, #plugininstall form, #plugininstall2 form, #updateplugins form, .configtable form {
    57455745     margin-bottom: 0;
    57465746}
     
    61866186}
    61876187
    6188 #manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
     6188#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
    61896189     background: #000 url(/themes/console/images/info/from_file.png) 12px center no-repeat;
    61906190     padding: 15px 15px 15px 50px;
     
    77997799}
    78007800
    7801 #plugininstall, #reseedconfig, #oldhome {
     7801#plugininstall, #plugininstall2, #reseedconfig, #oldhome {
    78027802     margin-bottom: 10px !important;
    78037803}
  • installer/resources/themes/console/dark/console_ar.css

    rfa740e8 r9d989c6  
    318318}
    319319
    320 table#netconfig th, table#externali2cp th, table#plugininstall th, .configtable th, th.th_title {
     320table#netconfig th, table#externali2cp th, table#plugininstall th, table#plugininstall2 th, .configtable th, th.th_title {
    321321     text-align: right !important;
    322322}
     
    447447h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp,
    448448#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),
    449 #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,
     449#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,
    450450p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp,
    451451#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
  • installer/resources/themes/console/light/console.css

    rfa740e8 r9d989c6  
    31313131}
    31323132
    3133 #manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
     3133#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
    31343134     background: #fafaff url(/themes/console/images/info/from_file.png) 12px center no-repeat;
    31353135     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;
     
    64886488}
    64896489
     6490table#plugininstall2 td:first-child,
    64906491table#plugininstall td:first-child {
    64916492     white-space: nowrap !important;
  • installer/resources/themes/console/light/console_ar.css

    rfa740e8 r9d989c6  
    448448}
    449449
    450 #plugininstall {
     450#plugininstall, #plugininstall2 {
    451451     margin: 0 0 0 -16px;
    452452}
     
    496496#consolepass tr:first-child td, form[action="events"],
    497497#plugininstall tr:nth-child(3) td:nth-last-child(2), #manualreseed tr:nth-child(3) td:nth-last-child(2),
    498 #manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2),
     498#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2),
    499499#config_summarybar .configtable td:not(.optionsave) {
    500500     background-position: right 12px center !important;
     
    555555}
    556556
    557 #plugininstall {
     557#plugininstall, #plugininstall2 {
    558558     margin-right: 0 !important;
    559559}
     
    10251025h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, #addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp,
    10261026#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),
    1027 #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,
     1027#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,
    10281028p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp,
    10291029#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
  • installer/resources/themes/console/midnight/console.css

    rfa740e8 r9d989c6  
    64486448}
    64496449
    6450 #netconfig th, #externali2cp th, #plugininstall th, .configtable th, th.th_title {
     6450#netconfig th, #externali2cp th, #plugininstall th, #plugininstall2 th, .configtable th, th.th_title {
    64516451    text-align: left;
    64526452    padding: 5px 10px !important;
     
    65286528}
    65296529
    6530 #floodfillconfig form, #plugininstall form, #updateplugins form, .configtable form {
     6530#floodfillconfig form, #plugininstall form, #plugininstall2 form, #updateplugins form, .configtable form {
    65316531     margin-bottom: 0;
    65326532}
     
    70017001}
    70027002
    7003 #manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall tr:nth-child(5) td:nth-last-child(2) {
     7003#manualreseed tr:nth-child(5) td:nth-last-child(2), #plugininstall2 tr:nth-child(2) td:nth-last-child(2) {
    70047004     background: #000 url(/themes/console/images/info/from_file.png) 12px center no-repeat;
    70057005     padding: 15px 15px 15px 50px;
  • installer/resources/themes/console/midnight/console_ar.css

    rfa740e8 r9d989c6  
    326326}
    327327
    328 table#netconfig th, table#externali2cp th, table#plugininstall th, .configtable th, th.th_title {
     328table#netconfig th, table#externali2cp th, table#plugininstall th, table#plugininstall2 th, .configtable th, th.th_title {
    329329     text-align: right !important;
    330330}
     
    458458h3#servicedebug + p.infohelp, h3#browseronstart + p.infohelp, table#addkeyring td:first-child, #config_peers tr:nth-child(3) td.infohelp,
    459459#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),
    460 #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,
     460#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,
    461461p#enablefullstats, p#gatherstats, #oldhome td:first-child, p#pluginconfigtext, #plugininstall .infohelp, #config_family .infohelp,
    462462#joinfamily tr:nth-child(3) td:first-child, #newfamily tr:last-child td:first-child, #config_summarybar .configtable td:not(.optionsave),
Note: See TracChangeset for help on using the changeset viewer.