Commit Graph

577 Commits

Author SHA1 Message Date
Ingo Schommer
4cc82e906b Merge remote-tracking branch 'origin/3.0' 2012-08-20 10:13:55 +02:00
Sam Minnée
9adf0a4155 Merge pull request #703 from patbolo/fix/7742_2
FIX 7742
2012-08-16 18:05:10 -07:00
Ingo Schommer
fb7008627c Merge remote-tracking branch 'origin/3.0' 2012-08-09 10:47:44 +02:00
Damian Mooyman
a80daef2c6 FIXED: Issue where urls with querystring arguments would not be properly concatenated with additional query parameters during ajax requests. The behaviour would not normally be noted except when using a module (such as Translatable) that adds parameters to data-url fields in forms. 2012-08-09 10:18:33 +12:00
jean
34812971cc FIX 7742 Decode the URI encoded attribute before displaying it as the value for the tree dropdown 2012-08-07 09:20:13 +12:00
Ingo Schommer
b135218789 BUG Detect JS lang by <body>, and force init 2012-08-06 10:59:18 +02:00
Will Rossiter
7162d65258 Merge pull request #691 from dd1079/patch-1
Update javascript/lang/de_DE.js
2012-08-04 21:53:33 -07:00
jean
fb9e997b5e BUGFIX Use tree/xxx instead of tree?ID=xxx when fetching subtrees for TreeDropdownField. Fix #7730 2012-08-04 10:53:12 +12:00
dd1079
fa671062f8 Update javascript/lang/de_DE.js
Adding German language strings
2012-08-01 19:17:04 +03:00
Hamish Friedlander
3efdb5c981 Merge in changes from 3.0.1 final 2012-07-31 16:51:10 +12:00
Naomi Guyer
55ec92d40e ENHANCEMENT: Maori language javascript 2012-07-26 17:18: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
unclecheese
b57f2bd022 BUGFIX: UploadField does not work on DataObjects 2012-07-19 22:11:38 -03:00
Ingo Schommer
3ae8b0b665 Merge remote-tracking branch 'origin/3.0' 2012-07-18 15:00:06 +02:00
Ingo Schommer
1a91431d39 Query param searches for GridFieldAddExistingAutocompleter
Fixes issues with query construction in JS when the search URL
already contains GET paramters (e.g. when using the 'translatable'
module).
2012-07-17 13:26:33 +02:00
Ingo Schommer
a033ddf773 More init checks in HtmlEditorField.js 2012-07-16 23:33:22 +02:00
Ingo Schommer
b4ecc308a1 BUG Enforce startClosed prop on ToggleCompositeField 2012-07-15 20:53:44 +02:00
Mateusz Uzdowski
c785f3c492 BUG Adjust the tree construction and triggers to work with IE.
After Hamish's suggestion. Entwine onchange would not get executed in
IE8 at all, which would have the effect of the displyed dropdown
selection not being set.

Change to onadd also mandates the changes to onadd on other parts of the
tree component - otherwise the change event can trigger before the
tree elements are added to the DOM.
2012-07-12 16:44:21 +12:00
Mateusz Uzdowski
7c41ff22ab BUG Change all shortcodes into the new, comma separated, format.
Space delimiter is often confused by browsers, and encoded as %20 which
breaks the shortcode system. Change to comma delimitation has already
been implemented, this is a followup cleanup.

Ref http://open.silverstripe.org/ticket/7337
2012-07-12 16:44:21 +12:00
Mateusz Uzdowski
29a039929b Refactor the linking functionality for the TinyMCE popup.
Functionality that affects the values in the form better fits in
updateFromEditor function, where we expect the form to be modified.
Redraw should only affect visibility parameters.

Also added a more robust reset code, so we can always expect to get at
least a clean form, and re-added missing "target" checkbox.
2012-07-12 16:44:15 +12:00
Mateusz Uzdowski
eef67b6f87 API Clean up the return values for getCurrentLink
Returning a link type "internal" in the situation when no link has been
detected is confusing and makes it hard to know downstream if the link
was detected or not. Switched that to null.

Also added target option to file downloads, as we don't currently have a
mechanism to default this field to "yes" for files.
2012-07-12 09:13:32 +12:00
Jeremy Shipman
606d86a926 BUGFIX: DateField javascript fails when it is included in a GroupField 2012-06-25 20:32:53 +12:00
Sam Minnee
7685a0b59d Merge branch '3.0' 2012-06-25 10:01:34 +12: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
Sam Minnee
4aa4cd2c28 Merge branch '3.0'
Conflicts:
	admin/scss/ie7.scss
