Commit Graph

378 Commits

Author SHA1 Message Date
Will Rossiter ecae94e8c2 MINOR: added unit test for checking whether viewing an unpublished version directly selects the checkbox option 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
Ed ebb1e0f370 MINOR Additional HTML for tree styling in SiteTree->getTreeTitle() 2011-07-08 15:36:31 +02:00
Ed a142e494de Minor class additions to assist styling elements in cms-content-toolbar 2011-07-08 15:36:31 +02:00
Ingo Schommer 38db63c3b0 MINOR Clearer CSS classes in CMS controller templates, added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag) 2011-07-08 15:36:30 +02:00
Ingo Schommer 1ad4bd6dfd MINOR Panel markup for AssetAdmin and CMSPagesController templates 2011-07-06 10:05:55 +02:00
Frank Mullenger b4366c9ca9 ENHANCEMENT 'data-hints' attribute into root of CMSMain site tree, changed from 'allowedParents' to 'disallowedParents', 'allowedChildren' to 'disallowedChildren' for brevity (fixes #6577) 2011-05-08 16:27:20 +12:00
Ingo Schommer bf8bc1d856 MINOR Added CMSPageHistoryController, CMSPageReportsController, marked placeholders for new functionality in AssetAdmin 2011-04-30 16:49:36 +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 94cb3075d0 MINOR Removed unused CMSMain_TreeTools.ss and CMSMain_left.ss templates 2011-04-28 22:49:34 +12:00
Ingo Schommer 5a0208d77a MINOR Wrapping cms-content-header <div> in order to provide overflows without line breaks 2011-04-28 22:49:34 +12:00
Ingo Schommer 58416e5dea ENHANCEMENT Added CMSPagesController 2011-04-28 22:49:34 +12:00
Ingo Schommer 1ae9a318af MINOR Changed ReportAdmin to new ReportAdmin_Content template, viewing available reports as unordered list instead of a tree (they can't be nested anyway) 2011-04-28 22:49:33 +12:00
Ingo Schommer 614fb06336 MINOR AssetAdmin support for new cms layout changes 2011-04-28 22:49:32 +12:00
Ingo Schommer bb4dbaa02c MINOR Removed unused CMSMain_rightbottom.ss 2011-04-28 22:48:56 +12:00
Ingo Schommer 941863aa86 MINOR Removed tree key, to be replaced with bezels alongside the tree nodes
MINOR Removed unnecessary #sitetree_holder classes from LeftAndMain templates
2011-04-28 22:48:55 +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 bc88a44e61 MINOR Removed checkboxActionIndicator from CMSMain_TreeTools.ss, no longer used (in preparation for new batch action handling in SS3) 2011-04-28 22:48:55 +12: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 dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer c660284236 MINOR Moved SilverStripeNavigator from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Paul Meyrick 93bf3029c3 Minor Moved ContentController template from sapphire/templates/ to cms/template in cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer 6e60314006 MINOR Adding classes and markup necessary to style tree before jstree.js loads 2011-03-22 18:43:39 +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 bfd4737aae BUGFIX Remove EmulateIE7 <meta> tag from LeftAndMain.ss (mainly in order to get rendering compatibility with jstree.js) 2011-03-22 18:43:38 +13:00
Sam Minnee 3498e41b0a Merge branch '2.4'
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13:00
Ingo Schommer bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer 0c177bcbca MINOR Removed unused MemberList templates (see MemberTableField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Ingo Schommer 95a917e04d MINOR Translations in CMSMain_left.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:46 +13:00
Ingo Schommer 5c84e5b0f1 MINOR Removed trailing slash in BackURL, fixed error message sentence structure in PageCommentInterface.ss (fixes #5520)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Will Rossiter 58a92cf456 BUGFIX: fixed select all link using incorrect function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Will Rossiter fac64e9aa5 BUGFIX: fixed incorrect include path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer df869f9da7 BUGFIX Can't set width or height on MemberTableField popup (fixes #5625, thanks smurkas)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105665 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer fa0bf8c571 MINOR Updated TableListField sublcass template to work with new TableListField->SelectOptions() setting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer 13995d710a MINOR Fixed _t() call in PageCommentInterface.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer 166d6f421f ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:38 +13:00
Ingo Schommer fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer 8c40e6f4a3 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer 4ff657e03f MINOR Translations in PageCommentInterface.ss (fixes #5598, thanks Pike)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer 38e1a09fb8 BUGFIX Wrong HTML syntax in LeftAndMain.ss (fixes #5552, thanks simon_w)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104403 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Luke Hudson cbc0b0a849 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Ingo Schommer db44725062 BUGFIX login BackURL wrong when using nested urls (fixes #5520, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103933 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Carlos Barberis ebea43ebd8 ENHANCEMENT: added language (Ticket #5390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Will Rossiter a3e8e4e60d BUGFIX: fixed invalid HTML output from page comments template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102320 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Sean Harvey c8945d9819 BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer 67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer 0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation.
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:58 +13:00
Ingo Schommer 8302f97ffc FEATURE set file metadata on upload. (from r97780)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00