4185 Commits

Author SHA1 Message Date
Thomas Gelf
178ddaade7 Data\Filter: add missing abstract function type 2014-11-14 22:44:04 +01:00
Thomas Gelf
53bca911fb Data\Filter: enforce isEmpty() implementation 2014-11-14 22:43:30 +01:00
Thomas Gelf
ce7aea5df7 Data\Filter: add isChain() and isExpression()
This makes node type distiction easier
2014-11-14 22:41:30 +01:00
Thomas Gelf
da47c7fc7e Merge remote-tracking branch 'origin/master' into feature/redesign-7144 2014-11-14 21:32:57 +01:00
Eric Lippmann
11bb8dbab0 icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR" 2014-11-14 16:02:17 +01:00
Eric Lippmann
ce69300c9a cli: Fix the path to the clicommands 2014-11-14 16:01:40 +01:00
Eric Lippmann
9b2bff4d17 Remove Zend/Locale from our vendor library 2014-11-14 15:36:51 +01:00
Eric Lippmann
5178798fa9 Remove Zend/Gdata from our vendor library
Let's waste less space
2014-11-14 15:06:26 +01:00
Johannes Meyer
ddf2ef5cc9 Remove $request parameter from Form::onSuccess and Form::onRequest
fixes #7552
2014-11-14 14:59:29 +01:00
Eric Lippmann
029630308d Load Zend on Web and EmbeddedWeb
refs #7464
2014-11-14 14:07:13 +01:00
Eric Lippmann
37dd2f5dd2 Do not load Zend on the CLI and remove our library from the include path
Adding Icinga Web 2's library to the include is not necessary for getting the Zend_Plugin_Loader working.
2014-11-14 14:04:24 +01:00
Eric Lippmann
c1591bc641 Zend: Reset require_once in Zend_Loader_Autoloader
refs #7464
2014-11-14 14:03:20 +01:00
Eric Lippmann
5bd888f46c Merge branch 'master' into feature/include-zend-7464 2014-11-14 13:28:08 +01:00
Eric Lippmann
49d66a7b73 Use lessphp from the include path
refs #6165
refs #6166
2014-11-14 13:27:02 +01:00
Eric Lippmann
85c6150ca4 Move lessphp from IcingaVendor to vendor
refs #6165
refs #6166
2014-11-14 13:26:11 +01:00
Eric Lippmann
97d026fb09 Update JShrink to version 1.0.1
refs #6165
refs #6166
2014-11-14 11:59:08 +01:00
Eric Lippmann
6624b764cf Use JShrink from the include path
refs #6165
refs #6166
2014-11-14 11:55:06 +01:00
Eric Lippmann
8e7a56db58 Move JShrink from IcingaVendor to vendor
refs #6165
refs #6166
2014-11-14 11:54:20 +01:00
Eric Lippmann
c081841917 Move Parsedown from IcingaVendor to vendor
refs #6165
refs #6166
2014-11-14 11:50:38 +01:00
Johannes Meyer
586b4f463b Let our module autloader know that we renamed our form namespaces
refs #7553
2014-11-14 11:30:44 +01:00
Johannes Meyer
775c20d9ad Rename namespace Icinga\Form to Icinga\Forms
refs #7553
2014-11-14 10:57:14 +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
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
Eric Lippmann
69c5728769 Remove htmlpurifier-4.6.0-lite from the IcingaVendor directory 2014-11-13 23:50:28 +01:00
Eric Lippmann
967492736b Add HTMLPurifier version 4.6.0 to our vendor library
refs #6165
refs #6166
2014-11-13 23:49:31 +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
Eric Lippmann
0a7decd0a9 Remove dompdf from the IcingaVendor directory
IcingaVendor will be removed.

refs #6165
refs #6166
2014-11-13 20:11:00 +01:00
Eric Lippmann
c4aeaf3428 Use dompdf from the include path
refs #6165
refs #6166
2014-11-13 20:10:24 +01:00
Eric Lippmann
d87acd557a Add dompdf version 0.6.1 to our vendor library
refs #6165
refs #6166
2014-11-13 20:09:27 +01:00
Bernd Erk
20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Eric Lippmann
48a468b888 Add our vendor path to the include path 2014-11-13 19:52:28 +01:00
Eric Lippmann
81b144d057 Fix locale setup
The CLI must not try to use HTTP_ACCEPT_LANGUAGE. Avoided double try-catch blocks.

refs #6073
2014-11-13 18:02:03 +01:00
Bernd Erk
6201858a68 Merge branch 'master' into feature/redesign-7144 2014-11-13 17:47:26 +01:00
Eric Lippmann
e3c70bec6d Fix timezone setup
The CLI must not try to use our web timezone detection thingy.

refs #6073
2014-11-13 17:07:36 +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
Eric Lippmann
94f8597271 Add existing GROUPBYs to count queries 2014-11-13 16:42:11 +01:00
Eric Lippmann
0e34001568 Use automatically a subquery when counting with groups 2014-11-13 16:42:11 +01:00
Johannes Meyer
77f5bc3932 Use GROUPBY instead of DISTINCT and subqueries when counting 2014-11-13 16:42:11 +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
Eric Lippmann
385157be8f Zend: Remove require_once calls
refs #7464
2014-11-13 10:49:39 +01:00