Ingo Schommer
e0aa610172
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
templates/Includes/ReportAdmin_Content.ss
templates/ReportAdminForm.ss
2013-08-03 19:46:46 +02:00
Arno Poot
afd9f28279
Updated siteconfig layout to be more like modeladmin
2013-07-26 17:45:28 +02:00
Arno Poot
184aeabcb4
Updated templates to be more consistent and removed trailing spaces
...
Edit
2013-07-18 13:14:29 +02:00
Andrew Short
27de4367b8
Merge branch '3.1'
2013-07-10 20:07:33 +10:00
Ingo Schommer
9417092040
Fixed installer message escaping, unified usage ( fixes #2211 )
...
Same entity was already fixed in a different file,
we can't have them use different strings, so used the new one instead.
2013-07-10 10:29:04 +02:00
Ingo Schommer
a29ce594a1
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:57 +02:00
Naomi Guyer
9dfc0b0e76
Add generic notice class to filter panels
...
* Added cms-notice class to filter panels for easier reuse of styles
2013-06-04 12:05:11 +12:00
Ingo Schommer
c21c9cba0d
Merge remote-tracking branch 'origin/3.1'
2013-05-31 18:10:26 +02:00
Ingo Schommer
7ecf56490a
FIX URL concat in tree actions (broke with 'translatable' module)
2013-05-08 09:38:25 +02:00
Ingo Schommer
8eb3840325
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
Ingo Schommer
1bad0742fb
Merge pull request #300 from chillu/pulls/show-children-as-list
...
NEW "Show children as list" tree context action
2013-03-18 04:13:09 -07:00
jean
59e66f39b7
FIX Ticket #8318 Append the HTML used for expanding/collapsing the site tree column in template instead of creating it on the fly with js
2013-03-18 08:57:13 +13:00
Andrew Short
18f4f68101
Merge branch '3.1'
2013-03-15 21:59:52 +11: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
jean
2dd0e3f02e
NEW Restored duplicate and duplicated with children functionality, as in 2.4 See ticket #7602
...
Conflicts:
javascript/CMSMain.Tree.js
templates/Includes/CMSMain_TreeView.ss
2013-03-13 10:04:09 +01:00
Ingo Schommer
8ab66c93b6
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/reports/Report.php
composer.json
2013-01-21 11:24:05 +01:00
Will Rossiter
06e8499070
Remove outdated ReportAdmin assets
2013-01-21 16:53:19 +13:00
Ingo Schommer
58d316e985
Moving "edit tree" button next to "add new" ( fixes #8119 )
2012-12-17 15:35:52 +01:00
Ingo Schommer
f4128a0839
Revert "BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041"
...
This reverts commit a63a9f0e74
.
Broken by merging in 0be51a93213, which works on 3.0,
but failed once we put those two patches together in 3.1.
They fix the same problem on different ends, and assume
the respective other behaviour still exists.
2012-12-13 00:28:39 +01:00
Naomi Guyer
35cbe28188
Re-add preview button for IE<=7. Side-by-side disabled for these.
...
Preview will open in new window.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
772961cb5e
Add a secondary side-by-side state selector to the edit form
...
For situations when preview is not visible (and options with it).
2012-12-10 18:09:54 +01:00
Naomi Guyer
639f6e4d95
NEW Side by side editing functionality - first cut (os#7412)
...
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.
Relies on sapphire's f95fadc84416835302fe6c8448054960b5e7ec65
2012-12-10 18:09:54 +01:00
Ingo Schommer
f9a5601fa3
BUG Enforce "add page" restrictions, improve UI ( fixes #7879 )
...
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
2012-12-03 16:52:17 +01:00
Ingo Schommer
98cd09a852
Merge pull request #251 from silverstripe-rebelalliance/8041
...
BUG removed class cms-panel-link as it was calling loadPanel to be calle...
2012-12-03 01:25:06 -08:00
Kirk Mayo
a63a9f0e74
BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041
2012-12-03 12:11:31 +13: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
bd86cf2c50
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
code/model/SiteTree.php
2012-11-06 19:56:04 +01:00
Ingo Schommer
abba77af51
Fixes required for jQuery UI 1.9
2012-11-06 15:54:37 +01:00
Sean Harvey
79e6304ce1
Merge branch '3.0'
2012-11-05 15:13:06 +13:00
Sean Harvey
b00397968b
Tweaking text for "You can start editing" on successful install
2012-11-05 11:12:49 +13:00
Saophalkun Ponlu
79cc947ed8
Batch actions UI enhancement ( #7878 )
2012-11-02 23:05:20 +01:00
Ingo Schommer
7131e167f1
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
code/model/RedirectorPage.php
2012-10-30 17:54:55 +01:00
Sean Harvey
f72cef95e6
Merge pull request #224 from adrexia/3.0
...
BUG: Installation successful "CMS" link has broken href (fixes #7874 )
2012-10-17 19:04:40 -07:00
Naomi Guyer
c9244456e0
BUG: Installation successful "CMS" link has broken href ( fixes #7874 )
...
Fixed the template component of this bug. Language files will also need
to be updated. eg. "Start editing" should appear in the en lang files
as:
StartEditing: 'You can start editing your site''s content by opening <a
href="{link}">the CMS</a>
2012-10-18 14:47:11 +13:00
Ingo Schommer
2f7e6a7303
Merge pull request #221 from adrexia/add-cms-buttons
...
BUG: Add "add new" button to Pages list view (fixes 7649)
2012-10-16 07:23:00 -07:00
Naomi Guyer
06e184a97f
BUG: Add "add new" button to Pages list view (fixes 7649)
...
Rearranged the templates around CMSPagesController_ContentToolbar and
uncommented the toolbar from the pages list view so the add new button
would be included with including actions that aren't applicable to the
gridfield.
Linked to https://github.com/silverstripe/sapphire/pull/684/commits
2012-10-15 14:59:04 +13:00
Jeremy Bridson
76e569a8bb
ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change.
2012-10-05 16:27:13 +13:00
Ingo Schommer
7525e3c977
Merge pull request #183 from adrexia/installer
...
BUG: Installer templates
2012-08-29 02:25:19 -07:00
Naomi Guyer
362e9795fd
Replace tutorial link
2012-08-29 11:24:37 +12:00
Naomi Guyer
4fdc76d904
BUG: Installer templates
...
Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
2012-08-22 13:52:33 +12:00
Damian Mooyman
7807842eb1
FIXED: Additional issue where the add-page ajax parameters wouldu incorrectly concatenate additional query parameters into the add action url. Resolved by moving URL concatenation from view to controller where Controller::join_links is available
2012-08-21 15:50:03 +12:00
Ingo Schommer
77ec21fe9d
BUG Fully qualified namespace for _t() in templates
...
Was inferred by the containing file previously,
which is deprecated behaviour, because it obscures
the fact that renaming an template file or copying
template code will change the context of the translations.
While it would be nice to use shorter and more readable namespaces,
this change would remove all existing translations.
Since there is no (easy) migration of entities to a new namespace,
having verbose template code is the lesser of two evils.
2012-08-06 13:44:33 +02:00
Ingo Schommer
2ba3fbe42d
'updatetreenodes' URL in tree template ( #7450 )
2012-07-23 21:24:28 +12:00
Ingo Schommer
3ff0c428cf
Ignore ajaxified tabsets on tab state saving
...
This prevents them from ping-ponging between the two states
in infinite loops.
2012-07-13 17:37:48 +02:00
Ingo Schommer
44c237c954
Adding DOM ids for all tabsets to aid saving their state
2012-07-13 16:44:01 +02:00
Ingo Schommer
b74178e7fd
BUG Reload full view in admin/settings to avoid tabs breaking
...
Had the pjax "CurrentForm" marker set to the <form> tag,
which makes sense, but excludes the tabs. On refresh,
the tabset wasn't reinitialized, showing all form elements on
one page. Its easier to simply refresh the whole content area.
2012-07-13 11:00:21 +02:00
Ingo Schommer
c051b80b73
MINOR Using links for fake remote tabs in CMSMain_Content.ss to avoid 'missing fragment identifier' errors from jQuery UI.
2012-06-15 00:35:58 +02:00
Ingo Schommer
7f27474159
BUGFIX Show AssetAdmin tree by not invoking $EditForm twice in template
...
Both for performance reasons, and for weird behaviour on the second invocation (doesn't retain the same record context)
2012-06-14 20:36:36 +02:00
Andrew Short
cdea489fcb
BUGFIX: Catch and display validation errors when adding a page.
2012-06-11 23:19:59 +10: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
6ac836348a
MINOR Fixed tab selection state (changed JS behaviour)
2012-06-05 14:04:25 +02:00
Ingo Schommer
ca9f4f6f6f
Merge branch 'pjax-multiple'
2012-06-05 14:01:20 +02:00
Ingo Schommer
8847506322
BUGFIX Selecting correct parent when adding a new page ( fixes #7188 )
2012-06-03 19:54:14 +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
Mateusz Uzdowski
50cbef7933
BUGFIX: remove unnecessary class that breaks the tab opening.
...
This class should be applied higher in the hierarchy so it also
includes panels - and it's already there too.
2012-05-23 15:49:10 +12:00
Sean Harvey
92019876d2
MINOR Removing unused template control
2012-05-18 16:47:12 +12:00
Julian Seidenberg
7112032b4c
BUGFIX: fixing the look of Settings tab in the CMS if it has multiple tabs
2012-05-18 16:33:34 +12:00
Julian Seidenberg
aa7bc23992
ENHANCEMENT: refactoring template "control" loops into "loop" and "with" to fit with the new template syntax
2012-05-18 16:32:44 +12:00
Ingo Schommer
7b40c5f0a1
MINOR Using search parameters in "edit tree" link (which ensures we include decorated parameters like 'locale' from the 'translatable' module)
2012-05-15 21:34:26 +02:00
Ingo Schommer
b9cae47135
BUGFIX Don't link to views in CMS tabs, use data-href instead to avoid jQuery.tabs() interfering with its own ajax load magic (specifically fixes a problem where admin/pages/edit/99 was detected as different from admin/pages/edit/99/?locale=de_DE)
2012-05-15 21:32:03 +02:00
Ingo Schommer
c185c737dd
MINOR More extension points in CMSMain (specifically to allow for 'locale' query parameter and language drop down of the 'translatable' extension)
2012-05-15 21:30:53 +02:00
Sean Harvey
5d825f38b7
Merge pull request #126 from mateusz/os7304
...
BUGFIX: Check the drag and drop radio by default.
2012-05-10 22:38:53 -07:00
Robert Curry
28a1d0d4e7
BUGFIX: Change styles on tabs to new format.
2012-05-11 11:31:40 +12:00
Mateusz Uzdowski
9b39acb08c
BUGFIX: Check the drag and drop radio by default.
...
The default state of the tree is drag and drop mode.
2012-05-11 10:29:13 +12:00
Ingo Schommer
ce58e55cc1
MINOR Consistent location for CSS classes on CMS tabsets
2012-05-08 15:31:28 +02:00
Normann Lou
440c96efb8
BUGFIX: replace "<!-- -->" with "<%-- --%>" for the blocks that are definately not needed to be processed by SSViewer to limit the chances of producing nested html comment tag "<!--<!-- -->-->"
2012-05-04 15:56:58 +12:00
Ingo Schommer
7c25754cb1
ENHANCEMENT Localization of installation success screen
2012-05-03 17:53:33 +02:00
Ingo Schommer
2fdc4e5f0b
ENHANCEMENT Section icons in CMS ( #7269 )
2012-05-03 13:49:44 +02:00
Ingo Schommer
63cef2af22
MINOR Disable batch actions in pages list view until we've implemented checkboxes in GridField
2012-05-01 17:58:42 +02:00
Ingo Schommer
c6cca21c5e
MINOR Removed duplicate HTML ids from tools panels, which meant they were sharing a collapse state cookie (see #7210 ). Marking AssetAdmin filters and 'edit page" tree sidebar as expanded by default, but the filters on "pages" as collapsed.
2012-05-01 14:08:14 +02:00
Ingo Schommer
f5d1831b0c
MINOR Reverting panel collapse changes for filters (see pull requests #383 and #385 )
2012-05-01 13:01:32 +02:00
Sean Harvey
e277b6f0d9
Merge pull request #109 from adrexia/7210-close-filter-panel-default
...
ENHANCEMENT: Make filter closed (#7210 )
2012-04-30 18:44:12 -07:00
Naomi Guyer
84045ccfed
ENHANCEMENT: Make filter closed ( #7210 )
...
This adds a class to the filter template so that the javascript in
Framework may target the filter panel
2012-05-01 11:17:27 +12:00
Ingo Schommer
98a0331a48
BUGFIX Fixed "add page" action when invoked through tree context menu (and removed URL hardcoding in JS) ( fixes #7155 )
2012-04-30 16:42:45 +02:00
Ingo Schommer
4fd757341a
MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview()
2012-04-18 22:59:31 +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
Jeremy Bridson
4443d0042a
ENHANCEMENT:Trac 6882 - created include for back button and altered the templates accordingly
2012-04-13 16:05:48 +12: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
Andrew O'Neil
4c76c8563c
ENHANCEMENT: Use GridFields to show reports in the ReportAdmin
2012-04-04 17:58:29 +12:00
jbridson
c6bfd0ae42
MINOR:changed the heading 'add pages' to add page trac #7026
2012-03-27 14:57:39 +02: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
c94308d21d
MINOR Implemented "Add new" link in CMSPagesController
2012-03-08 18:24:35 +01:00
Ingo Schommer
3670fe0530
ENHANCEMENT Show AssetAdmin breadcrumbs+tabs outside of search+editform panels
2012-03-07 17:02:08 +01:00
Ingo Schommer
d1581c2b9b
ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField
2012-03-02 20:45:34 +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
f216c783c6
Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12'
2012-02-23 23:39:06 +01:00
Ingo Schommer
81d362d5f8
MINOR Styling
2012-02-23 23:15:37 +01:00
Stig Lindqvist
876c809a7d
ENHANCEMENT Filterpanel for assetadmin
2012-02-21 16:02:54 +13:00
Ingo Schommer
f620f9b46c
MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons
2012-02-17 15:30:37 +01:00
jbridson
371f42e61a
MINOR:added classes for assets page so that the icons for view tabs appear.
2012-02-17 12:45:32 +13: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
68e9e91a78
ENHANCEMENT New panel styling for AssetAdmin and CMSFileAddController (SSF-24)
2012-02-16 13:59:29 +01:00