Commit Graph

1061 Commits

Author SHA1 Message Date
Ingo Schommer
aae16dc1f6 MINOR Hardcoded yoursite.com in assets treeview (see #3230)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68534 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
ccebbcf6ea MINOR fixed javascript initialization bug in SecurityAdmin_left.js (see #3211)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
b0839bd816 MINOR Hiding border around <fieldset>s in ModelAdmin add form (see #3214)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
12f46de93d MINOR fixed php notices on AssetAdmin (see #3187)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Sean Harvey
c4119ead33 BUGFIX Fixed PHP notice in RebuildStaticCacheTask
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68463 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
d9e9e5f348 ENHANCEMENT Using LeftAndMain->canView() in LeftAndMain->init() - if current admin interface can't be viewed, iterate over remaining interfaces until we find a valid one. This only includes admin interfaces with a valid controller, so it should fix the obnoxious redirect to userhelp.silverstripe.com when a website-user tries to access the CMS.
ENHANCEMENT Added LeftAndMain->canView() to check for logged-in member and CMS_ACCESS_* permissions in a testable way
ENHANCEMENT Don't show "Reports" admin section if no subclasses of SSReport are found (or none of the existing subclasses returns a valid canView())
ENHANCEMENT Added CMSMenu::get_viewable_menu_items() and using it in LeftAndMain->MainMenu()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
e817a013d8 BUGFIX Fixed ModelAdmin import success message (too few arguments for sprintf())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68331 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Brian Calhoun
709e352bbc Added ability for comment authors to leave a URL as a separate form field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
ca4a4a9c2f MINOR Styling for input.disabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
00af8833c9 MINOR updated translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
f461b91eba BUGFIX Moved creation of "help" menu entry from cms/_config.php to LeftAndMain::init() to get localized titles (locale isn't set at _config.php level)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
c09aed0fda BUGFIX Fixed i18n display of menu titles rendered by CMSMenu in LeftAndMain->MainMenu()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
e52672b314 MINOR Updated language master table
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
9402758823 BUGFIX Changing i18n entity format in CMSMenu->provideI18nEntities() to have actual class as namespace (related: r66264)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68159 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
dd50c757d3 MINOR Updated cms lang master table
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
b2bbb3945d MINOR formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Andrew O'Neil
df217369da BUGFIX: #3174 - Unable to drop widgets into widget areas in CMS (marcink)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
5b356e8617 BUGFIX Added $CurrentLink to templates of AssetTableField and MemberTableField in order to support auto-refreshing after popup-close (see #2925)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67526 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sean Harvey
9fa7446355 BUGFIX Avoid ugly border in CMS forms by adding "border: none" in CSS to cms/css/layout.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sean Harvey
74545e682c MINOR Removed whitespace after ?> end PHP tag
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Ingo Schommer
9c81737a57 BUGFIX Moving Requirements::combine_files() calls from cms/_config.php to LeftAndMain->init() to avoid side-effects in non-CMS contexts. Examples:
- including prototype.js in a website had caused jQuery to be loaded as well through base.js
- including greybox.js had caused the screen to become unscrollable because of an (unrelated) inclusion of LeftAndMain.js which sets <body> to overflow:hidden on javascript page load

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sean Harvey
9baf35d500 ENHANCEMENT Added ability to include a blockquote in the CMS WYSIWYG editor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Ingo Schommer
e6178ad82b ENHANCEMENT Only showing import form in ModelAdmin if an importer is set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Ingo Schommer
f45662cab1 MINOR ImageEditor indentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67230 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sam Minnee
6d45e58587 Added ModelAdmin:: for changing the class used to generate results tables
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:44 +13:00
Sean Harvey
1c98c2e8e5 BUGFIX Scrollbars didn't appear properly in CMS without resizing the window manually, so used jQuery to properly detect when document is ready before attempting resize. Ticket #3089
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Ingo Schommer
23b0fc4d35 BUGFIX Fixed StaticExporter output format
ENHANCEMENT Using TEMP_FOLDER for StaticExporter
MINOR Documentation for StaticExporter

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Ingo Schommer
12dc778cf5 ENHANCEMENT Disallowing CMSMain->revert() if SiteTree->canPublish() is not granted (used to be SiteTree->canEdit()). If a user isn't allowed to publish, he shouldn't be allowed to revert the live state of a page either.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Ingo Schommer
832cd7c1e9 ENHANCEMENT Moving "save" and "delete" cms actions from CMSMain->EditForm() into SiteTree->getCMSActions() to make them decoratable (e.g. disallow delete action) and easier to cover with unit tests. Leaving fallback "save" and "delete" actions in CMSMain in case no actions are defined (necessary e.g. for Group class in SecurityAdmin)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Sean Harvey
6fca21ecd0 BUGFIX Fixed error in javascript (because of commented out code) that broke IE6/7 in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67035 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:43 +13:00
Sam Minnee
fc14227238 BUGFIX: Fixed warning on AssetAdmin (merged from trunk)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sam Minnee
170a0f256f #1885: Fixed safari bold, italic, underline by removing HTML scrubbing.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
43058e137c BUGFIX Fixed sortWidgets() function in WidgetAreaEditor not working because it was picking up comment nodes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
13d0f09717 ENHANCEMENT Just redirect back after "import" action called, and set the session message on the Form object instead of hardcoded ID
MINOR phpDoc comments for ModelAdmin->import()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
02be93a3ca MINOR Added code example of $model_importers array item
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
7db5f7b2e9 BUGFIX Fixed importer not working because of i18n_singular_name(), just use the class name of the model instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
45c0564c9d BUGFIX Made use of Convert::raw2att() before returning the ModelName for Import spec fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Sean Harvey
811cdb66a3 BUGFIX Fixed "Show specification..." link not working because ModelName had spaces in it
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Ingo Schommer
96f6ffb74c BUGFIX Only including ModelAdmin->ImportForm() if an actual importer was specified
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:42 +13:00
Saophalkun Ponlu
8bff580b44 MINOR Reverted reference to jquery-packed.js which causes problems by double minification in cms (see r66735)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:41 +13:00
Saophalkun Ponlu
a4b3b95872 MINOR: fixed path include for jquery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:41 +13:00
Sam Minnee
70ad5368cd BUGFIX: Fixed redirection to help page bug that intermittently appears
BUGFIX: Add LeftAndMain:$url_rule to minimise bugs in modules

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:41 +13:00
Sean Harvey
21fa7b24f7 MINOR Removed unused action "waitingon" from CMSMain::$allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
d1ed61a5f4 MINOR Removed TaskList remnants of old cms workflow code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66642 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sam Minnee
856e01b156 Allow passing of columns to ColumnSelectionField() and allow different ColumnSelectionField() values to influence the result columsn
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
b1218f85da MINOR Readd of end php tag as per coding conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
2c1374a35d MINOR Added missing end php tag for ImageEditor, as per coding conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
42c40aeba3 MINOR Removed whitespace after end php tag for AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sean Harvey
43598d35e1 MINOR Added php end tag to AssetAdmin, coding conventions
MINOR Fixed tabbing for various functions
MINOR Removed commented out code that shouldn't be lying around

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00
Sam Minnee
33c05c65f4 BUGFIX: ModelAdmin clear search now preserves the result column selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:40 +13:00