Changeset 519

Timestamp:

Apr 14, 2013, 6:18:49 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Přepracován systém generování horního navigačního řádků stránek. Nyní mají stránky třídy Page určenu nadřazenou stránky přes nadřazenou třídu.

Location:

trunk

Files:

• Common/Page.php (modified) (3 diffs)
• Common/Version.php (modified) (1 diff)
• Modules/Chat/Chat.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/Map/Map.php (modified) (1 diff)
• Modules/Meals/Meals.php (modified) (2 diffs)
• Modules/Meteostation/Meteostation.php (modified) (1 diff)
• Modules/Network/Administration.php (modified) (1 diff)
• Modules/Network/Availability.php (modified) (1 diff)
• Modules/Network/HostList.php (modified) (1 diff)
• Modules/Network/Hosting.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/Network/Subnet.php (modified) (1 diff)
• Modules/Network/UserHosts.php (modified) (1 diff)
• Modules/NetworkShare/SharePage.php (modified) (1 diff)
• Modules/NetworkTopology/NetworkTopology.php (modified) (1 diff)
• Modules/Portal/Portal.php (modified) (1 diff)
• Modules/TV/TV.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• Modules/User/UserList.php (modified) (1 diff)
• Modules/WebCam/WebCam.php (modified) (1 diff)
• finance/index.php (modified) (1 diff)

trunk/Common/Page.php

@@ -9 +9 @@
   var $ShowRuntimeInfo = false;
   var $ClearPage = false;
-  var $PathTree = array('Rozcestník',
-    'index.php' => '',
-    'missing.php' => '',
-    'manualy.php' => 'Manuály',
-    'is' => array('',
-      'index.php' => 'Správa dat',
-      'topologie.php' => 'Topologie sítě',
-    ),
-    'network.php' => 'Technické informace',
-    'map' => array('',
-      'index.php' => 'Mapa sítě',
-    ),
-    'tv' => array('',
-      'index.php' => 'Síťová televize',
-    ),
-    'network' => array('',
-      'administration.php' => 'Administrace sítě',
-      'dostupnost.php' => 'Dostupnost zařízení',
-      'restart.php' => 'Restart služeb',
-      'user_hosts.php' => 'Registrované počítače',
-    ),
-    'nabidky_pripojeni.php' => 'Nabídky připojení',
-    'telseznam.php' => 'Telefonní seznam',
-    'merak.php' => 'Měřič spotřeby',
-    'tkr.php' => 'Kanály kabelové televize',
-    'LogShow.php' => 'Záznamy operací',
-    'share' => array('Prohledat sdílení',
-      'index.php' => '',
-      'firefox.php' => 'Integrace do prohlížeče',
-    ),
-    'hostlist.php' => 'Seznam počítačů',
-    'userlist.php' => 'Seznam uživatelů',
-    'farnost' => array('',
-      'index.php' => 'Rozpis mší',
-    ),
-    'finance' => array('Finance',
-      'index.php' => '',
-      'spotreba.php' => 'Spotřeba',
-      'zivnost.php' => 'Daňová evidence',
-      'prepocet.php' => 'Přepočet financí',
-      'changes.php' => 'Změny',
-      'tarify.php' => 'Tarify',
-      'clenove.php' => 'Seznam členů',
-      'zarizeni.php' => 'Zařízení',
-      'strom.php' => 'Strom zařízení',
-      'srovnani.php' => 'Porovnání tarifů s konkurencí',
-      'bills_manage.php' => 'Faktury',
-      'monthly_overall.php' => 'Měsíční přehledy',
-      'manage.php' => 'Správa financí',
-      'faktury' => array('',
-        'index.php' => 'Faktury za internet',
-      ),
-    ),
-    'statistic' => array('',
-      'trafficview.php' => 'Vytížení internetu',
-      'index.php' => 'Statistika',
-      'trafficview2.php' => 'Statistika',
-      'bandwidth.php' => 'Zatížení internetu',
-      'bandwidth_full.php' => 'Zatížení internetu všech počítačů',
-    ),
-    'fotbal.php' => 'Fotbal',
-    'webcam' => array('',
-       'index.php' => 'Web kamera',
-    ),
-    'navody.php' => 'Návody',
-    'ukoly.php' => 'Plánované projekty',
-    'otevreno.php' => 'Otvírací doby',
-    'aktuality' => array('',
-      'index.php' => 'Aktuality',
-      'subscription.php' => 'RSS aktuality',
-    ),
-    'sluzby.php' => 'Služby',
-    'history.php' => 'Historie',
-    'docs' => array('',
-      'zapisy' => array('',
-        'zapisy.php' => 'Zápisy ze schůzí',
-      ),
-    ),
-    'jidelna' => array('',
-      'index.php' => 'Jídelníček',
-      'menuedit.php' => 'Editace jídelníčku',
-    ),
-    'backup' => array('',
-      'index.php' => 'Nastavení zálohování',
-    ),
-    'mapa.php' => 'Mapa webu',
-  );
+  var $ParentClass = '';
+  var $ShortTitle;
+  var $FullTitle;
   
   function __construct()
