tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
14,896 Commits 31 Branches 527 Tags 162 MiB
a1e343629b
Commit Graph

1528 Commits

Author SHA1 Message Date
Ingo Schommer
8ec3641e60 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.FieldHelp.js
	lang/en.yml
	model/URLSegmentFilter.php
 2012-12-21 15:04:17 +01:00
unclecheese
07fb756327 Fix edge case in which uninitialized buttons are being destroyed. 
In certain cases, the button may not yet be initialized or may no longer have button properties at the time of removal from the DOM. Without this check, an uncaught exception is thrown.
 2012-12-18 09:41:54 -05:00
Ingo Schommer
9b3aebd310 Allow HTML in FormField->setDescription() 2012-12-18 15:02:23 +01:00
Loz Calver
4388433583 BUG: Right click on LeftAndMain menu caused CMS preview window to open 
The onclick event for LeftAndMain menu links didn't check if the click
was left or right, meaning that right click events could trigger the
function for loading split view mode in some browser/os combinations.
 2012-12-18 10:44:12 +00:00
Kirk Mayo
e217d42090 MINOR:added padding to ui-dialog-title so that it doesn't sit flush with the edge of the dialog box 2012-12-18 15:04:14 +13:00
Paul Clarke
51c6a87fc7 Fix for ie8 styles for preview switch and modes 2012-12-17 23:11:05 +01:00
Ingo Schommer
8779e9be5b BUG Fixed changetracking for radio and checkbox field types 
Also removing the 'changed' class from the form once
no further fields are marked as changed. That's important
now that we're surfacing the state much more visibly
through the alternative "save" button styles in the CMS.
 2012-12-17 23:02:04 +01:00
Loz Calver
8066376290 ENHANCEMENT: LeftAndMain breadcrumbs to use MenuTitle 
Breadcrumbs in the CMS currently only use title, when MenuTitle is
probably more appropriate (if it is set).
 2012-12-17 17:41:04 +01:00
uniun
77212c0647 CMS Titles does not support UTF-8 
Title in CMS is set using header X-Title. But UTF-8 characters can't be used in HTTP headers. So the title should be encoded just before sending X-Title header and decoded before setting HTML document title (fixes #7942).
 2012-12-17 17:36:00 +01:00
Ingo Schommer
6028cf1b62 Fixed panel spacing regressions from 544d2eb6 
Specifically, the change removed the "add page" panel padding,
because it moved padding from .cms-panel-padded into
commonly contained elements, like .ui-tabs-panel.
Apart from breaking layouts, it makes the class meaningless,
since its only padded depending on which elements it contains.

In order to rectify some introduced inconsistencies,
much too complex were required, e.g.
.ui-tabs .cms-edit-form, .ui-tabs .cms-content-fields {...}.
 2012-12-17 15:20:13 +01:00
Ingo Schommer
c1bd1432d1 Tab spacing (regression from 2d075671) 2012-12-17 14:21:13 +01:00
Ingo Schommer
375c33e0cf Wider sidebar to accommodate "add" and "edit" buttons 2012-12-17 13:00:18 +01:00
Ingo Schommer
a823c38c3f Fixed JS syntax error 2012-12-17 11:38:03 +01:00
Ingo Schommer
9cfa7b75f1 Wider side panel to fit "add" and "edit" button 
Moved "edit tree" button into same DOM structure so
we can layout them more easily through inline-block.
 2012-12-17 11:38:03 +01:00
Ingo Schommer
17908b670a Revert CMS button style (regression from fe08236) 
Was originally added for CMS grouped actions,
but can't see any effect. Probably related to the unreleased
changes around the new "batch actions" and "add page" panel styling.

It breaks button height in the top toolbar, by shifting from jQuery
UI's (well tested) mode of applying padding to the container,
to applying padding to the contained text instead. This
conflicts with the line-height set on many buttons.
 2012-12-17 11:38:00 +01:00
Mateusz Uzdowski
bf5590d873 BUG Fix side-by-side initial icon display issue in IE8. 
The new 'liszt:ready' handler is called late enough to trigger the
update, whereas the redraw is called to early for IE8 to pick up the
class change. The class property is changed correcly though, it looks
like an IE8 rendering issue.

http://open.silverstripe.org/ticket/8095
 2012-12-16 16:15:07 +13:00
Mateusz Uzdowski
8455686c36 BUG Fix the re-layouting not being triggered in IE8. 
Move onresize handler from entwine to regular event for IE8. The
fromWindow::onresize does not trigger otherwise.

Refer to http://open.silverstripe.org/ticket/8095
 2012-12-16 16:14:45 +13:00
Ingo Schommer
b3657147bf BUG Remove "delete" button from "My Profile" (fixes #8121) 2012-12-15 20:02:17 +01:00
Ingo Schommer
963f02e7a3 Using new description style in MemberDateTimeOptionSetField 2012-12-14 01:58:04 +01:00
Ingo Schommer
1ca3883a76 NEW Tooltip and inline help text support for CMS form fields 2012-12-14 01:58:04 +01:00
Ingo Schommer
dbaf407569 Fixed help text alignment for checkbox and grid fields 2012-12-14 01:57:26 +01:00
Ingo Schommer
aed58a55c4 Loading indicator for "more options" buttons 2012-12-14 00:32:06 +01:00
Paul Clarke
c0a122613e Bug fix and code clean up 
Removed tempory button fixs not needed any more,
Removed unrelated commits,
fix for preview note
 2012-12-13 17:44:06 +01:00
Naomi Guyer
6100eb957e Remove or comment magic numbers, whitespace 2012-12-13 17:43:26 +01:00
Paul Clarke
5d93f8daec Bug fix preview note "Website preview" 2012-12-13 17:43:25 +01:00
Mateusz Uzdowski
4d6d823cb1 API Allow ignoring persistent tab state through entwine property. 
In this case we don't want to rely on data attributes in the DOM, as
this should be an inbuilt property associated with this class.
 2012-12-13 17:43:25 +01:00
Naomi Guyer
5cef05ebea Separate out ActionTabSet functionality into a new file & clean up. 2012-12-13 17:43:25 +01:00
Naomi Guyer
ee797e4a48 More CSS fixes for the ActionTabSets. 
Thanks for contributing @clarkepaul.
 2012-12-13 17:43:25 +01:00
Naomi Guyer
618e639526 Refactor and comment TabSet.js 2012-12-13 17:43:25 +01:00
Naomi Guyer
235e8c8138 CSS fixes for the ActionTabSet. 
Thanks for contributing @clarkepaul!
 2012-12-13 17:43:25 +01:00
Naomi Guyer
a80aa3c969 Provide new save icon for the use in the framework. 2012-12-13 17:43:25 +01:00
Mateusz Uzdowski
fe08236f21 API Add action tabsets as a interface idiom. 
Introduces the concept of action tabsets - usage of TabSet and Tabs
in between the action buttons to allow richer set of capabilities that
can be offered to the user.

Goes along with c8d0cdec99c95dbed3b58ebcc098cc9d22c58206 that implements
a change to the CMS actions.
 2012-12-13 17:43:24 +01:00
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
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
Andrew Short
2503e481ff Only initialise chosen elements when visible. 2012-08-16 23:26:33 +02:00
Andrew Short
b38735d536 Fix chosen dropdown width not being set. 2012-08-16 23:26:29 +02:00
Andrew Short
c1f27c18ee Revert b9ed6f7f6d. 2012-08-16 23:26:24 +02:00
Mateusz Uzdowski
70eaa270e4 API Allow to force URL reload, while replacing the history state 
Comes with a wrapper for easy reloading of the current panel.
 2012-08-16 22:02:19 +02:00
Ingo Schommer
f79d2df104 BUG More robust url comparison in CMS 
Avoid ajax reloads when URLs differ in irrelevant ways,
e.g. admin/?locale=de vs. admin?locale=de.
This caused problems with the translatable module
reloading page content where it didn't need to,
because some previous robustness patches to the same problem
didn't apply (they only removed trailing slashes, ignoring
query parameter strings). The visible problem for this was
a broken tree panel, because it was ajax-loaded in parallel
with its container. Depending on ajax response order,
this would break the inner panel (in this case the tree),
since its original container was replaced with a new DOM.
 2012-08-15 21:22:15 +02:00
Jeremy Bridson
c621a6d699 BUGFIX: fixed trac 7665 - CMS Menu header now changes height depending on the name of the admin and greeting message. position and height were being set inline so added !important to override this. 2012-08-15 11:28:31 +12:00
Ingo Schommer
3bce3550d3 Merge remote-tracking branch 'origin/3.0' 2012-08-12 22:21:06 +02:00
dd1079
8d9db7f61a FIX: Proper buttonset styling 2012-08-11 10:19:17 +12:00
Ingo Schommer
35ca67535d Merge pull request #667 from jakr/trac7617-followup 
Fix edge case in sessionStorage detection for FireFox.
 2012-08-10 01:42:58 -07:00
Ingo Schommer
cac540d252 Merge branch '3.0' 2012-08-10 00:19:00 +02:00
Ingo Schommer
c7fd9a6605 CMS Localization 2012-08-10 00:17:34 +02:00
Ingo Schommer
77d939f0b2 CMS Localization 2012-08-09 23:55:30 +02:00
Ingo Schommer
fb7008627c Merge remote-tracking branch 'origin/3.0' 2012-08-09 10:47:44 +02:00
martimiz
b1ee36e3aa Fix: display the correct (menu) icon in the GridFieldDetailForm's breadcrumbs. 
In CMSBreadcrumbs.ss the (TopLevel)Controller is not recognized within
the Breadcrumbs loop, so the class that is used in css to style the
icon cannot be created. Moving the construction outside the loop will
remedy this. As far as I can see this works within the CMS.
 2012-08-08 17:30:20 +02:00
