Changeset 23

Timestamp:

Jun 12, 2009, 10:46:19 PM (15 years ago)

Author:

george

Message:

• Přidáno: Neověřená funkce pro generování map a dbc souborů z klienta.
• Upraveno: Uživatelské menu přesunuto z hlavního menu do levého panelu.

Location:

trunk/www

Files:

• emulator.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• page.php (modified) (1 diff)
• server.php (modified) (1 diff)
• style.css (modified) (3 diffs)

trunk/www/emulator.php

@@ -62 +62 @@
     ));
   }
+
+  function ExtractMaps()
+  {
+    $this->Task->Add('Vygenerování souborů map', array(
+      'cd wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client',
+      'wine emulator/'.$this->Id.'/source/contrib/extractor/ad.exe',
+      'mv wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client/dbc wowclient/'.$this->Emulator['ClientVersion']['Version'].'/',
+      'mv wowclient/'.$this->Emulator['ClientVersion']['Version'].'/client/maps wowclient/'.$this->Emulator['ClientVersion']['Version'].'/',
+    ));
+    return('Požadavek na vygenerování map zařazen.');
+  }
 }
 

trunk/www/index.php

@@ -102 +102 @@
   }
   
+  function UserMenu()
+  {
+    $Output = '<strong>Uživatelské menu</strong><br />';
+    if($this->System->Modules['User']->User['Id'] != $this->System->Modules['User']->AnonymousUserId) 
+    {
+      $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
+      $DbRow = $DbResult->fetch_row();
+      if($DbRow[0] > 0)
+      { 
+        $DbResult = $this->Database->query('SELECT Id FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
+        $Server = $DbResult->fetch_assoc();
+        $Output .= '<div><a href="?Action=ServerShow&amp;Id='.$Server['Id'].'">Můj server</a></div>';
+        $Output .= '<div><a href="?Action=ServerDebug&amp;Id='.$Server['Id'].'">Ladící záznamy</a></div>';
+      } else $Output .= '<div><a href="?Action=ServerAdd">Vytvořit vlastní server</a></div>';
+      $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení účtu</a></div>'; 
+      if($this->System->Modules['User']->User['Role'] == USER_ROLE_ADMINISTRATOR) 
+      {
+        $Output .= '<div><a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a></div>'; 
+      }
+    }
+    return($Output);
+  }
+    
   function Show()
   {
     global $Config;
     
-    $Output = '';
+    $Output = '<table class="BasicTable"><tr><td class="UserMenu">'.$this->UserMenu().'</td><td class="Content">';
     if(array_key_exists('Action', $_GET))
     {
@@ -344 +367 @@
         if($this->System->Modules['User']->User['Role'] >= USER_ROLE_USER)
         {        
-          $Output = '<div>Ladící informace serveru</div>'; 
+          $Output .= '<div>Ladící informace serveru</div>'; 
           $DbResult = $this->Database->query('SELECT Id FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
           $Server = $DbResult->fetch_assoc();
@@ -362 +385 @@
       } else
       {
-        $Output = $this->ShowServerList();
+        $Output .= $this->ShowServerList();
       }
     } else 
     {
-      $Output = $this->ShowServerList();
-    }
+      $Output .= $this->ShowServerList();
+    }
+    $Output .= '</td></tr</table>';
     return($Output);
   }

trunk/www/page.php

@@ -25 +25 @@
     '<title>'.$this->System->Config['Web']['Title'].' - '.$Path.'</title>
     </head><body'.$BodyParam.'>'.
-    '<div class="Navigation"><span class="MenuItem"><a href="?">Servery</a>';
-    if($this->System->Modules['User']->User['Id'] != $this->System->Modules['User']->AnonymousUserId) 
-    {
-      $DbResult = $this->Database->query('SELECT COUNT(*) FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
-      $DbRow = $DbResult->fetch_row();
-      if($DbRow[0] > 0)
-      { 
-        $DbResult = $this->Database->query('SELECT Id FROM Server WHERE User='.$this->System->Modules['User']->User['Id']);
-        $Server = $DbResult->fetch_assoc();
-        $Output .= ' <a href="?Action=ServerShow&amp;Id='.$Server['Id'].'">Můj server</a>';
-        $Output .= ' <a href="?Action=ServerDebug&amp;Id='.$Server['Id'].'">Ladící záznamy</a>';
-      } else $Output .= ' <a href="?Action=ServerAdd">Vytvořit vlastní server</a>';
-      $Output .= ' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení účtu</a>'; 
-      if($this->System->Modules['User']->User['Role'] == USER_ROLE_ADMINISTRATOR) 
-      {
-        $Output .= ' <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=EmulatorList">Emulátory</a>'; 
-      }
-    }
+    '<div class="Navigation"><span class="MenuItem">'.
+    '<a href="?">Servery</a>'.
+    ' <a href="?Action=ClientList">Verze klienta</a>';
     $Output .= '</span><div class="MenuItem2">';
     if($this->System->Modules['User']->User['Id'] == $this->System->Modules['User']->AnonymousUserId)

trunk/www/server.php

@@ -251 +251 @@
       ));
     }    
-  }
+  } 
 }
 

trunk/www/style.css

@@ -243 +243 @@
   margin-left: auto;
   margin-right: auto;
+  vertical-align: top: 
 }
 
@@ -248 +249 @@
 {
   text-align: left;
+  vertical-align: top;
   padding: 3px 3px 3px 3px;
 }
@@ -331 +333 @@
 }
 
+.BasicTable .Header
+{
+  text-align: center;
+}
+
 .Pager
 {
   text-align: center;
 }
+
+.UserMenu
+{
+  width: 20%;
+}
+
+.Content
+{
+}