Commit Graph

1536 Commits

Author SHA1 Message Date
Sam Minnée
34287895ef Merge pull request #2099 from chillu/pulls/insert-media-tweaks
Various "Insert Media" dialog tweaks
2013-06-18 21:32:00 -07:00
Ryan O'Hara
36d9563da8 FIX make sure select dropdowns in add page dialog aren't cut off due to .parent-mode class having overflow:auto 2013-06-19 11:27:22 +12:00
Sam Minnée
8bf4d417c6 Merge pull request #2094 from chillu/pulls/dialog-sizing
Min/max constraints for CMS dialog
2013-06-18 14:56:41 -07:00
Sean Harvey
726e4c313e Merge pull request #2084 from chillu/pulls/cmsform
Handle ValidationException on CMS forms
2013-06-18 14:41:51 -07:00
Ingo Schommer
04c337dc82 Tab breadcrumbs floating (regression from #1778) 2013-06-17 01:26:04 +02:00
Ingo Schommer
939773643a Accessibility: Open main tabs by keyboard focus
Regression caused by jQuery UI 1.9 upgrae
2013-06-15 12:23:51 +02:00
Ingo Schommer
ad28a3adc2 Updated browser warning in CMS JS 2013-06-15 11:58:35 +02:00
Ingo Schommer
9e4a7c835f Accessibility: Visible focus rings 2013-06-15 11:52:02 +02:00
Ingo Schommer
5b651e4593 Only clear tab entries from window.sessionStorage 2013-06-15 11:16:11 +02:00
Ingo Schommer
be62c731f5 Compressed layout in "Insert Media" detail screen
- Same font size as other CMS UI
 - Smaller thumbnail height
 - Less label width and padding for file info
2013-06-15 10:13:45 +02:00
Ingo Schommer
6338b0b2d9 Reduced line height for form field help text 2013-06-15 10:13:45 +02:00
Ingo Schommer
4bc2f9bc0d Localization-resilient SCSS selector (fixes #1590) 2013-06-15 10:13:45 +02:00
Ingo Schommer
071f30ded7 Consistent dropdown styles between chosen.js and treedropdown
Removed trigger background. Incidentally this also makes it less
obvious that the trigger has too much padding on the right
(which I can't figure out ...)
2013-06-15 10:13:45 +02:00
Ingo Schommer
ea4f8cec07 Tighten "Insert Media" dialog layout
Reduce space usage to fit into typical dialog dimensions without scrolling
2013-06-15 10:13:44 +02:00
Ingo Schommer
1bd31c84f2 Reduced URL field width in "Insert Media" to avoid wrap
450px width are often not available to the dialog (with all margins/paddings subtracted from the window).
Ensure the URL doesn't cause an unnecessary wrap. Ideally we can size this to the dialog width
automatically of course.
2013-06-15 10:13:44 +02:00
Ingo Schommer
10a558c882 Hide "delete" button in "Insert Media" dialog 2013-06-15 10:13:44 +02:00
Ingo Schommer
3f295adbdd .field.noborder style, use it in "Insert Media" dialog 2013-06-15 10:13:43 +02:00
Will Rossiter
acf42e87c2 Merge pull request #2090 from chillu/pulls/tabs-float
Fixed Tab floating in CMS (fixes #1778)
2013-06-14 00:00:53 -07:00
Ingo Schommer
9f600ada2c Min/max constraints for CMS dialog 2013-06-13 20:03:16 +02:00
Ingo Schommer
3b40711b98 BUG Resize infinite loops in IE8 (fixes #575)
IE8 gets a bit confused and fires resize events
when element dimensions in the DOM are changed
as a result of a resize event, causing an infinite loop.
Apart from artificially throttling the event, the only solution
I've found is to check for actual window dimension changes.
http://stackoverflow.com/questions/12366315/window-resize-event-continually-fires-in-ie7?lq=1

This implicitly fixes an issue where TreeDropdownField panel isn't
accessible in the "Insert Media" popup, because the resize event happes
to be triggered by the popup overlay, and in effect closes the drop down
panel right after opening it.

Relating to the jQuery UI component, there's a host of issues and discussions around this, but no solution…
http://bugs.jquery.com/ticket/4097
http://bugs.jqueryui.com/ticket/4758
http://bugs.jqueryui.com/ticket/4065
http://bugs.jqueryui.com/ticket/7514
http://bugs.jqueryui.com/ticket/8881
https://groups.google.com/forum/?fromgroups#!topic/jquery-ui/fDSvwAKL6Go
http://www.mail-archive.com/jquery-ui@googlegroups.com/msg04839.html
2013-06-13 17:37:25 +02:00
Ingo Schommer
5ff69b98ab LeftAndMain.js: Fix 'X-Reload' for IE10 (fixes #647) 2013-06-13 15:17:14 +02:00
Ingo Schommer
d42cbdd613 Removed "Last visited" from admin/myprofile (fixes #648)
It doesn't make any sense in this context
2013-06-13 15:01:23 +02:00
Ingo Schommer
bfff11eb9c API New CMSForm class to allow validation responses in CMS (fixes #1777)
Thanks to @willmorgan for getting this discussion started
(see https://github.com/silverstripe/sapphire/pull/1814).
2013-06-13 07:51:05 +02:00
Robert Curry
6ca27cd257 Always load preview when in preview mode, not in edit mode 2013-06-13 07:45:05 +02:00
Robert Curry
a365759a0d Always load preview when in preview mode, not in edit mode 2013-06-13 11:31:57 +12:00
Ingo Schommer
65209a0ed5 AssetAdmin reset button and chosen.js (fixes #1640)
See https://github.com/harvesthq/chosen/issues/215
2013-06-13 00:45:59 +02:00
Ingo Schommer
98f8191dff Fixed Tab floating in CMS (fixes #1778)
Removed inline-block from header elements which seems
to cause the issues of tabs stacking on top of each other.
Replaced header background to work on multiline scenarios
Added bottom margin to breadcrumbs so they don't look cramped
when tabs are floated below them.

See https://github.com/silverstripe/silverstripe-framework/pull/1863,
https://github.com/silverstripe/silverstripe-framework/issues/1943,
https://groups.google.com/forum/?fromgroups#!topic/silverstripe-dev/c-W-ZxDlDuA,
http://open.silverstripe.org/ticket/6882
2013-06-13 00:04:56 +02:00
Will Rossiter
358988e9c6 Merge pull request #2059 from adrexia/batch-actions
Batch actions styling
2013-06-03 19:14:13 -07:00
Will Rossiter
cc7a6eeaed Merge pull request #2060 from adrexia/preview
Preview Background styling
2013-06-03 19:00:02 -07:00
Naomi Guyer
aaa8bf0029 Preview Background styling
* Added background color to preview for sites that don't have a
background color (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/7750c8f75fc4a
764b384c6e19dbe543c4811cdcb)
2013-06-04 12:57:09 +12:00
Naomi Guyer
91605ca8ad Batch actions styling
* Removed cog icon (usually associated with settings), and tidied up
padding (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/b09cd5f7f8e73
4df1f7ca0d387a5b97a03a3b604)
2013-06-04 12:48:51 +12:00
Naomi Guyer
01e7bfb350 Filter notice styling and panel adjustments
* Based on @clarkepaul's commit here:
https://github.com/silverstripe-droptables/sapphire/commit/e5de6c06489f3
449ee8131bf4ee2a4e1b2380bee
* Kept margin adjustments, but avoided implementing tab changes, as
tabs have chnaged a lot since original commit
2013-06-04 12:11:05 +12:00
Ingo Schommer
e137d9e2f0 Merge pull request #2039 from g4b0/sitetree-edit-disabled
BUG: fixed "regression" adding a new class to SiteTree elem (edit-disabled)
2013-06-03 04:46:48 -07:00
Will Rossiter
db85f3ca16 FIX extra_requirements to accept non associative arrays.
Added unit tests for extra_requirements_js and extra_requirements_css.

Fixed YAML documentation to indicate list syntax.
2013-06-02 13:37:34 +12:00
Ingo Schommer
5a1d476e8d Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr 2013-05-31 19:27:19 +02:00
Sam Minnee
4548b67538 NEW: Add LeftAndMain.session_keepalive_ping config option.
The Session-keepalive ping that is built into LeftAndMain (i.e. all of the CMS admin) can now be
turned off.  The main reason you would want to do this is if you have enabled Session.timeout,
and you want users to be locked out of the CMS after a period.
2013-05-31 16:27:30 +12:00
g4b0
7bcaf90e2a BUG: fixed "regression" inserted with 9281ebc64764a58f86f685f9765e1d8b60995e5a adding a new class to SiteTree elem (edit-disabled) 2013-05-30 17:09:34 +02:00
Sam Minnee
f1e567eb93 NEW: More helpful message for 'sake dev/build' on new envs.
This change alters the no-db message on cli execution to give a bit more of a helpful set-up instruction.
The main motivation for this is so that composer can be set to run dev/build on post-install and post-update.

With that feature added, this will ensure that users installing with composer create-project won't be left
in the dark.

An improvement on this would be a shell script that interactively asked for details to populate this file
with, but one step at a time.
2013-05-30 16:49:43 +12:00
Sean Harvey
a29c51d2db Merge pull request #2032 from phptek/bug/revert-9741d1
BUGFIX: Removed regression introduced in 9741d1.
2013-05-29 21:13:22 -07:00
Russell Michell
b154c0f0e7 BUGFIX: Removed regression introduced in 9741d1. With the former in place, CMS authors can no longer perform batch publish actions 2013-05-30 16:05:56 +12:00
Ingo Schommer
bd918915e2 Merge pull request #2023 from g4b0/left-and-main-classes
BUG: correct handling of multiple classes
2013-05-29 07:23:26 -07:00
Loz Calver
9be5f07231 Fixes for LeftAndMain::require_themed_css()
LeftAndMain::require_themed_css() was setting an incorrect property, and a typo meant that those requirements would never be detected anyway
2013-05-28 15:48:23 +01:00
g4b0
9fc58feb03 BUG: correct handling of multiple classes 2013-05-28 16:25:25 +02:00
Mateusz Uzdowski
37d6871c15 Add explicit extension trigger to preview iframe updates. 2013-05-26 12:51:25 +12:00
Will Rossiter
831a507c90 FIX: Update references to ID values from 79c9433 2013-05-26 11:11:55 +12:00
Will Rossiter
e1ce3e15d8 PHPDoc updates 2013-05-26 11:11:54 +12:00
Ingo Schommer
67d1327b90 Avoid collision of status flags in tree items when updating tree nodes
Fixes silverstripe/silverstripe-cms#445
See https://github.com/silverstripe/silverstripe-framework/pull/1996
Thanks to Jean-Fabien for getting this started
2013-05-25 11:27:50 +02:00
Will Rossiter
9273df15ff Merge pull request #2003 from edlinklater/641-insert_link_styling
Formatting tweaks, fixes silverstripe/silverstripe-cms#641
2013-05-24 23:00:05 -07:00
Will Rossiter
d31fa7eb1b Merge pull request #2004 from adrexia/logout-button
Replace logout button with a more commonly used symbol
2013-05-24 21:57:36 -07:00
Naomi Guyer
c445997f32 Replace logout button with a more commonly used symbol
* Power icon swapped for door icon
* Minor hover/focus opacity effect added to button
2013-05-25 16:45:49 +12:00
Ed Linklater
98ba6b331c Formatting tweaks, fixes silverstripe/silverstripe-cms#641 2013-05-25 15:54:49 +12:00
Sam Minnée
eedcacb256 Merge pull request #2000 from wilr/1640
FIX: IE8 does not bubble reset form events (Fixes #1640)
2013-05-24 19:51:20 -07:00
Sam Minnée
370a07aef2 Merge pull request #1978 from kinglozzer/1783-uninitialised-tabs
FIX: Attempting to select uninitialised tab on validation error (fixes #1783)
2013-05-24 19:46:40 -07:00
Will Rossiter
d540c443bc FIX: IE8 does not bubble reset form events. Use click handler for reset button. (Fixes #1640) 2013-05-25 14:12:44 +12:00
Naomi Guyer
be5eaf1353 BUG: Fix alignment of media button 2013-05-25 13:40:37 +12:00
Russell Michell
9741d1f63b BUGFIX: Pages set as 'deletedindraft' were allowed to be published through CMS batch-actions leaving an empty title in the SiteTree. 2013-05-24 15:40:46 +12:00
Loz Calver
c8725d1c93 Attempting to select uninitialised tab on validation error (fixes #1783) 2013-05-23 16:01:27 +01:00
Ingo Schommer
30b53e65fe API Full-width HTMLEditorField by default 2013-05-22 16:15:16 +02:00
Ingo Schommer
9bda0b7c54 Merge pull request #1965 from kinglozzer/1958-stacked-field-descriptions
FIX: Remove left margin on stacked form field descriptions (fixes #1958)
2013-05-21 08:05:45 -07:00
Will Rossiter
ddcfcf7bed Update @package, @subpackage labels
Cleanup of framework's use of @package and @subpackage labels and additional of labels for classes missing packages.

Moved all GridField related components to the one name.

Countless spelling fixes, grammar for other comments.

Link ClassName references in file headers.
2013-05-21 22:24:41 +12:00
Loz Calver
55a4fb40a6 FIX: Remove left margin on stacked form field descriptions (fixes #1958) 2013-05-21 09:52:45 +01:00
Mateusz Uzdowski
b480886cab BUG All tabs are in open state when changing the name of a folder.
Submitting the form via AJAX changes the DOM controlled by the tabs
widget, it needs to be notified about the change.
2013-05-16 11:15:03 +12:00
Sean Harvey
33be390db8 Put back cog icon for multi-select batch actions (was removed in f4b080e) 2013-05-15 21:09:19 +12:00
Will Rossiter
8b073c1cad FIX: allow cite elements in TinyMCE 2013-05-11 23:20:00 +12:00
Ingo Schommer
e5d3a1da6b Disable ContentNegotiator in CMS (fixes #1850) 2013-05-08 23:45:53 +02:00
Loz Calver
c53b61c347 Fix broken CMSSettings saving
Regression from da7e515d13
2013-04-11 17:25:15 +01:00
Damian Mooyman
9da57b083a BUG Fixed broken ErrorPage icons in CMS view 2013-04-10 17:15:42 +12:00
Sean Harvey
97b1f8616f Merge pull request #1739 from kinglozzer/leftandmain-uninitialized-tabs
FIX: Edge case attempting to destroy uninitialized tabs
2013-04-09 14:08:12 -07:00
Ingo Schommer
9456b8043c Fixed "insert media" styling (regression from 27b0cda0) 2013-04-09 14:47:10 +02:00
Ingo Schommer
310bc8d09c Better default icon for ModelAdmin
Cogwheels doesn't really communicate its meaning well...
New icon is from http://thenounproject.com/noun/database/#icon-No6001,
doesn't require permanent attribution (CC0)
2013-04-09 13:43:32 +02:00
Loz Calver
975c6992df FIX: Edge case attempting to destroy uninitialized tabs
Another edge case very similar to
https://github.com/silverstripe/sapphire/commit/07fb7563273fa82bd93eb255
70571c0a298198e5
2013-04-09 11:21:54 +01:00
Ingo Schommer
17362f9474 Showing "Help" menu item below "Settings" 2013-04-09 12:20:20 +02:00
Ingo Schommer
7d600f57d5 CMSMenu sort order (fixes #1716)
Regression caused by b645703eb9
2013-04-09 12:19:33 +02:00
Sam Minnee
e6d8280296 Removed notice-level erorr in CMS page list. 2013-04-09 11:42:30 +12:00
Ingo Schommer
01f46d039f NEW Enforce max node counts to avoid excessive resource usage
Rendering potentially 1000s of nodes can exceed the CPU and memory constraints
of a normal PHP process, as well as the rendering capabilities of browsers.
Set a hard maximum for the renderable nodes, deferring to a "show as list" action
in the main CMS tree. For TreeDropdownField, we don't have the list fallback option,
so ask the user to search for the node title instead.

Also makes both the "node_threshold_total" and "node_threshold_leaf" values configurable
2013-04-09 10:24:18 +12:00
Will Rossiter
d94a6a5407 Polish add page screen. Disable styles and fix SelectionField 2013-04-08 19:54:46 +12:00
Ingo Schommer
828ac7fe4f API Replaced SSViewer.custom_theme with SSViewer.theme_enabled
Since we can't influence the setting of configuration values,
we also can't set/unset the 'custom_theme' value based on which
theme is set. This means the 'custom_theme' value goes stale,
and we can't rely on it e.g. in FilesystemPublisher.

The 'theme_enabled' toggle is a cleaner solution to the same problem,
since the 'custom_theme' was really just a way to remember the original
theme, while still disabling it. The toggle makes this more explicit,
but also requires users of the 'theme' setting to check for it.
2013-04-07 23:59:10 +02:00
Ingo Schommer
1dda9ae45f Fixed extra_requirements docs 2013-04-05 15:35:30 +02:00
g4b0
f033321adc Solved json obj to array issue 2013-03-28 22:06:37 +01:00
Andrew Short
10f46ba08e Include padding on padded edit form panels inside a tabset 2013-03-29 02:23:43 +11:00
Ingo Schommer
ace7c04b9e Merge pull request #1345 from ajshort/pulls/modeladmin-tabs
FIX: Set ModelAdmin tab targets to avoid creating new panels
2013-03-28 07:56:17 -07:00
Andrew Short
f2b4b95350 FIX: Set ModelAdmin tab targets to avoid creating new panels 2013-03-29 01:41:31 +11:00
g4b0
93428bd8f2 Solved json obj to array issue 2013-03-28 14:52:13 +01:00
Ingo Schommer
3c30c36b71 Fixed help_link config usage 2013-03-27 21:48:55 +01:00
Ingo Schommer
3f2b6a518f FIX Don't silently unset ParentID in "add page" dialog
Happened when changing the page type, because the "selectedNode"
property isn't set in all cases
2013-03-25 23:40:35 +01:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Daniel Hensby
a03d1e66ca BUG CMS messages touch the bottom of the inputs
making spacing even: http://screencast.com/t/oYHnG1Bj
2013-03-20 13:50:10 +01:00
Ingo Schommer
74014650ed Merge pull request #1205 from UndefinedOffset/3.0
BUG Fixed issue with cms help toggles not functioning correctly
2013-03-20 05:47:05 -07:00
Ingo Schommer
2debbd37dc Updated history.js dependency 2013-03-20 00:46:32 +01:00
Ingo Schommer
53c84ee1fe Merge remote-tracking branch 'origin/3.0' into 3.1 2013-03-19 14:04:29 +01:00
Ingo Schommer
52ffb307a7 Fixed ValidationException handling in LeftAndMain
getResult() isn't always available, and has the same content
as the native Exception->getMessage() anyway
2013-03-19 14:02:28 +01:00
Andrew Short
b8a51c3792 Merge branch '3.0' into 3.1 2013-03-19 22:27:09 +11:00
Ingo Schommer
dd6f33ab37 FIX Respect tree node limits, fix search result node display
- Renamed $minNodeCount to more accurate $nodeCountThreshold
- The $minNodeCount attribute wasn't properly respected
during actual querying, so SilverStripe would always traverse
the entire tree (and load all objects into memory),
before then marking nodes as "unexpanded", which prevents
them from actually being rendered.
- Fixes nodes on search results to be expanded by default
- Fixes nodes on search results to correctly ajax-expand
2013-03-19 00:05:14 +01:00
Ingo Schommer
b2552f885b Merge pull request #1288 from chillu/pulls/tab-state-overrides
Tab state overrides
2013-03-18 04:12:05 -07:00
Andrew Short
6ae931df24 Merge branch '3.0' into 3.1 2013-03-15 21:47:23 +11:00
Ingo Schommer
8ece47ad55 Merge pull request #1290 from patbolo/ticket/8322
FIX #8322 Use POST instead of GET when using LeftAndMain::savetreenode s...
2013-03-14 16:38:26 -07:00
jean
412f58b559 FIX #8322 Use POST instead of GET when using LeftAndMain::savetreenode so large site trees can be reorganised as well 2013-03-15 10:16:33 +13:00
Ingo Schommer
da7e515d13 Tab state overrides by class or HTML5 history state
Necessary to switch from tree view to list view programmatically,
which reloads the whole tabset and needs to enable the "list" tab.
Used for the new "Show list as children" functionality in the cms.
2013-03-14 17:28:53 +01:00
Ingo Schommer
746904ca7d FIX Respect previous tab choices in CMS on load
Previously only worked on ajax interactions.
This makes it much easier to default the CMS to
the "list view" rather than "tree view".
2013-03-14 16:22:32 +01:00
James Cocker
7e575481c7 CMS CSS Minor Polishing Tweaks
Fixed what I believe to be a few very minor CSS regressions, that appeared after the CSS restructure for the side-by-side preview.

- Reverted background of the right panel (and tab active state) to the slightly darker shade (as per 3.0) to keep each of the 3 panels visually separate.

- Slightly increased padding on ui-tabs-panel as felt a but too close for comfort. Had decreased since 3.0.

- Decreased padding for logged in user name in menu, felt too excessive. (3.0 was neater)

- Evened out padding above buttons in site tree sidebar

Screenshots showing changes:
3.0: http://spdr.me/xauh
3.1 before commit: http://spdr.me/jkIe
3.1 after commit: http://spdr.me/IxtB
2013-03-14 09:41:38 +01:00
Ingo Schommer
b81f39aee5 API Handle uncaught ValidationException on CMS controller execution
This removes the need for a lot of boilerplate code
around DataObject->write() logic, and avoids generic 500 errors
on user-level failures. This should really be a per-project choice,
but at the moment request handling doesn't allow to configure
custom exception handling.
2013-03-08 12:55:30 +01:00
Loz Calver
9a1ccd8a67 FIX: Prevent opening preview when clicking the link for current page again 2013-03-01 11:42:34 +00:00
Ingo Schommer
2b6d735182 Using composer.lock for LeftAndMain->CMSVersion()
See https://github.com/silverstripe/silverstripe-cms/pull/289 for context
2013-02-28 13:38:19 +01:00
Ingo Schommer
64b465f0cb Merge pull request #1143 from svandragt/3.1
ENHANCEMENT Sort menu items according to priority descending, then title ascending
2013-02-27 01:25:49 -08:00
Ingo Schommer
bea1b9002d Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/HTTP.php
2013-02-26 13:28:35 +01:00
Ingo Schommer
25af4adce2 Merge tag '3.0.5' into 3.0 2013-02-20 02:21:41 +01:00
UndefinedOffset
e954c8c1d1 No longer caching the target element to be toggled 2013-02-19 12:10:19 -04:00
UndefinedOffset
b3e40dd0c3 Fixed issue with cms help toggles not functioning correctly 2013-02-19 11:38:40 -04:00
roed
9e7c622abe fixed error property $ of object is not a function
changed $ to jQuery, because without it the system would generate the following error:

Uncaught TypeError: Property '$' of object [object Window] is not a function
2013-02-19 15:48:29 +01:00
roed
396af557df fixed error property $ of object is not a function
changed $ to jQuery, because without it the system would generate the following error:

Uncaught TypeError: Property '$' of object [object Window] is not a function
2013-02-19 09:20:29 +01:00
Ingo Schommer
0c6ac1960e Fixed whitespace usage 2013-02-18 15:43:52 +01:00
Ingo Schommer
a86e4ee00c Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/injector/InjectorTest.php
	tests/travis/before_script
2013-02-18 14:15:42 +01:00
ARNHOE
924c76ccb1 Create nl_NL.js 2013-02-18 03:13:09 -08:00
Hamish Friedlander
4b54383d68 API change request handling to be more orthogonal
RequestHandler#handleAction now exists. It takes the request, and
the action to call on itself. All calls from handleRequest to call an action
will go through this method

Controller#handleAction has had it's signature changed to
match new RequestHandler#handleAction

RequestHandler#findAction has been added, which extracts the
"match URL to rules to find action" portion of RequestHandler#handleRequest
into a separate, overrideable function

GridField#handleAction has beeen renamed to handleAlterAction and
CMSBatchActionHandler#handleAction has been renamed to handleBatchAction to
avoid name clash with new RequestHandler#handleAction

Reason for change: The exact behaviour of request handling depended heavily
on whether you inherited from RequestHandler or Controller, and whether the
rule extracted it's action directly (like "foo/$ID" => 'foo') or dynamically
(like "$Action/$ID" => "handleAction"). This cleans up behaviour so
all calls follow the same path through handleRequest and handleAction, and
the additional behaviour that Controller adds is clear.
2013-02-18 14:56:04 +13:00
Hamish Friedlander
7efae6b95f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 14:31:57 +13:00
Ingo Schommer
eafafb31e3 Fixed screen.css (wrong compilation) 2013-02-18 01:28:17 +01:00
Ingo Schommer
604ede30a4 BUGFIX Escape HTML in CMS status messages 2013-02-17 23:27:15 +01:00
Ingo Schommer
e21bd49462 BUG TimeField respects user choice (fixes #8260)
Regression from c969e04731.
Also fixes width to accommodate for widest common format:
"11:11:11 AM"
2013-02-17 21:00:02 +01:00
Ingo Schommer
923ad8861f Layout regression in "add pages"
Unrelated fields affected by changes to CMS tooltips. See 1ca3883a76.
2013-02-13 10:15:06 +01:00
Robert Curry
7ff8d35be0 Force preview window to refresh on every save 2013-02-08 12:04:18 +13:00
Ingo Schommer
14a56c18e9 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	control/Director.php
2013-02-07 21:45:16 +01:00
Jeremy Bridson
2e77e87ed3 BUGFIX: fix for broken layout in insert media dialog - Trac #8232 2013-02-07 21:43:34 +01:00
senglmann
bb223bb35f Update admin/javascript/lang/de_DE.js
fixed typo in translation
2013-02-06 10:13:49 +01:00
Ingo Schommer
b350ded87c Fixed DatetimeField formatting (single row, smaller field)
Also removed the arbitrary right-floating of fields within a fieldgroup
2013-02-05 12:01:32 +01:00
Ingo Schommer
1acb416a7f NEW Don't load CMS preview iframe if not visible (fixes #8247) 2013-02-05 10:23:48 +01:00
Sean Harvey
ba825cec28 Remove whitespace from LeftAndMain_Menu 2013-02-05 12:30:14 +13:00
Ingo Schommer
0e6912c8cd Re-added 'auto' sizing for CMS preview
Regression from making sizes configurable via JS
2013-02-04 13:43:04 +01:00
Ingo Schommer
1c045b5509 Smaller styling for minor actions in CMS 2013-02-04 13:43:03 +01:00
Kirk Mayo
0cb6b4630f NEW Storing page preview states (fixes #8092) 2013-02-04 13:43:01 +01:00
Ingo Schommer
1bb109041f FIX Node updates in IE without non-object error
Bug was most prominent after page publication,
which triggers a node reload. It iterated through
all node attributes to assign them to the existing node,
which apparently includes some non-scalar attributes
that can't simply be copied in IE.
2013-01-31 18:59:20 +01:00
Ingo Schommer
013f4cfe88 Merge pull request #1052 from kinglozzer/leftandmain-preview-click-bug
BUG: Right click on LeftAndMain menu caused CMS preview pane to open
2013-01-30 05:50:39 -08:00
uniun
ebe41cdadf CSS fixes for Batchactions.
On some browsers Batchactions block looked OK, but on others (e.t. Opera on Linux) every element in Batchactions block had different height.
The height of these elements was related to font size which is a little bit different on every OS'es and browsers.

See https://github.com/silverstripe/sapphire/pull/1132
2013-01-30 14:46:25 +01:00
Ingo Schommer
eb7fed9ab5 FIX Prevent defocus on first change in CMS HTMLEditorField (fixes #8217)
Regression caused by https://github.com/silverstripe/silverstripe-cms/commit/26cc14a9
2013-01-30 12:40:52 +01:00
Ingo Schommer
38e930dfe6 FIX Blocking of preview screen (regression)
Blocked when it should be editable, due to entwine's
onunmatch not firing when it was expected to.
2013-01-30 11:32:55 +01:00
Ingo Schommer
56336c3758 Merge pull request #1101 from chillu/pulls/preview-configuration
NEW Preview size and default mode configurability
2013-01-29 08:16:33 -08:00
Sander van Dragt
b645703eb9 Sort menu items according to priority descending, then title ascending 2013-01-29 15:30:35 +00:00
Ingo Schommer
3457f43839 BUG Respect CMS preview active state (related to #8089) 2013-01-25 11:33:48 +01:00
Ingo Schommer
072b485f66 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	lang/en.yml
2013-01-22 12:05:48 +01:00
Ingo Schommer
f7c8778466 Breadcrumb/back nav in ModelAdmin now retains search params 2013-01-21 12:04:20 +01:00
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
2013-01-21 11:14:57 +01:00
Ingo Schommer
89176e8f5d Unescaped breadcrumbs for inline groups display (fixes #7936) 2013-01-21 08:51:16 +01:00
Tony Air
e1517044cf Application Name fix 2013-01-21 08:09:47 +01:00
Nicolaas
7523fe4ef7 Update admin/code/ModelAdmin.php
Changed "Clear Database before import" - which is incorrect (not the whole database gets wiped, only the data in the model at hand) with the simpler: "replace data".
2013-01-19 22:38:55 +13:00
Ingo Schommer
432ff753c2 Wider side panel to fit "add" and "edit" button
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.

Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
2013-01-16 00:38:24 +01:00
Ingo Schommer
dc43a6b0f6 Wider sidebar to accommodate "add" and "edit" buttons
Conflicts:
	admin/css/screen.css
2013-01-16 00:38:24 +01:00
Ingo Schommer
ca84ddca16 NEW Preview size and default mode configurability 2013-01-15 16:50:57 +01:00
Ingo Schommer
64d3a3dafc BUG Don't double unescape URLs in history.js (fixes #8170)
Merged in pull request https://github.com/balupton/history.js/pull/108.
This has been a serious problem with the library for more than a year,
see https://github.com/balupton/history.js/issues/228.
2013-01-15 13:27:11 +01:00
jean
420c639e7b FIX Properly show link for showing and hiding class spec in model admin 2013-01-15 18:52:05 +13:00
Jeremy Bridson
a93f8841d7 BUGFIX:fixed broken styling of iframe in IE for member and group import 2013-01-15 00:57:47 +01:00
Ingo Schommer
703c10aa0e Restored inlined styling of .fieldgroup (same UI as in 2.x) 2013-01-14 17:01:08 +01:00
Ingo Schommer
0a00fea334 Removed .fieldgroup styles specific to one UI use case 2013-01-14 16:59:22 +01:00
Ingo Schommer
b918487375 Fixed preview overlay showing by default
This was a regression made visible by the recent change to
enforce dimensions on this overlay, which in turn visualizes
the blocked/unblocked states of the preview (see fc6d6ffad)
2013-01-11 00:23:47 +01:00
Ingo Schommer
76e233de70 Only show preview switch if states are available
We've removed all states from RedirectorPage in order to disable the redirect.
2013-01-09 21:43:10 +01:00
Ingo Schommer
80ee913f26 Correct dimensions for preview overlay
During the side-by-side refactoring, those were removed,
rendering the overlay invisible, which lead to the "blocked"
state not being shown at all.
2013-01-09 21:42:20 +01:00
Ingo Schommer
5bd8619dd3 Add pointer to expand/collapse tree icons
Make it clear that they're interactive elements
2013-01-08 18:46:08 +01:00
Ingo Schommer
f564592ec5 Fix tree arrows in TreeDropdownField
Partially reverts "fixes" from 411673ed. This re-introduces the arrow on the main tree node in the CMS ("Your site name"), but that's less important than being able to navigate tree hierarchies in the first place in TreeDropdownField.
2013-01-08 18:45:35 +01:00
Ingo Schommer
79997477b3 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	model/DataList.php
2013-01-08 17:16:09 +01:00
Ingo Schommer
d872202ae5 Support for X-Reload header
Backported from 3.1. Required to get subsite's
"copy page to subsite" form submission working.
2013-01-03 20:43:51 +01:00
Ingo Schommer
8ec3641e60 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/javascript/LeftAndMain.FieldHelp.js
	lang/en.yml
	model/URLSegmentFilter.php
2012-12-21 15:04:17 +01:00
unclecheese
07fb756327 Fix edge case in which uninitialized buttons are being destroyed.
In certain cases, the button may not yet be initialized or may no longer have button properties at the time of removal from the DOM. Without this check, an uncaught exception is thrown.
2012-12-18 09:41:54 -05:00
Ingo Schommer
9b3aebd310 Allow HTML in FormField->setDescription() 2012-12-18 15:02:23 +01:00
Loz Calver
4388433583 BUG: Right click on LeftAndMain menu caused CMS preview window to open
The onclick event for LeftAndMain menu links didn't check if the click
was left or right, meaning that right click events could trigger the
function for loading split view mode in some browser/os combinations.
2012-12-18 10:44:12 +00:00
Kirk Mayo
e217d42090 MINOR:added padding to ui-dialog-title so that it doesn't sit flush with the edge of the dialog box 2012-12-18 15:04:14 +13:00
Paul Clarke
51c6a87fc7 Fix for ie8 styles for preview switch and modes 2012-12-17 23:11:05 +01:00
Ingo Schommer
8779e9be5b BUG Fixed changetracking for radio and checkbox field types
Also removing the 'changed' class from the form once
no further fields are marked as changed. That's important
now that we're surfacing the state much more visibly
through the alternative "save" button styles in the CMS.
2012-12-17 23:02:04 +01:00
Loz Calver
8066376290 ENHANCEMENT: LeftAndMain breadcrumbs to use MenuTitle
Breadcrumbs in the CMS currently only use title, when MenuTitle is
probably more appropriate (if it is set).
2012-12-17 17:41:04 +01:00
uniun
77212c0647 CMS Titles does not support UTF-8
Title in CMS is set using header X-Title. But UTF-8 characters can't be used in HTTP headers. So the title should be encoded just before sending X-Title header and decoded before setting HTML document title (fixes #7942).
2012-12-17 17:36:00 +01:00
Ingo Schommer
6028cf1b62 Fixed panel spacing regressions from 544d2eb6
Specifically, the change removed the "add page" panel padding,
because it moved padding from .cms-panel-padded into
commonly contained elements, like .ui-tabs-panel.
Apart from breaking layouts, it makes the class meaningless,
since its only padded depending on which elements it contains.

In order to rectify some introduced inconsistencies,
much too complex were required, e.g.
.ui-tabs .cms-edit-form, .ui-tabs .cms-content-fields {...}.
2012-12-17 15:20:13 +01:00
Ingo Schommer
c1bd1432d1 Tab spacing (regression from 2d075671) 2012-12-17 14:21:13 +01:00
Ingo Schommer
375c33e0cf Wider sidebar to accommodate "add" and "edit" buttons 2012-12-17 13:00:18 +01:00
Ingo Schommer
a823c38c3f Fixed JS syntax error 2012-12-17 11:38:03 +01:00
Ingo Schommer
9cfa7b75f1 Wider side panel to fit "add" and "edit" button
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.
2012-12-17 11:38:03 +01:00
Ingo Schommer
17908b670a Revert CMS button style (regression from fe08236)
Was originally added for CMS grouped actions,
but can't see any effect. Probably related to the unreleased
changes around the new "batch actions" and "add page" panel styling.

It breaks button height in the top toolbar, by shifting from jQuery
UI's (well tested) mode of applying padding to the container,
to applying padding to the contained text instead. This
conflicts with the line-height set on many buttons.
2012-12-17 11:38:00 +01:00
Mateusz Uzdowski
bf5590d873 BUG Fix side-by-side initial icon display issue in IE8.
The new 'liszt:ready' handler is called late enough to trigger the
update, whereas the redraw is called to early for IE8 to pick up the
class change. The class property is changed correcly though, it looks
like an IE8 rendering issue.

http://open.silverstripe.org/ticket/8095
2012-12-16 16:15:07 +13:00
Mateusz Uzdowski
8455686c36 BUG Fix the re-layouting not being triggered in IE8.
Move onresize handler from entwine to regular event for IE8. The
fromWindow::onresize does not trigger otherwise.

Refer to http://open.silverstripe.org/ticket/8095
2012-12-16 16:14:45 +13:00
Ingo Schommer
b3657147bf BUG Remove "delete" button from "My Profile" (fixes #8121) 2012-12-15 20:02:17 +01:00
Ingo Schommer
963f02e7a3 Using new description style in MemberDateTimeOptionSetField 2012-12-14 01:58:04 +01:00
Ingo Schommer
1ca3883a76 NEW Tooltip and inline help text support for CMS form fields 2012-12-14 01:58:04 +01:00
Ingo Schommer
dbaf407569 Fixed help text alignment for checkbox and grid fields 2012-12-14 01:57:26 +01:00
Ingo Schommer
aed58a55c4 Loading indicator for "more options" buttons 2012-12-14 00:32:06 +01:00
Paul Clarke
c0a122613e Bug fix and code clean up
Removed tempory button fixs not needed any more,
Removed unrelated commits,
fix for preview note
2012-12-13 17:44:06 +01:00
Naomi Guyer
6100eb957e Remove or comment magic numbers, whitespace 2012-12-13 17:43:26 +01:00
Paul Clarke
5d93f8daec Bug fix preview note "Website preview" 2012-12-13 17:43:25 +01:00
Mateusz Uzdowski
4d6d823cb1 API Allow ignoring persistent tab state through entwine property.
In this case we don't want to rely on data attributes in the DOM, as
this should be an inbuilt property associated with this class.
2012-12-13 17:43:25 +01:00
Naomi Guyer
5cef05ebea Separate out ActionTabSet functionality into a new file & clean up. 2012-12-13 17:43:25 +01:00
Naomi Guyer
ee797e4a48 More CSS fixes for the ActionTabSets.
Thanks for contributing @clarkepaul.
2012-12-13 17:43:25 +01:00
Naomi Guyer
618e639526 Refactor and comment TabSet.js 2012-12-13 17:43:25 +01:00
Naomi Guyer
235e8c8138 CSS fixes for the ActionTabSet.
Thanks for contributing @clarkepaul!
2012-12-13 17:43:25 +01:00
Naomi Guyer
a80aa3c969 Provide new save icon for the use in the framework. 2012-12-13 17:43:25 +01:00
Mateusz Uzdowski
fe08236f21 API Add action tabsets as a interface idiom.
Introduces the concept of action tabsets - usage of TabSet and Tabs
in between the action buttons to allow richer set of capabilities that
can be offered to the user.

Goes along with c8d0cdec99c95dbed3b58ebcc098cc9d22c58206 that implements
a change to the CMS actions.
2012-12-13 17:43:24 +01:00
Joel Edwards
236e335a0a Permission list styling improvements (#8100) 2012-12-13 16:45:32 +01:00
Ingo Schommer
abf1ee9b52 Suppress jQuery UI's borders around tabs in the CMS
Noticed this on the "Groups" tab in admin/security, but
likely a problem elsewhere as well.
2012-12-13 10:21:56 +01:00
Paul Clarke
0ba51c1ebf Fix to allow buttons to align inline (fixes #8099) 2012-12-13 10:09:30 +01:00
Naomi Guyer
92e4b4fc5b Remove sub navigation for "Files" (fixes 7956)
Backport from master. Fixes display issues with expanded,
unselected submenus ... by removing them.
They're strictly not necessary since both "list" and "add"
modes can be reached through the default AssetAdmin UI.
2012-12-12 23:16:03 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
0fd6d14f94 Fixed Behat steps for preview feature 2012-12-10 18:06:49 +01:00
Naomi Guyer
dbee4a1bf9 Clean up the side-by-side code. 2012-12-10 17:52:02 +01:00
Paul Clarke
747346bb16 Ability to rotate the mobile preview in side-by-side preview. 2012-12-10 17:52:02 +01:00
Naomi Guyer
00f1ba4ab0 Side-by-side preview browser compatibility fixes. 2012-12-10 17:52:02 +01:00
Mateusz Uzdowski
fa3ef8c126 Side-by-side preview initialisation and navigation fixes.
Disables changetracking on preview options.
2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
4fa2b0f3ff API Support disabling/enabling of previews.
This fixes the problem of panels flipping back to the Pages section if
loading a non-previewable section, and also initialisation problems.
2012-12-10 17:52:01 +01:00
Naomi Guyer
8ce272861c Replace the state selector switch to support more than 2 states. 2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
8f5acd70b3 API Move state to enwtine properties, provide API for preview.
Also the preview state is now kept between panel loads. We also use a
redraw function to update appearance based on the state.
2012-12-10 17:52:01 +01:00
Naomi Guyer
9312c70696 Side-by-side preview options fixes.
Add extra preview-mode selector to the CMS actions so we can show
something when the preview is closed (and with it all options are not
visible).

Thanks @mateusz, @clarkepaul and @robert-h-curry for contributing.
2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
d4f13fe532 API Refactor the CMS layouting to provide access to options.
It is now possible to change the threeColumnLayout width options for the
columns via entwine property LayoutOptions and accessor methods.

Thanks @robert-h-curry, @clarkepaul for contributing!
2012-12-10 17:52:01 +01:00
Paul Clarke
544d2eb6e1 Side-by-side preview options styling.
Thanks @adrexia for contributing.
2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
1edfeefbdd BUG Remove extraneous layout calls.
Remove .layout() calls on redraw. It's unnessecary and means layout
actually gets triggered multiple times, making resizing very slow.
This was a hack to fix the positioning of ajax-replaced elements.

The problem is jLayout does not track replaced elements. We have
to trigger layout algorithm manually on the parents of the replaced DOM
so it can update internal structures and do the re-layout.

Relayouting only needed 3 levels down.
2012-12-10 17:51:35 +01:00
Mateusz Uzdowski
f4b080ee06 NEW Side by side editing functionality - first cut (os#7412)
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Goes along with cms commit fa3738a9f4c5181eabf18a77ca89792d31592250
2012-12-10 17:51:35 +01:00
Ingo Schommer
fa84c2d705 Merge remote-tracking branch 'origin/3.0' 2012-12-10 17:50:43 +01:00
Ingo Schommer
0be51a9321 BUG Fix ModelAdmin search (fixes #8052)
Broken by jQuery UI ajax behaviour in tabs, which compares
URLs to determine if the tab needs to be loaded via ajax.
This was always a brittle solution, and now broke alongside
our upgrade to jQuery UI 1.9 (specifically, with 2657a275).

The ajax behaviour is now globally disabled in favour of
having '.cms-panel-link' behaviour on the tabs, which
was already in place.
2012-12-04 14:28:36 +01:00
Ingo Schommer
4d106aa998 BUG Fixed unintentional ParentID reset in "add page" form
Side effects from old JS hanging around which was no longer used.
See d364070941
for background discussion.
2012-12-04 11:30:29 +01:00
Marcus Nyeholt
34788130ef BUG Rewrite hashlinks failing on empty a tags
Check for presence of href in _a_ tags before trying to .match them to
prevent null pointer errors.

Some external JS libs (eg tag-it) use <ul><a> structures which get matched
and break

(fixes regression introduced by ff39f9ad38)
2012-12-04 15:47:14 +11:00
Kirk Mayo
20a5bc1d36 BUG iOS safari navigation bug (fixes #8039) 2012-12-03 12:27:59 +01:00
Ingo Schommer
700c95a523 Merge pull request #989 from silverstripe-rebelalliance/8063
BUG Unable to return to site tree admin from Preview mode trac 8063
2012-12-03 01:33:04 -08:00
Kirk Mayo
da1a6e7bf7 BUG Unable to return to site tree admin from Preview mode trac 8063 2012-12-03 10:38:47 +13:00
Ingo Schommer
0808a1c21e Fixed JS syntax error
Regression from dbbcd08d
2012-11-30 12:30:41 +01:00
Ingo Schommer
888d4a87c5 Merge pull request #978 from adrexia/css-fix
BUG: Extends too generic (tree.scss)
2012-11-29 05:53:49 -08:00
Naomi Guyer
7d0e10f5fa BUG: Extends too generic 2012-11-29 10:20:00 +13:00
Ingo Schommer
87d538c7ee Merge pull request #959 from silverstripe-droptables/alternating-button-rc
NEW Extend the ssui.button with alternate appearances.
2012-11-27 01:55:16 -08:00
Naomi Guyer
715b62f790 Updating chosen dependency 2012-11-27 16:28:17 +13:00
Mateusz Uzdowski
dbbcd08d8f NEW Extend the ssui.button with alternate appearances.
Reusable feature for making CMS buttons that respond to the current
contextual state with an appearance change.

Provides capability to specify initial state, alternate icon and
alternate text via data attributes or options (PHP or JS), and to hook
up into events triggered when the state is alternating.

This is used by the follow-up cms action buttons cleanup work.
2012-11-26 09:51:02 +13:00
Ingo Schommer
e021a190b3 Merge pull request #968 from silverstripe-droptables/submitform-validation
Future-proof the submitForm for use with forms without validation.
2012-11-22 15:31:51 -08:00
Ingo Schommer
33039958c2 Merge pull request #965 from silverstripe-droptables/incorrect-bc-nesting
BUG Incorrect html nesting of breadcrumbs
2012-11-22 15:28:54 -08:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0'
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Mateusz Uzdowski
3f2ddbb3fb Future-proof the submitForm for use with forms without validation.
We might decide to use it for other submissions than EditForm.
2012-11-23 11:09:43 +13:00
Naomi Guyer
a933847217 BUG Incorrect html nesting of breadcrumbs
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div

Goes alon the cms commit 4fab9b8248819dc9008d5b94b5437cd833de31ac
2012-11-22 12:20:02 +13:00
Mateusz Uzdowski
2657a27573 BUG Adjust the handler to jQuery UI 1.9 API change.
Settings.url no longer contains the URL, as a result navigating around
tabs in IE (browsers that do not support History API) becomes broken.

For example when the admin is opened on "Pages" section it is impossible to
navigate to specific page, or if the admin is opened on a tab, it's not
possible to navigate to another tab.
2012-11-21 11:02:51 +01:00
stojg
c6fcb080a9 BUG Video embed from Add Media Feature no longer works (open #8033)
Since the tinymce upgrade from 3.5.6 to 3.5.7 it seems like data attributes are forbidden on tags.
This fix tells tinymce to allow data* properties on img tags
2012-11-15 15:49:03 +13:00
Sean Harvey
6a9617bf6b Remove deprecated LeftAndMainDecorator, use LeftAndMainExtension instead 2012-11-15 14:43:11 +13:00
Loz Calver
ea2dc9da0e ENHANCEMENT: Add ability to change URL for SS logo in CMS Menu 2012-11-09 11:06:04 +01:00
Ingo Schommer
c89f56f1cb Merge pull request #932 from clarkepaul/master
ENHANCEMENT message colours updated #7976
2012-11-07 06:29:05 -08:00
Ingo Schommer
91b69bfb52 Fixed tab alignment and padding
See discussion at https://github.com/silverstripe/sapphire/pull/934#issuecomment-10136236
2012-11-07 12:41:01 +01:00
Sean Harvey
aec59de955 Adding title to CMSProfileController so translations get default 2012-11-07 11:41:48 +13:00
Sean Harvey
f4a4465873 Merge branch '3.0' 2012-11-07 11:12:01 +13:00
Andrew O'Neil
0c8de0a1de APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:07:55 +13:00
Ingo Schommer
a7efc76c36 Removed usage of deprecated jQuery UI 1.9 features
See http://jqueryui.com/upgrade-guide/1.9 for details.
Fixes fade effect on changing toplevel tabs
(semantics for "show" option in $.tabs() changed).
2012-11-06 22:53:34 +01:00
Ingo Schommer
2d075671c3 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:28:19 +01:00
Ingo Schommer
3214a0a756 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	admin/css/screen.css
2012-11-06 19:56:34 +01:00
Ingo Schommer
ff39f9ad38 Upgrade jQuery UI to 1.9
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign)
2012-11-06 19:45:56 +01:00
Paul Clarke
f988ae3163 ENHANCEMENT Message colours updated 2012-11-06 13:23:20 +13:00
Sean Harvey
169366a011 Merge branch '3.0' 2012-11-06 13:04:21 +13:00
Paul Clarke
411673ed43 ENHANCEMENT general css enhancements
Remove arrow from sitetree next to site name  #7972
Remove 1px gap from above main tabs and enhance css
Replace loading logo
Adjust main link colour to have more contrast
Add more contrast to main edit panel - made bg slightly lighter
2012-11-05 17:51:38 +13:00
Sean Harvey
3451da001a BUG Fixing session keep alive for non-ADMIN users
SecurityAdmin isn't always available for CMS users, as they might
not have permission to view that section. This fixes the problem
with session keep alive by moving the ping to Security/ping, which
is available for all users.
2012-11-05 15:41:10 +13:00
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Sean Harvey
7a7c1a6857 BUG Escape tree title 2012-11-05 13:19:02 +13:00
Naomi Guyer
7ae73eabdd BUG: Border at top of tabs when no subtabs
This bug reappeared when branches were merged because the 3.0 version
of _style.scss had tabsets defined in different places.

This scss was inserted, but there was no idication that it was new to
master (except in the resulting css file). As these styles are declared
differently elsewhere in _style.scss, I think this declaration must
have been refactored in an earlier commit in master.
2012-11-05 11:48:50 +13:00
Sean Harvey
1cb9c34fc5 Fixing broken references to sprites (probably caused by old Compass version) 2012-11-05 11:21:41 +13:00
Saophalkun Ponlu
9fe99cfec9 Batch actions UI enhancement (#7878) 2012-11-02 22:57:14 +01:00
Ingo Schommer
70352fba32 Merge pull request #880 from adrexia/fileoverview
BUG: File Uploading Notifications (fixes #7883)
2012-11-02 14:08:16 -07:00
Naomi Guyer
95b5f6541f BUG: GridField add existing auto complete has no max height (fixes #7965)
Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
2012-11-02 13:36:51 +13:00
Naomi Guyer
2dabaebad8 BUG: File Uploading Notifications (fixes #7883)
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2012-11-02 12:46:16 +13:00
Simon Welsh
0b279a2cbc Changes ping to POST and clears Requirements for ping
GET requests can, and do, get cached. Using POST forces them not to.
Clears requirements so that the SecurityAdmin JS isn't injected.
2012-11-01 21:15:43 +13:00
Naomi Guyer
eb23f502b5 BUG: Site Tree checkboxes and refactoring
* Increased height of site tree checkbox by 3px, so users are less
likely to miss it and load a page by mistake
* Refactored _tree.scss to make better use of SCSS, and stop repetition
of styles
2012-11-01 15:26:46 +13:00
Ingo Schommer
bcbf4636fc BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7980)
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
2012-11-01 00:25:13 +01:00
Naomi Guyer
2a67715327 BUG: One too many brackets in _style.scss
Caused when merging 3.0 back into master
2012-11-01 11:16:13 +13:00
Ingo Schommer
08832261c1 Fixed merge errors in CMSProfileController 2012-10-30 18:03:49 +01:00
Ingo Schommer
efabde1416 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	security/Member.php
2012-10-30 17:52:49 +01:00
Naomi Guyer
a0f8d044c0 BUG: Border at top of tabs when no subtabs 2012-10-28 16:05:13 +13:00
Will Rossiter
d7bf6e781a Merge pull request #719 from silverstripe-rebelalliance/open/7665
FIX: CMS Menu header now changes height (Fixes: 7665)
2012-10-27 19:41:27 -07:00
Jeremy Bridson
940236a392 BUG: CMS Menu header now changes height depending on the name. Fixes 7665
Position and height were being set inline so added !important to override this.
2012-10-28 15:38:25 +13:00
Will Rossiter
4f8d23b7f2 Merge pull request #704 from adrexia/IE7-left-panel-text
BUG: IE7 vertical text fix
2012-10-27 19:23:46 -07:00
Will Rossiter
1692a1023d Merge pull request #890 from adrexia/7956-remove-files-subnav
Remove sub navigation for "Files" (fixes 7956)
2012-10-22 23:19:56 -07:00
Simon Welsh
bedb579b07 Merge branch '3.0' 2012-10-23 15:21:20 +13:00
Naomi Guyer
84851c96a7 Remove sub navigation for "Files" (fixes 7956) 2012-10-23 09:55:08 +13:00
Naomi Guyer
9158dead67 BUG: No indent on rightTitle (fixes #7950)
Added margin and made non checkbox right title's match similar labels
used elsewhere.
2012-10-18 16:23:49 +13:00
Ingo Schommer
b5fd9e6a8d Merge pull request #684 from adrexia/add-new-button
BUG: Adjust css for actions toolbar on pages (fixes 7649)
2012-10-16 07:21:27 -07:00
Ingo Schommer
d1ee7612f5 Merge remote-tracking branch 'origin/3.0' 2012-10-08 16:48:52 +02:00
Saophalkun Ponlu
e3a27ea7da CMS member profile now is no longer in a popup (#7880) 2012-10-08 12:57:55 +02:00
Ingo Schommer
b38cb39256 BUG Prevent CMS submission on disabled buttons (#7928)
Thanks @jbarrios for triggering this fix
2012-10-08 09:29:08 +02:00
Jeremy Bridson
ad7383a58d ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:30:47 +13:00
Simon Welsh
5768e421dc Merge branch '3.0' 2012-10-05 14:40:32 +13:00
Simon Welsh
8153326360 Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0
Conflicts:
	admin/_config.php
2012-10-05 14:39:27 +13:00
Sean Harvey
7901b02333 Use TinyMCE fancy selects for better usability selecting styles
This was previously disabled because of a bug in TinyMCE on
SilverStripe 2.3, but appears to have been resolved since then.
2012-10-05 14:18:30 +13:00
Sean Harvey
113545d177 BUG Non-breaking space added automatically by TinyMCE on anchors
Everytime TinyMCE is saved, it adds &nbsp; characters immediately
after anchors, e.g. <a name="test"></a>&nbsp; - this fix stops
TinyMCE from adding those extraneous &nbsp; after the anchors.
2012-10-05 14:14:59 +13:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
2012-10-03 16:16:19 +02:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Sam Minnee
28bd939580 FIX: Ignore charset when checking mime types in LeftAndMain ajax responses.
This is partly a fix to #7574, although quite different from the work Ingo did on Content-length.  The text/json mime type occasionally gets a charset suffixed to it by the webserver, which broke everything.

A follow-on fix from this would be to get the PHP code to supply charsets more consistently, so that webservers don't have to make things up.

Additionally, the 2nd interpretation - which treats the response as text/html - should probably only happen if the response is text/html, and throw a more helpful error otherwise.
2012-09-30 16:32:22 +13:00
Jeremy Bridson
07bc75c281 ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab. 2012-09-28 16:37:35 +02:00
Ingo Schommer
91e4fde96f ENHANCEMENT "Readonly" behaviour for CMS tabs 2012-09-28 16:37:35 +02:00
Ingo Schommer
d50341d8cd Rendering attributes for CMSTabSet.ss
Make behaviour consistent with parent template, Tabet.ss
2012-09-28 16:37:34 +02:00
Ingo Schommer
ea86b96fbb Merge pull request #832 from halkyon/sitetree_children_disabled
BUG If a nested page editable but parent not, user can't expand tree
2012-09-28 06:38:26 -07:00
Simon Erkelens
f991401a52 Translation possible for clear before import
I couldn't figure out why it wouldn't translate...
2012-09-28 09:45:16 +03:00
Sean Harvey
b186626b73 BUG If a nested page editable but parent not, user can't expand tree
If you're logged in as a specific user in a group who has view/edit
permissions of a page that has a parent page which doesn't have
permissions, you can't expand the tree node to get access to that
nested page.

This fixes LeftAndMain.Tree.js to allow expanding if there are
immediate children tree nodes that are not disabled. Also fixes
styling so that only immediate children nodes are greyed out.

Fixes this ticket: http://open.silverstripe.org/ticket/7913
2012-09-28 12:18:34 +12:00
Sean Harvey
e4ab02e1c3 Merge branch '3.0' 2012-09-27 10:39:31 +12:00
Marcus Nyeholt
da70dc469c BUG Fixed possible reference to null string
Hashlink for tabs in the backend didn't check the existence of
the href value before trying to .replace it.
2012-09-26 16:27:50 +10:00
Damian Mooyman
495ffb033c FIXED: Issue with duplicate help tips appearing on select fields in CMS. See Security / Groups / Edit Group form field for example. 2012-09-25 13:37:17 +12:00
Ingo Schommer
039b40247e Merge branch 'open/7875' of git://github.com/jbridson/sapphire into jbridson-open/7875 2012-09-21 10:49:36 +02:00
Simon Welsh
1e629f4585 Merge branch '3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
2012-09-21 14:56:56 +12:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Jeremy Bridson
a670e4ca40 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:25:57 +12:00
Sean Harvey
9c2be0f025 Merge branch '3.0' 2012-09-17 15:16:52 +12:00
jean
100aa178b0 FIX 7856 If the submit button is disabled, to perform the ajax request 2012-09-11 15:00:36 +12:00
Ingo Schommer
1088d044c5 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
2012-09-07 17:21:41 +02:00
Saophalkun Ponlu
a0462b90cf BUG Fixes an issue where batch actions dropdown doesn't show up after ajax request back to the cms Pages section 2012-09-03 18:47:25 +12:00
Ingo Schommer
2f643817a4 LeftAndMain::$session_namespace
More fine-grained control over session storage,
particularly when reusing the "current page" state.
2012-08-29 15:10:05 +02:00
Ingo Schommer
1e5b04ccad Merge branch '7740-re-ordering-page' of git://github.com/phalkunz/sapphire into phalkunz-7740-re-ordering-page 2012-08-29 14:54:49 +02:00
martimiz
82500dd4c4 NEW Custom menu icons for the CMS main menu
Add optional custom menu icons to the CMS main menu for every class
extending LeftAndMain (ModelAdmin). Works by setting optional static
$menu_icon = '/path/to/image' and providing custom styling for added
icons. Works for the menu as well as icon in the right-side (GridField) pane header.
2012-08-29 13:14:59 +02:00
Saophalkun Ponlu
c3d622c910 BUG: Fix an issue caused by moving a page from one location in the tree to another location doesn't update parent id in the edit form immediately (see #7740)
The issue causes the moved page to revert to previous location when Save and Publish before any page refresh or page switching.
This commit also adds 'Modified' badge to the moved page
2012-08-29 20:33:03 +12:00
Sam Minnée
fcc88264cb Merge pull request #747 from silverstripe-rebelalliance/trac/7763
FIX 7763 TreeDropdownField needs to refresh after CMS edit form save
2012-08-28 15:55:35 -07:00
Hamish Friedlander
05fade3249 FIX 7763 TreeDropdownField needs to refresh after CMS edit form save 2012-08-29 10:52:56 +12:00
Ingo Schommer
6162ae5e3f Fixed preview link ordering in CMS
jQuery seems to order by DOM rather than occurrence of
selectors, which means it always takes the last populated
field (in our case the "live" link over the "draft" link).
2012-08-28 18:31:15 +02:00
Sam Minnee
c2afca2cd8 Merge branch '3.0' 2012-08-28 16:08:57 +12:00
Sam Minnée
5b58e7951c Merge pull request #742 from silverstripe-rebelalliance/7812
BUG: open ticket 7812 correcting filter syntax on a DataObject used by f...
2012-08-27 21:05:09 -07:00
Ingo Schommer
dc08e87bd5 BUG Take first non-empty link field for preview
Goes by priority, but allows for fields to be empty.
This is important e.g. for models which are removed just
from live, or just from draft.
Also reacts to a field rename done in CMS module (62783c75).
2012-08-27 18:22:33 +02:00
Ingo Schommer
f63893544e BUG Fix CMS layout after preview navigation (fixes #7463) 2012-08-27 16:50:37 +02:00
Ingo Schommer
5a44ea2e20 Deselect tree nodes when reacting to form load event (fixes #7401)
Multiselected nodes are only possible in batch mode,
which would never trigger a form load event.
2012-08-27 16:49:06 +02:00
Ingo Schommer
4a8236ffa7 Removed special "from"/"to" filter field CSS rules
Use global field rules instead, and fall back to new
"stacked" styling of FieldGroup (see CMS CSS)
2012-08-27 16:03:21 +02:00
Ingo Schommer
e4db3c6c05 Removed DateField special width with .hasDatepicker class
Causes field to change width after first display,
as the .hasDatepicker class is added dynamically on first field focus.
Since we don't add an icon by default, there's no difference
between an <input> field with date picker, an input field for dates,
and a simple input field. Fall back to global (or CMS specific) rules.
2012-08-27 16:02:40 +02:00
Ingo Schommer
76dd8cca0f Remove width limit on CMS panel dropdowns
No longer necessary as we've fixed the Chosen.js width
settings, which means the <select> fields can inherit
their settings and determine width automatically.
2012-08-27 15:52:01 +02:00
Ingo Schommer
88dfde8afa Removed arbitrary width restrictions on field group children
Let the fields handle their dimensions themselves
(for example the "from" and "to" date fields in the CMS pages search form)
2012-08-27 15:50:21 +02:00
Ingo Schommer
1d2288b091 NEW Open external links in preview mode in new window (fixes #7652)
Rather than disabling the links altogether, which is
counter-intuitive to most users.
See https://github.com/silverstripe/sapphire/pull/638.

Also hide a duplicate $SilverStripeNavigator on the previewed
website (in case it has been manually applied to the template).
2012-08-27 14:42:10 +02:00
Ingo Schommer
a8f335360b Merge remote-tracking branch 'origin/3.0' 2012-08-27 09:25:59 +02:00
Kirk Mayo
3e351bc421 BUG: open ticket 7812 correcting filter syntax on a DataObject used by function updatetreenodes 2012-08-27 14:41:07 +12:00
Ingo Schommer
2fab657fce i18n for CMS section titles (see #7798) 2012-08-26 23:58:31 +02:00
Sam Minnee
824afffd2e Merge branch '3.0' 2012-08-23 12:39:41 +12:00
Ingo Schommer
ae9c2e78a1 BUG Restore tree children after updateNode() (fixes #7761) 2012-08-22 15:38:54 +02:00
Ingo Schommer
4cc82e906b Merge remote-tracking branch 'origin/3.0' 2012-08-20 10:13:55 +02:00
Sam Minnée
1e7e7c65ba Merge pull request #723 from silverstripe-rebelalliance/entwine
Re-enable entwine inspector
2012-08-19 16:36:18 -07:00
Hamish Friedlander
b560d258d3 Re-enable Entwine Inspector in CMS & document 2012-08-20 11:26:11 +12:00
Andrew Short
2503e481ff Only initialise chosen elements when visible. 2012-08-16 23:26:33 +02:00
Andrew Short
b38735d536 Fix chosen dropdown width not being set. 2012-08-16 23:26:29 +02:00
Andrew Short
c1f27c18ee Revert b9ed6f7f6d. 2012-08-16 23:26:24 +02:00
Mateusz Uzdowski
70eaa270e4 API Allow to force URL reload, while replacing the history state
Comes with a wrapper for easy reloading of the current panel.
2012-08-16 22:02:19 +02:00
Ingo Schommer
f79d2df104 BUG More robust url comparison in CMS
Avoid ajax reloads when URLs differ in irrelevant ways,
e.g. admin/?locale=de vs. admin?locale=de.
This caused problems with the translatable module
reloading page content where it didn't need to,
because some previous robustness patches to the same problem
didn't apply (they only removed trailing slashes, ignoring
query parameter strings). The visible problem for this was
a broken tree panel, because it was ajax-loaded in parallel
with its container. Depending on ajax response order,
this would break the inner panel (in this case the tree),
since its original container was replaced with a new DOM.
2012-08-15 21:22:15 +02:00
Jeremy Bridson
c621a6d699 BUGFIX: fixed trac 7665 - CMS Menu header now changes height depending on the name of the admin and greeting message. position and height were being set inline so added !important to override this. 2012-08-15 11:28:31 +12:00
Ingo Schommer
3bce3550d3 Merge remote-tracking branch 'origin/3.0' 2012-08-12 22:21:06 +02:00
dd1079
8d9db7f61a FIX: Proper buttonset styling 2012-08-11 10:19:17 +12:00
Ingo Schommer
35ca67535d Merge pull request #667 from jakr/trac7617-followup
Fix edge case in sessionStorage detection for FireFox.
2012-08-10 01:42:58 -07:00
Ingo Schommer
cac540d252 Merge branch '3.0' 2012-08-10 00:19:00 +02:00
Ingo Schommer
c7fd9a6605 CMS Localization 2012-08-10 00:17:34 +02:00
Ingo Schommer
77d939f0b2 CMS Localization 2012-08-09 23:55:30 +02:00
Ingo Schommer
fb7008627c Merge remote-tracking branch 'origin/3.0' 2012-08-09 10:47:44 +02:00
martimiz
b1ee36e3aa Fix: display the correct (menu) icon in the GridFieldDetailForm's breadcrumbs.
In CMSBreadcrumbs.ss the (TopLevel)Controller is not recognized within
the Breadcrumbs loop, so the class that is used in css to style the
icon cannot be created. Moving the construction outside the loop will
remedy this. As far as I can see this works within the CMS.
2012-08-08 17:30:20 +02:00
Naomi Guyer
5b88ffca46 BUG: IE7 vertical text fix
Re-add vertical text fix, as it's been overwritten somewhere along the
way
2012-08-07 13:29:33 +12:00
Ingo Schommer
d0a9811087 BUG Fully qualified namespace for _t() in templates
Was inferred by the containing file previously,
which is deprecated behaviour, because it obscures
the fact that renaming an template file or copying
template code will change the context of the translations.
While it would be nice to use shorter and more readable namespaces,
this change would remove all existing translations.
Since there is no (easy) migration of entities to a new namespace,
having verbose template code is the lesser of two evils.
2012-08-06 13:44:21 +02:00
Will Rossiter
c28c024dce Merge pull request #694 from creamarketing/javascript-treenode-updating
BUG: javascript tree node updating fails when Translatable is used
2012-08-03 14:49:52 -07:00
Niklas Forsdahl
a85530991c BUG: javascript tree node updating fails when Translatable is used
Automatic tree node updating fails when for example creating a new
translation, due to the update URL containing two question marks,
due to the locale get parameter.

Fixed by using the $.path.addSearchParams utility function, which properly
checks for existing query string parameters.
2012-08-03 13:36:37 +03:00
Will Rossiter
d774cb50f6 Add nowrap to buttons to ensure single lines (https://skitch.com/willrossi/ekp44/silverstripe-pages). Thanks oetiker 2012-08-03 09:13:37 +12:00
Hamish Friedlander
3efdb5c981 Merge in changes from 3.0.1 final 2012-07-31 16:51:10 +12:00
Naomi Guyer
2cb9a574a5 BUG: Adjust css for actions toolbar on pages (fixes 7649)
Set a minimum height on the actions panel so it would look the same in
list and tree views
2012-07-31 16:16:37 +12:00
Hamish Friedlander
72efed1993 Dont need to wrap entwine blocks in onload blocks, theres no benefit 2012-07-27 11:17:56 +12:00
Hamish Friedlander
a9bedccd1f Merge in changes from 3.0.1-rc2 2012-07-27 11:14:32 +12:00
Hamish Friedlander
5591017577 BUG 3156e755 broke GridField Add forms because guessed frag was wrong 2012-07-27 11:13:23 +12:00
Will Rossiter
1a42fd0faa Merge pull request #672 from adrexia/CMS-collapsed-menu
FIX: Logo padding in collapsed Menu
2012-07-25 22:57:16 -07:00
Naomi Guyer
55ec92d40e ENHANCEMENT: Maori language javascript 2012-07-26 17:18:44 +12:00
Naomi Guyer
a605d06d9f BUG: Logo padding in collapsed Menu 2012-07-26 15:41:44 +12:00
Hamish Friedlander
95d0be636c Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:44:53 +12:00
Hamish Friedlander
dc18c51f32 Add javascript japanese translation - thanks Yuki Awano 2012-07-25 09:38:36 +12:00
jakr
3bc2798e72 Fix edge case in sessionStorage detection for FireFox. If it is disabled using about:config, typeof will be object, but the value will be null. 2012-07-24 12:54:23 +02:00