1475 Commits

Author SHA1 Message Date
Eric Lippmann
2ff822c2ac Merge branch 'master' into feature/ipv6-addresses-9645-9826 2015-09-28 13:09:30 +02:00
Johannes Meyer
2f9bd78721 Merge branch 'master' into bugfix/Prettify-page-layout-when-accessing-a-non-existent-route-while-not-being-authenticated-10009 2015-09-28 09:55:07 +02:00
Johannes Meyer
d627f419ef Fix that an object's notes and action url label is escaped twice
fixes #10218
2015-09-28 09:05:17 +02:00
Eric Lippmann
ab50fcc091 CSS: Introduce .primary-nav
refs #5543
2015-09-27 16:06:46 +02:00
Eric Lippmann
8cd715f2d4 CSS: Include main.less after nav.less
refs #5543
2015-09-27 16:00:19 +02:00
Eric Lippmann
2996cb77ab Navigation: Close the navigation item after all children have been rendererd
refs #5543
2015-09-27 15:43:49 +02:00
Eric Lippmann
63e0549618 Navigation: Support empty labels for creating containers
refs #5543
2015-09-27 15:42:26 +02:00
Eric Lippmann
9115e1d834 CSS: Move monitoring/colors.less to application
refs #5543
2015-09-27 14:28:36 +02:00
Eric Lippmann
d59b09ca48 Fix badge markup in the BadgeNavigationItemRenderer
refs #5543
2015-09-27 14:16:51 +02:00
Eric Lippmann
30ed3ad760 Fix badge markup in the BadgeMenuItemRenderer
refs #5543
2015-09-27 14:16:36 +02:00
Eric Lippmann
4c798d4e04 Fix coding style in the SummaryNavigationItemRenderer
refs #5543
2015-09-27 14:16:10 +02:00
Eric Lippmann
181f6d5285 CSS: Re-add form.less but w/ out-commented content
refs #5543
2015-09-27 13:37:35 +02:00
Eric Lippmann
901a5b6d34 lib: Remove obsolete navigation renderer classes
refs #5543
2015-09-27 13:32:14 +02:00
Eric Lippmann
9789aed870 lib: Fix navigation renderer usage in the limiter widget
refs #5543
2015-09-27 13:29:22 +02:00
Eric Lippmann
a9f0aa6bcd lib: Fix navigation usage in the limiter widget
refs #5543
2015-09-27 13:22:43 +02:00
Eric Lippmann
d79a160547 Navigation: Disable ids on li for the moment
refs #5543
2015-09-27 13:11:49 +02:00
Eric Lippmann
d3ac1b16ee Merge branch 'master' into feature/dope-layout-5543 2015-09-27 13:11:11 +02:00
Eric Lippmann
ed9a6aa39d lib: Fix Navigation::addItem()
refs #5543
2015-09-27 12:26:58 +02:00
Alexander A. Klimov
ed935696ac CSS: outsource .logo related rules into a new .less file `logo.less'
refs #10009
2015-09-25 15:31:39 +02:00
Johannes Meyer
a55cced039 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
Eric Lippmann
7ff74ae36a lib: Use navigation classes in the limiter control
refs #5543
2015-09-25 13:36:28 +02:00
Eric Lippmann
823a2cc8ea CSS: Add nav.less and limiter.less to our stylesheet
refs #5543
2015-09-25 13:36:04 +02:00
Eric Lippmann
1122ffafad lib: Add navigation classes (WIP)
- Lacks custom renderer functionality
- Lacks navigation item priorities
- Lacks permission handling

refs #5600
2015-09-25 13:16:44 +02:00
Eric Lippmann
59b9155ca7 CSS: Include dev.less in our style sheet
refs #5543
2015-09-25 00:35:12 +02:00
Johannes Meyer
165dc00fad Url: Do not throw ProgrammingError if there is no relative url available
refs #5600
2015-09-24 14:03:15 +02:00
Eric Lippmann
27f3dd94d2 CSS: Add text-small to time-since, -until and -ago
refs #5543
2015-09-24 10:28:56 +02:00
Eric Lippmann
5b1e4f0a1c CSS: Add new main.less to our stylesheet
refs #5543
2015-09-23 13:41:39 +02:00
Eric Lippmann
2e9ea40eb1 CSS: Disable main-content.less for now
refs #5543
2015-09-23 13:37:19 +02:00
Eric Lippmann
e982735451 CSS: Rename main.less to base.less
refs #5543
2015-09-23 13:36:25 +02:00
Eric Lippmann
d1b141d142 CSS: Include main.less in our stylesheet
refs #5543
2015-09-23 11:01:55 +02:00
Eric Lippmann
12227d9d08 CSS: Disable defaults.less for now
refs #5543
2015-09-23 10:57:39 +02:00
Eric Lippmann
8b9cdc5c1e CSS: Include normalize.css in our style sheet
refs #5543
2015-09-23 10:43:43 +02:00
Johannes Meyer
5193fce1dd Url: Fix external url detection
refs #5600
2015-09-22 16:18:27 +02:00
Johannes Meyer
81e13109fc Revert "Url: Add support macros"
This reverts commit 33231d24dab942b31c924c4c8e352dd73f80939b.
There is no need for url macros, since we're handling absolute
urls correctly now.
2015-09-22 15:51:00 +02:00
Johannes Meyer
33231d24da Url: Add support macros
refs #5600
2015-09-22 14:15:04 +02:00
Johannes Meyer
7321d67b4f Url: Consider urls with a leading slash as absolute..
..and make it possible to have a url without a base.

refs #5600
2015-09-22 14:14:41 +02:00
Johannes Meyer
3c7155f246 NavigationItemRenderer: Pass external urls through the iframe module
refs #5600
2015-09-21 14:13:10 +02:00
Johannes Meyer
7e460e7c03 Url: Remove redundant slash on urls without path 2015-09-21 14:04:36 +02:00
Johannes Meyer
776d06d6ca Url: Fix host check in fromPath()
refs #5600
2015-09-21 14:03:53 +02:00
Johannes Meyer
c8d3aa2517 Url: Support external urls in fromPath()
refs #5600
2015-09-21 13:10:35 +02:00
Johannes Meyer
3aaf726856 Update CSS style used for the navigation
refs #5600
2015-09-21 11:13:05 +02:00
Johannes Meyer
76cf01869e NavigationItem: Add property $target
refs #5600
2015-09-21 10:18:46 +02:00
Eric Lippmann
46ab8d847d Forms: Wrap the label and the help icon in a div
refs #5543
2015-09-19 21:58:02 +02:00
Eric Lippmann
a92c0de52f CSS: Disable all form styles for the moment
refs #5543
2015-09-19 21:57:29 +02:00
Eric Lippmann
cf8548a29d CSS: Add Icinga theme (WIP)
refs #5543
2015-09-18 15:25:14 +02:00
Johannes Meyer
d4a9198310 Navigation: Only fail if there's really no chance to create the requested hierarchy
refs #5600
2015-09-17 14:42:02 +02:00
Johannes Meyer
b6fe6ffd6b Navigation: Relax type check in method fromConfig()
refs #5600
2015-09-17 13:41:28 +02:00
Eric Lippmann
79c9a8af9b lib: Fix Number::isValid(), again :) 2015-09-17 12:52:09 +02:00
Johannes Meyer
83bde3aa81 Form: Rename property $parent to $_parent
Zend.. I love you..
2015-09-17 11:23:47 +02:00
Johannes Meyer
4f5a5c83bc Navigation: Add method hasRenderableItems()
refs #5600
2015-09-17 11:01:06 +02:00