Merge remote-tracking branch 'origin/3.1'

code/controllers/CMSMain.php

@@ -202,10 +202,18 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		return $link;
 	}
 
-	public function LinkPageAdd($extraArguments = null) {
+	public function LinkPageAdd($extra = null, $placeholders = null) {
 		$link = singleton("CMSPageAddController")->Link();
 		$this->extend('updateLinkPageAdd', $link);
-		if($extraArguments) $link = Controller::join_links ($link, $extraArguments);
+
+		if($extra) {
+			$link = Controller::join_links ($link, $extra);
+		}
+
+		if($placeholders) {
+			$link .= (strpos($link, '?') === false ? "?$placeholders" : "&$placeholders");
+		}
+
 		return $link;
 	}
 	
@@ -634,6 +642,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			$form->addExtraClass('center ' . $this->BaseCSSClasses());
 			// if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
 			$form->setAttribute('data-pjax-fragment', 'CurrentForm');
+			// Set validation exemptions for specific actions
+			$form->setValidationExemptActions(array('restore', 'revert', 'deletefromlive', 'rollback'));
 
 			// Announce the capability so the frontend can decide whether to allow preview or not.
 			if(in_array('CMSPreviewable', class_implements($record))) {

javascript/lang/mi_NZ.js

@@ -28,12 +28,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
 		'WidgetAreaEditor.TOOMANY': 'Aroha noa, kua taea te mōrahi o ngā taupānga iti i tēnei wāhi',
 		'AssetAdmin.ConfirmDelete': 'Kei te tino hiahia muku i tēnei kōpaki me ngā kōnae i roto?',
 		'Folder.Name': 'Ingoa kōpaki',
-		'URLSEGMENT.Edit': 'Whakatika',
+		'Tree.AddSubPage': 'Tāpiri whārangi hou ki konei',
-		'URLSEGMENT.OK': 'Tiaki',
+		'Tree.Duplicate': 'Tārite',
-		'URLSEGMENT.Cancel': 'Whakakore',
-		'Tree.AddSubPage': 'Tāpiritia he whārangi hōu ki konei',
 		'Tree.EditPage': 'Whakatika',
+		'Tree.ThisPageOnly': 'Tēnei whārangi anake',
+		'Tree.ThisPageAndSubpages': 'Tēnei whārangi me ngā whārangi iti',
+		'Tree.ShowAsList': 'Whakaatu tamariki hei rārangi',
 		'CMSMain.ConfirmRestoreFromLive': "Kei te tino hiahia tārua i te ihirangi kua whakaputaina ki te pae hukihuki?",
-		'CMSMain.RollbackToVersion': "Kei te tino hiahia hoki ki te tauira #%s o tēnei whārangi?"
+		'CMSMain.RollbackToVersion': "Kei te tino hiahia hoki ki te tauira #%s o tēnei whārangi?",
+		'URLSEGMENT.Edit': 'Whakatika',
+		'URLSEGMENT.OK': 'ĀE',
+		'URLSEGMENT.Cancel': 'Whakakore'
 	});
 }

lang/mi.yml

@@ -5,11 +5,12 @@ mi:
     AppCategoryArchive: Puranga
     AppCategoryAudio: Ororongo
     AppCategoryDocument: Tuhinga
+    AppCategoryFlash: Kohiko
     AppCategoryImage: Atahanga
     AppCategoryVideo: Ataata
     BackToFolder: 'Hoki ki te kōpaki'
     CREATED: Rā
-    CurrentFolderOnly: 'Ka whakatiki ki te kōpaki o nāianei?'
+    CurrentFolderOnly: 'Me whakatiki ki te kōpaki o nāianei?'
     DetailsView: Ngā Taipitopito
     FILES: Ngā Kōnae
     FILESYSTEMSYNC: 'Tukutahi kōnae'
@@ -56,7 +57,7 @@ mi:
     ReasonDropdownRPBROKENLINK: 'Whārangi tuku anō e tohu ana ki te whārangi kāore i reira'
     ReasonDropdownVPBROKENLINK: 'Whārangi mariko e tohu ana ki te whārangi kāore i reira'
     RedirectorNonExistent: 'Whārangi tuku anō e tohu ana ki te whārangi kāore i reira'
