Commit Graph

904 Commits

Author SHA1 Message Date
Naomi Guyer
5c6ec68389 BUGFIX: Min-width on html dialog box (fixes #7541) 2012-06-25 17:35:05 +12:00
Naomi Guyer
e51bf760e9 BUGFIX: Insert link styling broken, and inconsistent with Insert media (fixes #7528) 2012-06-25 15:31:39 +12:00
Sam Minnee
7685a0b59d Merge branch '3.0' 2012-06-25 10:01:34 +12:00
Ingo Schommer
ba9c3c7b8e BUGFIX Type checking in CMS URL params (fixes #7187)
Nasty issue where nested requests to sub-controllers within LeftAndMain->EditForm() would fail because of
LeftAndMain->currentPageID() being taken from the URL, even though it was a field action name.
Example: POST /admin/pages/edit/EditForm/field/MyGridField/item/1/ItemEditForm/field/MyUploadField/upload
The current ID would be detected as "field" in this case.
Bug was previously fixed for AssetAdmin.
2012-06-22 17:47:45 +02:00
Ingo Schommer
682a6a0d1b BUGFIX "Insert media" loading indicator (fixes #7542)
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
2012-06-22 10:25:15 +02:00
Naomi Guyer
5713a37a32 BUGFIX: Alignment of http label in insert media 2012-06-22 18:11:00 +12:00
Naomi Guyer
f01c1640c7 BUGFIX: Alignment of http label in insert media 2012-06-22 18:04:13 +12:00
Sam Minnee
4aa4cd2c28 Merge branch '3.0'
Conflicts:
	admin/scss/ie7.scss
2012-06-22 17:20:07 +12:00
Naomi Guyer
cffb95280f BUGFIX: Tab colour htmleditor in IE7 2012-06-22 17:10:52 +12:00
Naomi Guyer
f3933aa3fb BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 17:10:52 +12:00
Naomi Guyer
89bd7ebfba BUGFIX: Tab colour htmleditor in IE7 2012-06-22 16:55:40 +12:00
Naomi Guyer
c2e8c2450d BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 16:23:01 +12:00
Sam Minnée
bafda93957 Merge pull request #563 from silverstripe-rebelalliance/trac/7427-add-responses
BUGFIX: Add batch handler status messages (fixes #7427)
2012-06-21 19:29:41 -07:00
Hamish Friedlander
03469230ff BUGFIX: Add batch handler status messages (fixes #7427)
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
2012-06-22 13:59:08 +12:00
Hamish Friedlander
daa226a9af BUGFIX: Fix trac ticket #7476
We missed making an event delegatable in https://github.com/silverstripe/sapphire/pull/542
the result was 7476 wasnt actually fixed
2012-06-22 10:46:03 +12:00
Hamish Friedlander
65030906ad BUGFIX: Add validation to fix open.silverstripe.org ticket #7494
When adding media via the HtmlEditorField dialog, the value of the URL field wasnt being validated. Youd get different errors depending on if the field was empty
or if it had text, but it didnt look like an absolute URL to HtmlEditorField#viewfile.

This adds some javascript validation to make the text field look like a URL field
2012-06-21 14:19:41 +12:00
Naomi Guyer
d3845380d7 BUGFIX: Padding in navigation elements in IE7
Fixes the gap between navigation elements in IE7
2012-06-21 11:48:39 +12:00
Naomi Guyer
3eff92ad40 ChangedBUG FIX: IE filter buttons (fixes #7501)
* Changed spacing of IE filter buttons

Conflicts:

	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
2012-06-20 14:21:12 +02:00
Ingo Schommer
89ce1ec991 Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters
Conflicts:
	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
2012-06-20 14:13:39 +02:00
Naomi Guyer
42d40a7c1a BUGFIX: Turn off filters on IE Nav icons (fixes #7471)
Set filter to none so that the icons appear correctly in IE7and 8

Conflicts:

	admin/scss/_ieShared.scss
2012-06-20 14:11:08 +02:00
Ingo Schommer
1016c36d33 Merge branch '7471-ie-filter-nav' of https://github.com/adrexia/sapphire into adrexia-7471-ie-filter-nav
Conflicts:
	admin/scss/_ieShared.scss
2012-06-20 14:10:08 +02:00
Naomi Guyer
50ed4f515d BUGFIX: Show text for collapsed side panel in IE8 and 9 (fixes #7469)
Altered IE CSS for CMS-panel to allow the text to display from top to
bottom.
2012-06-20 14:09:05 +02:00
Naomi Guyer
c9cde893b1 BUGFIX: Show text for collapsed side panel in IE8 and 9 (fixes #7469)
Altered IE CSS for CMS-panel to allow the text to display from top to
bottom.
2012-06-20 14:06:21 +02:00
Sean Harvey
c6039ae8d1 BUGFIX When updating the tree from EditForm, ensure we only change the
text of the tree node for the first .text element, instead of the nested
ones.
2012-06-20 22:00:19 +12:00
Sean Harvey
86753baaa1 BUGFIX When updating the tree from EditForm, ensure we only change the
text of the tree node for the first .text element, instead of the nested
ones.
2012-06-20 21:58:23 +12:00
Naomi Guyer
9f41ffd6e1 ChangedBUG FIX: IE filter buttons (fixes #7501)
* Changed spacing of IE filter buttons
2012-06-19 17:52:09 +12:00
Naomi Guyer
c55627ee7c BUGFIX: Turn off filters on IE Nav icons (fixes #7471)
Set filter to none so that the icons appear correctly in IE7and 8
2012-06-18 13:22:01 +12:00
Ingo Schommer
dd99fbc69e BUGFIX Apply batch action node deselection (fixes #7476)
The form ID list was only updated on node checking, but not unchecking.
2012-06-18 00:31:27 +02:00
Hamish Friedlander
c12db51c22 BUGFIX: Fix trac/7485 2012-06-18 10:23:04 +12:00
Ingo Schommer
16527f7fef MINOR Removed old CSS files 2012-06-15 16:24:01 +02:00
Sam Minnée
e3e15e4007 Merge pull request #537 from silverstripe-rebelalliance/trac/7462
BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: ...
2012-06-14 20:45:07 -07:00
Kirk Mayo
f546e0db64 BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: capitialize and display: block to the relevant css 2012-06-15 15:38:29 +12:00
Sean Harvey
c801671a90 BUGFIX #7394: Allow unselect dropdowns in chosen if there's an empty option 2012-06-15 14:32:21 +12:00
Sam Minnée
7ce7ac406e Merge pull request #528 from mango9/master
Ticket #5578
2012-06-14 16:43:20 -07:00
Ingo Schommer
deff232567 MINOR Using onadd in preview JS 2012-06-15 01:19:31 +02:00
Hamish Friedlander
acee026875 BUGFIX: Buttons in the cms that didnt have .ss-ui-button werent becoming buttons because we changed buttons to trigger on onadd, but the ss-ui-button class was being added dynamically 2012-06-15 01:19:31 +02:00
Ingo Schommer
2fa835a027 MINOR Moving edit form focus logic from onadd() to onmatch() to give the form time to become visible (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
ecb48bb57c BUGFIX Force full window reload on IE7/IE8 every 20 pushState requests (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
5260738148 MINOR Avoid reinitialising tabs (see #7258) 2012-06-15 01:19:19 +02:00
Ingo Schommer
980686ab75 MINOR Limiting console.log() output to explicit enabling through window.debug to avoid failing IE 2012-06-15 01:19:19 +02:00
Hamish Friedlander
21e7ec61f4 ENHANCEMENT: In dev mode, include some basic leak detection functions in the admin panel 2012-06-15 01:19:19 +02:00
Hamish Friedlander
b86a787521 BUGFIX: Use new jQuery.Entwine event capturing, onadd and onremove features to plug some memory leaks 2012-06-15 01:19:15 +02:00
Ingo Schommer
04e5ff09ca MINOR Hiding CMS-specific badges in TreeDropdownField (fixes #7456) 2012-06-14 20:43:29 +02:00
Ingo Schommer
c81d0e1222 MINOR Only set X-Pjax header in redirections if it doesn't already exist in the response 2012-06-14 20:20:29 +02:00
Paul Meyrick
882b4267cb BUGFIX: Ticket #5578 SiteTree->CanCreateTopLevel() doesn't change dragged tree nodes or ParentID changes 2012-06-14 17:17:27 +12:00
Ingo Schommer
e23a7585a7 MINOR Using new jQuery.changetracker.destroy method in LeftAndMain.EditForm.js 2012-06-13 23:16:13 +02:00
Ingo Schommer
0b6d45356e MINOR Added destroy() method to jQuery.changetracker plugin 2012-06-13 23:16:09 +02:00
Ingo Schommer
4c0a0f95b0 BUGFIX Inlining TinyMCE HTML popup (fixes #7451)
Doesn't include base TinyMCE logic when used externally,
most likely a TinyMCE bug since the source_editor.html file is unmodified.
2012-06-13 14:39:50 +02:00
Ingo Schommer
9cdc787935 Merge branch 'stylingfixes' of https://github.com/ajshort/sapphire into ajshort-stylingfixes 2012-06-13 13:23:24 +02:00
Ingo Schommer
db076c0f02 MINOR Using new setDescription() styling in HtmlEditorField 2012-06-13 13:21:41 +02:00
Andrew Short
d9c7bb8eb9 ENHANCEMENT: Implemented help text for form fields.
The title attribute is extracted from form fields and displayed inline
below the field.
2012-06-13 13:19:12 +02:00
Ingo Schommer
43483090b4 Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into ajshort-tabstyling 2012-06-13 10:37:59 +02:00
Andrew Short
160d516699 BUGFIX: Consistently style custom defined page icons.
* Apply page icon styling to .page-icon, rather than specific elements.
2012-06-13 18:22:43 +10:00
Andrew Short
86bb491f2a MINOR: Consistently style tabs in various CMS interfaces. 2012-06-13 15:10:48 +10:00
Andrew Short
aa67b56b10 ENHANCEMENT: Refactored ToggleCompositeField.
* Use jquery ui accordion for the field, and implemented an admin theme.
* Made the setting of configuration consistent with other form fields.
* ToggleComposteField->startClosed() has been deprecated in favour of
  setStartClosed().
* Removed public access to the heading level, instead use getHeadingLevel()
  or setHeadingLevel().
2012-06-13 14:20:27 +10:00
Andrew Short
513737097b MINOR: Fixed tab border being shown when tabs were hidden. 2012-06-13 13:46:00 +10:00
Ingo Schommer
ce3d48e310 MINOR Supressed dependencies of tree logic on SiteTree elements (not properly isolated to work well with Folder objects) 2012-06-13 00:51:53 +02:00
Ingo Schommer
b1d95cffac BUGFIX Passing existing SS_HTTPResponse to PjaxResponseNegotiator in LeftAndMain so state like X-Status HTTP headers are retained (fixes #7427) 2012-06-13 00:27:03 +02:00
Ingo Schommer
9b3d3123b6 Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into ajshort-tabstyling 2012-06-12 19:40:21 +02:00
Ingo Schommer
896d198890 BUGFIX Correct DOM structure on updating tree nodes from edit forms, adding badge classes to force strike-through styling on deleted nodes (see #7410) 2012-06-12 19:16:34 +02:00
Ingo Schommer
2637969bcd API CHANGE Renamed JS event from 'reloadeditform' on 'aftersubmitform', 'beforesave' to 'beforesubmitform'. Listening to bubbled event on container to avoid binding to forms which are removed before the event is triggered. 2012-06-12 17:13:36 +02:00
Andrew Short
8976c82a35 MINOR: Fixed nested tab styling.
* Added and styled border below nested tabs.
* Fixed duplicate nested tabset divs being created.
2012-06-13 00:43:04 +10:00
Ingo Schommer
ed9c856442 ENHANCEMENT Strikethrough styling for deleted tree nodes, adding status classes to tree node <li> in addition to the existing <span class="badge"> (fixes #7410) 2012-06-12 15:53:38 +02:00
Ingo Schommer
d95e9a06b3 Merge pull request #518 from ajshort/jsfixes
BUGFIX: Fixed incorrect variables breaking form submission.
2012-06-11 06:33:27 -07:00
Andrew Short
34eb1b39dd BUGFIX: Fixed incorrect variables breaking form submission. 2012-06-11 23:31:02 +10:00
Naomi Guyer
e96ca5fb9a ENHANCEMENT: Change media insertion to use button and apply design
Conflicts:

	css/UploadField.css
	scss/UploadField.scss
2012-06-11 10:54:48 +02:00
Ingo Schommer
9009d43f63 MINOR Moved "insert x" dialog styling from generic UploadField.scss to CMS-specific _style.scss 2012-06-11 10:51:47 +02:00
Paul Clarke
3ada9a9327 ENHANCEMENT Basic css spacing issues
Ticket #7446 Minor css spacing fixs: padding on grid filter, filter
panel, page actions box-shadow to remove
2012-06-11 16:02:33 +12:00
Naomi Guyer
7523f98e04 BUGFIXES: File Uploads
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
2012-06-08 18:40:33 +02:00
Will Rossiter
f3b91618fb Merge pull request #509 from Zauberfisch/patch-2
MINOR: fixed opera vendor prefix for @mixin hide-text-overflow
2012-06-07 00:37:55 -07:00
Sam Minnee
267f41bdf4 ENHANCEMENT: Point userhelp link at a new userhelp instance. (#7430) 2012-06-07 13:46:47 +12:00
Ingo Schommer
d4baf2d19d BUGFIX Stability improvements on CMS layout logic
- Changed application order
- Fixed layout trigger after preview toggle
- Replaced button row dimension approximation with double application of jQuery.layout() - once before sizing the action panel height to set correct width on container, then again for the height
2012-06-06 21:05:36 +02:00
Ingo Schommer
803aa6bfc5 MINOR Only applying box-shadow on inactive tabs 2012-06-06 21:05:35 +02:00
Ingo Schommer
415a680802 BUGFIX CMS Breadcrumbs and tabs as inline blocks which can span multiple lines, rather than being cropped off (fixes #6882) 2012-06-06 21:05:33 +02:00
Zauberfisch
eac70b6b5b MINOR: fixed opera vendor prefix for @mixin hide-text-overflow 2012-06-06 15:30:19 +02:00
Ingo Schommer
b3164eb2a9 MINOR Disabled jQuery.entwine inspector in dev mode, as it causes side effects due to document.write() before other scripts are loaded 2012-06-06 11:49:32 +02:00
Ingo Schommer
12f2e1e176 Merge branch 'pjax-multiple' 2012-06-05 14:01:18 +02:00
Ingo Schommer
f794e98d7e BUGFIX Moved localised JS messages in correct module (fixes #7393) 2012-06-04 11:52:31 +02:00
Ingo Schommer
69d3497497 MINOR Fixed node deselection when changing areas (e.g. "pages" to "edit page") 2012-06-04 11:05:05 +02:00
Ingo Schommer
a757c16411 MINOR Make tree loading indicator visible on page icon to ensure it shows when drag handles are hidden (in "sidebar view") (fixes #7256) 2012-06-03 23:30:56 +02:00
Ingo Schommer
8e89396c93 MINOR Updating compass sprites with its changed ordering starting with 0.12 release (see http://compass-style.org/blog/2012/02/01/compass-0-12-is-released/) 2012-06-03 23:22:29 +02:00
Ingo Schommer
31a66e0424 MINOR Returning at least some error feedback when admin/* route isn't found (fixes #7409) 2012-06-03 22:46:16 +02:00
Ingo Schommer
c18c29f464 BUGFIX Updating tree state (after adding/renaming nodes, changing parent). Deselecting nodes when switching to edit view (fixes #7389, #7336, #7309) 2012-06-03 18:48:47 +02:00
Ingo Schommer
460148c12a MINOR Debug messages for tracking down JS layout sequence issues (disabled by default) 2012-06-02 12:31:55 +02:00
Ingo Schommer
5a93ee77f8 MINOR Fixed tab selection state 2012-05-30 16:36:26 +02:00
Ingo Schommer
0eac6ea5c3 MINOR Apply loading indicators to all forms, not just .cms-edit-form (which means it includes the "pages list view"). Move to correct place in LeftAndMain.js (not specific to '.cms-content') 2012-05-30 16:36:25 +02:00
Ingo Schommer
19bfd01a60 ENHANCEMENT Declare a single DOM element with multiple Pjax fragments. Unified ajax response handling in CMS, followup from submitForm() refactoring. Removed replacement of arbitrary CSS selectors through Pjax, relies on a fragment now (to keep logic consistent). 2012-05-30 16:36:23 +02:00
Ingo Schommer
75e51de9ed API CHANGE Moved submitForm() from $('.cms-content') to $('.cms-container'), unifying ajax response handling between panel loading and form submission 2012-05-30 15:07:14 +02:00
Ingo Schommer
5178954311 UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts 2012-05-30 15:07:13 +02:00
Sam Minnee
73b9f93c08 BUGFIX: Improved layout of moneyfield. 2012-05-30 11:47:48 +12:00
Ingo Schommer
5b03f49245 BUGFIX Respecting server-overrides on X-Pjax responses during ajax redirects. Fixes GridFieldDetailForm redirect after delete, e.g. in ModelAdmin. Partially reverts 8b4b896. Closes pull request #488 2012-05-29 11:34:47 +02:00
Sean Harvey
c3eabffcb9 MINOR Use shorthand {class}::get() syntax instead of DataList::create()
in core code.
2012-05-28 21:13:42 +12:00
Sean Harvey
e3dee85635 MINOR Fix broken test 2012-05-28 12:03:13 +12:00
Sam Minnée
f80091f16a Merge pull request #492 from ajshort/multisites
Fix ModelAdmin When Managed Models Is Array
2012-05-27 16:53:28 -07:00
Naomi Guyer
9a7980e357 ENHANCEMENT: Design fixes in insert media pop-up
* Apply design to insert media/image pop-up
2012-05-28 11:50:34 +12:00
Naomi Guyer
28e43bdc88 ENHANCEMENT: File/Image UI fixes
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
2012-05-28 11:50:34 +12:00
Sean Harvey
79680137b1 BUGFIX SecurityAdmin shows incorrect breadcrumbs for viewing Roles GridField. Partially reverts 16982ba17c. 2012-05-28 11:46:25 +12:00
Sean Harvey
74d444cf2f BUGFIX Ensure "Add [modelClass]" is shown instead of using the field name of the GridField, partially reverts 16982ba17c which broke breadcrumbs in SecurityAdmin 2012-05-28 11:43:47 +12:00
Andrew Short
b7ce610933 BUGFIX: Fixed ModelAdmin not working when managed models was defined as an array. 2012-05-27 21:45:42 +10:00
Ingo Schommer
fb7cd328cf MINOR Fixed field naming in SecurityAdminTest (recently changed alongside new GridFieldAddButton commit) 2012-05-25 00:02:23 +02:00