Merge pull request #200 from Icinga/remove-font-files

Remove font files

configuration.php

@@ -37,5 +37,3 @@
     'label' => $this->translate('SNI'),
     'url' => 'sni'
 ));
-
-$this->provideCssFile('icons.less');

library/X509/CertificateDetails.php

@@ -8,6 +8,7 @@
 use Icinga\Module\X509\Model\X509Certificate;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\Html;
+use ipl\Web\Widget\IcingaIcon;
 
 /**
  * Widget to display X.509 certificate details
@@ -101,7 +102,7 @@ protected function assemble()
         ]);
 
         $this->add([
-            Html::tag('h2', [Html::tag('i', ['class' => 'x509-icon-cert']), $this->cert->subject]),
+            Html::tag('h2', [new IcingaIcon('certificate'), $this->cert->subject]),
             Html::tag('h3', mt('x509', 'Subject Name')),
             $subject,
             Html::tag('h3', mt('x509', 'Issuer Name')),

library/X509/CertificatesTable.php

@@ -7,6 +7,8 @@
 use Icinga\Module\X509\Model\X509Certificate;
 use Icinga\Web\Url;
 use ipl\Html\Html;
+use ipl\Web\Widget\IcingaIcon;
+use ipl\Web\Widget\Icon;
 
 /**
  * Table widget to display X.509 certificates
@@ -37,10 +39,7 @@ protected function createColumns()
                         return null;
                     }
 
-                    return Html::tag(
-                        'i',
-                        ['class' => 'x509-icon-ca', 'title' => mt('x509', 'Is Certificate Authority')]
-                    );
+                    return new IcingaIcon('ca-check-circle', ['title' => mt('x509', 'Is Certificate Authority')]);
                 }
             ],
 
@@ -51,10 +50,7 @@ protected function createColumns()
                         return null;
                     }
 
-                    return Html::tag(
-                        'i',
-                        ['class' => 'x509-icon-self-signed', 'title' => mt('x509', 'Is Self-Signed')]
-                    );
+                    return new IcingaIcon('refresh-cert', ['title' => mt('x509', 'Is Self-Signed')]);
                 }
             ],
 
@@ -65,10 +61,7 @@ protected function createColumns()
                         return null;
                     }
 
-                    return Html::tag(
-                        'i',
-                        ['class' => 'icon icon-thumbs-up', 'title' => mt('x509', 'Is Trusted')]
-                    );
+                    return new Icon('thumbs-up', ['title' => mt('x509', 'Is Trusted')]);
                 }
             ],
 

library/X509/ChainDetails.php

@@ -7,6 +7,8 @@
 use Icinga\Module\X509\Model\X509Certificate;
 use Icinga\Web\Url;
 use ipl\Html\Html;
+use ipl\Web\Widget\IcingaIcon;
+use ipl\Web\Widget\Icon;
 
 /**
  * Table widget to display X.509 chain details
@@ -24,7 +26,7 @@ public function createColumns()
             [
                 'attributes' => ['class' => 'icon-col'],
                 'renderer' => function () {
-                    return Html::tag('i', ['class' => 'x509-icon-cert']);
+                    return new IcingaIcon('certificate', ['title' => mt('x509', 'Is a x509 certificate')]);
                 }
             ],
 
@@ -46,10 +48,7 @@ public function createColumns()
                         return null;
                     }
 
-                    return Html::tag(
-                        'i',
-                        ['class' => 'x509-icon-ca', 'title' => mt('x509', 'Is Certificate Authority')]
-                    );
+                    return new IcingaIcon('ca-check-circle', ['title' => mt('x509', 'Is Certificate Authority')]);
                 }
             ],
 
@@ -60,10 +59,7 @@ public function createColumns()
                         return null;
                     }
 
-                    return Html::tag(
-                        'i',
-                        ['class' => 'x509-icon-self-signed', 'title' => mt('x509', 'Is Self-Signed')]
-                    );
+                    return new IcingaIcon('refresh-cert', ['title' => mt('x509', 'Is Self-Signed')]);
                 }
             ],
 
@@ -74,10 +70,7 @@ public function createColumns()
                         return null;
                     }
 
-                    return Html::tag(
-                        'i',
-                        ['class' => 'icon icon-thumbs-up', 'title' => mt('x509', 'Is Trusted')]
-                    );
+                    return new Icon('thumbs-up', ['title' => mt('x509', 'Is Trusted')]);
                 }
             ],
 

library/X509/UsageTable.php

@@ -6,7 +6,7 @@
 
 use Icinga\Module\X509\Model\X509Certificate;
 use Icinga\Web\Url;
-use ipl\Html\Html;
+use ipl\Web\Widget\Icon;
 
 /**
  * Table widget to display X.509 certificate usage
@@ -27,9 +27,7 @@ public function createColumns()
                     return $data->chain->valid;
                 },
                 'renderer'   => function ($valid) {
-                    $icon = $valid ? 'check -ok' : 'block -critical';
-
-                    return Html::tag('i', ['class' => "icon icon-{$icon}"]);
+                    return new Icon($valid ? 'circle-check' : 'ban', ['class' => $valid ? '-ok' : '-critical']);
                 }
             ],
 

public/css/module.less

@@ -7,7 +7,7 @@
 @cert-segment-color-4: #6A4C93;
 
 .cert-details {
-  .x509-icon-cert {
+  .iicon-certificate {
     font-size: 5em;
   }