-    VirtualPageNonExistent: 'Whārangi mariko e tohu ana ki te whārangi kāore i reira'
+    VirtualPageNonExistent: 'whārangi mariko e tohu ana ki te whārangi kāore i reira'
   CMSAddPageController:
     Title: 'Tāpiri whārangi'
   CMSBatchActions:
@@ -79,6 +80,8 @@ mi:
     DELETE: 'Mukua te hukihuki'
     DELETEFP: Muku
     DESCREMOVED: 'me ngā uri {count}'
+    DUPLICATED: 'I momoho te tārite i ''{title}'''
+    DUPLICATEDWITHCHILDREN: 'I momoho te tārite i ''{title}'' me ngā tamariki'
     EMAIL: Īmēra
     EditTree: 'Whakatika Rākau'
     ListFiltered: 'Rārangi kua tātaritia'
@@ -92,18 +95,23 @@ mi:
     PUBALLFUN2: "Ko te pēhi i tēnei pātene he taurite ki te haere ki ia whārangi me te pēhi i te \"whakaputaina\". Ko te tikanga, ka whakamahia tēnei pātene i muri ake i te mahi whakatikatika kua maha ngā tinihanga, pērā i te wā i hangaia tuatahi mai te pae. "
     PUBPAGES: 'Kua oti: I whakaputaina ngā whārangi {count}'
     PageAdded: 'I momoho te hanga whārangi'
+    REMOVED: 'I mukua te ''{title}''{description} i te pae ora'
     REMOVEDPAGE: 'I tango te ''{title}'' i te pae kua whakaputaina'
     REMOVEDPAGEFROMDRAFT: 'I tangohia a ''%s'' i te pae hukihuki'
     RESTORE: Whakaora
     RESTORED: 'I momoho te whakaora i te ''{title}'''
     ROLLBACK: 'Hoki whakamuri ki tēnei putanga.'
+    ROLLEDBACKPUBv2: 'I hoki ki te tauira kua whakaputaina.'
+    ROLLEDBACKVERSIONv2: 'I hoki ki te tauira #%d.'
     SAVE: tiakina
+    SAVEDRAFT: 'Tiaki hukihuki'
     TabContent: Ngā Ihirangi
     TabHistory: Hītori
     TabSettings: Ngā Tautuhinga
     TreeFiltered: 'Rākau kua tātaritia'
     TreeFilteredClear: 'Ūkui tātari'
     MENUTITLE: 'Whakatika Whārangi'
+    AddPageRestriction: 'Tuhipoka: Kāore e whakaaetia ētahi momo whārangi mō tēnei tīpakonga'
   CMSMain_left_ss:
     APPLY_FILTER: 'Hoatu Tātari'
     RESET: Tautuhi Anō
@@ -121,6 +129,7 @@ mi:
     VIEW: Tiro
     VIEWINGVERSION: 'Tiro ana i te putanga {version} ināianei.'
     MENUTITLE: Hītori
+    VIEWINGLATEST: 'Tirohia ana te tauira hou rawa ināianei.'
   CMSPageHistoryController_versions_ss:
     AUTHOR: Kaituhi
     NOTPUBLISHED: 'Kāore i whakaputaina'
@@ -153,6 +162,7 @@ mi:
   ContentController:
     ARCHIVEDSITE: 'Putanga Arokite'
     ARCHIVEDSITEFROM: 'Pae putumōhio mai i'
+    CMS: CMS
     DRAFTSITE: 'Pae Hukihuki'
     DRAFT_SITE_ACCESS_RESTRICTION: 'Me takiuru mā tō kupuhipa CMS hei tiro i te hukihuki, ngā ihirangi putumōhio rānei.  <a href="%s">Pāwhiri ki konei kia hoki ki te pae kua whakaputaina.</a>'
     Email: Īmēra
@@ -167,6 +177,7 @@ mi:
     PUBLISHEDSITE: 'Pae Kua Whakaputaina'
     Password: Kupuhipa
     PostInstallTutorialIntro: 'He tauira rūnā tēnei paetukutuku o tētahi paetukutuku SilverStripe 3. Hei toro i tēnei, tirohia te {link}'
+    StartEditing: 'Ka taea te tīmata ki te whakatika i ō ihirangi mā te whakatuwhera i <a href="{link}">the CMS</a>.'
     UnableDeleteInstall: 'Kāore i taea te muku i ngā kōnae tāuta. Mukua ā-ringa ngā kōnae kei raro'
     VIEWPAGEIN: 'Tiro Whārangi i'
     DRAFT: Hukihuki
