Commit Graph

3294 Commits

Author SHA1 Message Date
Andrew O'Neil
80fe9c8864 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:58:19 +01:00
Andrew O'Neil
346b9d06f7 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:05:30 +13:00
Ingo Schommer
aef351466e Merge branch 'master' into integration 2012-02-28 00:35:10 +01:00
Ingo Schommer
5a69985a52 Merge branch '106-add-edit-records' 2012-02-28 00:22:49 +01:00
Ingo Schommer
d09c071899 Merge branch 'master' into integration
Conflicts:
	templates/Includes/AssetAdmin_Content.ss
2012-02-24 00:31:36 +01:00
Ingo Schommer
f216c783c6 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:39:06 +01:00
Ingo Schommer
09fd710dd4 MINOR Combining CSS in CMS, added AssetAdmin styles 2012-02-23 23:15:37 +01:00
Ingo Schommer
7574c3177d MINOR Custom confirm message for deleting folders in AssetAdmin 2012-02-23 23:15:37 +01:00
Ingo Schommer
c582f08ea3 MINOR Ensuring a valid Folder object is returned from AssetAdmin->currentPage() to avoid breaking AssetAdmin->getEditForm(), e.g. when a GridField search is conducted 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
81d362d5f8 MINOR Styling 2012-02-23 23:15:37 +01:00
Ingo Schommer
c7c2a2c409 ENHANCEMENT New "add folder" logic for AssetAdmin 2012-02-23 23:15:37 +01:00
Ingo Schommer
71c7664c95 MINOR Moved AssetAdmin-specific fields from Folder->getCMSFields() to AssetAdmin->getEditForm(), added button icons and toolbar 2012-02-23 23:15:35 +01:00
Ingo Schommer
5a6ed1a603 MINOR Backlink for "Add files" UI 2012-02-21 21:17:56 +01:00
Ingo Schommer
eb63384900 MINOR Loading folders in AssetAdmin via panel ajax loading 2012-02-21 21:17:49 +01:00
Stig Lindqvist
876c809a7d ENHANCEMENT Filterpanel for assetadmin 2012-02-21 16:02:54 +13:00
Hamish Friedlander
c3bf93468f BUGFIX: SiteTree#getCMSFields referenced $linkedPages even if $linkedPages wasnt set 2012-02-21 15:56:20 +13:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
jbridson
371f42e61a MINOR:added classes for assets page so that the icons for view tabs appear. 2012-02-17 12:45:32 +13:00
jbridson
128d3a8316 MINOR:added classes so that the tabs to change page view can have the appropriate icons. 2012-02-17 12:45:32 +13:00
Hamish Friedlander
3b0ab9b0a0 BUGFIX: SiteTree#getCMSFields referenced $linkedPages even if $linkedPages wasnt set 2012-02-17 12:06:12 +13:00
Ingo Schommer
88952c0ac7 MINOR Using HTML5 data attributes for denoting layout in templates 2012-02-16 18:06:53 +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
68e9e91a78 ENHANCEMENT New panel styling for AssetAdmin and CMSFileAddController (SSF-24) 2012-02-16 13:59:29 +01:00
Ingo Schommer
93b3fe8a23 API CHANGE Removed unused AssetTableField, handled by GridField now 2012-02-16 13:59:29 +01:00
Ingo Schommer
3d7fb25ce1 MINOR Fixed admin/settings panel switching (was nesting .cms-content area) 2012-02-16 13:56:33 +01:00
Ingo Schommer
1301df00d6 MINOR Button styling for "Settings" form 2012-02-16 12:35:13 +01:00
Ingo Schommer
5167e394d4 MINOR DOM identifiers for tools panels so that the Panel.js logic can store their expansion state in a cookie 2012-02-16 12:34:59 +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
38cf7e5c4d ENHANCEMENT Using new "tools" panel architecture to render CMS templates, which e.g. allows CMSPageEditController to reload the form without the tree in the side-by-side display variation, and hence avoids slowing down the loading and saving process 2012-02-15 14:28:07 +01:00
Ingo Schommer
f88d4006f8 ENHANCEMENT CMSMain->Breadcrumbs() 2012-02-14 16:11:38 +01:00
Ingo Schommer
023902c4cc MINOR Unsetting any current record state in CMSPagesController, as it doesn't deal with records (and it wrongly highlights the current tree node) 2012-02-14 16:00:48 +01:00
Ingo Schommer
f4e3e79c0d 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
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
Cam Findlay
21289128bb MINOR SiteTreeURLSegmentField has new methods to aid in displaying URL prefix and secondary information text (fixes #6852) 2012-02-14 11:12:47 +01:00
Sean Harvey
7ffb5056a4 Merge pull request #60 from oddnoc/cleanup
MINOR Code cleanup: removed trailing ?> markers per code standard.
2012-02-13 12:53:09 -08:00
Fred Condo
f22f1201de Code cleanup: removed trailing ?> markers per code standard.
lang directory only
2012-02-13 12:48:55 -08:00
Fred Condo
d99e3a0927 Code cleanup: removed trailing ?> markers per code standard.
All cms module except lang directory.
2012-02-13 12:48:41 -08:00
Will Rossiter
adcb0a5c73 MINOR: remove duplicate controller folder 2012-02-11 16:29:06 +13:00
Will Rossiter
c958147609 MINOR: update HTTPResponse to SS_HTTPResponse. Ensure ID is casted as int when displaying in error message 2012-02-11 15:50:09 +13:00
Will Rossiter
8fe767b5f2 FEATURE: move breadcrumbs out to a customizable template 2012-02-11 15:13:51 +13:00
Will Rossiter
95f35cc0d2 Merge pull request #59 from simonwelsh/master
BUGFIX Page location radio buttons update ParentID accordingly
2012-02-10 17:18:25 -08:00
Simon Welsh
a519411629 BUGFIX Page location radio buttons update ParentID accordingly 2012-02-11 14:13:38 +13:00
Will Rossiter
01cef8a86d Merge pull request #54 from jthomerson/allow_different_homepage_url_master
ENHANCEMENT: Allow the homepage to have a different URL.
2012-02-10 17:08:16 -08:00
Will Rossiter
50ff9b6962 ENHACEMENT: include sitetree on the CMSPage editing screen 2012-02-11 14:02:22 +13:00
Ingo Schommer
8f25c8ee93 Merge pull request #58 from silverstripe-scienceninjas/pull/geteditform-strict-standard
MINOR getEditForm should have the same signature as parent class
2012-02-10 15:42:14 -08:00
Stig Lindqvist
6d37826305 MINOR getEditForm should have the same signature as inherited classes (PHP strict standard) 2012-02-10 23:16:09 +01:00
Ingo Schommer
7af4029a9a Merge pull request #57 from simonwelsh/patch-1
BUGFIX Preview button URL had wrong case for stage parameter.
2012-02-10 02:25:53 -08:00
Simon Welsh
fd39ed20a7 BUGFIX Preview button URL had wrong case for stage parameter. 2012-02-10 13:41:40 +13:00