Commit Graph

645 Commits

Author SHA1 Message Date
Ingo Schommer 8ab66c93b6 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/reports/Report.php
	composer.json
2013-01-21 11:24:05 +01:00
Will Rossiter 06e8499070 Remove outdated ReportAdmin assets 2013-01-21 16:53:19 +13:00
Kirk Mayo 383ae8f8b5 BUG SiteTree_Information.ss was not making use if i18n translations 2013-01-07 15:37:04 +13:00
Ingo Schommer 58d316e985 Moving "edit tree" button next to "add new" (fixes #8119) 2012-12-17 15:35:52 +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
Ingo Schommer f4128a0839 Revert "BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041"
This reverts commit a63a9f0e74.
Broken by merging in 0be51a93213, which works on 3.0,
but failed once we put those two patches together in 3.1.
They fix the same problem on different ends, and assume
the respective other behaviour still exists.
2012-12-13 00:28:39 +01:00
Naomi Guyer 35cbe28188 Re-add preview button for IE<=7. Side-by-side disabled for these.
Preview will open in new window.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski 772961cb5e Add a secondary side-by-side state selector to the edit form
For situations when preview is not visible (and options with it).
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
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 98cd09a852 Merge pull request #251 from silverstripe-rebelalliance/8041
BUG removed class cms-panel-link as it was calling loadPanel to be calle...
2012-12-03 01:25:06 -08:00
Kirk Mayo a63a9f0e74 BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041 2012-12-03 12:11:31 +13:00
Naomi Guyer 4fab9b8248 BUG Incorrect html nesting of breadcrumbs
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div

Relies on sapphire commit 72b4fbf
2012-11-22 12:19:38 +13:00
Ingo Schommer a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
Ingo Schommer bd86cf2c50 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	code/model/SiteTree.php
2012-11-06 19:56:04 +01:00
Ingo Schommer abba77af51 Fixes required for jQuery UI 1.9 2012-11-06 15:54:37 +01:00
Sean Harvey 79e6304ce1 Merge branch '3.0' 2012-11-05 15:13:06 +13:00
Sean Harvey b00397968b Tweaking text for "You can start editing" on successful install 2012-11-05 11:12:49 +13:00
Saophalkun Ponlu 79cc947ed8 Batch actions UI enhancement (#7878) 2012-11-02 23:05:20 +01:00
Ingo Schommer 7131e167f1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	code/model/RedirectorPage.php
2012-10-30 17:54:55 +01:00
Sean Harvey f72cef95e6 Merge pull request #224 from adrexia/3.0
BUG: Installation successful "CMS" link has broken href (fixes #7874)
2012-10-17 19:04:40 -07:00
Naomi Guyer c9244456e0 BUG: Installation successful "CMS" link has broken href (fixes #7874)
Fixed the template component of this bug. Language files will also need
to be updated. eg. "Start editing" should appear in the en lang files
as:
StartEditing: 'You can start editing your site''s content by opening <a
href="{link}">the CMS</a>
2012-10-18 14:47:11 +13:00
Ingo Schommer 2f7e6a7303 Merge pull request #221 from adrexia/add-cms-buttons
BUG: Add "add new" button to Pages list view (fixes 7649)
2012-10-16 07:23:00 -07:00
Naomi Guyer 06e184a97f BUG: Add "add new" button to Pages list view (fixes 7649)
Rearranged the templates around CMSPagesController_ContentToolbar and
uncommented the toolbar from the pages list view so the add new button
would be included with including actions that aren't applicable to the
gridfield.

Linked to https://github.com/silverstripe/sapphire/pull/684/commits
2012-10-15 14:59:04 +13: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
Will Rossiter 76373a4da6 Remove ContentController view, moved functionality to Controller view 2012-09-19 21:13:49 +12:00
Sean Harvey a77d1b8230 Use HTML5 doctype for default ContentController template 2012-09-14 14:24:47 +12:00
Ingo Schommer 7525e3c977 Merge pull request #183 from adrexia/installer
BUG: Installer templates
2012-08-29 02:25:19 -07:00
Naomi Guyer 362e9795fd Replace tutorial link 2012-08-29 11:24:37 +12: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 77ec21fe9d BUG Fully qualified namespace for _t() in templates
Was inferred by the containing file previously,
which is deprecated behaviour, because it obscures
the fact that renaming an template file or copying
template code will change the context of the translations.
While it would be nice to use shorter and more readable namespaces,
this change would remove all existing translations.
Since there is no (easy) migration of entities to a new namespace,
having verbose template code is the lesser of two evils.
2012-08-06 13:44:33 +02:00
Ingo Schommer 2ba3fbe42d 'updatetreenodes' URL in tree template (#7450) 2012-07-23 21:24:28 +12:00
Ingo Schommer 3ff0c428cf Ignore ajaxified tabsets on tab state saving
This prevents them from ping-ponging between the two states
in infinite loops.
2012-07-13 17:37:48 +02:00
Ingo Schommer 44c237c954 Adding DOM ids for all tabsets to aid saving their state 2012-07-13 16:44:01 +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 c051b80b73 MINOR Using links for fake remote tabs in CMSMain_Content.ss to avoid 'missing fragment identifier' errors from jQuery UI. 2012-06-15 00:35:58 +02:00
Ingo Schommer 7f27474159 BUGFIX Show AssetAdmin tree by not invoking $EditForm twice in template
Both for performance reasons, and for weird behaviour on the second invocation (doesn't retain the same record context)
2012-06-14 20:36:36 +02:00
Andrew Short cdea489fcb BUGFIX: Catch and display validation errors when adding a page. 2012-06-11 23:19:59 +10:00
Ingo Schommer 098d3b6b8a MINOR Changed CMS breadcrumbs markup to fit new inline-block CSS (fixes #6882) 2012-06-06 14:35:45 +02:00
Ingo Schommer 1bb6026240 BUGFIX Don't apply clientside deferred cache to list view since it relies on URL as a cache key which is set on the deferred container (=not replaced with view) 2012-06-05 17:16:58 +02:00
Ingo Schommer 6ac836348a MINOR Fixed tab selection state (changed JS behaviour) 2012-06-05 14:04:25 +02:00
Ingo Schommer ca9f4f6f6f Merge branch 'pjax-multiple' 2012-06-05 14:01:20 +02:00
Ingo Schommer 8847506322 BUGFIX Selecting correct parent when adding a new page (fixes #7188) 2012-06-03 19:54:14 +02:00
Ingo Schommer ad7c443255 ENHANCEMENT Saving tab state for CMSPagesController 2012-05-30 16:04:51 +02:00
Ingo Schommer c9fc7cda65 ENHANCEMENT Declaring Pjax fragments on CMS templates and forms 2012-05-30 15:06:54 +02:00
Mateusz Uzdowski 50cbef7933 BUGFIX: remove unnecessary class that breaks the tab opening.
This class should be applied higher in the hierarchy so it also
includes panels - and it's already there too.
2012-05-23 15:49:10 +12:00
Sean Harvey 92019876d2 MINOR Removing unused template control 2012-05-18 16:47:12 +12:00
Julian Seidenberg 7112032b4c BUGFIX: fixing the look of Settings tab in the CMS if it has multiple tabs 2012-05-18 16:33:34 +12:00
Julian Seidenberg aa7bc23992 ENHANCEMENT: refactoring template "control" loops into "loop" and "with" to fit with the new template syntax 2012-05-18 16:32:44 +12:00
Ingo Schommer 7b40c5f0a1 MINOR Using search parameters in "edit tree" link (which ensures we include decorated parameters like 'locale' from the 'translatable' module) 2012-05-15 21:34:26 +02:00
Ingo Schommer b9cae47135 BUGFIX Don't link to views in CMS tabs, use data-href instead to avoid jQuery.tabs() interfering with its own ajax load magic (specifically fixes a problem where admin/pages/edit/99 was detected as different from admin/pages/edit/99/?locale=de_DE) 2012-05-15 21:32:03 +02:00
Ingo Schommer c185c737dd MINOR More extension points in CMSMain (specifically to allow for 'locale' query parameter and language drop down of the 'translatable' extension) 2012-05-15 21:30:53 +02:00
Sean Harvey 5d825f38b7 Merge pull request #126 from mateusz/os7304
BUGFIX: Check the drag and drop radio by default.
2012-05-10 22:38:53 -07:00
Robert Curry 28a1d0d4e7 BUGFIX: Change styles on tabs to new format. 2012-05-11 11:31:40 +12:00
Mateusz Uzdowski 9b39acb08c BUGFIX: Check the drag and drop radio by default.
The default state of the tree is drag and drop mode.
2012-05-11 10:29:13 +12:00
Ingo Schommer 1863bb00db ENHANCEMENT Refactored SiteTreeURLSegmentField JS to a more selector based approach (future proof field for reusability e.g. in ModelAdmin with custom DataObject URL previews) 2012-05-10 14:50:08 +02:00
Ryan Wachtl bd94c6f336 Trac 6981: Opt-in URL Updating 2012-05-09 19:01:57 -05:00
Ingo Schommer ce58e55cc1 MINOR Consistent location for CSS classes on CMS tabsets 2012-05-08 15:31:28 +02:00
Normann Lou 440c96efb8 BUGFIX: replace "<!-- -->" with "<%-- --%>" for the blocks that are definately not needed to be processed by SSViewer to limit the chances of producing nested html comment tag "<!--<!-- -->-->" 2012-05-04 15:56:58 +12:00
Ingo Schommer 7c25754cb1 ENHANCEMENT Localization of installation success screen 2012-05-03 17:53:33 +02:00
Ingo Schommer 2fdc4e5f0b ENHANCEMENT Section icons in CMS (#7269) 2012-05-03 13:49:44 +02:00
Ingo Schommer 63cef2af22 MINOR Disable batch actions in pages list view until we've implemented checkboxes in GridField 2012-05-01 17:58:42 +02:00
Ingo Schommer c6cca21c5e MINOR Removed duplicate HTML ids from tools panels, which meant they were sharing a collapse state cookie (see #7210). Marking AssetAdmin filters and 'edit page" tree sidebar as expanded by default, but the filters on "pages" as collapsed. 2012-05-01 14:08:14 +02:00
Ingo Schommer f5d1831b0c MINOR Reverting panel collapse changes for filters (see pull requests #383 and #385) 2012-05-01 13:01:32 +02:00
Sean Harvey e277b6f0d9 Merge pull request #109 from adrexia/7210-close-filter-panel-default
ENHANCEMENT: Make filter closed (#7210)
2012-04-30 18:44:12 -07:00
Naomi Guyer 84045ccfed ENHANCEMENT: Make filter closed (#7210)
This adds a class to the filter template so that the javascript in
Framework may target the filter panel
2012-05-01 11:17:27 +12:00
Ingo Schommer 98a0331a48 BUGFIX Fixed "add page" action when invoked through tree context menu (and removed URL hardcoding in JS) (fixes #7155) 2012-04-30 16:42:45 +02:00
Ingo Schommer 8a72b32e95 API CHANGE Moved Widget API to new module (https://github.com/silverstripe/silverstripe-widgets), incl. WidgetArea and WidgetAreaEditor classes 2012-04-18 23:21:59 +02:00
Ingo Schommer 4fd757341a MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview() 2012-04-18 22:59:31 +02:00
Ingo Schommer 75da9fd7cb MINOR Renamed .ss-tabset to .cms-tabset in CMS templates in order to have more entwine flexibility 2012-04-17 22:59:11 +02:00
Ingo Schommer 6aeac37906 API CHANGE Combined "Pages" and "Edit Page" into a single menu entry
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
2012-04-17 22:59:08 +02:00
Ingo Schommer b127419f76 MINOR HTML5 for BlankPage.ss default template 2012-04-13 15:34:14 +02:00
Jeremy Bridson 4443d0042a ENHANCEMENT:Trac 6882 - created include for back button and altered the templates accordingly 2012-04-13 16:05:48 +12:00
Normann Lou bfb99aea6c MINOR SSF-124 move the trunk of html code (commented out) to the position of the third tab so if it is commented in someday, it wont break the default selected tab. 2012-04-11 17:21:24 +12:00
Normann Lou 653625914d ENHANCEMENT SSF-124 make tab select pages list view if the current url is 'listchildren' otherwise use the default action defined in TabSet.js 2012-04-11 15:01:31 +12:00
Normann Lou dc01b74152 FEATURE SS-124 duplicate "Add New" and "Batch Action" into page list view 2012-04-10 15:49:57 +12:00
Ingo Schommer 76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Wolf Vollprecht a18b9bd85e ENHANCEMENT: Flyout menu to directly choose the pagetype one wants to add. 2012-04-09 21:08:15 +02:00
Normann Lou f101595921 FEATURE SSF-124 first version of tree list view added 2012-04-05 15:39:46 +12:00
Andrew O'Neil 4c76c8563c ENHANCEMENT: Use GridFields to show reports in the ReportAdmin 2012-04-04 17:58:29 +12:00
jbridson c6bfd0ae42 MINOR:changed the heading 'add pages' to add page trac #7026 2012-03-27 14:57:39 +02:00
Ingo Schommer e9c7fb5e1e MINOR Removed temporary "gallery" and "list" panels from CMSPagesController, until they're actually implemented 2012-03-12 11:55:19 +01:00
Ingo Schommer c94308d21d MINOR Implemented "Add new" link in CMSPagesController 2012-03-08 18:24:35 +01:00
Ingo Schommer 3670fe0530 ENHANCEMENT Show AssetAdmin breadcrumbs+tabs outside of search+editform panels 2012-03-07 17:02:08 +01:00
Ingo Schommer d1581c2b9b ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField 2012-03-02 20:45:34 +01:00
Ingo Schommer d09c071899 Merge branch 'master' into integration
Conflicts:
	templates/Includes/AssetAdmin_Content.ss
2012-02-24 00:31:36 +01:00
Ingo Schommer f216c783c6 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:39:06 +01:00
Ingo Schommer 81d362d5f8 MINOR Styling 2012-02-23 23:15:37 +01:00
Stig Lindqvist 876c809a7d ENHANCEMENT Filterpanel for assetadmin 2012-02-21 16:02:54 +13:00
Ingo Schommer f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
jbridson 371f42e61a MINOR:added classes for assets page so that the icons for view tabs appear. 2012-02-17 12:45:32 +13:00
jbridson 128d3a8316 MINOR:added classes so that the tabs to change page view can have the appropriate icons. 2012-02-17 12:45:32 +13:00
Ingo Schommer 88952c0ac7 MINOR Using HTML5 data attributes for denoting layout in templates 2012-02-16 18:06:53 +01:00
Ingo Schommer 68e9e91a78 ENHANCEMENT New panel styling for AssetAdmin and CMSFileAddController (SSF-24) 2012-02-16 13:59:29 +01:00
Ingo Schommer 93b3fe8a23 API CHANGE Removed unused AssetTableField, handled by GridField now 2012-02-16 13:59:29 +01:00
Ingo Schommer 3d7fb25ce1 MINOR Fixed admin/settings panel switching (was nesting .cms-content area) 2012-02-16 13:56:33 +01:00
Ingo Schommer 5167e394d4 MINOR DOM identifiers for tools panels so that the Panel.js logic can store their expansion state in a cookie 2012-02-16 12:34:59 +01:00
Ingo Schommer 38cf7e5c4d ENHANCEMENT Using new "tools" panel architecture to render CMS templates, which e.g. allows CMSPageEditController to reload the form without the tree in the side-by-side display variation, and hence avoids slowing down the loading and saving process 2012-02-15 14:28:07 +01:00
Ingo Schommer f88d4006f8 ENHANCEMENT CMSMain->Breadcrumbs() 2012-02-14 16:11:38 +01:00
Ingo Schommer c96e2ba7ca API CHANGE Removed ThumbnailStripField class, as it was only used for the CMS image insertion logic (which was rewritten with a more powerful file selection based on GridField) 2012-02-14 13:32:58 +01:00
Cam Findlay 21289128bb MINOR SiteTreeURLSegmentField has new methods to aid in displaying URL prefix and secondary information text (fixes #6852) 2012-02-14 11:12:47 +01:00
Will Rossiter 8fe767b5f2 FEATURE: move breadcrumbs out to a customizable template 2012-02-11 15:13:51 +13:00
Will Rossiter 50ff9b6962 ENHACEMENT: include sitetree on the CMSPage editing screen 2012-02-11 14:02:22 +13:00
Normann Lou 40e7df9823 BUGFIX: SSF-107, Filter bar should be collapsed by default 2012-02-03 13:15:28 +01:00
Ingo Schommer acd2f6bacf API CHANGE Removed AssetAdmin metadata upload capabilities, please use the new UploadField inline editing support
EHNAHCEMENT Moved AssetAdmin->upload() and related functionality to new UploadField class
2012-02-03 00:11:11 +01:00
Ingo Schommer 60129f61da ENHANCEMENT Added new CMSFileAddController 2012-01-09 21:21:12 +01:00
Ingo Schommer 14d3dea87c MINOR Added panel identifiers to enable cookie support, added collapsed panel view 2012-01-06 16:40:24 +01:00
Ingo Schommer e35991b363 MINOR Misc styling fixes around dialogs and "add page" styling 2012-01-03 17:57:04 +01:00
Ingo Schommer 0d008b6496 ENHANCEMENT Allowing to add pages from main interface, in addition to dialog triggered from admin/pages (through CMSPageAddController) 2011-12-20 17:45:07 +01:00
Ingo Schommer a37ea52a86 MINOR More supporting selectors in templates (for JS performance reasons) 2011-12-12 22:51:58 +01:00
Will Rossiter e2b4913df9 MINOR moved title for content tools panel into scrollable region 2011-10-29 15:46:38 +13:00
Will Rossiter c34ef60d82 BUGFIX prevent calling function on null record 2011-10-29 15:46:38 +13:00
Will Rossiter f634ad09db MINOR update template to use jlayout 2011-10-29 15:46:38 +13:00
Ingo Schommer 9016204dec Merge branch 'candidasa-cms-enhancements' 2011-10-11 09:36:53 +02:00
Ingo Schommer f8b2363075 BUGFIX Replaced hardcoded CSS in ReportAdminForm.ss, using $FieldHolder instead of $Field for search fields to gain better control on how they're laid out 2011-10-07 12:16:31 +02:00
Julian Seidenberg 2c4b1271c7 ENHANCEMENT: CSS styling of "Create Page" dialog box and adjusting dialog title to be consistent with label of button that creates it (SSO-8) 2011-09-29 13:10:56 +13:00
Will Rossiter ecae94e8c2 MINOR: added unit test for checking whether viewing an unpublished version directly selects the checkbox option 2011-09-19 17:30:47 +02:00
Will Rossiter f81531115f ENHANCEMENT: added notice template for outputting notices to cmsmain interfaces. 2011-09-19 17:30:47 +02:00
Will Rossiter d90ea0d236 ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain API. 2011-09-19 17:30:46 +02:00
Ingo Schommer 5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Ed ebb1e0f370 MINOR Additional HTML for tree styling in SiteTree->getTreeTitle() 2011-07-08 15:36:31 +02:00
Ed a142e494de Minor class additions to assist styling elements in cms-content-toolbar 2011-07-08 15:36:31 +02:00
Ingo Schommer 38db63c3b0 MINOR Clearer CSS classes in CMS controller templates, added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag) 2011-07-08 15:36:30 +02:00
Ingo Schommer 1ad4bd6dfd MINOR Panel markup for AssetAdmin and CMSPagesController templates 2011-07-06 10:05:55 +02:00
Frank Mullenger b4366c9ca9 ENHANCEMENT 'data-hints' attribute into root of CMSMain site tree, changed from 'allowedParents' to 'disallowedParents', 'allowedChildren' to 'disallowedChildren' for brevity (fixes #6577) 2011-05-08 16:27:20 +12:00
Ingo Schommer bf8bc1d856 MINOR Added CMSPageHistoryController, CMSPageReportsController, marked placeholders for new functionality in AssetAdmin 2011-04-30 16:49:36 +12:00
Ingo Schommer 9a09aaf42b ENHANCEMENT Changed CMSMain->AddForm() to a modal dialog, showing page types and their descriptions as radiobuttons rather than a dropdown 2011-04-28 22:49:34 +12:00
Ingo Schommer 94cb3075d0 MINOR Removed unused CMSMain_TreeTools.ss and CMSMain_left.ss templates 2011-04-28 22:49:34 +12:00
Ingo Schommer 5a0208d77a MINOR Wrapping cms-content-header <div> in order to provide overflows without line breaks 2011-04-28 22:49:34 +12:00
Ingo Schommer 58416e5dea ENHANCEMENT Added CMSPagesController 2011-04-28 22:49:34 +12:00
Ingo Schommer 1ae9a318af MINOR Changed ReportAdmin to new ReportAdmin_Content template, viewing available reports as unordered list instead of a tree (they can't be nested anyway) 2011-04-28 22:49:33 +12:00
Ingo Schommer 614fb06336 MINOR AssetAdmin support for new cms layout changes 2011-04-28 22:49:32 +12:00
Ingo Schommer bb4dbaa02c MINOR Removed unused CMSMain_rightbottom.ss 2011-04-28 22:48:56 +12:00
Ingo Schommer 941863aa86 MINOR Removed tree key, to be replaced with bezels alongside the tree nodes
MINOR Removed unnecessary #sitetree_holder classes from LeftAndMain templates
2011-04-28 22:48:55 +12:00
Ingo Schommer 4ec0fa224e MINOR Changed #sitetree_ul to #sitetree in templates and javascript 2011-04-28 22:48:55 +12:00
Ingo Schommer bc88a44e61 MINOR Removed checkboxActionIndicator from CMSMain_TreeTools.ss, no longer used (in preparation for new batch action handling in SS3) 2011-04-28 22:48:55 +12:00
Ingo Schommer 0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer c660284236 MINOR Moved SilverStripeNavigator from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Paul Meyrick 93bf3029c3 Minor Moved ContentController template from sapphire/templates/ to cms/template in cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer 6e60314006 MINOR Adding classes and markup necessary to style tree before jstree.js loads 2011-03-22 18:43:39 +13:00
Ingo Schommer d22e80b1bd MINOR Replaced hardcoded URLs in LeftAndMain.Tree.js with data-url-* attributes 2011-03-22 18:43:38 +13:00
Ingo Schommer bfd4737aae BUGFIX Remove EmulateIE7 <meta> tag from LeftAndMain.ss (mainly in order to get rendering compatibility with jstree.js) 2011-03-22 18:43:38 +13:00
Sam Minnee 3498e41b0a Merge branch '2.4'
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13:00
Ingo Schommer bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer 0c177bcbca MINOR Removed unused MemberList templates (see MemberTableField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Ingo Schommer 95a917e04d MINOR Translations in CMSMain_left.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:46 +13:00
Ingo Schommer 5c84e5b0f1 MINOR Removed trailing slash in BackURL, fixed error message sentence structure in PageCommentInterface.ss (fixes #5520)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Will Rossiter 58a92cf456 BUGFIX: fixed select all link using incorrect function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Will Rossiter fac64e9aa5 BUGFIX: fixed incorrect include path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer df869f9da7 BUGFIX Can't set width or height on MemberTableField popup (fixes #5625, thanks smurkas)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105665 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer fa0bf8c571 MINOR Updated TableListField sublcass template to work with new TableListField->SelectOptions() setting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105273 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer 13995d710a MINOR Fixed _t() call in PageCommentInterface.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer 166d6f421f ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:38 +13:00
Ingo Schommer fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer 8c40e6f4a3 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer 4ff657e03f MINOR Translations in PageCommentInterface.ss (fixes #5598, thanks Pike)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer 38e1a09fb8 BUGFIX Wrong HTML syntax in LeftAndMain.ss (fixes #5552, thanks simon_w)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104403 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Luke Hudson cbc0b0a849 MINOR: Tweaks to ModelAdmin tabs HTML, and salad tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104078 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Ingo Schommer db44725062 BUGFIX login BackURL wrong when using nested urls (fixes #5520, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103933 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Carlos Barberis ebea43ebd8 ENHANCEMENT: added language (Ticket #5390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Will Rossiter a3e8e4e60d BUGFIX: fixed invalid HTML output from page comments template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102320 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Sean Harvey c8945d9819 BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer 67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer 0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation.
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:58 +13:00
Ingo Schommer 8302f97ffc FEATURE set file metadata on upload. (from r97780)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer 8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:49 +13:00
Sam Minnee f9769c5b0a MINOR set Print flag correctly on TLF
MINOR custom print template for SSReport TLF's that exposes the report title, and filters set (from r97138)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee d05c921226 BUGFIX: Add horizontal scrolling to reports when necessary. (from r96075)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:35 +13:00
Sam Minnee cc89bc68e9 BUGFIX: Don't throw an error if there are no report filters.
ENHANCEMENT: Allow for custom generation of SSReport::ID() for parameterised reports.
MINOR: Added SSReport::dataClass() accessor.
BUGFIX: Don't randomise the order of reports with the same priority. (from r95955)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:34 +13:00
Sam Minnee a6308abc71 MINOR: Added missing template from r95815 (from r95822)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Will Rossiter da57175a2d MINOR: visual tweaks to the widgets area including widget titles can now be spread over multiple lines and padding between columns. #4965
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Sean Harvey e9cd3eba62 ENHANCEMENT Added visual elements to aid in the usability of the WidgetAreaEditor
MINOR Added better help text underneath "Available Widgets" and "Widgets currently used"


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97602 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Ingo Schommer 16f9491f94 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Sean Harvey 334beaeedd BUGFIX Clicking available widgets now applies only to h3 elements
BUGFIX Widgets are now prepended to the available widget stack by use of Insertion.Top 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Sean Harvey d02f174f42 BUGFIX When adding a new widget by clicking one of the available widgets, add it to the top of the currently used widgets instead of the bottom
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:26 +13:00
Sean Harvey c9bf87fd1a MINOR Changed wording for WidgetAreaEditor.TOADD advising users to "click" instead of drag widgets
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:25 +13:00
Sean Harvey f5e5461fd2 MINOR Fixed default wording of WidgetAreaEditor.TOADD "drag them here from the left"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97509 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Sean Harvey ed4204b7fa BUGFIX Fixed incorrect lables "TOADD" etc in WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Ingo Schommer 2ccc3235fb BUGFIX Attribute escaping in PageCommentInterface?_singlecomment.ss (merged from r97071)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Sam Minnee f1bac8fd67 ENHANCEMENT: Renamed Author column to User in the page version history to better reflect that they might not have been authors, and just iniators of workflow actions. (from r89015)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +13:00
Sam Minnee 430f30b7c4 MINOR more fix around batch action parameters (from r88837)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:12 +13:00
Sam Minnee b14404922d ENHANCEMENT: Files and images section warns if you are deleting a file that is linked to
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Will Rossiter 19670e7b27 FEATURE: added delete all link to page comments. Patch via #4427. Thanks walec51
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Tom Rix 2d3365f7b2 MINOR make widgetarea/editor more suitable for generic use
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Ingo Schommer ce3365d095 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Tom Rix 5c8628e7d4 MINOR added stubs to allow widgets to use treedropdown fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Saophalkun Ponlu 2afc2e99dd MINOR: Reinstate noscript tag for no javascript warning message on loading screen
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 05:16:57 +00:00
Saophalkun Ponlu d97cfcbc7f ENHANCEMENT: Improve CMS loading screen #6254
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 04:08:02 +00:00
Will Rossiter e6ad58a006 MINOR: removed comment specific templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 06:07:20 +00:00
Will Rossiter 6d0c79c839 APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 05:43:08 +00:00
Will Rossiter 2d0f3be756 APICHANGE: changed BaseHref to AbsoluteBaseURL for consistency. FEATURE: added BaseURL for getting non absolute value. PATCH via muzdowski (#6158)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 02:01:13 +00:00
Ingo Schommer fa417589d8 MINOR Removed trailing slash in BackURL, fixed error message sentence structure in PageCommentInterface.ss (fixes #5520) (from r106694)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:41:20 +00:00
Ingo Schommer 0bf70b9032 BUGFIX: fixed select all link using incorrect function (from r105868)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:33:58 +00:00
Ingo Schommer c77f395451 BUGFIX: fixed incorrect include path (from r105833)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:33:41 +00:00
Ingo Schommer 71209b7402 BUGFIX Can't set width or height on MemberTableField popup (fixes #5625, thanks smurkas) (from r105665)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:32:45 +00:00
Ingo Schommer cc4160cdf7 MINOR Updated TableListField sublcass template to work with new TableListField->SelectOptions() setting (from r105273)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:49:35 +00:00
Ingo Schommer d7409fa851 MINOR Fixed _t() call in PageCommentInterface.ss (from r105272)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:49:28 +00:00
Ingo Schommer 8b39c98248 ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin (from r105271)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:49:20 +00:00