Skip to content

O
OpnSense
Commit 116c5add authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

system: brush up last bits of config history 

(cherry picked from commit 7fe5a8cf)
parent 5a1e939b
Show whitespace changes
Inline Side-by-side
Showing with 99 additions and 105 deletions
src/www/diag_confbak.php
View file @ 116c5add
...@@ -225,15 +225,19 @@ $( document ).ready(function() { ...@@ -225,15 +225,19 @@ $( document ).ready(function() {
</div> </div>
</form> </form>
<?php if ($diff): ?> <?php if ($diff): ?>
<section style="margin-bottom:15px;"> <div class="content-box tab-content table-responsive __mb" style="overflow: scroll;">
<div class="content-box"> <table class="table table-striped">
<header class="content-box-head container-fluid"> <tr>
<h3><?=gettext("Configuration diff from");?> <?= date(gettext("n/j/y H:i:s"), $oldtime); ?> <?=gettext("to");?> <?=date(gettext("n/j/y H:i:s"), $newtime); ?></h3> <th colspan="2" valign="top" class="listtopic">
</header> <?= sprintf(
<div class="content-box-main"> gettext('Configuration diff from %s to %s'),
<div class="container-fluid __mb"> date(gettext('n/j/y H:i:s'), $oldtime),
<div class="table-responsive" style="overflow: scroll;"> date(gettext('n/j/y H:i:s'), $newtime)
<table class="table table-condensed table-striped"> ); ?>
</th>
</tr>
<tr>
<td>
<?php <?php
foreach ($diff as $line): foreach ($diff as $line):
switch (substr($line, 0, 1)) { switch (substr($line, 0, 1)) {
...@@ -248,19 +252,13 @@ $( document ).ready(function() { ...@@ -248,19 +252,13 @@ $( document ).ready(function() {
break; break;
default: default:
$color = '#000000'; $color = '#000000';
} } ?>
?> <span style="color: <?=$color;?>; white-space: pre-wrap; font-family: monospace;"><?=htmlentities($line);?></span><br/>
<tr> <?php endforeach; ?>
<td style="color: <?=$color;?>; white-space: pre-wrap; font-family: monospace;"><?=htmlentities($line);?></td> </td>
</tr> </tr>
<?php
endforeach;?>
</table> </table>
</div> </div>
</div>
</div>
</div>
</section>
<?php endif; ?> <?php endif; ?>
<?php if (count($confvers)): ?> <?php if (count($confvers)): ?>
<form method="get"> <form method="get">
...@@ -269,9 +267,7 @@ $( document ).ready(function() { ...@@ -269,9 +267,7 @@ $( document ).ready(function() {
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext('History');?></h3> <h3><?=gettext('History');?></h3>
</header> </header>
<div class="content-box-main"> <table class="table table-responsive">
<div class="container-fluid __mb">
<table class="table table-condensed">
<tr> <tr>
<td> <td>
<button type="submit" name="diff" class="btn btn-primary pull-left" value="Diff"> <button type="submit" name="diff" class="btn btn-primary pull-left" value="Diff">
...@@ -283,7 +279,6 @@ $( document ).ready(function() { ...@@ -283,7 +279,6 @@ $( document ).ready(function() {
</td> </td>
</tr> </tr>
</table> </table>
</div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
...@@ -342,7 +337,6 @@ $( document ).ready(function() { ...@@ -342,7 +337,6 @@ $( document ).ready(function() {
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</section> </section>
</form> </form>
<?php endif ?> <?php endif ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023