Fixes after merge

Also found several duplicate ids that were split up; these will be replaced with
classes later.
This commit is contained in:
str4d
2016-07-09 23:53:51 +00:00
parent b38f3b56f8
commit 6d4f8fd471
3 changed files with 66 additions and 42 deletions

View File

@ -31,13 +31,13 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
if (clientshelper.showPlugins()) {
if (clientshelper.isPluginUpdateEnabled()) {
%>
<h3><a name="pconfig"></a><%=intl._t("Plugin Configuration")%></h3><p>
<h3 id="pluginconfig"><a name="pconfig"></a><%=intl._t("Plugin Configuration")%></h3><p id="pluginconfigtext">
<%=intl._t("The plugins listed below are started by the webConsole client.")%>
</p><div class="wideload">
<form action="" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
<jsp:getProperty name="clientshelper" property="form3" />
<div class="formaction">
<div class="formaction" id="pluginconfigactions">
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" name="action" class="accept" value="<%=intl._t("Save Plugin Configuration")%>" />
</div></form></div>
@ -45,38 +45,50 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
} // pluginUpdateEnabled
if (clientshelper.isPluginInstallEnabled()) {
%>
<h3><a name="plugin"></a><%=intl._t("Plugin Installation from URL")%></h3><p>
<h3 id="pluginmanage"><a name="plugin"></a><%=intl._t("Plugin Installation")%></h3><p>
<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\">i2pwiki.i2p</a>")%>
<%=intl._t("To install a plugin, enter the download URL:")%>
</p>
<div class="wideload">
</td></tr>
<tr><th colspan="2">
<%=intl._t("Installation from URL")%>
</th></tr>
<tr>
<form action="configplugins" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
<p>
<input type="text" size="60" name="pluginURL" >
</p><hr><div class="formaction">
<input type="submit" name="action" class="default" value="<%=intl._t("Install Plugin")%>" />
<td>
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
URL:&nbsp;
<input type="text" size="60" name="pluginURL" title="<%=intl._t("To install a plugin, enter the download URL:")%>" >
</td>
<td class="optionsave" align="right">
<input type="submit" name="action" class="default hideme" value="<%=intl._t("Install Plugin")%>" />
<input type="submit" class="cancel" name="foo" value="<%=intl._t("Cancel")%>" />
<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin")%>" />
</div></form></div>
<div class="wideload">
<h3><a name="plugin"></a><%=intl._t("Plugin Installation from File")%></h3>
</td>
</form>
</tr>
<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%>" >
<p><%=intl._t("Install plugin from file.")%>
<br><%=intl._t("Select xpi2p or su3 file")%> :
<input type="file" name="pluginFile" >
</p><hr><div class="formaction">
<%=intl._t("Select xpi2p or su3 file")%>:&nbsp;
<input type="file" name="pluginFile" accept=".xpi2p,.su3" >
</td>
<td class="optionsave" align="right">
<input type="submit" name="action" class="download" value="<%=intl._t("Install Plugin from File")%>" />
</div></form></div>
</td>
</form>
</tr>
</table>
<%
} // pluginInstallEnabled
if (clientshelper.isPluginUpdateEnabled()) {
%>
<h3><a name="plugin"></a><%=intl._t("Update All Plugins")%></h3>
<div class="formaction">
<h4 id="updateplugins" class="embeddedtitle"><a name="plugin"></a><%=intl._t("Update All Plugins")%></h4>
<div class="formaction" id="pluginupdater">
<form action="configplugins" method="POST">
<input type="hidden" name="nonce" value="<%=pageNonce%>" >
<input type="submit" name="action" class="reload" value="<%=intl._t("Update All Installed Plugins")%>" />