Changeset 782 for trunk/Application

Timestamp:

Jan 9, 2016, 11:10:49 AM (9 years ago)

Author:

chronos

Message:

• Modified: Page class separated to basic Page class and to BaseView class which is project specific.
• Fixed: RSS channel list was not displayed.
• Modified: Database updates specific for project moved to Application directory.

Location:

trunk/Application

Files:

• FullInstall.php (moved) (moved from trunk/Common/Setup/FullInstall.php )
• System.php (modified) (4 diffs)
• UpdateTrace.php (moved) (moved from trunk/Common/Setup/Updates.php )
• View.php (moved) (moved from trunk/Common/Page.php ) (7 diffs)

trunk/Application/System.php

@@ -7 +7 @@
 include_once(dirname(__FILE__).'/../Common/Global.php');
 include_once(dirname(__FILE__).'/FormClasses.php');
+include_once(dirname(__FILE__).'/FullInstall.php');
+include_once(dirname(__FILE__).'/UpdateTrace.php');
+include_once(dirname(__FILE__).'/View.php');
 
 class Core extends Application
@@ -80 +83 @@
   function ShowPage()
   {
+    $this->BaseView = new BaseView($this);
+
     /* @var $Page Page */
     $ClassName = $this->SearchPage($this->PathItems, $this->Pages);
@@ -85 +90 @@
     {
       $Page = new $ClassName($this);
-      $Page->GetOutput();
     } else {
       $Page = new PageMissing($this);
-      $Page->GetOutput();
-    }
+    }
+    echo($this->BaseView->GetOutput($Page));
   }
 
@@ -99 +103 @@
   function AddModule($Module)
   {
-    //echo('Přidávám modul '.get_class($Module).'<br />');
     $this->Modules[get_class($Module)] = $Module;
   }

trunk/Application/View.php

@@ -3 +3 @@
 define('PAGE_NOT_FOUND', 'Stránka nenalezena');
 
-class Page extends Model
+class BaseView extends View
 {
   var $TimeStart;
@@ -36 +36 @@
   }
 
-  function Show()
-  {
-    return('');
-  }
-
   function SystemMessage($Title, $Text)
   {
@@ -48 +43 @@
   }
 
-  function ShowHeader($Title, $Path)
+  function ShowNavigation($Page)
   {
     if(array_key_exists('REQUEST_URI', $_SERVER))
@@ -59 +54 @@
     $ScriptName = substr($ScriptName, strlen($this->System->Link('')));
     if(substr($ScriptName, -1, 1) == '/') $ScriptName = substr($ScriptName, 0, -1);
-    $Page = $this;
-    $Navigation = '';
+
+    $Output = '';
     while($Page)
     {
-      $Navigation = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Navigation;
+      $Output = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Output;
 
       if(class_exists($Page->ParentClass))
@@ -72 +67 @@
       } else $Page = null;
     }
-    $Navigation = substr($Navigation, 6);
+    $Output = substr($Output, 6);
+    return($Output);
+  }
+
+  function ShowHeader($Page)
+  {
+    $Title = $Page->FullTitle;
+    $Path = $Page->ShortTitle;
+
+    $Navigation = $this->ShowNavigation($Page);
 
     $BodyParam = '';
@@ -83 +87 @@
     '<meta http-equiv="content-type" content="application/xhtml+xml; charset='.$this->Encoding.'" />'.
     '<script type="text/javascript" src="'.$this->System->Link('/style/').$this->Style.'/global.js"></script>'.
-    '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>
-    </head><body'.$BodyParam.'>';
+    '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>';
+    $Output .= $this->System->ModuleManager->Modules['RSS']->ShowRSSHeader();
+    $Output .= '</head><body'.$BodyParam.'>';
     if($this->BasicHTML == false)
     {
@@ -118 +123 @@
   }
 
-  function GetOutput()
+  function GetOutput($Page)
   {
-    //try {
-      $Output = $this->Show();
-    //} catch (Exception $E) {
-    //  $Output = 'Chyba: '.$E->getMessage();
-    //}
-    if($this->ClearPage == false)
+    $Output = $Page->Show();
+    if($Page->ClearPage == false)
     {
-      $Output = $this->ShowHeader($this->FullTitle, $this->ShortTitle).$Output;
-      $Output .= $this->ShowFooter();
+      $Output = $this->ShowHeader($Page).$Output.$this->ShowFooter();
       if($this->FormatHTML == true) $Output = $this->FormatOutput($Output);
     }
-    echo($Output);
+    return($Output);
   }