Changeset 385 for trunk

Timestamp:

Jan 24, 2012, 11:40:43 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Sestavení navigačního řádku se nyní provádí postupným připojováním položek namísto globálního seznamu všeho.

Location:

trunk

Files:

• Common/Page.php (modified) (3 diffs)
• Common/Types/OneToMany.php (added)
• Common/Types/OneToMany2.php (added)
• Common/Types/PointerOneToMany.php (deleted)
• Common/Types/PointerOneToOne.php (deleted)
• Common/Types/Type.php (modified) (2 diffs)
• Common/ViewList.php (modified) (1 diff)
• Modules/Chat/Chat.php (modified) (2 diffs)
• Modules/Network/Dostupnost.php (modified) (1 diff)
• Modules/Network/HostList.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/Project/Project.php (modified) (1 diff)

trunk/Common/Page.php

@@ -12 +12 @@
   var $ShowRuntimeInfo = false;
   var $SimplePage = false;
-  var $PathTree = array('Rozcestník',
-    'index.php' => '',
-    'missing.php' => '',
-    'manualy.php' => 'Manuály',
-    'is' => array('',
-      'topologie.php' => 'Topologie sítě',
-      'dostupnost.php' => 'Dostupnost zařízení',
-    ),
-    'network.php' => 'Technické informace',
-    'map' => array('',
-      'index.php' => 'Mapa sítě',
-    ),
-    'network' => array('',
-      'administration.php' => 'Administrace sítě',
-      'dostupnost.php' => 'Dostupnost zařízení',
-      'restart.php' => 'Restart služeb',
-    ),
-    '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',
-      'inventory.php' => 'Skladové zásoby',
-      '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',
-  );
-  
-  function __construct()
+  var $NavigationPath = array();
+
+   function __construct()
   {
     global $Config;
@@ -103 +20 @@
     $this->FormatHTML = $Config['Web']['FormatHTML'];
     $this->ShowRuntimeInfo = $Config['Web']['ShowRuntimeInfo'];
+    $this->NavigationPath[] = array('Name' => 'Rozcestník', 'URL' => '');
   }
 
@@ -114 +32 @@
   function ShowHeader($Title, $Path)
   {
-    $ScriptName = $_SERVER['SCRIPT_NAME'];
-    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)
-    { 
-      //echo($ScriptNamePart.'<br />');
-      if(array_key_exists($ScriptNamePart, $PathTreeItem))
-      {
-        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; ';
-        }
-      } 
-    } 
-    $Navigation = substr($Navigation, 0, -6);
+    $Navigation = '';
+    $URL = '';
+    foreach($this->NavigationPath as $Index => $PathItem)
+    {
+      if($URL != '') $URL .= '/'.$PathItem['URL']; 
+      if($Index > 0) $Navigation .= ' &gt; ';
+      $Navigation .= '<a href="'.$this->System->Config['Web']['RootFolder'].
+        $URL.'">'.$PathItem['Name'].'</a>';
+    }
 
     $BodyParam = '';

trunk/Common/Types/Type.php

@@ -7 +7 @@
 include(dirname(__FILE__).'/String.php');
 include(dirname(__FILE__).'/Text.php');
-include(dirname(__FILE__).'/PointerOneToMany.php');
-include(dirname(__FILE__).'/PointerOneToOne.php');
+include(dirname(__FILE__).'/OneToMany.php');
+include(dirname(__FILE__).'/OneToMany2.php');
 include(dirname(__FILE__).'/Date.php');
 include(dirname(__FILE__).'/Time.php');
@@ -46 +46 @@
       'GPS' => array('Name' => 'GPS', 'Class' => 'GPS', 'ParentType' => '', 'Parameters' => array()),
       'IPv4Address' => array('Name' => 'IPv4Address', 'Class' => 'IPv4Address', 'ParentType' => '', 'Parameters' => array()),
-      'PointerOneToOne' => array('Name' => 'PointerOneToOne', 'Class' => 'PointerOneToOne', 'ParentType' => '', 'Parameters' => array()),
-      'PointerOneToMany' => array('Name' => 'PointerOneToMany', 'Class' => 'PointerOneToMany', 'ParentType' => '', 'Parameters' => array()),
+      'OneToOne' => array('Name' => 'OneToOne', 'Class' => 'OneToOne', 'ParentType' => '', 'Parameters' => array()),
+      'OneToMany' => array('Name' => 'OneToMany', 'Class' => 'OneToMany', 'ParentType' => '', 'Parameters' => array()),
       'Color' => array('Name' => 'Color', 'Class' => 'Color', 'ParentType' => '', 'Parameters' => array()),
     );

