Paul Clarke
25fead8afc
Reorder Campaigns in lefthand menu
2016-05-11 16:31:02 +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
Damian Mooyman
4f06a43986
Merge 3.3 into 3
...
# Conflicts:
# 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
# javascript/lang/fr.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
# lang/it.yml
2016-05-11 14:06:23 +12:00
Damian Mooyman
f4c2a89d5a
Update translations
2016-05-11 11:05:57 +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
Daniel Hensby
1fcf3a1315
Merge pull request #5485 from open-sausages/pulls/4.0/grid-field-tmp-loading-indicator
...
Simple GridField ReactJS loading indication
2016-05-09 16:21:44 +01:00
Ingo Schommer
2610010d52
Load form data back into obj after save() ( fixes #5484 )
2016-05-09 22:55:43 +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
Damian Mooyman
79a76c52c5
Merge pull request #5476 from open-sausages/pulls/4.0/5355-checkboxes-bootstrap-conflict
...
Checkbox layout, including settings tab bugs. Fixes #5355
2016-05-09 16:31:15 +12:00
Hamish Friedlander
b2786c228b
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:24 +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
Daniel Hensby
459fb4ec80
Merge pull request #5465 from frankmullenger/4917-renaming
...
MINOR: Renaming classes with 'Html' camel cased.
2016-05-07 10:30:57 +01:00
Ingo Schommer
0b295137c2
Fix unguarded JS check in LeftAndMain.Preview.js
2016-05-06 14:42:20 +12:00
Frank Mullenger
b4cd617ee3
FIX: Renaming to HTMLEditorConfig.
...
FIX: Renaming to HTMLEditorField*.
FIX: Renaming to HTMLEditorSanitiser*.
2016-05-06 14:16:34 +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
Daniel Hensby
840cd4f877
Update translations
2016-05-05 12:46:38 +01:00
Daniel Hensby
d1751e3310
Merge remote-tracking branch '3.2.4' into 3.3.2
2016-05-05 12:33:21 +01:00
Daniel Hensby
cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4
2016-05-05 11:17:45 +01: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
Daniel Hensby
e8cfe1cc72
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19
2016-05-05 01:01:37 +01:00
Daniel Hensby
47c3165aa3
Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19
2016-05-05 01:01:15 +01:00
Daniel Hensby
457931d664
Merge branch '3.3' into 3
2016-05-04 23:32:10 +01:00
Damian Mooyman
8b1146be9a
API Implement campaign item edit button
2016-05-05 10:24:08 +12:00
