Damian Mooyman
7dfe145412
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# code/controllers/CMSFileAddController.php
# code/controllers/CMSPageAddController.php
# code/controllers/CMSPageHistoryController.php
# code/controllers/CMSSiteTreeFilter.php
# code/controllers/ContentController.php
# code/controllers/LeftAndMainPageIconsExtension.php
# code/controllers/SilverStripeNavigator.php
# code/model/SiteTreeFileExtension.php
# code/model/VirtualPage.php
# composer.json
# tests/model/ErrorPageTest.yml
# tests/model/FileLinkTrackingTest.yml
# tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +13:00
Sam Minnee
bbc3aaaf9f
MINOR: 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 -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
scott1702
6dc3fc1f26
Update asset admin toolbar
2015-10-30 10:05:51 +13:00
scott1702
c028278957
Update font icons to use new library
2015-08-25 15:08:09 +12:00
David Craig
41ce038c8f
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:23:37 +12:00
David Craig
cc3385b9f8
Move filters from panel to header
...
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
- Renamed to Bulk actions
- Styles updated
- Added placeholder text / removed redundant option
- Now appears in SiteTree view too
2015-06-24 09:58:48 +12:00
Arno Poot
184aeabcb4
Updated templates to be more consistent and removed trailing spaces
...
Edit
2013-07-18 13:14:29 +02:00
Ingo Schommer
1e1049b5c8
NEW "Show children as list" tree context action
...
Allows for easier navigation between tree and list,
particularly if a node has many children nodes
(since it doesn't require expanding that node).
Uses a new 'ss-tabs-force-active' class on the tabset
to enforce the correct view state. This also fixes an issue
where you couldn't link to a list view directly via URL.
2013-03-14 17:31:36 +01:00
Naomi Guyer
4fab9b8248
BUG Incorrect html nesting of breadcrumbs
...
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div
Relies on sapphire commit 72b4fbf
2012-11-22 12:19:38 +13:00
Ingo Schommer
a52514a306
ENHANCEMENT Tab style consolidation and design consistency
2012-11-06 22:24:01 +01:00
Ingo Schommer
abba77af51
Fixes required for jQuery UI 1.9
2012-11-06 15:54:37 +01:00
Ingo Schommer
098d3b6b8a
MINOR Changed CMS breadcrumbs markup to fit new inline-block CSS ( fixes #6882 )
2012-06-06 14:35:45 +02:00
Ingo Schommer
1bb6026240
BUGFIX Don't apply clientside deferred cache to list view since it relies on URL as a cache key which is set on the deferred container (=not replaced with view)
2012-06-05 17:16:58 +02:00
Ingo Schommer
ad7c443255
ENHANCEMENT Saving tab state for CMSPagesController
2012-05-30 16:04:51 +02:00
Ingo Schommer
c9fc7cda65
ENHANCEMENT Declaring Pjax fragments on CMS templates and forms
2012-05-30 15:06:54 +02:00
Robert Curry
28a1d0d4e7
BUGFIX: Change styles on tabs to new format.
2012-05-11 11:31:40 +12:00
Ingo Schommer
2fdc4e5f0b
ENHANCEMENT Section icons in CMS ( #7269 )
2012-05-03 13:49:44 +02:00
Ingo Schommer
75da9fd7cb
MINOR Renamed .ss-tabset to .cms-tabset in CMS templates in order to have more entwine flexibility
2012-04-17 22:59:11 +02:00
Ingo Schommer
6aeac37906
API CHANGE Combined "Pages" and "Edit Page" into a single menu entry
...
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
2012-04-17 22:59:08 +02:00
Normann Lou
bfb99aea6c
MINOR SSF-124 move the trunk of html code (commented out) to the position of the third tab so if it is commented in someday, it wont break the default selected tab.
2012-04-11 17:21:24 +12:00
Normann Lou
653625914d
ENHANCEMENT SSF-124 make tab select pages list view if the current url is 'listchildren' otherwise use the default action defined in TabSet.js
2012-04-11 15:01:31 +12:00
Normann Lou
dc01b74152
FEATURE SS-124 duplicate "Add New" and "Batch Action" into page list view
2012-04-10 15:49:57 +12:00
Normann Lou
f101595921
FEATURE SSF-124 first version of tree list view added
2012-04-05 15:39:46 +12:00
Ingo Schommer
e9c7fb5e1e
MINOR Removed temporary "gallery" and "list" panels from CMSPagesController, until they're actually implemented
2012-03-12 11:55:19 +01:00
Ingo Schommer
d09c071899
Merge branch 'master' into integration
...
Conflicts:
templates/Includes/AssetAdmin_Content.ss
2012-02-24 00:31:36 +01:00
Ingo Schommer
81d362d5f8
MINOR Styling
2012-02-23 23:15:37 +01:00
jbridson
128d3a8316
MINOR:added classes so that the tabs to change page view can have the appropriate icons.
2012-02-17 12:45:32 +13:00
Ingo Schommer
88952c0ac7
MINOR Using HTML5 data attributes for denoting layout in templates
2012-02-16 18:06:53 +01:00
Ingo Schommer
38cf7e5c4d
ENHANCEMENT Using new "tools" panel architecture to render CMS templates, which e.g. allows CMSPageEditController to reload the form without the tree in the side-by-side display variation, and hence avoids slowing down the loading and saving process
2012-02-15 14:28:07 +01:00
Ingo Schommer
f88d4006f8
ENHANCEMENT CMSMain->Breadcrumbs()
2012-02-14 16:11:38 +01:00
Normann Lou
40e7df9823
BUGFIX: SSF-107, Filter bar should be collapsed by default
2012-02-03 13:15:28 +01:00
Ingo Schommer
14d3dea87c
MINOR Added panel identifiers to enable cookie support, added collapsed panel view
2012-01-06 16:40:24 +01:00
Ingo Schommer
e35991b363
MINOR Misc styling fixes around dialogs and "add page" styling
2012-01-03 17:57:04 +01:00
Will Rossiter
c34ef60d82
BUGFIX prevent calling function on null record
2011-10-29 15:46:38 +13:00
Julian Seidenberg
2c4b1271c7
ENHANCEMENT: CSS styling of "Create Page" dialog box and adjusting dialog title to be consistent with label of button that creates it (SSO-8)
2011-09-29 13:10:56 +13:00
Will Rossiter
d90ea0d236
ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain API.
2011-09-19 17:30:46 +02:00
Ed
ebb1e0f370
MINOR Additional HTML for tree styling in SiteTree->getTreeTitle()
2011-07-08 15:36:31 +02:00
Ingo Schommer
38db63c3b0
MINOR Clearer CSS classes in CMS controller templates, added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag)
2011-07-08 15:36:30 +02:00
Ingo Schommer
1ad4bd6dfd
MINOR Panel markup for AssetAdmin and CMSPagesController templates
2011-07-06 10:05:55 +02:00
Frank Mullenger
b4366c9ca9
ENHANCEMENT 'data-hints' attribute into root of CMSMain site tree, changed from 'allowedParents' to 'disallowedParents', 'allowedChildren' to 'disallowedChildren' for brevity ( fixes #6577 )
2011-05-08 16:27:20 +12:00
Ingo Schommer
bf8bc1d856
MINOR Added CMSPageHistoryController, CMSPageReportsController, marked placeholders for new functionality in AssetAdmin
2011-04-30 16:49:36 +12:00
Ingo Schommer
9a09aaf42b
ENHANCEMENT Changed CMSMain->AddForm() to a modal dialog, showing page types and their descriptions as radiobuttons rather than a dropdown
2011-04-28 22:49:34 +12:00
Ingo Schommer
5a0208d77a
MINOR Wrapping cms-content-header <div> in order to provide overflows without line breaks
2011-04-28 22:49:34 +12:00
Ingo Schommer
58416e5dea
ENHANCEMENT Added CMSPagesController
2011-04-28 22:49:34 +12:00