trunk/Common/ViewList.php

@@ -124 +124 @@
       'Type' => ViewItemTypeString, 'SQL' => $Name);
   }   
+
+  function AddItemText($Name, $Title)
+  {
+    $this->Columns[$Name] = array('Name' => $Name, 'Title' => $Title, 
+      'Type' => ViewItemTypeText, 'SQL' => $Name);
+  }   
+
+  function AddItemDateTime($Name, $Title)
+  {
+    $this->Columns[$Name] = array('Name' => $Name, 'Title' => $Title, 
+      'Type' => ViewItemTypeDateTime, 'SQL' => $Name);
+  }   
+  
+  function AddItemOneToMany($Name, $Title, $TargetTable)
+  {
+    $this->Columns[$Name] = array('Name' => $Name, 'Title' => $Title, 
+      'Type' => ViewItemTypeOneToMany, 'SQL' => $Name, 'TargetTable' => $TargetTable);
+  }   
 }
 

trunk/Modules/Chat/Chat.php

@@ -3 +3 @@
 class ChatHistory extends Page
 {
-  var $FullTitle = 'Výpis z historie chatu';
-  var $ShortTitle = 'Historie chatu';
-
+  function __construct()
+  {
+    parent::__construct();
+    $this->FullTitle = 'Výpis z historie chatu';
+    $this->ShortTitle = 'Historie chatu';
+    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'chat');     
+  }
+  
   function dechexr($Num)
   {
@@ -16 +21 @@
     global $MonthNames;
     
-    if(!$this->System->Models['User']->CheckPermission('Chat', 'Display')) return('Nemáte oprávnění');
+    if(!$this->System->Modules['User']->Models['User']->CheckPermission('Chat', 'Display')) return('Nemáte oprávnění');
 
     if(array_key_exists('date', $_GET)) $Date = $_GET['date']; 

trunk/Modules/Network/Dostupnost.php

@@ -14 +14 @@
     //array('Column' => 'TenYear', 'Title' => 'Desetiletí', 'Period' => 87600), // 365 * 24 * 10
   );
+
+  function __construct()
+  {
+    parent::__construct();
+    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'dostupnost');     
+  }
 
   function Show()

trunk/Modules/Network/HostList.php

@@ -5 +5 @@
   var $FullTitle = 'Seznam registrovaných počítačů';
   var $ShortTitle = 'Seznam počítačů';
+
+  function __construct()
+  {
+    parent::__construct();
+    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'pocitace');     
+  }
 
   function Show()

trunk/Modules/Network/Network.php

@@ -12 +12 @@
 class NetworkPage extends Page
 {
-  var $FullTitle = 'Síť';
-  var $ShortTitle = 'Síť';
-  var $RowPerPage = 20;
-
+  function __construct()
+  {
+    parent::__construct();
+    $this->FullTitle = 'Síť';
+    $this->ShortTitle = 'Síť';
+    $this->RowPerPage = 20;
+    $this->NavigationPath[] = array('Name' => $this->ShortTitle, 'URL' => 'sit');     
+  }
+  
   function Show()
   {
@@ -36 +41 @@
       $Page->Config = &$this->Config;
       $Page->System = &$this->System;
-      return($Page->Show());
+      $Output = $Page->Show();
+      array_shift($Page->NavigationPath);
+      $this->NavigationPath = array_merge($this->NavigationPath, $Page->NavigationPath);
+      return($Output);
     }
   }  

trunk/Modules/Project/Project.php

@@ -20 +20 @@
     parent::__construct($System);
     $this->Name = 'Project';
-    //$this->AddPropertyDateTime('TimeSchedule');
-    //$this->AddPropertyOneToMany('UserAssignedTo', 'User');
-    //$this->AddPropertyText('Description');
-    $this->AddItemString('Description', 'Description');
+    $this->AddItemDateTime('TimeSchedule', 'Time schedule');
+    $this->AddItemOneToMany('UserAssignedTo', 'User assigned to', 'User');
+    $this->AddItemText('Description', 'Description');
   }
 }