@@ -255,6 +266,7 @@ mi:
     ParameterLiveCheckbox: 'Tirohia te pae ora'
     REPEMPTY: 'Kua piako te pūrongo {title}.'
   SilverStripeNavigatorLink:
+    ShareInstructions: 'Hei tiritiri i tēnei whārangi, tāruatia ka whakapiri i te hono kei raro.'
     ShareLink: 'Tiritiri hono'
   SilverStripeNavigatorLinkl:
     CloseLink: Kati
@@ -317,10 +329,13 @@ mi:
     LINKCHANGENOTE: 'Mā te huri i te hono o tēnei whārangi ka pāngia ngā hono o ngā whārangi tamariki katoa.'
     MENUTITLE: 'Tapanga whakatere'
     METADESC: 'Whakaahuatanga Meta'
+    METADESCHELP: 'Ka whakamahi ngā pūrere rapu i ēnei ihirangi ki te whakaatu huanga rapu (ahakoa kāore ngā whakatauranga e whakaawetia).'
     METAEXTRA: 'Ngā Tūtohu Meta Ritenga'
+    METAEXTRAHELP: 'Ngā tūtohu HTML mō ngā mōhiohio meta tāpiri. Hei tauira &lt;ingoa meta="customName" ihirangi="your custom content here" /&gt;'
     MODIFIEDONDRAFTHELP: 'He huringa kāore anō kia whakaputaina ō te whārangi'
     MODIFIEDONDRAFTSHORT: Kua Whakakētia
     MetadataToggle: Raraungameta
+    OBSOLETECLASS: 'Nō te momo tawhito rawa {type} tēnei whārangi. Mā te tiaki ka tautuhia anō tōna momo, ka ngaro pea i a koe he raraunga'
     PAGELOCATION: 'Tauwāhi'
     PAGETITLE: 'Ingoa whārangi'
     PAGETYPE: 'Tūmomo wharangi '
@@ -349,6 +364,7 @@ mi:
     URLSegment: 'Wāhanga PRO'
     VIEWERGROUPS: 'Ngā Ropū Kaitirotiro'
     VIEW_ALL_DESCRIPTION: 'Tirohia tētahi whārangi'
+    VIEW_ALL_HELP: 'Te āhei ki te tiro i tētahi whārangi i te pae, ahakoa ngā tautuhinga i te ripa Uru. Ka hiahia i te whakaaetanga "wāhanga Uru ki ''Ngā Whārangi''"'
     VIEW_DRAFT_CONTENT: 'Tirohia ngā ihirangi hukihuki'
     VIEW_DRAFT_CONTENT_HELP: 'Ka hāngai ki te tiro whārangi i waho i te CMS i te aratau hukihuki. He whaihua mā ngā kaimahitahi kāore i a rātou te āhei CMS.'
     Viewers: 'Ngā Rōpū Kaitirotiro'
@@ -359,9 +375,14 @@ mi:
     many_many_LinkTracking: 'Taki Hono'
     BUTTONPUBLISHED: I whakaputaina
     BUTTONSAVED: Kua Tiakina
+    GroupPlaceholder: 'Pāwhiri ki te tīpako rōpū'
+    LASTPUBLISHED: 'Whakaputanga hou rawa'
+    LASTSAVED: 'Tiakinga hou rawa'
     MoreOptions: 'He kōwhiringa anō'
+    NOTPUBLISHED: 'Kāore i whakaputaina'
   SiteTreeURLSegmentField:
     HelpChars: 'Ka tahuri aunoatia, ka tangohia rānei ngā pūāhua motuhake'
+    EMPTY: 'Tāurua he Wāhanga PRO, ka pāwhiri whakakore rānei'
   StaticExporter:
     BASEURL: 'PRO Matua'
     EXPORTTO: 'Kaweake ki tēnā kōpaki'
@@ -386,12 +407,15 @@ mi:
     CANACCESS: 'Ka taea te uru ki te pae putumōhio mā tēnei hononga'
     HAVEASKED: 'Kua tono mai kia tirohia e koe ngā ihirangi o tā mātou pae i'
   VirtualPage:
