Commit Graph

173 Commits

Author SHA1 Message Date
Ingo Schommer
1bf67fd942 Merge remote-tracking branch 'origin/3.0' 2012-12-10 18:09:34 +01:00
Mateusz Uzdowski
c0751df54e BUG Remove handwritten SQL and use the ORM.
The custom SQL does not take subsites into account and breaks the CMS
on certain pages - under some circumstances the custom count will return
1 or more, while the set will be in fact empty because of augmentation.
2012-12-05 10:27:12 +13:00
Ingo Schommer
e6e12fe00e Merge branch '3.0'
Conflicts:
	composer.json
2012-11-22 23:48:18 +01:00
Tim Klein
59719a46cc MINOR removed reference to non existent js
cms/javascript/SitetreeAccess.js is no longer with us :)
2012-11-19 16:15:57 +13:00
Sean Harvey
cef087f689 Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead 2012-11-15 14:41:17 +13:00
Sean Harvey
d236bb58eb Removed deprecated SiteTree::prepopuplate_permission_cache()
This function is misspelled, and was marked deprecated. This commit
removes that function. Please use prepopulate_permission_cache()
instead (note the removal of the extraneous "p" in "prepopuplate")
2012-11-15 14:39:48 +13:00
Sean Harvey
555ecd7f24 Removed deprecated SiteTreeDecorator, use SiteTreeExtension instead 2012-11-15 14:31:54 +13:00
Simon Welsh
d006c08db3 Reverts test code committed in a52514a3 2012-11-10 15:42:45 +13:00
Ingo Schommer
a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
Sam Minnee
ef32310ef8 FIX: Allow 1024 chars for keywords, not a mere 255 2012-11-05 17:58:32 +13:00
Will Rossiter
b221f7ba7a FIX Remove Metadata Label from RedirectorPage. (Fixes #7959) 2012-10-23 19:32:25 +13:00
Ingo Schommer
17113039be NEW Enable SiteTree::$nested_urls by default 2012-10-08 17:05:46 +02:00
Ingo Schommer
0d03c62984 Merge remote-tracking branch 'origin/3.0' 2012-10-03 16:16:25 +02:00
Ingo Schommer
a6d09988ed Merge pull request #214 from silverstripe-droptables/ssexpress
Tweaks to CMS required for Translatable
2012-10-02 02:10:47 -07:00
Robert Curry
9cf5a6f47a BUG: Remove the is_null check on augmentValidURLSegment
Object::extend already does a check for NULL before it adds the results
to the array of return values. This was required for Translatable as the
result from Translatable::augmentValidURLSegment was being ignored.
2012-10-02 11:29:10 +13:00
Sean Harvey
cb8c10a473 Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0 2012-09-27 10:49:03 +12:00
Sean Harvey
345dbc8a4f BUG Fixing broken links "admin/show", should be "admin/pages..." 2012-09-25 15:31:42 +12:00
Ingo Schommer
cbd31e3ab2 API Removed SiteTree.MetaTitle and MetaKeywords
They are irrelevant in terms of SEO, general page informancy,
clutter up the CMS UI, and encourage CMS authors to waste
their time filling them out.

[1] http://www.seomoz.org/learn-seo/title-tag
[2] http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/
2012-09-21 11:31:00 +02:00
Ingo Schommer
cebce51bc1 Merge branch 'open/7875' of git://github.com/jbridson/silverstripe-cms into jbridson-open/7875 2012-09-21 10:49:20 +02:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Jeremy Bridson
05d5bd7508 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:22:12 +12:00
Damian Mooyman
02e95adb4c BUG Consistently save SiteConfig, and refactor Translatable hooks
Squashed commit of the following:

commit a60eddfacc710d3047bd1d5107e5df0cc6dba93c
Merge: c847b55 76be14b
Author: Ingo Schommer <ingo@silverstripe.com>
Date:   Fri Sep 7 17:02:47 2012 +0200

    Merge branch '3.0-translation-migration' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-migration

commit 76be14b1fccc05b5dcca8c805e0354a42e75135d
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:28:18 2012 +1200

    FIXED: Indentation

commit 715b60387c970846db1bf9a5f14140aee49ce665
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:25:14 2012 +1200

    FIXED: Coding style inconsistencies

commit 6395f9030ed65b24494842ce74864ff7ebbf6c5e
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 16:30:11 2012 +1200

    FIXED: Issue where new SiteConfig instances weren't always saved to the database

commit aca242e31c8d98ee3b8acc397bf605ceb964e1bf
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 14:22:56 2012 +1200

    UPDATED: Refactored Translation module specific code out of the SiteConfig
2012-09-07 17:06:29 +02:00
Hamish Friedlander
af2c890168 Merge pull request #190 from silverstripe-rebelalliance/open/5971
NEW Add warning if viewed SiteTree object class is obsolete
2012-09-02 14:12:23 -07:00
Ingo Schommer
1cd82e2db1 BUG Enforce $allowed_children in controllers on page creation (fixes #7694)
Original bug fix contributed by @kmayo-ss
2012-09-02 18:20:22 +02:00
Hamish Friedlander
949507c3fe NEW Add warning if viewed SiteTree object class is obsolete 2012-08-29 14:48:23 +12:00
Ingo Schommer
8a514d8b64 BUG Correct live state in SiteTree->getAbsoluteLiveLink()
Was fetching the record from live (and its direct URLSegment),
but all of its parents from the current stage, which might be draft,
leading to "mixed" draft/live nested URLs which might no longer
be reachable in live mode.
2012-08-28 19:04:16 +02:00
Ingo Schommer
59546ccf11 Localized page name in "add page" dialog and dropdowns (see #7798) 2012-08-26 23:58:38 +02:00
Ingo Schommer
2e791abad2 Better i18n for "new page" label (fixes #7796)
Also using better standard name for auto generated
page names ("Page" instead of "Site Tree",  "Pages" instead of "Site Tres" [sic])
2012-08-20 22:25:18 +02:00
Sean Harvey
c019f22163 Fix notice when ErrorPage tries to create static error pages and can't write 2012-08-20 15:23:46 +12:00
Ruud Arentsen
18a40b4b5d BUG Adding siteconfig translations
translations were not added in the same translation group, and the
translation module didn't work. Also commited changes in the translation module, which will need this commit.
2012-08-10 10:16:39 +02:00
Ingo Schommer
39a9093715 BUG SiteTree->provideI18nEntities() limited to class
Called for each subclass by the collector,
so we don't need to aggregate here.
In fact, its harmful because it causes entities
to be placed in the wrong definitions file.
The <class>.DESCRIPTION entity was always placed in cms/lang/en.yml,
regardless of the original location of the file containing the class.
2012-08-06 14:28:04 +02:00
Ingo Schommer
671c7daa4c SiteConfig load/save with ID in CMS
Allow loading a SiteConfig by ID (by specifying $tree_class),
and pass the ID through with the form data. Unifies processing
with SiteTree, and allows the Translatable module
to use the same logic for interacting with the load/save process.
2012-08-06 09:36:25 +02:00
Ingo Schommer
9076286162 SiteTree->CMSEditLink()
Mainly to make it compatible with the Translatable
extension linking to existing translations of it,
but also to make it work similarly to the SiteTree logic elsewhere.
2012-08-05 20:52:22 +02:00
Kirk Mayo
b15fabaf0d BUG: open ticket 5880 always show the current page type in the page type dropdown list 2012-07-16 14:56:24 +12:00
Ingo Schommer
69e4fa072a Toggle metadata fields in SiteTree->getCMSFields()
To save space, reduce clutter and deemphasize the fields.
Partially fixes #7405, needs better design though.
2012-07-15 21:29:46 +02:00
Mateusz Uzdowski
54fd54a2fb BUG Change all shortcodes into the new, comma separated, format.
Ref http://open.silverstripe.org/ticket/7337
2012-07-12 17:57:38 +02:00
Ingo Schommer
d1bc7219a8 Merge branch '3.0' 2012-07-05 17:53:35 +02:00
Sam Minnee
040f780a15 BUG: Allow children on RedirectorPage (Trac #7587) 2012-06-29 16:24:20 +12:00
Ingo Schommer
bb5e3e5fbd MINOR Remove DB dependency from SiteTree->provideEntities()
Use class manifest instead, which provides same level of info,
and means we can run the text collector on bare checkouts
without a database set.
2012-06-25 14:01:19 +02:00
Will Rossiter
facc8ba653 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:27:47 +02:00
Will Rossiter
3b7af0e945 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:20:04 +02:00
Ingo Schommer
4986355e3f MINOR Simplified page type dropdown labels, removed redundant info (fixes #7474) 2012-06-15 16:22:27 +02:00
Ingo Schommer
eccfc1a664 Merge branch 'stylingfixes' of https://github.com/ajshort/silverstripe-cms into ajshort-stylingfixes 2012-06-13 13:24:12 +02:00
Andrew Short
a6cee248e0 BUGFIX: Consistently style custom defined page icons.
* Renamed generateTreeStylingCSS() to generatePageIconsCSS().
* Removed legacy icon definitions.
2012-06-13 17:46:43 +10:00
Ingo Schommer
e50936fe9f MINOR Added caching to SiteTree->getStatusFlags(), as its called twice for every node now in LeftAndMain->SiteTreeAsUL() (see #7410) 2012-06-12 19:35:15 +02:00
Sean Harvey
ad28780959 MINOR Use shorthand syntax for DataList querying 2012-05-28 21:05:24 +12:00
Sean Harvey
808819ec3b BUGFIX Themes dropdown in SiteConfig::getCMSFields() should use setEmptyString() as the $emptyString argument is now deprecated. 2012-05-24 14:38:00 +12:00
Sean Harvey
542d727db2 MINOR Don't use deprecated extraStatics when adding extra statics with
DataExtension
2012-05-23 22:13:27 +12:00
Sean Harvey
ec3ebc91d8 MINOR Use instance methods on current Controller instance for redirect()
instead of static Director functions
2012-05-23 21:45:16 +12:00
Sean Harvey
7ed09917ac BUGFIX Fixing incorrect URL to edit canonical page on VirtualPage 2012-05-22 17:44:01 +12:00