2012-06-22 17:20:07 +12:00
Naomi Guyer
1197a2fa14 BUGFIX: Media styles in IE9 (fixes #4 of #7497)
Changed media conditional as was evaluating as false in IE9
2012-06-21 16:50:14 +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
Hamish Friedlander
ef11a0dc78 BUGFIX: Fix trac ticket 7081
IE contentEditable carets and selection boxes show on top of any elements, interfering with HtmlEditorFields dialogs.
This fixes that by storing the selection prior to opening the dialog, then unselecting everything. On dialog close the
selection is restored
2012-06-20 15:27:56 +12:00
Hamish Friedlander
8ae4597a85 BUGFIX: TreeDropdownField wasnt closing, because the closePanel method is in an entwine namespace 2012-06-15 01:19:30 +02:00
Ingo Schommer
40cef4d584 MINOR Fixed event naming 2012-06-15 01:19:21 +02:00
Hamish Friedlander
1085fd29be BUGFIX: TinyMCE isnt unbinding formatselect or styleselect which leaks memory. We should really fix TinyMCE, but lets just brute-force it for now. 2012-06-15 01:19:19 +02:00
Hamish Friedlander
e58929d52c ENHANCEMENT: Make ToggleCompositeField use new entwine features 2012-06-15 01:19:18 +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
6c1f7997a4 ENHANCEMENT HTML titles in TreeDropdownField
HTML in tree nodes is already used to render page icons via SiteTree->TreeTitle.
In order to select the initial value correctly via HTML5 data attributes,
we need to encode any HTML values.
2012-06-13 16:04:14 +02: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
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
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
2ecd8a0cc4 MINOR Hiding "insert media" tabs when editing an image (wrong selector) 2012-06-08 18:40:34 +02: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
Ingo Schommer
617fe3c0ac Merge pull request #508 from sminnee/fix-change-password
Fix JS bug that was preventing passwords from being changed
2012-06-07 03:39:40 -07:00
Ingo Schommer
22de5c6597 MINOR Performance improvement and removal of duplicate code in jQuery.ondemand 2012-06-06 11:50:17 +02:00
Sam Minnee
da915a4889 BUGFIX: Fix JS bug that was preventing passwords from being changed in 'hidden by default' ConfirmedPasswordField instances. 2012-06-06 17:53:16 +12:00
Sean Harvey
0235a8c0c7 BUGFIX Partially reverting 28e43bdc which broke media insertion 2012-05-28 22:27:20 +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
Simon Welsh
31db970fb2 BUGFIX Set Editor if getEditor() is null rather than onmatch 2012-05-24 23:39:53 +02:00
Simon Welsh
bb29ff3611 FEATURE: Allow adding media to the CMS using oEmbed 2012-05-24 17:00:21 +12:00
Mateusz Uzdowski
8d469b66c8 BUGFIX: add missing onunmatches 2012-05-23 16:24:15 +12:00
Mateusz Uzdowski
bbb08df176 BUGFIX: cater for elements without href 2012-05-23 15:53:46 +12:00
Ingo Schommer
dd924f1246 BUGFIX Removed duplicate 'change' event trigger from TreeDropdownField.js (fixes #7329) 2012-05-20 23:15:28 +02:00
Ingo Schommer
bb72037de1 MINOR Don't double-trigger 'stop' event in UploadField.js (regression from d642eee2, fixes #7355) 2012-05-20 13:36:11 +02:00
Ingo Schommer
0cbb1b11e3 MINOR Fixed async entwine redraw calls in HtmlEditorField.js (regression from fdebedd1) 2012-05-20 13:35:12 +02:00
Ingo Schommer
7ab47b6493 MINOR Moved redundant toggleLooks() logic in HtmlEditorField.js to existing redraw() logic 2012-05-20 13:34:18 +02:00
Ingo Schommer
02505247d5 MINOR Indentation 2012-05-20 12:22:55 +02:00
Mateusz Uzdowski
97e00a35dd BUGFIX: add missing onunmatches causing exceptions in entwine 2012-05-18 14:27:09 +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
f0c61c20df BUGFIX: GridField filter
Make sure the new class is used consistently, and has the correct css
applied to it.
2012-05-17 11:15:53 +12:00
Ingo Schommer
dfa01c8ce1 Merge pull request #446 from adrexia/sapphire
---

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 wouldnt appear in generated css

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

Conflicts:
	css/GridField.css
2012-05-16 12:29:13 +02:00
Naomi Guyer
b2fc117983 BUGFIX: Re-add status for successful upload 2012-05-16 18:10:12 +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
Ingo Schommer
f01ca808db MINOR More robust path concat in HtmlEditorField.js (means it doesn't break with translatable module enabled) 2012-05-16 00:10:08 +02:00
Ingo Schommer
ce3b2fc3af Merge pull request #440 from Zauberfisch/sapphire
---

fixed missing cancel icon in UploadField cancel button
2012-05-14 15:15:51 +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
Zauberfisch
dc649c1990 MINOR: removed wrong icon 2012-05-13 21:11:53 +02:00
Zauberfisch
ad78d9a3d1 MINOR: fixed missing cancel icon 2012-05-13 21:05:30 +02:00
Andrew Short
dc1ccfe251 MINOR: Made the JS class used for gridfield detail actions apply to .action-detail rather than specific actions. 2012-05-12 18:49:56 +10:00
Ingo Schommer
61232ba848 MINOR Localization of new UploadField strings 2012-05-12 09:53:53 +02:00
Ingo Schommer
3f19f4cec0 MINOR Removing special case handling for chosen.js from UploadField, using generic change listener (incl. some iframe scoping fixes) 2012-05-11 12:40:57 +02:00
Ingo Schommer
8e7d221ce2 BUGFIX Trigger change event on hidden input in TreeDrodpownField.js 2012-05-11 12:40:17 +02:00
Naomi Guyer
9844328a06 BUGFIX: Fix error notification on files (fixes: 7295)
Add title text to all status messages
Make room for the error message details by expanding the name area in
the file details
Fix up changes status to work with selects
2012-05-11 14:43:17 +12:00
Naomi Guyer
f2411cf13a BUGFIX: Uploads save button not visible (Trac #7294)
Fixed the calculation of height for the upload (non AssetUploads) area
so that the save button would show. Took off the min-height, as this
will cause UI issues when there are multiple files open for editing.
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
8e1aae35de Merge pull request #428 from silverstripe-scienceninjas/datefield-calendar
BUGFIX: DateField with calender do not format the date correctly after it's picked from the calendar.
2012-05-10 02:17:52 -07: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
Stig Lindqvist
a5355a7f39 BUGFIX: DateField with calender do not format the date correctly after it's picked from the calendar. 2012-05-10 17:33:57 +12:00
Ingo Schommer
f546ab2a70 Merge pull request #417 from halkyon/sapphire
---

Ensure the lazy loaded form inside htmleditorfield-dialog is redrawn when lazy loaded. This fixes the initial state for the insert link dialog form.

Also ensure the link form uses "internal" as the default, so the initial state doesnt show all fields, just those associated with the first radio option "internal".

This also fixes http://open.silverstripe.org/ticket/7273.
2012-05-09 11:26:01 +02:00
Ingo Schommer
82db28811d BUGFIX Show progress indicator when uploads are added to AssetUploadField, to ensure that failed uploads (e.g. exceeding max filesize) can actually show their error message to the user 2012-05-09 11:19:06 +02: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
Sean Harvey
fdebedd103 BUGFIX Ensure the form inside htmleditorfield-dialog element is redrawn when the form is lazy loaded by AJAX. 2012-05-09 17:11:59 +12:00
Normann Lou
cd13c0e178 BUGFIX: updating the value of a tree dropdown field, its title is not updated accordingly if using TreeTitle as the drropdown item title 2012-05-07 15:43:25 +12:00
Naomi Guyer
61c18c5dbc BUGFIXES: Fixes #7003 2012-04-30 12:25:35 +12:00
Ingo Schommer
8489ff37db Merge pull request #359 from silverstripe-big-o/sapphire
---

When open an image form loaded from TinyMCE Content, change the looks of the popup, such as popup heading (change from "Insert Image" to "Update Image"), action button label (change from "Insert" to "Update"), hiding the cancelling button on the top right corner which still needs to show when in inserting mode

Conflicts:
	lang/en.yml
2012-04-27 10:15:16 +02: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
Mateusz Uzdowski
47e3052aaa ENHANCEMENT: allow folder selection when attaching files from the CMS
http://open.silverstripe.org/ticket/7046
UploadField would default to one folder only, and wouldn't allow asset
tree traversal. HtmlEditorField MediaForm has this capability, so added
it here in a similar fashion via TreeDropdownField.
2012-04-23 12:08:16 +12:00
Normann Lou
ca38b25014 BUGFIX: add CloseButton back, only hidde it when editing an image that loaded from content area.
ENHANEMENT: remove call of toogleLooks() from redraw(), only call toggleLooks() when needed.
MINOR: code minimazing / code convention.
2012-04-20 18:04:50 +12:00
Normann Lou
e1372b3794 ENHANCEMENT: toggle header and action label for image dialog popups (from content TinyMCE image icon) 2012-04-20 18:04:49 +12:00
Ingo Schommer
14895a2056 BUGFIX Only call TinyMCE.init() once per window load (actual editor creation happens through new tinymce.Editor() 2012-04-18 17:38:24 +02:00
Ingo Schommer
f26951c63d MINOR Don't try to remove editor containers before they exist 2012-04-18 16:54:20 +02:00
Ingo Schommer
7f62ad0f3e Merge branch 'master' into 7094-combine-tree-edit-view 2012-04-18 14:19:55 +02:00
Naomi Guyer
180a305dd1 MINOR: Whitespace cleanup ticket 6943
Make sure tabs are used consistently.
2012-04-18 10:51:53 +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
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
Sean Harvey
5bb31c4e81 BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar
when clicking a link type
2012-04-17 15:47:40 +12: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
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
5ea080a585 Merge pull request #296 from halkyon/old_js_validation_remnants
MINOR Removing old client side validation remains - NumericField.js
2012-04-11 06:15:25 -07:00
Stig Lindqvist
5750eb02b1 Merge pull request #295 from halkyon/redirectorpage_changes
MINOR Removed RedirectorPage.js (has been moved to cms module)
2012-04-11 04:10:23 -07:00
Sean Harvey
4d97e8867b MINOR Removed useless Security_login.js file which doesn't have any
content and isn't used anywhere.
2012-04-11 16:03:57 +12:00
Sean Harvey
3e307e00fe MINOR Removing old remains of NumericField.js validation which was
removed in 9f3344b355
2012-04-11 15:55:07 +12:00