Commit Graph

779 Commits

Author SHA1 Message Date
Johannes Meyer 1c4a5ce86f Leave it up to Icinga\Web\Form to instantiate our own form elements 2014-11-14 10:15:27 +01:00
Johannes Meyer 872dce2208 Prefer form elements of Icinga\Web\Form\Element in Form::createElement 2014-11-14 10:15:27 +01:00
Thomas Gelf 69fdc6a329 Chart/InlinePie: smaller, white border for hover
I roughly changed the piechart defaults to their original (icon-like)
size. However, this is NOT how we should handle such changes. We MUST
be able to style them via CSS and get rid of that incredible amount of
HTML attributes.

I want to be able to set the height directly in CSS as em/px. And I want
also be able to set it to 100% and size the outer container.

refs #7077
2014-11-14 09:54:20 +01:00
Thomas Gelf d55c2a4c87 Widget\Filter*: fix parse error, replace minus 2014-11-13 21:47:40 +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
Bernd Erk 6201858a68 Merge branch 'master' into feature/redesign-7144 2014-11-13 17:47:26 +01:00
Eric Lippmann ac2ec83852 Merge branch 'master' into feature/localization-form-6073
Conflicts:
	library/Icinga/Application/ApplicationBootstrap.php
	test/php/library/Icinga/User/Store/DbStoreTest.php
2014-11-13 17:03:41 +01:00
Thomas Gelf f86d3e7636 Web\StyleSheet: PCRE problem workaround, PHP5.3.7
Lines with embedded fonts where too long for lessphp's PCRE matches
unless PHP 5.3.7
2014-11-13 16:35:26 +01:00
Thomas Gelf 28c239c6fd Web\Controller: initial commit
* This is the controller all modules should inherit from.
* We will flip code with the ModuleActionController as soon as a couple
  of pending feature branches are merged back to the master.
2014-11-13 15:42:25 +01:00
Thomas Gelf 1c0e427d3b Web\StyleSheet: compile webfont too
refs #6936
2014-11-13 15:41:13 +01:00
Thomas Gelf 50869c783d MonitoringMenuItemRenderer: webfont icon support
refs #6936
2014-11-13 15:30:00 +01:00
Thomas Gelf b16959bc44 Widget\Tab: support webfont icons
refs #6936
2014-11-13 15:22:47 +01:00
Thomas Gelf 29c7c2e707 Web\MenuRenderer: support webfont icons
refs #6936
2014-11-13 15:21:49 +01:00
Thomas Gelf 1aa8858dca helpers/icon: support webfont shortcuts
* set icon class instead of icon image if no such is given
* fix TODO: merge parameter classes

refs #6936
2014-11-13 15:17:36 +01:00
Bernd Erk ef2ec0442c Merge branch 'master' into feature/redesign-7144 2014-11-13 14:40:26 +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
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
Eric Lippmann b27d1d0058 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 14:48:15 +01:00
Alexander Fuhr 993390941a Add user account menu and move logout and preferences inside it 2014-11-12 13:22:14 +01:00
Thomas Gelf 5851886877 Widget\Tab: no underlined space after icon 2014-11-12 11:30:06 +01:00
Johannes Meyer 62aacce469 Place the noscript button next to the element it is supposed to apply 2014-11-12 10:48:52 +01:00
Johannes Meyer 7aae291f69 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 10:08:28 +01:00
Thomas Gelf f24b0e2a4e MonitoringBackend: a few more places, doesn't hurt 2014-11-12 00:20:37 +01:00
Thomas Gelf 0992f6cc15 Monitoring/MenuRenderers: unify logic, perftuning
This reduces duplicate code, query will be fired only once right now.

fixes #7554
2014-11-11 21:50:49 +01:00
Eric Lippmann 8e3394fd55 Merge branch 'master' into feature/redesign-7144 2014-11-11 13:54:13 +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 8f212018ec Move the setup wizard code to a dedicated module
refs #7163
2014-11-10 15:11:44 +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 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Bernd Erk f9e8cc84b9 Design: headline and main menu 2014-11-06 00:09:14 +01:00
Eric Lippmann a06568ce41 security: Add menu entry for security
refs #5647
2014-11-04 16:19:20 +01:00
Eric Lippmann d2eddcbec6 Introduce Form::setOnSuccess() in favor of overriding the constructor
Zend_Form uses setters for options if a respective setter method exists.
It is not necessary to override the constructor for introducing new options.
2014-11-04 16:15:06 +01:00
Johannes Meyer 0db658b7f3 Fix that pgsql privileges were tested in case of mysql
refs #7163
2014-11-04 15:51:11 +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
Johannes Meyer 581935c26f Fix database setup and add support for the new schema
refs #7163
2014-11-04 13:51:15 +01:00
Johannes Meyer 805cb9f079 Do not report whether files were skipped because they already exist
I've removed the summary earlier as a user does not configure this in any
way so it's not necessary to show him what should had happened to files
as well.

