Commit Graph

1012 Commits

Author SHA1 Message Date
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
5687e0a7f4 Added merge info for r71259
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71262 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 02:56:24 +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
ad5471afdb BUGFIX Making sure that LeftAndMain->CurrentPage() respects language settings - was returning pages in different language from session after switching between languages in cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70324 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-19 00:26:02 +00:00
Ingo Schommer
84f6f5d396 BUGFIX Fixed expanded/unexpanded flags on new tree items - was showing expanded styling (plus icon) with newly created pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70323 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-19 00:11:08 +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
fd65285cfc ENHANCEMENT Simplifying creation logic of new languages in CMS by reloading complete interface, rather than refreshing partial interface, language dropdown etc.
API CHANGE Removed CMSMain->switchlanguage()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-16 04:16:19 +00:00
Michael Andrewartha
f855a7512f BUGFIX: fixed scrollbar in safari and firefox3 for the list of pages in site reports and version history #2065
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-15 21:27:32 +00:00
Ingo Schommer
a46b3286d0 ENHANCEMENT Added htaccess examples for static publishing originally located in online documentation at http://doc.silverstripe.com/doku.php?id=staticpublisher
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70148 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-14 20:36:37 +00:00
Ingo Schommer
bdccea54e1 MINOR Updated translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-13 22:03:39 +00:00
Ingo Schommer
b7ffc6ed5d MINOR Updated language master tables
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-12 04:59:57 +00:00
Ingo Schommer
d0bb15c41e ENHANCEMENT Added Japanese translation (Thanks Hiroki, Daisuke, Fijii, Shiva, Daniel and Minoru!)
MINOR Updated translations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69994 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-12 04:35:39 +00:00
Ingo Schommer
b319355c67 ENHANCEMENT Augmenting stage links in CMS with &lang URL parameter if Translatable is enabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 12:39:51 +00:00
Ingo Schommer
c8beba696c Merged, debugged and enhanced Translatable patches from branches/translatable at r64523, r64523, 64523, thanks wakeless!
API CHANGE Changed Translatable schema from auxilliary tables (SiteTree_lang, SiteTree_lang_Live) to automatically filtered records on the original table (SiteTree, SiteTree_Live), using $Lang and $OriginalID properties. Incompatible update to old schema, migration script is in the works.
API CHANGE Removed Translatable::get_one(), Translatable::write()
ENHANCEMENT Simplified Translatable tree generation by using getSiteTreeFor() in CMSMain->createtranslation()
ENHANCEMENT Added AllChildrenIncludingDeleted(), augmentNumChildrenCountQuery(),  augmentAllChildrenIncludingDeleted(), augmentStageChildren() to Translatable class to allow for more stable tree generation.
ENHANCEMENT Moved definition of Translatable schema from augmentDatabase() to Translatable->extraStatics()
ENHANCEMENT Changes to the CMS language selection refresh the whole admin interface instead of the tree only. This way we can add a URL parameter ?lang=<lang> to /admin, which makes the specific language bookmarkable and reloadable. Changes to LangSelector.js
ENHANCEMENT Added fallback to ModelAsController->getNestedController() to fetch page with matching URLSegment but different language in case no page is found in the current language.
ENHANCEMENT Added helper methods to Translatable: getTranslation(), hasTranslation(), isTranslation(), findOriginalIDs()
ENHANCEMENT Getters and setters for Translatable->getOriginalPage() etc.
ENHANCEMENT Hooking Translatable into ModelAsController and ContentController initialization in order to call choose_site_lang()
ENHANCEMENT Simplified Translatable->augmentSQL(), augmentWrite() by not using auxilliary tables
ENHANCEMENT Showing clickable links for Translations in Translatable->updateCMSFields()
BUGFIX Modifying Hierarchy/SiteTree Children getters to accept optional "context" which can be used to set a language explicitly through the $Lang property, rather than implicitly reyling on the static Translatable::current_lang()
BUGFIX Fixed TranslatableTest to work with new datamodel
BUGFIX Temporarily disabled cookie/session selection in Translatable::choose_site_lang() until we have a good test suite for the side effects.
MINOR Added "untranslated" CSS styles to tree nodes and marking them as inactive/grey


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 12:15:30 +00:00
Ingo Schommer
300435fb13 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +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
dc9914ff2d MINOR Renamed LeftAndMainDecorator (had wrong classname)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69743 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-06 02:16:47 +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
Saophalkun Ponlu
b109f1c061 MINOR: fixed some alignments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 03:06:57 +00:00
Saophalkun Ponlu
fd5884dbac BUGFIX: didn't work on IE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69684 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 02:55:57 +00:00
Saophalkun Ponlu
f2f9a35508 changed alignment styles graphics
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 02:08:21 +00:00
Saophalkun Ponlu
299f67cdb3 IMPROVEMENT: image alignment options. ticket #1877
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-19 13:36:59 +00:00
Ingo Schommer
a495e561d3 ENHANCEMENT Removed object state setting in CMSMain/SiteTree publication process: DeletedFromStage, CheckedPublicationDifferences, IsAddedToStage and added getters for them. Improves testability as we don't have to rely on random methods like MenuTitle() being called to set object state.
ENHANCEMENT Flushing cache in SiteTree->onAfterWrite() and SiteTree->onAfterDelete() to ensure the publication state is up to date


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-17 22:41:07 +00:00
Sam Minnee
79c4e170ff Bugfixes for recent staticpublisher importsD
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@68913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-15 01:45:20 +00:00
Sam Minnee
ab776401db Static caching merges from dnc branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@68901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-15 01:31:01 +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
e79dd5558b Updating queries to be more DB agnostic
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-24 09:30:41 +00:00
Sam Minnee
f067bd1304 Adding double-quotes to table and field references
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 22:58:18 +00:00
Sam Minnee
a93a0c3c95 Updated SQL queries to be ansi compatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:31:13 +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
f317676341 Merged pre-2.3-oct08 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-21 01:11:49 +00:00
Sam Minnee
d598504bfc Merged branches/pre-2.3-oct08
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:56:08 +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
Will Rossiter
fe0ac4e990 Merged in pre-2.3-oct08 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-17 23:03:39 +00:00
Sean Harvey
ae38956c29 BUGFIX Added HTML title attribute to the anchor for images in CMS right hand pane
MINOR Added title attribute to anchor for flash objects in CMS right hand pane

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65953 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-16 21:41:02 +00:00
Josh Kosmala
987edc9522 Minor php notice fix
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-14 02:23:26 +00:00
Sean Harvey
f5a5002f14 MINOR Tidied up AssetAdmin functions
MINOR Removed commented out junk
 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-14 00:45:32 +00:00
Sean Harvey
19ce25e146 Merged in ReportAdmin JS error fix from branches/2.3 - r65865
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:06:00 +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
8d370c9cb6 Merged in change from branches/2.3 - r65860
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65882 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:03:14 +00:00
Sean Harvey
d8c795b7b7 Merged in flash insert panel bug fixes from r65827
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:37:10 +00:00
Sean Harvey
fc1b9daf50 Merged in flash uploader right hand panel in CMS tidying - r65825
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:24:59 +00:00
Sean Harvey
2ab7415231 Fixed flash upload fit to parent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:06:23 +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
Sam Minnee
5b80a0c1d1 Fixes for IE support of script tags being down the bottom
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:24:02 +00:00