Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Damian Mooyman
f47383f52e
BUG Fixed issue where file upload via the HTML Editor media dialogue would not prompt users to overwrite existing files
2013-06-20 15:21:18 +12:00
Ingo Schommer
a4189a6744
Merge pull request #2117 from ohararyan/3.1
...
FIX make sure select dropdowns in add page dialog aren't cut off
2013-06-19 05:30:54 -07:00
Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Sam Minnée
34287895ef
Merge pull request #2099 from chillu/pulls/insert-media-tweaks
...
Various "Insert Media" dialog tweaks
2013-06-18 21:32:00 -07:00
Ryan O'Hara
36d9563da8
FIX make sure select dropdowns in add page dialog aren't cut off due to .parent-mode class having overflow:auto
2013-06-19 11:27:22 +12:00
Sam Minnée
8bf4d417c6
Merge pull request #2094 from chillu/pulls/dialog-sizing
...
Min/max constraints for CMS dialog
2013-06-18 14:56:41 -07:00
Ingo Schommer
04c337dc82
Tab breadcrumbs floating (regression from #1778 )
2013-06-17 01:26:04 +02:00
Ingo Schommer
9e4a7c835f
Accessibility: Visible focus rings
2013-06-15 11:52:02 +02:00
Ingo Schommer
be62c731f5
Compressed layout in "Insert Media" detail screen
...
- Same font size as other CMS UI
- Smaller thumbnail height
- Less label width and padding for file info
2013-06-15 10:13:45 +02:00
Ingo Schommer
6338b0b2d9
Reduced line height for form field help text
2013-06-15 10:13:45 +02:00
Ingo Schommer
4bc2f9bc0d
Localization-resilient SCSS selector ( fixes #1590 )
2013-06-15 10:13:45 +02:00
Ingo Schommer
071f30ded7
Consistent dropdown styles between chosen.js and treedropdown
...
Removed trigger background. Incidentally this also makes it less
obvious that the trigger has too much padding on the right
(which I can't figure out ...)
2013-06-15 10:13:45 +02:00
Ingo Schommer
ea4f8cec07
Tighten "Insert Media" dialog layout
...
Reduce space usage to fit into typical dialog dimensions without scrolling
2013-06-15 10:13:44 +02:00
Ingo Schommer
1bd31c84f2
Reduced URL field width in "Insert Media" to avoid wrap
...
450px width are often not available to the dialog (with all margins/paddings subtracted from the window).
Ensure the URL doesn't cause an unnecessary wrap. Ideally we can size this to the dialog width
automatically of course.
2013-06-15 10:13:44 +02:00
Ingo Schommer
10a558c882
Hide "delete" button in "Insert Media" dialog
2013-06-15 10:13:44 +02:00
Ingo Schommer
3f295adbdd
.field.noborder style, use it in "Insert Media" dialog
2013-06-15 10:13:43 +02:00
Ingo Schommer
9f600ada2c
Min/max constraints for CMS dialog
2013-06-13 20:03:16 +02:00
Ingo Schommer
98f8191dff
Fixed Tab floating in CMS ( fixes #1778 )
...
Removed inline-block from header elements which seems
to cause the issues of tabs stacking on top of each other.
Replaced header background to work on multiline scenarios
Added bottom margin to breadcrumbs so they don't look cramped
when tabs are floated below them.
See https://github.com/silverstripe/silverstripe-framework/pull/1863 ,
https://github.com/silverstripe/silverstripe-framework/issues/1943 ,
https://groups.google.com/forum/?fromgroups#!topic/silverstripe-dev/c-W-ZxDlDuA ,
http://open.silverstripe.org/ticket/6882
2013-06-13 00:04:56 +02:00
Will Rossiter
358988e9c6
Merge pull request #2059 from adrexia/batch-actions
...
Batch actions styling
2013-06-03 19:14:13 -07:00
Will Rossiter
cc7a6eeaed
Merge pull request #2060 from adrexia/preview
...
Preview Background styling
2013-06-03 19:00:02 -07:00
Naomi Guyer
aaa8bf0029
Preview Background styling
...
* Added background color to preview for sites that don't have a
background color (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/7750c8f75fc4a
764b384c6e19dbe543c4811cdcb)
2013-06-04 12:57:09 +12:00
Naomi Guyer
91605ca8ad
Batch actions styling
...
* Removed cog icon (usually associated with settings), and tidied up
padding (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/b09cd5f7f8e73
4df1f7ca0d387a5b97a03a3b604)
2013-06-04 12:48:51 +12:00
Naomi Guyer
01e7bfb350
Filter notice styling and panel adjustments
...
* Based on @clarkepaul's commit here:
https://github.com/silverstripe-droptables/sapphire/commit/e5de6c06489f3
449ee8131bf4ee2a4e1b2380bee
* Kept margin adjustments, but avoided implementing tab changes, as
tabs have chnaged a lot since original commit
2013-06-04 12:11:05 +12:00
Ingo Schommer
5a1d476e8d
Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr
2013-05-31 19:27:19 +02:00
g4b0
7bcaf90e2a
BUG: fixed "regression" inserted with 9281ebc64764a58f86f685f9765e1d8b60995e5a adding a new class to SiteTree elem (edit-disabled)
2013-05-30 17:09:34 +02:00
Will Rossiter
831a507c90
FIX: Update references to ID values from 79c9433
2013-05-26 11:11:55 +12:00
Ingo Schommer
67d1327b90
Avoid collision of status flags in tree items when updating tree nodes
...
Fixes silverstripe/silverstripe-cms#445
See https://github.com/silverstripe/silverstripe-framework/pull/1996
Thanks to Jean-Fabien for getting this started
2013-05-25 11:27:50 +02:00
Will Rossiter
9273df15ff
Merge pull request #2003 from edlinklater/641-insert_link_styling
...
Formatting tweaks, fixes silverstripe/silverstripe-cms#641
2013-05-24 23:00:05 -07:00
Naomi Guyer
c445997f32
Replace logout button with a more commonly used symbol
...
* Power icon swapped for door icon
* Minor hover/focus opacity effect added to button
2013-05-25 16:45:49 +12:00
Ed Linklater
98ba6b331c
Formatting tweaks, fixes silverstripe/silverstripe-cms#641
2013-05-25 15:54:49 +12:00
Naomi Guyer
be5eaf1353
BUG: Fix alignment of media button
2013-05-25 13:40:37 +12:00
Ingo Schommer
30b53e65fe
API Full-width HTMLEditorField by default
2013-05-22 16:15:16 +02:00
Loz Calver
55a4fb40a6
FIX: Remove left margin on stacked form field descriptions ( fixes #1958 )
2013-05-21 09:52:45 +01:00
Sean Harvey
33be390db8
Put back cog icon for multi-select batch actions (was removed in f4b080e
)
2013-05-15 21:09:19 +12:00
Damian Mooyman
9da57b083a
BUG Fixed broken ErrorPage icons in CMS view
2013-04-10 17:15:42 +12:00
Ingo Schommer
9456b8043c
Fixed "insert media" styling (regression from 27b0cda0
)
2013-04-09 14:47:10 +02:00
Ingo Schommer
01f46d039f
NEW Enforce max node counts to avoid excessive resource usage
...
Rendering potentially 1000s of nodes can exceed the CPU and memory constraints
of a normal PHP process, as well as the rendering capabilities of browsers.
Set a hard maximum for the renderable nodes, deferring to a "show as list" action
in the main CMS tree. For TreeDropdownField, we don't have the list fallback option,
so ask the user to search for the node title instead.
Also makes both the "node_threshold_total" and "node_threshold_leaf" values configurable
2013-04-09 10:24:18 +12:00
Will Rossiter
d94a6a5407
Polish add page screen. Disable styles and fix SelectionField
2013-04-08 19:54:46 +12:00
Andrew Short
10f46ba08e
Include padding on padded edit form panels inside a tabset
2013-03-29 02:23:43 +11:00
Daniel Hensby
a03d1e66ca
BUG CMS messages touch the bottom of the inputs
...
making spacing even: http://screencast.com/t/oYHnG1Bj
2013-03-20 13:50:10 +01:00
James Cocker
7e575481c7
CMS CSS Minor Polishing Tweaks
...
Fixed what I believe to be a few very minor CSS regressions, that appeared after the CSS restructure for the side-by-side preview.
- Reverted background of the right panel (and tab active state) to the slightly darker shade (as per 3.0) to keep each of the 3 panels visually separate.
- Slightly increased padding on ui-tabs-panel as felt a but too close for comfort. Had decreased since 3.0.
- Decreased padding for logged in user name in menu, felt too excessive. (3.0 was neater)
- Evened out padding above buttons in site tree sidebar
Screenshots showing changes:
3.0: http://spdr.me/xauh
3.1 before commit: http://spdr.me/jkIe
3.1 after commit: http://spdr.me/IxtB
2013-03-14 09:41:38 +01:00
Hamish Friedlander
7efae6b95f
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-02-18 14:31:57 +13:00
Ingo Schommer
e21bd49462
BUG TimeField respects user choice ( fixes #8260 )
...
Regression from c969e04731
.
Also fixes width to accommodate for widest common format:
"11:11:11 AM"
2013-02-17 21:00:02 +01:00
Ingo Schommer
923ad8861f
Layout regression in "add pages"
...
Unrelated fields affected by changes to CMS tooltips. See 1ca3883a76
.
2013-02-13 10:15:06 +01:00
Jeremy Bridson
2e77e87ed3
BUGFIX: fix for broken layout in insert media dialog - Trac #8232
2013-02-07 21:43:34 +01:00
Ingo Schommer
b350ded87c
Fixed DatetimeField formatting (single row, smaller field)
...
Also removed the arbitrary right-floating of fields within a fieldgroup
2013-02-05 12:01:32 +01:00
Ingo Schommer
1c045b5509
Smaller styling for minor actions in CMS
2013-02-04 13:43:03 +01:00
uniun
ebe41cdadf
CSS fixes for Batchactions.
...
On some browsers Batchactions block looked OK, but on others (e.t. Opera on Linux) every element in Batchactions block had different height.
The height of these elements was related to font size which is a little bit different on every OS'es and browsers.
See https://github.com/silverstripe/sapphire/pull/1132
2013-01-30 14:46:25 +01:00
Ingo Schommer
56336c3758
Merge pull request #1101 from chillu/pulls/preview-configuration
...
NEW Preview size and default mode configurability
2013-01-29 08:16:33 -08:00