mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge remote-tracking branch 'origin/3'
This commit is contained in:
Damian Mooyman
commit
0a2456e71e
@ -409,11 +409,11 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
public function Breadcrumbs($unlinked = false) {
|
||||
$items = parent::Breadcrumbs($unlinked);
|
||||
|
||||
// The root element should point to the pages tree view,
|
||||
// rather than the actual controller (which would just show an empty edit form)
|
||||
$defaultTitle = self::menu_title_for_class('CMSPagesController');
|
||||
$items[0]->Title = _t("{$this->class}.MENUTITLE", $defaultTitle);
|
||||
$items[0]->Link = singleton('CMSPagesController')->Link();
|
||||
if($items->count() > 1) {
|
||||
// Specific to the SiteTree admin section, we never show the cms section and current
|
||||
// page in the same breadcrumbs block.
|
||||
$items->shift();
|
||||
}
|
||||
|
||||
return $items;
|
||||
}
|
||||
@ -869,15 +869,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
|
||||
$this->extend('updateCurrentPageID', $id);
|
||||
|
||||
// Fall back to homepage record
|
||||
if(!$id) {
|
||||
$homepageSegment = RootURLController::get_homepage_link();
|
||||
$homepageRecord = DataObject::get_one('SiteTree', array(
|
||||
'"SiteTree"."URLSegment"' => $homepageSegment
|
||||
));
|
||||
if($homepageRecord) $id = $homepageRecord->ID;
|
||||
}
|
||||
|
||||
return $id;
|
||||
}
|
||||
|
||||
|
||||
@ -11,10 +11,4 @@ class CMSPageEditController extends CMSMain {
|
||||
private static $required_permission_codes = 'CMS_ACCESS_CMSMain';
|
||||
private static $session_namespace = 'CMSMain';
|
||||
|
||||
public function Breadcrumbs($unlinked = false) {
|
||||
$crumbs = parent::Breadcrumbs($unlinked);
|
||||
$crumbs[0]->Title = _t('CMSPagesController.MENUTITLE');
|
||||
return $crumbs;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -2653,7 +2653,8 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
||||
|
||||
// if the current page type is this the same as the class type always show the page type in the list
|
||||
if ($this->ClassName != $instance->ClassName) {
|
||||
if((($instance instanceof HiddenClass) || !$instance->canCreate())) continue;
|
||||
if($instance instanceof HiddenClass) continue;
|
||||
if(!$instance->canCreate(null, array('Parent' => $this->ParentID ? $this->Parent() : null))) continue;
|
||||
}
|
||||
|
||||
if($perms = $instance->stat('need_permission')) {
|
||||
|
||||
@ -161,7 +161,7 @@
|
||||
}
|
||||
});
|
||||
|
||||
$(".cms-page-add-button").entwine({
|
||||
$(".cms-content-addpage-button").entwine({
|
||||
onclick: function(e) {
|
||||
var tree = $('.cms-tree'), list = $('.cms-list'), parentId = 0;
|
||||
|
||||
@ -173,7 +173,7 @@
|
||||
var state = list.find('input[name="Page[GridState]"]').val();
|
||||
if(state) parentId = parseInt(JSON.parse(state).ParentID, 10);
|
||||
}
|
||||
|
||||
|
||||
var data = {selector: this.data('targetPanel'),pjax: this.data('pjax')}, url;
|
||||
if(parentId) {
|
||||
extraParams = this.data('extraParams') ? this.data('extraParams') : '';
|
||||
|
||||
@ -244,6 +244,8 @@ cs:
|
||||
ERRORFILEPROBLEM: 'Chyba otevření souboru "{filename}" pro zápis. Zkontrolujte oprávnění souboru, prosím.'
|
||||
PLURALNAME: 'Chybové stránky'
|
||||
SINGULARNAME: 'Chybová stránka'
|
||||
File:
|
||||
Title: Název
|
||||
Folder:
|
||||
AddFolderButton: 'Přidat složku'
|
||||
DELETEUNUSEDTHUMBNAILS: 'Smazat nepoužité miniatury'
|
||||
|
||||
13
lang/fi.yml
13
lang/fi.yml
@ -94,10 +94,13 @@ fi:
|
||||
DUPLICATEDWITHCHILDREN: '''{title}'' ja alasivu monistettiin onnistuneesti'
|
||||
EMAIL: Sähköposti
|
||||
EditTree: 'Muokkaa rakennepuuta'
|
||||
ListFiltered: 'Näytetään haun tulokset.'
|
||||
MENUTITLE: 'Muokkaa sivua'
|
||||
NEWPAGE: 'Uusi {pagetype}'
|
||||
PAGENOTEXISTS: 'Tätä sivua ei ole olemassa'
|
||||
PAGES: 'Sivun tila'
|
||||
PAGETYPEANYOPT: Mikä tahansa
|
||||
PAGETYPEOPT: 'Sivun tyyppi'
|
||||
PUBALLCONFIRM: 'Julkaise jokainen sivu tällä sivustolla kopioiden luonnosten sisältö julkiselle sivustolle'
|
||||
PUBALLFUN: 'Julkaise kaikki -toiminto'
|
||||
PUBALLFUN2: "Painamalla tätä nappia, tekee se saman kuin kävisit painamassa joka sivulla \"julkaise\". Se on käytännöllinen, jos on tehnyt isoja muutoksia sisältöön, esim. kun sivusto luotiin."
|
||||
@ -119,7 +122,11 @@ fi:
|
||||
TabContent: Sisältö
|
||||
TabHistory: Historia
|
||||
TabSettings: Asetukset
|
||||
TreeFiltered: 'Näytetään haun tulokset.'
|
||||
TreeFilteredClear: Tyhjennä
|
||||
CMSMain_left_ss:
|
||||
APPLY_FILTER: Hae
|
||||
CLEAR_FILTER: Tyhjennä
|
||||
RESET: Nollaa
|
||||
CMSPageAddController:
|
||||
MENUTITLE: 'Lisää sivu'
|
||||
@ -151,6 +158,8 @@ fi:
|
||||
ListView: 'Listanäkymä'
|
||||
MENUTITLE: Sivut
|
||||
TreeView: 'Puunäkymä'
|
||||
CMSPagesController_ContentToolbar_ss:
|
||||
MULTISELECT: 'Sarjatoiminnot'
|
||||
CMSPagesController_Tools_ss:
|
||||
FILTER: Suodata
|
||||
CMSSIteTreeFilter_PublishedPages:
|
||||
@ -159,6 +168,8 @@ fi:
|
||||
FILTERDATEFROM: Alkaen
|
||||
FILTERDATEHEADING: Pvm
|
||||
FILTERDATETO: Päättyen
|
||||
FILTERLABELTEXT: Haku
|
||||
PAGEFILTERDATEHEADING: 'Viimeksi muokattu'
|
||||
CMSSettingsController:
|
||||
MENUTITLE: Asetukset
|
||||
CMSSiteTreeFilter_ChangedPages:
|
||||
@ -233,6 +244,8 @@ fi:
|
||||
ERRORFILEPROBLEM: 'Virhe avattaessa tiedostoa "{filename}" palvelimelle tallentamista varten. Tarkista tiedoston kirjoitusoikeudet.'
|
||||
PLURALNAME: 'Virhesivut'
|
||||
SINGULARNAME: 'Virhesivu'
|
||||
File:
|
||||
Title: Nimi
|
||||
Folder:
|
||||
AddFolderButton: 'Lisää kansio'
|
||||
DELETEUNUSEDTHUMBNAILS: 'Poista käyttämättömät pikkukuvat'
|
||||
|
||||
@ -244,6 +244,8 @@ lt:
|
||||
ERRORFILEPROBLEM: 'Klaida atveriant rašymui bylą "{filename}". Prašome patikrinti bylų leidimus.'
|
||||
PLURALNAME: 'Klaidos puslapiai'
|
||||
SINGULARNAME: 'Klaidos puslapis'
|
||||
File:
|
||||
Title: Pavadinimas
|
||||
Folder:
|
||||
AddFolderButton: 'Naujas katalogas'
|
||||
DELETEUNUSEDTHUMBNAILS: 'Ištrinti nenaudojamas paveikslėlių miniatūras'
|
||||
|
||||
@ -244,6 +244,8 @@ sk:
|
||||
ERRORFILEPROBLEM: 'Chyba otvorenia súboru "{filename}" pre zápis. Skontrolujte oprávnenia súboru, prosím.'
|
||||
PLURALNAME: 'Chybové stránky'
|
||||
SINGULARNAME: 'Chybová stránka'
|
||||
File:
|
||||
Title: Názov
|
||||
Folder:
|
||||
AddFolderButton: 'Pridať priečinok'
|
||||
DELETEUNUSEDTHUMBNAILS: 'Vymazať nepoužité miniatúry'
|
||||
|
||||
@ -4,19 +4,7 @@
|
||||
|
||||
|
||||
<div class="cms-content-header-nav">
|
||||
<div class="breadcrumbs-wrapper" data-pjax-fragment="Breadcrumbs">
|
||||
<h2 id="page-title-heading">
|
||||
<% loop $Breadcrumbs %>
|
||||
<% if $First %>
|
||||
<% else_if $Last %>
|
||||
<span class="cms-panel-link crumb last">$Title.XML</span>
|
||||
<% else %>
|
||||
<a class="cms-panel-link crumb" href="$Link">$Title.XML</a>
|
||||
<span class="sep">/</span>
|
||||
<% end_if %>
|
||||
<% end_loop %>
|
||||
</h2>
|
||||
</div>
|
||||
<% include CMSBreadcrumbs %>
|
||||
|
||||
<div class="cms-content-header-tabs">
|
||||
<ul class="cms-tabset-nav-primary">
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<div class="cms-content-fields center ui-widget-content cms-panel-padded">
|
||||
$Tools
|
||||
|
||||
<div class="cms-content-view cms-panel-deferred" id="cms-content-treeview" data-url="$LinkTreeView">
|
||||
<div class="cms-content-view cms-panel-deferred" id="cms-content-treeview" data-url="$LinkTreeView" data-deferred-no-cache="true">
|
||||
<%-- Lazy-loaded via ajax --%>
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user