Commit Graph

49 Commits

Author SHA1 Message Date
Jannis Moßhammer 0b479e3796 Code style fixes, fix documentation, fix tab parameters not being overwritten
refs #4512
2013-08-16 15:08:28 +02:00
Jannis Moßhammer be29b8ff8f Make ConfigController and PreferenceController extensible by convention
- Rename ConfigurationController to ConfigController
- ConfigController and PreferenceController are now subclasses of
  BaseConfigController and BasePreferenceController
- Module and Application Config/Preference Tabs are detected via
  the ControllerTabCollector
- Moved Controller classes to Icinga/Web/Controller (this is why
  so many files are modified)

refs #4530
2013-08-14 16:08:15 +02:00
Johannes Meyer 94ea09b552 Remove Date and Time form elements
Drops the Date and Time form element as they are redundant.

refs #4440
2013-08-12 16:43:08 +02:00
Eric Lippmann c0e3712e1b Framework/Elements: Implement DateTime form element
refs #4440
2013-08-12 16:42:51 +02:00
Jannis Moßhammer f8bb478f0e Update dashboard implementation
fix javascript naming (icinga-url to icingaurl), fix add form, add remove
button, code style changes

refs #4192
2013-08-07 17:43:37 +02:00
Marius Hein 8510d57cf8 Prepare user settings api
Rework application bootstrap, move user object to its new location, implement web
request class to handle the user object.

refs #4066
2013-07-30 14:06:46 +02:00
Eric Lippmann 104925dff4 Vagrant: Enable XDebug remote debugging
refs #4460
2013-07-29 18:37:40 +02:00
Johannes Meyer 4b8643dc56 Add a date and time form-element.
Added a date and time form-element which are implemented based on the
new "date" and "time" input-types introduced with html5. If those are not
available two bootstrap javascript-modules will be enabled.

refs #4355
2013-07-23 14:46:24 +02:00
Jannis Moßhammer bec7049785 Merge branch 'bugfix/history-api-encoding-4408' into feature/host-overview--4179 2013-07-15 12:41:07 +02:00
Jannis Moßhammer 820ed8f7a8 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179 2013-07-12 16:02:00 +02:00
Jannis Moßhammer b045650a19 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
Conflicts:
	application/layouts/scripts/layout.phtml
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/contacts.phtml
	modules/monitoring/application/views/scripts/show/components/customvars.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
2013-07-12 15:55:31 +02:00
Eric Lippmann 51755209b6 Adapt usage of config class
refs #4354
2013-07-12 15:43:23 +02:00
Jannis Moßhammer 30040eaa1b Add Host detail to hostoverview
This is merge to prevent the host-overview nad
host-detail branch from diverging too much

refs #4179

Conflicts:
	application/views/helpers/TimeSince.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/header.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	public/css/base.less
	public/css/components/details.less
2013-07-12 15:12:26 +02:00
Jannis Moßhammer 7116cfd60a Host list markup and less changes (WIP)
Modified the host list markup to reflect host information.
Comments are currently missing as well as behaviour and final styling.
The styling part is not really part of the ticket, as we decided
not to style or add additional markup, but as the work
has been done in sprint 1.0-4 it makes no sense to
throw it away at this time

