tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
1,116 Commits 29 Branches 403 Tags 28 MiB
646ed9342a
Commit Graph

223 Commits

Author SHA1 Message Date
Sam Minnee
646ed9342a BUGFIX: Fixed bugs in content differencer, and improved styling. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-23 03:30:57 +00:00
Sean Harvey
7f4e06c616 MINOR Removed styling for TypeDropdown which was removed in r77395 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77396 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-20 07:37:51 +00:00
Sean Harvey
c550b63f29 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77246 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-19 10:42:35 +00:00
Sean Harvey
d0e3ae5d6b BUGFIX Fixed clearing issue in checkbox actions CMSMain_left 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76860 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 06:21:02 +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
Sam Minnee
1a1229cd96 BUGFIX: Fixed tab layout for add form of model admin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76841 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 05:18:50 +00:00
Sean Harvey
0a362cc542 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76663 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-12 05:14:52 +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
4389affa5c BUGFIX Fixed checkbox "Show only changed pages" alignment issue 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76244 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 05:16:53 +00:00
Sean Harvey
687d0fef5e BUGFIX Fixed clearing issue of "Allow drag & drop reordering" and "Show deleted pages" 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76237 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 05:01:51 +00:00
Sean Harvey
e2a704d127 Reverted r69557 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:18:05 +00:00
Sean Harvey
09bc4d359a Merged in r75812 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75817 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:05:08 +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
7446bc29e9 BUGFIX Tweak CSS for contentpanel 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75696 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 01:29:09 +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
Normann Lou
230a70c02a merge open/modules/cms/branches/2.3 changeset 73452 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@73582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-24 08:23:09 +00:00
Sam Minnee
550931c02a Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72801 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 21:59:19 +00:00
Sean Harvey
b1045b461c MINOR Merged tinymce toolbar improvement change from cms/branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72677 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-09 05:20:49 +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
55ba6f6cfa BUGFIX Fixed styling of consistent label colours for non-left aligned labels 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71741 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-12 02:47:50 +00:00
Sean Harvey
97d8522e04 MINOR ModelAdmin left hand panel styling tweaks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71715 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-11 21:57:18 +00:00
Sean Harvey
d28951065e Added missing editor.css 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71284 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 04:06:11 +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
22b5b6ea7e Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71272 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:38:04 +00:00
Sean Harvey
32137f61c6 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71271 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-03 03:36:47 +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
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
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
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
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
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
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
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
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
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
Saophalkun Ponlu
6f33a5fcf6 Cleaned up the commented-code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65465 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-09 20:52:38 +00:00
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
Saophalkun Ponlu
f72f2b4dd0 IMPROVEMENT Fix tab display and button position when adding a record (ticket #3029) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65332 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 23:14:00 +00:00
Saophalkun Ponlu
86017a5ae9 IMPROVEMENT moved managed models' forms to one panel (ticket #2898) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65289 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 08:55:07 +00:00
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
e32d366975 Fixed TinyMCE stylihg 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64862 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-29 02:36:54 +00:00