Skip to content

Commit

Permalink
Fix about markup
Browse files Browse the repository at this point in the history 
refs #5543
  • Loading branch information
@lippserd
lippserd committed Sep 30, 2015
1 parent ebb0db3 commit 05904de
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 88 deletions.
160 changes: 82 additions & 78 deletions application/views/scripts/about/index.phtml
View file
@@ -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,
'class' => 'about-logo'
'width' => 320
)
); ?>
<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>
<strong><?= $this->translate('Git commit ID'); ?>:</strong> <?= $this->escape($version['gitCommitID']); ?>
<dt><?= $this->translate('Git commit') ?></dt>
<dd><?= $this->escape($version['gitCommitID']) ?></dd>
<?php endif ?>
<?php if (isset($version['gitCommitDate'])): ?>
<br>
<strong><?= $this->translate('Git commit date'); ?>:</strong> <?= $this->escape($version['gitCommitDate']); ?>
<dt><?= $this->translate('Git commit date') ?></dt>
<dd><?= $this->escape($version['gitCommitDate']) ?></dd>
<?php endif ?>
</p>
<p class="about-license">
<strong><?= $this->translate('Copyright'); ?></strong>: &copy; 2013-<?= date('Y'); ?> <?= $this->qlink(
$this->translate('The Icinga Project'),
'https://www.icinga.org',
null,
array(
'target' => '_blank'
)
); ?>
<br>
<strong><?= $this->translate('License'); ?></strong>: GNU GPL v2+
</p>
<p class="about-social">
<dt><?= $this->translate('Copyright') ?></dt>
<dd>
<span>&copy; 2013-<?= date('Y') ?></span>
<?= $this->qlink(
$this->translate('The Icinga Project'),
'https://www.icinga.org',
null,
array(
'target' => '_blank'
)
) ?>
</dd>
</dl>
<div>
<?= $this->qlink(
null,
'https://www.twitter.com/icinga',
Expand All @@ -45,7 +45,7 @@
'icon' => 'twitter',
'title' => $this->translate('Icinga on Twitter')
)
); ?> <?= $this->qlink(
) ?> <?= $this->qlink(
null,
'https://www.facebook.com/icinga',
null,
Expand All @@ -54,29 +54,32 @@
'icon' => 'facebook-squared',
'title' => $this->translate('Icinga on Facebook')
)
); ?>
</p>
<div class="about-urls">
<div><?= $this->qlink(
null,
'https://dev.icinga.org/projects/icingaweb2',
null,
array(
'target' => '_blank',
'img' => 'img/bugreport.png',
'title' => $this->translate('Report a bug')
)
); ?> <?= $this->qlink(
null,
'https://www.icinga.org/services/support',
null,
array(
'target' => '_blank',
'img' => 'img/support.png',
'title' => $this->translate('Support / Mailinglists')
)
); ?></div>
<div><?= $this->qlink(
) ?>
</div>
<div>
<?= $this->qlink(
null,
'https://dev.icinga.org/projects/icingaweb2',
null,
array(
'target' => '_blank',
'img' => 'img/bugreport.png',
'title' => $this->translate('Report a bug')
)
) ?>
<?= $this->qlink(
null,
'https://www.icinga.org/services/support',
null,
array(
'target' => '_blank',
'img' => 'img/support.png',
'title' => $this->translate('Support / Mailinglists')
)
) ?>
</div>
<div>
<?= $this->qlink(
null,
'https://wiki.icinga.org',
null,
Expand All @@ -85,7 +88,8 @@
'img' => 'img/wiki.png',
'title' => $this->translate('Icinga Wiki')
)
); ?> <?= $this->qlink(
) ?>
<?= $this->qlink(
null,
'https://docs.icinga.org/',
null,
Expand All @@ -94,35 +98,35 @@
'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">
<thead>
<tr>
<th><?= $this->translate('Name') ?></th>
<th><?= $this->translate('Version') ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($modules as $module): ?>
<tr>
<td>
<?php if ($this->hasPermission('config/modules')): ?>
<?= $this->qlink(
$module->getName(),
'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()); ?>
<?php endif ?>
<td>
<?= $this->escape($module->getVersion()); ?>
</td>
</tr>
<?php endforeach ?>
</tbody>
<table class="action-table listing-table" data-base-target="_next">
<thead>
<tr>
<th><?= $this->translate('Name') ?></th>
<th><?= $this->translate('Version') ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($modules as $module): ?>
<tr>
<td>
<?php if ($this->hasPermission('config/modules')): ?>
<?= $this->qlink(
$module->getName(),
'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()) ?>
<?php endif ?>
<td>
<?= $this->escape($module->getVersion()) ?>
</td>
</tr>
<?php endforeach ?>
</tbody>
</table>
</div>
1 change: 0 additions & 1 deletion library/Icinga/Web/StyleSheet.php
View file
Expand Up @@ -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'
);

Expand Down
9 changes: 0 additions & 9 deletions public/css/icinga/about.less
View file

This file was deleted.

0 comments on commit 05904de

Please sign in to comment.