Ingo Schommer
7f62ad0f3e
Merge branch 'master' into 7094-combine-tree-edit-view
2012-04-18 14:19:55 +02: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
