Commit Graph

337 Commits

Author SHA1 Message Date
Ingo Schommer
6d3cf213e7 MINOR Removed unnecessary tree CSS styles, will be replaced by new styles based on jstree.js 2011-03-22 18:43:38 +13:00
Ingo Schommer
8419ee8b3a MINOR Removed custom TreeDropdownField CSS styles (copypasted the entire block only to adjust widths), no longer necessary due to a flexible width system on the base styles 2011-03-22 18:43:38 +13:00
Ingo Schommer
3dbe03c3f9 MINOR Reverted floating of TinyMCE icons, as they don't automatically break into multiple lines like other floated elements 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
Sean Harvey
fe44a59fde BUGFIX Styling fixes for DateField/TimeField/DatetimeField in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Ingo Schommer
862b9823d1 MINOR Fixed DatetimeField display in cms
MINOR Removed obsolete .calendardate styles from cms_right.css

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +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
Carlos Barberis
c69df0f2b1 BUGFIX: action buttons always visible (not need to scroll) ticket 5051
BUGFIX: got rid of double scroll
BUGFIX: do not show action buttons (delete/save) when showing result list
ENHANCEMENT: fixed forward button underneath result form


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Ingo Schommer
7f3c14784f MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion (from r98883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
830fce69e9 MINOR Moved generic .TreeDropdownField styling from cms/css/cms_right.css to sapphire/css/TreeDropdownField.css (from r98881)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99687 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Sam Minnee
273cc2e930 BUGFIX: Pages that you can't edit should always be grey, even if there are unpublished changes.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Ingo Schommer
5484aaf01a MINOR Moved cms specific styling in CalendarDateField.css to cms/css/cms_right.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99362 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:55 +13:00
Ingo Schommer
8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:49 +13:00
Ingo Schommer
afdc77b293 MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (see r98854)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
905da3febf ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm (merged and rewritten from r98750)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Sam Minnee
8eef5a7d99 MINOR add pretty warning colors to expiring content warning (from r97151)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98210 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
9406cd7c9a BUGFIX: Add horizontal scrolling to reports when necessary. (from r96086)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
0782c0de4d ENHANCEMENT: Improved look and feel for report filtering
ENHANCEMNT: Added export and print buttons to reports (from r95815)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Will Rossiter
da57175a2d MINOR: visual tweaks to the widgets area including widget titles can now be spread over multiple lines and padding between columns. #4965
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Mateusz Uzdowski
df2b51eda3 BUGFIX: the anchor dropdown now works in IE. Also fixes other anchor-related problems as described in ticket #4961
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97673 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Sean Harvey
9cf86ec8af ENHANCEMENT Added hover states to "Available widgets" boxes in the CMS for usability
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Sean Harvey
e9cd3eba62 ENHANCEMENT Added visual elements to aid in the usability of the WidgetAreaEditor
MINOR Added better help text underneath "Available Widgets" and "Widgets currently used"


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97602 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Sean Harvey
47f782c907 MINOR Cursor is now a pointer for available widgets, as you need to click them to add to the available widget stack
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97540 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Sean Harvey
4194aaeaac ENHANCEMENT Adjusted "Available Widgets" column to be narrower than "Widgets currently used", allowing more space for configuring widgets
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:26 +13:00
Will Rossiter
a19fea2416 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Will Rossiter
169598e1ea BUGFIX: Fixed add button overlapping image/flash popups in modeladmin. #4906
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
79968d0814 API CHANGE: Added capability for batch actions to indicate failure through red checkboxes (from r94868)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
59899c68cf ENHANCEMENT: Added 'greyed out' status of batch action checkboxes while applicable pages are being loaded via ajax. (from r94774)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
513de2271a MINOR no longer assume with batch actions that the child pages of a parent are to be ticked (from r90999)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
9abe9a581b BUGFIX: Fixed width of time dropdown fields in the LHS CMS (from r89913)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +13:00
Mark Stephens
bf2ed79d8f ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Luke Hudson
177b3998b3 BUGFIX: Show selected row in autocomplete dropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +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
Saophalkun Ponlu
d97cfcbc7f ENHANCEMENT: Improve CMS loading screen #6254
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 04:08:02 +00:00
Will Rossiter
1d23f21a7d BUGFIX: fixed typo in the cms_left.css. Fixes #6154.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 01:06:25 +00:00
Ingo Schommer
a5103c3d43 BUGFIX Styling fixes for DateField/TimeField/DatetimeField in the CMS (from r107812)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:58:20 +00:00
Ingo Schommer
7d4f93f0fd MINOR Fixed DatetimeField display in cms
MINOR Removed obsolete .calendardate styles from cms_right.css (from r107442)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:56:59 +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
Sam Minnee
4961a9cd26 BUGFIX: Pages that you can't edit should always be grey, even if there are unpublished changes. (from r99572)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:06:55 +00:00
Ingo Schommer
3e3c0c7237 MINOR: visual tweaks to the widgets area including widget titles can now be spread over multiple lines and padding between columns. #4965 (from r98032)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:40:53 +00:00
Ingo Schommer
dd2dd831b7 BUGFIX: the anchor dropdown now works in IE. Also fixes other anchor-related problems as described in ticket #4961 (from r97673)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:23:53 +00:00
Ingo Schommer
7246dc86e2 ENHANCEMENT Added hover states to "Available widgets" boxes in the CMS for usability (from r97606)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:20:59 +00:00
Ingo Schommer
addd1dea0c ENHANCEMENT Added visual elements to aid in the usability of the WidgetAreaEditor
MINOR Added better help text underneath "Available Widgets" and "Widgets currently used" (from r97602)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:20:28 +00:00
Ingo Schommer
8c06bda962 MINOR Cursor is now a pointer for available widgets, as you need to click them to add to the available widget stack (from r97540)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:00:59 +00:00
Ingo Schommer
51f95081c4 ENHANCEMENT Adjusted "Available Widgets" column to be narrower than "Widgets currently used", allowing more space for configuring widgets (from r97530)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:00:43 +00:00
Ingo Schommer
32bdc74381 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. (from r97489)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 21:57:55 +00:00
Ingo Schommer
841b11ed26 BUGFIX: Fixed width of time dropdown fields in the LHS CMS (from r89913) (from r96797)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:26:30 +00:00
Ingo Schommer
d68bbc2c01 MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 04:01:49 +00:00
Ingo Schommer
ecab219100 MINOR Moved generic .TreeDropdownField styling from cms/css/cms_right.css to sapphire/css/TreeDropdownField.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 04:01:46 +00:00
Ingo Schommer
bc407889d1 MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (see r98854) (merged from r98855)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98865 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-12 02:42:28 +00:00