Changeset 636 for trunk/includes


Ignore:
Timestamp:
Dec 11, 2013, 12:15:15 PM (11 years ago)
Author:
chronos
Message:
  • Added: Pages should have set title which is used in HTML header to show title in web browser title bar.
Location:
trunk/includes
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/includes/Page.php

    r586 r636  
    66  var $Database;
    77  var $RawPage;
     8  var $Title;
    89 
    910  function __construct($System)

  • trunk/includes/Version.php

    r633 r636  
    66// and system will need database update.
    77
    8 $Revision = 633; // Subversion revision
     8$Revision = 636; // Subversion revision
    99$DatabaseRevision = 610; // Database structure revision
    10 $ReleaseTime = '2013-12-08';
     10$ReleaseTime = '2013-12-11';

  • trunk/includes/global.php

    r632 r636  
    5151}
    5252
     53function ShowPageClass($Page)
     54{
     55        global $TempPageContent, $System;
     56
     57  $System->Pages['temporary-page'] = get_class($Page);
     58        $_SERVER['REDIRECT_QUERY_STRING'] = 'temporary-page';
     59  $System->PathItems = ProcessURL();
     60        $System->ShowPage();
     61}
     62
    5363function ShowPage($Content)
    5464{
    5565        global $TempPageContent, $System;
    5666
    57         $TempPage = new TempPage($System);
    58         $System->Pages['temporary-page'] = 'TempPage';
     67  $TempPage = new TempPage($System);
     68  $System->Pages['temporary-page'] = 'TempPage';
    5969        $_SERVER['REDIRECT_QUERY_STRING'] = 'temporary-page';
    6070        $TempPageContent = $Content;
    61         $System->PathItems = ProcessURL();
     71  $System->PathItems = ProcessURL();
    6272        $System->ShowPage();
    6373}

  • trunk/includes/system.php

    r630 r636  
    231231  function ShowPage()
    232232  {
     233        $Output = '';
    233234    /* @var $Page Page */
    234235    $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
    … …  
    237238      $Page = new $ClassName($this);
    238239      $Output = $Page->GetOutput();
    239       if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);
    240       echo($Output);
    241     } else echo($this->BaseView->ShowPage($this->PageNotFound()));
     240      $this->BaseView->Title = $Page->Title;
     241      if($Page->RawPage == false) $Output = $this->BaseView->ShowPage($Output);     
     242    } else {
     243        $Output = $this->PageNotFound();
     244        $this->BaseView->Title = T('Page not found');
     245        $Output = $this->BaseView->ShowPage($Output);
     246    }
     247    echo($Output);
    242248  }
    243249}
    … …  
    245251class BaseView extends View
    246252{
     253        var $Title;     
     254       
    247255        function ShowTopBar()
    248256        {
    … …  
    387395                '<link rel="shortcut icon" href="'.$this->System->Link('/images/favicon.ico').'" />';
    388396                $Output .= $this->System->ModuleManager->Modules['News']->ShowRSSHeader();
    389                 $Output .= '<title>'.$this->System->Config['Web']['Title'].'</title>'.
     397                $Title = $this->System->Config['Web']['Title'];
     398                if($this->Title != '') $Title = $this->Title.' - '.$Title;
     399                $Output .= '<title>'.$Title.'</title>'.
    390400                '</head><body>';
    391401       
Note: See TracChangeset for help on using the changeset viewer.