- " . addslashes($brokenPageList) . "
- '.addslashes($brokenPageList).'
"._t('AssetTableField.EDITIMAGE', 'Edit this image')."
" . '' . + '' . "Edit this image
" . '' . '' ) ), @@ -111,8 +100,8 @@ class AssetTableField extends ComplexTableField { if(class_exists('GalleryFile')) { $detailFormFields->addFieldToTab("BottomRoot", - new Tab(_t('AssetTableField.GALLERYOPTIONS', 'Gallery Options'), - new TextField( "Content", _t('AssetTableField.CAPTION', 'Caption') ) + new Tab("Gallery Options", + new TextField( "Content", "Caption" ) ) ); } @@ -120,22 +109,22 @@ class AssetTableField extends ComplexTableField { else if (class_exists('GalleryFile')) { if( $childData->Extension == 'swf' ) { $detailFormFields->addFieldToTab("BottomRoot", - new Tab(_t('AssetTableField.GALLERYOPTIONS', 'Gallery Options'), - new TextField( "Content", _t('AssetTableField.CAPTION', 'Caption') ), - new TextField( 'PopupWidth', _t('AssetTableField.POPUPWIDTH', 'Popup Width') ), - new TextField( 'PopupHeight', _t('AssetTableField.POPUPHEIGHT', 'Popup Height') ), - new HeaderField( _t('AssetTableField.SWFFILEOPTIONS', 'SWF File Options') ), - new CheckboxField( 'Embed', _t('AssetTableField.ISFLASH', 'Is A Flash Document') ), - new CheckboxField( 'LimitDimensions', _t('AssetTableField.DIMLIMT', 'Limit The Dimensions In The Popup Window') ) + new Tab("Gallery Options", + new TextField( "Content", "Caption" ), + new TextField( 'PopupWidth', 'Popup Width' ), + new TextField( 'PopupHeight', 'Popup Height' ), + new HeaderField( 'SWF File Options' ), + new CheckboxField( 'Embed', 'Is A Flash Document' ), + new CheckboxField( 'LimitDimensions', 'Limit The Dimensions In The Popup Window' ) ) ); } else { $detailFormFields->addFieldToTab("BottomRoot", - new Tab(_t('AssetTableField.GALLERYOPTIONS', 'Gallery Options'), - new TextField( "Content", _t('AssetTableField.CAPTION', 'Caption') ), - new TextField( 'PopupWidth', _t('AssetTableField.POPUPWIDTH', 'Popup Width') ), - new TextField( 'PopupHeight', _t('AssetTableField.POPUPHEIGHT', 'Popup Height') ) + new Tab("Gallery Options", + new TextField( "Content", "Caption" ), + new TextField( 'PopupWidth', 'Popup Width' ), + new TextField( 'PopupHeight', 'Popup Height' ) ) ); } diff --git a/code/BulkLoader.php b/code/BulkLoader.php index 9da995a4..f90e359c 100755 --- a/code/BulkLoader.php +++ b/code/BulkLoader.php @@ -1,16 +1,5 @@ \ No newline at end of file diff --git a/code/CMSMain.php b/code/CMSMain.php index ba0f0186..e91afaf8 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -1,15 +1,8 @@ stat('need_permission') && !$this->can( singleton($class)->stat('need_permission') ) ) continue; - /* - * Since i18n_singular_name() this is not necessary $addAction = $instance->uninherited('add_action', true); if($addAction) { // backwards compatibility for actions like "a page" (instead of "page") $addAction = preg_replace('/^a /','',$addAction); $addAction = ucfirst($addAction); } else { - $addAction = $instance->i18n_singular_name(); + $addAction = $class; } - */ - $addAction = $instance->i18n_singular_name(); $result->push(new ArrayData(array( "ClassName" => $class, "AddAction" => $addAction, ))); } - $result->sort('AddAction'); - return $result; } @@ -471,9 +427,7 @@ JS; $newItem->ClassName = $className; $newItem->ParentID = $parentID; - // DataObject::fieldExists only checks the current class, not the hierarchy - // This allows the CMS to set the correct sort value - if($newItem->castingHelperPair('Sort')) { + if($newItem->fieldExists('Sort')) { $newItem->Sort = DB::query("SELECT MAX(Sort) FROM SiteTree WHERE ParentID = '" . Convert::raw2sql($parentID) . "'")->value() + 1; } @@ -482,9 +436,6 @@ JS; if($setID) $newItem->ID = $id; - # Some modules like subsites add extra fields that need to be set when the new item is created - $this->extend('augmentNewSiteTreeItem', $newItem); - return $newItem; } @@ -519,13 +470,13 @@ JS; if(isset($descendantsRemoved)) { $descRemoved = " and $descendantsRemoved descendants"; - $descRemoved = sprintf(' '._t('CMSMain.DESCREMOVED', 'and %s descendants'), $descendantsRemoved); } else { $descRemoved = ''; } + $title = Convert::raw2js($record->Title); FormResponse::add($this->deleteTreeNodeJS($record)); - FormResponse::status_message(sprintf(_t('CMSMain.REMOVED', 'Deleted \'%s\'%s from live site'), $record->Title, $descRemoved), 'good'); + FormResponse::status_message("Deleted '$title'$descRemoved from live site", 'good'); return FormResponse::respond(); } @@ -540,7 +491,7 @@ JS; //$record->PublishedByID = Member::currentUser()->ID; $record->write(); $record->publish("Stage", "Live"); - + GoogleSitemap::ping(); // Fix the sort order for this page's siblings @@ -717,7 +668,7 @@ HTML; foreach($reports as $report) { if($report != 'SideReport') $options[$report] = singleton($report)->title(); } - return new DropdownField("ReportSelector", _t('CMSMain.REPORT', 'Report'),$options); + return new DropdownField("ReportSelector","Report",$options); } /** * Get the content for a side report @@ -883,7 +834,7 @@ HTML; $form->loadDataFrom($record); $form->loadDataFrom(array( "ID" => $id, - "Version" => $fromVersion, + "Version" => $version, )); $form->makeReadonly(); foreach($form->Fields()->dataFields() as $field) { @@ -1172,23 +1123,14 @@ HTML; ini_set('max_execution_time', 300); if(isset($_POST['confirm'])) { - $start = 0; - $pages = DataObject::get("SiteTree", "", "", "", "$start,30"); + $pages = DataObject::get("SiteTree"); $count = 0; - while(true) { - foreach($pages as $page) { - $this->performPublish($page); - $page->destroy(); - unset($page); - $count++; - echo "
+ 
<% else_if Type = break %>
<% end_if %>
+ <% if LastLink %>
<% end_if %>
+ <% if NextLink %>