refs #4179
2013-07-12 14:14:32 +02:00
Jannis Moßhammer 673f73b38a Fix history api URI encoding
The history API encoded components multiple times, e.g. causing a [ to
be converted to %5B in the first link, then to %255B on the second link,
%25255B on the third, etc.

refs #4408
2013-07-12 11:51:59 +02:00
Eric Lippmann 6d05361370 phtml: Use short_open_tags instead of <?php echo 2013-07-10 17:03:51 +02:00
Marius Hein 6b37fcf24f Host detail view
Add commands to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein f455b32464 Host detail view
Add flags container to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein ffc1a2b43f Host detail view
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein 051724a786 Host detail view
Fix small bugs in layout and js typo
2013-07-08 16:12:47 +02:00
Jannis Moßhammer aefea8486e Add Autoconf based installation with most parameters
configure allows to set the authentication backend to internal (or ldap)
and to set connection details for authentication and data retrieval

refs #4175
2013-07-03 14:05:59 +02:00
Marius Hein a0f96379a9 Host detail view
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.

refs #4182
2013-07-02 16:00:41 +02:00
Marius Hein 3bcef9af9b Host detail view
Fix small bugs in layout and js typo
2013-07-02 11:39:20 +02:00
Eric Lippmann e80ddb0af4 Fix missing software and enable apache rewrite rules
Add the jquery node module and the Zend PDO adapter for MySQL.

refs #4307
2013-06-28 13:48:14 +02:00
Jannis Moßhammer 79a4ee1804 Remove console.log as this breaks tests 2013-06-27 11:25:19 +02:00
Jannis Moßhammer d71d15c822 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/history-api-4303
Conflicts:
	public/js/icinga/components/actionTable.js
	public/js/icinga/components/mainDetail.js
	public/js/icinga/container.js
	public/js/icinga/util/async.js
2013-06-27 10:20:46 +02:00
Jannis Moßhammer d1f4e9831a Fix empty module folder causing errors, fix var naming
Fix a wrongly named class causing ClassNotFound issues,
also added additional checks for empty module folder and
added en moduleFolder directive to configure module location

refs #4092
2013-06-26 16:41:07 +02:00
Jannis Moßhammer 5e5b301d0d Add support for lazy module loading
When the X-Icinga-Module-Enable header is send, the
modulemanager automatically tries to load javascript files for
that module. This is realized by adding the 'registerHeaderListener'
method to the async manager, which allows to listen to specific headers
and firing callbacks if a response with the specified header is retrieved.

Also the tests have changed a bit, requireNow should be used when using
the requiremock, so a require always loads files new.

refs #4092
refs #3753
2013-06-26 16:41:07 +02:00
Jannis Moßhammer fc83dfb4ef Add javascript autoloading
the js/modules/%modulename%/%file% is now mapped to the module
path (if existing). To prevent name clashing, the modules folder
has been renamed to components.
2013-06-26 16:40:33 +02:00
Jannis Moßhammer c1e460de17 Remove moved files
the 'behaviour' namespace in javascript has been renamed to
module

refs #4092
2013-06-26 16:40:08 +02:00
Jannis Moßhammer 8b84de934a Move ModuleController from incubator
The Notification dependency is removed and uses exceptions now,
otherwise it's mostly the same like in the incubator

refs #4092
2013-06-26 16:39:55 +02:00
Jannis Moßhammer beaac3a68d Add rule for 'body' container and QLink property 'target'
QLinks can now define the target for their link. Additionally, the
targte 'body' is now always the <body> tag. This allows the
modulemanager to reload the whole page (with the navigation bar).

refs #4092
2013-06-26 16:37:39 +02:00
Jannis Moßhammer e9ade7a339 Add support for lazy module loading
When the X-Icinga-Module-Enable header is send, the
modulemanager automatically tries to load javascript files for
that module. This is realized by adding the 'registerHeaderListener'
method to the async manager, which allows to listen to specific headers
and firing callbacks if a response with the specified header is retrieved.

Also the tests have changed a bit, requireNow should be used when using
the requiremock, so a require always loads files new.

refs #4092
refs #3753
2013-06-26 16:37:12 +02:00
Jannis Moßhammer d94d89e1cf Add javascript autoloading
the js/modules/%modulename%/%file% is now mapped to the module
path (if existing). To prevent name clashing, the modules folder
has been renamed to components.
2013-06-26 16:37:12 +02:00
Jannis Moßhammer 3a5a4bf273 Remove moved files
the 'behaviour' namespace in javascript has been renamed to
module

refs #4092
2013-06-26 16:36:47 +02:00
Jannis Moßhammer 4f2fb49555 Move ModuleController from incubator
The Notification dependency is removed and uses exceptions now,
otherwise it's mostly the same like in the incubator

refs #4092
2013-06-26 16:36:36 +02:00
Jannis Moßhammer 34f68856ee Add rule for 'body' container and QLink property 'target'
QLinks can now define the target for their link. Additionally, the
targte 'body' is now always the <body> tag. This allows the
modulemanager to reload the whole page (with the navigation bar).

refs #4092
2013-06-26 16:36:36 +02:00
Jannis Moßhammer f93344330e Rename require reference to requirejs
Require is a reserverd word for phantomjs

refs #4315
refs #4303
2013-06-25 11:18:27 +02:00
Jannis Moßhammer 04f7149cfe Allow container-based url in history api
When a url is now loaded for an non-main container, the url for the
container is appended to the GET part of the URL

refs #4303
2013-06-25 11:18:27 +02:00
Jannis Moßhammer 0694973c88 Add history api and modify js for tests
All JS Files now call 'requirejs' instead of 'require', also
the holder.js reference is removed and the history api added.
Tests are following in the next commit

refs #4303
refs #4315
2013-06-25 11:18:26 +02:00
Jannis Moßhammer b46dd9bae4 Remove behaviour files
These files are not required anymore as they are
now renamed to 'modules' and may affect testting

refs #3753
refs #4303
2013-06-25 11:18:26 +02:00
Jannis Moßhammer 6f6478b819 Rename require reference to requirejs
Require is a reserverd word for phantomjs

refs #4315
refs #4303
2013-06-19 13:22:02 +02:00
Jannis Moßhammer fa5c499733 Allow container-based url in history api
When a url is now loaded for an non-main container, the url for the
container is appended to the GET part of the URL

refs #4303
2013-06-19 13:22:02 +02:00
Jannis Moßhammer fc4b42e3e0 Add history api and modify js for tests
All JS Files now call 'requirejs' instead of 'require', also
the holder.js reference is removed and the history api added.
Tests are following in the next commit

refs #4303
refs #4315
2013-06-19 13:22:01 +02:00
Jannis Moßhammer ef505ed949 Remove behaviour files
These files are not required anymore as they are
now renamed to 'modules' and may affect testting

refs #3753
refs #4303
2013-06-19 13:22:01 +02:00
Jannis Moßhammer 0d0db281f7 Test and icinga.js module setup procedure
Behaviours are now modules and icinga.js automatically
requests module/list (which should be served by the application
and is non static) and retrieves a list of modules to request and
enable.

refs #3753
2013-06-17 11:22:53 +02:00
Jannis Moßhammer 95e4ebb76a Add javascript files (all untested)
This commit just adds the javascript files from the incubator,
even if not fully functional.

refs #3753
2013-06-17 11:22:53 +02:00
Eric Lippmann 6de8dd91fe Remove trash-containing StatusCircle.js
refs #4249
2013-06-17 10:54:08 +02:00
Marius Hein c905b1f490 Test and move bootstrapping/web code to source tree
Move code from incubator to web. Only files needed to show
welcome moved.

refs #4249
2013-06-17 08:49:27 +02:00