Changeset 561

Timestamp:

Aug 10, 2013, 12:37:21 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Akce zobrazení geografické pozice na externí mapě mapy.cz.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/File/File.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (2 diffs)
• Modules/Map/Map.php (modified) (2 diffs)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 558; // Subversion revision
+$Revision = 561; // Subversion revision
 $DatabaseRevision = 551; // SQL structure revision
 $ReleaseTime = '2013-07-21';

trunk/Modules/File/File.php

@@ -133 +133 @@
       ),
       'ItemActions' => array(
-        array('Caption' => 'Stáhnout', 'URL' => '/file?download'),
+        array('Caption' => 'Stáhnout', 'URL' => '/file'),
       ),
     ));

trunk/Modules/Finance/Finance.php

@@ -429 +429 @@
       ),
       'ItemActions' => array(
-        array('Caption' => 'Import plateb z banky', 'URL' => '/finance/import-api/?'),
-        array('Caption' => 'Import plateb ze souboru', 'URL' => '/finance/import-soubor/?'),
+        array('Caption' => 'Import plateb z banky', 'URL' => '/finance/import-api/'),
+        array('Caption' => 'Import plateb ze souboru', 'URL' => '/finance/import-soubor/'),
       ),
     ));

trunk/Modules/IS/IS.php

@@ -199 +199 @@
     {
       foreach($FormClass['ItemActions'] as $Action)
-        $Output .= '<li><a href="'.$this->System->Link($Action['URL']).'&amp;i='.$Id.'"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
+      {
+        $URL = $this->System->Link($Action['URL']);
+        if(strpos('?', $URL) === false) $URL .= '?';
+        else if((substr($URL, -5, 5) !== '&amp;') and (substr($URL, -1, 1) !== '?')) $URL .= '&amp;';
+        $URL .= '&amp;i='.$Id;
+        $Output .= '<li><a href="'.$URL.'"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
             $this->System->Link('/images/action.png').'"/>'.$Action['Caption'].'</a></li>';
+      }
     }  
     $Output .= '</ul><br/>';
@@ -393 +399 @@
     {
       foreach($FormClass['ItemActions'] as $Action)
-        $RowActions .= '<a href="'.$this->System->Link($Action['URL']).'&amp;i=#RowId"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
+      {
+        $URL = $this->System->Link($Action['URL']);
+        if(strpos('?', $URL) === false) $URL .= '?';
+        else if((substr($URL, -5, 5) !== '&amp;') and (substr($URL, -1, 1) !== '?')) $URL .= '&amp;';
+        $URL .= '&amp;i=#RowId';
+        $RowActions .= '<a href="'.$URL.'"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
           $this->System->Link('/images/action.png').'"/></a>';
+      }
     }   
     $Output = $this->ShowTable($Table, $Filter, $Title, $RowActions, $ExcludeColumn);

trunk/Modules/Map/Map.php

@@ -15 +15 @@
     global $Config;
     
+    if(count($this->System->PathItems) > 1)
+    {
+      if($this->System->PathItems[1] == 'show-position') 
+      {
+        $DbResult = $this->Database->select('MapPosition', '*', 'Id='.$_GET['i']);
+        if($DbResult->num_rows > 0)
+        {
+          $DbRow = $DbResult->fetch_assoc();
+          Header('Location: http://www.mapy.cz/#!x='.$DbRow['Longitude'].'&y='.
+            $DbRow['Latitude'].'&z=17&t=s&l=15&d=user_'.$DbRow['Longitude'].'%2C'.
+            $DbRow['Latitude'].'%2C'.$DbRow['Name'].'~%0A_1');
+          return('Přesměrování na http://www.mapy.cz/');
+        } else return('Položka nenalezena');
+        return('');
+      }
+      else return(PAGE_NOT_FOUND);
+    } else return($this->ShowMain());
+        
     $Output = '<script src="http://maps.google.com/maps?file=api&amp;v=2&amp;sensor=true&amp;key='.$Config['Web']['GoogleMapsApiKey'].'"
     type="text/javascript">
@@ -171 +189 @@
         'Longitude' => array('Type' => 'Float', 'Caption' => 'Zeměpisná výška', 'Default' => '0'),
       ),
+      'ItemActions' => array(
+        array('Caption' => 'Ukázat na mapě', 'URL' => '/map/show-position'),
+      ),
     ));