Ingo Schommer
efabde1416
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
2012-10-30 17:52:49 +01:00
Naomi Guyer
a0f8d044c0
BUG: Border at top of tabs when no subtabs
2012-10-28 16:05:13 +13:00
Will Rossiter
d7bf6e781a
Merge pull request #719 from silverstripe-rebelalliance/open/7665
...
FIX: CMS Menu header now changes height (Fixes: 7665)
2012-10-27 19:41:27 -07:00
Jeremy Bridson
940236a392
BUG: CMS Menu header now changes height depending on the name. Fixes 7665
...
Position and height were being set inline so added !important to override this.
2012-10-28 15:38:25 +13:00
Will Rossiter
4f8d23b7f2
Merge pull request #704 from adrexia/IE7-left-panel-text
...
BUG: IE7 vertical text fix
2012-10-27 19:23:46 -07:00
Will Rossiter
1692a1023d
Merge pull request #890 from adrexia/7956-remove-files-subnav
...
Remove sub navigation for "Files" (fixes 7956)
2012-10-22 23:19:56 -07:00
Simon Welsh
bedb579b07
Merge branch '3.0'
2012-10-23 15:21:20 +13:00
Naomi Guyer
84851c96a7
Remove sub navigation for "Files" (fixes 7956)
2012-10-23 09:55:08 +13:00
Naomi Guyer
9158dead67
BUG: No indent on rightTitle ( fixes #7950 )
...
Added margin and made non checkbox right title's match similar labels
used elsewhere.
2012-10-18 16:23:49 +13:00
Ingo Schommer
b5fd9e6a8d
Merge pull request #684 from adrexia/add-new-button
...
BUG: Adjust css for actions toolbar on pages (fixes 7649)
2012-10-16 07:21:27 -07:00
Ingo Schommer
d1ee7612f5
Merge remote-tracking branch 'origin/3.0'
2012-10-08 16:48:52 +02:00
Saophalkun Ponlu
e3a27ea7da
CMS member profile now is no longer in a popup ( #7880 )
2012-10-08 12:57:55 +02:00
Ingo Schommer
b38cb39256
BUG Prevent CMS submission on disabled buttons ( #7928 )
...
Thanks @jbarrios for triggering this fix
2012-10-08 09:29:08 +02:00
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> - this fix stops
TinyMCE from adding those extraneous 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