Commit Graph

963 Commits

Author SHA1 Message Date
Jeremy Bridson
ad7383a58d 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:30:47 +13:00
Simon Welsh
5768e421dc Merge branch '3.0' 2012-10-05 14:40:32 +13:00
Simon Welsh
8153326360 Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0
Conflicts:
	admin/_config.php
2012-10-05 14:39:27 +13:00
Sean Harvey
7901b02333 Use TinyMCE fancy selects for better usability selecting styles
This was previously disabled because of a bug in TinyMCE on
SilverStripe 2.3, but appears to have been resolved since then.
2012-10-05 14:18:30 +13:00
Sean Harvey
113545d177 BUG Non-breaking space added automatically by TinyMCE on anchors
Everytime TinyMCE is saved, it adds   characters immediately
after anchors, e.g. <a name="test"></a>&nbsp; - this fix stops
TinyMCE from adding those extraneous &nbsp; after the anchors.
2012-10-05 14:14:59 +13:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
2012-10-03 16:16:19 +02:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Sam Minnee
28bd939580 FIX: Ignore charset when checking mime types in LeftAndMain ajax responses.
This is partly a fix to #7574, although quite different from the work Ingo did on Content-length.  The text/json mime type occasionally gets a charset suffixed to it by the webserver, which broke everything.

A follow-on fix from this would be to get the PHP code to supply charsets more consistently, so that webservers don't have to make things up.

Additionally, the 2nd interpretation - which treats the response as text/html - should probably only happen if the response is text/html, and throw a more helpful error otherwise.
2012-09-30 16:32:22 +13:00
Jeremy Bridson
07bc75c281 ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab. 2012-09-28 16:37:35 +02:00
Ingo Schommer
91e4fde96f ENHANCEMENT "Readonly" behaviour for CMS tabs 2012-09-28 16:37:35 +02:00
Ingo Schommer
d50341d8cd Rendering attributes for CMSTabSet.ss
Make behaviour consistent with parent template, Tabet.ss
2012-09-28 16:37:34 +02:00
Ingo Schommer
ea86b96fbb Merge pull request #832 from halkyon/sitetree_children_disabled
BUG If a nested page editable but parent not, user can't expand tree
2012-09-28 06:38:26 -07:00
Simon Erkelens
f991401a52 Translation possible for clear before import
I couldn't figure out why it wouldn't translate...
2012-09-28 09:45:16 +03:00
Sean Harvey
b186626b73 BUG If a nested page editable but parent not, user can't expand tree
If you're logged in as a specific user in a group who has view/edit
permissions of a page that has a parent page which doesn't have
permissions, you can't expand the tree node to get access to that
nested page.

This fixes LeftAndMain.Tree.js to allow expanding if there are
immediate children tree nodes that are not disabled. Also fixes
styling so that only immediate children nodes are greyed out.

