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
10,238 Commits 31 Branches 527 Tags 162 MiB
715b62f790
Commit Graph

374 Commits

Author SHA1 Message Date
Ingo Schommer
c89f56f1cb Merge pull request #932 from clarkepaul/master 
ENHANCEMENT message colours updated #7976
 2012-11-07 06:29:05 -08:00
Ingo Schommer
91b69bfb52 Fixed tab alignment and padding 
See discussion at https://github.com/silverstripe/sapphire/pull/934#issuecomment-10136236
 2012-11-07 12:41:01 +01:00
Ingo Schommer
2d075671c3 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:28:19 +01:00
Ingo Schommer
3214a0a756 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	admin/css/screen.css
 2012-11-06 19:56:34 +01:00
Ingo Schommer
ff39f9ad38 Upgrade jQuery UI to 1.9 
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign)
 2012-11-06 19:45:56 +01:00
Paul Clarke
f988ae3163 ENHANCEMENT Message colours updated 2012-11-06 13:23:20 +13:00
Paul Clarke
411673ed43 ENHANCEMENT general css enhancements 
Remove arrow from sitetree next to site name  #7972
Remove 1px gap from above main tabs and enhance css
Replace loading logo
Adjust main link colour to have more contrast
Add more contrast to main edit panel - made bg slightly lighter
 2012-11-05 17:51:38 +13:00
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Sean Harvey
1cb9c34fc5 Fixing broken references to sprites (probably caused by old Compass version) 2012-11-05 11:21:41 +13:00
Saophalkun Ponlu
9fe99cfec9 Batch actions UI enhancement (#7878) 2012-11-02 22:57:14 +01:00
Ingo Schommer
70352fba32 Merge pull request #880 from adrexia/fileoverview 
BUG: File Uploading Notifications (fixes #7883)
 2012-11-02 14:08:16 -07:00
Naomi Guyer
95b5f6541f BUG: GridField add existing auto complete has no max height (fixes #7965) 
Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
 2012-11-02 13:36:51 +13:00
Naomi Guyer
2dabaebad8 BUG: File Uploading Notifications (fixes #7883) 
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
 2012-11-02 12:46:16 +13:00
Naomi Guyer
eb23f502b5 BUG: Site Tree checkboxes and refactoring 
* Increased height of site tree checkbox by 3px, so users are less
likely to miss it and load a page by mistake
* Refactored _tree.scss to make better use of SCSS, and stop repetition
of styles
 2012-11-01 15:26:46 +13:00
Naomi Guyer
2a67715327 BUG: One too many brackets in _style.scss 
Caused when merging 3.0 back into master
 2012-11-01 11:16:13 +13:00
Ingo Schommer
efabde1416 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	security/Member.php
 2012-10-30 17:52:49 +01:00
Naomi Guyer
a0f8d044c0 BUG: Border at top of tabs when no subtabs 2012-10-28 16:05:13 +13:00
Will Rossiter
d7bf6e781a Merge pull request #719 from silverstripe-rebelalliance/open/7665 
FIX: CMS Menu header now changes height (Fixes: 7665)
 2012-10-27 19:41:27 -07:00
Will Rossiter
4f8d23b7f2 Merge pull request #704 from adrexia/IE7-left-panel-text 
BUG: IE7 vertical text fix
 2012-10-27 19:23:46 -07:00
Simon Welsh
bedb579b07 Merge branch '3.0' 2012-10-23 15:21:20 +13:00
Naomi Guyer
9158dead67 BUG: No indent on rightTitle (fixes #7950) 
Added margin and made non checkbox right title's match similar labels
used elsewhere.
 2012-10-18 16:23:49 +13:00
Ingo Schommer
b5fd9e6a8d Merge pull request #684 from adrexia/add-new-button 
BUG: Adjust css for actions toolbar on pages (fixes 7649)
 2012-10-16 07:21:27 -07:00
Saophalkun Ponlu
e3a27ea7da CMS member profile now is no longer in a popup (#7880) 2012-10-08 12:57:55 +02:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
 2012-10-03 16:16:19 +02:00
Jeremy Bridson
07bc75c281 ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab. 2012-09-28 16:37:35 +02:00
Sean Harvey
b186626b73 BUG If a nested page editable but parent not, user can't expand tree 
If you're logged in as a specific user in a group who has view/edit
permissions of a page that has a parent page which doesn't have
permissions, you can't expand the tree node to get access to that
nested page.

This fixes LeftAndMain.Tree.js to allow expanding if there are
immediate children tree nodes that are not disabled. Also fixes
styling so that only immediate children nodes are greyed out.

Fixes this ticket: http://open.silverstripe.org/ticket/7913
 2012-09-28 12:18:34 +12:00
Jeremy Bridson
a670e4ca40 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:25:57 +12:00
Sam Minnee
c2afca2cd8 Merge branch '3.0' 2012-08-28 16:08:57 +12:00
Ingo Schommer
4a8236ffa7 Removed special "from"/"to" filter field CSS rules 
Use global field rules instead, and fall back to new
"stacked" styling of FieldGroup (see CMS CSS)
 2012-08-27 16:03:21 +02:00
Ingo Schommer
e4db3c6c05 Removed DateField special width with .hasDatepicker class 
Causes field to change width after first display,
as the .hasDatepicker class is added dynamically on first field focus.
Since we don't add an icon by default, there's no difference
between an <input> field with date picker, an input field for dates,
and a simple input field. Fall back to global (or CMS specific) rules.
 2012-08-27 16:02:40 +02:00
Ingo Schommer
76dd8cca0f Remove width limit on CMS panel dropdowns 
No longer necessary as we've fixed the Chosen.js width
settings, which means the <select> fields can inherit
their settings and determine width automatically.
 2012-08-27 15:52:01 +02:00
Ingo Schommer
88dfde8afa Removed arbitrary width restrictions on field group children 
Let the fields handle their dimensions themselves
(for example the "from" and "to" date fields in the CMS pages search form)
 2012-08-27 15:50:21 +02:00
Jeremy Bridson
c621a6d699 BUGFIX: fixed trac 7665 - CMS Menu header now changes height depending on the name of the admin and greeting message. position and height were being set inline so added !important to override this. 2012-08-15 11:28:31 +12:00
Ingo Schommer
3bce3550d3 Merge remote-tracking branch 'origin/3.0' 2012-08-12 22:21:06 +02:00
dd1079
8d9db7f61a FIX: Proper buttonset styling 2012-08-11 10:19:17 +12:00
Ingo Schommer
fb7008627c Merge remote-tracking branch 'origin/3.0' 2012-08-09 10:47:44 +02:00
Naomi Guyer
5b88ffca46 BUG: IE7 vertical text fix 
Re-add vertical text fix, as it's been overwritten somewhere along the
way
 2012-08-07 13:29:33 +12:00
Will Rossiter
d774cb50f6 Add nowrap to buttons to ensure single lines (https://skitch.com/willrossi/ekp44/silverstripe-pages). Thanks oetiker 2012-08-03 09:13:37 +12:00
Hamish Friedlander
3efdb5c981 Merge in changes from 3.0.1 final 2012-07-31 16:51:10 +12:00
Naomi Guyer
2cb9a574a5 BUG: Adjust css for actions toolbar on pages (fixes 7649) 
Set a minimum height on the actions panel so it would look the same in
list and tree views
 2012-07-31 16:16:37 +12:00
Naomi Guyer
a605d06d9f BUG: Logo padding in collapsed Menu 2012-07-26 15:41:44 +12:00
Hamish Friedlander
95d0be636c Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:44:53 +12:00
Ingo Schommer
ac5989560e Validation error styling in CMS 
Blocklevel to avoid weird alignment relative to actual form field
Highlighted background, same as other error messages
 2012-07-18 16:49:59 +02:00
Ingo Schommer
3ae8b0b665 Merge remote-tracking branch 'origin/3.0' 2012-07-18 15:00:06 +02:00
Kirk Mayo
ac45825752 BUG:fixed alignment of radio buttons on add page pane trac/7473 2012-07-11 10:09:10 +12:00
Ingo Schommer
dd9c968a7a Merge pull request #631 from silverstripe-rebelalliance/3.0_7472 
BUGFIX:fixed action buttons on edit page content - stopped them from ove...
 2012-07-10 01:30:18 -07:00
Kirk Mayo
4a9c6d1e22 BUGFIX:fixed action buttons on edit page content - stopped them from overlapping in ie8. 2012-07-10 16:57:58 +12:00
Will Rossiter
b4eb023f64 Merge pull request #627 from silverstripe-rebelalliance/open/7637 
Remove text shadow off confirmation message links trac 7637.
 2012-07-08 21:32:46 -07:00
Jeremy Bridson
0ef0c9c408 BUGFIX:removed text shadow off confirmation message links trac 7637 2012-07-09 16:21:00 +12:00
Andrew Short
2a9a4bede7 Fixed nested tab styling in other CMS interfaces. 2012-07-06 12:48:36 +10:00