Commit Graph

215 Commits

Author SHA1 Message Date
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
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
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
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
Ingo Schommer
d8a5db4ea7 MINOR Padding for "parent mode" radio buttons on "add page" panel 2012-03-12 10:53:51 +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 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
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
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
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
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
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
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
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
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
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
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
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