Fixes this ticket: http://open.silverstripe.org/ticket/7913
2012-09-28 12:18:34 +12:00
Sean Harvey
e4ab02e1c3 Merge branch '3.0' 2012-09-27 10:39:31 +12:00
Marcus Nyeholt
da70dc469c BUG Fixed possible reference to null string
Hashlink for tabs in the backend didn't check the existence of
the href value before trying to .replace it.
2012-09-26 16:27:50 +10:00
Damian Mooyman
495ffb033c FIXED: Issue with duplicate help tips appearing on select fields in CMS. See Security / Groups / Edit Group form field for example. 2012-09-25 13:37:17 +12:00
Ingo Schommer
039b40247e Merge branch 'open/7875' of git://github.com/jbridson/sapphire into jbridson-open/7875 2012-09-21 10:49:36 +02:00
Simon Welsh
1e629f4585 Merge branch '3.0'
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
2012-09-21 14:56:56 +12:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Jeremy Bridson
a670e4ca40 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:25:57 +12:00
Sean Harvey
9c2be0f025 Merge branch '3.0' 2012-09-17 15:16:52 +12:00
jean
100aa178b0 FIX 7856 If the submit button is disabled, to perform the ajax request 2012-09-11 15:00:36 +12:00
Ingo Schommer
1088d044c5 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	.travis.yml
2012-09-07 17:21:41 +02:00
Saophalkun Ponlu
a0462b90cf BUG Fixes an issue where batch actions dropdown doesn't show up after ajax request back to the cms Pages section 2012-09-03 18:47:25 +12:00
Ingo Schommer
2f643817a4 LeftAndMain::$session_namespace
More fine-grained control over session storage,
particularly when reusing the "current page" state.
2012-08-29 15:10:05 +02:00
Ingo Schommer
1e5b04ccad Merge branch '7740-re-ordering-page' of git://github.com/phalkunz/sapphire into phalkunz-7740-re-ordering-page 2012-08-29 14:54:49 +02:00
martimiz
82500dd4c4 NEW Custom menu icons for the CMS main menu
Add optional custom menu icons to the CMS main menu for every class
extending LeftAndMain (ModelAdmin). Works by setting optional static
$menu_icon = '/path/to/image' and providing custom styling for added
icons. Works for the menu as well as icon in the right-side (GridField) pane header.
2012-08-29 13:14:59 +02:00
Saophalkun Ponlu
c3d622c910 BUG: Fix an issue caused by moving a page from one location in the tree to another location doesn't update parent id in the edit form immediately (see #7740)
The issue causes the moved page to revert to previous location when Save and Publish before any page refresh or page switching.
This commit also adds 'Modified' badge to the moved page
2012-08-29 20:33:03 +12:00
Sam Minnée
fcc88264cb Merge pull request #747 from silverstripe-rebelalliance/trac/7763
FIX 7763 TreeDropdownField needs to refresh after CMS edit form save
2012-08-28 15:55:35 -07:00
Hamish Friedlander
05fade3249 FIX 7763 TreeDropdownField needs to refresh after CMS edit form save 2012-08-29 10:52:56 +12:00
Ingo Schommer
6162ae5e3f Fixed preview link ordering in CMS
jQuery seems to order by DOM rather than occurrence of
selectors, which means it always takes the last populated
field (in our case the "live" link over the "draft" link).
2012-08-28 18:31:15 +02:00
Sam Minnee
c2afca2cd8 Merge branch '3.0' 2012-08-28 16:08:57 +12:00
Sam Minnée
5b58e7951c Merge pull request #742 from silverstripe-rebelalliance/7812
BUG: open ticket 7812 correcting filter syntax on a DataObject used by f...
2012-08-27 21:05:09 -07:00
Ingo Schommer
dc08e87bd5 BUG Take first non-empty link field for preview
Goes by priority, but allows for fields to be empty.
This is important e.g. for models which are removed just
from live, or just from draft.
Also reacts to a field rename done in CMS module (62783c75).
2012-08-27 18:22:33 +02:00
Ingo Schommer
f63893544e BUG Fix CMS layout after preview navigation (fixes #7463) 2012-08-27 16:50:37 +02:00
Ingo Schommer
5a44ea2e20 Deselect tree nodes when reacting to form load event (fixes #7401)
Multiselected nodes are only possible in batch mode,
which would never trigger a form load event.
2012-08-27 16:49:06 +02:00
Ingo Schommer
4a8236ffa7 Removed special "from"/"to" filter field CSS rules
Use global field rules instead, and fall back to new
"stacked" styling of FieldGroup (see CMS CSS)
2012-08-27 16:03:21 +02:00
Ingo Schommer
e4db3c6c05 Removed DateField special width with .hasDatepicker class
Causes field to change width after first display,
as the .hasDatepicker class is added dynamically on first field focus.
Since we don't add an icon by default, there's no difference
between an <input> field with date picker, an input field for dates,
and a simple input field. Fall back to global (or CMS specific) rules.
2012-08-27 16:02:40 +02:00
Ingo Schommer
76dd8cca0f Remove width limit on CMS panel dropdowns
No longer necessary as we've fixed the Chosen.js width
settings, which means the <select> fields can inherit
their settings and determine width automatically.
2012-08-27 15:52:01 +02:00
Ingo Schommer
88dfde8afa Removed arbitrary width restrictions on field group children
Let the fields handle their dimensions themselves
(for example the "from" and "to" date fields in the CMS pages search form)
2012-08-27 15:50:21 +02:00
Ingo Schommer
1d2288b091 NEW Open external links in preview mode in new window (fixes #7652)
Rather than disabling the links altogether, which is
counter-intuitive to most users.
See https://github.com/silverstripe/sapphire/pull/638.

Also hide a duplicate $SilverStripeNavigator on the previewed
website (in case it has been manually applied to the template).
2012-08-27 14:42:10 +02:00
Ingo Schommer
a8f335360b Merge remote-tracking branch 'origin/3.0' 2012-08-27 09:25:59 +02:00
Kirk Mayo
3e351bc421 BUG: open ticket 7812 correcting filter syntax on a DataObject used by function updatetreenodes 2012-08-27 14:41:07 +12:00
Ingo Schommer
2fab657fce i18n for CMS section titles (see #7798) 2012-08-26 23:58:31 +02:00
Sam Minnee
824afffd2e Merge branch '3.0' 2012-08-23 12:39:41 +12:00
Ingo Schommer
ae9c2e78a1 BUG Restore tree children after updateNode() (fixes #7761) 2012-08-22 15:38:54 +02:00
Ingo Schommer
4cc82e906b Merge remote-tracking branch 'origin/3.0' 2012-08-20 10:13:55 +02:00
Sam Minnée
1e7e7c65ba Merge pull request #723 from silverstripe-rebelalliance/entwine
Re-enable entwine inspector
2012-08-19 16:36:18 -07:00
Hamish Friedlander
b560d258d3 Re-enable Entwine Inspector in CMS & document 2012-08-20 11:26:11 +12:00