Commit Graph

261 Commits

Author SHA1 Message Date
Will Rossiter
80c69abdb8 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:13 +13:00
Sam Minnee
b10f8a908d BUGFIX: Fixed notice-level errors when checking permissions of pages that don't exist anywhere (from r93166)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96755 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Geoff Munn
3d92026def BUGFIX: Resized images which return null or false are now ignored
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:06 +13:00
Mark Stephens
e22c843122 ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Sean Harvey
9c55927a17 API CHANGE Removed ComponentSet::removeByFilter() since it's not flexible enough and fixed calls to this from HtmlEditorField::saveInto() to use custom code instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:53 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Will Rossiter
137a67845c FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:36 +13:00
Ingo Schommer
8bb3797f04 MINOR BUGFIX Disabling security token in HtmlEditorField?->FlashForm?(), its not passed in by the ajax request (merged from r91392)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:35 +13:00
Ingo Schommer
eeed9ce189 BUGFIX Don't call LinkTracking/ImageTracking relationships in HTMLEditorField->saveInto() unless we have internal links/files to save. This helps to improve CMS saving times on records with many HTMLEditorField instances
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114139 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:23:51 +00:00
Sam Minnee
61bb2fe4a4 BUGFIX Removing "typography" class from HTMLEditorField container (should just apply to the contained <iframe>) (fixes #5949) (from r110809)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:33:28 +00:00
Ingo Schommer
6351b16ab9 BUGFIX Added Locale hidden field to HTMLEditorField->LinkForm() in order to show correct context in "page on the site" dropdown (fixes #5743) (from r107390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112573 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:25:51 +00:00
Sam Minnee
e09cc66e94 BUGFIX: Fixed issues with broekn link tracking (from r101138)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-12 21:42:25 +00:00
Sam Minnee
5f0fcc58ec BUGFIX HTMLEditorField->saveInto() can now find images with urlencoded information for resample (e.g. spaces in filenames) (from r100985)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 04:29:00 +00:00
Ingo Schommer
c81a788ba7 ENHANCEMENT Added 'updateImageForm', 'updateFlashForm', 'updateLinkForm' hooks to HtmlEditorField (the imageform hook was necessary to make the 'pixlr' module work) (see #3938) (from r100753)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105642 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 04:56:02 +00:00
Ingo Schommer
73ba193ad6 ENHANCEMENT: Select the uploaded image after uploading by default. #4962 (from r97765)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:36:50 +00:00
Ingo Schommer
d294c0f755 BUGFIX: add custom search function, so the search catches also the Titles (search uses DataObject::get, which bypasses the getMenuTitle function) (from r97755)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:34:08 +00:00
Ingo Schommer
7654557068 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. (from r97489)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 21:54:41 +00:00
Ingo Schommer
1192b9ef2c BUGFIX: Resized images which return null or false are now ignored (from r96754)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 02:45:35 +00:00
Mark Stephens
69818fad17 ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-29 23:29:31 +00:00
Will Rossiter
05832a1dee API CHANGE: removed deprecated removeByFilter() function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93670 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 22:18:59 +00:00
Ingo Schommer
fba5841d9d MINOR Updated SWFUpload library to 2.5.0 alpha (see r91302)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92573 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:33:59 +00:00
Ingo Schommer
76d2886a70 MINOR Moved tiny_mce_imrpovements.js from jsparty/ to sapphire/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92547 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:32:16 +00:00
Ingo Schommer
beb4efef09 ENHANCEMENT Disabling form validation for right-panel forms in CMS in HtmlEditorField. None of the fields have validation attached to them at the moment, so the generic validation output is unnecessary bloat.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:31:11 +00:00
Ingo Schommer
a11db29672 MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:29:59 +00:00
Ingo Schommer
70deaa44e4 ENHANCEMENT Changed markup of right panel forms in HtmlEditorField, titlebars and close buttons are now created through JavaScript. Also wrapped all fields in a container to make them easy to scroll in the panel
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92482 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:22:44 +00:00
Will Rossiter
0b3cb11262 BUGFIX: disabled swfupload in IE versions. MINOR: merged js order changes from r91542 and r91541
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-13 03:04:38 +00:00
Ingo Schommer
2daf84910c BUGFIX Disabling security token in HtmlEditorField->FlashForm(), its not passed in by the ajax request
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-12 02:53:49 +00:00
Will Rossiter
1a4cfc6c20 BUGFIX: updated paths to swfupload. MINOR: cleaned up structure around image upload section in the site content box
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-11 22:47:11 +00:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 21:46:13 +00:00
Andrew Short
5adfc28a43 BUGFIX: Reset broken file & link flags in HtmlEditorField->saveInto() before determining if a record contains broken links.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88989 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 00:02:04 +00:00
Andrew Short
26ece45bb0 BUGFIX: Stopped HtmlEditorField->saveInto() from dying when encountering a link that cannot be made relative.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-13 01:45:01 +00:00
Andrew Short
9b4d9993a4 FEATURE: Added SS_HTMLValue to provide a simple wrapper around DOMDocument to allow the manipulation of HTML snippets.
FEATURE: Re-instated broken link highlighting by manually checking all shortcodes in HtmlEditorField->Field(), and adding a class to broken ones.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88510 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:27 +00:00
Andrew Short
1859ba502b FEATURE: Updated HtmlEditorField to use DOMDocument to more reliably parse image tracking and shortcode link tracking data.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88492 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:13 +00:00
Andrew Short
73b0ea643f ENHANCEMENT #3279: Updated the link inserter to insert a shortcode rather than a plain HTML link.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:07:12 +00:00
Andrew Short
fd7b322ed4 MINOR: Removed un-used HtmlEditorField button generation code that has been replaced with HtmlEditorConfig.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:06:55 +00:00
Sam Minnee
66b25f1e62 BUGFIX: Fixed CSRF warning in image form after selecting a folder.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80237 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 01:17:20 +00:00
Sean Harvey
c5ef811b94 MINOR Add folder/upload links weren't being hidden properly in IE - this is for a feature that is disabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79369 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-16 22:46:06 +00:00
Sean Harvey
0a89009b73 MINOR Removed $rows variable from HtmlEditorField - this gets inherited from TextareaField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 05:17:48 +00:00
Sean Harvey
9c1ef3cd15 ENHANCEMENT Added caption field to HtmlEditorField for settting caption text (optional) on an image
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 05:02:00 +00:00
Sean Harvey
362931b6f2 BUGFIX Renamed thumb strip field "Image" to "FolderImages" to avoid ID collisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 03:18:32 +00:00
Sam Minnee
8cf4986397 BUGFIX #3916 bribaudo: Don't throw an error on HTMLEditorField save if a link is empty.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-08 00:34:58 +00:00
Sean Harvey
2fc1771f93 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 00:19:47 +00:00
Sean Harvey
b1018f5864 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:26:47 +00:00
Sean Harvey
0a5f4de51c Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:12:47 +00:00
Sean Harvey
fdeacb4d07 Reverted r69557
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:18:05 +00:00
Sean Harvey
35c8666c4a Merged in r75816
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:06:20 +00:00
Sean Harvey
8471d1fc87 MINOR Updated titles for alt and title attribute value fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75697 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 01:29:29 +00:00
Sean Harvey
30481b5199 ENHANCEMENT Added a new "TitleText" field to ImageForm allowing a user to select which title attribute should appear on their images inserted into the content
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 00:15:41 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 00:07:39 +00:00
Andrew O'Neil
635e2c3df6 Merged from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-04 03:44:11 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-01 23:49:53 +00:00
Ingo Schommer
b7d394008e MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:35:50 +00:00
Ingo Schommer
0747fc6d52 MINOR merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-07 23:00:54 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:19:48 +00:00
Saophalkun Ponlu
a32a79e816 MINOR: fixed some alignments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 03:06:57 +00:00
Saophalkun Ponlu
11d0491abf IMPROVEMENT: image alignment options. ticket #1877
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-19 13:36:59 +00:00
Sam Minnee
96c5be8252 Updating queries to be more DB agnostic
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-24 09:31:14 +00:00
Sam Minnee
93438e0be2 API CHANGE: Adding double quotes to all table and field references (a work in progress)
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 23:28:16 +00:00
Will Rossiter
8052c5dce4 Merged pre-2.3-oct08 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-17 22:59:17 +00:00
Sean Harvey
a25320a99c ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55:23 +00:00
Sam Minnee
73a075a491 FEATURE #594: Added javascript-on-demand support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:33 +00:00
Sam Minnee
020a92eda8 BUGFIX #2992: Fixed T_PAAMAYIM_NEKUDOTAYIM error in RequestHandler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 01:59:27 +00:00
Sean Harvey
dc8876223e MINOR Code formatting on HtmlEditorField functions
MINOR phpDoc of HtmlEditorField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 04:12:54 +00:00
Sam Minnee
cd699e3d89 API CHANGE #2857 - Renamed RequestHandlingData to RequestHandler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64953 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-30 22:03:21 +00:00
Sam Minnee
f5e636ac43 Changed default # of rows on HTMLEditorField from 15 to 30
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 02:39:09 +00:00
Sean Harvey
68326a5eac BUGFIX Avoid ajax evaluator errors by checking if $resizedImage actually exists before calling relativePath() on it
MINOR Code formatting cleanup



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-28 23:20:14 +00:00
Sam Minnee
f7a3e95851 Added LinkText field to link inserter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64759 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:12:22 +00:00
Sam Minnee
f8c1f84a0d #2397 - Fixed HTMLEditorField style dropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-02 22:15:37 +00:00
Ingo Schommer
fabf01d076 ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-28 13:12:20 +00:00
Sean Harvey
2b49d18350 BUGFIX HtmlEditorField_Toolbar->LinkForm() for editing a link inside an HtmlEditorField instance was showing page titles using the "Title"
field, changed to "MenuTitle" to be consistent with the main CMS site tree and to avoid confusion 



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 04:57:55 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Ingo Schommer
4735f91ab8 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:39:14 +00:00
Ingo Schommer
935ee6d1bc (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:35:11 +00:00
Sam Minnee
7a9dd25b9c BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:29:20 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sam Minnee
b8262b6d48 Merged revisions 50783 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50783 | sminnee | 2008-03-10 16:02:12 +1300 (Mon, 10 Mar 2008) | 1 line
  
  Added 'anchor' option to link inserter
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 03:29:30 +00:00
Sam Minnee
6c5ee3ceb9 Merged revisions 50214 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50214 | sminnee | 2008-02-26 16:12:22 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  A bit of a hack to fix double-escaped URLs in the CMS.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50865 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:36 +00:00
Ingo Schommer
fc3a2cc298 documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-04 01:31:37 +00:00
Ingo Schommer
a1451739a4 Merged revisions 48168 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48168 | ischommer | 2008-01-17 17:20:45 +1300 (Thu, 17 Jan 2008) | 1 line
  
  renamed escapeFlagForField() to escapeTypeForField(), updated documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:23:31 +00:00
Ingo Schommer
0b5ab1fc7b Merged revisions 48164 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48164 | ischommer | 2008-01-17 17:05:49 +1300 (Thu, 17 Jan 2008) | 2 lines
  
  Deprecated use of DBField 'Text' for saving HTML-Content (added check in HTMLEditorField->saveInto())
  Added ViewableData->escapeFlagForField() to determine if the record-field needs escaping (currently only 'xml' supported)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 04:22:13 +00:00
Sam Minnee
fea4042c3c rbarreiros: #1918 Translate newsletter and other strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Sam Minnee
9510bad3e0 Allow insertion of <img> tags that refer to external domains
Add alt= to any images that don't have alt tags

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 02:42:23 +00:00
Sam Minnee
41a11b277e Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:37:50 +00:00
Andrew O'Neil
95180448d0 Merged revisions 47155 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1asfonz

........
  r47155 | sminnee | 2007-12-17 11:20:21 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 00:53:54 +00:00
Andrew O'Neil
4dda814a11 Remove right on it's own, css hack only works in firefox (merged from branches/2.2.0@45907, r45475)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:32:30 +00:00
Andrew O'Neil
8903fb8eaf Add on its own alignment for images (merged from branches/2.2.0@45907, r45472)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:32:12 +00:00
Andrew O'Neil
ce30a13130 #1755 - Can't upload any files using the 'Upload' tab on a folder in Files and Images section (merged from branches/2.2.0, r44824)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44900 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:31:57 +00:00
Andrew O'Neil
29c16511fe SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:31:22 +00:00
Andrew O'Neil
9802f16afc Revert r44795 (merged from branches/2.2.0, r44812)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:30:25 +00:00
Andrew O'Neil
8acb9a0f48 Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:30:08 +00:00
Andrew O'Neil
ed69b15fd6 #1484 - Cannot upload files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 23:01:17 +00:00
Andrew O'Neil
34aa13ccbf #1606 - Check add folder & upload-functionality in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44594 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 22:30:01 +00:00
Andrew O'Neil
87010bc87c Clean up insert flash pane
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-08 02:08:50 +00:00
Will Rossiter
5d74baf7c8 more fixs to that menu
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 22:59:28 +00:00
Andrew O'Neil
90aa22e993 #1628 - Resizing images seems to break images, and doesn't display on front end
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 21:39:57 +00:00
Sean Harvey
893aa7a0d0 Fixes to flash popup - removed float which broke other sections
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44458 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:28:21 +00:00
Sean Harvey
d5d196c347 Removed cancel button for link form - this is closed using the x icon now
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44455 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 05:57:56 +00:00
Sean Harvey
babd4be599 Flash and image now consistent (e.g. dimensions fields)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 05:50:13 +00:00
Andrew O'Neil
201cc7b47e Added close button on right panel
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44451 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 05:26:16 +00:00
Romain Louis
fc531da28b Readonly work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 04:17:58 +00:00
Will Rossiter
a53684bbee fixed the treedropdown.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:19:11 +00:00
Andrew O'Neil
5b08367d5b #1607 - Make image editor findable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 01:33:24 +00:00
Romain Louis
8b1ef652d7 Readonly HTML code modification to coordinate the style of the fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44377 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 21:01:37 +00:00
Andrew O'Neil
1af11b07d2 Move flash, image and link forms to right
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 05:39:14 +00:00
Ingo Schommer
393caf4287 FEATURE made sapphire i18n-capable
FEATURE a little bit of german translation

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 02:47:45 +00:00
Ingo Schommer
4a0b7e1d6d elofgren: BUGFIX: Edge case fix to prevent execution timeout if a page has 50 identical broken links by only highlighting them once.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-15 00:05:49 +00:00
Ingo Schommer
ff2f8fa7f4 elofgren: Remove padding:0; margin:0; accidentally committed in r36714 (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:38:38 +00:00
Ingo Schommer
1d07b6b254 elofgren: Change width of 'HtmlEditorField? textareas' from 100% to 97% to prevent horizontal scrollbars at 1024x768 using IE7. (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41773 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:37:48 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00