Mateusz Uzdowski
f4b080ee06
NEW Side by side editing functionality - first cut (os#7412)
...
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.
Goes along with cms commit fa3738a9f4c5181eabf18a77ca89792d31592250
2012-12-10 17:51:35 +01:00
Ingo Schommer
c89f56f1cb
Merge pull request #932 from clarkepaul/master
...
ENHANCEMENT message colours updated #7976
2012-11-07 06:29:05 -08:00
Ingo Schommer
91b69bfb52
Fixed tab alignment and padding
...
See discussion at https://github.com/silverstripe/sapphire/pull/934#issuecomment-10136236
2012-11-07 12:41:01 +01:00
Ingo Schommer
2d075671c3
ENHANCEMENT Tab style consolidation and design consistency
2012-11-06 22:28:19 +01:00
Paul Clarke
f988ae3163
ENHANCEMENT Message colours updated
2012-11-06 13:23:20 +13:00
Paul Clarke
411673ed43
ENHANCEMENT general css enhancements
...
Remove arrow from sitetree next to site name #7972
Remove 1px gap from above main tabs and enhance css
Replace loading logo
Adjust main link colour to have more contrast
Add more contrast to main edit panel - made bg slightly lighter
2012-11-05 17:51:38 +13:00
Sean Harvey
fbc6e3366b
Merge branch '3.0'
2012-11-05 15:11:48 +13:00
Naomi Guyer
7ae73eabdd
BUG: Border at top of tabs when no subtabs
...
This bug reappeared when branches were merged because the 3.0 version
of _style.scss had tabsets defined in different places.
This scss was inserted, but there was no idication that it was new to
master (except in the resulting css file). As these styles are declared
differently elsewhere in _style.scss, I think this declaration must
have been refactored in an earlier commit in master.
2012-11-05 11:48:50 +13:00
Saophalkun Ponlu
9fe99cfec9
Batch actions UI enhancement ( #7878 )
2012-11-02 22:57:14 +01:00
Naomi Guyer
2dabaebad8
BUG: File Uploading Notifications ( fixes #7883 )
...
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2012-11-02 12:46:16 +13:00
Naomi Guyer
2a67715327
BUG: One too many brackets in _style.scss
...
Caused when merging 3.0 back into master
2012-11-01 11:16:13 +13:00
Ingo Schommer
efabde1416
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
2012-10-30 17:52:49 +01:00
Naomi Guyer
a0f8d044c0
BUG: Border at top of tabs when no subtabs
2012-10-28 16:05:13 +13:00
Simon Welsh
bedb579b07
Merge branch '3.0'
2012-10-23 15:21:20 +13:00
Ingo Schommer
b5fd9e6a8d
Merge pull request #684 from adrexia/add-new-button
...
BUG: Adjust css for actions toolbar on pages (fixes 7649)
2012-10-16 07:21:27 -07:00
Saophalkun Ponlu
e3a27ea7da
CMS member profile now is no longer in a popup ( #7880 )
2012-10-08 12:57:55 +02:00
Sam Minnee
c2afca2cd8
Merge branch '3.0'
2012-08-28 16:08:57 +12:00
Ingo Schommer
4a8236ffa7
Removed special "from"/"to" filter field CSS rules
...
Use global field rules instead, and fall back to new
"stacked" styling of FieldGroup (see CMS CSS)
2012-08-27 16:03:21 +02:00
Ingo Schommer
76dd8cca0f
Remove width limit on CMS panel dropdowns
...
No longer necessary as we've fixed the Chosen.js width
settings, which means the <select> fields can inherit
their settings and determine width automatically.
2012-08-27 15:52:01 +02:00
Ingo Schommer
88dfde8afa
Removed arbitrary width restrictions on field group children
...
Let the fields handle their dimensions themselves
(for example the "from" and "to" date fields in the CMS pages search form)
2012-08-27 15:50:21 +02:00
Ingo Schommer
fb7008627c
Merge remote-tracking branch 'origin/3.0'
2012-08-09 10:47:44 +02:00
Will Rossiter
d774cb50f6
Add nowrap to buttons to ensure single lines ( https://skitch.com/willrossi/ekp44/silverstripe-pages ). Thanks oetiker
2012-08-03 09:13:37 +12:00
Naomi Guyer
2cb9a574a5
BUG: Adjust css for actions toolbar on pages (fixes 7649)
...
Set a minimum height on the actions panel so it would look the same in
list and tree views
2012-07-31 16:16:37 +12:00
Hamish Friedlander
95d0be636c
Merge remote-tracking branch 'origin/3.0'
2012-07-25 11:44:53 +12:00
Ingo Schommer
ac5989560e
Validation error styling in CMS
...
Blocklevel to avoid weird alignment relative to actual form field
Highlighted background, same as other error messages
2012-07-18 16:49:59 +02:00
Ingo Schommer
3ae8b0b665
Merge remote-tracking branch 'origin/3.0'
2012-07-18 15:00:06 +02:00
Kirk Mayo
ac45825752
BUG:fixed alignment of radio buttons on add page pane trac/7473
2012-07-11 10:09:10 +12:00
Will Rossiter
b4eb023f64
Merge pull request #627 from silverstripe-rebelalliance/open/7637
...
Remove text shadow off confirmation message links trac 7637.
2012-07-08 21:32:46 -07:00
Jeremy Bridson
0ef0c9c408
BUGFIX:removed text shadow off confirmation message links trac 7637
2012-07-09 16:21:00 +12:00
Andrew Short
2a9a4bede7
Fixed nested tab styling in other CMS interfaces.
2012-07-06 12:48:36 +10:00
Ingo Schommer
6dc108ac3e
Merge pull request #570 from adrexia/7528-insert-link
...
BUGFIX: Insert link styling inconsistent with Insert media (fixes #7528 )
2012-06-25 06:24:30 -07:00
Naomi Guyer
5c6ec68389
BUGFIX: Min-width on html dialog box ( fixes #7541 )
2012-06-25 17:35:05 +12:00
Naomi Guyer
e51bf760e9
BUGFIX: Insert link styling broken, and inconsistent with Insert media ( fixes #7528 )
2012-06-25 15:31:39 +12:00
Ingo Schommer
682a6a0d1b
BUGFIX "Insert media" loading indicator ( fixes #7542 )
...
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
2012-06-22 10:25:15 +02:00
Naomi Guyer
5713a37a32
BUGFIX: Alignment of http label in insert media
2012-06-22 18:11:00 +12:00
Naomi Guyer
cffb95280f
BUGFIX: Tab colour htmleditor in IE7
2012-06-22 17:10:52 +12:00
Naomi Guyer
f3933aa3fb
BUGFIX: Make entire tab clickable in htmleditor ( fixes #7407 )
2012-06-22 17:10:52 +12:00
Hamish Friedlander
65030906ad
BUGFIX: Add validation to fix open.silverstripe.org ticket #7494
...
When adding media via the HtmlEditorField dialog, the value of the URL field wasnt being validated. Youd get different errors depending on if the field was empty
or if it had text, but it didnt look like an absolute URL to HtmlEditorField#viewfile.
This adds some javascript validation to make the text field look like a URL field
2012-06-21 14:19:41 +12:00
Sam Minnée
e3e15e4007
Merge pull request #537 from silverstripe-rebelalliance/trac/7462
...
BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: ...
2012-06-14 20:45:07 -07:00
Kirk Mayo
f546e0db64
BUGFIX: trac/7462 Amended the css to fix this by adding text-transform: capitialize and display: block to the relevant css
2012-06-15 15:38:29 +12:00
Ingo Schommer
9cdc787935
Merge branch 'stylingfixes' of https://github.com/ajshort/sapphire into ajshort-stylingfixes
2012-06-13 13:23:24 +02:00
Ingo Schommer
db076c0f02
MINOR Using new setDescription() styling in HtmlEditorField
2012-06-13 13:21:41 +02:00
Andrew Short
160d516699
BUGFIX: Consistently style custom defined page icons.
...
* Apply page icon styling to .page-icon, rather than specific elements.
2012-06-13 18:22:43 +10:00
Andrew Short
86bb491f2a
MINOR: Consistently style tabs in various CMS interfaces.
2012-06-13 15:10:48 +10:00
Andrew Short
513737097b
MINOR: Fixed tab border being shown when tabs were hidden.
2012-06-13 13:46:00 +10:00
Andrew Short
8976c82a35
MINOR: Fixed nested tab styling.
...
* Added and styled border below nested tabs.
* Fixed duplicate nested tabset divs being created.
2012-06-13 00:43:04 +10:00
Naomi Guyer
e96ca5fb9a
ENHANCEMENT: Change media insertion to use button and apply design
...
Conflicts:
css/UploadField.css
scss/UploadField.scss
2012-06-11 10:54:48 +02:00
Ingo Schommer
9009d43f63
MINOR Moved "insert x" dialog styling from generic UploadField.scss to CMS-specific _style.scss
2012-06-11 10:51:47 +02:00
Paul Clarke
3ada9a9327
ENHANCEMENT Basic css spacing issues
...
Ticket #7446 Minor css spacing fixs: padding on grid filter, filter
panel, page actions box-shadow to remove
2012-06-11 16:02:33 +12:00
Naomi Guyer
7523f98e04
BUGFIXES: File Uploads
...
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
2012-06-08 18:40:33 +02:00
Ingo Schommer
d4baf2d19d
BUGFIX Stability improvements on CMS layout logic
...
- Changed application order
- Fixed layout trigger after preview toggle
- Replaced button row dimension approximation with double application of jQuery.layout() - once before sizing the action panel height to set correct width on container, then again for the height
2012-06-06 21:05:36 +02:00
Ingo Schommer
803aa6bfc5
MINOR Only applying box-shadow on inactive tabs
2012-06-06 21:05:35 +02:00
Ingo Schommer
415a680802
BUGFIX CMS Breadcrumbs and tabs as inline blocks which can span multiple lines, rather than being cropped off ( fixes #6882 )
2012-06-06 21:05:33 +02:00
Naomi Guyer
28e43bdc88
ENHANCEMENT: File/Image UI fixes
...
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
2012-05-28 11:50:34 +12:00
Paul Clarke
84bf5e2029
ENHANCEMENT tabs text-shadow direction change, improve visibility for IE
2012-05-22 16:06:49 +12:00
Paul Clarke
5edf447d2a
ENHANCEMENT visual enhancements, cms tabs, main menu drop shadow adjusted, actions panel top gradient replaced
2012-05-22 16:06:49 +12:00
Ingo Schommer
607a9e2f45
MINOR Reverted removal of horizontal panel scrollbars from dc5e36ec
, as it makes important content like nested tree nodes inaccessible. UI elements inside the panel should adjust to the available width if visually required instead ( fixes #7347 )
2012-05-20 14:00:14 +02:00
Andrew Short
38075d880d
MINOR: Tweaked the main tab styling to fix the background and make text more readable.
2012-05-12 18:49:56 +10:00
Robert Curry
6dd94bd6f7
MINOR: Changed classes on tabset li and a tags to match new standard.
2012-05-11 11:12:44 +12:00
Naomi Guyer
68f9cde226
BUGFIX: 7219-feedback-changes-file-upload
...
Altered files from ENHANCEMENT: UI Changes to FileUpload Area
(TRAC-7219 that were missed in the prior push
2012-05-10 11:41:09 +02:00
Naomi Guyer
181ea6cbea
BUGFIX: colour Adjustments
...
Change the constructive button colour to match the colour used in the
designs, and fixed up calculations to produce the correct button colour.
2012-05-09 18:24:36 +12:00
Ingo Schommer
82cf93855e
MINOR Reverting padding changes from pull request #377 , way too global - solved through a .cms-panel-padded class in CMSSettingsController instead
2012-05-08 00:53:06 +02:00
Ingo Schommer
23148b959a
Merge pull request #402 from ohararyan/sapphire
...
---
http://open.silverstripe.org/ticket/7214
Added watermark to show current state of preview.
Removed button styling from Draft and Preview and added styling to show current selected state.
Designs signed off by Paul
Conflicts:
admin/css/screen.css
2012-05-07 13:01:00 +02:00
Ingo Schommer
f56097a29b
Merge pull request #386 from adrexia/sapphire
...
---
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-07 11:21:23 +02:00
Ryan O'Hara
abb5719d33
ENHANCEMENT: Style change to buttons for preview states. Removed open in new window (TRAC-7214)
2012-05-04 13:53:33 +12:00
Ryan O'Hara
92484581e3
ENHANCEMENT: Add disabled state to preview buttons and add watermark for the current state being viewed (TRAC:7214)
2012-05-04 13:53:33 +12:00
Ingo Schommer
4029f96728
ENHANCEMENT Section icons in CMS ( #7269 )
2012-05-03 13:49:19 +02: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
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
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
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
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
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
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
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
Jeremy Bridson
64300caae3
ENHANCEMENT:fixed issues with overflow between tabs and breadcrumbs in cms-content-header
2012-04-16 16:31:24 +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
Jeremy Bridson
20aeb76979
BUGFIX:fixed overflow issues in cms-content-header with back button / breadcrumbs / tabs
2012-04-13 16:08:05 +12: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
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
54905b077b
BUGFIX:fixed width of dropdowns in filter side menu.
2012-04-10 17:40:01 +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
e212e8cb25
BUGFIX: fixed a couple of minor bugs - X-scrolling to 9999em on ModelAdmin and padding on active tabs in pages.
2012-04-10 09:02:24 +12:00
Jeremy Bridson
6c697e5d05
BUGFIX:SSF-38 - fixed the issue with the size of the popup being to large on-load - added overflow scroll. Altered the header and tabs to match the style of edit profile.
2012-04-05 13:23:56 +12:00
Felipe Skroski
4ffef20b09
ENHANCEMENT: SSF-168 updated print styles to the datagrid
2012-04-04 14:09:52 +12:00
Julian Seidenberg
7f8a682ad7
BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field
2012-04-04 13:46:24 +12:00
Jeremy Bridson
cebe2fc093
BUGFIX:removed header from edit profile popup and restyled broken tabs - still needs a proper fix after beta II.
2012-04-03 14:34:42 +12:00
Julian Seidenberg
5c3c3cb347
BUGFIX: SSF-38 removing the z-index on the TabSet so that the upload button works in the HtmlEditorField insert image lightbox.
2012-04-03 10:31:01 +12:00
Jeremy Bridson
c0fd9bf97c
ENHANCEMENT:SSF-38 - Styled in-content file upload dialog box. Also added fixes for cms-content-header box-shadow.
2012-03-30 14:33:20 +13:00
Ingo Schommer
efc30fd39e
MINOR Removed setRightTitle() special case (and too specific styling) from Group->getCMSFields(), implemented title attribute for chosen.js drop downs instead (to be styled with more friendly title popovers)
2012-03-27 17:07:50 +02:00
jbridson
31d4629cdb
BUGFIX:removed the float from the li (checkboxes) in members permissions... fixed layout issues Trac #6958
2012-03-27 17:02:18 +02:00
jbridson
83be1a8b43
BUGFIX:removed unnecessary horizontal line from new members page and replaced cms-help-toggle text with ?icon Trac #6956
2012-03-27 17:02:18 +02:00
jbridson
97aa2c8ba6
BUGFIX:adjusted padding so that content aligns properly on the add page panel Trac #6990
2012-03-27 17:02:18 +02:00
jbridson
6fb95e098d
BUGFIX:fixed padding issues with navigation tabs across the CMS
2012-03-27 17:02:18 +02:00
Ingo Schommer
87fbb720a1
MINOR Fixing 1px gap between nav tree and page header
2012-03-27 17:02:18 +02:00