tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,550 Commits 29 Branches 403 Tags 28 MiB
332e490147
Commit Graph

843 Commits

Author SHA1 Message Date
Andrew Short
e17fb17520 Merge branch '3.1' 
Conflicts:
	lang/es.yml
 2013-11-11 18:24:03 +11:00
Ingo Schommer
b726180ab8 API JS i18n files with short locale names, generated by build task 
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
 2013-10-25 01:26:57 +02:00
Ingo Schommer
0a1ffd3e1a Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
 2013-10-20 13:51:19 +02:00
Dawid Cieszyński
69ae8a8fed FIX Remove invalid single quote 2013-10-16 00:06:41 +02:00
Ingo Schommer
dd29936fee Merge remote-tracking branch 'origin/3.1' 2013-10-10 12:10:20 +02:00
Simon Welsh
0c2514d13e Calculate where to scroll to based off the position in the div 
Also, only scroll if not currently visible.
 2013-10-10 15:42:49 +13:00
Ingo Schommer
6a8de3090c Updated Te Reo translations 2013-10-08 11:37:43 +02:00
Ingo Schommer
1a40994527 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
 2013-10-06 19:07:52 +02:00
Shea Dawson
0d2d293c02 BUGFIX check if hints are defined for given pagetype before using. Fixes #861 2013-10-03 14:20:54 +13:00
Loz Calver
595a0375e7 Stop MenuTitle updating tree on change 
If the MenuTitle is changed and the tree updates, not saving the
changes to the page leaves the tree with the new title instead of the
old, correct one (until a refresh). This also seems counter-intuitive
anyway - suggesting to users that their updated MenuTitle has been
saved before it actually has.
 2013-10-02 12:53:03 +02:00
