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
8,940 Commits 31 Branches 527 Tags 162 MiB
43483090b4
Commit Graph

263 Commits

Author SHA1 Message Date
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
8292075174 BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images 2012-04-10 14:17:47 +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
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
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
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
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
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
99e376d0f5 ENHANCMENT: SSF-25 - fixed a couple of styling issues on the ModelAdmin Filter 2012-03-12 09:59:56 +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
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
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
Ingo Schommer
8efaf75375 MINOR jQuery UI icons for GridField buttons (with spriting), added new icon to GridFieldRelationDelete to dustinguish it visually from GridFieldAction_Delete 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
jbridson
de7167b23f MINOR:SSF-30 - Changed the back arrow icon to the correct one. 2012-03-06 15:04:19 +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
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