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
7,538 Commits 31 Branches 527 Tags 162 MiB
de7167b23f
Commit Graph

401 Commits

Author SHA1 Message Date
Ingo Schommer
f3fe62e740 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
 2012-02-28 00:35:17 +01:00
Ingo Schommer
832d410303 MINOR Merge errors 2012-02-28 00:34:15 +01:00
Ingo Schommer
bcc73de85e Merge branch '106-add-edit-records-rc' 
Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php
 2012-02-27 23:58:10 +01:00
Ingo Schommer
f1775b5f84 MINOR Backlinks in CMS edit form template, first defined in GridFieldPopupForms 2012-02-27 23:52:49 +01:00
Ingo Schommer
e95a2cf40c MINOR Pad fields in base CMS template when no tabs exist, to avoid requiring a template overload for this simple view setting 2012-02-27 23:52:48 +01:00
Ingo Schommer
3b53ed1937 MINOR Moved some CMS-specific template config into GridFieldPopupForms, to make the external API easier to use, and make specific configs less dependent on the instanciation context, and more tuned to the actual execution controller context 2012-02-27 23:52:48 +01:00
Ingo Schommer
ba0d1c60cb MINOR Don't require controller on instanciation of GridFieldPopupForms, as it can't be reliably determined e.g. during a getCMSFields() call. Should use existing FormField/Form API to retrieve controller when its required. 
MINOR Renamed GridFieldPopupForms->popupFormName to $name to make it clearer that its the component name (which is optional now).
 2012-02-27 23:52:48 +01:00
