Commit Graph

1096 Commits

Author SHA1 Message Date
Joel Edwards
236e335a0a Permission list styling improvements (#8100) 2012-12-13 16:45:32 +01:00
Ingo Schommer
abf1ee9b52 Suppress jQuery UI's borders around tabs in the CMS
Noticed this on the "Groups" tab in admin/security, but
likely a problem elsewhere as well.
2012-12-13 10:21:56 +01:00
Paul Clarke
0ba51c1ebf Fix to allow buttons to align inline (fixes #8099) 2012-12-13 10:09:30 +01:00
Naomi Guyer
92e4b4fc5b Remove sub navigation for "Files" (fixes 7956)
Backport from master. Fixes display issues with expanded,
unselected submenus ... by removing them.
They're strictly not necessary since both "list" and "add"
modes can be reached through the default AssetAdmin UI.
2012-12-12 23:16:03 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
0fd6d14f94 Fixed Behat steps for preview feature 2012-12-10 18:06:49 +01:00
Naomi Guyer
dbee4a1bf9 Clean up the side-by-side code. 2012-12-10 17:52:02 +01:00
Paul Clarke
747346bb16 Ability to rotate the mobile preview in side-by-side preview. 2012-12-10 17:52:02 +01:00
Naomi Guyer
00f1ba4ab0 Side-by-side preview browser compatibility fixes. 2012-12-10 17:52:02 +01:00
Mateusz Uzdowski
fa3ef8c126 Side-by-side preview initialisation and navigation fixes.
Disables changetracking on preview options.
2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
4fa2b0f3ff API Support disabling/enabling of previews.
This fixes the problem of panels flipping back to the Pages section if
loading a non-previewable section, and also initialisation problems.
2012-12-10 17:52:01 +01:00
Naomi Guyer
8ce272861c Replace the state selector switch to support more than 2 states. 2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
8f5acd70b3 API Move state to enwtine properties, provide API for preview.
Also the preview state is now kept between panel loads. We also use a
redraw function to update appearance based on the state.
2012-12-10 17:52:01 +01:00
Naomi Guyer
9312c70696 Side-by-side preview options fixes.
Add extra preview-mode selector to the CMS actions so we can show
something when the preview is closed (and with it all options are not
visible).

Thanks @mateusz, @clarkepaul and @robert-h-curry for contributing.
2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
d4f13fe532 API Refactor the CMS layouting to provide access to options.
It is now possible to change the threeColumnLayout width options for the
columns via entwine property LayoutOptions and accessor methods.

Thanks @robert-h-curry, @clarkepaul for contributing!
2012-12-10 17:52:01 +01:00
Paul Clarke
544d2eb6e1 Side-by-side preview options styling.
Thanks @adrexia for contributing.
2012-12-10 17:52:01 +01:00
Mateusz Uzdowski
1edfeefbdd BUG Remove extraneous layout calls.
Remove .layout() calls on redraw. It's unnessecary and means layout
actually gets triggered multiple times, making resizing very slow.
This was a hack to fix the positioning of ajax-replaced elements.

The problem is jLayout does not track replaced elements. We have
to trigger layout algorithm manually on the parents of the replaced DOM
so it can update internal structures and do the re-layout.

Relayouting only needed 3 levels down.
2012-12-10 17:51:35 +01:00
Mateusz Uzdowski
f4b080ee06 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.

Goes along with cms commit fa3738a9f4c5181eabf18a77ca89792d31592250
2012-12-10 17:51:35 +01:00
Ingo Schommer
fa84c2d705 Merge remote-tracking branch 'origin/3.0' 2012-12-10 17:50:43 +01:00
Ingo Schommer
0be51a9321 BUG Fix ModelAdmin search (fixes #8052)
Broken by jQuery UI ajax behaviour in tabs, which compares
URLs to determine if the tab needs to be loaded via ajax.
This was always a brittle solution, and now broke alongside
our upgrade to jQuery UI 1.9 (specifically, with 2657a275).

The ajax behaviour is now globally disabled in favour of
having '.cms-panel-link' behaviour on the tabs, which
was already in place.
2012-12-04 14:28:36 +01:00
Ingo Schommer
4d106aa998 BUG Fixed unintentional ParentID reset in "add page" form
Side effects from old JS hanging around which was no longer used.
See d364070941
for background discussion.
2012-12-04 11:30:29 +01:00
Marcus Nyeholt
34788130ef BUG Rewrite hashlinks failing on empty a tags
Check for presence of href in _a_ tags before trying to .match them to
prevent null pointer errors.

Some external JS libs (eg tag-it) use <ul><a> structures which get matched
and break

(fixes regression introduced by ff39f9ad38)
2012-12-04 15:47:14 +11:00
Kirk Mayo
20a5bc1d36 BUG iOS safari navigation bug (fixes #8039) 2012-12-03 12:27:59 +01:00
Ingo Schommer
700c95a523 Merge pull request #989 from silverstripe-rebelalliance/8063
BUG Unable to return to site tree admin from Preview mode trac 8063
2012-12-03 01:33:04 -08:00
Kirk Mayo
da1a6e7bf7 BUG Unable to return to site tree admin from Preview mode trac 8063 2012-12-03 10:38:47 +13:00
Ingo Schommer
0808a1c21e Fixed JS syntax error
Regression from dbbcd08d
2012-11-30 12:30:41 +01:00
Ingo Schommer
888d4a87c5 Merge pull request #978 from adrexia/css-fix
BUG: Extends too generic (tree.scss)
2012-11-29 05:53:49 -08:00
Naomi Guyer
7d0e10f5fa BUG: Extends too generic 2012-11-29 10:20:00 +13:00
Ingo Schommer
87d538c7ee Merge pull request #959 from silverstripe-droptables/alternating-button-rc
NEW Extend the ssui.button with alternate appearances.
2012-11-27 01:55:16 -08:00
Naomi Guyer
715b62f790 Updating chosen dependency 2012-11-27 16:28:17 +13:00
Mateusz Uzdowski
dbbcd08d8f NEW Extend the ssui.button with alternate appearances.
Reusable feature for making CMS buttons that respond to the current
contextual state with an appearance change.

Provides capability to specify initial state, alternate icon and
alternate text via data attributes or options (PHP or JS), and to hook
up into events triggered when the state is alternating.

This is used by the follow-up cms action buttons cleanup work.
2012-11-26 09:51:02 +13:00
Ingo Schommer
e021a190b3 Merge pull request #968 from silverstripe-droptables/submitform-validation
Future-proof the submitForm for use with forms without validation.
2012-11-22 15:31:51 -08:00
Ingo Schommer
33039958c2 Merge pull request #965 from silverstripe-droptables/incorrect-bc-nesting
BUG Incorrect html nesting of breadcrumbs
2012-11-22 15:28:54 -08:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0'
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Mateusz Uzdowski
3f2ddbb3fb Future-proof the submitForm for use with forms without validation.
We might decide to use it for other submissions than EditForm.
2012-11-23 11:09:43 +13:00
Naomi Guyer
a933847217 BUG Incorrect html nesting of breadcrumbs
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div

Goes alon the cms commit 4fab9b8248819dc9008d5b94b5437cd833de31ac
2012-11-22 12:20:02 +13:00
Mateusz Uzdowski
2657a27573 BUG Adjust the handler to jQuery UI 1.9 API change.
Settings.url no longer contains the URL, as a result navigating around
tabs in IE (browsers that do not support History API) becomes broken.

For example when the admin is opened on "Pages" section it is impossible to
navigate to specific page, or if the admin is opened on a tab, it's not
possible to navigate to another tab.
2012-11-21 11:02:51 +01:00
stojg
c6fcb080a9 BUG Video embed from Add Media Feature no longer works (open #8033)
Since the tinymce upgrade from 3.5.6 to 3.5.7 it seems like data attributes are forbidden on tags.
This fix tells tinymce to allow data* properties on img tags
2012-11-15 15:49:03 +13:00
Sean Harvey
6a9617bf6b Remove deprecated LeftAndMainDecorator, use LeftAndMainExtension instead 2012-11-15 14:43:11 +13:00
Loz Calver
ea2dc9da0e ENHANCEMENT: Add ability to change URL for SS logo in CMS Menu 2012-11-09 11:06:04 +01:00
Ingo Schommer
c89f56f1cb Merge pull request #932 from clarkepaul/master
ENHANCEMENT message colours updated #7976
2012-11-07 06:29:05 -08:00
Ingo Schommer
91b69bfb52 Fixed tab alignment and padding
See discussion at https://github.com/silverstripe/sapphire/pull/934#issuecomment-10136236
2012-11-07 12:41:01 +01:00
Sean Harvey
aec59de955 Adding title to CMSProfileController so translations get default 2012-11-07 11:41:48 +13:00
Sean Harvey
f4a4465873 Merge branch '3.0' 2012-11-07 11:12:01 +13:00
Andrew O'Neil
0c8de0a1de APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:07:55 +13:00
Ingo Schommer
a7efc76c36 Removed usage of deprecated jQuery UI 1.9 features
See http://jqueryui.com/upgrade-guide/1.9 for details.
Fixes fade effect on changing toplevel tabs
(semantics for "show" option in $.tabs() changed).
2012-11-06 22:53:34 +01:00
Ingo Schommer
2d075671c3 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:28:19 +01:00
Ingo Schommer
3214a0a756 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	admin/css/screen.css
2012-11-06 19:56:34 +01:00
Ingo Schommer
ff39f9ad38 Upgrade jQuery UI to 1.9
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign)
2012-11-06 19:45:56 +01:00
Paul Clarke
f988ae3163 ENHANCEMENT Message colours updated 2012-11-06 13:23:20 +13:00
Sean Harvey
169366a011 Merge branch '3.0' 2012-11-06 13:04:21 +13:00
Paul Clarke
411673ed43 ENHANCEMENT general css enhancements
Remove arrow from sitetree next to site name  #7972
Remove 1px gap from above main tabs and enhance css
Replace loading logo
Adjust main link colour to have more contrast
Add more contrast to main edit panel - made bg slightly lighter
2012-11-05 17:51:38 +13:00
Sean Harvey
3451da001a BUG Fixing session keep alive for non-ADMIN users
SecurityAdmin isn't always available for CMS users, as they might
not have permission to view that section. This fixes the problem
with session keep alive by moving the ping to Security/ping, which
is available for all users.
2012-11-05 15:41:10 +13:00
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Sean Harvey
7a7c1a6857 BUG Escape tree title 2012-11-05 13:19:02 +13:00
Naomi Guyer
7ae73eabdd BUG: Border at top of tabs when no subtabs
This bug reappeared when branches were merged because the 3.0 version
of _style.scss had tabsets defined in different places.

This scss was inserted, but there was no idication that it was new to
master (except in the resulting css file). As these styles are declared
differently elsewhere in _style.scss, I think this declaration must
have been refactored in an earlier commit in master.
2012-11-05 11:48:50 +13:00
Sean Harvey
1cb9c34fc5 Fixing broken references to sprites (probably caused by old Compass version) 2012-11-05 11:21:41 +13:00
Saophalkun Ponlu
9fe99cfec9 Batch actions UI enhancement (#7878) 2012-11-02 22:57:14 +01:00
Ingo Schommer
70352fba32 Merge pull request #880 from adrexia/fileoverview
BUG: File Uploading Notifications (fixes #7883)
2012-11-02 14:08:16 -07:00
Naomi Guyer
95b5f6541f BUG: GridField add existing auto complete has no max height (fixes #7965)
Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
2012-11-02 13:36:51 +13:00
Naomi Guyer
2dabaebad8 BUG: File Uploading Notifications (fixes #7883)
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2012-11-02 12:46:16 +13:00
Simon Welsh
0b279a2cbc Changes ping to POST and clears Requirements for ping
GET requests can, and do, get cached. Using POST forces them not to.
Clears requirements so that the SecurityAdmin JS isn't injected.
2012-11-01 21:15:43 +13:00
Naomi Guyer
eb23f502b5 BUG: Site Tree checkboxes and refactoring
* Increased height of site tree checkbox by 3px, so users are less
likely to miss it and load a page by mistake
* Refactored _tree.scss to make better use of SCSS, and stop repetition
of styles
2012-11-01 15:26:46 +13:00
Ingo Schommer
bcbf4636fc BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load (#7980)
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
2012-11-01 00:25:13 +01:00
Naomi Guyer
2a67715327 BUG: One too many brackets in _style.scss
Caused when merging 3.0 back into master
2012-11-01 11:16:13 +13:00
Ingo Schommer
08832261c1 Fixed merge errors in CMSProfileController 2012-10-30 18:03:49 +01:00
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 &nbsp; 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