Changeset 2981

Show
Ignore:
Timestamp:
07/25/08 17:11:21 (4 weeks ago)
Author:
gcroes
Message:

Pour synchroniser

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/project/modules/devel/cms3/heading/actiongroups/admin.actiongroup.php

    r2977 r2981  
    99        $ppo->TITLE_PAGE = 'Administration des contenus du site'; 
    1010        $ppo->arHeadingElementTypes = _class ('heading|headingelementtype')->getList (); 
    11         $ppo->arHeadingElementInformations = _class ('heading|headingelementinformationservices')->find (array ('parent_heading_public_id_hei'=>_request ('heading', 0))); 
     11        $ppo->arHeadingElementInformations = _class ('heading|headingelementinformationservices')->find (array ('parent_heading_public_id_hei'=>$heading = _request ('heading', 0))); 
     12        $ppo->heading = $heading; 
    1213        return _arPpo ($ppo, 'headingelements.admin.php'); 
    1314    } 

  • trunk/project/modules/devel/cms3/heading/classes/headingservices.class.php

    r2975 r2981  
    5151     */ 
    5252    public function getPathFromPublicId ($pPublicId){ 
    53         if (!is_integer($pPublicId)) { 
    54             throw new CopixException ('ID must be an integer'); 
    55         } 
    5653        $path = array (); 
    5754        $public_id = $pPublicId; 
    …… 
    6057                                   ->setLimit (0, 1); 
    6158            $results = _dao('headingelementinformation')->findBy ($parameters); 
    62             if ($results[0]->parent_heading_public_id_hei !== 0) { 
     59            if (isset ($results[0]) && $results[0]->parent_heading_public_id_hei !== 0) { 
    6360                $record = _dao('headingelementinformation')->get ($results[0]->parent_heading_public_id_hei); 
    6461                if (!$record or $record->parent_heading_public_id_hei === 0) { 

  • trunk/project/modules/devel/cms3/heading/resources/heading.properties

    r2979 r2981  
    5959heading.editor.message.updated = Updated %s by %s  
    6060heading.editor.message.selectHeading = Please select an heading. 
     61 
     62heading.status.draft = Draft  
     63heading.status.proposed = Proposed  
     64heading.status.planned = Planned 
     65heading.status.published = Published 
     66heading.status.archive = Archive  
     67heading.status.deleted = Deleted  

  • trunk/project/modules/devel/cms3/heading/resources/heading_fr.properties

    r2979 r2981  
    5252heading.editor.message.updated = Modifiée le %s par %s  
    5353heading.editor.message.selectHeading = Sélectionnez une rubrique. 
     54 
     55 
     56heading.status.draft = Brouillon  
     57heading.status.proposed = Proposé 
     58heading.status.planned = Planifié 
     59heading.status.published = Publié 
     60heading.status.archive = Archivé  
     61heading.status.deleted = Supprimé 

  • trunk/project/modules/devel/cms3/heading/templates/breadcrumb.tpl

    r2974 r2981  
    22<a href="#"> Home </a> 
    33    {foreach from=$breadcrumb item=value key=cle} 
    4     -> {popupinformation text=$value displayimg=false zone='heading|breadcrumbpopup' param=$breadcrumb identifier=$cle}  {/popupinformation} 
     4    -> {popupinformation text=$value displayimg=false zone='heading|headingbreadcrumbpopup' param=$breadcrumb identifier=$cle}  {/popupinformation} 
    55    {/foreach} 
    66</div> 

  • trunk/project/modules/devel/cms3/heading/templates/headingelements.admin.php

    r2977 r2981  
    1 <div> 
    2 chemin > chemin > chemin 
    3 </div> 
     1<?php echo CopixZone::process ("heading|headingbreadcrumb", array ('heading' => $ppo->heading)); ?> 
    42 
    53<div id="HeadingElementInformationDiv" style="float: right;width: 20%; border:1px solid #000;"> 
    …… 
    106104  
    107105<script> 
     106    var lastIdHelt, lastTypeHei;  
    108107    function showHeadingElementInformationsIn (pIdElement, pTypeElement, pDivId){ 
     108        if (pIdElement == lastIdHelt && pTypeElement == lastTypeHei){ 
     109           if (pTypeElement == 'heading'){ 
     110              document.location.url = Copix.getActionUrl (); 
     111           } 
     112        } 
    109113        var AjaxRequest = new Ajax(Copix.getActionURL('heading|admin|headingelementinformation', {'id_helt':pIdElement, 'type_hei':pTypeElement}),{ 
    110114            execScripts: true, 

  • trunk/project/modules/devel/cms3/heading/zones/headingbreadcrumb.zone.php

    r2980 r2981  
    11<?php 
    2 class ZoneBreadCrumb extends CopixZone { 
     2class ZoneHeadingBreadCrumb extends CopixZone { 
    33    function _createContent (& $toReturn) { 
    44        $tpl = new CopixTpl (); 
    5         $publicId = 7; 
     5        $publicId = $this->getParam ('heading'); 
    66        $path = _class('heading|HeadingElementInformationServices')->getHeadingPathFromPublicId ($publicId); 
    77        $breadcrumb = array (); 
    …… 
    99            $breadcrumb[$value] = _class('heading|HeadingElementInformationServices')->getHeadingCaptionFromPublicId ($value);  
    1010        } 
    11         $tpl->assign('breadcrumb', array_reverse($breadcrumb, preserve_keys)); 
     11        $tpl->assign('breadcrumb', array_reverse($breadcrumb, true)); 
    1212        $toReturn = $tpl->fetch('breadcrumb.tpl'); 
    1313        return true; 

  • trunk/project/modules/devel/cms3/heading/zones/headingbreadcrumbpopup.zone.php

    r2980 r2981  
    11<?php 
    2 class ZoneBreadCrumbPopup extends CopixZone { 
     2class ZoneHeadingBreadCrumbPopup extends CopixZone { 
    33    function _createContent (& $toReturn) { 
    44        $tpl = new CopixTpl ();