tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 17:39:30 +02:00
Code Issues Projects Releases Wiki Activity
11,676 Commits 29 Branches 516 Tags 147 MiB
041f5f51a5
Commit Graph

454 Commits

Author SHA1 Message Date
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
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
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
Naomi Guyer
61c18c5dbc BUGFIXES: Fixes #7003 2012-04-30 12:25:35 +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
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
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
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 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
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
75c0937ab3 BUGFIX:removed reference to compass generated sprite and added direct reference to the png file. 2012-04-10 14:16:07 +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
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
cb09ff7ba8 BUGFIX:removed reference to compass generated sprite and added direct reference to the png file. 2012-04-10 12:20:12 +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
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
cbb0259dd7 Merge branch 'integration-merge27march' 2012-03-27 18:07:21 +02: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
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
jbridson
064a36e140 BUGFIX:fixed alignment of create and delete buttons across the CMS - Trac #6955 2012-03-27 17:02:17 +02:00
jbridson
43d8c08b28 ENHANCEMENT:added cursor:pointer to arrows in the pages tree (Trac #6930) 2012-03-27 17:02:17 +02:00
jbridson
62ef8a269f ENHANCEMENT:replaced text "Toggle Formatting Help" with a ? icon on edit profile Popup - Trac #6904 2012-03-27 17:02:17 +02:00
jbridson
1a66ecd6ac BUGFIX:fixed styling issues on edit profile dialog popup - Trac #6819 2012-03-27 17:02:14 +02:00
jbridson
304b89f802 MINOR:replaced back button icon with correct icon. 2012-03-27 15:38:36 +02:00
Will Rossiter
c3cae289d3 MINOR: added default flag to SCSS to allow variables to be overridden 2012-03-27 21:35:43 +13:00
Will Rossiter
e9f650a04e MINOR: tighten up tree spacing 2012-03-27 21:35:43 +13:00
Will Rossiter
39742f53e5 BUGFIX: #7036 refresh CMS panel when adding a new file 2012-03-24 14:20:46 +13:00
Sam Minnée
1b24437fde Merge pull request #262 from halkyon/security_import 
ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, and styling fixes.
 2012-03-23 17:39:46 -07:00
Sean Harvey
ffdf548575 ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into 
Users and Groups tab for context instead of Import tab, and fixing
styling to be close to how it was in SS 2.4.
 2012-03-24 13:20:19 +13:00
Will Rossiter
71f37b993c BUGFIX: #6840 Fix navigation highlights on LeftAndMain 2012-03-24 11:57:29 +13:00
Will Rossiter
ebec3ba1c6 MINOR: fix alignment of cms logo to panel title 2012-03-24 11:57:29 +13:00
Ingo Schommer
e70c9b7d13 Merge pull request #246 from silverstripe-scienceninjas/trac-6853 
BUGFIX: #6853 Necessary styles required to complement work on same-index...
 2012-03-15 15:40:38 -07:00
Sam Minnee
069d7117d7 BUGFIX: Remove stray scrolling and zooming glitches on iPad. 2012-03-15 14:13:30 +13:00
jbridson
7ff273263a BUGFIX:fixed issues with overflow on model and security admin - made changes more specific. 2012-03-12 23:01:07 +01:00
jbridson
3d26cb7bf9 BUGFIX:SSF-106 - fixed uneven column widths and overflow issues with datagrid in ie7. 2012-03-12 23:01:07 +01:00
Ingo Schommer
849b26dad4 MINOR Added custom save indicator for constructive buttons (green background on animated gif) 2012-03-12 11:10:25 +01:00
Ingo Schommer
d8a5db4ea7 MINOR Padding for "parent mode" radio buttons on "add page" panel 2012-03-12 10:53:51 +01:00
jbridson
7ece1d3e4f BUGFIX:fixed buttons in ie7/ie8 added missing background colour. 2012-03-12 10:01:01 +01:00
jbridson
b0573155ec BUGFIX:SSF-25 - fixed styling of model admin filter in ie7 and ie8 2012-03-12 10:00:47 +01:00
jbridson
99e376d0f5 ENHANCMENT: SSF-25 - fixed a couple of styling issues on the ModelAdmin Filter 2012-03-12 09:59:56 +01:00
jbridson
97386413d6 BUGFIX:SSF-106 - removed border that appeared after click in ie7 and ie8 2012-03-12 09:36:57 +01:00
jbridson
4bea5949d1 BUGFIX:SSF-106 fixed overlapping edit and delete button on datagrid in ie7. 2012-03-12 09:36:41 +01:00
jbridson
4a6116b562 MINOR:fixed use of $grid_x/y variables and documented 'magic' numbers 2012-03-12 09:35:38 +01:00
Normann Lou
aed91931a7 MINOR SSF-53 : code convention, use "-" instead of "_" for html class property value 2012-03-12 09:35:25 +01:00
Sam Minnee
d63efeb4a5 Revert "MINOR: Remove 2px margin from create button in New Member area" 
This reverts commit a5666d6d98.

Conflicts:

	admin/css/screen.css
 2012-03-12 12:06:43 +13:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25 
SSF-25: ModelAdmin
 2012-03-09 15:23:20 -08:00
Ingo Schommer
bf6317d534 MINOR Removed unrelated styles from .cms-panel-padded class (which should just do what it says) 2012-03-09 22:26:00 +01:00
Ingo Schommer
67a032ce17 MINOR Fixed button loading indicator (fixes #6876) 2012-03-09 22:05:06 +01:00
Ingo Schommer
e12a3a4ab7 API CHANGE ModelAdmin uses GridField, DataList and new layout. Removed ModelAdmin_CollectionController, ModelAdmin_RecordController and related functionality. 
API CHANGE Removed ModelAdmin->ResultColumns()/ColumnSelectionField, selection of own fields no longer possible through the UI, to be replaced by a more generic GridField component
 2012-03-09 15:15:58 +01:00
Sam Minnee
039ba665d4 Merge branch 'button_fixes' of https://github.com/ohararyan/sapphire into ohararyan-button_fixes 
Conflicts:
	admin/css/screen.css
 2012-03-09 17:51:41 +13:00
Ryan O'Hara
fb17f169d9 MINOR: Remove invalid changes to input.hasDatepicker 2012-03-09 17:08:26 +13:00
Ryan O'Hara
a5666d6d98 MINOR: Remove 2px margin from create button in New Member area 2012-03-09 17:03:48 +13:00
Sam Minnee
f51515b62a Merge branch 'master' of https://github.com/adrexia/sapphire into adrexia-master 
Conflicts:
	admin/css/screen.css
 2012-03-09 16:56:43 +13:00
Saophalkun Ponlu
c6d7301fab BUGFIX: Change to a page url segment doesn't get saved properly caused by 'disabled' attribute on the field, which is added by url segment suggestion function (ticket #6842) 2012-03-09 16:11:32 +13:00
Naomi Guyer
f048b7edf0 BUG FIX: Support for gradients in editor in IE9 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 15:04:26 +13:00
Russell Michell
5b4f83a567 BUGFIX: #6853 Necessary styles required to complement work on same-indexed commit in cms project 2012-03-09 13:20:27 +13:00
jbridson
72101c254a MINOR:SSF-106 - fixed position of pagination on datagrid. 2012-03-08 17:21:26 +13:00
jbridson
3870ba4d0a MINOR:SSF-53 - changed height of icon on back button in users detail view. 2012-03-08 16:40:05 +13:00
jbridson
bd85d038af ENHANCEMENT:SSF-53 - hid the find button from the link existing member field on users groups. 2012-03-08 16:40:04 +13:00
jbridson
292bd79b82 BUGFIX:SSF-53 - fixed filter and reset buttons in ie7 and ie8 plus fixed an array of other ie7/8 styling bugs 2012-03-08 16:40:04 +13:00
jbridson
c5a42797de ENHANCEMENT:SSF-53 - styled the label for the parent group input field on the users groups page. 2012-03-08 16:40:04 +13:00
Ingo Schommer
3916e33c39 MINOR Hide drag icons when tree is in multiselect, and root node checkbox when tree is in multiselect (but limit to content tree) 2012-03-08 01:49:35 +01:00
jbridson
4d39813a80 BUGFIX:SSF-30 - moved tabs SCSS from _style.scss to AssetAdmin.scss 2012-03-08 09:03:47 +13:00
Ingo Schommer
c820692e9e MINOR Ensuring .cms-panel-padded overrides .cms .ui-tabs 2012-03-07 16:20:46 +01:00
jbridson
4590436779 MINOR:SSF-53 changed the class of export to csv icon in scss. 2012-03-07 15:33:15 +13:00
jbridson
ecb7d92471 MINOR:SSF-53 corrected the icon styling on export to csv button - properly implemented the compass sprite. 2012-03-07 15:29:43 +13:00
jbridson
c0e1500ded ENHANCEMENT:SSF-30 - changed the SCSS so that the styling on the view tabs is more specific to pages and files. 2012-03-07 14:50:31 +13:00
jbridson
d28e32a16e ENHANCEMENT:SSF-30 - moved some code so that the css doesn't override the negative text indent on the view tabs. 2012-03-07 14:28:23 +13:00
jbridson
301c6801a4 MINOR:SSF-53 changed export to CSV icon to use the button-icon sprite. 2012-03-07 11:40:04 +13:00
Ingo Schommer
755a9c398a MINOR Fixed selected node styling in _treee.scss, was styling children as selected as well 2012-03-06 21:38:34 +01:00
jbridson
861785958a MINOR:Re-instated the Go button on the actions button for page tree batch actions. 2012-03-07 08:56:44 +13:00
jbridson
597b12e823 ENHANCEMENT: SSF-53 - Styled the pagination and icons on export to CSV button on User datagrid. 2012-03-06 15:55:26 +13:00
Ingo Schommer
9a02f19b66 MINOR .message styling 2012-03-05 17:41:50 +01:00
Ingo Schommer
bfd7adc666 MINOR Fixed default link styling in CMS, was too little contrast on light grey background 2012-03-05 17:41:49 +01:00
Ingo Schommer
a6a7b2e469 MINOR Fixed viewer/editor groups field widths to work with chosen.js UI component 2012-03-05 09:13:19 +01:00
Ingo Schommer
c69e949bc9 MINOR Show all "can view" options in page settings in their own line, as it makes it easier to scan available options 2012-03-05 09:13:19 +01:00
Ingo Schommer
3f07b9bffa MINOR Fixed PermissionCheckboxSetField readonly styles (SSF-53) 2012-03-01 21:35:48 +01:00
Ingo Schommer
f8201c48a3 MINOR More generic CSS styles for .cms-file-info: Apply to form.small parent, fixed related UploadField spacing issues 2012-03-01 11:58:16 +01:00
Ingo Schommer
da879da940 MINOR Styling and structural fixes for File/Image->getCMSFields() and relates usage in UploadField/HTMLEditorField. 2012-02-29 21:06:43 +01:00
jbridson
e61a7868fd BUGFIX:changed the colour of the font on the default tabs to match the designs 2012-02-29 16:26:52 +13:00
jbridson
e4496fefc1 BUGFIX:SSF-106 added fix for no delete icons in ie7 2012-02-29 16:00:30 +13:00
jbridson
e932be3a9a ENHANCEMENT:SSF-30 - partially finish - fixed broken layout on edit files 404error.html 2012-02-29 15:31:09 +13:00
jbridson
59df00d302 BUGFIX:fixed position of back button in the cms-content-header - adapted design to work around the inclusion of tabs. 2012-02-29 11:06:42 +13:00
jbridson
af59228036 MINOR:fixed the positioning of the viewmode (drag and drop, mulitiselect) on the pages treeview 2012-02-29 09:56:38 +13:00
jbridson
b53a32ae34 MINOR:SSF-30 changed measures to be multiples of grid-x and grid-y 2012-02-29 09:56:38 +13:00
Ingo Schommer
5cc33ab843 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
 2012-02-28 20:17:43 +01:00
Ingo Schommer
07abcb1dda MINOR Fixed button styling in CMS content header (tab styles not specific enough) 2012-02-28 18:09:32 +01:00
Ingo Schommer
f3fe62e740 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
 2012-02-28 00:35:17 +01:00
Ingo Schommer
bcc73de85e Merge branch '106-add-edit-records-rc' 
Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php
 2012-02-27 23:58:10 +01:00
Julian Seidenberg
550f75408e ENHANCEMENT: File and Image CMSFields styling 2012-02-27 23:52:40 +01:00
Ingo Schommer
312850aee9 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
 2012-02-24 00:32:30 +01:00
Ingo Schommer
6e6fdaf79e MINOR Applying default padding to edit form template rather than the tabs it contains, which allows a more standardised UI even when no tabs are present in the CMS content area (e.g. in "add files") 2012-02-23 18:39:42 +01:00
Felipe Skroski
1ebd83df1a ENHANCEMENT: styled the header of the datagrid (SSF-106) 2012-02-22 16:29:37 +13:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
jbridson
76ddb3c53b BUGFIX:fixed various styling issues in cms (raised in SSF-188) 2012-02-17 17:00:29 +13:00
jbridson
18131ae64a MINOR:fixed bug with tabs - created more specific styling for the page view tabs so that they do not affect the tabs sitewide. 2012-02-17 12:40:19 +13:00
Ingo Schommer
d41f37f771 MINOR Hiding collapsed panel views by CSS to avoid FOUC, and initialising component without triggering events to avoid redrawing the whole CMS layout twice due to it listening for panel changes 2012-02-16 11:45:07 +01:00
Ingo Schommer
44d82209a9 MINOR Improved collapsed panel view by auto-hiding panel headers and avoid ugly cropped overflow effect 2012-02-15 14:26:46 +01:00
Ingo Schommer
7a8e634d8f MINOR Reverted hiding of tab titles 2012-02-14 17:31:32 +01:00
Ingo Schommer
37dfbb6b7e ENHANCEMENT LeftAndMain->Breadcrumbs() 2012-02-14 17:31:32 +01:00
Ingo Schommer
42f3c542f8 MINOR Shorter SCSS $grid-* variables to promote wider usage (amended) 2012-02-14 17:31:23 +01:00
Ingo Schommer
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Ingo Schommer
4437f9db4f MINOR Shorter SCSS $grid-* variables to promote wider usage 2012-02-14 11:18:58 +01:00
Cam Findlay
0a75a34af1 MINOR Styles for form help text 2012-02-14 08:59:31 +01:00
Ingo Schommer
f6748f5b56 MINOR Merge errors 2012-02-13 18:15:09 +01:00
jbridson
23e7aeeea4 MINOR Tree and content toolbar styling fixes (SSF-138, SSF-71) 2012-02-13 09:53:00 +01:00
Will Rossiter
649f4cef9c ENHANCEMENT: allow left column on LeftAndMain::getEditForm 2012-02-11 14:01:43 +13:00
Anselm Christophersen
0fd8482be6 Button overflow contained to max 100% + outcommented instructions on how button styling can be increased for Webkit & IE9 
Last changes & comments
 2012-02-09 14:59:45 +01:00
Ingo Schommer
55ddbd38bc ENHANCEMENT Replaced custom profile dialog JS with generic ssui-core.js functionality. Removed cookie state saving abilities for now, not a high priority to re-implement) 2012-02-08 15:34:40 +01:00
Felipe Skroski
f4c140bcf4 MINOR Cleaner tree icons 2012-02-03 15:27:33 +01:00
Felipe Skroski
586ae4ab6e MINOR GridField column header and sorting styles 2012-02-03 15:27:18 +01:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Ingo Schommer
041da993fa ENHANCEMENT Added generic 'small' form style 2012-02-03 00:46:49 +01:00
Ingo Schommer
8ba585be27 MINOR Fixing button whitespace gaps and "interrupted" buttonsets 2012-01-23 10:23:49 +01:00
Wolf Vollprecht
0444d4ea16 ENHANCEMENT Buttonsets for CMS (fixes #6631), using new jQuery UI button() to style buttons in CMS, moved JavaScript to LeftAndMain.js as the button styles only apply with an .Actions container now 2012-01-23 09:35:07 +01:00
Ingo Schommer
ef514b924e MINOR Fixed SecurityAdmin styling 2012-01-09 10:09:40 +01:00
Ingo Schommer
aff72e766e MINOR Simpler field alignment of OptionsetField (and some specifics for member-profile-form) 2012-01-09 10:09:40 +01:00
Ingo Schommer
c6e1937021 MINOR Rotated labels for collapsed panels 2012-01-06 16:58:04 +01:00
Ingo Schommer
fcc01a322b MINOR More spriting in CMS styles 2012-01-06 11:59:14 +01:00
Ingo Schommer
66d01d645b MINOR Deselected menu toggles 2012-01-06 00:06:34 +01:00
Ingo Schommer
6edf055dff ENHANCEMENT Added children toggle actions to CMS menu, fixed menu link update behaviour when records change 2012-01-05 23:17:55 +01:00
Ingo Schommer
d8388b7140 MINOR Improved .cms-add-form styling 2012-01-05 23:17:46 +01:00
Ingo Schommer
e4d65ab01b MINOR Adding step indicators to "insert link" dialog 2012-01-03 23:01:05 +01:00
Ingo Schommer
97bff7e83d MINOR More robust way to style "triangle"/"flyout"/"step indicator" in forms, via background image rather than CSS3 with hard-to-maintain dimension and positioning tweaks. Use inline-block to have it working within other elements (+titles) rather than standalone 2012-01-03 23:01:05 +01:00
Ingo Schommer
b4b6e5a2db MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
Ingo Schommer
3202d12933 MINOR Moved ModelAdmin styles into separate file 2012-01-03 18:11:21 +01:00
Ingo Schommer
8dd64bd2ef MINOR Using box-sizing to lay out form fields rather than relying on hacky 90% widths + pixel-based paddings, which makes it impossible to align anything outside of the field container the these elements. Using conditional CSS to disable field padding if box-sizing is not available. Generalized "stacked" form pattern in _form.scss, fixed CMS actions padding to align with fields. 2012-01-03 18:11:21 +01:00
Ingo Schommer
0cf6421afe MINOR Button styling for "insert" dialogs 2012-01-03 09:38:42 +01:00
wolfv
2ccda564ca ENHANCEMENT: #6579 Show page status in page tree (pull request #142 from wolfv/sapphire) 2011-12-29 10:35:44 +01:00
Wolf Vollprecht
2a429c9850 MINOR: Added Member Profile Popup Styling 
MINOR: Better button styles
MINOR: Now compass for button sprites
 2011-12-29 09:48:22 +01:00
Anselm Christophersen
cdedbb8d37 MINOR ModelAdmin styling 2011-12-20 18:00:56 +01:00
Ingo Schommer
2211fc11ca MINOR Added reuseable .cms-panel-padded style 2011-12-20 17:46:43 +01:00
Ingo Schommer
47f53dfa39 MINOR Reverted special styling of preview button in CMS, too hard to keep consistent alignment 2011-12-20 17:46:43 +01:00
Will Rossiter
4d0d5799bb MINOR: merged edlinklater/master into master. Fixes #134 2011-12-17 16:12:21 +13:00
=
d407f4c613 MINOR: Revert special formatting of preview button, fix Action button icons in IE8 2011-12-17 15:56:34 +13:00
Will Rossiter
6977484f99 ENHANCEMENT: scale cms dialog popups based on browser. BUGFIX: #6760 ensure scrolling is supported in cms dialogs 2011-12-17 13:51:10 +13:00
Ingo Schommer
7253746bdc MINOR Fixed IE6 compat note styling 2011-12-15 20:38:35 +01:00
Ingo Schommer
f3494839b0 MINOR Improved CMS loading spinner visibility by enforcing a higher z-index in its own element 2011-12-15 00:48:50 +01:00
Ingo Schommer
f57a3018a3 MINOR Improved perceived UI feedback by hiding various elements until they're styled properly (TinyMCE, tree) 2011-12-15 00:48:48 +01:00
Anselm Christophersen
5e9db043fa MINOR ModelAdmin search and create panel fixes (see #6782) 2011-12-02 10:27:06 +01:00
Ingo Schommer
4a2fe9877d MINOR Disabled styling for form fields in CMS 2011-11-14 12:23:59 +01:00
Ingo Schommer
f815425b4d MINOR Fixed collapsed cms menu and preview by setting correct panel width (broken by 6b88006456) 2011-10-30 14:34:35 +01:00
Ingo Schommer
c6aa0697d3 MINOR Moved <ins> and <del> styles to more specific selectors in cms module 2011-10-29 20:47:44 +02:00
Ingo Schommer
6e2eaed4fc MINOR Fixed batch action drop down width in CMS (somehow chosen.js interprets it as only 60px wide) 2011-10-29 13:27:11 +02:00
Ingo Schommer
ac94809068 MINOR Fixed content loading overlay in CMS 2011-10-29 13:27:11 +02:00
Ingo Schommer
d1ce2c07c0 MINOR Using overflow-y: auto instead of overflow-y: scroll in CMS to avoid showing ugly scroll bars by default even if resolution is high enough to accommodate all elements. 2011-10-29 13:27:10 +02:00
Will Rossiter
aba6b44163 MINOR remove console.log. MINOR clean up for icon sprites in the cms and content toolbars 2011-10-29 15:47:07 +13:00
Will Rossiter
6b88006456 BUGFIX show scroll bar on menu and side panels in adminstration section rather than hiding 2011-10-29 15:47:07 +13:00
Julian Seidenberg
df1de11a63 BUGFIX: renaming "triangle" to "flyout-indicator" and fixing bug when switching between pages in the CMS after collapsing left-hand side menu 2011-10-10 13:24:27 +13:00
Julian Seidenberg
9fb1b32e01 ENHANCEMENT: Collapsed main menu view (SSO-7) 2011-10-07 17:48:53 +13:00
Julian Seidenberg
d378a86c49 BUGFIX: using Will's grid variables for spacing of dialog 2011-09-30 16:08:32 +13:00
Julian Seidenberg
e58b0320dd ENHANCEMENT: adding ui-state-disabled icons for CMS buttons (SSO-8) 2011-09-30 14:29:19 +13:00
Julian Seidenberg
9beef85259 BUGFIX: creating green fallback color for "Save and Publish" button in IE7 (SSO-8) 2011-09-30 13:49:05 +13:00
Julian Seidenberg
6837baea38 MINOR: adjust distances and fallback colors (SSO-8) 2011-09-30 13:24:23 +13:00
Julian Seidenberg
fb364bcc25 ENHANCEMENT: using CSS3 to do number label in dialog box (SSO-8) 2011-09-30 12:48:27 +13:00
Julian Seidenberg
90d4321c52 ENHANCEMENT: adding an additional overlay-light div that is used when switching between pages by ajax. The dialog pop-up uses the default "ui-widget-overlay", but that overlay is darker than "ui-widget-overlay-light". Having two overlays prevents weird graphic effects when switching pages using the darker overlay (SSO-12) 2011-09-29 17:09:36 +13:00
Julian Seidenberg
f50a281759 ENHANCEMENT: styling of popup with Ed Knight's changes and moving them from CMS to sapphire, because that is where all the image assets live (SSO-12) 2011-09-29 16:25:31 +13:00
Julian Seidenberg
b2af1bfda9 BUGFIX: fixing "outside" close button on dialogs (SSO-12) 2011-09-29 16:24:21 +13:00
Julian Seidenberg
cdc8d8b976 ENHANCEMENT: merging of Ed Knight's changes from: 52acf3532f. (SSO-12) 2011-09-29 16:24:03 +13:00
Julian Seidenberg
bfa0181d78 ENHANCEMENT: Icons for all core CMS actions like "Save draft" (SSO-26) 2011-09-29 15:15:12 +13:00
Will Rossiter
a1b6a8aff2 ENHANCEMENT: stripped out typography styles from the cms into its own file. Included styling for ins and del 2011-09-19 17:27:26 +02:00
Will Rossiter
2036354d8d ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain interface 2011-09-19 17:26:01 +02:00
Will Rossiter
7560e468ed BUGFIX: fixed menu not appearing on load 2011-09-19 17:22:36 +02:00
Will Rossiter
60cba7dd76 BUGFIX: fixed submenu not opening in cms-menu when cms loads on page other than edit page section 2011-09-19 17:22:36 +02:00
Will Rossiter
2bf2c3a15f MINOR: #css styles to clean up vertical alignment in content tools 2011-09-19 17:22:36 +02:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Ingo Schommer
4461cae31b ENHANCEMENT New CMSPreviewable interface class to standardize metadata making a record previewable by the CMS. 
ENHANCEMENT New "preview" and "edit" buttons to toggle between preview and cms views. Reinstated utility links to switch between draft and live preview (based on SilverStripeNavigator) (formerly called "AjaxSwitchView")
 2011-08-12 17:05:50 +02:00
Ingo Schommer
6d26a88442 MINOR Better redrawing of panels loaded via ajax in CMS (no jslayout/tabset glitches, loading overlay) 2011-08-12 14:28:44 +02:00
Will Rossiter
094b3916e6 MINOR: misc style fixes to the content-tools sidebar in the main tab including resizing form fields to fit. 2011-08-09 17:52:13 +12:00
Will Rossiter
dc222d54f8 MINOR: changed icon size for lefthand menu down to 16x16 rather than 24x24 2011-08-09 11:39:12 +12:00
Will Rossiter
404e71399b ENHANCEMENAT: sprited up cms menu icons via compass 2011-08-05 16:46:03 +12:00
Will Rossiter
aec1e7ab5d MINOR: added mouse cursor for checkboxes and optionsets 2011-08-05 16:06:23 +12:00
Will Rossiter
9a340e7eb4 ENHANCEMENT: Added Chosen jQuery library for providing styled and searchable dropdowns. BUGFIX: removed explict width on TreeDropdownFields, instead using a width from jQuery. 2011-08-05 15:46:57 +12:00
Will Rossiter
0db6558a1b MINOR: #css added active highlighting to menu for webkit browsers. tidied up grid for content-tools. Crop text that expands over the title fields. polish tweaks to the cms content actions 2011-08-04 14:09:08 +12:00
Will Rossiter
e484a230fe ENHANCEMENT: updated TreeDropdown display. Use jQuery UI provided icon rather than custom 2011-08-01 14:27:52 +12:00
Will Rossiter
7872c1297f MINOR: #css implemented multiple column support for optionset fields. 2011-08-01 10:54:31 +12:00
Will Rossiter
aad97ba220 MINOR: added vertical and horizontal grid helpers 2011-07-29 15:10:14 +12:00
Will Rossiter
1827c18fe1 BUGFIX: fixed CMSMain menu being displayed on CMSPageController pages. MINOR: added icons for main left hand side. 2011-07-28 16:57:41 +12:00
Ingo Schommer
928884c5d0 MINOR IE compatibility fixes in new admin CSS 2011-07-08 15:36:48 +02:00
Ingo Schommer
d77cbe62dd MINOR Cleaned up structure and documentation of SCSS files in sapphire/admin/scss 2011-07-08 15:36:48 +02:00
Ed
ed449ee03d MINOR CSS styles for tree and misc. form elements 2011-07-08 15:36:47 +02:00
Ed
803a3d9e3d MINOR CSS styles for admin buttons. Color defintions set into _default.scss 2011-07-08 15:36:47 +02:00
Will Rossiter
92c662e552 MINOR: styles for the top tabs in the main cms. #css 2011-07-08 15:36:47 +02:00
Ingo Schommer
177e085a79 MINOR Improved CSS for left navigation, tabs and form fields 2011-07-08 15:36:47 +02:00
Ingo Schommer
19b9edb170 MINOR Clearer CSS classes in CMS controller templates. Fixed JS loading of ModelAdmin panels. Added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag). Leaving $BaseCSSClasses in LeftAndMain.ss base template for legacy reasons. 2011-07-08 15:36:46 +02:00
Ingo Schommer
ff54044206 API CHANGE Forms in ajax responses from LeftAndMain and subclasses include <form> tags, and replace the form itself on the client (rather than just everything inside the form). Form submissions and loading is handled by its container ('.cms-content') to avoid problems with a DOM element replacing itself upon form submission. 2011-07-08 15:36:46 +02:00
Ingo Schommer
0e0a59df99 ENHANCEMENT Collapsible menu, disable menu actions on external links 2011-07-08 15:36:45 +02:00
Ingo Schommer
4e0949f565 ENHANCEMENT Consistently wrapping CMS forms in <div class="cms-content">, added LeftAndMain.Content.js to reload panels via ajax, hooking into preview logic 2011-07-08 15:36:44 +02:00
Ingo Schommer
2b56d2a8d8 FEATURE Preview panel to show CMS changes on actual website. Navigating in preview loads new page for editing in CMS. 2011-07-08 15:36:44 +02:00
Ingo Schommer
6649d69b39 MINOR Updated menu icons 2011-07-08 15:36:43 +02:00
Ingo Schommer
686f101925 ENHANCEMENT Toggleable panels in CMS 2011-07-08 15:36:43 +02:00
Will Rossiter
6956275d2e MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier 2011-05-20 11:29:40 +12:00
Ingo Schommer
ff1c961ead MINOR CMS Preview fixes 2011-05-02 11:43:51 +12:00
Ingo Schommer
f94647197b MINOR Loading indication for buttons in CMS (overrides jQuery UI backgrounds) 2011-05-02 11:43:34 +12:00
Ingo Schommer
afbb4cc045 MINOR Fixed Member_ProfileForm styling, inlining into _style.css. Misc style fixes 2011-05-01 20:23:07 +12:00
Ingo Schommer
f8b38e9adb MINOR Moving _layout.scss include from screen.css into its own file, in order to selectively block layout options like body {overflow: none;} while retaining all other cms styles (useful in a dialog context) 2011-05-01 20:23:07 +12:00
Ingo Schommer
0fd6924fe1 FEATURE Preview changes of page edits in CMS on website (through <iframe> sidebar) 2011-04-28 22:36:28 +12:00
Ingo Schommer
afa05f93dd MINOR Background color fallbacks for IE (no gradient support) 2011-04-27 19:37:46 +12:00
Ingo Schommer
663c49ccdd MINOR Added temporary 'preview' header 2011-04-24 11:46:56 +12:00
Ingo Schommer
035b68fc32 MINOR Misc style improvements around batch actions and content tools display 2011-04-24 11:46:56 +12:00
Ingo Schommer
2c6e0c277b MINOR Adapted CMS batch actions form to work outside of tabset context 2011-04-24 11:46:55 +12:00
Ingo Schommer
b08fc52da4 MINOR Wrapping cms-content-header <div> in order to provide overflows without line breaks 2011-04-24 11:46:55 +12:00
Ingo Schommer
4ddd69f85f ENHANCEMENT Using SCSS variables for colour definitions in CMS, setting to greyscale theme for now in order to communicate the early status of the UI work 2011-04-24 11:46:51 +12:00
Ingo Schommer
a2b39e55c1 MINOR Removed unnecessary "type" field from LeftAndMain->AddForm(), added generic styles for buttons 2011-04-24 11:46:51 +12:00
Ingo Schommer
99a68dde75 ENHANCEMENT Started styles for new CMS 2011-04-24 11:46:48 +12:00