Commit Graph

1970 Commits

Author SHA1 Message Date
Sean Harvey
79e6304ce1 Merge branch '3.0' 2012-11-05 15:13:06 +13:00
Stig Lindqvist
fa348d6666 MINOR Code refactoring of CMSMain::SearchForm() extracted some methods. 2012-11-02 23:52:24 +01:00
Ingo Schommer
600c73086b Merge pull request #223 from adrexia/7883-File-Uploading-Notifications
BUG: File Uploading Notifications (fixes #7883)
2012-11-02 14:08:20 -07:00
Ingo Schommer
53e92a080a Merge pull request #226 from adrexia/asset-grid-filter
BUG: Filter in asset grid appears in incorrect place
2012-10-30 14:59:25 -07:00
Ingo Schommer
7131e167f1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	code/model/RedirectorPage.php
2012-10-30 17:54:55 +01:00
Will Rossiter
b221f7ba7a FIX Remove Metadata Label from RedirectorPage. (Fixes #7959) 2012-10-23 19:32:25 +13:00
Naomi Guyer
0d642af136 BUG: Filter in asset grid appears in incorrect place
Moved the filter component in the asset gridfield to after the sortable
header
2012-10-23 15:00:49 +13:00
Russell Michell
72543440cb BUGFIX: Fixed SideReport for use with Postgres (using v8.4) which requires table/column-names to be quoted. MySQL seems OK with either/both 2012-10-19 16:04:32 +13:00
Naomi Guyer
d61f16d54a BUG: File Uploading Notifications (fixes #7883)
* Moved allowed file types into a variable to be used in the template.
2012-10-16 18:43:10 +13:00
Sean Harvey
8a0ae5653f Merge branch '3.0' 2012-10-15 10:10:52 +13:00
Sean Harvey
98197525c6 Remove use of backticks in BrokenLinksReport, always use ANSI quotes 2012-10-11 17:24:23 +13:00
Sam Minnée
de4f207534 Merge pull request #208 from halkyon/upload_assets_changes
Uploads go to "assets/assets" instead of root of assets
2012-10-10 13:24:06 -07:00
Ingo Schommer
17113039be NEW Enable SiteTree::$nested_urls by default 2012-10-08 17:05:46 +02:00
Jeremy Bridson
76e569a8bb ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:27:13 +13: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
Simon Welsh
03ae8e3728 Merge pull request #213 from sminnee/http-error-catching
FIX Use RequestHandler::httpError() for all HTTP errors.
2012-09-26 18:00:32 -07:00
Sam Minnee
39792debb8 FIX Use RequestHandler::httpError() for all HTTP errors.
https://github.com/silverstripe/sapphire/pull/827 adds some extension points for catching HTTP errors such as 404.  This change fixes some issues where httpError() isn't used all the time.  Note that the aforementioned pull request will be necessary to ensure that it works properly.
2012-09-27 12:56:56 +12: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
Roman
bde71c1b9c Fixing permission issue with CMSSettingsController, where it won't show up for users with limited rights, even when they have the EDIT_SITECONFIG permission 2012-09-25 22:13:31 +02:00
Sean Harvey
686f70330b Merge pull request #210 from chillu/pull/sitetree-meta-removal
API Removed SiteTree.MetaTitle and MetaKeywords
2012-09-24 21:15:24 -07:00
Sean Harvey
345dbc8a4f BUG Fixing broken links "admin/show", should be "admin/pages..." 2012-09-25 15:31:42 +12:00
Sean Harvey
d229fdcc6d Merge branch 'removestatic' of git://github.com/wilr/silverstripe-cms into wilr-removestatic 2012-09-25 14:15:09 +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
Will Rossiter
a3007b618f API moved StaticCache / StaticPublisher to module.
Removed all related functionality for exporting a static version of the website to the silverstripe-static module.
2012-09-21 19:59:31 +12:00
Sean Harvey
118b28dea1 BUG setFolderName in CMSFileAddController should default to the root
setFolderName expects a folder name relative to the root. Specifying
ASSETS_DIR will create a duplicate folder called "assets", so the
file gets uploaded into "assets/assets". Specifying "/" means the
file will get uploaded into the root instead, which is correct.
2012-09-21 16:00:35 +12: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
UndefinedOffset
a2d76c9305 BUG Remove page types from the "add new page here" menu if they appear in a hide_ancestor (fixes #7712) 2012-09-15 17:04:02 +12:00
Niklas Forsdahl
17db5baf19 BUG: Page type names not translated in pages overview search form
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-12 11:02:24 +02:00
Ingo Schommer
9b6ca79746 Fixed report title column localization 2012-09-12 11:02:24 +02:00
Ingo Schommer
9124d8ae1a Fixed report title column localization 2012-09-11 12:49:27 +02: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 76be14b1fc
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:28:18 2012 +1200

    FIXED: Indentation

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

    FIXED: Coding style inconsistencies

commit 6395f9030e
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 aca242e31c
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
Ingo Schommer
c847b55608 Merge pull request #195 from creamarketing/page-type-dropdown-translations
BUG: Page type names not translated in pages overview search form
2012-09-06 12:36:35 -07:00
Andrew O'Neil
f843dd56dc BUGFIX: Fix site tree filter not showing parents of results more than a level deep in the hierachy 2012-09-05 14:35:48 +12:00
Niklas Forsdahl
2934423ebc BUG: Page type names not translated in pages overview search form
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-04 09:00:04 +03:00
jean
53fdafb473 NEW 7839 Support for documents as a file type in Files and images 2012-09-04 11:26:09 +12: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
Saophalkun Ponlu
e5401668fa BUG Filter pages by LastEdited always returns an empty list
This is caused by the input date values entered by the user are passed into query without converting in a correct format first.
2012-08-30 22:42:45 +12:00
Ingo Schommer
f454f481f2 BUG Session namespace sharing for CMS controllers
Ideally we could do this without session, but pragmatically
we still need it, because of the inflexible routing system,
and because of performance considerations.

Example: The tree is lazy loaded via a generic  URL (admin/pages/treeview).
While we could add ?ID=<currentpage> to make the view (more or less) stateless,
it would trigger a full tree reload on every tree navigation action.
Instead, we assume that all "reachable" nodes are already cached,
and simply mark a different one as current. For this to work, we need
shared session state between CMS controllers.

See http://open.silverstripe.org/ticket/7815 for detail.
2012-08-29 15:09:15 +02:00
Ingo Schommer
651cb03ff2 BUG Removed 'Sort' field from CMSMain edit form
Related to #7740. The sort field gets stale if the current
record is moved in the tree. Since the sort value can't
be altered by interacting with the form, its not required
as a hidden field, either.
2012-08-29 14:58:42 +02:00
Ingo Schommer
ab0dce9127 Merge pull request #188 from phalkunz/7601-listview-sort-by-title
Enable page sorting by Page name in list view (see #7601)
2012-08-29 05:42:07 -07:00
Ingo Schommer
7525e3c977 Merge pull request #183 from adrexia/installer
BUG: Installer templates
2012-08-29 02:25:19 -07:00
Hamish Friedlander
d9243cddde FIX Pages with obsolete class shouldnt do first versionless write 2012-08-29 16:17:17 +12:00
Hamish Friedlander
949507c3fe NEW Add warning if viewed SiteTree object class is obsolete 2012-08-29 14:48:23 +12:00
Hamish Friedlander
fdecfbc091 Merge pull request #189 from silverstripe-rebelalliance/open/7754
BUG: Fixing a issue with a undefined variable in getLink
2012-08-28 16:09:35 -07:00
Ingo Schommer
cec461b767 BUG Use AbsoluteLiveLink() for CMS previews
It uses the correct live URLSegments for its parents
by setting the global Versioned reading mode correctly,
see 8a514d8b64 for detail.
2012-08-28 19:07:12 +02: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
Saophalkun Ponlu
436972744d Enable page sorting by Page name in list view (see #7601) 2012-08-28 21:18:07 +12:00
jean
62cfd871b6 FIX 7819 Check if the current folder ID is in the url before assuming the list should not filter by folder ID 2012-08-28 16:43:54 +12:00
Ingo Schommer
62783c75a9 BUG Prevent overwriting of draft/live preview form fields
By renaming fields to "StageLink" and "LiveLink",
which means they don't get influenced by the model getters
on Form->loadDataFrom(). Its also a more accurate
name for the field value, since it contains a full (nested) URL
rather than just a segment. Only used internally, so no API change.
2012-08-27 18:20:56 +02:00
Ingo Schommer
11b85e988e Fixed "from"/"to" filter field widths
Removed ineffective FieldGroup->subfieldParam setting,
replaced with a specialised template, as well as a new "stacked" styling
(both added to framework codebase)
2012-08-27 16:15:41 +02:00
Ingo Schommer
e59aec3f6f BUG Redirect to edit view after page revert in CMS (fixes #7391) 2012-08-27 14:19:40 +02:00
Ingo Schommer
cd8c3a0245 NEW Re-added SilverStripeNavigator styling 2012-08-27 11:53:57 +02:00
Ingo Schommer
8442ed0ecd i18n for report table title (see #7798) 2012-08-26 23:58:38 +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
6b6dfaed7b Fixed i18n namespace for "Sync Files" 2012-08-26 23:58:38 +02:00
Ingo Schommer
0ec269f1bd Merge branch '3.0-translation-compatibility-fixes' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-compatibility-fixes
Conflicts:
	code/controllers/CMSMain.php
2012-08-23 22:53:27 +02:00
Naomi Guyer
4fdc76d904 BUG: Installer templates
Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
2012-08-22 13:52:33 +12:00
Damian Mooyman
7807842eb1 FIXED: Additional issue where the add-page ajax parameters wouldu incorrectly concatenate additional query parameters into the add action url. Resolved by moving URL concatenation from view to controller where Controller::join_links is available 2012-08-21 15:50:03 +12: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
Ingo Schommer
f5007a5536 Allow extension of "add" link in CMS
First use case is the "translatable" module
2012-08-16 09:29:51 +02:00
Will Rossiter
4bbd90487b BUG fix getting translated string for page type description (Fixes #7781). 2012-08-12 14:44:48 +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
Will Rossiter
24ce0c199a Merge pull request #174 from adrexia/add-archive
BUG: Missing preview archive version button (fixes 7656)
2012-08-09 02:57:59 -07:00
Damian Mooyman
a6087f1d4e FIXED: Issue where links within the CMS page list view would not be correctly generated. E.g. when the translatable module is used, page links for the "show children" action would come up as admin/pages/?locale=en_NZ?ParentID=21&view=list when they should be shows as admin/pages/?locale=en_NZ&ParentID=21&view=list. Uses Controller::join_links to perform the necessary sanity check on urls. 2012-08-08 17:04:17 +12:00
Kirk Mayo
03e4893b15 BUG: Fixing a issue with a undefined variable in getLink 2012-08-08 16:39:10 +12: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
Will Rossiter
5938ab06ba Merge pull request #165 from silverstripe-droptables/search-form-fix
BUG: Check for the parameter existence.
2012-08-04 23:18:45 -07:00
Andrew Short
21bcc01878 ENHANCEMENT: Made the tree search form more extensible.
- Use DataQuery for generating the search query.
- For custom field matching, use searchcontext rather than a LIKE query.
- Added an extension hook for updating the search form.
2012-08-05 18:05:46 +12:00
Marcus Nyeholt
97d678b258 BUGFIX Provide default constructor value to filesystem publisher so that singleton calls (which don't pass params) don't fail 2012-08-05 18:02:13 +12:00
Naomi Guyer
7c0e38707c BUG: Missing preview archive version button (fixes 7656)
Added missing preview button
2012-07-31 17:49:59 +12:00
Hamish Friedlander
4c91a56277 Merge in changes from 3.0.1 final 2012-07-31 16:52:55 +12:00
Hamish Friedlander
c96101654d BUG 15e2efb55d broke the Page ListView. 2012-07-28 15:43:13 +12:00
Hamish Friedlander
6d5d3d19b4 Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:46:14 +12:00
carlos barberis
f7b6f1de5a BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment 2012-07-23 17:06:37 +12:00
Mateusz Uzdowski
ee2b1a9070 BUG Check for the parameter existence.
The specific situation is if the SearchForm.ss is overriden, and the
$SearchQuery parameter is used in the template. This will throw a Notice
in case the form is rendered without searching.
2012-07-20 14:04:52 +12:00
Ingo Schommer
2ad40e1ba7 Merge remote-tracking branch 'origin/3.0' 2012-07-18 13:55:46 +02:00
Ingo Schommer
abc87a4f8f Localized CMS breadcrumbs title 2012-07-18 13:51:30 +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
Ingo Schommer
b93e2bbee2 Remove .ss-tabset class from CMSMain forms, confuses tab state setting.
It is already applied to the parent template container,
which means that tab state finds two nested sets,
setting the wrong id (#Root instead of #pages-controller-cms-content
2012-07-13 17:37:35 +02:00
Ingo Schommer
84ad9b55f0 BUG Retain page search state on list view actions (fixes #7648)
The ".action-detail" link behaviour overloads GridField's
showDetailForm() method, which in turn appends any query params
to the URL (including the existing search params).
2012-07-13 12:15:25 +02:00
Ingo Schommer
b74178e7fd BUG Reload full view in admin/settings to avoid tabs breaking
Had the pjax "CurrentForm" marker set to the <form> tag,
which makes sense, but excludes the tabs. On refresh,
the tabset wasn't reinitialized, showing all form elements on
one page. Its easier to simply refresh the whole content area.
2012-07-13 11:00:21 +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
8055fc2e7b FIX Corrected page edit links in reports 2012-07-12 16:30:17 +02:00
Ingo Schommer
57c615d6b2 NEW Reinstated filters in ReportAdmin
- Moved report table generation back to its original location in Report->getCMSFields(),
in order to keep it customisable rather than duplicating it in ReportAdmin.
- Using History.js to set URL state and reload panel
- Namespacing filter GET parameters in order to only include them in URL state
2012-07-12 16:19:23 +02:00
Ingo Schommer
d77c43d6c7 BUG CMS pages list view link targets (fixes #7589)
Previously broken in e7ecdf4b35
2012-07-10 10:43:07 +02:00
Devlin
e0c92f135e Display of last edit date should be exact to the minute. 2012-07-09 16:20:36 +03:00
Julian Seidenberg
63ad68a7d3 BUGFIX: fixing an edge-case bug where a 404-page would get statically published and overwrite the homepage of the site (this would sometimes happen when a RedirectorPage was set to an external URL and still referenced an internal page ID) 2012-07-09 13:20:58 +12:00
Ingo Schommer
d1bc7219a8 Merge branch '3.0' 2012-07-05 17:53:35 +02:00
Ingo Schommer
89079c4ca0 Checking for existence of 'Locale' data in CMS controllers
Only applies for Translatable extension installed
2012-06-29 14:22:24 +02:00
Sam Minnee
040f780a15 BUG: Allow children on RedirectorPage (Trac #7587) 2012-06-29 16:24:20 +12:00
Naomi Guyer
ef651d9d93 ENHANCEMENT: Add GridfieldLevelup component to files area 2012-06-26 13:35:38 +02:00