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
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
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
Ingo Schommer
52d56fda05
MINOR Making full result table rows in ModelAdmin selectable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:59 +00:00
Ingo Schommer
2683a5ae62
MINOR Making full result table rows in ModelAdmin selectable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92773 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:49 +00:00
Ingo Schommer
650d44dd57
ENHANCEMENT Reimplemented ModelAdmin history feature as separate javascript file based on jQuery.concrete. It removes any dependencies to PHP code or existing markup, which means it can be disabled if not required.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:41 +00:00
Ingo Schommer
001151a66b
API CHANGE Adjusted ModelAdmin CSS, JS and PHP to fit with underlying LeftAndMain changes: Using jquery.concrete, removing some redundant form saving logic in ModelAdmin.js, returning <form> tags within ajax responses in ModelAdmin controllers
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:34 +00:00
Sean Harvey
182d1061a9
Merged from 2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 06:37:45 +00:00
Normann Lou
230a70c02a
merge open/modules/cms/branches/2.3 changeset 73452
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-24 08:23:09 +00:00
Sean Harvey
97d8522e04
MINOR ModelAdmin left hand panel styling tweaks
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-11 21:57:18 +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
6f33a5fcf6
Cleaned up the commented-code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 20:52:38 +00:00
Saophalkun Ponlu
f72f2b4dd0
IMPROVEMENT Fix tab display and button position when adding a record (ticket #3029 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:14:00 +00:00
Saophalkun Ponlu
86017a5ae9
IMPROVEMENT moved managed models' forms to one panel (ticket #2898 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 08:55:07 +00:00
Saophalkun Ponlu
1d0134db10
fixed fix position of action area (status message and ajax action buttons) in IE6 using javascript
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 00:31:33 +00:00
Saophalkun Ponlu
9381860e9a
layout fix: make the status message and ajax button stay in fixed position (ticket #2876 )
...
- position: fixed for #statusMessage and ajaxActions in ModelAdmin
- commented out this.style.position = "absolute"; in LeftAndMain.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 03:04:35 +00:00
Sam Minnee
dcb9e53ed0
Updated ModelAdmin.js to use $ instead of jQuery for executing jQuery items.
...
Added support for specifying a SearchClassSelector() method on ModelAdmin, which returns 'tabs' or 'dropdown', to enable a better UI for ModelAdmins that manage a large number of different classes.
Updated ModelAdmin's javascript to provide more status indicator (loading icons, success/failure messages), using HTTP status codes and custom status text.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62334 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-13 04:45:30 +00:00
Ingo Schommer
cc0117a307
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:21:44 +00:00
Ingo Schommer
c4651a2fda
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Ingo Schommer
66b916abc5
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
7ec72c8254
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:17:51 +00:00
Ingo Schommer
689c34400b
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:57:44 +00:00
Ingo Schommer
8a4c5fef72
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:00:42 +00:00
Ingo Schommer
4b5ab8a997
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
038bcbb8d9
(merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:28:25 +00:00