Fix about markup

refs #5543

application/views/scripts/about/index.phtml

@@ -1,41 +1,41 @@
 <div class="controls">
-    <?= $tabs; ?>
+    <?= $tabs ?>
 </div>
-<div class="content about">
+<div class="content content-centered">
     <?= $this->img(
         'img/logo_icinga_big_dark.png',
         null,
         array(
-            'width' => 400,
+            'width' => 320
-            'class' => 'about-logo'
         )
-    ); ?>
+    ) ?>
-    <p class="about-version">
+    <dl class="name-value-list">
     <?php if (isset($version['appVersion'])): ?>
-        <strong><?= $this->translate('Version'); ?>:</strong> <?= $this->escape($version['appVersion']); ?>
+        <dt><?= $this->translate('Version') ?></dt>
+        <dd><?= $this->escape($version['appVersion']) ?></dd>
     <?php endif ?>
     <?php if (isset($version['gitCommitID'])): ?>
-        <br>
+        <dt><?= $this->translate('Git commit') ?></dt>
-        <strong><?= $this->translate('Git commit ID'); ?>:</strong> <?= $this->escape($version['gitCommitID']); ?>
+        <dd><?= $this->escape($version['gitCommitID']) ?></dd>
     <?php endif ?>
     <?php if (isset($version['gitCommitDate'])): ?>
-        <br>
+        <dt><?= $this->translate('Git commit date') ?></dt>
-        <strong><?= $this->translate('Git commit date'); ?>:</strong> <?= $this->escape($version['gitCommitDate']); ?>
+        <dd><?= $this->escape($version['gitCommitDate']) ?></dd>
     <?php endif ?>
-    </p>
+        <dt><?= $this->translate('Copyright') ?></dt>
-    <p class="about-license">
+        <dd>
-        <strong><?= $this->translate('Copyright'); ?></strong>: &copy; 2013-<?= date('Y'); ?> <?= $this->qlink(
+            <span>&copy; 2013-<?= date('Y') ?></span>
+            <?= $this->qlink(
                 $this->translate('The Icinga Project'),
                 'https://www.icinga.org',
                 null,
                 array(
                     'target' => '_blank'
                 )
-        ); ?>
+            ) ?>
-        <br>
+        </dd>
-        <strong><?= $this->translate('License'); ?></strong>: GNU GPL v2+
+    </dl>
-    </p>
+    <div>
-    <p class="about-social">
         <?= $this->qlink(
             null,
             'https://www.twitter.com/icinga',
@@ -45,7 +45,7 @@
                 'icon'      => 'twitter',
                 'title'     => $this->translate('Icinga on Twitter')
             )
-        ); ?> <?= $this->qlink(
+        ) ?> <?= $this->qlink(
             null,
             'https://www.facebook.com/icinga',
             null,
@@ -54,10 +54,10 @@
                 'icon'      => 'facebook-squared',
                 'title'     => $this->translate('Icinga on Facebook')
             )
-        ); ?>
+        ) ?>
-    </p>
+    </div>
-    <div class="about-urls">
+    <div>
-        <div><?= $this->qlink(
+    <?= $this->qlink(
         null,
         'https://dev.icinga.org/projects/icingaweb2',
         null,
@@ -66,7 +66,8 @@
             'img'       => 'img/bugreport.png',
             'title'     => $this->translate('Report a bug')
         )
-        ); ?> <?= $this->qlink(
+    ) ?>
+    <?= $this->qlink(
         null,
         'https://www.icinga.org/services/support',
         null,
@@ -75,8 +76,10 @@
             'img'       => 'img/support.png',
             'title'     => $this->translate('Support / Mailinglists')
         )
-        ); ?></div>
+    ) ?>
-        <div><?= $this->qlink(
+    </div>
+    <div>
+        <?= $this->qlink(
             null,
             'https://wiki.icinga.org',
             null,
@@ -85,7 +88,8 @@
                 'img'       => 'img/wiki.png',
                 'title'     => $this->translate('Icinga Wiki')
             )
-        ); ?> <?= $this->qlink(
+        ) ?>
+        <?= $this->qlink(
             null,
             'https://docs.icinga.org/',
             null,
@@ -94,10 +98,10 @@
                 'img'       => 'img/docs.png',
                 'title'     => $this->translate('Icinga Documentation')
             )
-        ); ?></div>
+        ) ?>
     </div>
     <h2><?= $this->translate('Loaded modules') ?></h2>
-    <table class="action alternating about-modules" data-base-target="_next">
+    <table class="action-table listing-table" data-base-target="_next">
     <thead>
         <tr>
             <th><?= $this->translate('Name') ?></th>
@@ -114,12 +118,12 @@
                 'config/module/',
                 array('name' => $module->getName()),
                 array('title' => sprintf($this->translate('Show the overview of the %s module'), $module->getName()))
-                    ); ?>
+            ) ?>
         <?php else: ?>
-                    <?= $this->escape($module->getName()); ?>
+            <?= $this->escape($module->getName()) ?>
         <?php endif ?>
         <td>
-                    <?= $this->escape($module->getVersion()); ?>
+            <?= $this->escape($module->getVersion()) ?>
         </td>
     </tr>
 <?php endforeach ?>

library/Icinga/Web/StyleSheet.php

@@ -39,7 +39,6 @@ class StyleSheet
         'css/icinga/controls.less',
         'css/icinga/dev.less',
 //        'css/icinga/logo.less',
-        'css/icinga/about.less',
         'css/icinga/spinner.less'
     );
 

public/css/icinga/about.less

@@ -1,9 +0,0 @@
-div.about {
-    width: 600px;
-    margin: 0 auto;
-    text-align: center;
-
-    .about-modules {
-        text-align: initial;
-    }
-}