refs #7163
2014-11-04 13:47:37 +01:00
Eric Lippmann ea1f51ad9a Use callable as type hint instead of Callback
PHP 5.4 introduces callable for type hinting and PSR-5 proposes callable.
2014-10-31 15:59:45 +01:00
Eric Lippmann 16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer 538bc8aec8 Drop unused method parameter in DbTool::checkPrivileges 2014-10-30 15:08:04 +01:00
Johannes Meyer 521a36e0af Fix method documentation of DbTool::checkPgsqlPriv() 2014-10-30 15:07:33 +01:00
Johannes Meyer e58520c3e6 Drop irritating and redundant docblock warning 2014-10-30 15:06:57 +01:00
Johannes Meyer 1bd1b58d46 Drop unused use statement 2014-10-30 15:06:14 +01:00
Johannes Meyer 9cd4aeec06 Fix MySQL login creation in DbTool::addLogin()
refs #7163
2014-10-29 15:45:57 +01:00
Johannes Meyer 33a64eb55a Do not throw an exception in DbTool due to an implementation detail
Throwing exceptions due to failing logic which is purely an implementation
detail must not affect the calling code in any way.

refs #7163
2014-10-29 15:45:26 +01:00
Johannes Meyer 47d9426a1f Use a hardcoded path where to look for modules
refs #7163
2014-10-29 15:43:08 +01:00
Johannes Meyer 6a3244d8df Do not show a summary for the MakeDirStep
The user does not configure anything this step will process so there is no
need to show the user a summary about something he can't control.

refs #7163
2014-10-29 08:38:59 +01:00
Johannes Meyer 83cfcef85c Add EnableModuleStep
refs #7163
2014-10-29 08:38:59 +01:00
Johannes Meyer a899070606 Move MakeDirStep to Icinga\Web\Setup
refs #7163
2014-10-29 08:38:59 +01:00
Matthias Jentsch 2e8c0cffe6 Check privileges of database user accounts before continuing with the setup
Implement owner and privilege checks for postgresql, and fix some errors in
existing MySQL privilege checks.

resolves #7389
2014-10-27 15:08:52 +01:00
Johannes Meyer 851682cf18 Make page count assertion more sensitive
refs #7163
2014-10-24 14:06:31 +02:00
Johannes Meyer 03bbc2e2e6 Use a dedicated method to clear a wizard's session
Simplifies session removal in case a sub-class of Icinga\Web\Wizard
requires special session handling

refs #7163
2014-10-24 13:55:41 +02:00
Johannes Meyer 216c072024 Implement installation routines modularly
This allows us to "merge" module installation
routines with our main installer routines.