Ingo Schommer
26b086c3f7 Escape pl_PL.js (fixes #859) 2013-10-02 12:24:23 +02:00
Ingo Schommer
ef21906063 "add page" behaviour fixed to work with new FormField IDs (#786) 2013-08-28 11:10:32 +02:00
Ingo Schommer
c62f992dc3 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:28 +02:00
Ingo Schommer
010869a9b5 Merge pull request #828 from sheadawson/827-treescroll 
CMS tree pane to scroll to the page being edited. Fixes #827
 2013-08-20 13:32:22 -07:00
Ingo Schommer
c4e54fd7eb Fixed fromDocument usage in .cms-tree 
See https://github.com/silverstripe/silverstripe-cms/pull/823
 2013-08-20 15:37:17 +02:00
Shea Dawson
bb86373ab9 CMS tree pane to scroll to the page being edited. Fixes #827 2013-08-19 11:18:37 +10:00
Naomi Guyer
a2a4957fa5 BUG: Context menu too long (Fixes #811) 
Added javascript to add and remove classes on context sub menus, to
allow for multi column layout.
 2013-08-07 13:46:40 +12:00
Ingo Schommer
c21c9cba0d Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:10:26 +02:00
Ingo Schommer
bd86ff848c Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	javascript/CMSMain.Tree.js
 2013-05-31 17:53:05 +02:00
Matt Peel
3cc6485c14 Add default params to _t() calls to ensure if a translation isn't found, it falls back to a useful English string 2013-05-21 14:57:29 +12:00
Loz Calver
f51448ced4 FIX 'Add new' page button missing ParentID 
Slight typo causing this. Also slightly amended how extra URL
parameters are tagged on to prevent &undefined being appended to URL
 2013-05-14 15:38:07 +01:00
Sean Harvey
4f88dcbbfc BUG ShowUnpublished checkbox with initial state not working 
If ShowUnpublished checkbox initial state is checked, the history
doesn't show the unpublished versions up front. The user would need to
uncheck the box then check again, as only the change event would handle
the toggling of showing unpublished versions.

Moved the ShowUnpublished handler into a separate entwine class, and
run the same toggle code onmatch, as well as onchange.
 2013-05-13 16:24:00 +12:00
Ingo Schommer
7ecf56490a FIX URL concat in tree actions (broke with 'translatable' module) 2013-05-08 09:38:25 +02:00
Ingo Schommer
c0302bc24d Merge remote-tracking branch 'origin/3.1' 2013-04-29 08:59:11 +02:00
jean
685b82a985 FIX #673 Do not prevent default browser behaviour when selecting page type on new page creation 2013-04-12 19:39:54 +12:00
Ingo Schommer
2227ed3629 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:26:24 +02:00
ARNHOE
7305aca95b MINOR: added translation for children list and added tree translations 2013-04-10 10:54:09 +03:00
Ingo Schommer
d7435cde71 Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix 
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570)
 2013-04-08 07:58:49 -07:00
Simon Welsh
6482eeb137 Update pl_PL.js 2013-04-08 21:32:05 +12:00
jean
c18f3fe446 BUGFIX Use onadd instead of onmatch on cms-add-form when creating new page #673 2013-04-08 11:03:12 +12:00
wkulesza
125edeb12e Update pl_PL.js 2013-04-06 22:00:05 +13:00
Loz Calver
ea446f2ade Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570) 2013-04-05 14:06:32 +01:00
Ingo Schommer
4d3e19958e Merge pull request #309 from a2nt/multibyte_url_convertion 
IMPROVEMENT Convert multibyte URLs preview to human readable format
 2013-04-02 02:31:07 -07:00
a2nt
73e97e7c42 IMPROVEMENT Convert multibyte URLs preview to human redable format 2013-04-03 06:35:42 +07:00
Ingo Schommer
32af5336c3 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
 2013-04-02 02:01:48 +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
0ebd52516b FIX Unset "underneath page" title when switching to "top" in "add page" 2013-03-25 23:41:21 +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
Andrew Short
18f4f68101 Merge branch '3.1' 2013-03-15 21:59:52 +11:00
Ingo Schommer
ec93643f49 NEW Set correct ParentID when creating page from list view 2013-03-14 19:00:56 +01: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
jean
2ba26ba701 FIX 8316 Prevents browser default behaviour when changing the pagetypes if creating a new page 2013-03-13 11:05:47 +13:00
Ingo Schommer
c09bca6fac Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	lang/ja_JP.yml
	lang/lt.yml
	lang/pl.yml
 2013-02-18 14:18:27 +01:00
Ingo Schommer
b74af926ce Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/travis/before_script
 2013-02-18 14:16:12 +01:00
ARNHOE
b36ab5acaa Create nl_NL.js 2013-02-18 03:02:45 -08:00
Ryan Wachtl
b4c9c18b33 BUG: Prevent conflict when using multiple SiteTreeURLSegmentField's in CMS edit form 2013-02-04 15:04:52 -06:00
Ingo Schommer
00097a5d5d NEW Clickable URL preview in CMS 
- Refactored SiteTreeURLSegmentField to render controls in template
rather than JS for better clientside performance, and cleaner behaviour.
- Added dynamic ellipsis to start of URL, to retain most relevant
part of the URL (the last bits)
- Added "suffix" setting to field, which defaults to ?stage=Stage
- Removed prefix from edit view to leave more room for URL

Thanks to @sunnysideup for getting this started in
https://github.com/silverstripe/silverstripe-cms/pull/269
 2013-02-04 12:12:28 +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
Kirk Mayo
1571d3542d BUG Only use $.button in onunmatch if init'ed (fixes #8181) 2013-01-21 08:43:29 +01:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
Ingo Schommer
6cb77108f5 Remove "changed" style from buttons if fields are reset 2012-12-17 23:02:32 +01:00
Mateusz Uzdowski
26cc14a930 API Rework the CMS actions to use alternating buttons and drop-ups. 
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
 2012-12-13 19:10:39 +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
98e824bced Avoid duplicating ReportAdmin search params (fixes #8046) 2012-12-04 10:22:29 +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
Simon Elvery
91e48b850c BUGFIX Provide fallback text for translations. 2012-11-14 10:03:05 +10:00
Ryan Wachtl
5a5290421b BUG Fixing Update URLSegment from Title behavior. 
The class name of a field used to determine if a page was "new" had changed from LiveURLSegment = > LiveLink.
 2012-10-05 22:40:10 -05:00
Ingo Schommer
a6d09988ed Merge pull request #214 from silverstripe-droptables/ssexpress 
Tweaks to CMS required for Translatable
 2012-10-02 02:10:47 -07:00
Robert Curry
7316f96190 BUG: Only add validation to non-read only URLSegmentField 
Fix required for Translatable, as it has a read-only URLSegmentField.
 2012-10-02 11:29:10 +13:00
Sean Harvey
548ec241a9 BUG Fixing "public function" not allowed in SilverStripeNavigator.js 2012-09-24 15:14:38 +12:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
jean
45819cfba2 FIX 7856 Show the Create button as disabled if no pagetypes are available for page creation 2012-09-11 14:56:13 +12:00
Ingo Schommer
fd8e852c92 BUG Disallow "add page here" shortcut to avoid $allowed_children edge cases (fixes #7694) 2012-09-02 18:20:49 +02:00
Ingo Schommer
b637d04235 Merge pull request #175 from creamarketing/swedish-javascript-translations 
Added Swedish javascript translations
 2012-08-29 04:50:37 -07:00
Ryan Wachtl
5f9362e742 BUG Visual cue that URLSegment is updating 
Added a loading class on .field.urlsegment to indicate that the URLSegment is updating its value, set before and after self.suggest().
 2012-08-17 03:05:39 -05:00
Ingo Schommer
2923e55c71 BUG Restrict URLSegment preview to editable fields 
This fixes a bug where the Translatable module
would have a duplicate preview because it had
another ".urlsegment" field showing the value in its
original language.

See https://github.com/silverstripe/silverstripe-translatable/issues/43
 2012-08-16 09:48:54 +02:00
Ingo Schommer
2276336d6e Maori translation of URLSegment JS UI 2012-08-06 10:50:05 +02:00
Ingo Schommer
635c05b3b4 URLSegment JS UI globalization 2012-08-06 10:49:25 +02:00
Niklas Forsdahl
61862e3834 Added Swedish javascript translations 2012-07-31 09:13:59 +03:00
Naomi Guyer
7dfc7dec1d BUG: Missing comma in Maori language translation 2012-07-26 17:56:23 +12:00
Naomi Guyer
c97ed78fd9 ENHANCEMENT: Maori Language javascript 2012-07-26 17:21:16 +12:00
Hamish Friedlander
6b20bc89ec Add javascript japanese translation - thanks Yuki Awano 2012-07-25 09:43:18 +12:00
Ingo Schommer
57c615d6b2 NEW Reinstated filters in ReportAdmin 
- Moved report table generation back to its original location in Report->getCMSFields(),
in order to keep it customisable rather than duplicating it in ReportAdmin.
- Using History.js to set URL state and reload panel
- Namespacing filter GET parameters in order to only include them in URL state
 2012-07-12 16:19:23 +02:00
Ingo Schommer
db47dcff47 Fixed url concat in SiteTreURLSegmentField.js 
Needed to handle existing GET params, e.g. added from
the translatable module
 2012-06-29 14:21:44 +02:00
Sam Minnee
6be8602295 BUG: Update MenuTitle whenever Title is changed and the value of Title used to be. Bubble the change to update LHS tree. (Trac #7507) 
We had to use .data() to track OrigVal manually, but this means that the MenuTitle can be updated much more reliably.  In addition, we trigger the change-handler for MenuTitle that updates the LHS tree.  Unfortunately, we couldn't simply use .trigger('change') because it broken in IE8 due to an entwine bug.
 2012-06-22 13:04:40 +12:00
Sean Harvey
d55eb13ecc BUGFIX Ensure that we only select the first item when updating tree 
nodes, otherwise we change the title for all nested node's text as well.
 2012-06-20 22:01:36 +12:00
Sam Minnee
447ef16294 BUGFIX: Update the tree w/ javascript when MenuTitle is updated, not Title (Trac #7496) 2012-06-18 17:34:35 +12:00
Ingo Schommer
c8052da5b8 BUGFIX Corrected page history pane loading (fixes #7477) 2012-06-15 12:50:54 +02:00
Sam Minnee
bfe354de5e BUGFIX: Disable javascript not used right now because assets don't have batch actions. (Trac #7367) 2012-06-15 15:50:11 +12:00
Ingo Schommer
f94f03defe MINOR Removed unused jQuery.dialog creation in CMSMain.AddForm.js, which causes mem leaks (now uses dedicated pages/add UI) 2012-06-13 23:36:46 +02:00
Ingo Schommer
e99b2e9d31 MINOR Bubbling up GridField row edit event in AssetAdmin.js so default behaviour for files (not folders) can kick in 2012-06-05 13:46:22 +02:00
Ingo Schommer
63467b0cb5 MINOR Moved localised JS messages in correct module (fixes #7393) 2012-06-04 11:53:11 +02:00
Ingo Schommer
8847506322 BUGFIX Selecting correct parent when adding a new page (fixes #7188) 2012-06-03 19:54:14 +02:00
Sam Minnee
b6ca328494 BUGFIX: Fixed add page context menu, replacing references to .pagetype with .ssclass. (#7398) 2012-05-25 10:36:42 +12:00
Sean Harvey
be2c811639 BUGFIX Adding missing onunmatch in AssetAdmin.DragDrop 2012-05-23 16:09:08 +12:00
Sean Harvey
b0a026b4c6 BUGFIX Fixed url_segment undefined error in CMSMain.EditForm, assuming 
*all* title fields have a URLSegment field associated with them, which
they don't.
 2012-05-22 14:05:21 +12:00
Mateusz Uzdowski
b2468eb354 BUGFIX: add missing selectors and namespace qualifiers 2012-05-22 11:28:27 +12:00
Mateusz Uzdowski
00734f5498 BUGFIX: add missing onunmatches causing exceptions in entwine 2012-05-18 14:33:17 +12:00
Mateusz Uzdowski
aaeebd6ea2 BUGFIX: change namespace for the tree so all matchers are executed 
Refer to similar commit on framework
(55cabd6fbfe5c2f90f0825ed2a51098dc9a2f5ac)
 2012-05-18 12:23:30 +12:00
Mateusz Uzdowski
b75483e1da BUGFIX: add missing _super calls to all matchers and unmatchers 
Otherwise some matchers might not be triggered as expected.
 2012-05-18 12:23:30 +12:00
Ryan Wachtl
f56126470d ENHANCEMENT Update URLSegment from Title (closes #6981) 2012-05-12 23:55:26 -05:00
Ryan Wachtl
2945f9d963 BUGFIX: Updating URLSegment from Title field when new page is created 2012-05-10 10:21:30 -05:00
Ingo Schommer
1863bb00db ENHANCEMENT Refactored SiteTreeURLSegmentField JS to a more selector based approach (future proof field for reusability e.g. in ModelAdmin with custom DataObject URL previews) 2012-05-10 14:50:08 +02:00
Ryan Wachtl
bd94c6f336 Trac 6981: Opt-in URL Updating 2012-05-09 19:01:57 -05:00
Ingo Schommer
d8e62221b5 MINOR Tree metadata naming 2012-05-07 14:45:39 +02:00
Ingo Schommer
6ec6b107ca BUGFIX Don't require ParentModeField in CMSpageAddController submissions, to allow for easier programmatical submission of "add page" form (via CMS tree). Reset any selected parent nodes in the interface instead 2012-05-07 14:30:08 +02: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
Sean Harvey
647d57809b BUGFIX Cleanup of onclick() being called in onmatch for ParentType 
field. Use a redraw() function instead which is called in onmatch and
onclick
 2012-04-23 21:21:31 +12:00
Sean Harvey
614f307a37 ENHANCEMENT When loading CMS, ensure that "Parent page" tree dropdown is 
either hidden or shown depending on initial "Page location" state
 2012-04-23 21:02:29 +12:00