Changeset 529 for trunk/Common

Timestamp:

Apr 23, 2013, 7:12:53 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Výběr relací mezi tabulkami pomocí zobrazení samostatného okna s výběrovou tabulkou ve správě dat.
• Přidáno: Možnost generovat jen základní HTML část stránky bez hlavičky a patičky.

Location:

trunk/Common

Files:

• Form/Form.php (modified) (4 diffs)
• Form/Types/OneToMany.php (modified) (3 diffs)
• Global.php (modified) (1 diff)
• Page.php (modified) (3 diffs)
• Version.php (modified) (1 diff)

trunk/Common/Form/Form.php

@@ -138 +138 @@
             array('Value' => $DbRow[$Index], 'Name' => $Index, 
             'Type' => $Item['Type'], 'Values' => $this->Values));
-        
-        //echo($DbRow[$Index].'='.$this->Values[$Index].'<br/>');
     }
   }
@@ -172 +170 @@
         $Values[$Index] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnSaveDb', $Parameters);
         if(($Item['Type'] == 'Password') and ($Values[$Index] == '')) unset($Values[$Index]);
-        
-        //echo($DbRow[$Index].'='.$this->Values[$Index].'<br/>');
     }
     }
@@ -182 +178 @@
     } else
       $DbResult = $this->Database->update($this->Definition['Table'], 'Id='.$Id, $Values);
-    //echo($Database->LastQuery);
   }
 
@@ -255 +250 @@
   var $Database;
   var $Type;
+  var $RootURL;
   
   function __construct($Database)

trunk/Common/Form/Types/OneToMany.php

@@ -5 +5 @@
 class TypeOneToMany extends TypeBase
 {
+  var $EditActions;
+  
   function OnView($Item)
   {
@@ -24 +26 @@
   function OnEdit($Item)
   {
-    $Output = '<select name="'.$Item['Name'].'">';
+    $Output = '<select name="'.$Item['Name'].'" id="'.$Item['Name'].'">';
     $Type = $this->FormManager->Type->TypeDefinitionList[$Item['Type']];
     if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
@@ -42 +44 @@
     }
     $Output .= '</select>';
+    $Output .=  '<img src="'.$this->FormManager->Root.'/images/select.png" alf="Vybrat" language="javascript" '.
+      'onclick="return popupwindow(&quot;'.$this->FormManager->Root.'/is/?a=select&amp;t='.$Table.'&amp;r='.$Item['Name'].'&quot;,&quot;test&quot;);" style="cursor:hand;cursor:pointer"/>';
     return($Output);
   }

trunk/Common/Global.php

@@ -72 +72 @@
   $System->Database->ShowSQLQuery = $Config['Web']['ShowSQLQuery'];
   $System->RootURLFolder = $Config['Web']['RootFolder'];
+  $System->FormManager->Root = $Config['Web']['RootFolder'];
   
   // Check database persistence structure

trunk/Common/Page.php

@@ -9 +9 @@
   var $ShowRuntimeInfo = false;
   var $ClearPage = false;
+  var $BasicHTML = false;
   var $ParentClass = '';
   var $ShortTitle;
@@ -64 +65 @@
     '<script type="text/javascript" src="'.$this->System->Link('/style/').$this->System->Config['Web']['Style'].'/global.js"></script>'.
     '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>
-    </head><body'.$BodyParam.'>
-    <div id="Title">'.$Title.'</div>
-    <div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
-    if($this->System->Config['Web']['UserSupport'] == 1)
+    </head><body'.$BodyParam.'>';
+    if($this->BasicHTML == false)
     {
-      if($this->System->User->User['Id'] == null)
-        $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> <a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>'; 
-        else $Output .= $this->System->User->User['Name'].' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
-   } else $Output .= '&nbsp;';
-// <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>'; 
-    $Output .= '</div></div>';
+      $Output .= '<div id="Title">'.$Title.'</div>
+      <div class="Navigation"><span class="MenuItem"><strong>Navigace :: </strong> '.$Navigation.'</span><div class="MenuItem2">';
+      if($this->System->Config['Web']['UserSupport'] == 1)
+      {
+        if($this->System->User->User['Id'] == null)
+          $Output .= '<a href="'.$this->System->Link('/?Action=LoginForm').'">Přihlášení</a> <a href="'.$this->System->Link('/?Action=UserRegister').'">Registrace</a>'; 
+          else $Output .= $this->System->User->User['Name'].' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
+     } else $Output .= '&nbsp;';
+//   <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>'; 
+      $Output .= '</div></div>';
+    }
     return($Output);
   }
@@ -82 +86 @@
     global $ScriptTimeStart;
     $Time = round(GetMicrotime() - $ScriptTimeStart, 2);
-    $Output = '<div id="Footer">
-   <i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' |';
-    if($this->ShowRuntimeInfo == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
-    $Output .= '</i></div></body></html>';
+    $Output = '';
+    if($this->BasicHTML == false)
+    {
+      $Output .= '<div id="Footer">
+     <i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' |';
+      if($this->ShowRuntimeInfo == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
+      $Output .= '</i></div>';
+    }
+    $Output .= '</body></html>';
     return($Output); 
   }

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 528; // Subversion revision
+$Revision = 529; // Subversion revision
 $DatabaseRevision = 527; // SQL structure revision
-$ReleaseTime = '2013-04-21';
+$ReleaseTime = '2013-04-23';
 
 ?>