Commit Graph

45 Commits

Author SHA1 Message Date
Daniel Hensby
679185514d
Merge 3.3 into 3
Conflicts:
	admin/css/screen.css.map
2016-04-26 00:24:59 +01:00
Daniel Hensby
ada12066f3 FIX Autocomplete loading spinner now showing 2016-03-21 15:15:00 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
David Craig
a6013ed1d0 Move filters from panel to header
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
  - Now called 'Bulk actions'
  - Styling updated
  - Added placeholder text / removed redundant option
  - Now also appears in SiteTree view
2015-06-23 13:08:23 +12:00
Damian Mooyman
8331171f2c Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	.scrutinizer.yml
	admin/javascript/LeftAndMain.Panel.js
	core/startup/ParameterConfirmationToken.php
	dev/Debug.php
	dev/FixtureBlueprint.php
	docs/en/00_Getting_Started/05_Coding_Conventions.md
	docs/en/00_Getting_Started/index.md
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	filesystem/File.php
	filesystem/Folder.php
	forms/FieldList.php
	forms/LabelField.php
	forms/MoneyField.php
	forms/TextField.php
	forms/TreeDropdownField.php
	forms/Validator.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldExportButton.php
	lang/de.yml
	lang/fi.yml
	model/DataObject.php
	model/SQLQuery.php
	parsers/ShortcodeParser.php
	security/ChangePasswordForm.php
	security/Security.php
	tests/control/DirectorTest.php
	tests/core/startup/ParameterConfirmationTokenTest.php
	tests/dev/FixtureBlueprintTest.php
	tests/forms/FieldListTest.php
	tests/forms/MoneyFieldTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Daniel Hensby
cb7aed46cd Adding loading spinner to ui-autocomplete fields when making ajax reqests 2015-04-17 11:38:04 +01:00
David Craig
33930597c0 Improve styling on modal dialogs 2015-02-16 08:58:23 +13:00
Kirk Mayo
e217d42090 MINOR:added padding to ui-dialog-title so that it doesn't sit flush with the edge of the dialog box 2012-12-18 15:04:14 +13:00
Mateusz Uzdowski
fe08236f21 API Add action tabsets as a interface idiom.
Introduces the concept of action tabsets - usage of TabSet and Tabs
in between the action buttons to allow richer set of capabilities that
can be offered to the user.

Goes along with c8d0cdec99c95dbed3b58ebcc098cc9d22c58206 that implements
a change to the CMS actions.
2012-12-13 17:43:24 +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
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
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
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
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
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
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
jbridson
76ddb3c53b BUGFIX:fixed various styling issues in cms (raised in SSF-188) 2012-02-17 17:00:29 +13:00
Ingo Schommer
4437f9db4f MINOR Shorter SCSS $grid-* variables to promote wider usage 2012-02-14 11:18:58 +01:00
jbridson
23e7aeeea4 MINOR Tree and content toolbar styling fixes (SSF-138, SSF-71) 2012-02-13 09:53:00 +01:00
Ingo Schommer
fcc01a322b MINOR More spriting in CMS styles 2012-01-06 11:59:14 +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
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
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
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
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
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
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
035b68fc32 MINOR Misc style improvements around batch actions and content tools display 2011-04-24 11:46:56 +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
99a68dde75 ENHANCEMENT Started styles for new CMS 2011-04-24 11:46:48 +12:00