refs #7163
2014-10-23 11:41:16 +02:00
Johannes Meyer a5b10235d2 Add more detail to error messages when token validation fails
refs #7163
fixes #7410
2014-10-21 16:10:21 +02:00
Johannes Meyer 9f127be1dc Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/General/LoggingConfigForm.php
2014-10-17 13:04:59 +02:00
Johannes Meyer d1ea7e87a2 Improve form styling slightly 2014-10-15 15:46:07 +02:00
Johannes Meyer 38ee467603 Fix that the session is written too early when post-dispatching 2014-10-15 13:15:30 +02:00
Johannes Meyer 2c09ca1623 Fix that retrieving notifications causes them to be dropped entirely
I've broke this when doing some improvements while being
brainless, obviously.
2014-10-15 13:14:51 +02:00
Johannes Meyer 5d44a005a0 Fix that notifications are not registered 2014-10-15 13:02:56 +02:00
Matthias Jentsch 937dbe2c15 Add missing close buttons to views without tabs 2014-10-14 17:54:52 +02:00
Johannes Meyer b5798331db Wrap form notifications in <p> by default, not <div> 2014-10-13 09:41:36 +02:00
Johannes Meyer 437b41c6c1 Merge branch 'master' into feature/setup-wizard-7163 2014-10-13 08:18:43 +02:00
Johannes Meyer ca6eca6b67 Quote database names, usernames and passwords when setting up the db
refs #7163
2014-10-09 16:02:18 +02:00
Johannes Meyer c3404fdc67 Support prepared statements in DbTool::exec and DbTool::query
refs #7163
2014-10-09 15:03:51 +02:00
Johannes Meyer f8f27e046d Ensure that we advance a wizard when pushing ENTER
refs #7163
2014-10-09 13:41:06 +02:00
Eric Lippmann cc61dc2b01 Form: Don't override Zend_Form::setDefaults()
fixes #7315
2014-10-08 17:43:28 +02:00
Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/StatusdatResourceForm.php
2014-10-08 16:34:31 +02:00
Johannes Meyer 89ae05899b Query a particular login name and create database logins using the DbTool
refs #7163
2014-10-08 15:33:51 +02:00
Johannes Meyer abc34a5f1a Add database setup routines
refs #7163
2014-10-07 17:08:50 +02:00
Johannes Meyer b50c780bcf Let the setup's view scripts be a bit more generic
refs #7163
2014-10-06 16:04:58 +02:00
Johannes Meyer 83006c014c Wrap wizard buttons in a div
refs #7163
2014-10-06 11:07:21 +02:00
Eric Lippmann 2956d9e342 form: Correctly set our default element decorators 2014-10-06 10:42:24 +02:00
Eric Lippmann fa96a1cbbe Number: Extend our FormElement class 2014-10-06 10:21:17 +02:00
Eric Lippmann a3409b166d Note: Extend our FormElement class 2014-10-06 10:21:02 +02:00
Eric Lippmann 9be52a9148 DateTimePicker: Extend our FormElement class
fixes #7322
2014-10-06 10:20:26 +02:00
Eric Lippmann 9db76bf371 CsrfCounterMeasure: Save calls to `setRequired()' and `setIgnore()' 2014-10-06 10:19:36 +02:00
Eric Lippmann 8106fe4f79 form: Add `FormElement' as base class for our elements 2014-10-06 10:19:05 +02:00
Johannes Meyer a980184eb9 Move css instructions to dedicated stylesheet
refs #7163
2014-10-01 15:46:58 +02:00
Matthias Jentsch ed91e119d2 Add close-button to all containers
refs #6216
2014-10-01 14:51:51 +02:00
Johannes Meyer 8f79e0a713 Fix warning "references should be passed by variable only" 2014-10-01 09:17:48 +02:00
Johannes Meyer 08d259eccf Add database creation page
refs #7163
2014-10-01 09:16:53 +02:00
Eric Lippmann bbee06b57f form: Ignore note elments when retrieving values at form level 2014-10-01 08:18:34 +02:00
Johannes Meyer 7b01525456 Fix that navigation buttons have labels
refs #7163
refs #7320
2014-09-29 16:42:38 +02:00
Johannes Meyer 513d5e30a4 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 16:16:12 +02:00
Johannes Meyer ab8436dea8 Fix Icinga\Web\Form\Element\Note using its default decorators 2014-09-29 16:12:38 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Johannes Meyer 4a14dc5916 Add interface for setup wizards
refs #7163
2014-09-29 14:19:05 +02:00
Johannes Meyer 5d6391242c Add interface for installers
refs #7163
2014-09-29 14:18:50 +02:00
Johannes Meyer 929344e68b Add container to store and handle installation requirements
refs #7163
2014-09-29 12:25:29 +02:00
Johannes Meyer aa17f2828d Add utility to ease working with databases without the use of Zend
refs #7163
2014-09-29 12:24:56 +02:00
Johannes Meyer 7c53e6f7be Improve page permission handling
refs #7163
2014-09-29 11:31:59 +02:00
Johannes Meyer 5c13a19b1a Populate a wizard page in case the user moves backwards
refs #7163
2014-09-29 11:31:13 +02:00
Johannes Meyer 73b41769e7 __toString() should call __toString() as well if possible
There may be cases that an error occurs and another _toString()
implementation handles that appropriately. This is such a case.
2014-09-29 11:28:58 +02:00
Johannes Meyer 3107eb87bb Silence stat() call 2014-09-29 11:24:59 +02:00
Alexander Fuhr b2f12e1caa Revert "lib: Remove form element `Note'"
This reverts commit c21d7d1fdd.
2014-09-26 16:19:44 +02:00
Alexander Fuhr c8a24f72b8 Introduce getValue() in Preferences and fix the loading of values 2014-09-26 14:15:50 +02:00
Johannes Meyer 8e48853f4d Add Wizard
This is a container/controller for form based wizards. Can be used directly
or by using a subclass that allows for a more customized handling.

