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
9,821 Commits 31 Branches 527 Tags 162 MiB
aec59de955
Commit Graph

346 Commits

Author SHA1 Message Date
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
04e5ff09ca MINOR Hiding CMS-specific badges in TreeDropdownField (fixes #7456) 2012-06-14 20:43:29 +02: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
d9c7bb8eb9 ENHANCEMENT: Implemented help text for form fields. 
The title attribute is extracted from form fields and displayed inline
below the field.
 2012-06-13 13:19:12 +02:00
Ingo Schommer
43483090b4 Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into ajshort-tabstyling 2012-06-13 10:37:59 +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
aa67b56b10 ENHANCEMENT: Refactored ToggleCompositeField. 
* Use jquery ui accordion for the field, and implemented an admin theme.
* Made the setting of configuration consistent with other form fields.
* ToggleComposteField->startClosed() has been deprecated in favour of
  setStartClosed().
* Removed public access to the heading level, instead use getHeadingLevel()
  or setHeadingLevel().
 2012-06-13 14:20:27 +10:00
Andrew Short
513737097b MINOR: Fixed tab border being shown when tabs were hidden. 2012-06-13 13:46:00 +10:00
Ingo Schommer
9b3d3123b6 Merge branch 'tabstyling' of https://github.com/ajshort/sapphire into ajshort-tabstyling 2012-06-12 19:40:21 +02: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
Ingo Schommer
ed9c856442 ENHANCEMENT Strikethrough styling for deleted tree nodes, adding status classes to tree node <li> in addition to the existing <span class="badge"> (fixes #7410) 2012-06-12 15:53:38 +02: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
Ingo Schommer
a757c16411 MINOR Make tree loading indicator visible on page icon to ensure it shows when drag handles are hidden (in "sidebar view") (fixes #7256) 2012-06-03 23:30:56 +02:00
Ingo Schommer
8e89396c93 MINOR Updating compass sprites with its changed ordering starting with 0.12 release (see http://compass-style.org/blog/2012/02/01/compass-0-12-is-released/) 2012-06-03 23:22:29 +02:00
Sam Minnee
73b9f93c08 BUGFIX: Improved layout of moneyfield. 2012-05-30 11:47:48 +12: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
Ingo Schommer
fa445ad13f Merge pull request #452 from adrexia/sapphire 
---

* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments

Conflicts:
	css/AssetUploadField.css
	css/GridField.css
 2012-05-24 23:06:46 +02:00
Paul Clarke
2f4a033bc2 BUGFIX: CMS tabs were hidden in ie7, changed css to make them appear far right 2012-05-22 16:06:50 +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
Naomi Guyer
1747298786 ENHANCEMENT: Make GridFieldButtonRow more adaptable 
* Add ability to choose where to put buttons (in buttonRow, toolbar
header, etc)
* Adjust styles to take these changes into account
 2012-05-21 14:41:46 +12:00
Naomi Guyer
458171ff92 ENHANCEMENT: Gridfield usability (fixes 7215) 
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates
(spans were being inserted inside spans), and adjusted styles. Added
extra class to template
5. Added "filter by ..." placeholder text to input fields
 2012-05-16 12:18:23 +12:00
Ingo Schommer
4d97f75e15 MINOR Fixed form reset styles 2012-05-15 22:15:36 +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
Andrew Short
d17c4d00ba MINOR: Made all icons consistently 16x16, and show them inside .ui-widget-content elements. 2012-05-12 18:49:56 +10:00
Andrew Short
4a5603b249 MINOR: Don't show a border below the last field. 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
Ingo Schommer
7f4c6e3d19 MINOR Fixed small button styles (now used in URLSegment "edit" button etc.) 2012-05-10 14:17:02 +02:00
Naomi Guyer
106bd47e88 BUGFIX: #7295 Long Filenames break layout 
Add text overflow and a max width to filenames.
 2012-05-10 11:41:10 +02: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
d642eee28e ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219) 
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they don't look like input boxes, and fix
rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again
(saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
 2012-05-09 18:38:21 +12:00
Naomi Guyer
7d5e46cdcf BUGFIX: IE Colours 
Replace hard coded colours in IE with variables, and refactored code
so that shared IE7 and IE8 fixes are in one place.
 2012-05-09 18:31:25 +12: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
76dd6d1636 MINOR Fixed style sprites broken by pull request #402 2012-05-08 00:43:25 +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
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
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
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
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
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
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
Naomi Guyer
e2d6d5936d BUGFIX: #7004 Fixes 
Fixed the overflow bug in IE7, as per ticket #7004.
 2012-04-19 16:06:58 +12:00
Ingo Schommer
1408198e70 MINOR Fixing display of tree checkboxes 2012-04-18 18:22:54 +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
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
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 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
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
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
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
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
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
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
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
 2012-04-09 21:10:08 +02:00
Wolf Vollprecht
3ae0ac7805 ENHANCEMENT: Rightlick submenu styles and ability to add page with pagetype 2012-04-09 21:08:19 +02:00
Jeremy Bridson
a85301b3c7 MINOR:css files regenerating from sass 2012-04-05 15:27: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
Jeremy Bridson
c1f6f20114 ENHANCEMENT:added logo to header on ss3 install page - plus compass regenerated icon sprites. 2012-04-05 11:18:11 +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
3ef3a6df99 MINOR Shrinking GridField button column to fit, rather than hardcoding a width for it that depends on the amount and styling of buttons in the table 2012-03-27 17:07:52 +02: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