tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-16 06:26:27 +02:00
Code Issues Projects Releases Wiki Activity
8,711 Commits 30 Branches 526 Tags 154 MiB
d782c37044
Commit Graph

727 Commits

Author SHA1 Message Date
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
Ingo Schommer
1742b4b742 BUGFIX Fixed loading/saving regressions due to new PJAX logic introduced in e01b0aa3d0 2012-04-10 00:37:14 +02:00