refs #7163
2014-09-24 10:46:36 +02:00
Johannes Meyer 028a6c442b Fix persisting notification messages in the session 2014-09-24 10:46:35 +02:00
Johannes Meyer 635b802a2b Add tests for hasChanged, set/getByRef and fix setByRef 2014-09-24 10:46:35 +02:00
Johannes Meyer 6f988cb94c Remove method write() from Icinga\Web\Session\SessionNamespace 2014-09-24 10:46:35 +02:00
Johannes Meyer c00dbf9f46 Write session on response
There should not be any necessity to write the session once changes are
being made to it. We now track whether changes were made and write
the session when responding to the user's request if so.
2014-09-24 10:46:35 +02:00
Johannes Meyer 7fcd665aaa Fix value invalidation in Icinga\Web\Session\SessionNamespace 2014-09-24 10:46:35 +02:00
Johannes Meyer efab6c7827 Add method set/getByRef to Icinga\Web\Session\SessionNamespace 2014-09-24 10:46:35 +02:00
Johannes Meyer c772787967 Re-add TokenValidator
refs #7163
2014-09-24 10:46:35 +02:00
Eric Lippmann cde3ec6bc8 Merge branch 'master' into bugfix/commands-6593
Conflicts:
	modules/monitoring/application/controllers/TimelineController.php
2014-09-23 22:54:17 -07:00
Alexander Fuhr 07a4b25560 Merge branch 'master' into bug/history-notification-time-format-6980 2014-09-23 11:38:24 +02:00
Alexander Fuhr e784aa34b6 Implement DateTimeRenderer and fix history time format
refs #6980
2014-09-23 11:36:09 +02:00
Matthias Jentsch 6c8f324dd4 Add filter widget to StateHistorySummary and fix some minor bugs
fixes #6979
2014-09-19 17:41:44 +02:00
Matthias Jentsch 4ce71ef2f2 Display a tooltip on days without events 2014-09-19 17:41:44 +02:00
Matthias Jentsch 6f1cb6f1f3 Adjust brightness for different event type colors 2014-09-19 17:41:44 +02:00
Matthias Jentsch 65203fddcf Add additional state history filters for time interval and event type 2014-09-19 17:41:44 +02:00
Matthias Jentsch ef2f332869 Do not refresh a container when form input was changed or a form element is focused
Listen for changes in form elements and abort all reloads that contain a form with
at least one changed form element. Do not refresh containers that contain a focused form
element, except of elements with autofocus, to preserve form elements with a dropdown.
Only focus autofocus elements when there is currently no other selection.