@@ -114 +30 @@
   function ShowHeader($Title, $Path)
   {
-    $ScriptName = $_SERVER['SCRIPT_NAME'];
+    $ScriptName = $_SERVER['REQUEST_URI'];
     while(strpos($ScriptName, '//') !== false)
       $ScriptName = str_replace('//', '/', $ScriptName);
-    $PathTreePath = '/';
-    $PathTreeItem = $this->PathTree;
-    $Navigation = '<a href="'.$this->System->Config['Web']['RootFolder'].$PathTreePath.'">'.$PathTreeItem[0].'</a> &gt; ';
-    $ScriptName = substr($ScriptName, strlen($this->System->Config['Web']['RootFolder']));
-    $ScriptNameParts = explode('/', $ScriptName);
-    array_shift($ScriptNameParts);
-    foreach($ScriptNameParts as $ScriptNamePart)
+    $ScriptName = substr($ScriptName, strlen($this->System->Link('')));
+    if(substr($ScriptName, -1, 1) == '/') $ScriptName = substr($ScriptName, 0, -1);
+    $Page = $this;
+    $Navigation = '';
+    while($Page)
     { 
-      if(array_key_exists($ScriptNamePart, $PathTreeItem))
+      $Navigation = ' &gt; <a href="'.$this->System->Link($ScriptName).'/">'.$Page->ShortTitle.'</a>'.$Navigation;
+      
+      if($Page->ParentClass != '')
       {
-        if(is_array($PathTreeItem[$ScriptNamePart])) 
-        {
-          $PathTreeItem = $PathTreeItem[$ScriptNamePart];
-          $PathTreePath .= $ScriptNamePart.'/';
-          if($PathTreeItem[0] != '')
-            $Navigation .= '<a href="'.$this->System->Config['Web']['RootFolder'].$PathTreePath.'">'.$PathTreeItem[0].'</a> &gt; ';
-        } else 
-        {
-          if($PathTreeItem[$ScriptNamePart] != '')
-            $Navigation .= '<a href="'.$this->System->Config['Web']['RootFolder'].$PathTreePath.$ScriptNamePart.'">'.$PathTreeItem[$ScriptNamePart].'</a> &gt; ';
-        }
-      } 
+        $PageClass = $Page->ParentClass;
+        $Page = new $PageClass();
+        $ScriptName = substr($ScriptName, 0, strrpos($ScriptName, '/'));
+      } else $Page = null;
     } 
-    $Navigation = substr($Navigation, 0, -6);
+    $Navigation = substr($Navigation, 6);
 
     $BodyParam = '';
@@ -194 +102 @@
     $Page->System = $this->System;
     $Page->Database = $this->Database;
+    $Page->FormatHTML = $this->FormatHTML;
     return($Page);
   }

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 517; // Subversion revision
+$Revision = 519; // Subversion revision
 $DatabaseRevision = 517; 
 $ReleaseTime = '2013-04-13';

