tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
2,622 Commits 29 Branches 403 Tags 28 MiB
1ae9a318af
Commit Graph

228 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
16f9491f94 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels 
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:27 +13:00
Sam Minnee
430f30b7c4 MINOR more fix around batch action parameters (from r88837) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96788 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:12 +13:00
Sam Minnee
b14404922d ENHANCEMENT: Files and images section warns if you are deleting a file that is linked to 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96778 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:11 +13:00
Ingo Schommer
ce3365d095 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:52:04 +13:00
Will Rossiter
e6ad58a006 MINOR: removed comment specific templates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-11 06:07:20 +00:00
Ingo Schommer
0bf70b9032 BUGFIX: fixed select all link using incorrect function (from r105868) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112483 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:33:58 +00:00
Ingo Schommer
c77f395451 BUGFIX: fixed incorrect include path (from r105833) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112482 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:33:41 +00:00
Ingo Schommer
71209b7402 BUGFIX Can't set width or height on MemberTableField popup (fixes #5625, thanks smurkas) (from r105665) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112480 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:32:45 +00:00
Ingo Schommer
cc4160cdf7 MINOR Updated TableListField sublcass template to work with new TableListField->SelectOptions() setting (from r105273) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:49:35 +00:00
Ingo Schommer
8b39c98248 ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin (from r105271) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112466 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:49:20 +00:00
Ingo Schommer
0ac0beca47 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz) (from r104980) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112461 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:46:53 +00:00
Ingo Schommer
e9b8594fe9 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests (from r104078) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112451 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:33:10 +00:00
Sam Minnee
6f0743fbb2 BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField (from r101375) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111642 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 06:08:13 +00:00
Ingo Schommer
ce675197bb API CHANGE: Introduced new API for SS_Report (from r98215) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105808 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-28 01:35:53 +00:00
Ingo Schommer
1e510684a3 ENHANCEMENT: Files and images section warns if you are deleting a file that is linked to (from r96778) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105678 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 23:38:34 +00:00
Ingo Schommer
3b50f8d3f3 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels 
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title (from r97597)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102731 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 22:19:49 +00:00
Ingo Schommer
1ba1c563a8 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'))

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-11 21:55:33 +00:00
Ingo Schommer
d0cc476c2a MINOR Merged CanOrganiseSitetree permission into CMSMain_TreeTools.ss (originally implemented in r84073) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-22 08:23:16 +00:00
Ingo Schommer
683dfa9426 MINOR Styling of side reports and tree area in CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:08 +00:00
Ingo Schommer
f793ffd368 ENHANCEMENT SideReportsHandler class for easier handling and templating of "side reprts" in the CMS interface 
API CHANGE Removed CMSMain->ReportFormParameters()/ReportForm()/sidereport(), replaced with new SideReportsHandler class

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92846 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:54 +00:00
Ingo Schommer
e56852dcd8 ENHANCEMENT Adjusted SecurityAdmin to new LeftAndMain API and jquery.concrete javascript. Changed 'delete' and 'create' interface to be more in line with CMSMain parent implementation, and increase code reuse. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:17 +00:00
Ingo Schommer
c467c926fd ENHANCEMENT Converted AssetAdmin and AssetTableField javascript to jquery-concrete 
MINOR Moved AssetAdmin->movemarked() logic to AssetTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92829 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:11 +00:00
Ingo Schommer
26df8bd9af ENHANCEMENT Moved AssetAdmin->deletemarked() logic into AssetTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92826 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:20:03 +00:00
Ingo Schommer
9be25f8a18 MINOR Fixed CommentAdmin_left.ss links 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92823 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:54 +00:00
Ingo Schommer
343044e89c ENHANCEMENT Using built-in TableListField javascript deletion for AssetTableField 
ENHANCEMENT Less template overloading in AssetTableField.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:47 +00:00
Ingo Schommer
067b7bcaeb ENHANCEMENT Changed AssetAdmin interface 'delete' action to behave same as main CMS interface: Show 'batch actions' with dropdown. Added AssetAdmin_DeleteBatchAction class. 
ENHANCEMENT Moved 'Sync files' action in AssetAdmin from toplevel tab to the bottom of the tree and hooked up to AssetAdmin->SyncForm to avoid hardcoding the URL.
ENHANCEMENT Changed AssetAdmin interface 'create' button to show dialog and 'go' button, and behave similar to the main CMS interface

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92802 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:19:05 +00:00
Ingo Schommer
b9bfcc99b5 API CHANGE Renamed CMSMain->AddPageOptionsForm() to AddForm() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92797 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:18:51 +00:00