+    CHOOSE: 'Whārangi kua honoa'
     DESCRIPTION: 'Ka whakaatu i ngā ihirangi o tētahi atu whārangi'
+    EDITCONTENT: 'Whakatika ihirangi ki te whārangi kua honoa'
     HEADER: 'He whārangi mariko tēnei'
     PLURALNAME: 'Ngā Whārangi Mariko'
     PageTypNotAllowedOnRoot: 'Kāore e whakaaetia te momo whārangi taketake "{type}" i te taumata pūtake o tēnei whārangi mariko'
     SINGULARNAME: 'Whārangi Mariko'
     EditLink: Whakatika
+    HEADERWITHLINK: 'He whārangi mariko tēnei e tārua ihirangi ana i "{title}" ({link})'
   CMSFileAddController:
     MENUTITLE: Ngā Kōnae
   CMSPageEditController:
@@ -400,6 +424,13 @@ mi:
     MENUTITLE: 'Whakatika Whārangi'
   CMSSettingsController:
     MENUTITLE: Ngā Tautuhinga
+  SITETREE:
+    VIRTUALPAGEDRAFTWARNING: 'Whakaputaina te whārangi kua honoa kia whakaputa ai i te whārangi mariko'
+    VIRTUALPAGEWARNING: 'Kōwhiria he whārangi kua honoa kātahi anō ka tiaki kia whakaputa ai i tēnei whārangi'
+    VIRTUALPAGEWARNINGSETTINGS: 'Kōwhiria he whārangi kua honoa i ngā āpure ihirangi matua kia whakaputa ai'
+  SilverStripeNavigator:
+    ARCHIVED: I putumōhiotia
   URLSegmentField:
     Cancel: Whakakore
     Edit: Whakatika
+    OK: ĀE

lang/zh.yml

@@ -164,11 +164,11 @@ zh:
     ARCHIVEDSITEFROM: '存档站点从'
     CMS: 内容管理系统
     DRAFTSITE: '草稿站点'
-    DRAFT_SITE_ACCESS_RESTRICTION: '您必须使用您的内容管理系统密码登录，才可以查看草稿或存档内容。<a href="%s">点击这里返回到已发布的站点。</a>'
+    DRAFT_SITE_ACCESS_RESTRICTION: '您必须使用您的内容管理系统密码登录，才可以查看草稿或存档内容。<a href="%s">点击这里返回到已发布的站点。</a>'
     Email: 电子邮件
     INSTALL_SUCCESS: '安装成功'
     InstallFilesDeleted: '安装文件已经成功删除。'
-    InstallSecurityWarning: '出于安全原因，您应该现在删除安装文件，除非您计划以后（&lt;em&gt;需要以管理员身份登录，详见下方&lt;/em&gt;）重新安装。web服务器现在仅需要对“assets”文件夹的写权限，您可以删除所有其他文件夹的写权限。&lt;a href="{link}" style="text-align: center;"&gt;点击这里删除安装文件。&lt;/a&gt;'
+    InstallSecurityWarning: '出于安全原因，您应该现在删除安装文件，除非您计划以后（<em>需要以管理员身份登录，详见下方</em>）重新安装。web服务器现在仅需要对“assets”文件夹的写权限，您可以删除所有其他文件夹的写权限。<a href="{link}" style="text-align: center;">点击这里删除安装文件。</a>'
     InstallSuccessCongratulations: 'SilverStripe已经成功安装！'
     LOGGEDINAS: '当前登录'
     LOGIN: 登录
@@ -207,9 +207,9 @@ zh:
     504: '504 - 网关超时'
     505: '505 - HTTP版本不支持'
     CODE: '错误代码'
-    DEFAULTERRORPAGECONTENT: '&lt;p&gt;对不起，您正在尝试访问不存在的页面。&lt;/p&gt;&lt;p&gt;请检查您想要访问的URL的拼写并再试一次。&lt;/p&gt;'
+    DEFAULTERRORPAGECONTENT: '<p>对不起，您正在尝试访问不存在的页面。</p><p>请检查您想要访问的URL的拼写并再试一次。</p>'
     DEFAULTERRORPAGETITLE: '未发现页面'