trunk/Modules/Chat/Chat.php

@@ -8 +8 @@
     $this->FullTitle = 'Výpis z historie chatu';
     $this->ShortTitle = 'Historie chatu';
-    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'chat');     
+    $this->ParentClass = 'PagePortal';
   }
   

trunk/Modules/IS/IS.php

@@ -7 +7 @@
   var $FullTitle = 'Správa dat';
   var $ShortTitle = 'Správa dat';
+  var $ParentClass = 'PagePortal';
   var $MenuItems = array();
 

trunk/Modules/Map/Map.php

@@ -7 +7 @@
   var $FullTitle = 'Mapa sítě';
   var $ShortTitle = 'Mapa sítě';
+  var $ParentClass = 'PagePortal';
   var $Load = 'initialize()';
   var $Unload = 'GUnload()';

trunk/Modules/Meals/Meals.php

@@ -5 +5 @@
   var $FullTitle = 'Jídleníček jídelny Na kopečku';
   var $ShortTitle = 'Jídelníček'; 
+  var $ParentClass = 'PagePortal';
   var $DayNames = array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota');
   var $DayNamesShort = array('NE', 'PO', 'ÚT', 'ST', 'ČT', 'PÁ', 'SO');
@@ -87 +88 @@
     <br>
     <strong>CENA JEDNOHO MENU JE '.$Row['Price'].' Kč</strong></td></tr>';
-    //echo('<tr><td colspan="2">dd</td></tr>');
     $Output .= '</table>';
-
-    //DB_Select('meals_info','*');
-    //$Row = DB_Row();
-    //echo($Row['info']);
 
     $Output .= '</body></html>';

trunk/Modules/Meteostation/Meteostation.php

@@ -8 +8 @@
   var $FullTitle = 'Stav meteostanice';
   var $ShortTitle = 'Meteostanice';
-
+  var $ParentClass = 'PagePortal';
+  
   function Show()
   {

trunk/Modules/Network/Administration.php

@@ -8 +8 @@
     $this->FullTitle = 'Administrace sítě';
     $this->ShortTitle = 'Administrace sítě';
-    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'sprava');     
+    $this->ParentClass = 'PageNetwork';
   }
 

trunk/Modules/Network/Availability.php

@@ -5 +5 @@
   var $FullTitle = 'Dostupnost aktivních prvků sítě';
   var $ShortTitle = 'Dostupnost sítě';
