Commit Graph

370 Commits

Author SHA1 Message Date
Ingo Schommer
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Ingo Schommer
1d470fe718 Removed duplciate success status feedback on CMS save/publish
We now have the CMS actions with two states for communicating
that they've saved correctly.
2012-12-13 23:29:17 +01:00
Mateusz Uzdowski
26cc14a930 API Rework the CMS actions to use alternating buttons and drop-ups.
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
2012-12-13 19:10:39 +01:00
Niklas Forsdahl
d42c0041d2 BUG: Fixed pagination functionality on root assets folder
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.

Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
2012-12-13 16:31:19 +02:00
Ingo Schommer
8cd29b627c Merge branch 'pulls/selectiongroup' 2012-12-11 11:08:30 +01:00
Mateusz Uzdowski
a9004b9978 Restore numbering to navigator items so we can use iterator.
Otherwise the numbering is by priority which is not traversable
(1000, 2000, 3000...).
2012-12-10 18:09:55 +01:00
Mateusz Uzdowski
230182fc77 Remove preview button from history section.
No longer works. Needs to be rewritten to work with side-by-side.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
47f41d80c6 API Machine-friendly name for CMS states navigator (stages).
Used programmatically by the side-by-side state switcher.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
aaae8c97e6 Explicitly mark the section as previewable.
Picked up by the forntend side-by-side preview JS.
2012-12-10 18:09:54 +01:00
Naomi Guyer
0711c321c5 Add side-by-side translation context. 2012-12-10 18:09:54 +01:00
Naomi Guyer
639f6e4d95 NEW Side by side editing functionality - first cut (os#7412)
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Relies on sapphire's f95fadc84416835302fe6c8448054960b5e7ec65
2012-12-10 18:09:54 +01:00
Andrew O'Neil
6b6571cd28 BUGFIX: Only rely on request var ParentID, instead of using both $this->currentPage() and the request var. This will hopefully fix issues around the parent ID getting lost. 2012-12-04 11:16:40 +01:00
Ingo Schommer
f9a5601fa3 BUG Enforce "add page" restrictions, improve UI (fixes #7879)
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
2012-12-03 16:52:17 +01:00
Ingo Schommer
2cd46ff0ed Use new SelectionGroup_Item API in "add page" UI 2012-11-30 15:34:10 +01:00
Ingo Schommer
027a41aec7 Consistent naming for root breadcrumb on page controllers (fixes #8057) 2012-11-29 14:43:37 +01:00
Ingo Schommer
e6e12fe00e Merge branch '3.0'
Conflicts:
	composer.json
2012-11-22 23:48:18 +01:00
Ingo Schommer
65fe8e5ae3 Fixed line length 2012-11-19 01:18:01 +01:00
Kirk Mayo
d58b23d6fa BUG AssetAdmin filter array indices (fixes #8014) 2012-11-19 00:51:12 +01:00
Sean Harvey
94b37dbeb0 Fixing AssetAdmin to use static FormField::create_tag()
Instead of createTag() which is deprecated
2012-11-15 14:32:52 +13:00
Sean Harvey
33884acbc5 Removed deprecated ContentController::LangAttributes()
Use ContentLocale() instead and write attribute names suitable
to XHTML/HTML instead
2012-11-15 14:32:21 +13:00
Andrew O'Neil
b31188f252 APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:08:36 +13:00
Ingo Schommer
a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Naomi Guyer
ef651d9d93 ENHANCEMENT: Add GridfieldLevelup component to files area 2012-06-26 13:35:38 +02:00
Sam Minnee
3fbf57245c REMOVE: Remove action handler for widgets. (Trac #7174)
The widget functionality has been moved into a module, and this URL handler was the last of the code still in the core app related to widgets.  As well as this commit, there is a related change to the silverstripe-widgets module to add this feature there: 025ee424c4
2012-06-22 14:05:27 +12:00
Ingo Schommer
c8052da5b8 BUGFIX Corrected page history pane loading (fixes #7477) 2012-06-15 12:50:54 +02:00
Sam Minnee
e7ecdf4b35 BUGFIX: Fixed page tree view 2012-06-15 16:38:55 +12:00
Sam Minnee
792c9058fa BUGFIX: Fixed DataList operations to respect the fact that they're idempotent. 2012-06-15 15:30:08 +12:00
Ingo Schommer
3c81958345 MINOR Only set folder field state in AssetAdmin if a folder is shown 2012-06-14 20:21:28 +02:00
Ingo Schommer
a64cf8c27b BUGFIX AssetAdmin->delete() is now allowed, and redirects to parent folder automatically 2012-06-14 20:21:04 +02:00
Ingo Schommer
eaf05a6a7c BUGFIX AssetAdmin root navigation (fixes #7448)
Return a new object instance rather than relying on singleton(),
which might've been modified elsewhere, and have a non-zero ID/ParentID.
2012-06-14 09:42:55 +02:00
Ingo Schommer
6581831396 MINOR Disable parent node search in CMSPageAddController
The search <input> field can't handle HTML returned by SiteTree.TreeTitle, see #7455 for proposed fix
2012-06-13 16:11:35 +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
bc2fb3c900 Merge pull request #147 from ajshort/silverstripe-cms
---
2012-06-12 00:35:21 +02:00
Andrew Short
cdea489fcb BUGFIX: Catch and display validation errors when adding a page. 2012-06-11 23:19:59 +10:00
Andrew Short
1c5dae9748 MINOR: Always include tree CSS so tree icons are consistently styled. 2012-06-11 21:24:58 +10:00
Ingo Schommer
ca9f4f6f6f Merge branch 'pjax-multiple' 2012-06-05 14:01:20 +02:00
Ingo Schommer
8b8de0564c BUGFIX Don't filter AssetAdmin list view when showing detail view (fixes #7408) 2012-06-05 13:42:38 +02:00
Ingo Schommer
b5254862a2 MINOR Added feedback after creating page (fixes #7297) 2012-06-04 09:57:40 +02:00