refs #7146
refs #5537
fixes #7162
2014-09-19 15:48:44 +02:00
Eric Lippmann 264d818133 Do not save config references in the `ActionController'
This is redundant because our `Config' class already caches loaded configs.
2014-09-19 14:44:21 +02:00
Eric Lippmann 119e23e79e Make `InlinePie's setters fluent 2014-09-19 14:43:25 +02:00
Eric Lippmann bea110d0c7 Fix `Form::isSubmitted()' for dynamic submit labels 2014-09-19 14:27:04 +02:00
Eric Lippmann 5b5f553d0d form: Fix dynamic submit label retrieval 2014-09-19 13:39:38 +02:00
Eric Lippmann c51b05296e Merge branch 'master' into bugfix/commands-6593 2014-09-19 13:18:47 +02:00
Eric Lippmann 3c9859a0f1 Call `Form::getSubmitLabal()' in `Form::addSubmitButton()'
This allows us to dynamically define submit labels in form subclasses.
2014-09-19 13:00:15 +02:00
Eric Lippmann 5ba96c32f9 `Form::setDefaults()' fix strict standards violation
Declaration of Icinga\Web\Form::setDefaults() should be compatible with that of Zend_Form::setDefaults().
2014-09-19 12:59:01 +02:00
Eric Lippmann 7eb51f6367 form/csrf: Set the csrf element decorators in the element not in the form 2014-09-19 12:57:53 +02:00
Eric Lippmann d091e2150c Fix `ActionController::prepareInit()' php doc 2014-09-16 18:43:14 +02:00
Alexander Fuhr b38ef9c0bd Implement plural and context based translation functionality
refs #6982
2014-09-16 15:19:23 +02:00
Eric Lippmann c21d7d1fdd lib: Remove form element `Note'
Zend already provides this.
2014-09-16 09:54:23 +02:00
Eric Lippmann 5c647719e4 lib/ModuleActionController: Fix stupid code 2014-09-16 09:29:03 +02:00
Eric Lippmann f8edb4f220 lib: Add method `ActionController::prepareInit()'
As it should not be required for controllers to call the parent's init() method, base controllers should use
prepareInit() in order to prepare the controller initialization.
2014-09-16 09:28:10 +02:00
Alexander Fuhr e2b5e05f21 Implement plural translation (testing) 2014-09-15 14:11:42 +02:00
Eric Lippmann 8bf66425d1 Merge branch 'master' into bugfix/commands-6593 2014-09-15 09:27:56 +02:00
Eric Lippmann 9e0d6657b7 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
2014-09-15 09:27:07 +02:00
Alexander Fuhr f48094f01a Merge branch 'master' into feature/translation-plurals-6982 2014-09-15 08:34:19 +02:00
Matthias Jentsch 1932a912f8 Fix month-naming for different week arrangements
fixes #7179
2014-09-12 11:51:51 +02:00
Matthias Jentsch 6c3c466f92 Start history grid weeks at monday
Add configuration option for week-start and set the default to Monday.
2014-09-12 11:51:51 +02:00
Matthias Jentsch e42b7b3026 Display current weeks at the beginning of the history grid
fixes #7179
2014-09-12 11:51:51 +02:00
Thomas Gelf 8ceef96d28 Web\Hook: remove unused methods 2014-09-12 09:53:38 +02:00
Thomas Gelf 93777ac15e Web/Response: use & to encode XHR redirection URLs 2014-09-12 09:28:11 +02:00
Matthias Jentsch ad53f7ad3d Use EventEmitter class as a way to delegate events from behaviors to the dom 2014-09-12 09:09:21 +02:00
Thomas Gelf 0e926ba05e Revert "Revert "Web\Hook: register('grapher')
This reverts commit 65564cda65.

The test was wrong, not the code.
2014-09-12 09:02:23 +02:00
Alexander Fuhr 583fd46f15 Experimental Plural Translation Implementation
Personal BACKUP
2014-09-11 18:04:10 +02:00
Alexander Fuhr 65564cda65 Revert "Web\Hook: register('grapher') => GrapherHook"
This reverts commit 4a89c2e163.
2014-09-11 15:00:28 +02:00
Matthias Jentsch 9376ceed33 Add missing use-statement for Exceptions in MenuRenderer
fixes #7157
2014-09-10 17:12:19 +02:00
Matthias Jentsch f58da73e2d Move javascript behaviors into separate classes 2014-09-10 17:02:39 +02:00
Matthias Jentsch d99d50b3c4 Add stub for javascript behaviors 2014-09-10 17:02:38 +02:00
Thomas Gelf ea63dad087 viewHelpers: use the view
refs #7177
2014-09-10 16:56:26 +02:00
Thomas Gelf 631b3d9f6e viewHelpers: There is no $this, not before 5.4
refs #7177
2014-09-10 16:54:57 +02:00
Thomas Gelf c2fe0232ca helpers/attributes: escape value
refs #7177
2014-09-10 16:07:00 +02:00
Matthias Jentsch 27960fc628 Catch exceptions in MenuItemRenderers
fixes #7157
2014-09-10 14:38:11 +02:00
Johannes Meyer 83772c6684 Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-09-09 16:03:22 +02:00
Matthias Jentsch 71f55e388f Only display custom menu renders on XHR requests and not in regular HTML
The main navigation should be rendered without a working backend.

fixes #7143
2014-09-09 15:33:42 +02:00
Johannes Meyer e7c021845d Simplify subform usage
refs #5525
2014-09-09 15:00:33 +02:00
Johannes Meyer f7f6bcc447 Make Form base class more test friendly..
refs #5525
2014-09-09 09:31:15 +02:00