webui: Additional Font Awesome icons (#5572)

2024-10-07 16:52:45 +00:00 · 2017-01-25 19:42:26 +02:00
parent e53503c544
commit 6a1fd3ec05
28 changed files with 32 additions and 1560 deletions
--- a/html/images/billing-key.png
+++ b/html/images/billing-key.png
--- a/html/images/eventlog.png
+++ b/html/images/eventlog.png
--- a/html/images/pd_connect_button.png
+++ b/html/images/pd_connect_button.png
--- a/html/images/readme.html
+++ b/html/images/readme.html
--- a/html/images/readme.txt
+++ b/html/images/readme.txt
@@ -1,22 +0,0 @@
-Silk icon set 1.3
-
-_________________________________________
-Mark James
-http://www.famfamfam.com/lab/icons/silk/
-_________________________________________
-
-This work is licensed under a
-Creative Commons Attribution 2.5 License.
-[ http://creativecommons.org/licenses/by/2.5/ ]
-
-This means you may use it for any purpose,
-and make any changes you like.
-All I ask is that you include a link back
-to this page in your credits.
-
-Are you using this icon set? Send me an email
-(including a link or picture if available) to
-mjames@gmail.com
-
-Any other questions about this icon set please
-contact mjames@gmail.com
--- a/html/images/submitbg.png
+++ b/html/images/submitbg.png
--- a/html/includes/common/generic-graph.inc.php
+++ b/html/includes/common/generic-graph.inc.php
@@ -254,7 +254,7 @@ function '.$unique_id.'() {
    async: false,
    templates: {
      header: "<h5><strong>&nbsp;Ports</strong></h5>",
-      suggestion: Handlebars.compile(\'<p><small><img src="images/icons/port.png" /> <strong>{{name}}</strong> – {{hostname}} - <i>{{description}}</i></small></p>\')
+      suggestion: Handlebars.compile(\'<p><small><i class="fa fa-link fa-sm icon-theme" aria-hidden="true"></i> <strong>{{name}}</strong> – {{hostname}} - <i>{{description}}</i></small></p>\')
    }
  });

@@ -290,7 +290,7 @@ function '.$unique_id.'() {
    async: false,
    templates: {
      header: "<h5><strong>&nbsp;Applications</strong></h5>",
-      suggestion: Handlebars.compile(\'<p><small><img src="images/icons/port.png" /> <strong>{{name}}</strong> – {{hostname}}</small></p>\')
+      suggestion: Handlebars.compile(\'<p><small><i class="fa fa-link fa-sm icon-theme" aria-hidden="true"></i> <strong>{{name}}</strong> – {{hostname}}</small></p>\')
    }
  });

@@ -328,7 +328,7 @@ function '.$unique_id.'() {
    async: false,
    templates: {
      header: "<h5><strong>&nbsp;Munin</strong></h5>",
-      suggestion: Handlebars.compile(\'<p><small><img src="images/icons/port.png" /> <strong>{{plugin}}</strong> – {{hostname}}</small></p>\')
+      suggestion: Handlebars.compile(\'<p><small><i class="fa fa-link fa-sm icon-theme" aria-hidden="true"></i> <strong>{{plugin}}</strong> – {{hostname}}</small></p>\')
    }
  });

--- a/html/includes/hostbox-public.inc.php
+++ b/html/includes/hostbox-public.inc.php
@@ -50,12 +50,12 @@ echo '  <tr>

 echo '<td>';
 if ($port_count) {
-    echo ' <img src="images/icons/port.png" align=absmiddle /> '.$port_count;
+    echo ' <i class="fa fa-link fa-lg icon-theme" aria-hidden="true"></i> '.$port_count;
 }

 echo '<br />';
 if ($sensor_count) {
-    echo ' <img src="images/icons/sensors.png" align=absmiddle /> '.$sensor_count;
+    echo ' <i class="fa fa-tachometer fa-lg icon-theme" aria-hidden="true"></i> '.$sensor_count;
 }

 echo '</td>';
--- a/html/includes/print-accesspoint.inc.php
+++ b/html/includes/print-accesspoint.inc.php
@@ -37,9 +37,9 @@ echo "<br>\n";

 echo '</td><td width=120>';

-echo "<img src='images/icons/wireless.png' style='height:20px; width:20px;' align=absmiddle /> ".format_bi($ap[numasoclients]).' Clients<br />';
-echo "<img src='images/icons/wireless.png' style='height:20px; width:20px;' align=absmiddle /> ".format_bi($ap[radioutil]).' % busy<br />';
-echo "<img src='images/icons/wireless.png' style='height:20px; width:20px;' align=absmiddle /> ".format_bi($ap[interference]).' interference index<br />';
+echo "<i class='fa fa-wifi fa-lg icon-theme' aria-hidden='true'></i> ".format_bi($ap[numasoclients]).' Clients<br />';
+echo "<i class='fa fa-wifi fa-lg icon-theme' aria-hidden='true'></i> ".format_bi($ap[radioutil]).' % busy<br />';
+echo "<i class='fa fa-wifi fa-lg icon-theme' aria-hidden='true'></i> ".format_bi($ap[interference]).' interference index<br />';

 echo '</td></tr>';

--- a/html/includes/print-interface-adsl.inc.php
+++ b/html/includes/print-interface-adsl.inc.php
@@ -15,7 +15,7 @@ if (!is_integer($i / 2)) {
 }

 if ($port['ifInErrors_delta'] > 0 || $port['ifOutErrors_delta'] > 0) {
-    $error_img = generate_port_link($port, "<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>", 'port_errors');
+    $error_img = generate_port_link($port, "<i class='fa fa-flag fa-lg' style='color:red' aria-hidden='true'></i>", 'port_errors');
 } else {
    $error_img = '';
 }
@@ -52,7 +52,7 @@ $height = '40';
 $from   = $config['time']['day'];

 echo '</td><td width=135>';
-echo (formatRates(($port['ifInOctets_rate'] * 8))." <img class='optionicon' src='images/icons/arrow_updown.png' /> ".formatRates(($port['ifOutOctets_rate'] * 8)));
+echo (formatRates(($port['ifInOctets_rate'] * 8))." <i class='fa fa-arrows-v fa-lg icon-theme' aria-hidden='true'></i> ".formatRates(($port['ifOutOctets_rate'] * 8)));
 echo '<br />';
 $port['graph_type'] = 'port_bits';
 echo generate_port_link(
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -21,7 +21,7 @@ if ($int_colour) {
 $port_adsl = dbFetchRow('SELECT * FROM `ports_adsl` WHERE `port_id` = ?', array($port['port_id']));

 if ($port['ifInErrors_delta'] > 0 || $port['ifOutErrors_delta'] > 0) {
-    $error_img = generate_port_link($port, "<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>", 'port_errors');
+    $error_img = generate_port_link($port, "<i class='fa fa-flag fa-lg' style='color:red' aria-hidden='true'></i>", 'port_errors');
 } else {
    $error_img = '';
 }
@@ -175,8 +175,6 @@ $neighborsCount=0;
 $nbLinks=0;
 if (strpos($port['label'], 'oopback') === false && !$graph_type) {
    foreach (dbFetchRows('SELECT * FROM `links` AS L, `ports` AS I, `devices` AS D WHERE L.local_port_id = ? AND L.remote_port_id = I.port_id AND I.device_id = D.device_id', array($if_id)) as $link) {
-        // echo("<img src='images/16/connect.png' align=absmiddle alt='Directly Connected' /> " . generate_port_link($link, makeshortif($link['label'])) . " on " . generate_device_link($link, shorthost($link['hostname'])) . "</a><br />");
-        // $br = "<br />";
        $int_links[$link['port_id']]      = $link['port_id'];
        $int_links_phys[$link['port_id']] = 1;
        $nbLinks++;
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -766,7 +766,7 @@ $('#gsearch').typeahead({
  valueKey: 'name',
    templates: {
        header: '<h5><strong>&nbsp;Ports</strong></h5>',
-        suggestion: Handlebars.compile('<p><a href="{{url}}"><small><img src="images/icons/port.png" /> <strong>{{name}}</strong> – {{hostname}}<br /><i>{{description}}</i></small></a></p>')
+        suggestion: Handlebars.compile('<p><a href="{{url}}"><small><i class="fa fa-link fa-sm icon-theme" aria-hidden="true"></i> <strong>{{name}}</strong> – {{hostname}}<br /><i>{{description}}</i></small></a></p>')
    }
 },
 {
--- a/html/includes/table/address-search.inc.php
+++ b/html/includes/table/address-search.inc.php
@@ -92,7 +92,7 @@ foreach (dbFetchRows($sql, $param) as $interface) {
    }

    if ($interface['in_errors'] > 0 || $interface['out_errors'] > 0) {
-        $error_img = generate_port_link($interface, "<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>", errors);
+        $error_img = generate_port_link($interface, "<i class='fa fa-flag fa-lg' style='color:red' aria-hidden='true'></i>", errors);
    } else {
        $error_img = '';
    }
--- a/html/includes/table/arp-search.inc.php
+++ b/html/includes/table/arp-search.inc.php
@@ -66,7 +66,7 @@ $sql = "SELECT *,`P`.`ifDescr` AS `interface` $sql";
 foreach (dbFetchRows($sql, $param) as $entry) {
    if (!$ignore) {
        if ($entry['ifInErrors'] > 0 || $entry['ifOutErrors'] > 0) {
-            $error_img = generate_port_link($entry, "<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>", port_errors);
+            $error_img = generate_port_link($entry, "<i class='fa fa-flag fa-lg' style='color:red' aria-hidden='true'></i>", port_errors);
        } else {
            $error_img = '';
        }
--- a/html/includes/table/sensors.inc.php
+++ b/html/includes/table/sensors.inc.php
@@ -51,7 +51,7 @@ foreach (dbFetchRows($sql, $param) as $sensor) {
        $sensor['sensor_current'] = 'NaN';
    } else {
        if ($sensor['sensor_current'] >= $sensor['sensor_limit']) {
-            $alert = '<img src="images/16/flag_red.png" alt="alert" />';
+            $alert = '<i class="fa fa-flag fa-lg" style="color:red" aria-hidden="true"></i>';
        } else {
            $alert = '';
        }
--- a/html/pages/apps.inc.php
+++ b/html/pages/apps.inc.php
@@ -147,12 +147,8 @@ $link_array = array(
 foreach ($app_list as $app) {
    echo $sep;

-    // if (!$vars['app']) { $vars['app'] = $app['app_type']; }
    if ($vars['app'] == $app['app_type']) {
        echo "<span class='pagemenu-selected'>";
-        // echo('<img src="images/icons/'.$app['app_type'].'.png" class="optionicon" />');
-    } else {
-        // echo('<img src="images/icons/greyscale/'.$app['app_type'].'.png" class="optionicon" />');
    }

    echo generate_link(nicecase($app['app_type']), array('page' => 'apps', 'app' => $app['app_type']));
--- a/html/pages/bill.inc.php
+++ b/html/pages/bill.inc.php
@@ -118,7 +118,7 @@ if (bill_permitted($bill_id)) {
        $sep = ' | ';
    }
    
-    echo '<div style="font-weight: bold; float: right;"><a href="'.generate_url(array('page' => 'bills')).'/"><img align=absmiddle src="images/16/arrow_left.png"> Back to Bills</a></div>';
+    echo '<div style="font-weight: bold; float: right;"><a href="'.generate_url(array('page' => 'bills')).'/"><i class="fa fa-arrow-left fa-lg icon-theme" aria-hidden="true"></i> Back to Bills</a></div>';

    print_optionbar_end();

--- a/html/pages/bill/history.inc.php
+++ b/html/pages/bill/history.inc.php
@@ -60,7 +60,7 @@ echo '<table class="table table-striped">
        <th>95th %ile</th>
        <th style="text-align: center;">Overusage</th>
        <th colspan="2" style="text-align: right;"><a href="'.generate_url($vars, array('detail' => 'all')).'">
-            <img src="images/16/chart_curve.png" border="0" align="absmiddle" alt="Show details" title="Show details" /> Show all details</a>
+            <i class="fa fa-bar-chart fa-lg icon-theme" aria-hidden="true" title="Show details"></i> Show details</a>
        </th>
    </tr>
    </thead>
@@ -111,7 +111,7 @@ foreach (dbFetchRows('SELECT * FROM `bill_history` WHERE `bill_id` = ? ORDER BY
                <td style=\"text-align: center;\">$overuse</td>
                <td width=\"250\">".print_percentage_bar(250, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']).'</td>
                <td>
-                    <a href="'.$url.'"><img src="images/16/chart_curve.png" border="0" align="absmiddle" alt="Show details" title="Show details"/></a>
+                    <a href="'.$url.'"><i class="fa fa-bar-chart fa-lg icon-theme" aria-hidden="true" title="Show details"></i></a>
                </td>
            </tr>';

--- a/html/pages/bill/pdf_history.inc.php
+++ b/html/pages/bill/pdf_history.inc.php
@@ -260,7 +260,7 @@ function transferOverview($bill_id, $history)


 // Html template
-$logo  = $pdf->serializeTCPDFtagParameters(array('images/dummy-logo.png', 15, 18, 100, '', '', 'www.example.com', 'T'));
+$logo  = $pdf->serializeTCPDFtagParameters(array('images/librenms_logo.png', 15, 18, 100, '', '', 'www.example.com', 'T'));
 $html .= '<tcpdf method="Image" params="'.$logo.'" />';
 $html .= '<h1 class="right">Billing Report</h1>';
 $html .= '<p></p>';
--- a/html/pages/device/apps.inc.php
+++ b/html/pages/device/apps.inc.php
@@ -21,9 +21,7 @@ foreach (dbFetchRows('SELECT * FROM `applications` WHERE `device_id` = ?', array

    if ($vars['app'] == $app['app_type']) {
        echo "<span class='pagemenu-selected'>";
-        // echo('<img src="images/icons/'.$app['app_type'].'.png" class="optionicon" />');
    } else {
-        // echo('<img src="images/icons/greyscale/'.$app['app_type'].'.png" class="optionicon" />');
    }

    $link_add = array('app' => $app['app_type']);
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -48,14 +48,11 @@ if ($_SESSION['userlevel'] < '7') {
        echo($sep);
        if ($vars['section'] == $type) {
            echo("<span class='pagemenu-selected'>");
-            #echo('<img src="images/icons/'.$type.'.png" class="optionicon" />');
        } else {
-            #echo('<img src="images/icons/greyscale/'.$type.'.png" class="optionicon" />');
        }

        echo(generate_link($text, $link_array, array('section'=>$type)));

-    #    echo("<a href='device/".$device['device_id']."/edit/" . $type . ($_GET['optd'] ? "/" . $_GET['optd'] : ''). "/'> " . $text ."</a>");
        if ($vars['section'] == $type) {
            echo("</span>");
        }
--- a/html/pages/device/entphysical.inc.php
+++ b/html/pages/device/entphysical.inc.php
@@ -94,8 +94,8 @@ function printEntPhysical($ent, $level, $class)


 echo "<div style='float: right;'>
-       <a href='#' class='button' onClick=\"expandTree('enttree');return false;\"><img src='images/16/bullet_toggle_plus.png'>Expand All Nodes</a>
-       <a href='#' class='button' onClick=\"collapseTree('enttree');return false;\"><img src='images/16/bullet_toggle_minus.png'>Collapse All Nodes</a>
+       <a href='#' class='button' onClick=\"expandTree('enttree');return false;\"><i class='fa fa-plus fa-lg icon-theme'  aria-hidden='true'></i>Expand All Nodes</a>
+       <a href='#' class='button' onClick=\"collapseTree('enttree');return false;\"><i class='fa fa-minus fa-lg icon-theme'  aria-hidden='true'></i>Collapse All Nodes</a>
     </div>";

 echo "<div style='clear: both;'><UL CLASS='mktree' id='enttree'>";
--- a/html/pages/device/port.inc.php
+++ b/html/pages/device/port.inc.php
@@ -227,7 +227,7 @@ if (dbFetchCell("SELECT COUNT(*) FROM juniAtmVp WHERE port_id = '".$port['port_i
 }//end if

 if ($_SESSION['userlevel'] >= '10' && $config['enable_billing'] == 1) {
-    echo "<span style='float: right;'><a href='" . generate_url(array('page'=>'bills', 'view'=>'add', 'port'=>$port['port_id'])) . "'><i class='fa fa-money fa-lg icon-theme' aria-hidden='true' border='0' align='absmiddle'></i> Create Bill</a></span>";
+    echo "<span style='float: right;'><a href='" . generate_url(array('page'=>'bills', 'view'=>'add', 'port'=>$port['port_id'])) . "'><i class='fa fa-money fa-lg icon-theme' aria-hidden='true'></i> Create Bill</a></span>";
 }

 print_optionbar_end();
--- a/html/pages/edituser.inc.php
+++ b/html/pages/edituser.inc.php
@@ -66,7 +66,7 @@ if ($_SESSION['userlevel'] != '10') {

        $device_perms = dbFetchRows('SELECT * from devices_perms as P, devices as D WHERE `user_id` = ? AND D.device_id = P.device_id', array($vars['user_id']));
        foreach ($device_perms as $device_perm) {
-            echo '<tr><td><strong>'.$device_perm['hostname']."</td><td> <a href='edituser/action=deldevperm/user_id=".$vars['user_id'].'/device_id='.$device_perm['device_id']."'><img src='images/16/cross.png' align=absmiddle border=0></a></strong></td></tr>";
+            echo '<tr><td><strong>'.$device_perm['hostname']."</td><td> <a href='edituser/action=deldevperm/user_id=".$vars['user_id'].'/device_id='.$device_perm['device_id']."'><i class='fa fa-trash fa-lg icon-theme' aria-hidden='true'></i></a></strong></td></tr>";
            $access_list[] = $device_perm['device_id'];
            $permdone      = 'yes';
        }
@@ -124,7 +124,7 @@ if ($_SESSION['userlevel'] != '10') {
                <strong>'.$interface_perm['hostname'].' - '.$interface_perm['ifDescr'].'</strong>'.''.display($interface_perm['ifAlias'])."
              </td>
              <td>
-                &nbsp;&nbsp;<a href='edituser/action=delifperm/user_id=".$vars['user_id'].'/port_id='.$interface_perm['port_id']."'><img src='images/16/cross.png' align=absmiddle border=0></a>
+                &nbsp;&nbsp;<a href='edituser/action=delifperm/user_id=".$vars['user_id'].'/port_id='.$interface_perm['port_id']."'><i class='fa fa-trash fa-lg icon-theme' aria-hidden='true'></i></a>
              </td>
            </tr>";
            $ipermdone = 'yes';
@@ -196,7 +196,7 @@ if ($_SESSION['userlevel'] != '10') {
        foreach ($bill_perms as $bill_perm) {
            echo '<tr>
              <td>
-                <strong>'.$bill_perm['bill_name']."</strong></td><td width=50>&nbsp;&nbsp;<a href='edituser/action=delbillperm/user_id=".$vars['user_id'].'/bill_id='.$bill_perm['bill_id']."'><img src='images/16/cross.png' align=absmiddle border=0></a>
+                <strong>'.$bill_perm['bill_name']."</strong></td><td width=50>&nbsp;&nbsp;<a href='edituser/action=delbillperm/user_id=".$vars['user_id'].'/bill_id='.$bill_perm['bill_id']."'><i class='fa fa-trash fa-lg icon-theme' aria-hidden='true'></i></a>
              </td>
            </tr>";
            $bill_access_list[] = $bill_perm['bill_id'];
--- a/html/pages/pollers.inc.php
+++ b/html/pages/pollers.inc.php
@@ -19,11 +19,11 @@ echo '<ul class="nav nav-tabs">';
 $poll_tabs = array(
    array(
        'name' => 'Pollers',
-        'icon' => 'clock_link',
+        'icon' => 'fa-th-large',
    ),
    array(
        'name' => 'Groups',
-        'icon' => 'clock_add',
+        'icon' => 'fa-th',
    ),
 );

@@ -31,7 +31,7 @@ foreach ($poll_tabs as $tab) {
    echo '
            <li>
                <a href="' . generate_url(array('page'=>'pollers','tab'=>lcfirst($tab['name']))) . '">
-                   <img src="images/16/'.$tab['icon'].'.png" align="absmiddle" border="0"> '.$tab['name'].'
+                <i class="fa '.$tab['icon'].' fa-lg icon-theme" aria-hidden="true"></i>'.$tab['name'].'
                </a>
            </li>';
 }
--- a/html/pages/ports/graph.inc.php
+++ b/html/pages/ports/graph.inc.php
@@ -14,7 +14,7 @@ foreach ($ports as $port) {
    $port['out_rate'] = formatRates(($port['ifOutOctets_rate'] * 8));

    if ($port['in_errors'] > 0 || $port['out_errors'] > 0) {
-        $error_img = generate_port_link($port, "<img src='images/16/chart_curve_error.png' alt='Interface Errors' border=0>", errors);
+        $error_img = generate_port_link($port, "<i class='fa fa-flag fa-lg' style='color:red' aria-hidden='true'></i>", errors);
    } else {
        $error_img = '';
    }
--- a/html/pages/routing/bgp.inc.php
+++ b/html/pages/routing/bgp.inc.php
@@ -299,8 +299,8 @@ if ($_SESSION['userlevel'] < '5') {
            <td><strong>AS'.$peer['bgpPeerRemoteAs'].'</strong><br />'.$peer['astext']."</td>
            <td><strong><span style='color: $admin_col;'>".$peer['bgpPeerAdminStatus']."</span><br /><span style='color: $col;'>".$peer['bgpPeerState'].'</span></strong></td>
            <td>'.formatUptime($peer['bgpPeerFsmEstablishedTime'])."<br />
-            Updates <img src='images/16/arrow_down.png' align=absmiddle /> ".format_si($peer['bgpPeerInUpdates'])."
-            <img src='images/16/arrow_up.png' align=absmiddle /> ".format_si($peer['bgpPeerOutUpdates']).'</td></tr>';
+            Updates <i class='fa fa-arrow-down fa-lg icon-theme' aria-hidden='true'></i> ".format_si($peer['bgpPeerInUpdates'])."
+            <i class='fa fa-arrow-up fa-lg icon-theme' aria-hidden='true'></i> ".format_si($peer['bgpPeerOutUpdates']).'</td></tr>';

        unset($invalid);
        switch ($vars['graph']) {
--- a/html/pages/routing/vrf.inc.php
+++ b/html/pages/routing/vrf.inc.php
@@ -143,7 +143,7 @@ if ($_SESSION['userlevel'] >= '5') {
                echo "<tr bgcolor='$dev_colour'><td width=150>".generate_device_link($device, shorthost($device['hostname']));

                if ($device['vrf_name'] != $vrf['vrf_name']) {
-                    echo "<a href='#' onmouseover=\" return overlib('Expected Name : ".$vrf['vrf_name'].'<br />Configured : '.$device['vrf_name']."', CAPTION, '<span class=list-large>VRF Inconsistency</span>' ,FGCOLOR,'#e5e5e5', BGCOLOR, '#c0c0c0', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#050505');\" onmouseout=\"return nd();\"> <img align=absmiddle src=images/16/exclamation.png></a>";
+                    echo "<a href='#' onmouseover=\" return overlib('Expected Name : ".$vrf['vrf_name'].'<br />Configured : '.$device['vrf_name']."', CAPTION, '<span class=list-large>VRF Inconsistency</span>' ,FGCOLOR,'#e5e5e5', BGCOLOR, '#c0c0c0', BORDER, 5, CELLPAD, 4, CAPCOLOR, '#050505');\" onmouseout=\"return nd();\"> <i class='fa fa-flag fa-lg' style='color:red' aria-hidden='true'></i></a>";
                }

                echo '</td><td>';