4233 Commits

Author SHA1 Message Date
Johannes Meyer
688c016f2d Re-enable requirement checks for Zend_Db_Adapter_*
refs #7464
2014-11-13 14:34:31 +01:00
Johannes Meyer
4595b51318 Remove Zend version check
refs #7464
2014-11-13 14:34:04 +01:00
Johannes Meyer
6be51d1565 Use Icinga\Web\Form\Element\Button instead of Zend's button
Due to a bug in Zend prior to 1.12.2 we need our own button implementation
to support earlier versions of the Zend Framework. The side effect is, that
this button can also be used as submit button for our forms as isChecked
will do its job now properly.
2014-11-13 14:26:12 +01:00
Alexander Fuhr
dc1960184d Add hint in the grid if there are no active downtimes 2014-11-13 14:18:19 +01:00
Eric Lippmann
7c8e9e6f56 CLI/Webserver Setup: Rename webPath to urlPath
This is how the apache docs call it. Nginx speaks of uri.

refs #6120
2014-11-13 14:18:14 +01:00
Eric Lippmann
459fc77fc7 CLI/Webserver Setup: Allow to define Icinga Web 2's configuration directory
refs #6120
2014-11-13 14:05:13 +01:00
Alexander Fuhr
d0651e9e7f Rename 'service current state' to 'service detail information' header 2014-11-13 14:04:23 +01:00
Eric Lippmann
0e64a8d573 CLI/Webserver Setup: Prefix URL paths with '/' if missing
refs #6120
2014-11-13 13:47:08 +01:00
Eric Lippmann
36d3c3e3d5 CLI/Webserver Setup: Don't print "# Your %s configuration"
I want to copy the config only.

refs #6120
2014-11-13 13:42:22 +01:00
Eric Lippmann
a0d4b6eee6 CLI/Webserver Setup: Don't use camelCase arguments
refs #6120
2014-11-13 13:40:39 +01:00
Eric Lippmann
e0f6ce36ea CLI/Webserver Setup: Fix argument sanity checks
refs #6120
2014-11-13 13:30:07 +01:00
Eric Lippmann
8594dc068a CLI/Webserver Setup: Rename publicPath to documentRoot
refs #6120
2014-11-13 13:17:59 +01:00
Eric Lippmann
0d4ed40cb2 CLI/Webserver Setup: Remove sapi stuff becuase it's nowhere used
refs #6120
2014-11-13 13:17:53 +01:00
Eric Lippmann
2ad2127ae3 Merge branch 'master' into feature/generate-webserver-config-6120
Conflicts:
	application/clicommands/SetupCommand.php
2014-11-13 12:50:55 +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
Eric Lippmann
66975f0da5 Remove sample apache configuration
Our CLI will generate webserver configuration.
2014-11-13 10:56:08 +01:00
Eric Lippmann
f097299534 Merge branch 'master' into feature/remove-autotools-files-7505 2014-11-13 10:52:40 +01:00
Eric Lippmann
385157be8f Zend: Remove require_once calls
refs #7464
2014-11-13 10:49:39 +01:00
Eric Lippmann
38ebc949a5 Zend: Include Zend version 1.12.9
refs #7464
2014-11-13 10:49:32 +01:00
Eric Lippmann
f427577067 Add getVendorDir() in favor of constant ICINGAWEB_VENDORS 2014-11-13 09:38:04 +01:00
Eric Lippmann
bfa834fc3b Remove constant ICINGAWEB_APPDIR
We should avoid use of constants.
2014-11-13 09:33:31 +01:00
Eric Lippmann
9c103a9864 Remove constant ICINGAWEB_BASEDIR
We should avoid use of constants.
2014-11-13 09:24:51 +01:00
Johannes Meyer
79bd743900 Add missing use statement for IcingaException in SetupException 2014-11-12 17:49:05 +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
Eric Lippmann
75475b1684 Rename getBootstrapDirecory() to getBootstrapDirectory() 2014-11-12 17:14:43 +01:00
Bernd Erk
68b598320b Fix module top padding 2014-11-12 17:14:30 +01:00
Johannes Meyer
5da82a3164 Move the servicegrid's navigation upwards instead of downwards 2014-11-12 17:13:23 +01:00
Alexander Fuhr
b8113b688b Update User\Store\IniStoreTest 2014-11-12 17:13:15 +01:00
Alexander Fuhr
8bb318eb72 Update User\Store\DbStoreTest 2014-11-12 17:12:05 +01:00
Eric Lippmann
c394cd0bff Use realpath in ApplicationBootstrap::getBootstrapDirecory()
If the CLI is called from source, the base directory is now set to the correct path.
Packagers will have to provide the path to the base directory though.
2014-11-12 17:11:48 +01:00
Johannes Meyer
4fa2340552 Merge branch 'feature/setup-wizard-7163'
resolves #7163
2014-11-12 17:05:32 +01:00
Johannes Meyer
db7954c350 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 17:05:13 +01:00
Alexander Fuhr
c7f36a5afa Fix empty preferences array warning in the DbStore 2014-11-12 17:03:22 +01:00
Eric Lippmann
79e4b9852b Do not try to detect the library path in icingacli
Packagers will use a custom icingacli.
2014-11-12 16:58:36 +01:00
Bernd Erk
288c52f88d Fix padding and moved h1 into control section 2014-11-12 16:56:04 +01:00
Bernd Erk
31f4fc6c63 Fix Plugin Output 2014-11-12 16:40:34 +01:00
Johannes Meyer
259a465f97 Show only the most important warning on the login page 2014-11-12 16:23:55 +01:00
Bernd Erk
f2c4c3bb1b Fix color codes and badges 2014-11-12 16:19:00 +01:00
Johannes Meyer
2eb9a771c9 Do not check for any config file, just the directory to show the login-warning
refs #7163
2014-11-12 15:58:18 +01:00
Bernd Erk
f456ad3a04 Fix for hovered host- and servicename 2014-11-12 15:53:12 +01:00
Eric Lippmann
ec6b56a060 Allow to define Icinga Web 2's base directory while bootstrapping 2014-11-12 15:52:43 +01:00
Eric Lippmann
8b1419bb04 Do not try to detect the library path in index.php
Packagers will use a custom index.php.
2014-11-12 15:41:04 +01:00
Johannes Meyer
8e1a6a5b83 Fix that navigating in the service grid opens the grid in a new column
refs #6180
2014-11-12 15:13:32 +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
Eric Lippmann
b27d1d0058 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 14:48:15 +01:00
Eric Lippmann
a081db08a4 icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined" 2014-11-12 14:43:58 +01:00
Eric Lippmann
6089372c42 Do not define ICINGAWEB_BASEDIR in index.php
There's SCRIPT_FILENAME. The constants will be removed shortly.
2014-11-12 14:39:45 +01:00
Eric Lippmann
826cfbeceb Fix include path to the Cli in icingacli 2014-11-12 13:48:26 +01:00
Alexander Fuhr
993390941a Add user account menu and move logout and preferences inside it 2014-11-12 13:22:14 +01:00
Alexander Fuhr
2bae33d6ad Change PreferenceForm and add the ability to store preferences in the current session 2014-11-12 13:18:35 +01:00