Changeset 912 for trunk/Application

Timestamp:

Aug 3, 2021, 11:38:29 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.

Location:

trunk/Application

Files:

• BaseView.php (modified) (5 diffs)
• Core.php (modified) (3 diffs)

trunk/Application/BaseView.php

@@ -8 +8 @@
   public bool $FormatHTML = false;
   public bool $ShowRuntimeInfo = false;
-  public bool $ClearPage = false;
+  public bool $RawPage = false;
   public bool $BasicHTML = false;
   public string $ParentClass = '';
-  public string $ShortTitle;
-  public string $FullTitle;
+  public string $Title;
+  public string $Description;
   public string $Encoding;
   public string $Style;
@@ -58 +58 @@
     while ($Page)
     {
-      $Output = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Output;
+      $Output = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->Title.'</a>'.$Output;
 
       if (class_exists($Page->ParentClass))
@@ -73 +73 @@
   function ShowHeader(Page $Page): string
   {
-    $Title = $Page->FullTitle;
-    $Path = $Page->ShortTitle;
+    $Path = $Page->Title;
 
     $Navigation = $this->ShowNavigation($Page);
@@ -87 +86 @@
     '<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>';
+    '<title>'.$Path.' - '.$this->System->Config['Web']['Title'].'</title>';
 
     // Show page headers
@@ -133 +132 @@
 
     $Output = $Page->Show();
-    if ($Page->ClearPage == false)
+    if ($Page->RawPage == false)
     {
       $Output = $this->ShowHeader($Page).$Output.$this->ShowFooter();

trunk/Application/Core.php

@@ -152 +152 @@
     if (file_exists($this->ModuleManager->FileName)) $this->ModuleManager->LoadState();
     if (ModuleSetup::Cast($ModuleSetup)->CheckState())
-        {
+    {
       $this->ModuleManager->StartAll(array(ModuleCondition::Enabled));
     }
@@ -236 +236 @@
       return $System;
     }
-    throw new Exception('Expected ModuleSetup type but '.gettype($System));
+    throw new Exception('Expected Core type but '.gettype($System));
   }
 }
@@ -245 +245 @@
   {
     parent::__construct($System);
-    $this->FullTitle = 'Stránka nenalezena';
-    $this->ShortTitle = 'Stránka nenalezena';
+    $this->Title = 'Stránka nenalezena';
     $this->ParentClass = 'PagePortal';
   }