Commit Graph

117 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Sean Harvey
499410d7bd BUGFIX: Show selected row in autocomplete dropdown (from r95558)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 06:08:46 +00:00
Mark Stephens
276a36e493 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/trunk@93932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-29 23:29:31 +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
08dc3f0de9 evenly pad out action buttons at bottom
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:45 +00:00
Ingo Schommer
05510ca65f MINOR Rounded corners for notice-wrap layer in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92762 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:23 +00:00
Ingo Schommer
d3172a0775 BUGFIX Hiding LeftAndMain editform while loading new DOM through ajax, to avoid flash-of-unstyled-content issues
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:04 +00:00
Ingo Schommer
cf6181a849 MINOR Fixed positioning in ParentType field in CMS editform
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:13 +00:00
Ingo Schommer
8b8867ba76 API CHANGE Changed <p id=statusMessage> to <div class=notice-wrap> in LeftAndMain_right.ss and subclasses
ENHANCEMENT Using external jquery.notice library to handle status message updates in the CMS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92696 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:14:36 +00:00
Ingo Schommer
bc2cad4670 ENHANCEMENT Floating tinymce toolbar icons in CMS to allow for smaller widths without having tinymce hide the tabset scrollbars
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:39:26 +00:00
Ingo Schommer
1bac2dc4aa BUGFIX Fixed ParentType selector javascript in SiteTree->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:39:18 +00:00
Ingo Schommer
b7f0b400e7 BUGFIX Fixed z-index of jquery.datepicker DIV element, which was hidden under the jquery.layout panels
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:37:23 +00:00
Ingo Schommer
9f4d0da80a ENHANCEMENT Integrating right panels ('insert image', etc.) in CMS with new layout manager, adjusting title bar to jQuery UI styling, making panel content scrollable
MINOR Updated cmsmain/leftandmain javascript to concrete API changes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:26 +00:00
Ingo Schommer
5d4e5def8b MINOR Removed 100% width from tabsets in CMS, was messing up jQuery UI border styling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92602 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:05 +00:00
Ingo Schommer
d45da27296 MINOR Added styling for CMS actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:03 +00:00
Ingo Schommer
22d4141805 MINOR Reordering and indentation in cms_right.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:39 +00:00
Ingo Schommer
61be99cf6e MINOR Removed CMS specific tab styling, now handled by jQuery UI tabs
MINOR New CMS specific styling for CMS buttons

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92589 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:37 +00:00
Ingo Schommer
042f4c2fb3 ENHANCEMENT Removed custom button styling in CMS, now replaced with standard jQuery UI buttons
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:35 +00:00
Ingo Schommer
41fa0b8e05 MINOR CSS fixes for tabset in CMS: Removing vertical overflow, setting to position relative to avoid 'floating' TreeDropdownFields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:30 +00:00
Ingo Schommer
2b55a91646 MINOR Removed unused translation CSS in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92585 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:28 +00:00
Ingo Schommer
ae56eba853 ENHANCEMENT Using jQuery layout manager plugin to size panels in main CMS interface. Removed custom javascript resizing and CSS rules.
API CHANGE Removed custom resizing javascript methods: window.ontabschanged, window.onresize, fixRightWidth(), fixHeight_left()
API CHANGE Removed DraggableSeparator, SideTabs, SideTabItem javascript classes
API CHANGE Removed Effect.ReSize and Highlighter javascript helper classes
API CHANGE Modified template structure in CMSMain_left.ss, CMSMain_right.ss and LeftAndMain.ss
API CHANGE Modified markup IDs in LeftAndMain/CMSMain templates, removed "left", "right", "contentPanel", "bottom"
ENHANCEMENT Using jquery-latest (currently 1.3) in CMSMain and LeftAndMain
ENHANCEMENT Added jQuery UI library and "smoothness" theme to default CMS interface

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:20 +00:00
Sean Harvey
7f4e06c616 MINOR Removed styling for TypeDropdown which was removed in r77395
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:37:51 +00:00
Sean Harvey
c550b63f29 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77246 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 10:42:35 +00:00
Sean Harvey
42a6692d79 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:44:28 +00:00
Sean Harvey
b1045b461c MINOR Merged tinymce toolbar improvement change from cms/branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-09 05:20:49 +00:00
Sean Harvey
55ba6f6cfa BUGFIX Fixed styling of consistent label colours for non-left aligned labels
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-12 02:47:50 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:46:15 +00:00
Sean Harvey
9d32dd4026 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:26:44 +00:00
Sean Harvey
3680bbea46 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:22:20 +00:00
Ingo Schommer
300435fb13 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +00:00
Ingo Schommer
3c8e45f65a MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:58 +00:00
Sean Harvey
bd10591e7c ENHANCEMENT Added filter/search capability to AssetTableField, this is similar to MemberTableField, except you search by file name.
ENHANCEMENT Refactored CSS applied to filter boxes by using common selector

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 23:09:49 +00:00
Sam Minnee
e32d366975 Fixed TinyMCE stylihg
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 02:36:54 +00:00
Sam Minnee
9f4ad4b2cc FEATURE: Update to TinyMCE 3.2 - CMS changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:03:33 +00:00
Hayden Smith
690cebdccd Merged from branches/nzct-trunk. Use 'svn log -c <changeset> -g' for full commit message. Merge includes stability fixes and minor refactor of TableListField and ComplexTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 02:00:39 +00:00
Sam Minnee
1844173308 Corrected layout of field groups
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-22 22:51:18 +00:00
Sean Harvey
92f0f65e70 ENHANCEMENT Consistent styling of TypeDropdown in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61166 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 05:25:14 +00:00