Commit Graph

563 Commits

Author SHA1 Message Date
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
Johannes Meyer c8ce1088c9 Disable checking whether a form is sent when form identification is disabled
refs #5525
2014-09-09 09:30:33 +02:00
Matthias Jentsch a352131d65 Move charts.less into widgets.less
Don't use a separate less file for only two styles
2014-09-08 16:25:11 +02:00
Matthias Jentsch e8164c6da0 Show tooltips to describe menu badges 2014-09-08 10:38:02 +02:00
Eric Lippmann 0e7ca591ec Merge branch 'master' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
	application/views/helpers/FormDateTime.php
	modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
Matthias Jentsch e39dd64a1b Fix layout of HistoryColorGrid
Use actual color for critical hosts and only display the first two letters of the weekday
2014-09-08 09:52:28 +02:00
Johannes Meyer 12b4865559 Fix incompatible declaration of Form::setDefaults()
PHP with strict standards: Declaration of Icinga\Web\Form::setDefaults()
should be compatible with that of Zend_Form::setDefaults()

refs #5525
2014-09-08 09:42:02 +02:00
Johannes Meyer 930e6e7d71 We shouldn't require Form::createElements() to return self
refs #5525
2014-09-08 09:24:53 +02:00
Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/forms/Preference/GeneralForm.php
2014-09-08 08:46:53 +02:00
Thomas Gelf 4a89c2e163 Web\Hook: register('grapher') => GrapherHook 2014-09-05 18:54:50 +02:00
Matthias Jentsch 51d14af154 Merge branch 'master' into feature/navigation-unhandled-badges-7114
Conflicts:
	library/Icinga/Web/Menu.php
2014-09-05 18:14:29 +02:00
Matthias Jentsch 19eca5f50b Show all unhandled host and services in a menu
Add the option to define custom renderers for menu items and implement renderers to
display all unhandled services and host in a badge in the navigation.

resolves #7114
2014-09-05 17:57:20 +02:00
Thomas Gelf 596800bd7d helpers/url: overwrite existing params 2014-09-05 17:56:55 +02:00
Thomas Gelf 4bb065d9bb Web\Menu: provide and render unique id
fixes #7083
2014-09-05 17:24:55 +02:00
Thomas Gelf b034028ff8 Menu: do not show application log when none exists
Added new functions to the logger to get rid of distributed logging config
"knowledge".

fixes #7062
fixes #7098
2014-09-05 15:31:30 +02:00
Marius Hein 3ce42489c6 Timezone detection: Client implementation
refs #6078
2014-09-05 15:24:13 +02:00
Thomas Gelf e205ca4d0b FilterWidget: remove icon titles
fixes #7105
2014-09-05 14:50:22 +02:00