tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix about markup 

refs #5543
This commit is contained in:
Eric Lippmann 2015-10-01 00:55:49 +02:00
parent ebb0db3800
commit 05904de5d5
3 changed files with 82 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
application/views/scripts/about/index.phtml
View File

@ -1,41 +1,41 @@
<div class="controls"> <div class="controls">
<?= $tabs; ?> <?= $tabs ?>
</div> </div>
<div class="content about"> <div class="content content-centered">
<?= $this->img( <?= $this->img(
'img/logo_icinga_big_dark.png', 'img/logo_icinga_big_dark.png',
null, null,
array( array(
'width' => 400, 'width' => 320
'class' => 'about-logo'
) )
); ?> ) ?>
<p class="about-version"> <dl class="name-value-list">
<?php if (isset($version['appVersion'])): ?> <?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 endif ?>
<?php if (isset($version['gitCommitID'])): ?> <?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 endif ?>
<?php if (isset($version['gitCommitDate'])): ?> <?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 ?> <?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->translate('The Icinga Project'), <?= $this->qlink(
'https://www.icinga.org', $this->translate('The Icinga Project'),
null, 'https://www.icinga.org',
array( null,
'target' => '_blank' array(
) 'target' => '_blank'
); ?> )
<br> ) ?>
<strong><?= $this->translate('License'); ?></strong>: GNU GPL v2+ </dd>
</p> </dl>
<p class="about-social"> <div>
<?= $this->qlink( <?= $this->qlink(
null, null,
'https://www.twitter.com/icinga', 'https://www.twitter.com/icinga',
@ -45,7 +45,7 @@
'icon' => 'twitter', 'icon' => 'twitter',
'title' => $this->translate('Icinga on Twitter') 'title' => $this->translate('Icinga on Twitter')
) )
); ?> <?= $this->qlink( ) ?> <?= $this->qlink(
null, null,
'https://www.facebook.com/icinga', 'https://www.facebook.com/icinga',
null, null,
@ -54,29 +54,32 @@
'icon' => 'facebook-squared', 'icon' => 'facebook-squared',
'title' => $this->translate('Icinga on Facebook') 'title' => $this->translate('Icinga on Facebook')
) )
); ?> ) ?>
</p> </div>
<div class="about-urls"> <div>
<div><?= $this->qlink( <?= $this->qlink(
null, null,
'https://dev.icinga.org/projects/icingaweb2', 'https://dev.icinga.org/projects/icingaweb2',
null, null,
array( array(
'target' => '_blank', 'target' => '_blank',
'img' => 'img/bugreport.png', 'img' => 'img/bugreport.png',
'title' => $this->translate('Report a bug') 'title' => $this->translate('Report a bug')
) )
); ?> <?= $this->qlink( ) ?>
null, <?= $this->qlink(
'https://www.icinga.org/services/support', null,
null, 'https://www.icinga.org/services/support',
array( null,
'target' => '_blank', array(
'img' => 'img/support.png', 'target' => '_blank',
'title' => $this->translate('Support / Mailinglists') 'img' => 'img/support.png',
) 'title' => $this->translate('Support / Mailinglists')
); ?></div> )
<div><?= $this->qlink( ) ?>
</div>
<div>
<?= $this->qlink(
null, null,
'https://wiki.icinga.org', 'https://wiki.icinga.org',
null, null,
@ -85,7 +88,8 @@
'img' => 'img/wiki.png', 'img' => 'img/wiki.png',
'title' => $this->translate('Icinga Wiki') 'title' => $this->translate('Icinga Wiki')
) )
); ?> <?= $this->qlink( ) ?>
<?= $this->qlink(
null, null,
'https://docs.icinga.org/', 'https://docs.icinga.org/',
null, null,
@ -94,35 +98,35 @@
'img' => 'img/docs.png', 'img' => 'img/docs.png',
'title' => $this->translate('Icinga Documentation') 'title' => $this->translate('Icinga Documentation')
) )
); ?></div> ) ?>
</div> </div>
<h2><?= $this->translate('Loaded modules') ?></h2> <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> <thead>
<tr> <tr>
<th><?= $this->translate('Name') ?></th> <th><?= $this->translate('Name') ?></th>
<th><?= $this->translate('Version') ?></th> <th><?= $this->translate('Version') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($modules as $module): ?> <?php foreach ($modules as $module): ?>
<tr> <tr>
<td> <td>
<?php if ($this->hasPermission('config/modules')): ?> <?php if ($this->hasPermission('config/modules')): ?>
<?= $this->qlink( <?= $this->qlink(
$module->getName(), $module->getName(),
'config/module/', 'config/module/',
array('name' => $module->getName()), array('name' => $module->getName()),
array('title' => sprintf($this->translate('Show the overview of the %s module'), $module->getName())) array('title' => sprintf($this->translate('Show the overview of the %s module'), $module->getName()))
); ?> ) ?>
<?php else: ?> <?php else: ?>
<?= $this->escape($module->getName()); ?> <?= $this->escape($module->getName()) ?>
<?php endif ?> <?php endif ?>
<td> <td>
<?= $this->escape($module->getVersion()); ?> <?= $this->escape($module->getVersion()) ?>
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
</tbody> </tbody>
</table> </table>
</div> </div>

1
library/Icinga/Web/StyleSheet.php
View File

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

9
public/css/icinga/about.less
View File

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