configuration: layout and other things

(cherry picked from commit 61ec0fcd)
(cherry picked from commit f42e229b)
(cherry picked from commit 3161dece)
(cherry picked from commit a35211fd)

src/etc/config.xml.sample

@@ -227,6 +227,7 @@
       <interval>monthly</interval>
     </bogons>
     <kill_states/>
+    <backupcount>60</backupcount>
   </system>
   <interfaces>
     <wan>

src/etc/inc/config.lib.inc

@@ -288,7 +288,8 @@ function cleanup_backups()
     if (isset($config['system']['backupcount']) && is_numeric($config['system']['backupcount']) && ($config['system']['backupcount'] >= 0)) {
         $revisions = intval($config['system']['backupcount']);
     } else {
-        $revisions = 30;
+        /* XXX this value used to be left out of the config */
+        $revisions = 60;
     }
 
     $cnf = OPNsense\Core\Config::getInstance();

src/etc/inc/upgrade_config.inc

@@ -3432,4 +3432,8 @@ function upgrade_111_to_112()
 			}
 		}
 	}
+
+	if (!isset($config['system']['backupcount'])) {
+		$config['system']['backupcount'] = 60;
+	}
 }

src/www/diag_logs_settings.php

@@ -351,11 +351,8 @@ $(document).ready(function() {
                   </tr>
                   <tr>
                     <td colspan="2">
-                      <p>
-                        <strong><span class="text-danger"><?=gettext("Note:");?></span></strong><br />
-                            <?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " .
-                            "take this into account after changing the style.");?>
-                      </p>
+                      <?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " .
+                        "take this into account after changing the style.");?>
                     </td>
                   </tr>
                 </table>
@@ -565,10 +562,10 @@ $(document).ready(function() {
                       </td>
                     </tr>
                     <tr>
-                      <td  colspan="2"><strong><span class="text-danger"><?=gettext("Note:")?></span></strong><br />
-                      <?=gettext("Syslog sends UDP datagrams to port 514 on the specified " .
-                      "remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
-                      "remote server to accept remote syslog messages.");?>
+                      <td colspan="2">
+                        <?=gettext("Syslog sends UDP datagrams to port 514 on the specified " .
+                          "remote syslog server, unless another port is specified. Be sure to set syslogd on the " .
+                          "remote server to accept remote syslog messages.");?>
                       </td>
                     </tr>
                   </table>