2675 Commits

Author SHA1 Message Date
Johannes Meyer
3166c518e1 Rename Icinga\Module\Monitoring\Form to Icinga\Module\Moni...\Forms
refs #7553
2014-11-14 11:17:22 +01:00
Johannes Meyer
775c20d9ad Rename namespace Icinga\Form to Icinga\Forms
refs #7553
2014-11-14 10:57:14 +01:00
Johannes Meyer
ea56e4f108 Fix addElements call in CheckNowCommandForm 2014-11-14 10:41:30 +01:00
Johannes Meyer
1c4a5ce86f Leave it up to Icinga\Web\Form to instantiate our own form elements 2014-11-14 10:15:27 +01:00
Eric Lippmann
1f77ef069d Use HTMLPurifier from the include path
refs #6165
refs #6166
2014-11-13 23:49:32 +01:00
Bernd Erk
903219b302 Merge branch 'master' into feature/redesign-7144
Conflicts:
	library/Icinga/Web/Menu.php
	public/css/icinga/menu.less
2014-11-13 21:11:36 +01:00
Bernd Erk
20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Matthias Jentsch
0db5167a35 Fix event grid layout and forms
Make event grid horizontal, user build in form apply button, add linebreak between filter and grid
2014-11-13 18:40:13 +01:00
Matthias Jentsch
022d89254f Fix tab, navigation and menu names 2014-11-13 18:38:42 +01:00
Bernd Erk
6201858a68 Merge branch 'master' into feature/redesign-7144 2014-11-13 17:47:26 +01:00
Alexander Fuhr
dedb348af9 Add clickable icon for command check now 2 2014-11-13 15:55:25 +01:00
Bernd Erk
ef2ec0442c Merge branch 'master' into feature/redesign-7144 2014-11-13 14:40:26 +01:00
Alexander Fuhr
dc1960184d Add hint in the grid if there are no active downtimes 2014-11-13 14:18:19 +01:00
Alexander Fuhr
d0651e9e7f Rename 'service current state' to 'service detail information' header 2014-11-13 14:04:23 +01:00
Alexander Fuhr
46df428e28 Add selection count hint in grids with help for hosts and services
refs #7654
2014-11-13 12:50:39 +01:00
Bernd Erk
ac8cc0613c Merge branch 'master' into feature/redesign-7144
Conflicts:
	application/views/scripts/authentication/login.phtml
	public/css/icinga/login.less
2014-11-12 17:21:54 +01:00
Bernd Erk
68b598320b Fix module top padding 2014-11-12 17:14:30 +01:00
Johannes Meyer
db7954c350 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 17:05:13 +01:00
Johannes Meyer
933172f250 Replace navigation of the service matrix and rename it to service grid
fixes #6180
2014-11-12 15:07:01 +01:00
Johannes Meyer
7aae291f69 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 10:08:28 +01:00
Thomas Gelf
e5ac319cbb helpers/MonitoringState: translate 'since' 2014-11-12 09:13:49 +01:00
Thomas Gelf
f24b0e2a4e MonitoringBackend: a few more places, doesn't hurt 2014-11-12 00:20:37 +01:00
Johannes Meyer
4974f582d3 Add page titles
refs #7163
2014-11-11 15:27:14 +01:00
Eric Lippmann
8e3394fd55 Merge branch 'master' into feature/redesign-7144 2014-11-11 13:54:13 +01:00
Johannes Meyer
7b804e4747 Provide some default values in the wizard
refs #7163
2014-11-11 12:41:02 +01:00
Johannes Meyer
9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Johannes Meyer
79493592bb Do not use Installer anywhere.
"It's setup."

refs #7163
2014-11-10 10:30:52 +01:00
Johannes Meyer
f1b6a82387 Make it optional to define protected custom variables
fixes #7590
2014-11-07 15:05:08 +01:00
Johannes Meyer
bb96316a7c Make sure that IDO is the default backend type if available
refs #7163
fixes #7604
2014-11-07 14:47:37 +01:00
Johannes Meyer
9a5d01b3fd Check the mysql or pgsql extension instead of just pdo, really 2014-11-07 14:31:20 +01:00
Marius Hein
cb09c8acdc Backend/Config: Add shortlink to resource
fixes #7493
2014-11-07 14:20:47 +01:00
Marius Hein
a460286597 Revert "Monitoring/Backens: Add resource configuration link"
This reverts commit 52c452c044a09cae9bde0ecd5d3ac09657f99908.

Wrong implementation.
2014-11-07 14:18:23 +01:00
Johannes Meyer
124f64ad89 Merge branch 'master' into bugfix/drop-zend-config-7147 2014-11-07 14:07:15 +01:00
Johannes Meyer
7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Bernd Erk
f300c121cd Redesign tactical overview 2014-11-06 22:38:06 +01:00
Thomas Gelf
da20926a97 Customvars: use new helper
refs #7569
2014-11-06 16:11:29 +01:00
Thomas Gelf
a8326350d1 Customvar view helper: show structured data
refs #7569
2014-11-06 16:10:52 +01:00
Bernd Erk
548058650a Fixed Plugin output and box-border 2014-11-06 15:49:26 +01:00
Marius Hein
cd9e3693e4 Downtime: Add filter editor and preview
resolves #7445
2014-11-06 13:22:38 +01:00
Marius Hein
52c452c044 Monitoring/Backens: Add resource configuration link
resolves: #7493
2014-11-06 12:59:31 +01:00
Johannes Meyer
170ded6510 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
Eric Lippmann
16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer
c1bff9a26e Merge branch 'master' into feature/setup-wizard-7163 2014-10-30 10:38:21 +01:00
Johannes Meyer
2f05ed3d49 Add monitoring module wizard
refs #7163
2014-10-29 15:40:34 +01:00
Eric Lippmann
5fc1f85b76 monitoring: Write transport directive to instances INI configuration
Further I replaced if-elseif blocks w/ switch when branching based on the value of a single parameter,
which would have to be implied otherwise by looking at all the conditions.
2014-10-29 13:36:09 +01:00
Eric Lippmann
319c5e7833 monitoring: indent php blocks in config/index.phtml properly 2014-10-29 11:33:31 +01:00
Eric Lippmann
6973492b0d monitoring: Translate headings in the config overview 2014-10-28 14:01:00 +01:00
Eric Lippmann
71e25f268a monitoring: Rename label of the path to the local Icinga command file
Rename 'Local filepath' to 'Command file' because the remote instance form is using 'Command file' too.
2014-10-28 13:52:10 +01:00
Eric Lippmann
d04eceaeb2 monitoring: Remove 'Remote' prefix from the remote instance form elements' labels
The 'Remote' prefix of the remote instance form elements' labels is superfluous because the
instance's type already tells that it's remote.
2014-10-28 13:50:42 +01:00
Alexander Klimov
38220afd11 PHP: avoid short tags <? 2014-10-23 10:44:54 +02:00