Commit Graph

739 Commits

Author SHA1 Message Date
Ingo Schommer
dcdb0b4731 Merge pull request #95 from simonwelsh/silverstripe-cms
---

ssmacron had a reference to sapphire. Rather than trying to figure out how to make it variable, moving the plugin into third party means the path doesnt need it. ssbuttons is also moved and now all the tinyMCE related JS is in sapphire.

See also https://github.com/silverstripe/sapphire/pull/310

Conflicts:
	javascript/tinymce_ssbuttons/editor_plugin_src.js
2012-04-16 12:09:35 +02:00
Ingo Schommer
e91d49036b MINOR Using loadPanel() rather than removed duplicate loadForm() method 2012-04-12 23:55:37 +02:00
Ingo Schommer
9b79827972 MINOR Decoupling dialog logic from tinymce_ssbuttons plugin to allow for lazy loaded dialogs 2012-04-12 22:26:04 +02:00
Ingo Schommer
f26d0bc158 MINOR Removed SideReportsForm JS logic, interface element no longer exists 2012-04-12 14:50:23 +02:00
Simon Welsh
517bf3198b API-CHANGE Move tinymce plugins in thirdparty 2012-04-12 20:49:43 +12:00
Mateusz Uzdowski
03a8aa546e BUGFIX Only load existing languages in custom TinyMCE plugins to avoid the tinymce_gzip.php logic stalling (fixes #7035) 2012-04-11 18:36:32 +02:00
Ingo Schommer
73a466c927 Merge branch 'integration' 2012-04-11 16:25:46 +02:00
Stig Lindqvist
587de186d0 Merge pull request #90 from halkyon/redirectorpage_changes
BUGFIX Adding RedirectorPage.js to cms module (was in sapphire) and swapping out old behaviour.js usage
2012-04-11 04:10:01 -07:00
Ingo Schommer
39208d15e0 MINOR i18n for revert confirmation messages, improved wording 2012-04-11 10:19:54 +02:00
Normann Lou
35da0e9b46 BUGFIX SS-124 SearchForm clear button fixed 2012-04-11 17:37:28 +12:00
Normann Lou
1cf2e2ca12 MINOR SSF-124 added missing ";" for keep SilverStripe Code Convention 2012-04-11 15:53:04 +12:00
Sean Harvey
240627b504 BUGFIX Adding RedirectorPage.js to cms module (was in sapphire) and
fixing to use entwine/jquery instead of old behaviour
2012-04-11 15:32:41 +12:00
Normann Lou
afdac50ef1 MINOR SSF-124 correct inline document for a newly added routine. 2012-04-11 15:08:39 +12:00
Normann Lou
653625914d ENHANCEMENT SSF-124 make tab select pages list view if the current url is 'listchildren' otherwise use the default action defined in TabSet.js 2012-04-11 15:01:31 +12:00
Normann Lou
bfb81fb89f BUGFIX SSF-124 fix issue that listchildren links for third level pages lost default ajax event bind 2012-04-10 16:21:26 +12:00
Normann Lou
4a36b1e490 ENHANCEMENT SSF-124 finished ajax version of admin/pages/listchildren/ID in Pages admin 2012-04-10 14:14:58 +12:00
Ingo Schommer
76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Wolf Vollprecht
a18b9bd85e ENHANCEMENT: Flyout menu to directly choose the pagetype one wants to add. 2012-04-09 21:08:15 +02:00
Normann Lou
f101595921 FEATURE SSF-124 first version of tree list view added 2012-04-05 15:39:46 +12:00
Normann Lou
1311ba2720 BUGFIX: Empty error message on renaming a page and confirming url is changed accordingly (trac ticket 7068) 2012-03-27 14:57:39 +02:00
Sean Harvey
8166c26a8f MINOR Fixed grammar in "Foldername" popup when adding a folder in
AssetAdmin. Should be "Folder name".
2012-03-27 09:57:29 +13:00
Ingo Schommer
112a3f5f81 ENHANCEMENT "Edit" action in tree context menu 2012-03-12 11:48:44 +01:00
Ingo Schommer
454a6e891d ENHANCEMENT Allow adding new pages under specific nodes via tree context menu 2012-03-12 11:40:43 +01:00
Ingo Schommer
059137290f MINOR Correct confirmation message when deleting files (#6975) 2012-03-09 21:12:22 +01:00
Saophalkun Ponlu
1823c58f6f BUGFIX: Change to a page url segment doesn't get saved properly caused by 'disabled' attribute on the field, which is added by url segment suggestion function (ticket #6842) 2012-03-09 16:12:07 +13:00
Russell Michell
e5d038f7f0 BUGFIX: #6853 Removed bottom border of the parent div wrapped around settings' options-sets when radio-buttons with a value of 'OnlyTheseUsers' is selected. 2012-03-09 13:14:17 +13:00
Ingo Schommer
953e2bd1c7 MINOR Fixed overloaded delete confirmations in AssetAdmin.js 2012-03-08 18:24:35 +01:00
Ingo Schommer
f085583b61 ENHNANCEMENT Creating folders via (faster) JavaScript prompt in AssetAdmin, implicitly fixing AssetAdmin->doAdd() layout issues after submitting 2012-03-08 18:24:33 +01:00
Ingo Schommer
467db5146b MINOR Removed obnoxious message about tree filtering success (which now became visible as we fixed the statusMessage() system) 2012-03-02 15:23:14 +01:00
Ingo Schommer
18e612e65b MINOR Moved CMSMain.GridField.js logic into LeftAndMain.js (applies to all CMS interfaces), fixed event bugs with GridField overloading in AssetAdmin.js 2012-03-01 00:19:34 +01:00
Ingo Schommer
a317b66a8a MINOR Merge errors 2012-02-28 16:56:21 +01:00
Ingo Schommer
5a69985a52 Merge branch '106-add-edit-records' 2012-02-28 00:22:49 +01:00
Ingo Schommer
7574c3177d MINOR Custom confirm message for deleting folders in AssetAdmin 2012-02-23 23:15:37 +01:00
Ingo Schommer
c32595d1c8 MINOR Fixed selector for changed ".ss-gridfield" DOM structure 2012-02-23 23:15:37 +01:00
Ingo Schommer
eb63384900 MINOR Loading folders in AssetAdmin via panel ajax loading 2012-02-21 21:17:49 +01:00
Ingo Schommer
8c503069b8 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-16 18:06:48 +01:00
Ingo Schommer
63d0fcbde4 MINOR Removed usage of prototype.js style $() alias in WidgetAreaEditor.js 2012-02-16 12:28:24 +01:00
Ingo Schommer
c96e2ba7ca API CHANGE Removed ThumbnailStripField class, as it was only used for the CMS image insertion logic (which was rewritten with a more powerful file selection based on GridField) 2012-02-14 13:32:58 +01:00
Ingo Schommer
490b87a0c5 MINOR Changed 'insert image' form names, removed dynamic node change events for links (modal dialog doesn't allow for changes while the dialog is open) 2012-02-14 13:32:58 +01:00
Simon Welsh
a519411629 BUGFIX Page location radio buttons update ParentID accordingly 2012-02-11 14:13:38 +13:00
Ingo Schommer
cb26a83bd1 MINOR Fixed XSS when changing page title 2012-01-31 14:37:21 +01:00
Ingo Schommer
2814aeb249 MINOR Fixed variable declaration in CMSMain.AddForm.js 2012-01-22 11:58:24 +01:00
Ingo Schommer
e34f56dcc6 MINOR Better failsafes for tree hints (allows add if hint for class is if not defined) 2012-01-09 21:20:58 +01:00
Ingo Schommer
9d1822e7c6 MINOR Don't allow page type selection in add form when radio button is disabled 2012-01-06 16:54:16 +01:00
Ingo Schommer
6887b88099 MINOR Selection bugfixes for CMSMain.AddForm.js, more efficient tree metadata 2012-01-05 23:17:12 +01:00
Ingo Schommer
bb7edf8bfd ENHANCEMENT Marking "link" and "unlink" buttons in SilverStripe's TinyMCE as disabled if no link is selected (see 4646efe84 in sapphire for details) 2012-01-05 00:40:29 +01:00
Ingo Schommer
7a29a4a0ca MINOR Using entwine calls in ssbuttons TinyMCE plugin 2012-01-04 18:06:22 +01:00
Ingo Schommer
a4494d4775 MINOR Triggering parent field expansion on click (on change doesn't work in IE) 2012-01-03 17:57:40 +01:00
Frank Mullenger
ae0ec6304d BUGFIX: Fixes #6809. Updates page title heading when page title changes on edit page in CMS. 2011-12-18 15:34:03 +01:00
Will Rossiter
28dff0107a BUGFIX: prevent refreshing the history panel when reloading versions 2011-12-17 17:17:55 +13:00
Ingo Schommer
15e9d08eaa BUGFIX Making HTML5 History support optional, so we can disable HTML4 hash change fallback 2011-12-15 16:54:58 +01:00
Ingo Schommer
b4eda409c2 ENHANCEMENT Replaced client side URL filtering in CMS with ajax callbacks to new SiteTreeURLSegmentField, in order to align with extended server side logic (and avoid pre-filtering values too heavily before passing them to the server). Removed suggestions from client side user confirmation. 2011-11-14 15:29:19 +01:00
Ingo Schommer
89abb29047 MINOR Fixed reading of javascript metadata in CMSMain.AddForm.js 2011-10-29 22:04:40 +02:00
Ingo Schommer
2ac0ea78cf MINOR Don't emulate built-in radiobutton behaviour in CMSMain.AddForm.js 2011-10-29 22:04:39 +02:00
Julian Seidenberg
ebcc1f324e BUGFIX: "Parent Page" dropdown isn't hidden in "Edit Page" -> Settings (SSO-15) 2011-09-28 11:48:36 +13:00
Ingo Schommer
ab9d62b53c MINOR Removed hardcoding of history ajax links 2011-09-19 21:34:46 +02:00
Ingo Schommer
872239830c BUGFIX Fixed history.pushState() ajax load duplication in CMSPageHistoryController.js 2011-09-19 21:00:17 +02:00
Will Rossiter
18471e8878 ENHANCEMENT: added tests for CMSPageHistoryController::VersionsForm(). BUGFIX: fixed VersionsForm hidden ID storing a reference to itself. ENHANCEMENT: changed url structure from /version/ to /show/ for consistency between CMSPageHistoryController and CMSMain. APICHANGE: moved performRollback() from CMSMain to CMSPageHistoryController 2011-09-19 17:30:47 +02:00
Will Rossiter
f81531115f ENHANCEMENT: added notice template for outputting notices to cmsmain interfaces. 2011-09-19 17:30:47 +02:00
Will Rossiter
d90ea0d236 ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain API. 2011-09-19 17:30:46 +02:00
Ingo Schommer
5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Ingo Schommer
c4a99dfc09 MINOR Redirecting page links in CMSPagesController to CMSPageEditController (admin/pages/show/99 to admin/page/show/99) 2011-07-08 15:36:30 +02:00
Ingo Schommer
c4c3d21fa9 MINOR Using Form->forTemplate() to include <form> tags in controller actions on AssetAdmin and CMSMain (underlying clientside logic has changed) 2011-07-08 15:36:30 +02:00
Ingo Schommer
26151f2e4c ENHANCEMENT Limiting page types based on SiteTree::$allowed_children in CMSMain.AddForm.js 2011-05-08 23:36:55 +12:00
Ingo Schommer
4f157e3133 MINOR Fixed CreateToplevelGroups toggling in CMSMain.EditForm.js 2011-04-30 18:34:52 +12:00
Ingo Schommer
9a09aaf42b ENHANCEMENT Changed CMSMain->AddForm() to a modal dialog, showing page types and their descriptions as radiobuttons rather than a dropdown 2011-04-28 22:49:34 +12:00
Ingo Schommer
09ad6dcaa6 ENHANCEMENT Showing full CMS search form (instead of toggling fields individually), removing metadata search fields (limiting to fields applicable in new designs)
API CHANGE Renamed CMSMain->SearchTreeForm() to SearchForm(), CMSMain->doSearchTree() to doSearch() (search can be used for list and gallery views as well)
API CHANGE Removed CMSMain->SiteTreeFilterOptions() and CMSMain::$site_tree_filter_options, moved to CMSMain->SearchForm()
2011-04-28 22:49:34 +12:00
Ingo Schommer
58416e5dea ENHANCEMENT Added CMSPagesController 2011-04-28 22:49:34 +12:00
Ingo Schommer
b9fc626fc9 MINOR Removed CommentTableField, moved to page-comments module 2011-04-28 22:49:33 +12:00
Ingo Schommer
d48f21afc0 MINOR Renamed #sitetree_ul to .cms-tree in JavaScript logic (changed in LeftAndMain.ss base template) 2011-04-28 22:49:33 +12:00
Ingo Schommer
4ec0fa224e MINOR Changed #sitetree_ul to #sitetree in templates and javascript 2011-04-28 22:48:55 +12:00
Ingo Schommer
766adba5ad ENHANCEMENT Removed tinymce_ssbuttons code which assumed a non-modal dialog (toggling between different link/image/flash forms) 2011-04-28 22:48:55 +12:00
Ingo Schommer
4fe07e9b71 MINOR Using '.cms-edit-form' instead of '#Form_EditForm' selector 2011-04-28 22:48:55 +12:00
Ingo Schommer
c193743b43 MINOR Removed jQuery.layout references 2011-04-28 22:48:53 +12:00
Ingo Schommer
842c38fbc4 MINOR Disable ui-titlebar styling for link/image forms, as it breaks the "insert" button interactions (to be replaced with a new modal dialog implementation soon anyway) 2011-04-05 15:34:59 +12:00
Ingo Schommer
c2457c845b MINOR Moved jquery-changetracker from 'cms' to 'sapphire' 2011-03-28 09:17:58 +13:00
Ingo Schommer
0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
c660284236 MINOR Moved SilverStripeNavigator from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
8c04bafb4e MINOR Added class_exists() check for Translatable, which has moved into a new 'translatable' module 2011-03-28 09:02:41 +13:00
Ingo Schommer
d4dbb0680b BUGFIX Only select node after form reload if creating the node 2011-03-22 18:43:40 +13:00
Ingo Schommer
6cfade0b3d BUGFIX Allowing "batch action" selection in new jstree implementations (first draft, doesn't reflect success/fail state on nodes afterwards)
BUGFIX Passing native JSON array back from CMSBatchActionHandler in order to simplify clientside logic in LeftAndMain.BatchActions.js
2011-03-22 18:43:40 +13:00
Ingo Schommer
6700abe570 BUGFIX Fixed 'onreset' behaviour for IE in CMSMain.js 2011-03-22 18:43:40 +13:00
Ingo Schommer
2497f37f58 ENHANCEMENT Allowing checkboxes and their disabling on LeftAndMain.Tree.js 2011-03-22 18:43:39 +13:00
Ingo Schommer
49a76a0c95 MINOR Fixed ajax load binding to folder selection in ThumbnailStripField.js (was broken after move to jquery) 2011-03-22 18:43:39 +13:00
Ingo Schommer
cfea011680 ENHANCEMENT Fixed tree search 2011-03-22 18:43:39 +13:00
Ingo Schommer
15d320ec91 BUGFIX Adding jstree ajax settings after initial load 2011-03-22 18:43:39 +13:00
Ingo Schommer
91995ad73b MINOR Disabled AssetAdmin form reload after uploading through iframe, relies on old tree.js library - UI will change anyway 2011-03-22 18:43:39 +13:00
Ingo Schommer
3b01a9af67 BUGFIX Allowing HTML titles in LeftAndMain.Tree.js (necessary for <span class="modified"> etc) 2011-03-22 18:43:39 +13:00
Ingo Schommer
5b104b7b8f MINOR Fixed LeftAndMain.Tree.js scope 2011-03-22 18:43:39 +13:00
Ingo Schommer
b2e4fdd6da MINR Fixed double generation of tree via 'data' parameter 2011-03-22 18:43:39 +13:00
Ingo Schommer
23cb19958f BUGFIX Reinstated create page functionality in LeftAndMain.Tree.js 2011-03-22 18:43:39 +13:00
Ingo Schommer
20427cd45b MINOR Using 'apple' theme in tree (until we decide on a proper redesign) 2011-03-22 18:43:39 +13:00
Ingo Schommer
cfb83e4e47 MINOR Wrapping LeftAndMain.Tree.js in entwine block 2011-03-22 18:43:38 +13:00
Ingo Schommer
ea0f8b0e65 BUGFIX Updated various CMS javascript functions to new jstree library 2011-03-22 18:43:38 +13:00
Ingo Schommer
885597a754 MINOR Removed legacy code from LeftAndMain.Tree.js, replaced with a list of @todo items 2011-03-22 18:43:38 +13:00
Ingo Schommer
d22e80b1bd MINOR Replaced hardcoded URLs in LeftAndMain.Tree.js with data-url-* attributes 2011-03-22 18:43:38 +13:00
Ingo Schommer
a9cd7aa08c ENHANCEMENT Allow disabling of tree drag'n'drop via input box 2011-03-22 18:43:38 +13:00
Ingo Schommer
eb030fa0f9 BUGFIX Don't allow dragging tree nodes outside of the root node, don't allow moving the root node, don't access drag/drops from other trees. 2011-03-22 18:43:38 +13:00
Ingo Schommer
cf467d5272 MINOR Disabled animation on tree (for performance reasons) 2011-03-22 18:43:38 +13:00
Ingo Schommer
a137360085 MINOR Temporarily disabled onchange bindings in ThumbnailStripField, as they fail in IE7/IE8 2011-03-22 18:43:37 +13:00