Commit Graph

652 Commits

Author SHA1 Message Date
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
cb1895866a ENHANCEMENT Refactored versions panel in CMS: Removed "compare mode" checkbox in UI, and replaced with explicit checkboxes and a "compare versions" button. Added manual "refresh" button. Replaced custom markup with a form generated through CMSMain->VersionsForm(), and adjusted markup in CMSMain_versions.ss accordingly
API CHANGE Removed CMSMain->sendFormToBrowser(), replaced with custom code

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:09 +00:00
Ingo Schommer
01d06dd47e API CHANGE Replaced CMSMain->LangSelector() with CMSMain->LangForm() to provide more accessible backend and properly wrap existing <select> tag in a form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:00 +00:00
Ingo Schommer
2796a37a02 API CHANGE Removed SideReport javascript class, replaced with concrete implementation in CMSMain.js
ENHANCEMENT Using full form for 'site reports' panel in CMSMain->ReportForm(). Removed CMSMain->ReportSelector()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:55 +00:00
Ingo Schommer
fec71a06eb ENHANCEMENT Moved sitetree filter functionality back into CMSMain->SearchForm() to simplify both serverside and clientside processing, and save precious UI real estate above the tree panel
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:47 +00:00
Ingo Schommer
44e16b9620 API CHANGE Removed CMSBatchAction->getDoingText(), is now using button loading indicators in the UI
API CHANGE Removed LeftAndMain->BatchActionList(), no longer necessary as we're creating the batch actions form in the same class
ENHANCEMENT Changed CMSBatchAction logic to return JSON status changes rather than eval'ed JavaScript via FormResponse
ENHANCEMENT Ported batchactions in CMSMain_left.js to concrete javascript, and moved to new CMSMain.BatchActions.js file
ENHANCEMENT Using native CMSMain->BatchActionsForm() to render form instead of custom template markup in CMSMain_TreeTools.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:40 +00:00
Ingo Schommer
8d5dc11aab MINOR Using native AddPageOptionsForm rendering in CMSMain_TreeTools.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92717 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:28 +00:00
Ingo Schommer
dc4375a383 API CHANGE Removed LeftAndMain->EditForm(), please use getEditForm() instead
API CHANGE Returning LeftAndMain->EmptyForm() as a welcome/placeholder message from LeftAndMain->getEditForm() if no record is found. Removed this placeholder from LeftAndMain_right.ss
ENHANCEMENT Allowing optional $id parameter in LeftAndMain->getEditForm() (and subclasses)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:13 +00:00
Ingo Schommer
e30f92a2f8 API CHANGE Returning empty form from getEditForm() method in CMSMain, AssetAdmin, SecurityAdmin to avoid an <% if %> condition in the template. The previous placeholder text is now always stored alongside the form template. This also allows for easier class overloading with different URLs, as the form action is no longer hardcoded in the template placeholder form.
BUGFIX Adjusted AssetAdmin_left.ss, CommentAdmin_left.ss
MINOR Removed CommentAdmin_right.ss, SecurityAdmin_right.ss - inherits a more generic LeftAndMain_right.ss instead
MINOR Merged CommentAdmin_SiteTree.ss template back into CommentAdmin_left.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:00 +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
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
140fae5d7e API CHANGE Removed AssetAdmin_right.ss template, using LeftAndMain_right.ss now
API CHANGE Removed CMSMain_right.ss template, moved one level up to LeftAndMain_right.ss to be inheritable by other LeftAndMain subclasses

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92692 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:14:24 +00:00
Ingo Schommer
c48c7755bb ENHANCEMENT Moving placeholder HTML for CMS EditForm out of the <form> tag, and picking it up for later usage in the EditForm javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:14:22 +00:00
Ingo Schommer
471afa4002 MINOR Changed statusMessage container in LeftAndMain_right.ss to a <div> so we can save ourselves the CSS styling defaults
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:14:18 +00:00
Ingo Schommer
a9c257bc2f MINOR Re-enabled statusmessage in CMSMain_right.ss template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92667 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:38:54 +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
671961cf45 ENHANCEMENT Refactored tree search javascript to support concrete and jquery, and build less UI scaffold on the serverside
API CHANGE Removed CMSMain::site_tree_filter_options
API CHANGE Removed CMSMain::SiteTreeFilterOptions() and T_SiteTreeFilterOptions(), now handled inline in CMSMain::TreeSearchForm()
ENHANCEMENT Refactored tree search PHP in CMSMain: Generate form in PHP instead of template, require less UI state, pass filtered/sanitized paramers straight into CMSMainMarkingFilter instead of relying on

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:37:06 +00:00
Ingo Schommer
58513992aa MINOR Removed "ss-tabset" class from #TreeTools: it messes up the execution order on which tabs are created, meaning they cant be made collapsible in LeftAndMain code later on
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:30 +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
2ccc3669eb ENHANCEMENT Using a simple target=_blank for opening the logo link in CMS instead of javascript
ENHANCEMENT Moved the "edit profile" popup link to concrete

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92605 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:15 +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
081802e2d6 MINOR Reverted removal of placeholder <form> tab in CMSMain_right.ss - its still needed for the CMS javascript
MINOR Reverted north/south inner layouts in CMSMain_right.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92596 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:52 +00:00
Ingo Schommer
612dbe0831 MINOR Added 'ss-ui-button' class to all #TreeActions buttons in the CMS to allow for jQuery UI native styling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92595 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:50 +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
Ingo Schommer
094c30ea4a API CHANGE Removed ModalForm, ModalDialog, GBModalDialog javascript classes from cms, were superseded by a simple javascript alert a while ago (see r11727 and r12245)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92577 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:35:07 +00:00
Ingo Schommer
c14e7df9e8 MINOR added stubs to allow widgets to use treedropdown fields (from r91850)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:00:58 +00:00
Tom Rix
a0649efa49 BUGFIX WidgetArea now works. Can have multiple areas on a page, and has unit tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 00:13:56 +00:00
Sam Minnee
a7c07369e0 FEATURE batch actions for setting/resetting embargo/expiry (from r85397)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:44:08 +00:00
Sam Minnee
2294857460 ENHANCMENT side reports can now have parameters (from r85329)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:43:58 +00:00
Sean Harvey
6cdbbe9d6b BUGFIX Fixed missing default english text for "Clear" and "Search" buttons in template CMSMain_left.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@88957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-14 06:42:04 +00:00
Ingo Schommer
98ba54ec91 MINOR More translations for ModelAdmin (#4521, thanks "random-value ")
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-26 20:54:24 +00:00
Tom Rix
96d438f21e ENHANCEMENT added new permission, SITETREE_REORGANISE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-09 22:29:45 +00:00
Tom Rix
b087ef99c5 MINOR moving inline css to a class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-04 04:41:32 +00:00
Tom Rix
6a0f21ca05 ENHANCEMENT sitetree filters now show up in a dropdown, and you can add your own by extending CMSSiteTreeFilter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-04 03:09:26 +00:00
Will Rossiter
901c49c328 MINOR: merged r82000 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@82002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-16 03:59:40 +00:00
Sean Harvey
00c8fd25d9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-02 07:23:29 +00:00
Sam Minnee
9bc3f5fe2a ENHANCEMENT: Added manual Filesystem::sync() button to improve load time of admin/assets area.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-01 22:28:06 +00:00
Sam Minnee
836ab09fc8 BUGFIX #2391: Removed pagination header when there are no records.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-27 12:29:42 +00:00
Sam Minnee
fb6b248501 MINOR: Added delete button styling to the "Delete the selected groups" button in SecurityAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 10:40:35 +00:00
Sean Harvey
ecbffeeb6d MINOR Text change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 02:16:46 +00:00
Will Rossiter
0e4a3330dd MINOR: fix typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 02:15:24 +00:00
Will Rossiter
bf7b7d09e7 FEATURE: added ability to display comments even when comments have been disabled. #2081
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77806 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:56:07 +00:00
Sam Minnee
4adb585e80 ENHANCEMENT ajshort: Add the ability to overload getModelForms() and add new custom model sidebars.
API CHANGE: Move the generation of the content for the create / search / import model sidebar from ModelAdmin into the collection controller.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 05:58:54 +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
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
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
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
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
Ingo Schommer
15454352bb ENHANCEMENT Showing all available languages in language selector above sitetree in CMS - you can now create new pages in completely new languages without any relation to an "original"
ENHANCEMENT Added CMSMain->IsTranslatableEnabled
API CHANGE Removed CMSMain->switchlanguage() - createTranslation() is sufficient for new, ajax refreshing of CMS state got way too complicated for switching languages, we now just reload the entire CMS with a different ?lang GET parameter

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73345 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-18 17:18:52 +00:00
Ingo Schommer
770e404fdb BUGFIX Using TableListField_Item.ss in MemberTableField to avoid template duplication and inconsistent feature sets
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-13 10:04:58 +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
fea613c19f BUGFIX Only show the LangSelector dropdown if there's multiple languages available on the site
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71297 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 05:12:42 +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
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
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
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
5889def36d ENHANCEMENT Moved language selector in CMS above tree for better visibility, added padding and adjusted dropdown width
ENHANCEMENT Removed "Translating mode" status message above edit form - should be clear by the language dropdown above the CMS tree now

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70308 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-16 04:17:37 +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
d02401ebda MINOR Removed DuplicatePagesOptionsForm from CMSMain_left.ss (functionality was committed ~2 years ago and never useable - no matching controller actions)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-06 02:21:55 +00:00
Ingo Schommer
266acd409d ENHANCEMENT Moved batch forms in CMSMain and AssetAdmin from hardcoded templates to SilverStripe forms. Enhances styling capabilities, unifies HTML syntax, better support for unobtrusive scripting, validation and field additions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69744 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-06 02:18:33 +00:00
Ingo Schommer
1aecc007a8 MINOR Removed obsolete CMSLeft.ss and CMSRight.ss templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69739 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-06 02:07:14 +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
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
f9342e562c Removed javascript from AssetAdmin template to prevent warnings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-22 03:47:56 +00:00
Sam Minnee
2ee0c0991b Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:50 +00:00
Sean Harvey
f69f705aad Merged in ReportAdmin sitetree root node fix from branches/2.3 - r65859
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:04:13 +00:00
Sean Harvey
c5241fa487 ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55:23 +00:00
Normann Lou
64c16e3936 APICHANGE: make CreateForm be able to disable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65744 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 23:42:23 +00:00
Normann Lou
07eb2df9dc BUGFIX: there is no horizontal scroll bar for Model Admin right panel if the results table is long.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 03:47:36 +00:00
Normann Lou
76afea41bc APICHANGE: tidy up NewsletterAdmin.
BUGFIX: a lot of methods in this class now passed $params as HTTPRequest object, rather than as a array if the function is called from Ajax or top-level of front-end, some method is called in both manner, ie. called from Ajax and called internally as well, so we need to check $params type and do further process. This is a partial fix of open source ticket #3035

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 22:23:48 +00:00
Sam Minnee
e28bfb2730 Merged branches/2.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 04:07:03 +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
Will Rossiter
0ef452c524 FEATURE: merged back patch for image editor. Currently completely broken on trunk this patch does nothing to fix it sadly. I think its a prototype thing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65351 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 02:04:03 +00:00
Ingo Schommer
85daead336 BUGFIX Making ModelAdmin labels in left panel translatable again (regression from moving them into one common panel)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:23:23 +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
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
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
Sean Harvey
2795dae693 BUGFIX Fixed old references to GenericDataAdmin in ModelAdmin.php and ModelAdmin_Results.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 03:45:39 +00:00
Normann Lou
0f4698726a APICHANGE: delete GenericDataAdmin, RelatedDataEditor, DropdownField_WithAdd and their related code (js, css, etc) from cms, sapphire, "GenericDataAdmin" name space has also been deleted from lang files. They are all added in the new module "genericdataadmin"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 00:20:00 +00:00
Ingo Schommer
63995a366c ENHANCEMENT Added german translation for ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-10 12:36:05 +00:00
Sean Harvey
e0d792837e BUGFIX Removed old reference to ?executeForm=EditForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-06 22:15:16 +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
Sean Harvey
03c1d1e001 MINOR Committed missing files related to r63452
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-01 06:43:15 +00:00
Sam Minnee
2954514b4c ENHANCEMENT #2172: Added counts to comment admin submenu items
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 00:05:22 +00:00
Sean Harvey
8920edb85f ENHANCEMENT Moved UserDefinedForm and related code, templates, CSS and javascript out of cms and sapphire classes into userforms/trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63249 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-29 03:18:23 +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
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
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
Sam Minnee
b4e681dc83 BUGFIX: Removed use of deprecated TableListField_Item::BaseLink() And TableListField::ajax_refresh() from CommentTableField and MemberTableField
BUGFIX: Fixed styling, searching, and pagination of CommentTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@61686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-28 04:26:59 +00:00
Hayden Smith
5cd507ecaa Merged [47101]: Adds class=action to action cells in MemberTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:17:21 +00:00
Sam Minnee
387b5edd21 Merged changes from branches/2.2.2-assets:
Static publishing
Ability to lock down comments to logged-in members only

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:59:27 +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
9a6483b024 (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@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:25:44 +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
772490ca99 (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@60232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:40:50 +00:00
Ingo Schommer
3fe17e9649 (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@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:29:50 +00:00
Ingo Schommer
649ff87aec (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@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:18:32 +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
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
2b87d00c13 (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@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
e858222ce1 (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@59925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:36:18 +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
Ingo Schommer
12899b864c ENHANCEMENT Added CSS class "field" to templates of TableListField and subclasses
ENHANCEMENT Added <div class=""middleColumn"> around TableListField templates and all subclasses

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59286 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:44:33 +00:00
Ingo Schommer
0f642e8bbd BUGFIX Fixed colspan on <td class="actions"> in MemberTableField.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:38:38 +00:00
Sam Minnee
6561b9be04 BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:29:20 +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
Ingo Schommer
52a96217e9 API CHANGE Removing unfinished deprecated BulkLoader functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@54119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-07 04:30:13 +00:00
Sam Minnee
098052a6b3 Merged revisions 53073 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r53073 | sminnee | 2008-04-21 10:55:34 +1200 (Mon, 21 Apr 2008) | 1 line
  
  Fix drag&drop in assets and security
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:41:12 +00:00
Sam Minnee
91de5fd771 Merged revisions 52399 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line
  
  BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:40:29 +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
Ingo Schommer
b1920529f8 API CHANGE Moving newsletter functionality to its own module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:34:37 +00:00
Ingo Schommer
07c58cc90f API CHANGE Moved "statistics" functionality into separate module, which is not distributed with a default silverstripe installation. see r52168
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 01:40:36 +00:00
Sam Minnee
32024b451c Merged revisions 50812 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50812 | sminnee | 2008-03-11 10:34:32 +1300 (Tue, 11 Mar 2008) | 1 line
  
  #2285 - Fixed widget editor
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:53 +00:00
Sam Minnee
a4ecf8938d #2284 - Removed notice-level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-03 08:30:44 +00:00
Matt Peel
66c3db1e8e Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
2128298467 Added SubscribeSubmission template to get subscribeforms to work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 02:45:49 +00:00
Sam Minnee
c92be46619 Added default SubscribeForm.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 02:40:39 +00:00
Sam Minnee
c3ab5b92f1 Merged revisions 47190 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r47190 | sminnee | 2007-12-17 17:38:32 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Fixed 404 on spacer.gif
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:00:14 +00:00
Andrew O'Neil
033f55f5c1 Fix i18n errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 01:43:15 +00:00
Andrew O'Neil
fc1ba512b9 #1959 - You can't reorganise pages without creating pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 22:11:32 +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
311479a371 Merged revisions 46927 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1

........
  r46927 | aoneil | 2007-12-14 18:55:50 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Leave me
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:41:15 +00:00
Andrew O'Neil
681a591018 Merged revisions 46142 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1

........
  r46142 | aoneil | 2007-12-03 11:53:07 +1300 (Mon, 03 Dec 2007) | 2 lines
  
  #1933 - SecurityAdmin_rightbottom.ss template doesn't exist
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:46:28 +00:00
Sam Minnee
cf31a3d4e6 rhalff: #1580 - i18n for comments system
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:57:29 +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
Normann Lou
a3f9d9b6d3 switch externals to trunk.
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +00:00
Sam Minnee
cbbdd8c412 parents-merge 35478 - Fixed bugs with newsletter import (.CSV didn't work if capital letters, no scroll on import form)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:31:27 +00:00
Ingo Schommer
99b0288927 fixed export-feature in MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 03:27:13 +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
Normann Lou
018d344ff7 a button need to translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:03:15 +00:00
Normann Lou
e11b907ddd a button need to translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:01:20 +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
54c65ce091 Ticket #1498 - Action param buttons now work in IE7 (applied classes)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44292 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:22:13 +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
Sean Harvey
a557f8260d Ticket #1498 - Removed inconsistent ... in labels
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 20:51:45 +00:00
Sean Harvey
4db20bec83 Ticket #1498 - CSS clean up, use margin reset and remove excess margin 0 and padding 0
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 10:10:14 +00:00
Sean Harvey
96006c5614 Ticket #1498 - CSS cleanup and template tweak
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 05:03:05 +00:00
Sean Harvey
7c574874ea reinstated clear div as it broke clearing, and tweaks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:30:07 +00:00
Sean Harvey
a129de4c1a Tweaks to version template, styling and more tweaking of inconsistent styling
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 03:12:12 +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
Sean Harvey
fa94bb8ec2 Removed status box, tweak treepanes css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 22:31:27 +00:00
Sean Harvey
0ca628b33c Ticket #1565 - Removed 'reordering' button on Files and Images as well as Security. Also fixed inconsistent templating on Comments section - it is now consistent with Elijah's GSOC changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44013 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-30 05:16:59 +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
Andrew O'Neil
b0d78ea5bd mujma: BUGFIX: All global variables added to ImageEditor namespace, solved issue reported in ticket 102, http://support.silverstripe.com/gsoc/ticket/102 (merged from gsoc branch, r42789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42989 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 23:26:35 +00:00
Andrew O'Neil
ca8c9ea955 mujma: BUGFIX: Removed unnecessary closing tags. (merged from gsoc branch, r42521)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 23:16:53 +00:00
Andrew O'Neil
6aed530816 mujma: ENHANCEMENT: Added garbage collection (merged from gsoc branch, r40463, r42790, r41070)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 21:34:57 +00:00
Jeremy Shipman
63ff9536d1 Created the option of having bbcode in comments.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 02:47:02 +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
ba3d4ab812 initial commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:41:08 +00:00
Ingo Schommer
dc84c5a924 fixed indentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:52:56 +00:00
Ingo Schommer
3831c9b651 bfojcapell: replacing strings with _t() calls
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:37:15 +00:00
Ingo Schommer
4fd9b960c5 bfojcapell: removing semicolons in _t() calls
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42136 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:35:09 +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
3090ae956d qhoxie: added user activity graph
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:27:36 +00:00
Ingo Schommer
b3da227764 qhoxie: fixed prototype 1.5.x issues for plotting, drops 1.4.x for stats page only, rework of stats admin css
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:24:45 +00:00
Ingo Schommer
bdb4e5ae65 qhoxie: revamped tablesorting, copious js fixes, cms stats reword progress
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42126 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:24:02 +00:00
Ingo Schommer
54b428e6d3 elofgren: NEW FEATURE: Add 'Show only changed pages' checkbox above 'Publish the selected pages'
button under 'Bulk Actions'. Note: Pages that have children will always be 
shown in case, their children have been changed. 
Suggested here: http://www.silverstripe.com/silverstripe-development/flat/3799?showPost=4092#post4092 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:20:02 +00:00
Ingo Schommer
a56657fb83 elofgren: NEW FEATURE: When 'Search' button is clicked show a simple search text input and button which allow for filtering the Site Tree by searching the URL, Title, Menu Title, and Content.
Also show an 'Add criteria...' drop-down with 'Page Type', 'Status', 'Description', and 'Keywords' options which allow for more fine grained filtering based on columns in the SiteTree? table. 
In addition add an 'Edited Since' option which uses a CalendarDatePicker? which allows for filtering pages based on when they were last edited. 
NOTE: Pages that have children will always be shown whether they match the filter or not, in case one of their children matches the filter. It would probably be better to switch to a flat 
display of the results. 
More info: http://www.silverstripe.com/google-summer-of-code-forum/flat/2526 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:19:17 +00:00
Ingo Schommer
ed9bca2c68 elofgren: NEW FEATURE: Replace the 'Delete...' button with a 'Batch Actions' button and add a 'Publish the selected pages' button.
See: http://www.silverstripe.com/google-summer-of-code-forum/flat/1636?showPost=1859#post1859 
And: http://www.silverstripe.com/silverstripe-development/flat/3799?showPost=4070#post4070 
TODO: Make the new 'Search' button functional. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:04:09 +00:00
Ingo Schommer
b456ca5829 elofgren: Replace the 'Reorder...' button with a 'Allow drag & drop reordering' checkbox as per:
http://www.silverstripe.com/google-summer-of-code-forum/flat/1636?showPost=1859#post1859  
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:00:08 +00:00
Ingo Schommer
7f4dd7279b elofgren: USABILITY: Make 'Add new draft' the default action for 'Create...' in the Newsletter section. Also make 'Add new draft' be selected whenever a selection is made in the left tree. Only select 'Add new type' by default if there are no Newsletter types. This will reduce confusion and make the more common 'Add new draft' action easier since it will be the default. Also select the 'Add new draft' option after a Newsletter type is added since this will be the next logical action. This fixes GSoC trac ticket: http://support.silverstripe.com/gsoc/ticket/70
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42061 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:32:33 +00:00
Ingo Schommer
d17251a311 elofgren: On Newsletter Mailing List Bounced tab: Change 'Last bounce at' column label to 'Date' to be more accurate because multiple bounce records will be shown for a member if their email has bounced
more than once. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:30:33 +00:00
Ingo Schommer
57f6174967 elofgren: On Newsletter 'Mailing List' 'Bounced' tab: Change instructions from "Uncheck the box to *disable* sending to an email address." to "Uncheck the box to *enable* sending to a *blacklisted* email
address.", label checkbox column as Blacklisted, and show the checkbox checked if Member.BlacklistedEmail? is true. This makes things easier to understand and correctly complies with spec: 
"Bounces report with tickboxes ticked by default (to not send to in the future, unticking resends)" 

(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:30:08 +00:00
Ingo Schommer
f72e6d9a56 elofgren: In order to fix: http://support.silverstripe.com/gsoc/ticket/58 "Add" button is broken after reloadRecipientsList() is called do the following:
After recipients are imported, show a link to "reload the Mailing List" which calls reloadRecipientsList() instead of doing it automatically. 
Simply call getPageFromServer() and focus the Recipients tab, instead of only reloading the Recipients tab. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:27:39 +00:00
Ingo Schommer
e176c2c265 mujma: BUGFIX: Iframe shouldn't "jump" after clicking on link (problem under Safari and IE6/7)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:25:32 +00:00
Ingo Schommer
030b55d750 mujma: ENHANCEMENTS: Added new design for ImageEditor?.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42046 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:23:10 +00:00
Ingo Schommer
706580c443 elofgren: NEW FEATURE: Make it possible to blacklist and remove bounced Newsletter recipients from the Bounced tab of the Mailing List. @TODO: Make this features work corectly in IE.
Make class BouncedList? just extend FormField? like it used to, extending TableListField? added unneeded complexity. 
Remove the unused Save button from the 'Mailing List' section. Fixes gsoc track ticket: #26 Remove uneeded "Save" button in "Mailing List" section of Newsletters 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42039 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:17:51 +00:00
Ingo Schommer
be99502d53 elofgren: NEW FEATURE: Log any attempts to send Newsletters to Emails that are blacklisted and show a 'Sending to the Following Recipients Did Not Occur Because They Are BlackListed?' report on the 'Sent Status Report' of Newsletters.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:17:14 +00:00
Ingo Schommer
bba347331f elofgren: Make it so that if red (X) link next to an Email on the Bounced Tab of a Mailing List is clicked, the Email_BounceRecord will be deleted and the Member will be removed from the Mailing List group. @TODO Reload whole right frame so that Recipients and Bounced tabs will be updated after bounced member is removed.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42037 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:16:47 +00:00
Ingo Schommer
7a996450e6 elofgren: Make 'Email' colum always be 1/3 of width of table and listed first in every report for consistency on Newsletter 'Sent Status Report' tab.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42013 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:36:31 +00:00
Ingo Schommer
6714eea295 elofgren: Add style="width:auto;" to the 'Sending to the Following Recipients Failed' and 'Sending to the Following Recipients Bounced' headings in the 'Sent Status Report' tab so they are not always width:50%.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42011 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:35:26 +00:00
Ingo Schommer
29cecf3845 elofgren: Remove the 'Firstname' and 'Surname' colums from all reports except the 'The Newsletter has Never Been Sent to Following Subscribers' one on the 'Sent Status Report' tab since it wasn't showing and I can't get the MySQL join working right.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42010 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:31:51 +00:00
Ingo Schommer
094c3629f1 elofgren: Remove '@TODO: Make bounces actually show up here.' from above 'Sending to the Following Recipients Bounced' heading in the 'Sent Status Report' tab of Newsletters since bounce logging for Newsletters was implemented in r39232
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:31:07 +00:00
Ingo Schommer
a42fd1d2d2 mujma: ENHANCEMENTS: Now image is placed in scrolled container so operation that results in image larger than screen are no longer problem.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:30:43 +00:00
Ingo Schommer
ed0232eb71 elofgren: BUGFIX: Make adding newsletter types work again (was broken by r38923). Fix long-standing problem of whole page reloading when adding a Newsletter type. Now it is always added via AJAX.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42006 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:29:40 +00:00
Ingo Schommer
24ed3ff68b elofgren: NEW FEATURE: Add 'Send to only people not previously sent to' option for sending Newsletters. Please test. :)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:02:32 +00:00
Ingo Schommer
03423e67be elofgren: Add 'Firstname' and 'Surname' columns to all Sent Status report tables.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:01:27 +00:00
Ingo Schommer
2c012f3c4e elofgren: BUGFIX: Fix gsoc trac ticket: #54 For newly created Newsletter drafts, Content of Newsletter Sent is not what is shown on screen (Save button has to be clicked)
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 01:01:06 +00:00
Ingo Schommer
4deaf09212 elofgren: Track whether mail() returns TRUE or FALSE when a Newsletter is sent and record the result in a new Newsletter_SentRecipient table.
Add a 'Sent Status Report' tab to Newsletters that shows the following 4 reports: 
* Sending to the Following Recipients Failed 
* Sending to the Following Recipients Bounced (@TODO: Make bounces actually show up here) 
* The Newsletter has Never Been Sent to Following Subscribers 
* Sending to the Following Recipients was Successful 
More info: http://support.silverstripe.com/gsoc/wiki/GSoc07UsabilityElijah 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41995 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:57:31 +00:00
Ingo Schommer
07c4301ca7 elofgren: USABILITY: Add <label for=...> tags to 'Send to the mailing list' and 'Send test to' radio buttons.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41994 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:54:16 +00:00
Ingo Schommer
5c3e3b1d6b mujma: ADD-ON: Removed image toolbar under IE6
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41988 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 00:50:22 +00:00
Ingo Schommer
31921fb25b elofgren: Truly fix problem with overflow:hidden being applied to RecipientImportField? iframe by simply setting <body onload=""> and reverting changes in r38497
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 22:01:23 +00:00
Ingo Schommer
03f0b31f70 elofgren: Make RecipientImportField? iframe body be style.overflow = 'auto'; so that all messages can be seen after recipients are imported.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41968 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 22:00:16 +00:00
Ingo Schommer
f7a1b199db elofgren: BUGFIX: Fix issue with deleting pictures with 'X' delete link not removing thumbs in _resampled folder. Thanks to Mateusz for reporting this.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:57:11 +00:00
Ingo Schommer
5e4b0852c4 mujma: BUGFIX: No longer croping under IE6 selects all image.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:54:51 +00:00
Ingo Schommer
650317f43f elofgren: Get rid of the large blank space at the bottom of the left frame in the AssetAdmin?, NewsletterAdmin?, and SecurityAdmin? sections.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41945 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:12:05 +00:00
Ingo Schommer
1af0b19db0 elofgren: Remove toggle images in cms/images/panels/ and use the new sapphire/images/ location.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 21:09:53 +00:00
Ingo Schommer
cad57b11ec mujma: Added support for IE6.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41931 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:54:37 +00:00
Ingo Schommer
e646d31498 elofgren: Fix 'DRAG' image alt text in AssetAdmin? file list and make it simply be 'Drag'.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41928 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:49:23 +00:00
Ingo Schommer
3cae2fb249 elofgren: USABILITY: Fix usability issue #48 "Delete and Move Files buttons need repositioning"
Changes: 
* Remove the 'Move Files' button and enable multi-file drag and drop file moving 
* Position the 'Delete selected files' button under the checkboxes and make it turn red on hover 
* Add 'Ctrl' and 'Shift' range selection to file checkboxes 
* Add 'X' delete links to the right of each file 
* Rename the 'Save' button to 'Save folder name' and don't show it when listing 'assets' folder since it can't be renamed 
More info: http://www.silverstripe.com/google-summer-of-code-forum/flat/1607
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:47:35 +00:00
Ingo Schommer
1b5c8ee6a8 qhoxie: basics of tabular data for stats
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 20:23:50 +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
Ingo Schommer
31a9fbee3c mujma: Fixed various browser compatibility problems. Now should work on Safari 3.0.2 /Windows, FF 1.5/2.0 Windows/Linux.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:19:43 +00:00
Ingo Schommer
3fc2fc14ec elofgren: USABILITY: Make the 'Site Reports' drop-down use a 'Go' button. Fixes usability issue #12. More info: http://www.elijahlofgren.com/silverstripe/inconsistent-go-buttons/
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:15:08 +00:00
Ingo Schommer
ee61a1776d elofgren: Apply r37456 to Statistics section - Removed scrollbar on sitetree
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:12:37 +00:00
Ingo Schommer
13bedbcf5e elofgren: USABILITY: Rename first left sidebar section in 'Site Content' to 'Site Content and Structure'.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41880 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:12:12 +00:00
Ingo Schommer
0c895b3a30 elofgren: USABILITY: Make blue title bars in all sections match the ones in 'Site Content' section. Relable 'Files & Images' left frame to 'Folders'.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:10:53 +00:00
Ingo Schommer
65e0686fa0 mujma:
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41874 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:09:25 +00:00
Ingo Schommer
bd58e931bb mujma: All PHP and JS files for ImageEditor?, works on FF 1.5/2.0.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41872 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:08:25 +00:00
Ingo Schommer
b13f8a3963 elofgren: USABILITY: Comment out the blue right frame titles in all of the Admin sections to free up space (since the action buttons have been moved to the bottom, the headings are no longer needed). In addition, comment out the 'My Site' left frame title in the 'Site Content' section since the sub-sections each have their own blue title bar.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 01:03:23 +00:00
Ingo Schommer
bf5c5154c4 qhoxie: slight stats left panel changes
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:55:58 +00:00
Ingo Schommer
0762c09ba2 qhoxie: additions to left statistics panel
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:55:36 +00:00
Ingo Schommer
83530f139f elofgren: USABILITY: Change the 'Create', 'Delete', and 'Reorganise' links into 'Create...', 'Delete...', and 'Reorder...' buttons in order to fix Usability Issue #23 "Create, Delete, and Reorganise links
need to be more prominent". More info: http://www.elijahlofgren.com/silverstripe/create-delete-and-reorganise-links-need-to-be-more-prominent/ 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:54:13 +00:00
Ingo Schommer
e1438c9949 qhoxie: updates to stats panels
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:49:54 +00:00
Ingo Schommer
dd853ef168 elofgren: USABILITY: Add 'label' tags for 'Compare mode (click 2 below)' and 'Show unpublished versions' checkboxes in left frame 'Page Version History' section.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:49:11 +00:00
Ingo Schommer
e70d060983 elofgren: USABILITY: In 'Page Version History' left sidebar section, use a checkbox labeled 'Compare mode (click 2 below)' instead of a drop-down with only 'View (click to see)' and 'Compare (click 2 to see)' options. More info: http://www.elijahlofgren.com/silverstripe/inconsistent-go-buttons/
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:48:48 +00:00
Ingo Schommer
59bfa913a5 elofgren: USABILITY: In 'Site Content' left frame, relabel 'Site Tree' => 'Site Content', 'History' => 'Page Version History', 'Reports' => 'Site Reports' .Fixes usability issue #21: http://www.elijahlofgren.com/silverstripe/site-content-needs-consistent-labeling/
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:41:22 +00:00
Ingo Schommer
119b3b017a elofgren: USABILITY: Remove the left Side Tabs and implement clicking on the headings to show sidebar sections instead in order to fix Usability issue "#22 Allow clicking on blue heading bar of Left
Site Tree to reduce it". More info: http://www.elijahlofgren.com/silverstripe/allow-clicking-on-blue-heading-bar-of-left-site-tree-to-reduce-it/ 
A big THANK YOU to Andy Skelton for permission to use his WordPress? toggle icons originally posted at: http://trac.wordpress.org/attachment/ticket/1904/toggle.gif 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:37:48 +00:00
Ingo Schommer
8fe47c6e87 qhoxie: basic setup for statistics viewing and handling in the cms
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:33:51 +00:00
Ingo Schommer
8be38885d0 elofgren: USABILITY: Fix usability issue #66 'Cancel button needs to be added to Send Newsletter Window' by adding a Cancel button and aligning it left.
More info here: http://www.elijahlofgren.com/silverstripe/cancel-button-needs-to-be-added-to-send-newsletter-window/ 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 19:27:34 +00:00
Ingo Schommer
1eca17e0a9 elofgren: USABILITY: Rework the tabs in the Newsletter section to be less confusing as per issue #57 of the Usability Report
Includes the removal of all tabs and submit action buttons when 'Drafts' or 'Sent Items' are clicked and the addition of an 'add one' link on 'Drafts' folder page. 
For more information see: http://www.elijahlofgren.com/silverstripe/newletter-tree-and-tab-row-are-confusing/ 
Includes a few fixes for undefined variables.  (merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41772 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:29:08 +00:00
Ingo Schommer
9a229d70a5 mujma: USABILITY: Fixed usability issue number #46. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 02:33:58 +00:00
Sean Harvey
4301f7b29f added a message to indicate there are no widgets available
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-09 11:28:26 +00:00
Sam Minnee
9b43207884 Fixed svn:eol-style settings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-18 02:33:28 +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
Will Rossiter
d12ea7b2a7 tidied up the page comment interface. Improved vaildation as well.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40030 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-15 01:25:12 +00:00
Andrew O'Neil
3d5d9200ca Renamed feedback to comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39904 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-13 00:32:48 +00:00
Andrew O'Neil
1e02df02f9 Unmoderated comments have unmoderated css class on them
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39893 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-12 23:39:18 +00:00
Andrew O'Neil
d7ea506562 'Approving' a comment makes more sense than 'accepting' a comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-12 22:19:06 +00:00
Andrew O'Neil
6b4cdc6dbb Added icons (thanks WIll! :D)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 05:02:52 +00:00
Andrew O'Neil
7e1d53885d Highlight the current folder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 02:55:37 +00:00
Andrew O'Neil
2728b92c42 Add root item 'Comments' to tree in feedback admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 02:31:28 +00:00
Andrew O'Neil
683f9f6d11 #1189 Page comments links for spam and delete comment should be inside <ul>
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 02:11:00 +00:00
Andrew O'Neil
6de32f6edc Don't show unmoderated comments unless user is admin, add link to accept comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 01:29:09 +00:00
Andrew O'Neil
ab89c8dd7a Removed sorting as it doesn't work properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-10 00:37:23 +00:00
Andrew O'Neil
4cbc4642b6 Added deleting of marked comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39805 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-09 22:59:20 +00:00
Andrew O'Neil
a1cb5387a1 Added search form to comment admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-09 22:24:38 +00:00
Andrew O'Neil
8c9f5900b5 Allowing marking of comment as spam, ham or accepted in cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-08 06:00:20 +00:00
Andrew O'Neil
6666021921 Fixed breakage in comments with unescaped entities
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-08 04:55:41 +00:00
Andrew O'Neil
9f4c3d3196 Began interface for comment administration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-08 01:16:02 +00:00
Andrew O'Neil
12069c6a96 Show a link for page comments on each page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39684 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-07 04:59:19 +00:00
Andrew O'Neil
19b3420722 Added anchors to page comments in rss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-06 01:03:19 +00:00
Andrew O'Neil
9de10f467c #1428 - 'Available widgets' is good, but 'Used widgets' is confusing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39566 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-02 22:28:38 +00:00
Andrew O'Neil
112d7ed1ad Moved widgets into core
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39562 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-02 22:07:11 +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