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
17,193 Commits 31 Branches 527 Tags 162 MiB
4b413d395e
Commit Graph

279 Commits

Author SHA1 Message Date
Ingo Schommer
56b249eb23 Field values in FormBuilder action handling 
Allows actions to make decisions based on the form payload.
For example, a "delete" button can pass the currently edited record ID to its API endpoint.
 2016-09-01 07:55:56 +12:00
Ingo Schommer
fa5e6bbd69 Fixed breadcrumb icon spacing 
Regression from https://github.com/silverstripe/silverstripe-framework/issues/5917
 2016-08-31 22:31:39 +12:00
Christopher Joe
c1c20aaafc Breadcrumbs with new icons generated 2016-08-30 14:46:59 +12:00
Christopher Joe
b509f9199d Fix Modal response positioning 2016-08-29 10:50:17 +12:00
Ingo Schommer
564ddfa602 Apply .field class to <FieldHolder> react component 
It keeps styling consistent between Entwine sections (generated by FieldHolder.ss)
and React sections (generated by <FieldHolder> component).
 2016-08-28 13:31:17 +12:00
Ingo Schommer
a0d4e363c2 Moved <select> styles to generic _forms.scss 
Form element styles should be consistent throughout the CMS.
While we still have the ability to create dropdowns (<select>) which aren't based on
Entwine/HTML rather than new components like <SingleSelectField>,
we need to ensure those are rendered the same.

By default, the Entwine-based CMS sections will transform <select>
into a ChosenJS control, but you can still apply .no-chosen.
Hence there's a need for correct height both in React and Entwine sections,
not just in a React component.
 2016-08-28 13:30:18 +12:00
Ingo Schommer
79b9bb6f18 React for "Add to campaign" on pages 
Reuse existing functionality rather than creating "new legacy code" through writing more Entwine
 2016-08-28 13:07:32 +12:00
Christopher Joe
b77d21c25a Fix pages add to campaign, improved FormActions error handling, Popover focus highlight and refactored AddToCampaignModal to FormBuilderModal 
tweaked tests to suit new generic FormBuilderModal, changed FormAction handler to throw a promise instead
 2016-08-28 13:07:32 +12:00
Paul Clarke
a49456df20 Fix for batch actions not postponed under toolbar on open/close 2016-08-28 13:07:32 +12:00
Paul Clarke
b01de98b04 Remove padding override but adjust contents to suit container padding 
Remove spacing to the right of icon as there is no btn label
 2016-08-28 13:07:31 +12:00
Ingo Schommer
5c2e8d1299 Fix form attr merging order 2016-08-28 13:07:31 +12:00
Ingo Schommer
84cdb15a5f Simplify "add to campaign" dialog 
Talked to @clarkepaul and simplified to avoid title duplication
 2016-08-28 13:07:31 +12:00
Christopher Joe
a9bdf33ca8 Fix SingleSelect styling, added add to campaign documentation 2016-08-28 13:07:31 +12:00
Christopher Joe
b9624994ac AddToCampaign save message, Submitting indicator on FormAction button 2016-08-28 13:07:31 +12:00
Christopher Joe
d7663e850e Remove duplicate props for PopoverField, added FormBuilder->handleAction and flattened state data 2016-08-28 13:07:30 +12:00
Christopher Joe
6a4b29d703 Add to campaign modal 2016-08-28 13:07:30 +12:00
Christopher Joe
fb64e27960 Cleanup API for better form schema support 2016-08-28 13:07:30 +12:00
Daniel Hensby
1d1227cc9a
Merge branch '3' 2016-08-23 10:37:47 +01:00
Damian Mooyman
59efd280ad Fix issues with CMS permission codes 
Standardise template locations
Move CMSSettingsController class to SiteConfig module
Fix CMSMenu behaviour for namespaced admin sections
Split classes into one per file
Manual fixes and cleanup
 2016-08-17 11:19:14 +12:00
