Ingo Schommer
47e2ac9885
Merge pull request #5372 from open-sausages/pulls/4.0/OSS-1750-js-file-rename
...
Rename JS files to comply with AirBnB conventions
2016-04-25 15:56:58 +12:00
Ingo Schommer
21db18e7ef
Correct naming for JS and CSS files in client/
...
Removed some dist/js/*.js files since they're no longer built as individual files.
This was a side effect of them living in the toplevel folder of admin/client/src/,
which used to have all the legacy/*.js files in there (they do need to be built).
Following AirBnB convention: https://github.com/airbnb/javascript#naming--filename-matches-export
While it technically allows index.js files, we found them to be bad for dev and debugging in practice:
Depending on the used IDE, editor tabs all look the same. Other views like Chrome Dev Tools with
sourcemaps rely on path context, and are harder to auto-complete.
There's no direct rules for CSS files, but same principles apply here.
Also renamed the sections/ folder to containers/, which more clearly communicates
the distinction between components/ (shouldn't contain state-dependant, smart components).
Renamed state/ files to follow AirBnB naming conventions
https://github.com/airbnb/javascript#naming--filename-matches-export
https://github.com/airbnb/javascript#naming--camelCase-default-export
https://github.com/airbnb/javascript#naming--PascalCase-singleton
Leaving the folder name in state/<state-key> lowercase since
that's also the key to reducers in the actual state object.
References:
http://engineering.kapost.com/2016/01/organizing-large-react-applications/
https://github.com/erikras/react-redux-universal-hot-example/tree/master/src
https://github.com/RickWong/react-isomorphic-starterkit/tree/master/src
https://github.com/react-toolbox/react-toolbox/issues/98
https://github.com/react-bootstrap/react-bootstrap/tree/master/src
2016-04-25 15:43:19 +12:00
Ingo Schommer
c66a45c8b8
Fixed GridField JS test warnings
2016-04-25 14:58:26 +12:00
Hamish Friedlander
84193b00fd
Merge pull request #5377 from open-sausages/pulls/4.0/api-exempt-validation
...
API Allow actions to declare they are exempt from validation themselves
2016-04-22 15:50:33 +12:00
Damian Mooyman
098f199d67
Merge pull request #5366 from open-sausages/pulls/4.0/fix-asset-admin-icon
...
Fix AssetAdmin icon reference
2016-04-22 15:50:14 +12:00
Damian Mooyman
8b239a5011
Docs and tests for exempt validation actions
2016-04-22 14:52:38 +12:00
Hamish Friedlander
241cdfed1b
API Allow actions to declare they are exempt from validation themselves
2016-04-22 14:22:11 +12:00
Damian Mooyman
0ed353a3df
Reformat code
2016-04-22 14:05:55 +12:00
Ingo Schommer
8c63ae3d68
Fix AssetAdmin icon reference
...
Needs to use namespaced class name (see LeftAndMain->Menu()).
Not replacing the old .icon-assetadmin rule since we want the old and new UI to co-exist for a short while.
Ideally we'd move these styles to the asset-admin module, but the whole way of referencing image sprites
is outdated anyway - so I'd prefer to merge this quick fix and think about SVG icons for menu entries instead.
2016-04-22 13:57:10 +12:00
Ingo Schommer
dba0247544
Merge pull request #5358 from open-sausages/pulls/4.0/debug-logging
...
API redux-logger respects ss environment
2016-04-22 13:21:55 +12:00
Damian Mooyman
e463fcce6e
API redux-logger respects ss environment
2016-04-22 13:20:24 +12:00
Ingo Schommer
9331b4095a
Merge pull request #5373 from open-sausages/pulls/4.0/fix-routing-reredux
...
BUG Fix routing tests
2016-04-22 13:15:48 +12:00
Ingo Schommer
12383c16e4
Merge pull request #5371 from open-sausages/pulls/4.0/fix-icon-styles
...
Fix regression with font-icon styles
2016-04-22 13:03:46 +12:00
Damian Mooyman
fa8075367d
BUG Fix routing tests
...
BUG Fix issue with top level routes without trailing slashes
2016-04-22 11:16:48 +12:00
David Craig
d376944d48
Fix regression with font-icon styles
2016-04-22 10:43:06 +12:00
Ingo Schommer
3ef35778cb
Merge pull request #5362 from open-sausages/pulls/update-font-icons
...
Updated icon set with new icons and license, removed two unused stylesheets
2016-04-21 20:46:44 +12:00
Paul Clarke
3a778f23bf
Build and compile
2016-04-21 15:41:30 +12:00
Paul Clarke
01145301fa
Delete unwanted stylesheets and move remainder styles to better location
2016-04-21 15:39:58 +12:00
Paul Clarke
35e062d9f3
Update SilverStripe font icons
...
Added new icons
Updated license
moved location of font styles
2016-04-21 15:39:06 +12:00
Ingo Schommer
560ed0b3aa
Merge pull request #5329 from open-sausages/features/OSS-1657-campaign-preview
...
Added placeholder panel for items with no preview
2016-04-21 11:21:48 +12:00
Ingo Schommer
3594fa79c7
Include components/label in build
2016-04-21 11:19:30 +12:00
Paul Clarke
95e4415288
Fix for IE, added ability to adjust panel height based on the amount of toolbars
2016-04-21 11:19:30 +12:00
Paul Clarke
35a2e13085
Added modifier for img --fits-space, will need to use js to detect so styles can be adapted
2016-04-21 11:19:30 +12:00
Paul Clarke
9b5430a80c
Use bootstrap mixing text-truncate instead of custom styles
2016-04-21 11:19:29 +12:00
Paul Clarke
02bb158a27
Removed old typography, minor updates and rebase regressions
2016-04-21 11:19:20 +12:00
Paul Clarke
a7e5da8228
Fix for height
2016-04-21 11:03:45 +12:00
Paul Clarke
cc7170d424
improved consistency of toolbars included in preview and other areas of cms
2016-04-21 11:03:45 +12:00
Paul Clarke
6cd5bf2f3f
Preview panel as its own component, file preview styles, no preview message.
...
Improved layout reusability
Moved layout styles to its own stylesheet
Added scrollable panels
2016-04-21 11:03:42 +12:00
Ingo Schommer
4d43664057
Merge pull request #5318 from open-sausages/pulls/4.0/fix-page-routing
...
BUG fix routing for react sections
2016-04-21 09:11:20 +12:00
Damian Mooyman
dbd17bd49a
API Remove routing from silverstripe-component
...
BUG Fix page routing in subdirectory
BUG Fix top level admin sections not causing ajax load
2016-04-21 08:43:03 +12:00
Ingo Schommer
869f438253
Merge pull request #5351 from open-sausages/pulls/minor-css-fixes
...
Minor fixes to CMS panels to use the newer variables and sizes
2016-04-21 08:28:41 +12:00
Paul Clarke
978369bd63
Update old cms toolbars and menu to use new variables and heights so everything lines up
...
Includes fixes for menu borders and preview border
2016-04-21 08:28:12 +12:00
Paul Clarke
0d1d8c5888
Remove text-decoration on focus for campaign items
2016-04-21 08:24:41 +12:00
Ingo Schommer
43040d5b05
Merge pull request #5346 from open-sausages/pulls/4.0/static-file-restructure
...
Static file restructure
2016-04-20 21:15:32 +12:00
Ingo Schommer
19de22f427
API Moved frontend assets into admin/client/
...
admin/javascript => admin/client
admin/javascript/src => admin/client/src/legacy (mostly)
admin/scss/_variables.scss => admin/client/styles/_variables.scss
admin/scss => admin/client/styles/legacy/
admin/css/editor.css => admin/client/dist/css/editor.css
admin/css/screen.css => admin/client/dist/css/bundle.css
admin/images => admin/client/dist/images
admin/images/sprites/src => admin/client/src/sprites
admin/images/sprites/dist => admin/client/dist/sprites
admin/font => admin/client/dist/font
2016-04-20 21:13:10 +12:00
Ingo Schommer
cb7b2b09a8
Don't generate separate bootstrap.css files
...
We only need them in the main.css build file.
The bootstrap.scss already includes reboot and grid.
We're not using flex (yet), and can be built alongside main.css as well.
Reordered includes to ensure they bootstrap reboot gets included early.
2016-04-20 21:13:09 +12:00
Ingo Schommer
32dbd1d2b5
Consolidated style locations
2016-04-20 21:13:08 +12:00
Ingo Schommer
c5a20ab5fc
Restructure main SCSS includes
...
Makes more sense to go from generic to specific
2016-04-20 21:13:08 +12:00
Ingo Schommer
4c734abac9
Removed unused GridFieldPaginator.scss
...
Refactored a while ago through 3c516b7b97
2016-04-20 21:13:08 +12:00
Ingo Schommer
55d7e78875
Removed unused "grayscale" theme
...
Was never in active use, and has outdated variables
2016-04-20 21:13:08 +12:00
Ingo Schommer
dbf90b5e64
Removed _ieShared.scss
...
Already removed usage in 429682e
2016-04-20 21:13:08 +12:00
Ingo Schommer
5b96decb5c
Removed unused CSS files
...
UnitTesting.css was referring to web-based dev/tests runs which is no longer supported
SubmittedFormReportField.css was a user-forms specific sheet!
2016-04-20 21:13:07 +12:00
Hamish Friedlander
1b8b869754
Merge pull request #5350 from open-sausages/pulls/4.0/fix-chosen-behat-use
...
Fix Chosen.js selector for Behat feature
2016-04-20 14:22:22 +12:00
Ingo Schommer
8cf38720b5
Fix Chosen.js selector for Behat feature
...
The recent upgrade to Chosen.js 1.5 changes the generated markup:
It still renders an <a> tag, but without the "href" attribute.
This attribute isn't actually required to uniquely identify
the link in this structure.
2016-04-20 13:52:51 +12:00
Ingo Schommer
8215a9421e
Merge pull request #5343 from IgorNadj/patch-4
...
minor: fix docs broken link
2016-04-19 23:24:17 +12:00
Igor
ec5464a6dc
minor docs broken link
2016-04-19 22:21:26 +12:00
Ingo Schommer
ac88bf57b1
Merge pull request #5339 from IgorNadj/patch-3
...
Update CONTRIBUTING.md
2016-04-19 21:58:56 +12:00
Igor
654c133913
Update CONTRIBUTING.md
...
minor grammar
2016-04-19 21:29:18 +12:00
Devlin
93da45f699
Prevent Upload from showing default controller template ( fixes #4613 ) ( #4615 )
2016-04-19 19:10:57 +12:00
Daniel Hensby
4240785fc7
Check whether run from cli or from web request within cli-script.php ( #3984 )
...
* ENHANCEMENT - Improved access determination
* ENHANCEMENT - Added an additional check for the existence of the mod_rewrite module
2016-04-19 18:54:11 +12:00