Naomi Guyer
5b88ffca46 BUG: IE7 vertical text fix 
Re-add vertical text fix, as it's been overwritten somewhere along the
way
 2012-08-07 13:29:33 +12:00
Ingo Schommer
d0a9811087 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:21 +02:00
Will Rossiter
c28c024dce Merge pull request #694 from creamarketing/javascript-treenode-updating 
BUG: javascript tree node updating fails when Translatable is used
 2012-08-03 14:49:52 -07:00
Niklas Forsdahl
a85530991c BUG: javascript tree node updating fails when Translatable is used 
Automatic tree node updating fails when for example creating a new
translation, due to the update URL containing two question marks,
due to the locale get parameter.

Fixed by using the $.path.addSearchParams utility function, which properly
checks for existing query string parameters.
 2012-08-03 13:36:37 +03:00
Will Rossiter
d774cb50f6 Add nowrap to buttons to ensure single lines (https://skitch.com/willrossi/ekp44/silverstripe-pages). Thanks oetiker 2012-08-03 09:13:37 +12:00
Hamish Friedlander
3efdb5c981 Merge in changes from 3.0.1 final 2012-07-31 16:51:10 +12:00
Naomi Guyer
2cb9a574a5 BUG: Adjust css for actions toolbar on pages (fixes 7649) 
Set a minimum height on the actions panel so it would look the same in
list and tree views
 2012-07-31 16:16:37 +12:00
Hamish Friedlander
72efed1993 Dont need to wrap entwine blocks in onload blocks, theres no benefit 2012-07-27 11:17:56 +12:00
Hamish Friedlander
a9bedccd1f Merge in changes from 3.0.1-rc2 2012-07-27 11:14:32 +12:00
Hamish Friedlander
5591017577 BUG 3156e755 broke GridField Add forms because guessed frag was wrong 2012-07-27 11:13:23 +12:00
Will Rossiter
1a42fd0faa Merge pull request #672 from adrexia/CMS-collapsed-menu 
FIX: Logo padding in collapsed Menu
 2012-07-25 22:57:16 -07:00
Naomi Guyer
55ec92d40e ENHANCEMENT: Maori language javascript 2012-07-26 17:18:44 +12:00
Naomi Guyer
a605d06d9f BUG: Logo padding in collapsed Menu 2012-07-26 15:41:44 +12:00
Hamish Friedlander
95d0be636c Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:44:53 +12:00
Hamish Friedlander
dc18c51f32 Add javascript japanese translation - thanks Yuki Awano 2012-07-25 09:38:36 +12:00
jakr
3bc2798e72 Fix edge case in sessionStorage detection for FireFox. If it is disabled using about:config, typeof will be object, but the value will be null. 2012-07-24 12:54:23 +02:00
Hamish Friedlander
22d6c7afa4 BUG Updating node would position wrong, Sort isnt === offset 2012-07-23 22:15:11 +12:00
Ingo Schommer
120de7cba2 NEW Tree node updates after save (fixes #7450, #7389) 
- Updates icon, badges, title, and position in hierarchy
- New LeftAndMain_TreeNode API to allow rendering of single tree nodes
without their hierarchy, extracted from LeftAndMain->getSiteTreeFor()
- New LeftAndMain->updatetreenodes() endpoint to request updated state
for one or more nodes. Triggered on demand by form refreshes.
 2012-07-23 17:21:49 +12:00
Ingo Schommer
09067cc8dd NEW Open first tab with validation errors 2012-07-18 16:50:09 +02:00
Ingo Schommer
3156e75548 BUG Redisplay CMS forms with validation errors 
Guess the fragment based on the returned HTML.
The validation error HTTP response is generated by Form rather than
the controller (LeftAndMain), so we can't set custom PJAX headers easily.
 2012-07-18 16:50:04 +02:00
Ingo Schommer
ac5989560e Validation error styling in CMS 
Blocklevel to avoid weird alignment relative to actual form field
Highlighted background, same as other error messages
 2012-07-18 16:49:59 +02:00
Ingo Schommer
3ae8b0b665 Merge remote-tracking branch 'origin/3.0' 2012-07-18 15:00:06 +02:00
Ingo Schommer
faff2c122d Localized CMS breadcrumbs title 2012-07-18 13:51:12 +02:00
Andrew Short
9a5baafde7 Don't capture form submits to new windows. 2012-07-17 16:34:01 +10:00
Ingo Schommer
d4b8db27af Marking fake LeftAndMain->redirect() responses as finished 
Introduce new LeftAndMain_HTTPResponse class for this purpose,
to mark a response as finished regardless of HTTP status.
This is required for ajax responses which do redirects on app layer
rather than HTTP (to avoid double processing).

Specifically required to decorate LeftAndMain->init()
in the 'translatable' module (TranslatableCMSMainExtension),
which marks the response as finished through its redirect,
avoiding further processing after init().
 2012-07-16 23:30:59 +02:00
Ingo Schommer
bbfa54c816 Allow custom preview URLs through hidden fields 
Useful e.g. to force non-SSL previews via absolute links,
even if the CMS is loaded on an SSL host.
 2012-07-16 12:05:48 +02:00
unclecheese
b9ed6f7f6d BUGFIX: When Chosen dropdowns are instantiated on hidden tabs, the width is rendered very small and they are unreadable. This is a known bug in Chosen. A change has been proposed at the Chosen page here: https://github.com/harvesthq/chosen/issues/92 but no pull request has been executed. 2012-07-16 10:18:58 +02:00
unclecheese
d571cdcc85 ENHANCEMENT: Hide the search bar in Chosen dropdown fields when list is reasonably short. 2012-07-16 10:10:01 +02:00
unclecheese
6e2d6c2782 ENHANCEMENT: Hide the search bar in Chosen dropdown fields when list is reasonably short. 2012-07-15 22:54:53 -03:00
Ingo Schommer
bf91594e4f Disable tab state logic on uninit'ed tabs, allow opt-out 
Fixes a problem when switching between ajax tabs,
e.g. "Content" and "Settings" in admin/pages/edit/show/<id>.
 2012-07-13 17:34:55 +02:00
Ingo Schommer
c493dc730a Avoid lonely question mark for GridField URLs in CMS 2012-07-13 17:33:48 +02:00
Ingo Schommer
155758f546 NEW Save and restore tab state upon CMS navigation (fixes #7647) 
Implemented independently of URL state to ensure that
state is retained on every user interaction, rather than
having to add it to each URL specifically.
Same reasons for not saving it as HTML5 history metadata,
as that's only inspected on history events, not
normal CMS navigation.
 2012-07-13 16:46:23 +02:00
Ingo Schommer
712f28bc78 Scoped deprecation messages (fixes #7645) 2012-07-13 11:37:35 +02:00
Ingo Schommer
a5a08530fc BUG Force "full" ajax content reload with invalid fragments 
When one or more fragments are requested that are not in
the current DOM, we need to force loading the outermost
fragment instead (currently hardcoded to "Content").
This mainly prevents history back navigation from breaking,
e.g. admin/pages -> admin/pages/list ->
admin/pages/list/?ParentID=99 -> admin/pages/edit/show/5 -> (back)
 2012-07-13 10:19:24 +02:00
Ingo Schommer
7a52a7fe41 BUG Default form submits to text/html, fixing validation (#7653) 
Was using text/json, which Form->httpSubmission() interprets
(correctly) to returning JSON validation data.
This trips up the interface, which expects HTML with
the validation errors directly in the markup.
 2012-07-12 17:10:50 +02:00
Kirk Mayo
ac45825752 BUG:fixed alignment of radio buttons on add page pane trac/7473 2012-07-11 10:09:10 +12:00
Ingo Schommer
dd9c968a7a Merge pull request #631 from silverstripe-rebelalliance/3.0_7472 
BUGFIX:fixed action buttons on edit page content - stopped them from ove...
 2012-07-10 01:30:18 -07:00
Kirk Mayo
4a9c6d1e22 BUGFIX:fixed action buttons on edit page content - stopped them from overlapping in ie8. 2012-07-10 16:57:58 +12:00
Will Rossiter
b4eb023f64 Merge pull request #627 from silverstripe-rebelalliance/open/7637 
Remove text shadow off confirmation message links trac 7637.
 2012-07-08 21:32:46 -07:00
Jeremy Bridson
0ef0c9c408 BUGFIX:removed text shadow off confirmation message links trac 7637 2012-07-09 16:21:00 +12:00
Andrew Short
2a9a4bede7 Fixed nested tab styling in other CMS interfaces. 2012-07-06 12:48:36 +10:00
Ingo Schommer
64357a4522 Merge branch '3.0' 
Conflicts:
	admin/css/screen.css
	admin/scss/_forms.scss
	docs/en/changelogs/3.0.0.md
 2012-07-05 18:01:09 +02:00
ARNHOE
b6c59f2c95 Restricting input.time width 2012-07-04 18:57:07 +02:00
Andrew Short
b44ff84aac Allow multi-line application names. 2012-07-04 13:17:19 +10:00
Ingo Schommer
fa62c1b0ba Smarter concat of query params in LeftAndMain.js 
Broke when CMS URL already had query params,
such as ?locale=en_US with the Translatable module enabled.
With this patch it doesn't double-concat ?locale....
Still doubles query params, but that's acceptable
until we find a more solid URL manipulation lib for JS.
 2012-06-29 14:23:01 +02:00
Simon Welsh
8d670283c9 FIX Santise model classes in ModelAdmin 
As ModelAdmin puts classes directly into links, a namespaced class
has its \s turned into /s, breaking the links. This escapes them by
converting each \ to a -, then converting them back when loading.
 2012-06-29 13:52:33 +12:00
ARNHOE
81c085f777 Fixed width of DateField with dmyfields=true 2012-06-27 10:11:39 +02:00
Ingo Schommer
6dc108ac3e Merge pull request #570 from adrexia/7528-insert-link 
BUGFIX: Insert link styling inconsistent with Insert media (fixes #7528)
 2012-06-25 06:24:30 -07:00
Naomi Guyer
5c6ec68389 BUGFIX: Min-width on html dialog box (fixes #7541) 2012-06-25 17:35:05 +12:00
Naomi Guyer
e51bf760e9 BUGFIX: Insert link styling broken, and inconsistent with Insert media (fixes #7528) 2012-06-25 15:31:39 +12:00
Sam Minnee
7685a0b59d Merge branch '3.0' 2012-06-25 10:01:34 +12:00
Ingo Schommer
ba9c3c7b8e BUGFIX Type checking in CMS URL params (fixes #7187) 
Nasty issue where nested requests to sub-controllers within LeftAndMain->EditForm() would fail because of
LeftAndMain->currentPageID() being taken from the URL, even though it was a field action name.
Example: POST /admin/pages/edit/EditForm/field/MyGridField/item/1/ItemEditForm/field/MyUploadField/upload
The current ID would be detected as "field" in this case.
Bug was previously fixed for AssetAdmin.
 2012-06-22 17:47:45 +02:00
Ingo Schommer
682a6a0d1b BUGFIX "Insert media" loading indicator (fixes #7542) 
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
 2012-06-22 10:25:15 +02:00
Naomi Guyer
5713a37a32 BUGFIX: Alignment of http label in insert media 2012-06-22 18:11:00 +12:00
Naomi Guyer
f01c1640c7 BUGFIX: Alignment of http label in insert media 2012-06-22 18:04:13 +12:00
Sam Minnee
4aa4cd2c28 Merge branch '3.0' 
Conflicts:
	admin/scss/ie7.scss
 2012-06-22 17:20:07 +12:00
Naomi Guyer
cffb95280f BUGFIX: Tab colour htmleditor in IE7 2012-06-22 17:10:52 +12:00
Naomi Guyer
f3933aa3fb BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 17:10:52 +12:00
Naomi Guyer
89bd7ebfba BUGFIX: Tab colour htmleditor in IE7 2012-06-22 16:55:40 +12:00
Naomi Guyer
c2e8c2450d BUGFIX: Make entire tab clickable in htmleditor (fixes #7407) 2012-06-22 16:23:01 +12:00
Sam Minnée
bafda93957 Merge pull request #563 from silverstripe-rebelalliance/trac/7427-add-responses 
BUGFIX: Add batch handler status messages (fixes #7427)
 2012-06-21 19:29:41 -07:00
Hamish Friedlander
03469230ff BUGFIX: Add batch handler status messages (fixes #7427) 
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
 2012-06-22 13:59:08 +12:00
Hamish Friedlander
daa226a9af BUGFIX: Fix trac ticket #7476 
We missed making an event delegatable in https://github.com/silverstripe/sapphire/pull/542
the result was 7476 wasnt actually fixed
 2012-06-22 10:46:03 +12:00
Hamish Friedlander
65030906ad BUGFIX: Add validation to fix open.silverstripe.org ticket #7494 
When adding media via the HtmlEditorField dialog, the value of the URL field wasnt being validated. Youd get different errors depending on if the field was empty
or if it had text, but it didnt look like an absolute URL to HtmlEditorField#viewfile.

This adds some javascript validation to make the text field look like a URL field
 2012-06-21 14:19:41 +12:00
Naomi Guyer
d3845380d7 BUGFIX: Padding in navigation elements in IE7 
Fixes the gap between navigation elements in IE7
 2012-06-21 11:48:39 +12:00
Naomi Guyer
3eff92ad40 ChangedBUG FIX: IE filter buttons (fixes #7501) 
* Changed spacing of IE filter buttons

Conflicts:

	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
 2012-06-20 14:21:12 +02:00
Ingo Schommer
89ce1ec991 Merge branch '7501-grid-field-filters' of https://github.com/adrexia/sapphire into adrexia-7501-grid-field-filters 
Conflicts:
	admin/css/ie7.css
	admin/css/ie8.css
	admin/scss/ie7.scss
 2012-06-20 14:13:39 +02:00
Naomi Guyer
42d40a7c1a BUGFIX: Turn off filters on IE Nav icons (fixes #7471) 
Set filter to none so that the icons appear correctly in IE7and 8

Conflicts:

	admin/scss/_ieShared.scss
 2012-06-20 14:11:08 +02:00
Ingo Schommer
1016c36d33 Merge branch '7471-ie-filter-nav' of https://github.com/adrexia/sapphire into adrexia-7471-ie-filter-nav 
Conflicts:
	admin/scss/_ieShared.scss
 2012-06-20 14:10:08 +02:00
Naomi Guyer
50ed4f515d BUGFIX: Show text for collapsed side panel in IE8 and 9 (fixes #7469) 
Altered IE CSS for CMS-panel to allow the text to display from top to
bottom.
 2012-06-20 14:09:05 +02:00
Naomi Guyer
c9cde893b1 BUGFIX: Show text for collapsed side panel in IE8 and 9 (fixes #7469) 
Altered IE CSS for CMS-panel to allow the text to display from top to
bottom.
 2012-06-20 14:06:21 +02:00
Sean Harvey
c6039ae8d1 BUGFIX When updating the tree from EditForm, ensure we only change the 
text of the tree node for the first .text element, instead of the nested
ones.
 2012-06-20 22:00:19 +12:00
Sean Harvey
86753baaa1 BUGFIX When updating the tree from EditForm, ensure we only change the 
text of the tree node for the first .text element, instead of the nested
ones.
 2012-06-20 21:58:23 +12:00
Naomi Guyer
9f41ffd6e1 ChangedBUG FIX: IE filter buttons (fixes #7501) 
* Changed spacing of IE filter buttons
 2012-06-19 17:52:09 +12:00
Naomi Guyer
c55627ee7c BUGFIX: Turn off filters on IE Nav icons (fixes #7471) 
Set filter to none so that the icons appear correctly in IE7and 8
 2012-06-18 13:22:01 +12:00
Ingo Schommer
dd99fbc69e BUGFIX Apply batch action node deselection (fixes #7476) 
The form ID list was only updated on node checking, but not unchecking.
 2012-06-18 00:31:27 +02:00
Hamish Friedlander
c12db51c22 BUGFIX: Fix trac/7485 2012-06-18 10:23:04 +12:00
Ingo Schommer
16527f7fef MINOR Removed old CSS files 2012-06-15 16:24:01 +02:00
Sam Minnée
e3e15e4007 Merge pull request #537 from silverstripe-rebelalliance/trac/7462 
BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: ...
 2012-06-14 20:45:07 -07:00
Kirk Mayo
f546e0db64 BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: capitialize and display: block to the relevant css 2012-06-15 15:38:29 +12:00
Sean Harvey
c801671a90 BUGFIX #7394: Allow unselect dropdowns in chosen if there's an empty option 2012-06-15 14:32:21 +12:00
Sam Minnée
7ce7ac406e Merge pull request #528 from mango9/master 
Ticket #5578
 2012-06-14 16:43:20 -07:00
Ingo Schommer
deff232567 MINOR Using onadd in preview JS 2012-06-15 01:19:31 +02:00
Hamish Friedlander
acee026875 BUGFIX: Buttons in the cms that didnt have .ss-ui-button werent becoming buttons because we changed buttons to trigger on onadd, but the ss-ui-button class was being added dynamically 2012-06-15 01:19:31 +02:00
Ingo Schommer
2fa835a027 MINOR Moving edit form focus logic from onadd() to onmatch() to give the form time to become visible (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
ecb48bb57c BUGFIX Force full window reload on IE7/IE8 every 20 pushState requests (see #7258) 2012-06-15 01:19:20 +02:00
Ingo Schommer
5260738148 MINOR Avoid reinitialising tabs (see #7258) 2012-06-15 01:19:19 +02:00
Ingo Schommer
980686ab75 MINOR Limiting console.log() output to explicit enabling through window.debug to avoid failing IE 2012-06-15 01:19:19 +02:00
Hamish Friedlander
21e7ec61f4 ENHANCEMENT: In dev mode, include some basic leak detection functions in the admin panel 2012-06-15 01:19:19 +02:00
Hamish Friedlander
b86a787521 BUGFIX: Use new jQuery.Entwine event capturing, onadd and onremove features to plug some memory leaks 2012-06-15 01:19:15 +02:00
Ingo Schommer
04e5ff09ca MINOR Hiding CMS-specific badges in TreeDropdownField (fixes #7456) 2012-06-14 20:43:29 +02:00
Ingo Schommer
c81d0e1222 MINOR Only set X-Pjax header in redirections if it doesn't already exist in the response 2012-06-14 20:20:29 +02:00
Paul Meyrick
882b4267cb BUGFIX: Ticket #5578 SiteTree->CanCreateTopLevel() doesn't change dragged tree nodes or ParentID changes 2012-06-14 17:17:27 +12:00
Ingo Schommer
e23a7585a7 MINOR Using new jQuery.changetracker.destroy method in LeftAndMain.EditForm.js 2012-06-13 23:16:13 +02:00
Ingo Schommer
0b6d45356e MINOR Added destroy() method to jQuery.changetracker plugin 2012-06-13 23:16:09 +02:00
Ingo Schommer
4c0a0f95b0 BUGFIX Inlining TinyMCE HTML popup (fixes #7451) 
Doesn't include base TinyMCE logic when used externally,
most likely a TinyMCE bug since the source_editor.html file is unmodified.
 2012-06-13 14:39:50 +02:00
Ingo Schommer
9cdc787935 Merge branch 'stylingfixes' of https://github.com/ajshort/sapphire into ajshort-stylingfixes 2012-06-13 13:23:24 +02:00
Ingo Schommer
db076c0f02 MINOR Using new setDescription() styling in HtmlEditorField 2012-06-13 13:21:41 +02:00
Andrew Short
d9c7bb8eb9 ENHANCEMENT: Implemented help text for form fields. 
The title attribute is extracted from form fields and displayed inline
below the field.
 2012-06-13 13:19:12 +02:00
Ingo Schommer
43483090b4 Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into ajshort-tabstyling 2012-06-13 10:37:59 +02:00
Andrew Short
160d516699 BUGFIX: Consistently style custom defined page icons. 
* Apply page icon styling to .page-icon, rather than specific elements.
 2012-06-13 18:22:43 +10:00
Andrew Short
86bb491f2a MINOR: Consistently style tabs in various CMS interfaces. 2012-06-13 15:10:48 +10:00
Andrew Short
aa67b56b10 ENHANCEMENT: Refactored ToggleCompositeField. 
* Use jquery ui accordion for the field, and implemented an admin theme.
* Made the setting of configuration consistent with other form fields.
* ToggleComposteField->startClosed() has been deprecated in favour of
  setStartClosed().
* Removed public access to the heading level, instead use getHeadingLevel()
  or setHeadingLevel().
 2012-06-13 14:20:27 +10:00
Andrew Short
513737097b MINOR: Fixed tab border being shown when tabs were hidden. 2012-06-13 13:46:00 +10:00
Ingo Schommer
ce3d48e310 MINOR Supressed dependencies of tree logic on SiteTree elements (not properly isolated to work well with Folder objects) 2012-06-13 00:51:53 +02:00
Ingo Schommer
b1d95cffac BUGFIX Passing existing SS_HTTPResponse to PjaxResponseNegotiator in LeftAndMain so state like X-Status HTTP headers are retained (fixes #7427) 2012-06-13 00:27:03 +02:00
Ingo Schommer
9b3d3123b6 Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into ajshort-tabstyling 2012-06-12 19:40:21 +02:00
Ingo Schommer
896d198890 BUGFIX Correct DOM structure on updating tree nodes from edit forms, adding badge classes to force strike-through styling on deleted nodes (see #7410) 2012-06-12 19:16:34 +02:00
Ingo Schommer
2637969bcd API CHANGE Renamed JS event from 'reloadeditform' on 'aftersubmitform', 'beforesave' to 'beforesubmitform'. Listening to bubbled event on container to avoid binding to forms which are removed before the event is triggered. 2012-06-12 17:13:36 +02:00
Andrew Short
8976c82a35 MINOR: Fixed nested tab styling. 
* Added and styled border below nested tabs.
* Fixed duplicate nested tabset divs being created.
 2012-06-13 00:43:04 +10:00
Ingo Schommer
ed9c856442 ENHANCEMENT Strikethrough styling for deleted tree nodes, adding status classes to tree node <li> in addition to the existing <span class="badge"> (fixes #7410) 2012-06-12 15:53:38 +02:00
Ingo Schommer
d95e9a06b3 Merge pull request #518 from ajshort/jsfixes 
BUGFIX: Fixed incorrect variables breaking form submission.
 2012-06-11 06:33:27 -07:00
Andrew Short
34eb1b39dd BUGFIX: Fixed incorrect variables breaking form submission. 2012-06-11 23:31:02 +10:00
Naomi Guyer
e96ca5fb9a ENHANCEMENT: Change media insertion to use button and apply design 
Conflicts:

	css/UploadField.css
	scss/UploadField.scss
 2012-06-11 10:54:48 +02:00
Ingo Schommer
9009d43f63 MINOR Moved "insert x" dialog styling from generic UploadField.scss to CMS-specific _style.scss 2012-06-11 10:51:47 +02:00
Paul Clarke
3ada9a9327 ENHANCEMENT Basic css spacing issues 
Ticket #7446 Minor css spacing fixs: padding on grid filter, filter
panel, page actions box-shadow to remove
 2012-06-11 16:02:33 +12:00
Naomi Guyer
7523f98e04 BUGFIXES: File Uploads 
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
 2012-06-08 18:40:33 +02:00
Will Rossiter
f3b91618fb Merge pull request #509 from Zauberfisch/patch-2 
MINOR: fixed opera vendor prefix for @mixin hide-text-overflow
 2012-06-07 00:37:55 -07:00
Sam Minnee
267f41bdf4 ENHANCEMENT: Point userhelp link at a new userhelp instance. (#7430) 2012-06-07 13:46:47 +12:00
Ingo Schommer
d4baf2d19d BUGFIX Stability improvements on CMS layout logic 
- Changed application order
- Fixed layout trigger after preview toggle
- Replaced button row dimension approximation with double application of jQuery.layout() - once before sizing the action panel height to set correct width on container, then again for the height
 2012-06-06 21:05:36 +02:00
Ingo Schommer
803aa6bfc5 MINOR Only applying box-shadow on inactive tabs 2012-06-06 21:05:35 +02:00
Ingo Schommer
415a680802 BUGFIX CMS Breadcrumbs and tabs as inline blocks which can span multiple lines, rather than being cropped off (fixes #6882) 2012-06-06 21:05:33 +02:00
Zauberfisch
eac70b6b5b MINOR: fixed opera vendor prefix for @mixin hide-text-overflow 2012-06-06 15:30:19 +02:00
Ingo Schommer
b3164eb2a9 MINOR Disabled jQuery.entwine inspector in dev mode, as it causes side effects due to document.write() before other scripts are loaded 2012-06-06 11:49:32 +02:00
Ingo Schommer
12f2e1e176 Merge branch 'pjax-multiple' 2012-06-05 14:01:18 +02:00
Ingo Schommer
f794e98d7e BUGFIX Moved localised JS messages in correct module (fixes #7393) 2012-06-04 11:52:31 +02:00
Ingo Schommer
69d3497497 MINOR Fixed node deselection when changing areas (e.g. "pages" to "edit page") 2012-06-04 11:05:05 +02:00
Ingo Schommer
a757c16411 MINOR Make tree loading indicator visible on page icon to ensure it shows when drag handles are hidden (in "sidebar view") (fixes #7256) 2012-06-03 23:30:56 +02:00
Ingo Schommer
8e89396c93 MINOR Updating compass sprites with its changed ordering starting with 0.12 release (see http://compass-style.org/blog/2012/02/01/compass-0-12-is-released/) 2012-06-03 23:22:29 +02:00
Ingo Schommer
31a66e0424 MINOR Returning at least some error feedback when admin/* route isn't found (fixes #7409) 2012-06-03 22:46:16 +02:00
Ingo Schommer
c18c29f464 BUGFIX Updating tree state (after adding/renaming nodes, changing parent). Deselecting nodes when switching to edit view (fixes #7389, #7336, #7309) 2012-06-03 18:48:47 +02:00
Ingo Schommer
460148c12a MINOR Debug messages for tracking down JS layout sequence issues (disabled by default) 2012-06-02 12:31:55 +02:00
Ingo Schommer
5a93ee77f8 MINOR Fixed tab selection state 2012-05-30 16:36:26 +02:00
Ingo Schommer
0eac6ea5c3 MINOR Apply loading indicators to all forms, not just .cms-edit-form (which means it includes the "pages list view"). Move to correct place in LeftAndMain.js (not specific to '.cms-content') 2012-05-30 16:36:25 +02:00
Ingo Schommer
19bfd01a60 ENHANCEMENT Declare a single DOM element with multiple Pjax fragments. Unified ajax response handling in CMS, followup from submitForm() refactoring. Removed replacement of arbitrary CSS selectors through Pjax, relies on a fragment now (to keep logic consistent). 2012-05-30 16:36:23 +02:00
Ingo Schommer
75e51de9ed API CHANGE Moved submitForm() from $('.cms-content') to $('.cms-container'), unifying ajax response handling between panel loading and form submission 2012-05-30 15:07:14 +02:00
Ingo Schommer
5178954311 UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts 2012-05-30 15:07:13 +02:00
Sam Minnee
73b9f93c08 BUGFIX: Improved layout of moneyfield. 2012-05-30 11:47:48 +12:00
Ingo Schommer
5b03f49245 BUGFIX Respecting server-overrides on X-Pjax responses during ajax redirects. Fixes GridFieldDetailForm redirect after delete, e.g. in ModelAdmin. Partially reverts 8b4b896. Closes pull request #488 2012-05-29 11:34:47 +02:00
Sean Harvey
c3eabffcb9 MINOR Use shorthand {class}::get() syntax instead of DataList::create() 
in core code.
 2012-05-28 21:13:42 +12:00
Sean Harvey
e3dee85635 MINOR Fix broken test 2012-05-28 12:03:13 +12:00
Sam Minnée
f80091f16a Merge pull request #492 from ajshort/multisites 
Fix ModelAdmin When Managed Models Is Array
 2012-05-27 16:53:28 -07:00
Naomi Guyer
9a7980e357 ENHANCEMENT: Design fixes in insert media pop-up 
* Apply design to insert media/image pop-up
 2012-05-28 11:50:34 +12:00
Naomi Guyer
28e43bdc88 ENHANCEMENT: File/Image UI fixes 
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
 2012-05-28 11:50:34 +12:00
Sean Harvey
79680137b1 BUGFIX SecurityAdmin shows incorrect breadcrumbs for viewing Roles GridField. Partially reverts 16982ba17c. 2012-05-28 11:46:25 +12:00
Sean Harvey
74d444cf2f BUGFIX Ensure "Add [modelClass]" is shown instead of using the field name of the GridField, partially reverts 16982ba17c which broke breadcrumbs in SecurityAdmin 2012-05-28 11:43:47 +12:00
Andrew Short
b7ce610933 BUGFIX: Fixed ModelAdmin not working when managed models was defined as an array. 2012-05-27 21:45:42 +10:00
Ingo Schommer
fb7cd328cf MINOR Fixed field naming in SecurityAdminTest (recently changed alongside new GridFieldAddButton commit) 2012-05-25 00:02:23 +02:00
Ingo Schommer
fa445ad13f Merge pull request #452 from adrexia/sapphire 
---

* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments

Conflicts:
	css/AssetUploadField.css
	css/GridField.css
 2012-05-24 23:06:46 +02:00
Simon Welsh
bb29ff3611 FEATURE: Allow adding media to the CMS using oEmbed 2012-05-24 17:00:21 +12:00
Sean Harvey
45465dca91 Merge pull request #483 from halkyon/cms_ping_keepalive 
Re-instate CMS ping to ensure sessions are kept alive
 2012-05-23 15:55:22 -07:00
Sean Harvey
77c2365b87 MINOR Replacing deprecated static function calls to Director with 
current Controller instance replacements.
 2012-05-23 21:50:02 +12:00
Sean Harvey
ecf847b61c ENHANCEMENT Re-instate pinging every 5 minutes in the CMS as a measure 
to keep sessions alive. Moved Security/ping to admin/security/ping
 2012-05-23 17:15:17 +12:00
Mateusz Uzdowski
8d469b66c8 BUGFIX: add missing onunmatches 2012-05-23 16:24:15 +12:00
Sean Harvey
3ed9c5f9f8 MINOR Removed getitem allowed action, this method no longer exists in LeftAndMain 2012-05-22 17:33:34 +12:00
Sean Harvey
ae1a106600 BUGFIX Ensure that CMSMain rule doesn't override the CMSPagesController 
rule in AdminRootController::add_rule_for_controller()
 2012-05-22 16:59:31 +12:00
Paul Clarke
2f4a033bc2 BUGFIX: CMS tabs were hidden in ie7, changed css to make them appear far right 2012-05-22 16:06:50 +12:00
Paul Clarke
84bf5e2029 ENHANCEMENT tabs text-shadow direction change, improve visibility for IE 2012-05-22 16:06:49 +12:00
Paul Clarke
5edf447d2a ENHANCEMENT visual enhancements, cms tabs, main menu drop shadow adjusted, actions panel top gradient replaced 2012-05-22 16:06:49 +12:00
Sean Harvey
0d4f7a04dc BUGFIX Fixing incorrect arguments to submitForm() in 
LeftAndMain.AddForm.js
 2012-05-22 15:37:31 +12:00
Sean Harvey
ce7a96b116 BUGFIX Fixed missing comma in LeftAndMain.AddForm 2012-05-22 14:57:30 +12:00
Mateusz Uzdowski
78b7836d04 BUGFIX: add missing onunmatch 2012-05-22 14:49:57 +12:00
Mateusz Uzdowski
ac2567761b BUGFIX: add missing selectors and namespace qualifiers 2012-05-22 11:29:06 +12:00
Naomi Guyer
16982ba17c ENHANCEMENT: Make GridFieldAddNewButton Content more specific 
* Alter Grid Field "Add New" Button to take the name of the table (i.e.
"Add Member")
* Alter table names in security section to be singular so the button
text makes sense
 2012-05-21 17:47:14 +12:00
Naomi Guyer
1747298786 ENHANCEMENT: Make GridFieldButtonRow more adaptable 
* Add ability to choose where to put buttons (in buttonRow, toolbar
header, etc)
* Adjust styles to take these changes into account
 2012-05-21 14:41:46 +12:00
Sam Minnée
f348141cfd Merge pull request #466 from silverstripe-scienceninjas/feature/config-enhancements 
Feature/config enhancements
 2012-05-20 19:03:43 -07:00
Ingo Schommer
607a9e2f45 MINOR Reverted removal of horizontal panel scrollbars from dc5e36ec, as it makes important content like nested tree nodes inaccessible. UI elements inside the panel should adjust to the available width if visually required instead (fixes #7347) 2012-05-20 14:00:14 +02:00
Hamish Friedlander
94f50f554e API CHANGE: Changes to make Director rules set through the new config system. Includes the addition of a new AdminRootController to take over handling of routing /admin/* routes to the correct LeftAndMain panel. 2012-05-19 14:37:32 +12:00
Ingo Schommer
7c589f07dc MINOR Don't invoke layout() in onmatch() for cms-preview, as it causes a gap above the menu/logo div for some reason. It's also unnecessary processing, since the preview is always hidden by default, and layout() will be triggered through redraw() when required (e.g. preview panel expansion) 2012-05-18 20:07:06 +02:00
Ingo Schommer
d23e8ec14c BUGFIX Fixed cms menu expansion logic when shown alongside preview panel, retain cookie preference 2012-05-18 20:07:06 +02:00
Ingo Schommer
e185a9b8f8 MINOR Adding title to menu items so they can be more easily identified in collapsed mode 2012-05-18 20:07:06 +02:00
Sean Harvey
3f932d6bad Merge pull request #464 from mateusz/os7299 
BUGFIX: add capability of redirecting form actions.
 2012-05-17 22:44:05 -07:00
Mateusz Uzdowski
8b4b896578 BUGFIX: add capability of redirecting form actions. 
Form actions assume that they are reloading the form afterwards. But
this is not always the case - for example "delete" action will redirect
back to the panel, so we need to be able to set the X-Pjax headers
accordingly.
 2012-05-18 17:36:06 +12:00
Sam Minnee
70a5b49dd6 MINOR: Fixed i18n coding for LeftAndMain save and delete. 2012-05-18 16:15:13 +12:00
Mateusz Uzdowski
97e00a35dd BUGFIX: add missing onunmatches causing exceptions in entwine 2012-05-18 14:27:09 +12:00
Mateusz Uzdowski
6e436b54f4 BUGFIX: change namespace for the tree so all matchers are executed 
.cms-tree.multiple matcher would not execute, because .cms-tree from
another file is overriding it (and the element is marked as resolved by
entwine). We need to move it to a separate namespace.
 2012-05-18 12:27:30 +12:00
Mateusz Uzdowski
37399f88db BUGFIX: add missing _super calls to all matchers and unmatchers 
Otherwise some matchers might not be triggered as expected.
 2012-05-18 12:27:30 +12:00
Mateusz Uzdowski
3d0876c8f5 BUGFIX: put all CMS JS code into 'ss' namespace. 
Conflicts:

	admin/javascript/LeftAndMain.js
	javascript/GridField.js
 2012-05-18 12:27:30 +12:00
Naomi Guyer
458171ff92 ENHANCEMENT: Gridfield usability (fixes 7215) 
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates
(spans were being inserted inside spans), and adjusted styles. Added
extra class to template
5. Added "filter by ..." placeholder text to input fields
 2012-05-16 12:18:23 +12:00
Naomi Guyer
5a023f985d MINOR: SCSS refactoring 
1. Refactored some gridfield styles to enable reuse (created a mixin
file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldn't appear in generated
css
 2012-05-16 12:18:00 +12:00
Ingo Schommer
4d97f75e15 MINOR Fixed form reset styles 2012-05-15 22:15:36 +02:00
Ingo Schommer
d57ede8f44 MINOR Fixed query param concatenation in LeftAndMain.js 2012-05-15 21:28:55 +02:00
Ingo Schommer
5ff282e20a MINOR Allow extending LeftAndMain->SiteTreeAsUL() (specifically used to add the language drop down for the 'translatable' module) 2012-05-15 21:28:38 +02:00
Ingo Schommer
8e39e7dfba MINOR Allow extension of LeftAndMain->Link() 2012-05-15 21:27:32 +02:00
Ingo Schommer
d42ea5a9d6 BUGFIX Encoding multibyte characters in custom X-Status HTTP headers used in CMS (headers don't allow multibyte data) 2012-05-14 15:13:49 +02:00
Ingo Schommer
45ae2465e8 Merge pull request #438 from ajshort/sapphire 
---

These are some enhancements + tweaks I made as part of getting the advanced workflow module running in SS3:

* Added a readonly view button and action to GridField.
* Made LeftAndMain::getResponseNegotiator() public so CMS extensions can use it to generate responses.
* Fixed top tab background, made text more readable (http://i.imgur.com/yDmmY.png).
* Allow fields in the CMS to not be change tracked using ".no-change-track".
* Made all icons 16x16 (some were different sizes, being cut off), and allow them without .ui-state-default.
* Fixed ToggleCompositeField and tweaked field styling.
 2012-05-14 14:25:16 +02:00
Hamish Friedlander
7f05add15e ENHANCEMENT: Make jQuery.Entwine inspector available in admin panels in dev mode 2012-05-14 16:34:18 +12:00
Andrew Short
38075d880d MINOR: Tweaked the main tab styling to fix the background and make text more readable. 2012-05-12 18:49:56 +10:00
Andrew Short
d17c4d00ba MINOR: Made all icons consistently 16x16, and show them inside .ui-widget-content elements. 2012-05-12 18:49:56 +10:00
Andrew Short
4a5603b249 MINOR: Don't show a border below the last field. 2012-05-12 18:49:56 +10:00
Andrew Short
1e174b3102 API CHANGE: Made LeftAndMain::getResponseNegotiator() public so extensions can use it. 2012-05-12 18:49:56 +10:00
Andrew Short
304c3cd5d3 ENHANCEMENT: Fields can be excluded from change tracking using a ".no-change-track" class. 2012-05-12 18:49:56 +10:00
Sean Harvey
0fe0d87d9f Merge pull request #434 from halkyon/using_non_deprecated_template_controls 
Replacing use of deprecated <% control %> with <% with %> or <% loop %> as necessary
 2012-05-11 15:08:16 -07:00
Ingo Schommer
ffbcf634bb Merge pull request #420 from chillu/sapphire 
---

See http://open.silverstripe.org/ticket/7261
 2012-05-11 13:42:47 +02:00
Ingo Schommer
d5ebdf91b6 Merge pull request #437 from mateusz/sapphire 
---

http://open.silverstripe.org/ticket/7304

When the actions dropdown is loaded from deferred cache, the Chosen does not apply because of stale classess and markup.
 2012-05-11 11:17:39 +02:00
Mateusz Uzdowski
be06ae7e5f MINOR: change the tree reorganisation message. 2012-05-11 16:22:56 +12:00
Mateusz Uzdowski
905115b4db BUGFIX: Update the batch action select state also on load (os7304) 
This approach should cover more situations than the previous one. It
will owrk regardless of the initial state in the HTML (which can be
loaded from deferred cache).
 2012-05-11 16:21:00 +12:00
Mateusz Uzdowski
b28a625f0b BUGFIX: clean up Chosen classess, so the cached panel can be rebuilt (os7304) 
There is no way to clean up attached Chosen instance in a nice way -
there is no destroy, nor remove on the library.

Also, we can't use the onunmatch on this entwine - it only triggers after the cache snapshot
has been taken. This is because the cache function is on different
namespace.
 2012-05-11 16:17:44 +12:00
Sean Harvey
6f672e5f36 MINOR Fixing use of <% control %> with <% with %> or <% loop %> as necessary. 2012-05-11 13:49:20 +12:00
Robert Curry
6dd94bd6f7 MINOR: Changed classes on tabset li and a tags to match new standard. 2012-05-11 11:12:44 +12:00
Ingo Schommer
7f4c6e3d19 MINOR Fixed small button styles (now used in URLSegment "edit" button etc.) 2012-05-10 14:17:02 +02:00
Ingo Schommer
8b4afc01a7 Merge pull request #426 from halkyon/jquery_upgrade 
MINOR Upgrade jQuery dependency to 1.7.2
 2012-05-10 02:49:41 -07:00
Naomi Guyer
106bd47e88 BUGFIX: #7295 Long Filenames break layout 
Add text overflow and a max width to filenames.
 2012-05-10 11:41:10 +02:00
Naomi Guyer
68f9cde226 BUGFIX: 7219-feedback-changes-file-upload 
Altered files from ENHANCEMENT: UI Changes to FileUpload Area
(TRAC-7219 that were missed in the prior push
 2012-05-10 11:41:09 +02:00
Ingo Schommer
2753744f9e ENHANCEMENT Moving X-Status message handling in CMS from global ajaxError to ajaxComplete handler, to allow success messages being passed this way as well. 2012-05-10 10:44:21 +02:00
Ingo Schommer
6956b1be5c Merge pull request #412 from adrexia/sapphire 
---

The two bug fixes impact on the file area, but have wider reach.

BUGFIX: Colour Adjustments
Change the constructive button colour to match the colour used in the designs, and fix up calculations to produce the correct button colour.

BUGFIX: IE Colours
Replace hard coded colours in IE with variables, and refactor code so that shared IE7 and IE8 fixes are in one place.

ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219)
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they dont look like input boxes, and fix rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again (saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
 2012-05-10 10:27:11 +02:00
Sean Harvey
1e8a89db8f MINOR Upgrade jQuery dependency to 1.7.2 2012-05-10 16:21:11 +12:00
Sean Harvey
138ba0c5bf Merge pull request #424 from adrexia/chosen-bug 
BUGFIX: typeof undefined error fix
 2012-05-09 20:26:03 -07:00
Naomi Guyer
6c5255246f BUGFIX: typeof undefined error fix 
Make chosen check if a trigger exists before continuing
 2012-05-10 15:18:52 +12:00
Ingo Schommer
11f4756225 ENHANCEMENT Auto-hiding tab bar in CMS forms if only a single tab is available (to save screen space and reduce UI clutter) (see #7261) 2012-05-09 17:19:20 +02:00
Sean Harvey
b1e17578c7 API CHANGE Removed assertType() and assertEmpty() workarounds. Use assertInstanceOf() 
instead of assertType(), assertEmpty() is available in PHPUnit 3.5+.
PHPUnit 3.4 is no longer supported, so please upgrade your version to
work.

MINOR Removed FullTestSuite which was a workaround for PHPUnit but not
used.
 2012-05-09 23:05:39 +12:00
Naomi Guyer
d642eee28e ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219) 
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they don't look like input boxes, and fix
rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again
(saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
 2012-05-09 18:38:21 +12:00
Naomi Guyer
7d5e46cdcf BUGFIX: IE Colours 
Replace hard coded colours in IE with variables, and refactored code
so that shared IE7 and IE8 fixes are in one place.
 2012-05-09 18:31:25 +12:00
Naomi Guyer
181ea6cbea BUGFIX: colour Adjustments 
Change the constructive button colour to match the colour used in the
designs, and fixed up calculations to produce the correct button colour.
 2012-05-09 18:24:36 +12:00
Ingo Schommer
9052cdc1da ENHANCEMENT Making "Users", "Groups" and "Roles" tabs in SecurityAdmin bookmarkable. 
ENHANCEMENT Fixed SecurityAdmin->Breadcrumbs() to include link to individual tab, and disable backlink (signed off by Paul)
 2012-05-08 11:25:47 +02:00
Ingo Schommer
2c878f5296 MINOR Template consistency between TabSet.ss and overloaded LeftAndMain tabsets 2012-05-08 11:25:47 +02:00
Ingo Schommer
f2d2f5bb0e MINOR Changed CMS section name from "Users" back to its 2.4 label, "Security". Mainly to avoid breadcrumb weirdnesses when having a "Users/Users/My User" path. Signed off by Paul. 2012-05-08 11:25:47 +02:00
Ingo Schommer
2212363a0f MINOR Using new extraClass support in tabs for CMSTabSet 2012-05-08 11:25:46 +02:00
Ingo Schommer
82cf93855e MINOR Reverting padding changes from pull request #377, way too global - solved through a .cms-panel-padded class in CMSSettingsController instead 2012-05-08 00:53:06 +02:00
Ingo Schommer
76dd6d1636 MINOR Fixed style sprites broken by pull request #402 2012-05-08 00:43:25 +02:00
Ingo Schommer
7e0d0a4dee MINOR Tree metadata naming 2012-05-07 14:45:25 +02:00
Ingo Schommer
23148b959a Merge pull request #402 from ohararyan/sapphire 
---

http://open.silverstripe.org/ticket/7214

Added watermark to show current state of preview.
Removed button styling from Draft and Preview and added styling to show current selected state.

Designs signed off by Paul

Conflicts:
	admin/css/screen.css
 2012-05-07 13:01:00 +02:00
Ingo Schommer
f56097a29b Merge pull request #386 from adrexia/sapphire 
---

Includes:
* Changes to chosen to include a custom function that will let the drop-down rise-up if there is room and it would otherwise drop beneath the size of the window (changes in coffeescript, jquery output, and chosen css)
* Changes in SCSS to stop the automatic addition of scrollbars, and to limit the extra space at the bottom of the filter div

Issues remaining:
* jLayout is calculating the height of the filter div incorrectly. It is assuming the div is around 70px longer than it is. This height assumption is linked somehow to chosen, as initiating the select box results in a correct height calculation.
 2012-05-07 11:21:23 +02:00
Ryan O'Hara
abb5719d33 ENHANCEMENT: Style change to buttons for preview states. Removed open in new window (TRAC-7214) 2012-05-04 13:53:33 +12:00
Ryan O'Hara
92484581e3 ENHANCEMENT: Add disabled state to preview buttons and add watermark for the current state being viewed (TRAC:7214) 2012-05-04 13:53:33 +12:00
Ingo Schommer
f6c8468d56 MINOR Disabled MainMenu caching in LeftAndMain 2012-05-03 14:19:07 +02:00
Ingo Schommer
4029f96728 ENHANCEMENT Section icons in CMS (#7269) 2012-05-03 13:49:19 +02:00
Ingo Schommer
0d1e4cece5 Merge pull request #395 from silverstripe-big-o/sapphire 
---

...tAdmin + regenerated css files.
 2012-05-03 11:26:12 +02:00
Normann Lou
826878b45d ENHANCEMENT: add header icon to CMSFileAddController when uploading file and SecurityAdmin when editing a member record 2012-05-03 18:16:35 +12:00
Jeremy Bridson
7f1e6de4f2 ENHANCEMENT:Trac 7266 - added an icon to the 'sync files' button in AssetAdmin + regenerated css files. 2012-05-03 12:17:41 +12:00
Sean Harvey
151abde17d Merge pull request #388 from chillu/trac/7170-i18n-sprintf-injections 
#7170 i18n sprintf injections
 2012-05-02 16:18:30 -07:00
Ingo Schommer
c7323545b6 BUGFIX Return consistent data from ModelAdmin->getManagedModels(), fixing custom 'title' settings in $managed_models (fixes #7243) 2012-05-02 22:11:26 +02:00
Ingo Schommer
e29bb3c390 ENHANCEMENT Allow opt-out of autofocus in CMS editor form, to avoid browser "auto scrolling" to bring the focused element into view (fixes #7242) 2012-05-02 18:27:45 +02:00
Ingo Schommer
8c1053968c MINOR Fixed unnecessary background in CMS tabs, causes wrong display in FF, and already implemented on parent "cms-content-header" (#7240) 2012-05-02 18:13:34 +02:00
Ingo Schommer
dc659543a1 MINOR Correct breadcrumbs in ModelAdmin when managing multiple models (#7240) 2012-05-02 18:13:34 +02:00
Ingo Schommer
38ff6d4398 Merge pull request #390 from silverstripe-big-o/Trac-7222-change-gallery-icon 
ENHANCEMENT:changed gallery icon to an edit icon for assetAdmin + regene...
 2012-05-02 06:24:55 -07:00
Ingo Schommer
30153d4538 Merge pull request #394 from silverstripe-big-o/sapphire 
---

Set the input to the left and label on the right in CheckboxFieldHolder_Small.ss for consistancy with checkbox set field.

Conflicts:
	admin/scss/_style.scss
 2012-05-02 14:03:59 +02:00
Jeremy Bridson
db9806a895 BUGFIX:Trac#7196 - Fixed styling issues with CMS page settings. 2012-05-02 16:58:08 +12:00
Jeremy Bridson
bc36406826 ENHANCEMENT:changed gallery icon to an edit icon for assetAdmin + regenerated UnitTesting.css 2012-05-02 11:47:54 +12:00
Ingo Schommer
ca789ef5ff BUGFIX Disable form submits through "enter" key in CMS, as they might trigger unwanted actions by the browser choosing the default button 2012-05-01 23:40:21 +02:00
Ingo Schommer
7b18d9d0da MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:17:00 +02:00
Ingo Schommer
4c2352f908 MINOR Don't trigger on click on construction of view-model toggles, as it bubbles up to the panel, where it causes a toggle action which overrides any previous user choices stored in cookies (fixes #7210) 2012-05-01 14:10:09 +02:00
Ingo Schommer
feab46e075 MINOR Marking ModelAdmin tools filters panel as expanded by default (related to #7210) 2012-05-01 14:08:55 +02:00
Ingo Schommer
b428fa1548 MINOR Reverting panel collapse changes for filters (see pull requests #383 and #385) 2012-05-01 13:01:00 +02:00
Naomi Guyer
dc5e36ec5c BUGFIX: 7117 Fixes 
Includes:
* Changes to chosen to include a custom function that will let the
drop-down rise-up if there is room and it would otherwise drop beneath
the size of the window (changes in coffeescript, jquery output, and
chosen css)
* Changes in SCSS to stop the automatic addition of scrollbars, and
to limit the extra space at the bottom of the filter div

Issues remaining:
* jLayout is calculating the height of the filter div incorrectly.
It is assuming the div is around 70px longer than it is. This height
assumption is linked somehow to chosen, as initiating the select box
results in a correct height calculation.
 2012-05-01 17:14:16 +12:00
Sean Harvey
3cd4b33121 Merge pull request #385 from adrexia/7210-close-filter-panel-default 
BUGFIX: Fix logic error
 2012-04-30 20:26:41 -07:00
Naomi Guyer
16fae77241 BUGFIX: Fix logic error 2012-05-01 15:23:11 +12:00
Sean Harvey
1663e96ddb BUGFIX Fixing stray . in the "Page type: x" tooltip hovering over a page 2012-05-01 15:16:22 +12:00
Sean Harvey
befc80676d Merge pull request #383 from adrexia/7210-close-filter-panel-default 
ENHANCEMENT: Close filter panel(Track#7210)
 2012-04-30 18:44:08 -07:00
Naomi Guyer
af5bd4d750 ENHANCEMENT: Close filter panel(Track#7210) 
Make the filter panel closed every time unless explicitly opened. This
commit is dependent on a commit to the CMS that adds a class to the
template.
 2012-05-01 11:12:47 +12:00
Ingo Schommer
85a331cc11 BUGFIX Choose first "action" button on submission of CMS forms via enter key, to avoid a form field button being autoselected (fixes #7151) 2012-04-30 17:13:39 +02:00
Naomi Guyer
61c18c5dbc BUGFIXES: Fixes #7003 2012-04-30 12:25:35 +12:00
Ingo Schommer
4d64946a48 Merge pull request #368 from adrexia/apply-chosen-updates-coffeescript 
MINOR: Fix chosen Coffeescript files
 2012-04-27 01:21:22 -07:00
Ingo Schommer
e7a4eec0da Merge pull request #377 from adrexia/sapphire 
---

Added padding back into the settings panel.
 2012-04-27 09:42:10 +02:00
Naomi Guyer
f5c26e7282 BUGFIX: Add padding to settings panel 2012-04-27 16:45:07 +12:00
Naomi Guyer
4dc564b143 BUGFIX: actions panel 
Fix actions panel background colours and shading to work on both the
main page content areas and the settings area. Adjust margin and
z-index so there isn't a visible space on the left-hand side.
 2012-04-27 15:48:09 +12:00
Naomi Guyer
66d0673b07 BUGFIX: Fixes #7003 
Changed the calculation of the iframe size so it would be the correct
height. Altered the styles of the view details area to match design.
Changed the background color of the title on the file header so it
wouldn't look editable (as recommended by Felipe)
 2012-04-26 11:17:16 +02:00
Naomi Guyer
70adfc106c MINOR: Fix chosen Coffeescript files 
Apply all changes implemented in chosen.jquery.js back on to source
file (chosen.jquery.coffee) and rebuild files. Update cakefile to
current version (fixes package reserved word).
 2012-04-26 12:04:40 +12:00
Naomi Guyer
e392cc21c3 BUGFIX: Pop-up scrolling IE7 
Added position relative to the body of the iframe to fix scrolling bug
 2012-04-23 17:01:38 +12:00
Ingo Schommer
ef8651dd30 Merge pull request #350 from adrexia/7004-IE7-wrapping-bug 
BUGFIX: #7004 Fixes
 2012-04-20 01:15:28 -07:00
Will Rossiter
585417d141 Merge pull request #343 from halkyon/object_static_remove_deprecation 
BUGFIX Remove calls to deprecated Object static methods, update ConfigTest
 2012-04-19 14:41:45 -07:00
Naomi Guyer
e2d6d5936d BUGFIX: #7004 Fixes 
Fixed the overflow bug in IE7, as per ticket #7004.
 2012-04-19 16:06:58 +12:00
Robert Curry
842784c8aa ENHANCEMENT: Fixes #7010. Move DisplayFields, FieldCasting and FieldFormatting functions from GridField to GridFieldDataColumns. 2012-04-19 12:44:59 +12:00
Sam Minnee
9d36048ada BUGFIX: Fixed a few references to non-existent $request variable. 2012-04-19 10:11:01 +12:00
Ingo Schommer
d8bb1b2375 MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview() 2012-04-18 22:59:18 +02:00
Ingo Schommer
1408198e70 MINOR Fixing display of tree checkboxes 2012-04-18 18:22:54 +02:00
Ingo Schommer
57ee9bf5e8 MINOR Removed unnecessary jquery.livequery include from CMS, its still processing in the background = performance overhead 2012-04-18 17:37:36 +02:00
Ingo Schommer
e40455f2e3 MINOR Fixed tabset/breadcrumb tabular styling, avoid tabs overflowing into hidden space (still needs more work to fix properly) 2012-04-18 16:56:04 +02:00
Ingo Schommer
972e7ccb1a MERGE sitetreeasul 2012-04-18 16:55:15 +02:00
Ingo Schommer
3ee4459476 MERGE tabs url abs 2012-04-18 16:54:57 +02:00
Ingo Schommer
7f62ad0f3e Merge branch 'master' into 7094-combine-tree-edit-view 2012-04-18 14:19:55 +02:00
Sean Harvey
16e950cb6a MINOR Tidy up of code formatting in TestRunner 
MINOR Fixing up old ObjectStaticTest and merging into ConfigTest
 2012-04-18 23:29:54 +12:00
Sean Harvey
4c6be2931b BUGFIX Removing use of deprecated Object static functions like 
get_static(), set_static(), uninherited() etc. Replace with equivalent
Config system get(), update()
 2012-04-18 23:10:57 +12:00
Jeremy Bridson
4c9fa6276d ENHANCMENT:Trac#7166 - added styling for 2nd level tabs. 2012-04-18 14:28:13 +12:00
Jeremy Bridson
02abc42f24 BUGFIX:fixed unwanted box shadow on cms-panel-header when side panel is collapsed 2012-04-18 13:59:00 +12:00
Jeremy Bridson
330dd3008c ENHANCEMENT:Trac#7166 - styled the new combined tree and edit view. 2012-04-18 13:35:57 +12:00
Naomi Guyer
b075dc9058 BUGFIX: Fixes #6943 
Added classes to dropzone when dragging and dropping files. Added
styles to the dropzone when a file could be dropped. Added a clearfloat
mixin to the mixins file.
 2012-04-18 09:56:09 +12:00
Ingo Schommer
473d3a66b8 MINOR Fixed controller contexts in LeftAndMain->SiteTreeAsUL() - needs different context for edit links and determining "current page" (not applicable for CMSPagesController) 2012-04-17 22:33:30 +02:00
Ingo Schommer
35d4cd3da8 MINOR PJAX support for .cms-panel-link 2012-04-17 22:28:36 +02:00
Ingo Schommer
84b0a7d96c MINOR Renamed .ss-tabset to .cms-tabset in cms templates to distinguish entwine selectors and add extra functionality (cookies, re-selecting tab, panel loading) 2012-04-17 17:40:37 +02:00
Ingo Schommer
d6eb1b6fff ENHANCEMENT Added .cms-panel-deferred for lazy loading of CMS panels (for performance reasons) 2012-04-17 17:19:03 +02:00
Ingo Schommer
37777615cf MINOR Ignore aborted ajax requests in CMS notifications 2012-04-17 17:12:15 +02:00
Ingo Schommer
0ef5d0b84f MINOR Moved tree filtering in LeftAndMain from SiteTreeAsUL() into getSiteTreeFor() to allow filtering the initial tree (via GET parameters), rather than just through getsubtree() 2012-04-17 16:07:22 +02:00
Ingo Schommer
9b2b39aaaa MINOR More specific tree links, to ensure correct CMSMain subclass is used 2012-04-17 11:03:09 +02:00
Ingo Schommer
6bee103d14 MINOR Removed hardcoded children entries from CMS Menu (and record setting logic), as the related controllers have been merged to be accessible under the same top-level menu 2012-04-17 11:03:09 +02:00
Sean Harvey
de08c05027 BUGFIX Fixing reference to moved editor_plugin_src.js in HtmlEditorConfig settings 2012-04-17 11:56:59 +12:00
Jeremy Bridson
64300caae3 ENHANCEMENT:fixed issues with overflow between tabs and breadcrumbs in cms-content-header 2012-04-16 16:31:24 +12:00
Andrew O'Neil
3b9f99394b MINOR: Use config system for cms title, rather than eval. 2012-04-16 11:04:55 +12:00
Ingo Schommer
d44f6b3e1f MINOR Removed deprecated usage of $priority argument in _t() calls 2012-04-15 17:17:17 +02:00
Will Rossiter
befbd3e6a8 MINOR: remove reference to sapphire in CMSVersion 2012-04-15 15:00:52 +12:00
Sean Harvey
8949dfa691 ENHANCEMENT Replaced locations of sapphire with $ModulePath(framework) in templates, based off Controller which implements TemplateGlobalProvider 2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Will Rossiter
907568b182 ENHANCEMENT: move hard coded template HTML for composite field and field group out to separate template files. 2012-04-14 17:36:08 +12:00
Ingo Schommer
3572b31a94 MINOR Default app title when SiteConfig object is not present (fixes #7114) 2012-04-13 16:21:30 +02:00
Ingo Schommer
0f8a6999a1 MINOR Passing rendered form to renderWith() call, underlying logic changed (see #7136) 2012-04-13 15:35:46 +02:00
Jeremy Bridson
20aeb76979 BUGFIX:fixed overflow issues in cms-content-header with back button / breadcrumbs / tabs 2012-04-13 16:08:05 +12:00
Jeremy Bridson
6a7668fefb ENHANCEMENT:Trac 6882 - created include template for back button and altered the templates accordingly 2012-04-13 16:06:15 +12:00
Ingo Schommer
e2df1f4c5f MINOR Removed $('.cms-content').loadForm(), its very similar to loadPanel() - accepts callbacks, but that's not specific to forms. Listen to 'afterstatechange' rather than 'loadform' events 2012-04-12 23:53:14 +02:00
Ingo Schommer
b025b95ede ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin) 2012-04-12 23:53:12 +02:00
Ingo Schommer
5cfbac63a2 MINOR Fixed PJAX panel loading when .cms-content is a split panel with tree and form view (regression caused by 452a507cc9) 2012-04-12 12:29:20 +02:00
Mateusz Uzdowski
452a507cc9 BUGFIX: remove form auto-detection from the generic JS state handler. 
Forms take care of PJAX state on their own in the submit and load functions (os-7126)
 2012-04-12 11:31:28 +12:00
Ingo Schommer
ca24120a5e MINOR Install screen visual tweaks, more visible disabled state on install button, conditional version number (to avoid it showing without a version), referencing new theme in install screen, using new layout in install progress screen as well 2012-04-11 16:49:31 +02:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Ingo Schommer
fb12dbe075 Merge pull request #298 from silverstripe-big-o/sapphire 
---

...s CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs.

- There are a couple changes to dropdown widths for the filter side panel in Big-o integration branch already.

Conflicts:
	admin/code/ModelAdmin.php
	admin/css/screen.css
 2012-04-11 15:20:25 +02:00
Jeremy Bridson
98399f7779 BUGFIX:Trac #6854 / #7115 - fixed styling issues with filter panel across CMS - fixed the issue with the width of the date fields - aligned action buttons in filter panel with the designs. 2012-04-11 16:00:56 +12:00
Jeremy Bridson
b58183ff1b MINOR:Trac #7116 - added a set width to dropdowns in filter side panel for IE8 2012-04-11 11:43:53 +12:00
Ingo Schommer
a64715beeb BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order (fixes #6877) 2012-04-10 21:41:00 +02:00
Jeremy Bridson
8292075174 BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images 2012-04-10 14:17:47 +02:00
Jeremy Bridson
75c0937ab3 BUGFIX:removed reference to compass generated sprite and added direct reference to the png file. 2012-04-10 14:16:07 +02:00
Julian Seidenberg
2c5c3eed20 MINOR: regenerating compass icons 2012-04-10 14:16:00 +02:00
Ingo Schommer
3390ea390f MINOR Updating tree nodes on each state change, rather than just listening to form reloads 2012-04-10 12:28:10 +02:00
Ingo Schommer
15e16f13e1 MINOR Retaining correct PJAX selector on (fake) redirects after form submissions 2012-04-10 12:27:40 +02:00
Julian Seidenberg
1e0b843353 ENHANCEMENT: refactoring code for making a link an ajax/history link. Removing the selector that targets .crumb and only applying the selector that turns links with cms-panel-link into ajax enabled links. Adding the cms-panel-link to those links that already have the crumb class. 2012-04-10 18:16:27 +12:00
Jeremy Bridson
54905b077b BUGFIX:fixed width of dropdowns in filter side menu. 2012-04-10 17:40:01 +12:00
Jeremy Bridson
df389716df BUGFIX: SSF-124 - fixed width of column and positioning of show children arrow in ie7 2012-04-10 16:28:25 +12:00
Jeremy Bridson
4a3a6d5128 BUGFIX: SSF-124 - removed styles to fix color of th text. 2012-04-10 13:36:15 +12:00
Julian Seidenberg
9183890148 BUGFIX: SSF-168 fixing Webkit rendering issue that would display elements outside of an absolute positioned layout, breaking the layout in the reportadmin section. The fix is to hide to container that breaks the layout and use js to move the required elements out of the container when the CMS needs them. 2012-04-10 12:41:47 +12:00
Jeremy Bridson
e0b429491c ENHANCEMENT: SSF-124 - styled the pages list view. 2012-04-10 12:22:11 +12:00
Jeremy Bridson
1176d8d100 BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images 2012-04-10 12:20:13 +12:00
Jeremy Bridson
cb09ff7ba8 BUGFIX:removed reference to compass generated sprite and added direct reference to the png file. 2012-04-10 12:20:12 +12:00
Julian Seidenberg
c57d8a8ed4 MINOR: regenerating compass icons 2012-04-10 12:11:01 +12:00
Ingo Schommer
cf304044b8 Merge branch 'master' into integration 2012-04-10 00:39:29 +02:00