Christopher Joe
8a5f8fbc2d Created FieldHolder HOC for TextField and HtmlReadonlyField 2016-08-16 16:53:17 +12:00
Christopher Joe
0363351ee5 Add React HtmlReadonlyField and fixed TextField id 2016-08-16 11:10:44 +12:00
Christopher Joe
a68ba38478 Improve FormBuilder API and added HeaderField and LiteralField 2016-08-16 11:09:19 +12:00
Ingo Schommer
7322c57fc8 Merge pull request #5882 from open-sausages/pulls/4.0/redux-devtools 
Switch redux-logger to redux devtools for easier debugging
 2016-08-12 16:11:58 +12:00
Christopher Joe
42d36da3fb Switch redux-logger to redux devtools for easier debugging 2016-08-12 16:11:33 +12:00
Daniel Hensby
988af4582d Merge pull request #5862 from silverstripe-terraformers/fixes/batch-actions-checkboxes 
Fix batch action permissions not applied to new nodes loaded
 2016-08-11 14:26:27 +01:00
Damian Mooyman
6005a1c2b2 API Upgrade for silverstripe CMS namespace changes 2016-08-11 11:51:02 +12:00
Christopher Joe
7448fb7bae Fix batch action permissions not applied to new nodes loaded 2016-08-11 11:41:07 +12:00
Paul Clarke
b9445511b7 Bootstrap GridField 2016-08-03 18:35:18 +12:00
Christopher Joe
d93d9bc3c4 Disable datepicker for disabled or readonly fields, they were still editable through the picker 2016-08-01 11:47:48 +12:00
Daniel Hensby
d42826e2ba Merge pull request #5851 from open-sausages/pulls/4.0/fix-hash-navigation 
BUG Fix hash link navigation in CMS
 2016-07-29 11:26:07 +01:00