Julian Seidenberg
550f75408e ENHANCEMENT: File and Image CMSFields styling 2012-02-27 23:52:40 +01:00
Normann Lou
f7030c56a5 BUGFIX: Page tree node reflects any changes made to page (title, publication status) in its edit view, implemented on the level of cms-content dom element, rather than cms-edit-form level 2012-02-27 12:47:36 +13:00
Normann Lou
587d195647 BUGFIX: Page tree node reflects any changes made to page (title, publication status) in its edit view 2012-02-24 16:46:46 +13:00
Sam Minnée
61c810a79a Merge pull request #200 from simonwelsh/patch-1 
BUGFIX Fallback to sapphire/silverstripe_version if there is no CMS (fra...
 2012-02-23 19:14:09 -08:00
Ingo Schommer
312850aee9 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
 2012-02-24 00:32:30 +01:00
Ingo Schommer
8fcb40cdf0 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:38:29 +01:00
Ingo Schommer
58f5b870a4 MINOR Added more fugue sprites 2012-02-23 23:29:59 +01:00
Ingo Schommer
30989b598d ENHANCEMENT Added path manipulation lib from jQuery.mobile, using it to ensure all URLs are made absolute (to fix IE issues) 2012-02-23 23:29:59 +01:00
Ingo Schommer
9465df6fb4 MINOR Less specific button selectors in CMS JavaScript to cover <button> tags as well 2012-02-23 23:29:58 +01:00
Ingo Schommer
8b6ef6599e MINOR Updating usage of jQuery.data() to confirm with API changes in 1.6 (camelcased names) 2012-02-23 23:29:58 +01:00
Ingo Schommer
bb42afe32f MINOR Removed inline CSS styles 2012-02-23 23:29:58 +01:00
Ingo Schommer
39dc5ae301 MINOR Load breadcrumb links via ajax into panels in CMS 2012-02-23 23:29:57 +01:00
Ingo Schommer
3c29a9268c MINOR AssetUploadField styling 2012-02-23 18:39:42 +01:00
Ingo Schommer
6e6fdaf79e MINOR Applying default padding to edit form template rather than the tabs it contains, which allows a more standardised UI even when no tabs are present in the CMS content area (e.g. in "add files") 2012-02-23 18:39:42 +01:00
Simon Welsh
df82dac334 BUGFIX Fallback to sapphire/silverstripe_version if there is no CMS (framework only) 2012-02-23 20:46:34 +13:00
Felipe Skroski
1ebd83df1a ENHANCEMENT: styled the header of the datagrid (SSF-106) 2012-02-22 16:29:37 +13:00
Ingo Schommer
3cad19a97e MINOR JS formatting 2012-02-21 17:46:58 +01:00
Stig Lindqvist
82748a0873 MINOR JS functionality on intercepting injected filtering of gridfields in LeftAndMain inherited Controllers. 2012-02-21 17:09:09 +13:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
Ingo Schommer
743a26be05 MINOR Reverted conditional redraw of preview panel introduced in a1e9c0f4, too unstable 2012-02-17 15:58:31 +01:00
Ingo Schommer
bb7c128025 MINOR JS syntax errors 2012-02-17 15:58:31 +01:00
Ingo Schommer
fd847dda4d MINOR Customized jQuery.layout.js to support fetching layout type through HTML5, for easier readability and avoiding the $.metadata dependency (which fails to parse HTML5 data attrs correctly) 2012-02-17 13:35:54 +01:00
Ingo Schommer
4e99af7047 MINOR Using HTML5 data attributes for denoting layout in templates 2012-02-17 13:35:54 +01:00
Ingo Schommer
ac56fef8b4 MINOR Removed jQuery.metadata usage in CMS, use jQuery.data() and HTML5 data attributes instead. Also fixes errors where jQuery.metadata tries to eval() HTML5 data attrs, which isn't always applicable 2012-02-17 13:35:53 +01:00
Ingo Schommer
a3d8185d8e MINOR Click behaviour for special "panel loading" links in the CMS 2012-02-17 13:33:38 +01:00
Ingo Schommer
ca9b78f255 MINOR Re-apply custom jstree onselect behaviour on partial form refreshes 2012-02-17 13:33:38 +01:00
jbridson
76ddb3c53b BUGFIX:fixed various styling issues in cms (raised in SSF-188) 2012-02-17 17:00:29 +13:00
jbridson
18131ae64a MINOR:fixed bug with tabs - created more specific styling for the page view tabs so that they do not affect the tabs sitewide. 2012-02-17 12:40:19 +13:00
Ingo Schommer
5911abc0f6 API CHANGE Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias. 
API CHANGE Removed several unsed JavaScript globals: sprintf(), Number.prototype.CURRENCIES, Number.prototype.toCurrency(), String.prototype.ucfirst(), jQuery.fn.clearFields(), jQuery.fn.clearInputs()
MINOR Removed prototype_improvements.js and jquery_improvements.js files, now contained in individual component code (or removed altogether)
 2012-02-16 12:27:47 +01:00
Ingo Schommer
0e3e2904a4 MINOR Redraw the whole layout on form submit, instead of relying on .cms-content onmatch() which doesn't get fired on partial refreshes (e.g. in CMSPageEditController) 2012-02-16 12:17:03 +01:00
Ingo Schommer
d41f37f771 MINOR Hiding collapsed panel views by CSS to avoid FOUC, and initialising component without triggering events to avoid redrawing the whole CMS layout twice due to it listening for panel changes 2012-02-16 11:45:07 +01:00
Ingo Schommer
44d82209a9 MINOR Improved collapsed panel view by auto-hiding panel headers and avoid ugly cropped overflow effect 2012-02-15 14:26:46 +01:00
Ingo Schommer
51fe1fa1ca MINOR More events for LeftAndMain.Panel.js 2012-02-15 14:26:46 +01:00
Ingo Schommer
a1e9c0f41e ENHANCEMENT CMS panels restructured to use two new types of "tools" templates, fetched through LeftAndMain->Tools() and LeftAndMain->EditFormTools(). Requires less overloading of template markup. 2012-02-15 14:26:45 +01:00
Ingo Schommer
92d513857c MINOR Changed $Left placeholder in CMS templates to $Tools, documented it 2012-02-15 14:26:45 +01:00
Ingo Schommer
060e110481 MINOR Allow expanding a collapsed panel by a click on the visible surface 2012-02-15 14:26:45 +01:00
Ingo Schommer
2acce7b632 MINOR Moved menu-specific panel logic in LeftAndMain.Menu.js to avoid weakening base library 2012-02-15 14:26:45 +01:00
Ingo Schommer
7a8e634d8f MINOR Reverted hiding of tab titles 2012-02-14 17:31:32 +01:00
Ingo Schommer
37dfbb6b7e ENHANCEMENT LeftAndMain->Breadcrumbs() 2012-02-14 17:31:32 +01:00
Ingo Schommer
42f3c542f8 MINOR Shorter SCSS $grid-* variables to promote wider usage (amended) 2012-02-14 17:31:23 +01:00
Ingo Schommer
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Ingo Schommer
a96429cba6 MINOR Removed unused "nullConverter" callback in TinyMCE CMS integration 2012-02-14 13:53:34 +01:00
Ingo Schommer
3866f561f5 ENHANCEMENT Using GridField for file selection in "insert image" dialog 
API CHANGE Combined HTMLEditorField_Toolbar->FlashForm() and ImageForm() into new MediaForm() to handle both file types
 2012-02-14 13:30:52 +01:00
Ingo Schommer
4437f9db4f MINOR Shorter SCSS $grid-* variables to promote wider usage 2012-02-14 11:18:58 +01:00
Cam Findlay
0a75a34af1 MINOR Styles for form help text 2012-02-14 08:59:31 +01:00
Ingo Schommer
f6748f5b56 MINOR Merge errors 2012-02-13 18:15:09 +01:00
jbridson
23e7aeeea4 MINOR Tree and content toolbar styling fixes (SSF-138, SSF-71) 2012-02-13 09:53:00 +01:00
Normann Lou
4bd526fbee MINOR Don't follow <a> tag's href if click on page-icon or drag-icon (SSF-109) 2012-02-13 09:52:59 +01:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard 
All sapphire but the lang directory
 2012-02-12 12:40:16 -08:00
Will Rossiter
649f4cef9c ENHANCEMENT: allow left column on LeftAndMain::getEditForm 2012-02-11 14:01:43 +13:00
Ingo Schommer
5bf79f8146 BUGFIX Removed tinymce-advcode plugin which breaks with new TinyMCE and newer browsers. Both the plugin and the underlying 'codepress' engine are unmaintained. Fall back to standard (non-highlighted) TinyMCE <textarea> editing (fixes #6779) 2012-02-11 01:08:04 +01:00
Anselm Christophersen
0fd8482be6 Button overflow contained to max 100% + outcommented instructions on how button styling can be increased for Webkit & IE9 
Last changes & comments
 2012-02-09 14:59:45 +01:00
Ingo Schommer
c2f201f6ca MINOR Fixed profile link (was broken due to admin/ => admin/pages redirect) 2012-02-08 15:34:41 +01:00
Ingo Schommer
55ddbd38bc ENHANCEMENT Replaced custom profile dialog JS with generic ssui-core.js functionality. Removed cookie state saving abilities for now, not a high priority to re-implement) 2012-02-08 15:34:40 +01:00
Felipe Skroski
f4c140bcf4 MINOR Cleaner tree icons 2012-02-03 15:27:33 +01:00
Normann Lou
80a08aab60 MINOR Collapsing filter breaks the main navigation (SSF-108) 2012-02-03 15:27:24 +01:00
Normann Lou
deee8a294a BUGFIX: SSF-107, Filter bar should be collapsed by default, this fix works with fix of cms repo commit eec833215dcaa7a4510f7b4724413a39160d1ad7 (see gist https://gist.github.com/1720221) 
MINOR: correct in-line document
 2012-02-03 15:27:24 +01:00
Felipe Skroski
586ae4ab6e MINOR GridField column header and sorting styles 2012-02-03 15:27:18 +01:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Ingo Schommer
041da993fa ENHANCEMENT Added generic 'small' form style 2012-02-03 00:46:49 +01:00
Ingo Schommer
d261f4406a API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:42:21 +01:00
Sam Minnee
2d898cab63 API CHANGE: Added GridFieldExporter, a GridField component that adds export functionality, and added it to the security admin. 2012-01-30 19:49:10 +13:00
Sam Minnee
24850954c1 BUGFIX: Fixed bug in sprintf syntax with GroupImportForm iframe 2012-01-30 19:25:27 +13:00
Stig Lindqvist
dc85fa09b9 MINOR SecurityAdmin::getEditForm should have same signature as LeftAndMain::getEditForm 2012-01-24 02:46:12 +01:00
Stig Lindqvist
ed889529b4 API CHANGE Added two predefined GridFieldConfigs and removal of unsused accessors 
- GridFieldConfig_ManyManyEditor for default relationship list managment
- GridFieldConfig_Base for basic list managment
 2012-01-24 02:46:12 +01:00
Stig Lindqvist
c396c2d2ae API CHANGE Security admin supports adding, removing and searching for members by relations via gridfield 
This contains some experimental API's when using GridFieldPopupForms on GridFieldPopupForms.

- GridFieldRelationAdd
- GridFieldRelationDelete
 2012-01-24 02:46:07 +01:00
Jeremy Thomerson
09bb6d404c Use corrected function name from silverstripe-cms project 
The CMS project had a function named "SiteTree::prepopuplate_permission_cache" which
should be "SiteTree::prepopulate_permission_cache".  Since another commit corrected
the function name in that project, this project needs to use the new name.
 2012-01-23 14:29:55 -05:00
Ingo Schommer
8ba585be27 MINOR Fixing button whitespace gaps and "interrupted" buttonsets 2012-01-23 10:23:49 +01:00
Wolf Vollprecht
0444d4ea16 ENHANCEMENT Buttonsets for CMS (fixes #6631), using new jQuery UI button() to style buttons in CMS, moved JavaScript to LeftAndMain.js as the button styles only apply with an .Actions container now 2012-01-23 09:35:07 +01:00
Ingo Schommer
d456e86cbd MINOR Name attribute for preview iframe (mainly to facilitate testing) 2012-01-22 18:28:33 +01:00
Ingo Schommer
e18698d541 MINOR Wrapping tree title in its own element (mainly to facilitate selectors during testing) 2012-01-22 18:27:57 +01:00
Ingo Schommer
a6cc7d8392 MINOR Enforce SiteTree::$allowed_children in tree drag'n'drop for VirtualPage originals 2012-01-14 13:07:13 +01:00
Sam Minnée
5ab38ae13b Merge pull request #156 from chillu/gridfield-assetadmin 
Gridfield assetadmin
 2012-01-09 13:08:29 -08:00
Ingo Schommer
a1c63a2912 MINOR Only setting style attributes in LeftAndMain panel handling if it was previously set 2012-01-09 21:21:41 +01:00
Ingo Schommer
f50e11bbfb MINOR Separating menu entries for "add file" and "edit file" 2012-01-09 21:17:56 +01:00
Ingo Schommer
a06300f0b4 ENHANCEMENT GridFieldItemEditView (and specific view and behaviour for usage in CMS) 2012-01-09 21:17:56 +01:00
Ingo Schommer
0caf1991cf MINOR Better failsafes for tree hints (allows move if hint for class is if not defined) 2012-01-09 13:20:02 +01:00
Ingo Schommer
ef514b924e MINOR Fixed SecurityAdmin styling 2012-01-09 10:09:40 +01:00
Ingo Schommer
aff72e766e MINOR Simpler field alignment of OptionsetField (and some specifics for member-profile-form) 2012-01-09 10:09:40 +01:00
Ingo Schommer
c6e1937021 MINOR Rotated labels for collapsed panels 2012-01-06 16:58:04 +01:00
Ingo Schommer
e7747b0240 ENHANCEMENT Saving panel collapse UI state in cookie 2012-01-06 16:58:00 +01:00
Ingo Schommer
a633326c3e ENHANCEMENT Allow Requirements::add_i18n_javascript() to return its files more optimised inclusion, using it in LeftAndMain 2012-01-06 15:34:29 +01:00
Ingo Schommer
fcc01a322b MINOR More spriting in CMS styles 2012-01-06 11:59:14 +01:00
Ingo Schommer
850ea4cd7b MINOR Don't combine CMS-related CSS files in LeftAndMain, as it breaks relative image paths 2012-01-06 10:46:27 +01:00
Ingo Schommer
66d01d645b MINOR Deselected menu toggles 2012-01-06 00:06:34 +01:00
Ingo Schommer
6edf055dff ENHANCEMENT Added children toggle actions to CMS menu, fixed menu link update behaviour when records change 2012-01-05 23:17:55 +01:00
Ingo Schommer
d8388b7140 MINOR Improved .cms-add-form styling 2012-01-05 23:17:46 +01:00
Ingo Schommer
e4d65ab01b MINOR Adding step indicators to "insert link" dialog 2012-01-03 23:01:05 +01:00
Ingo Schommer
97bff7e83d MINOR More robust way to style "triangle"/"flyout"/"step indicator" in forms, via background image rather than CSS3 with hard-to-maintain dimension and positioning tweaks. Use inline-block to have it working within other elements (+titles) rather than standalone 2012-01-03 23:01:05 +01:00
Ingo Schommer
d9ad1e6e78 MINOR Cache link forms for a couple of minutes, as they don't contain any record/interface specific settings and generally only change when the underlying PHP is changed 2012-01-03 23:01:05 +01:00
Ingo Schommer
1ec694d0a9 MINOR Moved EditorToolbar() from CMSMain to LeftAndMain (as we don't support loading link forms via ajax) 2012-01-03 23:01:02 +01:00
Ingo Schommer
b4b6e5a2db MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
Ingo Schommer
3202d12933 MINOR Moved ModelAdmin styles into separate file 2012-01-03 18:11:21 +01:00