-    DEFAULTSERVERERRORPAGECONTENT: '&lt;p&gt;对不起，处理您的请求时发生错误。&lt;/p&gt;'
+    DEFAULTSERVERERRORPAGECONTENT: '<p>对不起，处理您的请求时发生错误。</p>'
     DEFAULTSERVERERRORPAGETITLE: '服务器错误'
     DESCRIPTION: '给不同的错误自定义内容（例如”未发现页面“）'
     ERRORFILEPROBLEM: '打开文件”{filename}“尝试写入. 请检查文件许可'
@@ -303,11 +303,11 @@ zh:
     CREATED: '创建日期'
     Comments: 评论
     Content: 内容
-    DEFAULTABOUTCONTENT: '&lt;p&gt;您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。&lt;br /&gt;&lt;/p&gt;'
+    DEFAULTABOUTCONTENT: '<p>您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。<br /></p>'
     DEFAULTABOUTTITLE: '关于我们'
-    DEFAULTCONTACTCONTENT: '&lt;p&gt;您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。&lt;br /&gt;&lt;/p&gt;'
+    DEFAULTCONTACTCONTENT: '<p>您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。<br /></p>'
     DEFAULTCONTACTTITLE: '联络我们'
-    DEFAULTHOMECONTENT: '&lt;p&gt;欢迎来到SilverStripe！这是默认首页。您可以通过打开&lt;a href="admin/"&gt;内容管理系统&lt;/a&gt;修改该页面。您现在可以访问&lt;a href="http://doc.silverstripe.org"&gt;开发者文档&lt;/a&gt;，或者从&lt;a href="http://doc.silverstripe.org/doku.php?id=tutorials"&gt;教程&lt;/a&gt;开始。&lt;/p&gt;'
+    DEFAULTHOMECONTENT: '<p>欢迎来到SilverStripe！这是默认首页。您可以通过打开<a href="admin/">内容管理系统</a>修改该页面。您现在可以访问<a href="http://doc.silverstripe.org">开发者文档</a>，或者从<a href="http://doc.silverstripe.org/doku.php?id=tutorials">教程</a>开始。</p>'
     DEFAULTHOMETITLE: 首页
     DELETEDPAGEHELP: '页面已停止发布'
     DELETEDPAGESHORT: 已删除

templates/Includes/CMSMain_TreeView.ss

@@ -19,7 +19,7 @@ $ExtraTreeTools
 	</div>
 	<% end_if %>
 
-	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-updatetreenodes="$Link(updatetreenodes)" data-url-addpage="{$LinkPageAdd('AddForm/?action_doAdd=1')}&amp;ParentID=%s&amp;PageType=%s" data-url-editpage="$LinkPageEdit('%s')" data-url-duplicate="{$Link('duplicate/%s')}" data-url-duplicatewithchildren="{$Link('duplicatewithchildren/%s')}" data-url-listview="{$Link('?view=list')}" data-hints="$SiteTreeHints.XML" data-extra-params="SecurityID=$SecurityID">
+	<div class="cms-tree" data-url-tree="$Link(getsubtree)" data-url-savetreenode="$Link(savetreenode)" data-url-updatetreenodes="$Link(updatetreenodes)" data-url-addpage="{$LinkPageAdd('AddForm/?action_doAdd=1', 'ParentID=%s&amp;PageType=%s')}" data-url-editpage="$LinkPageEdit('%s')" data-url-duplicate="{$Link('duplicate/%s')}" data-url-duplicatewithchildren="{$Link('duplicatewithchildren/%s')}" data-url-listview="{$Link('?view=list')}" data-hints="$SiteTreeHints.XML" data-extra-params="SecurityID=$SecurityID">
 		$SiteTreeAsUL
 	</div>
 </div>

templates/Includes/CMSPagesController_ContentToolActions.ss

@@ -1,5 +1,5 @@
 <div class="cms-actions-row">
-	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive" data-icon="add" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd('?ParentID=%s')}"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
+	<a class="cms-page-add-button ss-ui-button ss-ui-action-constructive" data-icon="add" href="$LinkPageAdd" data-url-addpage="{$LinkPageAdd('', 'ParentID=%s')}"><% _t('CMSMain.AddNewButton', 'Add new') %></a>
 	<button href="$LinkPagesWithSearch" class="cms-tree-expand-trigger cms-panel-link ss-button" data-icon="pencil">
 		<% _t('CMSMain.EditTree', 'Edit Tree') %>
 	</button>