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

Remove unnecessary spaces at end of line

This commit is contained in:
Alexander Klimov 2014-03-06 13:08:11 +01:00
parent a3ce5f2e52
commit b410ebeed6
32 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/layouts/scripts/pdf.phtml
View File

@ -13,7 +13,7 @@ use Icinga\Web\StyleSheet;
<body>
<script type="text/php">
// This attempt doesn't work :(
if ( isset($pdf) )
if ( isset($pdf) )
{
$w = $pdf->get_width();
$h = $pdf->get_height();

2
application/views/scripts/mixedPagination.phtml
View File

@ -71,7 +71,7 @@ foreach ($this->pagesInRange as $page) {
);
}
}
if (isset($this->next)) {
printf(
$li,

64
doc/Icinga-Design/icinga-design.css
View File

@ -256,10 +256,10 @@ select.input-sm {
========================================================================== */
.pagination > .active > a,
.pagination > .active > span,
.pagination > .active > a:hover,
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span,
.pagination > .active > a:hover,
.pagination > .active > span:hover,
.pagination > .active > a:focus,
.pagination > .active > span:focus {
background-color: #049baf !important;
@ -410,27 +410,27 @@ select.input-sm {
.icon-flapping {
background-image: url('images/flapping.png');
background-repeat: no-repeat;
}
}
.icon-comment {
background-image: url('images/comment.png');
background-repeat: no-repeat;
}
}
.icon-unhandled {
background-image: url('images/unhandled.png');
background-repeat: no-repeat;
}
}
.icon-host {
background-image: url('images/host.png');
background-repeat: no-repeat;
}
}
.icon-acknowledgement {
background-image: url('images/acknowledgement.png');
background-repeat: no-repeat;
}
}
.icon-remove {
background-image: url('images/remove.png');
background-repeat: no-repeat;
}
}
.icon-submit {
background-image: url('images/submit.png');
background-repeat: no-repeat;
@ -438,35 +438,35 @@ select.input-sm {
.icon-create {
background-image: url('images/create.png');
background-repeat: no-repeat;
}
}
.icon-dashboard {
background-image: url('images/dashboard.png');
background-repeat: no-repeat;
}
}
.icon-disable {
background-image: url('images/disable.png');
background-repeat: no-repeat;
}
}
.icon-edit {
background-image: url('images/edit.png');
background-repeat: no-repeat;
}
}
.icon-error {
background-image: url('images/error.png');
background-repeat: no-repeat;
}
}
.icon-downtime {
background-image: url('images/in_downtime.png');
background-repeat: no-repeat;
}
}
.icon-save {
background-image: url('images/save.png');
background-repeat: no-repeat;
}
}
.icon-service {
background-image: url('images/service.png');
background-repeat: no-repeat;
}
}
.icon-user {
background-image: url('images/user.png');
background-repeat: no-repeat;
@ -474,11 +474,11 @@ select.input-sm {
.icon-reschedule {
background-image: url('images/reschedule.png');
background-repeat: no-repeat;
}
}
.icon-refresh {
background-image: url('images/refresh.png');
background-repeat: no-repeat;
}
}
/* ==========================================================================
@ -525,7 +525,7 @@ select.input-sm {
padding-right: 10px;
width: 30%;
clear: left;
}
.panel-content {
float: left;
@ -679,16 +679,16 @@ ul.icinga-subnavigation {
border-left: 6px solid red !important;
}
.nav-stacked > li > a:hover,
.nav-stacked > li > a:hover,
.icinga-subnavigation > li > a:focus {
/* font-weight: bold;*/
background-color: transparent; !important;
display: inline-block;
}
.nav-stacked > li:hover,
.nav-stacked > li:hover,
.nav-stacked > li:focus,
.icinga-subnavigation > li:hover,
.icinga-subnavigation > li:hover,
.icinga-subnavigation > li:focus {
background-color: #fff;
@ -707,45 +707,45 @@ background-color: #fff;
background-image: url('images/host_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}
.nav-icon-services {
background-image: url('images/service_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}
.nav-icon-downtimes {
background-image: url('images/in_downtime_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}
.nav-icon-notifications {
background-image: url('images/notification_petrol.png');
background-repeat: no-repeat;
background-position: 19px 20px;
}
}
.nav-icon-comments {
background-image: url('images/comment_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}
.nav-icon-dashboard {
background-image: url('images/dashboard_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}
.nav-icon-configuration {
background-image: url('images/configuration_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}
.subnav-icon-configuration {
background-image: url('images/configuration_petrol.png');
background-repeat: no-repeat;
background-position: 19px 50%;
}
}

2
library/Icinga/Application/Modules/Module.php
View File

@ -287,7 +287,7 @@ class Module
*/
public function getDependencies()
{
return $this->metadata()->depends;
}

2
library/Icinga/Chart/Inline/Inline.php
View File

@ -120,4 +120,4 @@ class Inline {
}
}
}
}

2
library/Icinga/Chart/Inline/PieChart.php
View File

@ -45,4 +45,4 @@ class PieChart extends Inline {
$pie->setWidth($this->width)->setHeight($this->height);
echo $pie->render();
}
}
}

2
library/Icinga/Cli/Command.php
View File

@ -20,7 +20,7 @@ abstract class Command
protected $moduleName;
protected $commandName;
protected $actionName;
protected $defaultActionName = 'default';
public function __construct(App $app, $moduleName, $commandName, $actionName, $initialize = true)

2
library/Icinga/Cli/Documentation.php
View File

@ -64,7 +64,7 @@ class Documentation
public function moduleUsage($module, $command = null, $action = null)
{
$commands = $this->loader->listModuleCommands($module);
if (empty($commands)) {
return "The '$module' module does not provide any CLI commands\n";
}

2
library/Icinga/Cli/Documentation/CommentParser.php
View File

@ -44,7 +44,7 @@ class CommentParser
if ($p === null && empty($this->paragraphs)) {
$p = & $this->paragraphs[];
}
if ($line === '') {
if ($p !== null) {
$p = & $this->paragraphs[];

2
library/Icinga/Cli/Loader.php
View File

@ -11,7 +11,7 @@ use Icinga\Cli\Documentation;
use Exception;
/**
*
*
*/
class Loader
{

2
library/Icinga/Data/PivotTable.php
View File

@ -11,7 +11,7 @@ class PivotTable
protected $horizontalColumn;
protected $limit;
protected $offset;
protected $verticalLimit;

2
library/Icinga/File/Pdf.php
View File

@ -68,7 +68,7 @@ class Pdf extends DOMPDF
$html = $layout->render();
$imgDir = Url::fromPath('img');
$html = preg_replace('~src="' . $imgDir . '/~', 'src="' . Icinga::app()->getBootstrapDirecory() . $imgDir . '/', $html);
//echo $html; exit;
$this->load_html($html);

2
library/Icinga/Web/Controller/ActionController.php
View File

@ -311,7 +311,7 @@ class ActionController extends Zend_Controller_Action
$this->_helper->layout()->setLayout('body');
header('X-Icinga-Container: layout');
}
if ($this->autorefreshInterval !== null) {
if ($this->autorefreshInterval !== null) {
header('X-Icinga-Refresh: ' . $this->autorefreshInterval);
}
}

2
library/Icinga/Web/Form/Element/TriStateCheckbox.php
View File

@ -34,7 +34,7 @@ use \Zend_Form_Element_Xhtml;
/**
* A checkbox that can display three different states:
* true, false and mixed. When there is no JavaScript
* true, false and mixed. When there is no JavaScript
* available to display the checkbox properly, a radio
* button-group with all three possible states will be
* displayed.

2
library/Icinga/Web/LessCompiler.php
View File

@ -58,7 +58,7 @@ class LessCompiler
private $lessc;
private $baseUrl;
private $source;
/**

2
library/Icinga/Web/Widget/AlertMessageBox.php
View File

@ -39,7 +39,7 @@ class AlertMessageBox implements \Icinga\Web\Widget\Widget
* @var array
*/
private $messages = array();
/**
* The user to fetch the messages from
*

6
modules/monitoring/application/clicommands/ListCommand.php
View File

@ -13,7 +13,7 @@ use Exception;
/**
* Icinga monitoring objects
*
* This module is your interface to the Icinga monitoring application.
* This module is your interface to the Icinga monitoring application.
*/
class ListCommand extends Command
{
@ -157,7 +157,7 @@ class ListCommand extends Command
->order('host_name');
echo $this->renderStatusQuery($query);
}
protected function renderStatusQuery($query)
{
$out = '';
@ -217,7 +217,7 @@ class ListCommand extends Command
);
}
}
$last_host = $row->host_name;
if (! isset($row->service_description)) {
continue;

2
modules/monitoring/application/views/helpers/CommandForm.php
View File

@ -196,7 +196,7 @@ class Zend_View_Helper_CommandForm extends Zend_View_Helper_Abstract
}
$formCode = (string) $form;
$jsLessSubmit = '<noscript>'
. '<input type="submit" value="Change" class="button btn btn-cta" />'
. '</noscript></form>';

2
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -14,7 +14,7 @@ $viewHelper = $this->getHelper('MonitoringState');
<div class="content">
<table class="action">
<tbody>
<?php foreach ($comments as $comment):
<?php foreach ($comments as $comment):
$objectType = ($comment->comment_objecttype_id === '1') ? 'host' : 'service';
$objectName = ($objectType === 'host') ? $comment->host_name : $comment->service_name;

2
modules/monitoring/application/views/scripts/tactical/components/monitoringfeatures.phtml
View File

@ -123,7 +123,7 @@ $services_not_processing_event_handlers = $total_services - $summary->services_p
</a>
<?php endif ?>
</div>
</td>
</td>
</tr>
</tbody>
</table>

2
modules/monitoring/library/Monitoring/Backend/Ido/Query/AllcontactsQuery.php
View File

@ -62,7 +62,7 @@ class AllcontactsQuery extends IdoQuery
array($this->contacts, $this->contactgroups),
Zend_Db_Select::SQL_UNION_ALL
);
$this->baseQuery = $this->db->select()->distinct()->from(
array('c' => $sub),
array()

2
public/css/icinga/forms.less
View File

@ -90,7 +90,7 @@ form ul.errors {
padding: 0;
}
form ul.errors li {
form ul.errors li {
color: @colorCritical;
font-weight: bold;
line-height: 1.5em;

8
public/css/icinga/monitoring-colors.less
View File

@ -284,7 +284,7 @@ a.critical {
display: inline-block;
padding: 0.5em;
margin: 0.5em;
background: #555;
border-radius: 0.5em;
-moz-border-radius: 0.5em;
@ -293,7 +293,7 @@ a.critical {
/* Box caption */
.boxview div.box h2 {
margin: 0.5em 0 1em;
color: white;
font-weight: bold;
}
@ -317,7 +317,7 @@ a.critical {
/* Box separator */
.boxview div.box-separator:first-child {
border-top-width: 0;
border-top-left-radius: 0.5em;
border-top-right-radius: 0.5em;
-moz-border-top-left-radius: 0.5em;
@ -346,7 +346,7 @@ a.critical {
/* Any line of a box entry */
.boxview div.box.entry a {
display: block;
color: inherit;
}

2
public/css/icinga/pagination.less
View File

@ -25,7 +25,7 @@ ul.pagination {
.pagination > li > a {
color: #555;
text-decoration: none;
text-decoration: none;
outline: 0;
}

10
public/js/helpers.js
View File

@ -3,15 +3,15 @@
'use strict';
Object.keys = Object.keys || function(o) {
var result = [];
for(var name in o) {
Object.keys = Object.keys || function(o) {
var result = [];
for(var name in o) {
if (o.hasOwnProperty(name)) {
result.push(name);
}
}
}
return result;
return result;
};
})(Object);

6
public/js/icinga/events.js
View File

@ -234,16 +234,16 @@
icinga.events.layout2col();
}
}
icinga.loader.loadUrl(href, $target);
event.stopPropagation();
event.preventDefault();
if ($a.closest('#menu').length) {
icinga.events.layout1col();
return false;
}
if ($a.closest('table.action').length) {
if ($('#layout').hasClass('twocols')) {
if ($target.attr('id') === 'col2') {

4
public/js/icinga/loader.js
View File

@ -173,7 +173,7 @@
}
interval = interval * 1000;
// TODO:
// TODO:
if ((lastUpdate + interval) > (new Date()).getTime()) {
// self.icinga.logger.info(
// 'Skipping refresh',
@ -402,7 +402,7 @@
this.icinga.utils.timeShort() +
'.'
);
this.icinga.ui.fixControls();
}

2
public/js/icinga/logger.js
View File

@ -72,7 +72,7 @@
},
/**
* Write a log message with the given level to the console
* Write a log message with the given level to the console
*/
writeToConsole: function (level, args) {

4
public/js/icinga/timer.js
View File

@ -125,7 +125,7 @@
};
Icinga.Timer.Interval = function (callback, interval) {
if ('undefined' === typeof interval) {
throw 'Timer interval is required';
}
@ -156,7 +156,7 @@
this.scheduledNextRun += this.interval;
}
this.callback();
this.callback();
},
destroy: function () {

2
public/js/icinga/ui.js
View File

@ -133,7 +133,7 @@
$('#main > .container').css({
width: '100%'
});
}
}
},
setTitle: function (title) {

2
public/js/icinga/utils.js
View File

@ -54,7 +54,7 @@
},
/**
* Parse a given Url and return an object
* Parse a given Url and return an object
*/
parseUrl: function (url) {

2
public/js/vendor/jquery.sparkline.min.js vendored
View File

File diff suppressed because one or more lines are too long