Commit Graph

485 Commits

Author SHA1 Message Date
Sean Harvey
ecf847b61c ENHANCEMENT Re-instate pinging every 5 minutes in the CMS as a measure
to keep sessions alive. Moved Security/ping to admin/security/ping
2012-05-23 17:15:17 +12:00
Sean Harvey
3ed9c5f9f8 MINOR Removed getitem allowed action, this method no longer exists in LeftAndMain 2012-05-22 17:33:34 +12:00
Sean Harvey
ae1a106600 BUGFIX Ensure that CMSMain rule doesn't override the CMSPagesController
rule in AdminRootController::add_rule_for_controller()
2012-05-22 16:59:31 +12:00
Naomi Guyer
16982ba17c ENHANCEMENT: Make GridFieldAddNewButton Content more specific
* Alter Grid Field "Add New" Button to take the name of the table (i.e.
"Add Member")
* Alter table names in security section to be singular so the button
text makes sense
2012-05-21 17:47:14 +12:00
Hamish Friedlander
94f50f554e API CHANGE: Changes to make Director rules set through the new config system. Includes the addition of a new AdminRootController to take over handling of routing /admin/* routes to the correct LeftAndMain panel. 2012-05-19 14:37:32 +12:00
Sean Harvey
3f932d6bad Merge pull request #464 from mateusz/os7299
BUGFIX: add capability of redirecting form actions.
2012-05-17 22:44:05 -07:00
Mateusz Uzdowski
8b4b896578 BUGFIX: add capability of redirecting form actions.
Form actions assume that they are reloading the form afterwards. But
this is not always the case - for example "delete" action will redirect
back to the panel, so we need to be able to set the X-Pjax headers
accordingly.
2012-05-18 17:36:06 +12:00
Sam Minnee
70a5b49dd6 MINOR: Fixed i18n coding for LeftAndMain save and delete. 2012-05-18 16:15:13 +12:00
Ingo Schommer
5ff282e20a MINOR Allow extending LeftAndMain->SiteTreeAsUL() (specifically used to add the language drop down for the 'translatable' module) 2012-05-15 21:28:38 +02:00
Ingo Schommer
8e39e7dfba MINOR Allow extension of LeftAndMain->Link() 2012-05-15 21:27:32 +02:00
Ingo Schommer
d42ea5a9d6 BUGFIX Encoding multibyte characters in custom X-Status HTTP headers used in CMS (headers don't allow multibyte data) 2012-05-14 15:13:49 +02:00
Ingo Schommer
45ae2465e8 Merge pull request #438 from ajshort/sapphire
---

These are some enhancements + tweaks I made as part of getting the advanced workflow module running in SS3:

* Added a readonly view button and action to GridField.
* Made LeftAndMain::getResponseNegotiator() public so CMS extensions can use it to generate responses.
* Fixed top tab background, made text more readable (http://i.imgur.com/yDmmY.png).
* Allow fields in the CMS to not be change tracked using ".no-change-track".
* Made all icons 16x16 (some were different sizes, being cut off), and allow them without .ui-state-default.
* Fixed ToggleCompositeField and tweaked field styling.
2012-05-14 14:25:16 +02:00
Hamish Friedlander
7f05add15e ENHANCEMENT: Make jQuery.Entwine inspector available in admin panels in dev mode 2012-05-14 16:34:18 +12:00
Andrew Short
1e174b3102 API CHANGE: Made LeftAndMain::getResponseNegotiator() public so extensions can use it. 2012-05-12 18:49:56 +10:00
Mateusz Uzdowski
be06ae7e5f MINOR: change the tree reorganisation message. 2012-05-11 16:22:56 +12:00
Ingo Schommer
9052cdc1da ENHANCEMENT Making "Users", "Groups" and "Roles" tabs in SecurityAdmin bookmarkable.
ENHANCEMENT Fixed SecurityAdmin->Breadcrumbs() to include link to individual tab, and disable backlink (signed off by Paul)
2012-05-08 11:25:47 +02:00
Ingo Schommer
f2d2f5bb0e MINOR Changed CMS section name from "Users" back to its 2.4 label, "Security". Mainly to avoid breadcrumb weirdnesses when having a "Users/Users/My User" path. Signed off by Paul. 2012-05-08 11:25:47 +02:00
Ingo Schommer
7e0d0a4dee MINOR Tree metadata naming 2012-05-07 14:45:25 +02:00
Ingo Schommer
4029f96728 ENHANCEMENT Section icons in CMS (#7269) 2012-05-03 13:49:19 +02:00
Sean Harvey
151abde17d Merge pull request #388 from chillu/trac/7170-i18n-sprintf-injections
#7170 i18n sprintf injections
2012-05-02 16:18:30 -07:00
Ingo Schommer
c7323545b6 BUGFIX Return consistent data from ModelAdmin->getManagedModels(), fixing custom 'title' settings in $managed_models (fixes #7243) 2012-05-02 22:11:26 +02:00
Ingo Schommer
dc659543a1 MINOR Correct breadcrumbs in ModelAdmin when managing multiple models (#7240) 2012-05-02 18:13:34 +02:00
Ingo Schommer
7b18d9d0da MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:17:00 +02:00
Sean Harvey
1663e96ddb BUGFIX Fixing stray . in the "Page type: x" tooltip hovering over a page 2012-05-01 15:16:22 +12:00
Will Rossiter
585417d141 Merge pull request #343 from halkyon/object_static_remove_deprecation
BUGFIX Remove calls to deprecated Object static methods, update ConfigTest
2012-04-19 14:41:45 -07:00
Robert Curry
842784c8aa ENHANCEMENT: Fixes #7010. Move DisplayFields, FieldCasting and FieldFormatting functions from GridField to GridFieldDataColumns. 2012-04-19 12:44:59 +12:00
Sam Minnee
9d36048ada BUGFIX: Fixed a few references to non-existent $request variable. 2012-04-19 10:11:01 +12:00
Ingo Schommer
d8bb1b2375 MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview() 2012-04-18 22:59:18 +02:00
Ingo Schommer
57ee9bf5e8 MINOR Removed unnecessary jquery.livequery include from CMS, its still processing in the background = performance overhead 2012-04-18 17:37:36 +02:00
Ingo Schommer
972e7ccb1a MERGE sitetreeasul 2012-04-18 16:55:15 +02:00
Sean Harvey
16e950cb6a MINOR Tidy up of code formatting in TestRunner
MINOR Fixing up old ObjectStaticTest and merging into ConfigTest
2012-04-18 23:29:54 +12:00
Sean Harvey
4c6be2931b BUGFIX Removing use of deprecated Object static functions like
get_static(), set_static(), uninherited() etc. Replace with equivalent
Config system get(), update()
2012-04-18 23:10:57 +12:00
Ingo Schommer
473d3a66b8 MINOR Fixed controller contexts in LeftAndMain->SiteTreeAsUL() - needs different context for edit links and determining "current page" (not applicable for CMSPagesController) 2012-04-17 22:33:30 +02:00
Ingo Schommer
0ef5d0b84f MINOR Moved tree filtering in LeftAndMain from SiteTreeAsUL() into getSiteTreeFor() to allow filtering the initial tree (via GET parameters), rather than just through getsubtree() 2012-04-17 16:07:22 +02:00
Ingo Schommer
9b2b39aaaa MINOR More specific tree links, to ensure correct CMSMain subclass is used 2012-04-17 11:03:09 +02:00
Andrew O'Neil
3b9f99394b MINOR: Use config system for cms title, rather than eval. 2012-04-16 11:04:55 +12:00
Ingo Schommer
d44f6b3e1f MINOR Removed deprecated usage of $priority argument in _t() calls 2012-04-15 17:17:17 +02:00
Will Rossiter
befbd3e6a8 MINOR: remove reference to sapphire in CMSVersion 2012-04-15 15:00:52 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Ingo Schommer
3572b31a94 MINOR Default app title when SiteConfig object is not present (fixes #7114) 2012-04-13 16:21:30 +02:00
Ingo Schommer
0f8a6999a1 MINOR Passing rendered form to renderWith() call, underlying logic changed (see #7136) 2012-04-13 15:35:46 +02:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration'
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
2012-04-11 16:31:12 +02:00
Ingo Schommer
fb12dbe075 Merge pull request #298 from silverstripe-big-o/sapphire
---

...s CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs.

- There are a couple changes to dropdown widths for the filter side panel in Big-o integration branch already.

Conflicts:
	admin/code/ModelAdmin.php
	admin/css/screen.css
2012-04-11 15:20:25 +02:00
Jeremy Bridson
98399f7779 BUGFIX:Trac #6854 / #7115 - fixed styling issues with filter panel across CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs. 2012-04-11 16:00:56 +12:00
Ingo Schommer
cf304044b8 Merge branch 'master' into integration 2012-04-10 00:39:29 +02:00
Ingo Schommer
85a898e1d5 MINOR Don't assume existence of cms/ folder in LeftAndMain->CMSVersion() (regression from earlier code) 2012-04-09 23:55:23 +02:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
2012-04-09 21:10:08 +02:00
Wolf Vollprecht
3ae0ac7805 ENHANCEMENT: Rightlick submenu styles and ability to add page with pagetype 2012-04-09 21:08:19 +02:00
Sam Minnee
e01b0aa3d0 ENHANCEMENT PjaxResponseNegotiator for more structured partial ajax refreshes, applied in CMS and GridField. Also fixes issues with history.pushState() and pseudo-redirects on form submissions (e.g. from page/add to page/edit/show/<new-record-id>) 2012-04-05 23:00:22 +02:00
Ingo Schommer
a44b67bae2 API CHANGE Moved RequestHandler->isAjax() to SS_HTTPRequest->isAjax() 2012-04-05 23:00:22 +02:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Ingo Schommer
6517f4496b Merge pull request #273 from ajoneil/sapphire
---

This allows DataList::create(SiteTree) as equivalent to Object::create(DataList, SiteTree), without
having to have a create() function on DataList.

Required for E_STRICT compliance, as child classes cant override create() if they change the arguments.

DBField::create() is also renamed to DBField::create_field(), as this does not just call the constructor, which all other cases of create() do.

Conflicts:
	tests/model/DateTest.php
	tests/model/DatetimeTest.php
2012-04-04 16:48:16 +02:00
Ingo Schommer
0414e42bbc MINOR Keep X-ControllerURL canonical by not re-constructing with question mark if there's no GET string (caused duplicate HTML5 pushState requests) 2012-04-04 16:47:13 +02:00
Felipe Skroski
7740bb326a ENHANCEMENT SSF-168 moved print and csv export buttons to the top of the grid 2012-04-04 14:09:52 +12:00
Normann Lou
2f3949ac6e MINOR add 'print button' to Member list and data list of ModelAdmin 2012-04-04 10:35:41 +12:00
Ingo Schommer
f34e58f573 ENHANCEMENT Enabled History.pushState() support in IE via onhashchange fallbacks (#7002) 2012-03-30 16:51:42 +02:00
Ingo Schommer
f0ee711f52 Merge pull request #275 from halkyon/e_strict_support
First round of fixes for E_STRICT compliance
2012-03-28 02:42:26 -07:00
Sean Harvey
e097f6e1a8 MINOR Fixes to method arguments in core classes for E_STRICT support.
API CHANGE Remove abstract static function and just use static functions
in Authenticator (PHP 5.3+ doesn't support abstract static functions)
2012-03-28 22:41:42 +13:00
Sean Harvey
cf014dc56d MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3
ENHANCEMENT E_DEPRECATED and E_USER_DEPRECATED are now handled as notice level errors in Debug.
2012-03-27 23:16:52 +13:00
Andrew O'Neil
de2832e65f ENHANCEMENT: Allow Object::create() to be called with late static binding.
This allows DataList::create('SiteTree') as equivalent to Object::create('DataList', 'SiteTree'), without
having to have a create() function on DataList. Required for E_STRICT compliance.
2012-03-27 17:57:42 +13:00
Sean Harvey
fd7f2eb469 ENHANCEMENT Use of Object::create('GridField') for Roles grid in
SecurityAdmin, to be consistent with Members and Groups grid
instantiation.
MINOR Removing comments referring to CTF
2012-03-26 14:51:40 +13:00
Sean Harvey
fca60b786c ENHANCEMENT Addition of ModelAdmin::getExportFields() which allows ModelAdmin classes to customise which fields should be exported. Defaults to the summary fields from the model class definition. 2012-03-25 20:01:43 +13:00
Sean Harvey
ffdf548575 ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into
Users and Groups tab for context instead of Import tab, and fixing
styling to be close to how it was in SS 2.4.
2012-03-24 13:20:19 +13:00
Ingo Schommer
620b23a23f MINOR Including GET parameters in X-ControllerURL default headers (which fixes e.g. AssetAdmin search persistence) 2012-03-14 16:07:50 +01:00
Andrew O'Neil
f367db2904 MINOR: Remove table filter from modeladmin search results 2012-03-12 23:01:07 +01:00
Ingo Schommer
bac23bcdb7 BUGFIX Correctly set $BaseCSSClasses on LeftAndMain content container templates, not only on forms. Fixes $('.cms-menu') handling of "current id" updates (fixes #6997) 2012-03-12 14:05:54 +01:00
Ingo Schommer
8f8817b2f9 MINOR Always set X-ControllerURL in CMS responses, in order to fix menu state after Ajax HTTP redirects (e.g. from CMSPageAddController to CMSPageEditController) 2012-03-12 13:41:22 +01:00
Ingo Schommer
44515f51b6 MINOR Don't link tree root node in CMS views, its not editable any longer (replaced by more specialised views with CMSSettingsController and SecurityAdmin->EditForm()) 2012-03-12 10:42:07 +01:00
Sam Minnee
d94048c1a6 BUGFIX: Fixed back redirectBack() call in GroupImportForm::doImport (#6969) 2012-03-10 14:56:49 +13:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25
SSF-25: ModelAdmin
2012-03-09 15:23:20 -08:00
Ingo Schommer
9e6d70be64 MINOR Moved LeftAndMain->doAdd() and AddForm() to subclasses where they're actually used (no possible through a combination of architectural and UI changes) 2012-03-10 00:04:51 +01:00
Ingo Schommer
dd517c49ba ENHANCEMENT Allowing to override importer instances in ModelAdmin (fixes #2982) 2012-03-09 15:33:24 +01:00
Ingo Schommer
e12a3a4ab7 API CHANGE ModelAdmin uses GridField, DataList and new layout. Removed ModelAdmin_CollectionController, ModelAdmin_RecordController and related functionality.
API CHANGE Removed ModelAdmin->ResultColumns()/ColumnSelectionField, selection of own fields no longer possible through the UI, to be replaced by a more generic GridField component
2012-03-09 15:15:58 +01:00
Ingo Schommer
64db811d65 BUGFIX Convert pages from DataList to ArrayList in CMSBatchActionHandler to avoid problems on merge() 2012-03-09 09:28:20 +01:00
Robert Curry
d34dca675a MINOR: Fix typographical errors. 2012-03-09 17:00:25 +13:00
Sam Minnee
a071456837 Merge branch 'master' of github.com:silverstripe/sapphire
Conflicts:
	tests/forms/gridfield/GridFieldDetailFormTest.php
	tests/forms/gridfield/GridFieldPopupFormsTest.yml
2012-03-09 14:37:32 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Sean Harvey
c59c717d78 API CHANGE Removed CustomRequiredFields, please use custom validation instead
BUGFIX Ensure validators still used in ModelAdmin forms
2012-03-09 12:45:18 +13:00
Sean Harvey
9f3344b355 API CHANGE Removed built-in behaviour.js client-side form validation.
This is no longer supported. Please use custom client-side validation instead. (see 3.0.0 changelog
for more information)
2012-03-09 12:19:57 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration'
Conflicts:
	forms/gridfield/GridField.php
2012-03-08 20:25:21 +01:00
Ingo Schommer
c117ef58cf API CHANGE Removed LeftAndMain->RootForm(), concept no longer applies in 3.0 UI. Use EmptyForm() or EditForm() 2012-03-08 18:22:30 +01:00
Ingo Schommer
174cf08c75 MINOR Removing special TinyMCE case in LeftAndMain->doAdd(), feature has been removed 2012-03-08 18:22:30 +01:00
Ingo Schommer
9517763ec6 MINOR Fixed PHP notice in ModelAdmin 2012-03-08 15:18:11 +01:00
Normann Lou
5e92c69c0a BUGFIX SSF-25 : remove CreateForm, using the GridField 'Add New" action, instead 2012-03-08 20:29:19 +13:00
Normann Lou
2ea7c8d136 ENHANCEMENT SSF-25 : remove GridField filter component for search result in ModelAdmin 2012-03-08 20:29:19 +13:00
Normann Lou
d24c2ef1ed FEATURE SSF-25 : change to use GridField for showing searched results in stead of TableListField 2012-03-08 20:29:18 +13:00
Ingo Schommer
27d23633ea MINOR Disabled browser autocomplete for batch action select 2012-03-08 01:49:36 +01:00
Julian Seidenberg
13c7c01b95 MINOR: changing order of save and delete buttons so that they are consistent 2012-03-07 16:43:12 +13:00
Ingo Schommer
9bbac335c4 MINOR Merging SecurityAdmin->getEditForm() with RootForm(), in order to have the form fields consistently available (there's no longer a distinction between edit/root) 2012-03-06 01:23:34 +01:00
Hamish Friedlander
28bb83552a API-CHANGE: moving iterator support from ViewableData to SSViewer. New set of unit tests for iterator support functions. 2012-03-06 09:31:55 +13:00
Hamish Friedlander
927dbbe717 API-CHANGE: Global template variables can now be called directly using SSViewer_DataPresenter instead of needing to inherit off ViewableData 2012-03-06 09:11:46 +13:00
Ingo Schommer
6f71186e2c ENHANCEMENT Replaced SecurityAdmin tree view for groups with three top-level tabs: "Users", "Groups" and "Roles" 2012-03-05 18:31:52 +01:00
Ingo Schommer
0117b32fee API CHANGE Removed MemberTableField, use GridField with GridFieldConfig_RelationEditor instead 2012-03-05 17:41:51 +01:00
Ingo Schommer
f9f659672a MINOR Re-instating Member_Validator in SecurityAdmin->RootForm() and Groups->getCMSFields() with new GridField implementation 2012-03-05 17:41:50 +01:00
Ingo Schommer
2abb021efb BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 17:41:49 +01:00
Ingo Schommer
e9a2de35c2 ENHANCEMENT Using GridField to edit roles in SecurityAdmin 2012-03-05 17:41:49 +01:00
Ingo Schommer
ad5cf1ebf1 ENHANCEMENT Using ListboxField/chosen.js to assign roles in Group->getCMSFields(). Improved explanation of groups in the user interface. 2012-03-05 17:41:47 +01:00
Ingo Schommer
02e728fa08 BUGFIX Fixed visibility of admin/myprofile for non-admins by moving it to a new CMSProfileController class and overloaded canView() 2012-03-02 20:46:22 +01:00
Ingo Schommer
3659c63afe MINOR Updated jquery.form.js plugin, and re-added it to standard includes (its handy for clearing out forms, and consistently getting form field values) 2012-03-02 13:42:15 +01:00
Normann Lou
45927b98c4 ENHANCEMENT SSF-53: add customised class to Member's GridField in SecurityAdmin 2012-03-02 16:28:47 +13:00
Ingo Schommer
3ded12e599 MINOR Removed obsolete "add member" button in SecurityAdmin, now handled through GridField (SSF-53) 2012-03-01 21:36:01 +01:00
Ingo Schommer
4bd5333b56 MINOR Editing and relation adding on SecurityAdmin groups (both root and group instances) (SSF-53) 2012-03-01 21:35:48 +01:00
Ingo Schommer
1b600a0b09 MINOR Fixed empty breadcrumbs in AssetAdmin when using non-existent (singleton) record as the "current record" 2012-03-01 00:20:25 +01:00
Ingo Schommer
7d10ff790c MINOR Fixed JS notice/alerts in CMS 2012-02-29 17:15:52 +01:00
Ingo Schommer
af9e46af74 MINOR LeftAndMain->Breadcrumbs() ordering 2012-02-28 18:48:20 +01:00
Ingo Schommer
f67cca321c BUGFIX Using RequestHandler->urlParams rather than HTTPRequest->param() in LeftandMain->currentPageId() in order to avoid the wrong ID being chosen on nested controllers like GridField with their own "ID" parameters in the URL signature 2012-02-28 18:48:02 +01:00
Ingo Schommer
832d410303 MINOR Merge errors 2012-02-28 00:34:15 +01:00
Ingo Schommer
bcc73de85e Merge branch '106-add-edit-records-rc'
Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php
2012-02-27 23:58:10 +01:00
Ingo Schommer
3b53ed1937 MINOR Moved some CMS-specific template config into GridFieldPopupForms, to make the external API easier to use, and make specific configs less dependent on the instanciation context, and more tuned to the actual execution controller context 2012-02-27 23:52:48 +01:00
Ingo Schommer
ba0d1c60cb MINOR Don't require controller on instanciation of GridFieldPopupForms, as it can't be reliably determined e.g. during a getCMSFields() call. Should use existing FormField/Form API to retrieve controller when its required.
MINOR Renamed GridFieldPopupForms->popupFormName to $name to make it clearer that its the component name (which is optional now).
2012-02-27 23:52:48 +01:00
Sam Minnée
61c810a79a Merge pull request #200 from simonwelsh/patch-1
BUGFIX Fallback to sapphire/silverstripe_version if there is no CMS (fra...
2012-02-23 19:14:09 -08:00
Ingo Schommer
30989b598d ENHANCEMENT Added path manipulation lib from jQuery.mobile, using it to ensure all URLs are made absolute (to fix IE issues) 2012-02-23 23:29:59 +01:00
Simon Welsh
df82dac334 BUGFIX Fallback to sapphire/silverstripe_version if there is no CMS (framework only) 2012-02-23 20:46:34 +13:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
Ingo Schommer
ac56fef8b4 MINOR Removed jQuery.metadata usage in CMS, use jQuery.data() and HTML5 data attributes instead. Also fixes errors where jQuery.metadata tries to eval() HTML5 data attrs, which isn't always applicable 2012-02-17 13:35:53 +01:00
Ingo Schommer
5911abc0f6 API CHANGE Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias.
API CHANGE Removed several unsed JavaScript globals: sprintf(), Number.prototype.CURRENCIES, Number.prototype.toCurrency(), String.prototype.ucfirst(), jQuery.fn.clearFields(), jQuery.fn.clearInputs()
MINOR Removed prototype_improvements.js and jquery_improvements.js files, now contained in individual component code (or removed altogether)
2012-02-16 12:27:47 +01:00
Ingo Schommer
a1e9c0f41e ENHANCEMENT CMS panels restructured to use two new types of "tools" templates, fetched through LeftAndMain->Tools() and LeftAndMain->EditFormTools(). Requires less overloading of template markup. 2012-02-15 14:26:45 +01:00
Ingo Schommer
37dfbb6b7e ENHANCEMENT LeftAndMain->Breadcrumbs() 2012-02-14 17:31:32 +01:00
Ingo Schommer
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard
All sapphire but the lang directory
2012-02-12 12:40:16 -08:00
Ingo Schommer
d261f4406a API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:42:21 +01:00
Sam Minnee
2d898cab63 API CHANGE: Added GridFieldExporter, a GridField component that adds export functionality, and added it to the security admin. 2012-01-30 19:49:10 +13:00
Sam Minnee
24850954c1 BUGFIX: Fixed bug in sprintf syntax with GroupImportForm iframe 2012-01-30 19:25:27 +13:00
Stig Lindqvist
dc85fa09b9 MINOR SecurityAdmin::getEditForm should have same signature as LeftAndMain::getEditForm 2012-01-24 02:46:12 +01:00
Stig Lindqvist
ed889529b4 API CHANGE Added two predefined GridFieldConfigs and removal of unsused accessors
- GridFieldConfig_ManyManyEditor for default relationship list managment
- GridFieldConfig_Base for basic list managment
2012-01-24 02:46:12 +01:00
Stig Lindqvist
c396c2d2ae API CHANGE Security admin supports adding, removing and searching for members by relations via gridfield
This contains some experimental API's when using GridFieldPopupForms on GridFieldPopupForms.

- GridFieldRelationAdd
- GridFieldRelationDelete
2012-01-24 02:46:07 +01:00
Jeremy Thomerson
09bb6d404c Use corrected function name from silverstripe-cms project
The CMS project had a function named "SiteTree::prepopuplate_permission_cache" which
should be "SiteTree::prepopulate_permission_cache".  Since another commit corrected
the function name in that project, this project needs to use the new name.
2012-01-23 14:29:55 -05:00
Ingo Schommer
e18698d541 MINOR Wrapping tree title in its own element (mainly to facilitate selectors during testing) 2012-01-22 18:27:57 +01:00
Ingo Schommer
ef514b924e MINOR Fixed SecurityAdmin styling 2012-01-09 10:09:40 +01:00
Ingo Schommer
c6e1937021 MINOR Rotated labels for collapsed panels 2012-01-06 16:58:04 +01:00
Ingo Schommer
a633326c3e ENHANCEMENT Allow Requirements::add_i18n_javascript() to return its files more optimised inclusion, using it in LeftAndMain 2012-01-06 15:34:29 +01:00
Ingo Schommer
850ea4cd7b MINOR Don't combine CMS-related CSS files in LeftAndMain, as it breaks relative image paths 2012-01-06 10:46:27 +01:00
Ingo Schommer
1ec694d0a9 MINOR Moved EditorToolbar() from CMSMain to LeftAndMain (as we don't support loading link forms via ajax) 2012-01-03 23:01:02 +01:00
Ingo Schommer
b4b6e5a2db MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
Ingo Schommer
8dd64bd2ef MINOR Using box-sizing to lay out form fields rather than relying on hacky 90% widths + pixel-based paddings, which makes it impossible to align anything outside of the field container the these elements. Using conditional CSS to disable field padding if box-sizing is not available. Generalized "stacked" form pattern in _form.scss, fixed CMS actions padding to align with fields. 2012-01-03 18:11:21 +01:00
wolfv
2ccda564ca ENHANCEMENT: #6579 Show page status in page tree (pull request #142 from wolfv/sapphire) 2011-12-29 10:35:44 +01:00
Ingo Schommer
7d245c3803 MINOR Reduced unnecessary autoloading 2011-12-23 10:31:35 +01:00
Ingo Schommer
225776389a MINOR Allow overwriting of 'X-Controller' and 'X-Title' HTTP headers in CMS 2011-12-20 17:46:44 +01:00
Ingo Schommer
68a394427d MINOR Fixed usage of FieldSet->insertFirst() in ModelAdmin, no longer present in FieldList 2011-12-18 18:19:28 +01:00
Ingo Schommer
0bfc0bc645 MINOR Cleaning $Content property explicitly for SecurityAdmin->groupimport() iframe 2011-12-18 18:18:44 +01:00
Ingo Schommer
4d28b79c1b MINOR Reduced HTML validation errors in CMS and FieldGroup 2011-12-18 17:00:01 +01:00
Ingo Schommer
e8ecdf66b2 BUGFIX Disabling HTML5 history hash change fallbacks due to infinite loops on changing hash values 2011-12-15 00:48:34 +01:00
Ingo Schommer
f2ec8b0d54 BUGFIX Enforcing TinyMCE textarea call on window.load in addition to entwine/DOMReady to ensure TinyMCE.init() has been called and all plugins are loaded. 2011-12-15 00:48:29 +01:00
Ingo Schommer
a17e1c21c2 MINOR Suppress inline JS validation scripts in CMS (they don't work with ajax-loaded content) 2011-12-14 16:15:32 +01:00
Ingo Schommer
e5b88c6c48 MINOR Documentation 2011-10-29 21:59:21 +02:00
Ingo Schommer
3aafb63821 MINOR Allowing usage of custom *_EditForm templates in base class with LeftAndMain->getEditForm() (was already implemented in subclasses) 2011-10-29 21:56:33 +02:00
Ingo Schommer
7be28d5714 BUGFIX Making LeftAndMain->PreviewLink() an "opt-in", returning false by default to avoid adverse effects from loading unpreviewable items like users or filesystem folders - see CMSMain for sample implementation 2011-10-29 19:12:33 +02:00
Ingo Schommer
96d18efa58 MINOR Replaced calls to deprecated FormField->Name() with getName() 2011-10-29 13:27:11 +02:00
Sam Minnee
e5afa25522 MINOR: Use Deprecation class to indicate deprecated methods in core. 2011-10-29 17:34:31 +13:00
Will Rossiter
01bfdbeb90 MINOR tweaks to SecurityAdmin layout 2011-10-29 15:47:08 +13:00
Will Rossiter
3d77214d91 MINOR remove old stylesheet 2011-10-29 15:47:07 +13:00
Sam Minnée
089c38a5da Merge pull request #73 from stojg/leftandmain
MINOR Fixing the path of the CSS files in LeftAndMain
2011-10-27 20:13:47 -07:00
Stig Lindqvist
e38dd08ea5 MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate 2011-10-28 15:58:55 +13:00
Hamish Friedlander
0a3e0f15de MINOR: Replace references to FieldSet (now deprecated) with references to FieldList 2011-10-28 15:58:55 +13:00
Stig Lindqvist
15ad2d29c3 MINOR Fixing the path of the CSS files in LeftAndMain 2011-10-22 17:04:02 +02:00
Ingo Schommer
2279e9f3b3 MINOR Removed individual Requirements calls in LeftAndMain->init() in favour of Requirements::combine_files(), to avoid duplication and hard to debug behaviour differences due to changed file inclusion orders between non-live and live systems 2011-10-11 09:55:58 +02:00
Ingo Schommer
98b4fe21d9 Merge branch 'candidasa-cms-enhancements' 2011-10-11 09:37:18 +02:00
Julian Seidenberg
b7f9c59e12 ENHANCEMENT: adding hoverIntent plug-in to the js combined_files (SSO-7) 2011-10-11 12:12:46 +13:00
Julian Seidenberg
f807aa01b2 ENHANCEMENT: introducing a flight delay (using the jQuery HoverIntent plug-in) to prevent "sloppy mouse movement" from instantly closing the flyout menu when the mouse leaves the area. Also fixes problem with the menu in IE7. 2011-10-10 14:00:47 +13:00
Ingo Schommer
fa6681f5c5 BUGFIX: Better handling of non-existent records in delete calls (if button is clicked twice) 2011-10-07 14:12:52 +02:00
Will Rossiter
51affd2d63 BUGFIX: update LeftAndMain::handleRequest() to be consistent with Controller::handleRequest() 2011-09-26 16:55:59 +13:00
Will Rossiter
1732a17114 Merged new-orm into datagrid 2011-09-26 16:47:54 +13:00
Will Rossiter
2036354d8d ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain interface 2011-09-19 17:26:01 +02:00
Will Rossiter
60cba7dd76 BUGFIX: fixed submenu not opening in cms-menu when cms loads on page other than edit page section 2011-09-19 17:22:36 +02:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
4461cae31b ENHANCEMENT New CMSPreviewable interface class to standardize metadata making a record previewable by the CMS.
ENHANCEMENT New "preview" and "edit" buttons to toggle between preview and cms views. Reinstated utility links to switch between draft and live preview (based on SilverStripeNavigator) (formerly called "AjaxSwitchView")
2011-08-12 17:05:50 +02:00
Ingo Schommer
dacdade4b0 ENHANCEMENT Removed automatic redirection to admin URLs in ContentController, too counter-intuitive and hard to implement consistently, while still allowing linkage of pages without CMS around them. Use $SilverStripeNavigator in custom Page.ss to link a page to its admin view for logged-in users. 2011-08-12 14:28:44 +02:00
Ingo Schommer
e40d3d45c0 ENHANCEMENT $('.cms-preview').block()/unblock() for blocking preview window when unavailable. Fixed duplicate addition of GET parameters in preview with new jQuery.query library for parameter parsing. 2011-08-12 14:28:22 +02:00
Will Rossiter
9a340e7eb4 ENHANCEMENT: Added Chosen jQuery library for providing styled and searchable dropdowns. BUGFIX: removed explict width on TreeDropdownFields, instead using a width from jQuery. 2011-08-05 15:46:57 +12:00
Will Rossiter
1827c18fe1 BUGFIX: fixed CMSMain menu being displayed on CMSPageController pages. MINOR: added icons for main left hand side. 2011-07-28 16:57:41 +12:00
Ingo Schommer
1dc9457048 MINOR Using LeftAndMain->BaseCSSClasses() instead of ViewableData->CSSClasses() to avoid conflicts with customized controller objects (e.g. ModelAdmin_RecordController->edit()) 2011-07-08 15:36:46 +02:00
Ingo Schommer
b326f03ed7 MINOR Using LeftAndMain->Link() $action parameter correctly in getSiteTreeFor() 2011-07-08 15:36:46 +02:00
Ingo Schommer
d68ec395a3 API CHANGE Using $Link instead of $ApplicationTitle and $SectionTitle in LeftAndMain.ss. Adding new 'X-Title' HTTP header in order to support title changes for history.pushState 2011-07-08 15:36:46 +02:00
Ingo Schommer
2f2096cd3a ENHANCEMENT HTML5 History.pushState support in CMS 2011-07-08 15:36:46 +02:00
Ingo Schommer
ff54044206 API CHANGE Forms in ajax responses from LeftAndMain and subclasses include <form> tags, and replace the form itself on the client (rather than just everything inside the form). Form submissions and loading is handled by its container ('.cms-content') to avoid problems with a DOM element replacing itself upon form submission. 2011-07-08 15:36:46 +02:00
Ingo Schommer
8378a9d561 MINOR Moved "pinging" logic for CMS into new LeftAndMain.Ping.js container 2011-07-08 15:36:44 +02:00
Ingo Schommer
4e0949f565 ENHANCEMENT Consistently wrapping CMS forms in <div class="cms-content">, added LeftAndMain.Content.js to reload panels via ajax, hooking into preview logic 2011-07-08 15:36:44 +02:00
Ingo Schommer
2b56d2a8d8 FEATURE Preview panel to show CMS changes on actual website. Navigating in preview loads new page for editing in CMS. 2011-07-08 15:36:44 +02:00
Ingo Schommer
686f101925 ENHANCEMENT Toggleable panels in CMS 2011-07-08 15:36:43 +02:00
Sam Minnee
878b348a0f Merge branch 'master' into new-orm
Conflicts:
	docs/en/reference/built-in-page-controls.md
	model/SQLQuery.php
2011-05-26 17:08:10 +12:00
Will Rossiter
6956275d2e MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier 2011-05-20 11:29:40 +12:00
Ingo Schommer
cbf191b14c MINOR Temporarily disabled deprecation notice in DataObjectDecorator and LeftAndMainDecorator, to be re-enabled once we're in beta stage (they unnecessarily break too many modules for now 2011-05-19 10:25:15 +12:00
ajshort
1f6f7f0862 API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().
MINOR: Replaced usage of FieldSet with FieldList.
MINOR: Renamed FieldSetTest to FieldListTest.
2011-05-11 17:51:54 +10:00
ajshort
3f132a105b API CHANGE: Replaced DataObjectSet instances with ArrayList. 2011-05-05 20:40:24 +10:00
ajshort
04e5dae22e MINOR: Updated places that expect a DataObjectSet to accept an SS_List instance. 2011-05-02 17:14:05 +10:00
Ingo Schommer
40786cddd3 BUGFIX Allowing 'root' as ID parameter in LeftAndMain->getEditForm() (necessary for AssetAdmin root folders etc.) 2011-05-02 13:24:42 +12:00
Ingo Schommer
71bc87fa1e MINOR Making SiteConfig dependency optional in LeftAndMain->SiteConfig() 2011-05-01 22:30:53 +12:00
Ingo Schommer
9a595fbd25 MINOR Rendering DateField instances with button by default in CMS 2011-05-01 22:30:52 +12:00
Ingo Schommer
f8b38e9adb MINOR Moving _layout.scss include from screen.css into its own file, in order to selectively block layout options like body {overflow: none;} while retaining all other cms styles (useful in a dialog context) 2011-05-01 20:23:07 +12:00
Ingo Schommer
64692ccee6 API CHANGE Removed LeftAndMain->getitem(), use show() instead 2011-05-01 20:23:07 +12:00
ajshort
81c0caaddb API CHANGE: Renamed DataList::filter() and DataQuery::filter() to ::where(). 2011-05-01 15:26:30 +12:00
Sam Minnee
4a061fd071 ENHANCEMENT: Refactored MemberTableList field to make better use of DataList and ManyManyList. Refactored ComplexTableField and TableListField to, stripping out as much model logic as possible. 2011-05-01 15:26:28 +12:00
Sam Minnee
319d2f4952 ENHANCEMENT: Refactored TableListField and subclasses to rely on the DataList to handle data manipulatation.
API CHANGE: A DataList can be passed as the 2nd argument to the constructor; this is the recommended approach for editing non-relations.
API CHANGE: You can't set a custom query; only a custom DataList.
API CHANGE: You can't have one of these fields editing data that doesn't correspond to a DataList - there must be some kind of DataObject behind it.
API CHANGE: If the field's name corresponds to a relation on the object being edited, then the relation is used as the data set - all the source* parameters are ignored.
API CHANGE: relationAutoSetting only works if your form has had the corresponding data object loaded with $form->loadDataFrom().
API CHANGE: relationAutoSetting can't be turned off; attach a non-relation DataList instead.
2011-05-01 15:25:45 +12:00
Sam Minnee
de1494e3a8 ENHANCEMENT: Implemented DataList as the successor of DataObjectSet. DataList doesn't execute the query until it's actually needed, allowing for a more flexible ORM.
API CHANGE: augmentSQL is now passed a DataQuery object from which query parameters can be extracted.
API CHANGE: DataObjectDecorators that manipulate the query can now define augmentDataQueryCreation().
API CHANGE: The container class argument for DataObject::get() is deprecated.
API CHANGE: DataObject::buildSQL() and DataObject::extendedSQL() are deprecated; just use DataObject::get() now.
API CHANGE: DataObject::instance_get() and DataObject::instance_get_one() are deprecated, and can no longer be overloaded.
API CHANGE: DataObject::buildDataObjectSet() is deprecated.
API CHANGE: Cant't call manual manipulation methods on DataList such as insertFirst()
2011-05-01 15:25:45 +12:00
Ingo Schommer
79e0634537 Merge branch 'cms-ui-preparation' 2011-04-28 22:48:02 +12:00
Ingo Schommer
0fd6924fe1 FEATURE Preview changes of page edits in CMS on website (through <iframe> sidebar) 2011-04-28 22:36:28 +12:00
ajshort
3a1c2df4e7 API CHANGE: Renamed DataObjectDecorator to DataExtension.
API CHANGE: Renamed LeftAndMainDecorator to LeftAndMainExtension.
MINOR: Replaced all references to decorators with extension.
2011-04-26 11:01:38 +10:00
Ingo Schommer
43491c2641 MINOR Reducing number of asset downloads by combining files in LeftAndMain->init() and including full jquery.ui.css instead of multiple @import statements 2011-04-25 21:36:51 +12:00
Ingo Schommer
2291d64c2c MINOR Disabled "welcome" message in LeftAndMain->RootForm() 2011-04-24 11:46:56 +12:00
Ingo Schommer
035b68fc32 MINOR Misc style improvements around batch actions and content tools display 2011-04-24 11:46:56 +12:00
Ingo Schommer
2c6e0c277b MINOR Adapted CMS batch actions form to work outside of tabset context 2011-04-24 11:46:55 +12:00
Ingo Schommer
f0f7f8aa75 MINOR Removed unnecessary 'actionsparams' class from LeftAndMain forms 2011-04-24 11:46:55 +12:00
Ingo Schommer
be68450ce1 MINOR Allowing NULL returns from getRecord() in LeftAndMain->getSiteTreeFor() 2011-04-24 11:46:54 +12:00
Ingo Schommer
ecddf5b945 API CHANGE ModelAdmin->ResultsForm() no longer returns a TabSet (was just a layout crutch to support correct sizing) 2011-04-24 11:46:54 +12:00
Ingo Schommer
1a9441ffc8 MINOR Removed jquery.fitheighttoparent from LeftAndMain->init(), handled by layout manager now 2011-04-24 11:46:53 +12:00
Ingo Schommer
0271652aa3 ENHANCEMENT Added default 'delete' action in LeftAndMain->getEditForm() if no other actions are set ('save' action was already present) 2011-04-24 11:46:53 +12:00
Ingo Schommer
3c544340ee MINOR Making canEdit() method optional on objects handled by LeftAndMain subclasses 2011-04-24 11:46:53 +12:00
Ingo Schommer
403d05726d ENHANCEMENT Using new *_Content templates for ModelAdmin and SecurityAdmin 2011-04-24 11:46:52 +12:00
Ingo Schommer
a2b39e55c1 MINOR Removed unnecessary "type" field from LeftAndMain->AddForm(), added generic styles for buttons 2011-04-24 11:46:51 +12:00
Ingo Schommer
f4cb6ae40f MINOR Renamed #sitetree_ul to .cms-tree in templates, removed #sitetree from contained <ul> (unnecessary duplication) 2011-04-24 11:46:51 +12:00
Ingo Schommer
ba4d7099bb ENHANCEMENT Using custom CMSEditForm to render LeftAndMain->EditForm(), in order to place (fake) tab navigation alongside the layout manager areas (outside of actual edit form) 2011-04-24 11:46:49 +12:00
Ingo Schommer
9da43d139a API CHANGE Removed support for CMSTopMenu_alternative template, use CMSMenu.ss in themes or project template folders instead
API CHANGE Renamed LeftAndMain->CMSTopMenu() to CMSMenu()
API CHANGE Renamed LeftAndMain->Left() to Menu(), used through LeftAndMain_Menu.ss templates (instead of LeftAndMain_left.ss) - in order to avoid presentational naming
API CHANGE Renamed LeftAndMain->Right() to Content(), used through LeftAndMain_Content.ss templates (instead of LeftAndMain_right.ss) - in order to avoid presentational naming
2011-04-24 11:46:48 +12:00
Ingo Schommer
8183cc7117 BUGFIX Checking file existence in LeftAndMain->init() for TinyMCE's content_css settings to avoid unnecessary clientside loading of files 2011-04-24 11:46:46 +12:00
Ingo Schommer
b273861591 ENHANCEMENT Implemented new jLayout layout manager, more expressive class names in LeftAndMain.ss 2011-04-24 11:46:46 +12:00
Ingo Schommer
bdd81e5d00 MINOR Renaming CMSMenu entries 2011-04-24 11:44:17 +12:00
Ingo Schommer
dad6169f73 MINOR Using '.cms-edit-form' instead of '#Form_EditForm' selector 2011-04-24 11:44:17 +12:00
Ingo Schommer
fd0c38c175 MINOR Added sapphire/admin/scss folder and started SCSS file architecture 2011-04-24 11:44:16 +12:00
Ingo Schommer
c44deb03ab MINOR Moved existing CSS files from sapphire/admin/css to sapphire/admin/css/_old folder, for later reference. Blocking them from controller inclusion to prepare CMS UI redesign 2011-04-24 11:44:16 +12:00
Ingo Schommer
a423bd4e04 API CHANGE Removed LeftAndMain->setLogo(), use CSS instead 2011-04-24 11:44:16 +12:00
Ingo Schommer
cfaec05141 API CHANGE Removed LeftAndMain->setApplicationName() $logoText parameter, and LeftAndMain->getApplicationLogoText(), overload templates instead 2011-04-24 11:44:16 +12:00
Ingo Schommer
05f0ce3a21 API CHANGE Removed LeftAndMain->setLogo() $logoStyle parameter and LeftAndMain->LogoStyle(), use CSS 2011-04-24 11:44:16 +12:00
Ingo Schommer
e3928a0517 API CHANGE Removed LeftAndMain::set_loading_image() and LoadingImage(), use CSS 2011-04-24 11:44:16 +12:00
Ingo Schommer
11a3b86fef MINOR Removed jQuery.layout implementation 2011-04-24 11:44:16 +12:00
Ingo Schommer
b1f27b40ce MINOR Updated image references in sapphire/ folder to local files, rather than requiring cms/ folder (copied a bunch of images files over for this) 2011-03-29 21:34:26 +13:00
Ingo Schommer
b4affff38d MINOR Removed hard dependency on SiteConfig and VirtualPage in LeftAndMain 2011-03-29 18:20:14 +13:00
Ingo Schommer
a467eda0d2 MINOR Making managed class configurable in CMSBatchAction in order to remove hard dependency to cms module (still defaults to SiteTree) 2011-03-29 18:20:14 +13:00
Ingo Schommer
9d742f02f2 API CHANGE Removed ?debug_firebug GET parameter, and related firebug-lite inclusion in LeftAndMain 2011-03-29 18:08:33 +13:00
Ingo Schommer
519f06219f MINOR Moved EditorToolbar from LeftAndMain to CMSMain 2011-03-29 18:08:33 +13:00
Ingo Schommer
500624fa5b MINOR Removing unnecessary Requirements calls in SecurityAdmin (either already in place through LeftAndMain base class, or included by MemberTableField) 2011-03-29 18:08:33 +13:00
Ingo Schommer
358975ea0c MINOR Conditional checks on SiteConfig existence in LeftAndMain->init() 2011-03-29 18:08:33 +13:00
Ingo Schommer
a73c9ccb3c MINOR Moved CMSBatchAction class to sapphire module, but keeping SiteTree specific subclasses in cms 2011-03-29 18:08:33 +13:00
Ingo Schommer
5f59b3a3c9 MINOR Fixed paths due to file moving into sapphire/admin 2011-03-29 18:08:32 +13:00
Ingo Schommer
a1fb071b2b MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-29 18:07:59 +13:00