tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,477 Commits 31 Branches 527 Tags 162 MiB
fb660225c2
Commit Graph

37 Commits

Author SHA1 Message Date
Ingo Schommer
466ed29f0e Merge remote-tracking branch 'origin/3.3' into 3 2016-03-04 14:55:08 +13:00
Ingo Schommer
7bb6295c79 Fix TreeDropdownField auto-close regression 
Causes build failures due to Behat not being able to select
a link from a dropdown in "Insert Media".

Follow on effect from triggering a window.resize event
when the window wasn't actually resized (in order to force a layout redraw).

See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context
 2016-03-03 17:54:07 +13:00
Damian Mooyman
9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
scott1702
a67b8144b0 Fix incorrect height on main nav after toggle 2016-02-24 10:23:16 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:15:54 +13:00
Daniel Hensby
ca8d0f2818 Merge branch '3.1' into 3.2 
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
 2015-07-20 10:48:01 +01:00
Tom Densham
b17b186e93 Convert FQCNs to html safe strings 
Convert namespaced class names to html safe strings in `LeftAndMain.php` `CMSMenu.php` and `LeftAndMain.Main.js` by replacing backslashes (\) with dashes (\) and removing special characters with `Convert::raw2htmlname()`
 2015-07-15 15:33:00 +01:00
David Craig
8b29732291 Fix left nav styling. 
- Incorrent collapsed state on reload, when 'flush' param is not present.
- The content area had a horizontal scroll in split-mode.
 2015-05-25 16:55:25 +12:00
David Craig
3bac6fadfe Add 'sticky' behaviour to left menu 2015-05-25 12:09:14 +12:00
Will Rossiter
2d0a354405 API: Add attributes argument for CMSMenuItem. 
Currently help menu item is the only external link in the CMS and the ability for it to work is hardcoded in the template. This request makes the target attribute definable by CMSMenu::add_link().

Adds documentation for how to add a basic external link to the CMS.
 2013-10-02 19:06:54 +13:00
Saophalkun Ponlu
e3a27ea7da CMS member profile now is no longer in a popup (#7880) 2012-10-08 12:57:55 +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
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
Mateusz Uzdowski
8d469b66c8 BUGFIX: add missing onunmatches 2012-05-23 16:24:15 +12:00
Mateusz Uzdowski
37399f88db BUGFIX: add missing _super calls to all matchers and unmatchers 
Otherwise some matchers might not be triggered as expected.
 2012-05-18 12:27:30 +12:00
Ingo Schommer
6bee103d14 MINOR Removed hardcoded children entries from CMS Menu (and record setting logic), as the related controllers have been merged to be accessible under the same top-level menu 2012-04-17 11:03:09 +02:00
Ingo Schommer
c518a19ec2 BUGFIX Replaced logic for checking external URLs in CMS Menu with more stable jQuery Mobile codebase (fixes problems on IE not loading menu entries via ajax) (#7002) 2012-03-30 16:51:42 +02:00
Ingo Schommer
3cad19a97e MINOR JS formatting 2012-02-21 17:46:58 +01:00
Ingo Schommer
bb7c128025 MINOR JS syntax errors 2012-02-17 15:58:31 +01:00
Ingo Schommer
2acce7b632 MINOR Moved menu-specific panel logic in LeftAndMain.Menu.js to avoid weakening base library 2012-02-15 14:26:45 +01:00
Ingo Schommer
6edf055dff ENHANCEMENT Added children toggle actions to CMS menu, fixed menu link update behaviour when records change 2012-01-05 23:17:55 +01:00
Ingo Schommer
30377f277e MINOR Update CMS menu state on form submission (as well as history state change) 2011-12-20 17:46:44 +01:00
Ingo Schommer
ac963755dd ENHANCEMENT Support for fake "redirects" in ajax responses via History.replaceState() (used e.g. for an add form loading the record for editing afterwards, under its own URL) 2011-12-20 17:46:38 +01:00
Will Rossiter
01541487ca MINOR: code formatting 2011-12-17 16:06:56 +13:00
Will Rossiter
a04c1410e1 BUGFIX: update admin menu links when current page ID updates. Fixes #6768. 2011-12-17 15:51:02 +13:00
Ingo Schommer
482324b6ae BUGFIX Fixed form change tracking in the CMS, integrated it into menu changes. Reduced TinyMCE coupling. 2011-12-15 20:38:35 +01:00
Ingo Schommer
1c20213dbd ENHANCEMENT Hide "edit page" menu entry in CMS when no page is opened for editing (for usability reasons) 2011-12-15 00:48:50 +01:00
Ingo Schommer
9c6cbf7012 BUGFIX Making HTML5 History support optional, so we can disable HTML4 hash change fallback 2011-12-15 00:48:34 +01:00
Will Rossiter
6b88006456 BUGFIX show scroll bar on menu and side panels in adminstration section rather than hiding 2011-10-29 15:47:07 +13:00
Ingo Schommer
443777e789 MINOR Selecting parents of nested menu entries by default in LeftAndMain.Menu.js 2011-10-04 13:16:55 +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
475e055b18 MINOR Avoid triggering $('.cms-menu') item selection when already selected. Add new 'select' event for easier customization 2011-08-12 14:28:22 +02:00
Ingo Schommer
a1b8698389 MINOR Removed '.LeftAndMain' selector from rules in order to avoid DOM hierarchy confusion (.LeftAndMain contains .cms-content vs .LeftAndMain equals .cms-content) 2011-07-08 15:36:47 +02:00
Ingo Schommer
2f2096cd3a ENHANCEMENT HTML5 History.pushState support in CMS 2011-07-08 15:36:46 +02:00
Ingo Schommer
0e0a59df99 ENHANCEMENT Collapsible menu, disable menu actions on external links 2011-07-08 15:36:45 +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