+  var $ParentClass = 'PageNetwork';
   var $PeriodCount = 24;
   var $Period = array(

trunk/Modules/Network/HostList.php

@@ -7 +7 @@
   var $FullTitle = 'Seznam registrovaných počítačů';
   var $ShortTitle = 'Seznam počítačů';
-
+  var $ParentClass = 'PageNetwork';
+  
   function Show()
   {

trunk/Modules/Network/Hosting.php

@@ -5 +5 @@
   var $FullTitle = 'Hostované projekty';
   var $ShortTitle = 'Hostované projekty';
+  var $ParentClass = 'PageNetwork';
 
   function Show()

trunk/Modules/Network/Network.php

@@ -11 +11 @@
 {
   var $FullTitle = 'Technické informace o síti';
-  var $ShortTitle = 'Technické informace';
+  var $ShortTitle = 'Síť';
+  var $ParentClass = 'PagePortal';
 
   function Show()
@@ -17 +18 @@
     if(count($this->System->PathItems) > 1)
     {
-      if($this->System->PathItems[1] == 'administration') $Output = $this->NewPage('PageNetworkAdministration')->Show();
-      else if($this->System->PathItems[1] == 'availability') $Output = $this->NewPage('PageAvailability')->Show();
-      else if($this->System->PathItems[1] == 'subnet') $Output = $this->NewPage('PageSubnet')->Show();
-      else if($this->System->PathItems[1] == 'user_hosts') $Output = $this->NewPage('PageNetworkHostList')->Show();
-      else if($this->System->PathItems[1] == 'hosting') $Output = $this->NewPage('PageHosting')->Show();
-      else if($this->System->PathItems[1] == 'hosts') $Output = $this->NewPage('PageHostList')->Show();
-      else $Output = $this->ShowInformation();
+      $this->ClearPage = true;
+      if($this->System->PathItems[1] == 'administration') $Output = $this->NewPage('PageNetworkAdministration')->GetOutput();
+      else if($this->System->PathItems[1] == 'availability') $Output = $this->NewPage('PageAvailability')->GetOutput();
+      else if($this->System->PathItems[1] == 'subnet') $Output = $this->NewPage('PageSubnet')->GetOutput();
+      else if($this->System->PathItems[1] == 'user_hosts') $Output = $this->NewPage('PageNetworkHostList')->GetOutput();
+      else if($this->System->PathItems[1] == 'hosting') $Output = $this->NewPage('PageHosting')->GetOutput();
+      else if($this->System->PathItems[1] == 'hosts') $Output = $this->NewPage('PageHostList')->GetOutput();
+      else {
+        $this->ClearPage = false;
+        $Output = $this->ShowInformation();
+      }
     } else $Output = $this->ShowInformation();
     return($Output);  

trunk/Modules/Network/Subnet.php

@@ -8 +8 @@
     $this->FullTitle = 'Informace o podsítích';
     $this->ShortTitle = 'Podsítě';
+    $this->ParentClass = 'PageNetwork';
   }
 

trunk/Modules/Network/UserHosts.php

@@ -8 +8 @@
     $this->FullTitle = 'Registrované počítače';
     $this->ShortTitle = 'Registrované počítače';
+    $this->ParentClass = 'PageNetwork';
   }
 

trunk/Modules/NetworkShare/SharePage.php

@@ -3 +3 @@
 class SharePage extends Page
 {
-  var $FullTitle = 'Vyhledávání souborů';
-  var $ShortTitle = 'Vyhledávání souborů';
+  var $FullTitle = 'Prohledávání sdílených souborů';
+  var $ShortTitle = 'Sdílené soubory';
+  var $ParentClass = 'PagePortal';
   var $Dependencies = array('Log');
   var $MaxNesting = 20; // Maximální vnoření

trunk/Modules/NetworkTopology/NetworkTopology.php

@@ -5 +5 @@
   var $FullTitle = 'Grafické zobrazení topologie sítě';
   var $ShortTitle = 'Topologie sítě';
+  var $ParentClass = 'PagePortal';
   var $TopHostName = 'NIX-ROUTER';
   

trunk/Modules/Portal/Portal.php

@@ -6 +6 @@
 {
   var $FullTitle = 'Zděchovský rozcestník';
-  var $ShortTitle = '';
+  var $ShortTitle = 'Rozcestník';
   
   function ShowLinks($HyperlinkGroup)

trunk/Modules/TV/TV.php

@@ -7 +7 @@
   var $FullTitle = 'Síťová televize';
   var $ShortTitle = 'IPTV';
+  var $ParentClass = 'PagePortal';
   
   function Show()

trunk/Modules/User/User.php

@@ -27 +27 @@
   {
     parent::Start();
-    $this->System->RegisterPage('userlist.php', 'PageUserList');
+    $this->System->RegisterPage('userlist', 'PageUserList');
   }  
   

trunk/Modules/User/UserList.php

@@ -5 +5 @@
   var $FullTitle = 'Seznam registrovaných uživatelů';
   var $ShortTitle = 'Seznam uživatelů';
-
+  var $ParentClass = 'PagePortal';
+  
   function Show()
   {

trunk/Modules/WebCam/WebCam.php

@@ -5 +5 @@
   var $FullTitle = 'Webová kamera';
   var $ShortTitle = 'Kamera';
+  var $ParentClass = 'PagePortal';
   
   function Show()

trunk/finance/index.php

@@ -7 +7 @@
   var $FullTitle = 'Přehled financování sítě';
   var $ShortTitle = 'Přehled financí';
-
+  var $ParentClass = 'PagePortal';
+  
   function Show()
   {