Commit Graph

2904 Commits

Author SHA1 Message Date
Ingo Schommer
fbbbc9f0bc MINOR Fixed breadcrumbs for CMSSettingsController 2012-03-02 20:45:44 +01:00
Ingo Schommer
d1581c2b9b ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField 2012-03-02 20:45:34 +01:00
Ingo Schommer
7125af918d BUGFIX Fixed CMSFileAddController upload in custom folders 2012-03-02 15:43:22 +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
75694726d9 MINOR Removed duplicate AssetAdmin.scss file 2012-03-02 15:22:38 +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
6860c5dd9f MINOR Consolidated AssetAdmin->FilterForm() button styling and labels with CMSMain 2012-02-29 21:06:21 +01:00
Ingo Schommer
ebfc1526ad MINOR Removed duplicate reset CSS from cms 2012-02-29 21:06:02 +01:00
Ingo Schommer
477c319cac Merge branch 'master' into integration 2012-02-28 20:17:49 +01:00
Ingo Schommer
e96d6f5bd5 MINOR Linking breadcrumbs to root node via AssetAdmin->Breadcrumbs() 2012-02-28 20:11:07 +01:00
Ingo Schommer
f78ab9097a MINOR Reinstated getting current record ID from session in AssetAdmin in order to allow routing to GridFieldPopupForms detail views (admin/assets/show/99 vs admin/assets/EditForm/field/...) 2012-02-28 20:10:39 +01:00
Ingo Schommer
a317b66a8a MINOR Merge errors 2012-02-28 16:56:21 +01:00
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
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
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