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
38e1a09fb8
BUGFIX Wrong HTML syntax in LeftAndMain.ss ( fixes #5552 , thanks simon_w)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104403 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +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
Saophalkun Ponlu
2afc2e99dd
MINOR: Reinstate noscript tag for no javascript warning message on loading screen
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 05:16:57 +00: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
2d0f3be756
APICHANGE: changed BaseHref to AbsoluteBaseURL for consistency. FEATURE: added BaseURL for getting non absolute value. PATCH via muzdowski ( #6158 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 02:01:13 +00:00
Ingo Schommer
139c3e8c40
APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395) (from r99114)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 02:45:23 +00:00
Ingo Schommer
4aa80af647
MINOR Fixed spacing in CMS bottom bar template (LeftAndMain.ss)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:15 +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
773d7c9e18
API CHANGE Removed StageLink javascript class, replaced with 'concrete' implementation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:38: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
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
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
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
3d4630a2c8
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 02:50:25 +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
Sam Minnee
54ac444b2c
BUGFIX #2987 - IE8 support via IE7 compatability mode
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 00:41:11 +00:00
Ingo Schommer
2a93f96436
ENHANCEMENT Added ViewableData->i18nLocale, used in LeftAndMain.ss to determine interface language through meta tags (see r63564)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63565 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-03 00:44:24 +00:00
Sam Minnee
366ceda590
ENHANCEMENT #2700 - Added section title to CMS title tag
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@62894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-23 02:24:23 +00:00
Andrew O'Neil
e9cb69118b
MINOR #2696 - Add message when trying to load the CMS with javascript
...
disabled (simon_w)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-01 05:03:38 +00:00
Ingo Schommer
861fae99e1
ENHANCEMENT Using Requirements instead of hardcoded template logic to include some LeftAndMain js/css
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:29:12 +00:00
Ingo Schommer
6401ee7eaf
(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@60211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:53:34 +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
Sean Harvey
3015bea8dc
ENHANCEMENT Allow subclass of CMSMain to view the SwitchView context for staging/published site links
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-24 03:22:39 +00:00
Sam Minnee
4ab91642b3
Merged revisions 52298 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r52298 | sminnee | 2008-04-08 12:35:20 +1200 (Tue, 08 Apr 2008) | 1 line
Added LeftAndMain::set_loading_image() for replacing the image shown when the CMS is loading
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:39:00 +00:00
Sean Harvey
909b3487fe
FEATURE: Ticket #2321 - Merged patch allowing CMS to be fully rebrandable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 03:19:53 +00:00
Sam Minnee
7d00a996b4
rbarreiros: #1918 Translate newsletter and other strings
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Andrew O'Neil
1ec701d849
#1815 - The Page view: Edit | Draft Site | Published shouldn't show when it's not relevant (merged from branches/2.2.0@45907, r44977)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:28 +00:00
Sean Harvey
b6bff63b10
Styling, and tweak to show logged in user even if first name doesn't exist
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 02:43:23 +00:00
Andrew O'Neil
28d8dfdfaf
Move flash, image and link forms to right
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 05:39:14 +00:00
Sean Harvey
e33cd71485
Ticket #1498 - fail, didn't close span
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44294 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:28:19 +00:00
Sean Harvey
e5a0abf989
Ticket #1498 - Usability fix - span not <a> - can't click it without the href
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:24:24 +00:00
Sean Harvey
3913c747cd
Ticket #1498 - display: none for archived site until it's turned on by js
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 21:51:50 +00:00
Sean Harvey
b264b411a2
Ticket #1498 - clean up, added coloured link for links, ensure bottom footer doesn't receive this
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 21:51:17 +00:00
Will Rossiter
77be4f43f1
tidy up images and get links at least working now
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44166 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:10:31 +00:00
Jeremy Shipman
ef1457f597
Reverting typography changes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:01:40 +00:00
Jeremy Shipman
64749dfd3d
added cms_typography.css to replace typography.css in the cms, as it confusues with front end typography.css
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 02:14:20 +00:00
Will Rossiter
ad0fa1c84c
made titles bold in the site tree
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44141 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 01:12:31 +00:00
Will Rossiter
afd16bf60b
footer styling
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44134 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 23:35:23 +00:00
Ingo Schommer
2befee113b
FEATURE Sapphire files are now also scanned for _t calls
...
ENHANCEMENT Revised locale list
ENHANCEMENT Updated en_US generated files (and created for sapphire)
BUGFIX Fixed some _t() calls in the cms module
(merged from patch #1476 by bfojcapell)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-20 23:49:14 +00:00
Ingo Schommer
7ab29414f8
BUGFIX: Changed language-dropdown to normal dropdown-field (wasn't selecting the right languages)
...
FEATURE: Added "profile"-popup with Member_ProfileForm (see r42730)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:16:23 +00:00
Ingo Schommer
a1bbe0d08e
bfojcapell: removing semicolons from _t() calls (not needed now)
...
(merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:34:40 +00:00
Ingo Schommer
be4ed16a0c
bfojcapell: strings replaced by calls in the Site Content area. The regenerated master string table and a spanish translation are also added. Always, if you get any kind of blank string, just regenerate en_US.php by visiting /i18n/text_collector
...
(merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:21:13 +00:00
Sam Minnee
56a65ab20d
Added CMSTopMenu template, so that add-on modules could change the top menu
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-16 06:25:55 +00:00
Hayden Smith
abb9a61d0d
Moved CMS module to open source path
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:05 +00:00