Damian Mooyman
06ae50e4f5
BUG Fix hash link navigation in CMS 2016-07-29 15:58:23 +12:00
Oly Su
89508a8f19 Tidy up history panel 2016-07-29 15:54:00 +12:00
Paul
e2826927a7 Adjust width of select dropdown (#5850) 2016-07-29 10:48:12 +12:00
Damian Mooyman
d15b19d208 Fix merge regressions in add-link fixes 2016-07-28 17:03:46 +12:00
Damian Mooyman
a868ecdbfa BUG Correct include paths for legacy JS files 2016-07-28 16:34:28 +12:00
Damian Mooyman
6e74b57c36 BUG Fix issue with gulpfile.js not compiling client/src/legacy dir 
BUG Make SelectionGroup.ss and SelectionGroup.js work together
BUG Fix for IE visual indentation of composite field
 2016-07-28 16:32:40 +12:00
Oly Su
2805baecd3 Added missing bootstrap form messages 
Align top of selection-group and label
Fix styles for overly nested composite fields
Step label added and new templates for forms
 2016-07-28 16:32:40 +12:00
Hamish Friedlander
1f8c2f781b Fix "Insert Link" dialog in HTMLEditorField. CSS still needs work. 2016-07-28 16:01:50 +12:00
Damian Mooyman
a809e80d01 API Convert CMS forms to bootstrap 
NEW Add cms-forms microtheme to cater to bootstrap's needs.

Note that the old SS3 assets section is buggy as a result of this change.
 2016-07-25 17:24:26 +12:00
Daniel Hensby
c7767b0e5b Merge pull request #5812 from silverstripe-terraformers/fixes/cms-action-spinner 
Moved spinner to right so it does not overlap text
 2016-07-19 15:34:44 +01:00
Daniel Hensby
ac17e12464
Merge pull request #3274 from colymba/custom-admin-url 2016-07-19 14:42:25 +01:00
Oly Su
059d03bb37 Moved spinner to right so it does not overlap text 2016-07-19 13:57:08 +12:00
Daniel Hensby
a8c0c0fc6a
Merge pull request #3614 from chillu/pulls/switch-states 2016-07-17 12:39:20 +01:00
Loz Calver
0a7e4cf7c3
Merge branch '3' 2016-07-15 16:01:48 +01:00
Damian Mooyman
5cb4ab4a82 API Add PopoverField for extra-actions popup in react 2016-07-15 15:46:11 +12:00
Damian Mooyman
6e68f38efb API Update react sections to use react-router instead of page.js (#5796) 
Fixes #5711
 2016-07-14 17:51:01 +12:00
Damian Mooyman
68a9b45a9a Build dist client files 2016-07-13 14:43:07 +12:00
Damian Mooyman
7d82304bb0 BUG Fix route invoking multiple handleStateChanges on single navigation actions 
BUG Fix reference to non-existant window.history.state.url property
 2016-07-13 14:42:57 +12:00
Damian Mooyman
d54f4dc9c6 Convert tabs to spaces in legacy script files 2016-07-13 14:33:19 +12:00
Damian Mooyman
859acf571e API mute frontend debugging by default (#5777) 2016-07-07 10:22:24 +01:00
Christopher Joe
b8d634166f remove adding "original classes" 2016-07-06 21:44:11 +12:00
Damian Mooyman
80e5b9149e
API Move dependency on model class from form schema API 
API Refactor hard-coded dataobject class references from CampaignAdmin
Fixes #5730
 2016-06-23 11:04:42 +12:00
David Craig
83308689d5 API Initialise React controllers via routes (#5436) 2016-06-16 15:04:14 +12:00
Daniel Hensby
9e3f76832b
Merge branch '3' 2016-06-13 13:41:20 +01:00
Paul Clarke
b3a96e7e3d minor linting fix 2016-06-07 12:45:38 +12:00
Paul Clarke
5e634c2a16 Update Form component to just Form 
Convert form and Textfield  styles to use Bootstrap
Split out btn styles a bit more clearly defined (BEM)
Toolbar modifier to improve spacing for smaller screens
Use bootstrap spacer styles .m-t-1 (margin-top-1 x spacer) instead of custom spacer
Added a few typography helpers
Tab styles continued although they are hidden (used on AssetAdmin editor panel)
 2016-06-03 15:52:31 +12:00
Ingo Schommer
3c03dcff91 Variable for light component background 
Required for a highlighted file in admin/assets
 2016-06-03 15:00:04 +12:00
Ingo Schommer
7c62a6d58d Bootstrap classes for text field 
Required to support new "compressed" form style in admin/assets
which puts form field labels on their own line (and requires the bootstrap layout styling for this)
 2016-06-03 14:59:40 +12:00
Chris Joe
b4c5c71a0b ActionTabSet, Change position absolute to bottom instead of top (#5602) 
* change position absolute to bottom instead of top

* Fixed bottom position to 100% to uncover the tabset title
 2016-05-31 09:48:59 +01:00
Paul
f4037fe319 Swap out .Actions class for bootstrap .btn-toolbar (#5581) 
* Swap out .Actions class for bootstrap .btn-toolbar

* Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required
 2016-05-27 13:39:10 +12:00
Christopher Joe
19a1ebe789 add namespace for appBoot, and fix syntax error in GridField 2016-05-25 12:11:46 +12:00
Daniel Hensby
cdb0b07345
Merge branch '3' 2016-05-20 14:20:33 +01:00
Damian Mooyman
66ef857cdf Manual merge of #5412 into master 2016-05-18 17:42:13 +12:00
Scott Hutchinson
9ba362065e Fix loading icon bug on IE 2016-05-14 14:09:50 +12:00
Damian Mooyman
19daf8f974 Update translations 2016-05-12 15:37:09 +12:00
Hamish Friedlander
a61d0a2f0b FIX Persistant Loading... indicator when no campaigns yet in admin 2016-05-12 13:32:38 +12:00
Ingo Schommer
0838770798 Consistent React event method naming 
Use "on<event>" for props, same as React's own event naming: https://facebook.github.io/react/docs/forms.html#interactive-props
Use "handle<event>" to delineate internal handlers
 2016-05-11 18:08:23 +12:00
Paul Clarke
c1204bc614 build js/css 2016-05-11 16:33:11 +12:00
Paul Clarke
746c4f7548 Vertically centre title only in breadcrumb 
Fixes #5508
 2016-05-11 16:32:49 +12:00
Ingo Schommer
a736d9e08b Merge pull request #5510 from open-sausages/pulls/4.0/5495-security-header-fix 
Markup and styles for back button outside of new toolbar
 2016-05-11 16:07:17 +12:00
Damian Mooyman
f13e44a265 Merge 3 into master 
# Conflicts:
#	admin/javascript/LeftAndMain.Tree.js
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/en.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/en.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	css/GridField.css
#	forms/gridfield/GridFieldExportButton.php
#	javascript/GridField.js
#	javascript/lang/ar.js
#	javascript/lang/cs.js
#	javascript/lang/de.js
#	javascript/lang/en.js
#	javascript/lang/en_GB.js
#	javascript/lang/eo.js
#	javascript/lang/es.js
#	javascript/lang/fi.js
#	javascript/lang/fr.js
#	javascript/lang/id.js
#	javascript/lang/id_ID.js
#	javascript/lang/it.js
#	javascript/lang/ja.js
#	javascript/lang/lt.js
#	javascript/lang/mi.js
#	javascript/lang/nb.js
#	javascript/lang/nl.js
#	javascript/lang/pl.js
#	javascript/lang/ru.js
#	javascript/lang/sk.js
#	javascript/lang/sl.js
#	javascript/lang/sr.js
#	javascript/lang/sr@latin.js
#	javascript/lang/sr_RS.js
#	javascript/lang/sr_RS@latin.js
#	javascript/lang/src/ar.js
#	javascript/lang/src/cs.js
#	javascript/lang/src/de.js
#	javascript/lang/src/en.js
#	javascript/lang/src/eo.js
#	javascript/lang/src/es.js
#	javascript/lang/src/fi.js
#	javascript/lang/src/fr.js
#	javascript/lang/src/id.js
#	javascript/lang/src/id_ID.js
#	javascript/lang/src/it.js
#	javascript/lang/src/ja.js
#	javascript/lang/src/lt.js
#	javascript/lang/src/mi.js
#	javascript/lang/src/nb.js
#	javascript/lang/src/nl.js
#	javascript/lang/src/pl.js
#	javascript/lang/src/ru.js
#	javascript/lang/src/sk.js
#	javascript/lang/src/sl.js
#	javascript/lang/src/sr.js
#	javascript/lang/src/sr@latin.js
#	javascript/lang/src/sr_RS.js
#	javascript/lang/src/sr_RS@latin.js
#	javascript/lang/src/sv.js
#	javascript/lang/src/zh.js
#	javascript/lang/sv.js
#	javascript/lang/zh.js
#	scss/GridField.scss
#	tests/model/ManyManyListTest.php
#	tests/model/SQLQueryTest.php
 2016-05-11 15:19:35 +12:00
Paul Clarke
7093224db3 Markup and styles for back button outside of new toolbar 
Adjust height of north bar to match rest of CMS plus minor positioning
fixes.
 2016-05-11 14:39:47 +12:00
Paul Clarke
1f4bdb2d8f Remove the small space above menu to align with content area 2016-05-10 22:22:49 +12:00
Paul Clarke
79d1a0542d Spacing above forms and of labels and middle column within forms 2016-05-10 22:20:00 +12:00
Paul Clarke
f64de9b667 Move accordion item up slightly 2016-05-10 22:20:00 +12:00
Paul Clarke
25f118657e Slight adjustment to make sure icons don't effect text 2016-05-10 22:20:00 +12:00
Paul Clarke
f0d6f6b04e Remove verdana (ui-widget) overrides 2016-05-10 22:19:31 +12:00
Paul Clarke
e0a7c4fb47 Move the back arrow back slightly for visual alignment 2016-05-10 22:19:31 +12:00
Damian Mooyman
7f03b88e5e API Add empty campaign layout 2016-05-10 17:34:32 +12:00
Paul Clarke
0321d0868e Added btn--icon-xl for use within assetAdmin 2016-05-10 16:34:13 +12:00
Paul Clarke
100deada75 Updated markup on Campaign edit and add screen to use newer patterns. 
Moved role=group up a level as it broke layout.
 2016-05-10 16:33:21 +12:00
Paul Clarke
75faa0de9f Reduce spacing between buttons, fix for large icons 2016-05-10 16:27:26 +12:00
Paul Clarke
d8a13233e6 Removed menu line-height overrides 
Now that bootstrap is in line-height isn’t needed here
 2016-05-10 16:27:26 +12:00
Paul Clarke
e16d3ec963 Added space to top of assetAdmin sort 2016-05-10 16:27:26 +12:00
Paul Clarke
26b84ab488 Update spacing to be consistent throughout 
Uses bootstrap $gutters rather than $spacer even though they are based
of the same value.
Improves alignment of a few things but mostly unnoticeable.
 2016-05-10 16:27:26 +12:00
Damian Mooyman
9588f0c999 Remove redux from breadcrumbs and fix breadcrumbs lazy loading 2016-05-10 15:34:54 +12:00
Ingo Schommer
c9e7d4fb81 Unnest breadcrumbs 2016-05-10 13:34:45 +12:00
Damian Mooyman
3edbfd944e API Implement breadcrumbs via controllable state 2016-05-10 13:34:34 +12:00
Ingo Schommer
d9f0914e4f Use props.extraClass on TextField holder 
This should be separated out to a common FormField class,
but for now we're only using TextField. Can be solved
properly at the same time as switching form fields to
react-bootstrap.

Required for readonly field value alignment in the "campaigns" edit form.
 2016-05-10 10:45:12 +12:00
Ingo Schommer
eab90bc82e Simple GridField ReactJS loading indication 
Better than no feedback at all while campaigns are loading.
Not using spinner.gif because a loading animation is already presented when the section is loaded (via PJAX).
Not translating the "Loading..." text because its temporary.
 2016-05-09 22:35:51 +12:00
Ingo Schommer
984d7c1cf6 Don't use Object.freeze on functions (fixes #5473) 
We're not using it for any other props passed to ReactJS components,
so there's no reason to do it here. Props are immutable by convention.
While it would be nice to enforce this, its too common to pass through
function objects which aren't supported by IE's Object.freeze().

IE isn't following the spec on how to handle Object.freeze(function() {}).
See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/freeze#Notes
> In ES6, a non-object argument will be treated as if it was a  frozen ordinary object, simply return it.

MS docs on https://msdn.microsoft.com/en-us/subscriptions/downloads/ff806186(v=vs.94).aspx
> If the object argument is not an object, a TypeError exception is thrown.
 2016-05-09 21:19:43 +12:00
Damian Mooyman
8b94dd83df API Add CSRF to Campaign delete 2016-05-09 17:33:10 +12:00
Paul Clarke
142fcb2a27 Checkbox layout, including settings tab bugs. Fixes #5355 2016-05-09 15:09:23 +12:00
Paul Clarke
c5d0d0bb99 Build 2016-05-09 12:53:02 +12:00
Paul Clarke
f1ea820ab1 Steps styles fix 2016-05-09 12:52:02 +12:00
Paul Clarke
83d70c4414 Fixes font used for add page steps and alignment 2016-05-09 12:51:35 +12:00
Paul Clarke
261ca9378e Fixes campaign thumbnail left alignment issue 2016-05-09 12:51:35 +12:00
Paul Clarke
2681b81d29 Swapped a few btn classes for updated ones 2016-05-09 12:36:14 +12:00
Ingo Schommer
0b295137c2 Fix unguarded JS check in LeftAndMain.Preview.js 2016-05-06 14:42:20 +12:00
Ingo Schommer
c251fab9af Fixed more SCSSLint errors, disabled some files 
The mixins and compasscompat will probably be replaced in time,
and install.scss is quite low priority to fix (same treatment as legacy/* styles)
 2016-05-06 08:02:38 +12:00
Paul Clarke
e81e99fb0d improved variable comments 2016-05-05 18:52:42 +12:00
Paul Clarke
b87d0a3e3c removed path to framework in framework variables, added to assetAdmin 2016-05-05 18:26:27 +12:00
Paul Clarke
22f26d10a8 moved assetadmin variables into framework 2016-05-05 17:19:05 +12:00
Damian Mooyman
8b1146be9a API Implement campaign item edit button 2016-05-05 10:24:08 +12:00
Paul
e04fb5b986 Fixes missing actions on responsive gridfield, cleanup indentation (#5446) 2016-05-04 20:21:11 +12:00
Paul
4b8e98b351 fix for scss linting issues in new scss (#5448) 2016-05-04 20:14:56 +12:00
Damian Mooyman
f88d708ee9 BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton 
Based on https://github.com/silverstripe/silverstripe-framework/pull/5426
Fixes #5267
 2016-05-03 17:45:46 +12:00
Ingo Schommer
3abd2f7119 Updated dist files 2016-05-03 16:17:36 +12:00
Paul Clarke
cd9a5dbbe9 created placeholder ListGroup.js, not currently used 2016-05-03 16:17:36 +12:00
Paul Clarke
7895e21d51 hide campaign links for alpha1 2016-05-03 16:17:36 +12:00
Paul Clarke
c7eca59a8a Refactored class names, split out campaign specific elements, hide campaign links 2016-05-03 16:17:28 +12:00
Paul Clarke
6d1a14de9c delete unused file, swap class for bootstrap list-group-item-heading class 2016-05-03 16:04:48 +12:00
Paul Clarke
4e67a913d6 Move label style out of component, remove legacy overrides 2016-05-03 16:04:48 +12:00
Paul Clarke
22617cd9b2 Improves readability slightly 2016-05-03 16:04:48 +12:00
Paul Clarke
bcbb0fcc5c rename class for better reusability and refactor 2016-05-03 16:04:47 +12:00
Paul Clarke
5b2d910aeb Form action styles update 
Doesn’t conform to BEM.
Need to update places btn-success is being used and replace with
btn-primary, but the differences shouldn’t be too noticeable.
 2016-05-03 16:04:47 +12:00
Paul Clarke
3be4e80711 Restructure accordion so list items are in their own component 
Accordion styles to get more BEM
 2016-05-03 16:04:42 +12:00
Paul
a7f5ef7b95 Removed More Options action and popover from template (#5435) 2016-05-03 15:30:41 +12:00
Paul Clarke
1506f83ef5 focus adjustments to items so selected item isn't blury 2016-05-02 15:27:12 +12:00
Damian Mooyman
72fcfbf4bc API Campaign preview for images 2016-05-02 15:27:12 +12:00
Damian Mooyman
4be5e7c961 API Implement basic preview behaviour 2016-05-02 15:27:12 +12:00
Damian Mooyman
e7cd864ebc Merge branch 'master' 2016-05-02 10:38:08 +12:00
Paul
9238bc5778 Added class to actions cell to reduce space (#5404) 2016-05-02 08:53:53 +12:00
Damian Mooyman
8d2f063f0c Fix eslint errors (#5411) 2016-05-02 08:51:31 +12:00
Paul
2e056dd98b media query to use mixin (#5402) 2016-05-02 08:50:29 +12:00
Damian Mooyman
d52db0ba34 Merge 3 into master 
# Conflicts:
#	.travis.yml
#	admin/css/ie7.css
#	admin/css/ie7.css.map
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.js
#	admin/scss/_style.scss
#	admin/scss/_uitheme.scss
#	control/HTTPRequest.php
#	core/Object.php
#	css/AssetUploadField.css
#	css/AssetUploadField.css.map
#	css/ConfirmedPasswordField.css.map
#	css/Form.css.map
#	css/GridField.css.map
#	css/TreeDropdownField.css.map
#	css/UploadField.css
#	css/UploadField.css.map
#	css/debug.css.map
#	dev/Debug.php
#	docs/en/00_Getting_Started/00_Server_Requirements.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md
#	filesystem/File.php
#	filesystem/Folder.php
#	filesystem/GD.php
#	filesystem/Upload.php
#	forms/ToggleField.php
#	forms/Validator.php
#	javascript/lang/en_GB.js
#	javascript/lang/fr.js
#	javascript/lang/src/en.js
#	javascript/lang/src/fr.js
#	model/Image.php
#	model/UnsavedRelationList.php
#	model/Versioned.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/DBField.php
#	model/fieldtypes/Enum.php
#	scss/AssetUploadField.scss
#	scss/UploadField.scss
#	templates/email/ChangePasswordEmail.ss
#	templates/forms/DropdownField.ss
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
#	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
#	tests/forms/EnumFieldTest.php
#	tests/security/MemberTest.php
#	tests/security/MemberTest.yml
#	tests/security/SecurityTest.php
 2016-04-29 17:50:55 +12:00
Paul Clarke
acb1b46a46 Add back button for smaller screens 2016-04-27 14:09:57 +12:00
Paul
fc8d94d789 Fix for toolbar-south width (#5391) 2016-04-26 17:41:07 +12:00
Ingo Schommer
5d26035a51 Update build artifacts 2016-04-26 15:34:11 +12:00
Paul Clarke
bbf74bdca9 Minor adjustments to align header, removed cancel icon and give space to main actions 2016-04-26 15:32:10 +12:00
David Craig
778ed1257d Fix campaign section cancel buttons 
- Cancel buttons we submitting forms.
- Nothing happened when clicking the DeatilEdit cancel button.

Now both cancel button route to the Campaign index view
 2016-04-26 15:32:10 +12:00
David Craig
8af1ad09d0 Add loading indicator to save button on scaffolded forms 2016-04-26 15:32:10 +12:00
Ingo Schommer
576e916504 Don't group form buttons by default 
Looks weird with a "save" and "cancel" button for example
 2016-04-26 15:32:10 +12:00
Ingo Schommer
b0d4283c17 Allow form action props override in FormBuilder 
Also added bootstrapButtonStyle defaults
 2016-04-26 15:32:10 +12:00
Paul Clarke
78a385c16a Update no-text class to BEM 2016-04-26 15:32:10 +12:00
Paul Clarke
ec99452ce1 Toolbar renaming from north-header and move styles to component 2016-04-26 15:32:10 +12:00
David Craig
0b9a339b79 Make 'form' state key singular rather than plural 2016-04-26 15:32:10 +12:00
David Craig
25f1f992a9 Made FormBuilder.mergeFieldData do deep merge 2016-04-26 15:32:09 +12:00
David Craig
7e7946e50a Fixed case sensitive naming regressions 2016-04-26 15:32:09 +12:00
David Craig
312bab8a6f Add back button to Campaign creation view 2016-04-26 15:32:09 +12:00
David Craig
35ad44b8c8 Refactor GridFieldComponent render method 
- Splits render out into logical methods
- Fixes missing key props issue for table header palceholder
 2016-04-26 15:32:09 +12:00
David Craig
2f7a7c3a5c Fix GridFieldComponent not rendering all records 2016-04-26 15:32:09 +12:00
Damian Mooyman
b2e8fd96ec BUG Fix form schema to use correct ID values 
API Implement creation of new changesets endpoint
 2016-04-26 15:32:08 +12:00
David Craig
2b8ef99d5e Add 'Cancel' button to Campaign creation form 2016-04-26 15:32:08 +12:00
David Craig
5cc6171f77 Apply default action props in FormBuilder 
Perviously consumers had to props to FormBuilder for styling common actions like 'save'. The props are now automatically passed to FormActions by the FormBuilder. Consumers can override these defaults via the 'createFn' prop.
 2016-04-26 15:32:08 +12:00
David Craig
ae285f3286 Adds route for creating new Campaigns 2016-04-26 15:32:08 +12:00
Ingo Schommer
48d01343c3 Adapt to new naming convention 2016-04-26 15:32:08 +12:00
David Craig
a15a392bd3 Styling updates for the Campaign edit form 2016-04-26 15:32:08 +12:00
David Craig
1ad6730b9e Add form component styling 2016-04-26 15:32:08 +12:00
David Craig
58036cd156 Add back button to NorthHeader component 2016-04-26 15:32:08 +12:00