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,507 Commits 29 Branches 403 Tags 28 MiB
a99d7b0b1d
Commit Graph

107 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
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
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
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
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
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
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
Mateusz Uzdowski
3379870b19 MINOR: #4843 removed the secondary scrollbar visible when 'allow drag and drop reordering' was checked by adding 5px of additional space under the tree to accomodate the div drop-target between the entries. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95746 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-17 02:25:45 +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
604c9798a2 removed overflow from top menu bar (was showing a scrollbar) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92796 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:18:47 +00:00
Ingo Schommer
50d058b0cc styles for righthand content panel to match sitetree 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92791 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:18:35 +00:00
Ingo Schommer
1a5ed26cd5 ENHANCEMENT Making jQuery.layout dimension settings in CMS configurable through CSS, to allow for easy overloading without using the javascript object (e.g. making the sidebar wider in ModelAdmin through ModelAdmin.css) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92765 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:17:29 +00:00
Ingo Schommer
7561dc69bc MINOR Fixed height of loading screen for IE6 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92702 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:14:51 +00:00
Ingo Schommer
7400f8e3d1 ENHANCEMENT Using concrete for CMS loading screen javascript 
ENHANCEMENT Better styling for non-javascript message in CMS loading screen

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92701 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:14:49 +00:00
Ingo Schommer
d478f175b7 MINOR Layout manager tweaks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92699 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:14:43 +00:00
Ingo Schommer
b9041367bf BUGFIX Ensuring the padding rules for loading indicators in CMS action buttons are properly applied 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:38:42 +00:00
Ingo Schommer
b50f1a5978 MINOR Removed obsolete css rules for tree search in left panel 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92624 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:37:17 +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
d973510fef MINOR Removed .thumbnailstrip 100% width, which breaks the right panel forms in CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92607 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:36:19 +00:00
Ingo Schommer
c5eadd81ab ENHANCEMENT Using jQuery UI tabs for tree tools like 'search' or 'batch actions' instead of custom JavaScript 
API CHANGE Removed 'treeactions' javascript global

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92603 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:36:09 +00:00
Ingo Schommer
e7562ba0ab MINOR Removed #SearchControls dropdown width to allow for full title display within the UI element 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92591 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:35:41 +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
63e1fede45 MINOR Changed to CMS layout 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92584 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:35:27 +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
Will Rossiter
ada0084506 MINOR: fixed typo in layout.css file. Ticket #4398 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85690 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-03 21:57:53 +00:00
Sean Harvey
09128f09b2 BUGFIX Changed references from "Image" to "FolderImages" 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79168 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 03:19:44 +00:00
Sean Harvey
d0e3ae5d6b BUGFIX Fixed clearing issue in checkbox actions CMSMain_left 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76860 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 06:21:02 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 06:11:18 +00:00
Sam Minnee
1a1229cd96 BUGFIX: Fixed tab layout for add form of model admin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76841 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 05:18:50 +00:00
Sean Harvey
0a362cc542 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76663 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-12 05:14:52 +00:00
Sean Harvey
7dd4e4284c ENHANCEMENT Added loading indicator for the AJAX request "Show deleted pages" checkbox in the CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 06:22:00 +00:00
Sean Harvey
4389affa5c BUGFIX Fixed checkbox "Show only changed pages" alignment issue 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76244 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 05:16:53 +00:00
Sean Harvey
e2a704d127 Reverted r69557 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:18:05 +00:00
Sean Harvey
09bc4d359a Merged in r75812 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:05:08 +00:00
Sean Harvey
4e4810bbb6 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 22:47:28 +00:00
Sean Harvey
7446bc29e9 BUGFIX Tweak CSS for contentpanel 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75696 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 01:29:09 +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
Sam Minnee
550931c02a Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72801 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 21:59:19 +00:00
Andrew O'Neil
fa76e64d48 Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:35:29 +00:00
Sean Harvey
31f530cb0f Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71279 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:56:56 +00:00
Sean Harvey
75f962b6e9 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71277 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:52:06 +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
22b5b6ea7e Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71272 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:38:04 +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
2591492023 BUGFIX Ensuring that new pages can't be created when in translation mode by disabling the "create..." tree action 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70322 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-19 00:09:55 +00:00
Ingo Schommer
7e09cc8a18 MINOR merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69858 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-07 23:01:47 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:17:59 +00:00
Saophalkun Ponlu
b109f1c061 MINOR: fixed some alignments 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69685 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 03:06:57 +00:00