summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-05-28 17:01:45 -0300
committerRenato Botelho <garga@FreeBSD.org>2014-05-28 17:01:45 -0300
commit612b6ad6a740ccfb6576192283dd352dd1c922aa (patch)
treec1179dee2d3a05af7463c7a8e4374b7149be5202 /usr/local
parent4f280a4a1ba46c595b58483d620693f62f6204b4 (diff)
parent587ecd08637e6a5c71e0c292b55281bc7f664452 (diff)
downloadpfsense-612b6ad6a740ccfb6576192283dd352dd1c922aa.zip
pfsense-612b6ad6a740ccfb6576192283dd352dd1c922aa.tar.gz
Merge pull request #1212 from ExolonDX/branch_master_04
Diffstat (limited to 'usr/local')
-rwxr-xr-xusr/local/www/system_firmware_auto.php12
-rw-r--r--usr/local/www/system_firmware_check.php9
2 files changed, 18 insertions, 3 deletions
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php
index 2f8928b..26d3d92 100755
--- a/usr/local/www/system_firmware_auto.php
+++ b/usr/local/www/system_firmware_auto.php
@@ -109,10 +109,18 @@ include("head.inc");
</tr>
</table>
<br />
+ <script type="text/javascript">
+ //<![CDATA[
+ window.onload=function(){
+ document.getElementById("status").wrap='hard';
+ document.getElementById("output").wrap='hard';
+ }
+ //]]>
+ </script>
<!-- status box -->
- <textarea cols="90" rows="1" name="status" id="status" wrap="hard"><?=gettext("Beginning firmware upgrade"); ?>.</textarea>
+ <textarea cols="90" rows="1" name="status" id="status"><?=gettext("Beginning firmware upgrade"); ?>.</textarea>
<!-- command output box -->
- <textarea cols="90" rows="25" name="output" id="output" wrap="hard"></textarea>
+ <textarea cols="90" rows="25" name="output" id="output"></textarea>
</td>
</tr>
</table>
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php
index e2c3ebd..d09bda6 100644
--- a/usr/local/www/system_firmware_check.php
+++ b/usr/local/www/system_firmware_check.php
@@ -92,7 +92,14 @@ include("head.inc");
</table>
<br />
<!-- command output box -->
- <textarea style="border:1;bordercolordark:#000000;bordercolorlight:#000000" cols="90" rows="9" name="output" id="output" wrap="hard"></textarea>
+ <script type="text/javascript">
+ //<![CDATA[
+ window.onload=function(){
+ document.getElementById("output").wrap='hard';
+ }
+ //]]>
+ </script>
+ <textarea style="border:1;bordercolordark:#000000;bordercolorlight:#000000" cols="90" rows="9" name="output" id="output"></textarea>
<div id="backupdiv" style="visibility:hidden">
<?php if ($g['hidebackupbeforeupgrade'] === false): ?>
<br /><input type="checkbox" name="backupbeforeupgrade" id="backupbeforeupgrade" /><?=gettext("Perform full backup prior to upgrade");?>
OpenPOWER on IntegriCloud