Changeset 595 for trunk

Timestamp:

May 19, 2009, 7:58:09 AM (16 years ago)

Author:

george

Message:

• Upraveno: Navrácení zmenšeného textu na normální a nastavení přetekání obsahu obsahové části stránky.
• Upraveno: Počeštěny tlačítka menu. Přesunuty odkazy Jak začít, Registrace a Správa účtu nahoru.
• Opraveno: Validace XHTML kódu stránek guildy a guilda.

Location:

trunk

Files:

• inc/html.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• pages/arena.php (modified) (1 diff)
• pages/banlist.php (modified) (1 diff)
• pages/dotation.php (modified) (1 diff)
• pages/events.php (modified) (1 diff)
• pages/guilda.php (modified) (4 diffs)
• pages/guildy.php (modified) (3 diffs)
• pages/online.php (modified) (1 diff)
• styles/style.css (modified) (1 diff)

trunk/inc/html.php

@@ -119 +119 @@
       } else
       {
-        $this->RefreshMsg($this -> Antirefresh($anti_ref[$get], $get), $get);
+        $this->RefreshMsg($this->Antirefresh($anti_ref[$get], $get), $get);
         return($dir_pages.'/free.php');
       }
     } else
     {
-      if($site_show != '' AND is_readable($site_show)) return($site_show);
+      if(($site_show != '') and is_readable($site_show)) return($site_show);
         else return($dir_pages.'/'.$def.'.php');
     }

trunk/index.php

@@ -27 +27 @@
 $MenuItems = array(
   array('link' => '?page=main', 'Text' => 'Úvod'),
+  array('link' => '?page=begin', 'Text' => 'Jak začít'),
+  array('link' => '?page=register', 'Text' => 'Registrace'),
+  array('link' => '?page=acc', 'Text' => 'Správa účtu'),
+  array('link' => 'forum/', 'Text' => 'Fórum'),
   array('link' => '?page=server', 'Text' => 'Server'),
-  array('link' => '?page=register', 'Text' => 'Registrace'),
-  array('link' => '?page=begin', 'Text' => 'Jak začít'),
-  array('link' => 'forum/', 'Text' => 'Fórum'),
   array('link' => '?page=gmteam', 'Text' => 'GM Tým'),
-  array('link' => '?page=acc', 'Text' => 'Správa účtu'),
-  array('link' => 'bug_tracker/', 'Text' => 'Nahlaš Bug'),
+  array('link' => 'bug_tracker/', 'Text' => 'Nahlaš chybu'),
   array('link' => 'gallery/', 'Text' => 'Galerie'),
   array('link' => '?page=download', 'Text' => 'Stahování'),
@@ -39 +39 @@
   array('link' => '?page=online', 'Text' => 'Online hráči'),
   array('link' => '#', 'Text' => 'Mapa hráčů', 'OnClick' => "popup('../mmadmin/pomm_public/pomm.php', 758, 525); return false;"),
-  array('link' => '?page=tophraci', 'Text' => 'TopHráči'),
-  array('link' => '?page=banlist', 'Text' => 'Ban List'),
-  array('link' => '?page=guildy', 'Text' => 'Guildy'),
-  array('link' => '?page=gh', 'Text' => 'Domky Guild'),
+  array('link' => '?page=tophraci', 'Text' => 'Nej hráči'),
+  array('link' => '?page=banlist', 'Text' => 'Bany'),
+  array('link' => '?page=guildy', 'Text' => 'Spolky'),
+  array('link' => '?page=gh', 'Text' => 'Domky spolků'),
   array('link' => '?page=arena', 'Text' => 'Arény'),
-  array('link' => '?page=events', 'Text' => 'Eventy'),
+  array('link' => '?page=events', 'Text' => 'Události'),
   array('link' => '?page=dotation', 'Text' => 'Dotace'),
   array('link' => '?page=teamspeak', 'Text' => 'Team speak'),
@@ -98 +98 @@
     else include_once('pages/main.php');
 }
-echo('</div><div id="footer"><br /><div id="copyright"><a href="?page=autori">Vývoj webu</a></div></div></div>');
+echo('</div>'.
+'<div id="footer"><br /><div id="copyright"><a href="?page=autori">Vývoj webu</a></div></div></div>');
 
 $html->Stop();

trunk/pages/arena.php

@@ -23 +23 @@
 echo('<h3 class="PageTitle">Arénové týmy :</h3>
 Celkem týmů : <strong>'.$all_record.'</strong>
-  <table class="BaseTable" style="font-size: small;">
+  <table class="BaseTable">
     <tr>
       <th>'.MakeLink('Tým', 'atname').'</th>

trunk/pages/banlist.php

@@ -39 +39 @@
 $sqldata = $db->query('SELECT `account`.`last_ip`,`ip_banned`.`bandate`,`ip_banned`.`unbandate`,`ip_banned`.`bannedby`,`ip_banned`.`banreason` FROM `account` INNER join `ip_banned` ON `account`.`last_ip`=`ip_banned`.`ip`');
 
-echo('<table class="BaseTable" style="font-size: small;">');
+echo('<table class="BaseTable">');
 echo('<tr><th>IP</th><th>Od</th><th>Do</th><th>Banoval</th><th>Důvod</th></tr>');
 

trunk/pages/dotation.php

@@ -69 +69 @@
   if($row['time'] != '')
   {
-    //$date = $server -> HumanDate ($row["time"],0);
-    $date = $row['time'];
-  } else
-  {
-    $date = '';
-  }
+    $date = $server->HumanDate($row['time'], 0);
+    //$date = $row['time'];
+  } else $date = '';
   if($row['money'] > 0) $plus = '+';
     else $plus = '';

trunk/pages/events.php

@@ -91 +91 @@
 
 $Events = Events();
-echo('<table class="BaseTable" style="font-size: small;">');
+echo('<table class="BaseTable">');
 echo('<tr><th>Název</th><th>Začátek</th><th>Konec</th><th>Informace</th></tr>');
 echo('<tr><td colspan="5"><b>Probíhající akce</b></td></tr>');

trunk/pages/guilda.php

@@ -15 +15 @@
 {
   $guild_id = $id;
-  $guild_data = $db -> query("SELECT `guildid`, `name`, `createdate` FROM `guild` WHERE `guildid` = ".$guild_id." LIMIT 1;") -> fetch_array();
-  $members = $db -> query("SELECT guild_member.guid, guild_member.rank AS mrank, `characters`.name, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, ' ', ".$Config['Mangos']['CharacterDataOffset']['Level']." + 1), ' ', -1) AS level, (SELECT rname FROM guild_rank WHERE guildid =".$guild_id." AND rid = mrank+1) AS rname, guild_member.pnote, guild_member.offnote FROM guild_member,`characters` LEFT JOIN guild_member k1 ON k1.`guid`=`characters`.`guid` WHERE guild_member.guildid = ".$guild_id." AND guild_member.guid=`characters`.guid ORDER BY mrank");
-  $total_members = $members -> num_rows;
-  $members_data = $members -> fetch_array();
-  $online_mem = $db -> query("SELECT count(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = ".$guild_id." AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1;") -> fetch_array();;
+  $DbResult = $db->query('SELECT `guildid`, `name`, `createdate` FROM `guild` WHERE `guildid` = '.$guild_id.' LIMIT 1');
+  $guild_data = $DbResult->fetch_assoc();
+  $members = $db->query('SELECT guild_member.guid, guild_member.rank AS mrank, `characters`.name, SUBSTRING_INDEX(SUBSTRING_INDEX(`characters`.`data`, " ", '.$Config['Mangos']['CharacterDataOffset']['Level'].' + 1), " ", -1) AS level, (SELECT rname FROM guild_rank WHERE guildid ='.$guild_id.' AND rid = mrank + 1) AS rname, guild_member.pnote, guild_member.offnote FROM guild_member,`characters` LEFT JOIN guild_member k1 ON k1.`guid`=`characters`.`guid` WHERE guild_member.guildid = '.$guild_id.' AND guild_member.guid=`characters`.guid ORDER BY mrank');
+  $total_members = $members->num_rows;
+  $members_data = $members->fetch_assoc();
+  $DbResult = $db->query('SELECT count(*) AS online_mem  FROM `guild_member`, `characters`, `guild` WHERE guild.guildid = '.$guild_id.' AND guild_member.guildid = guild.guildid AND guild_member.guid = characters.guid AND characters.online = 1');
+  $online_mem = $DbResult->fetch_assoc();
+
   // guild info
   $date_arr = explode(' ', $guild_data['createdate']);
@@ -27 +30 @@
   $human_date = date('d.m.Y H:i:s', $time);
   echo('<a href="?page=guildy">&lt;- Zpět na výpis</a><br />');
-  echo('<table border="1">
+  echo('<table class="BaseTable">
     <tr>
-      <td colspan="2"><font size="5">Guilda : '.$guild_data['name'].'</font></td>
+      <td colspan="2" style="font-size: x-large;">Spolek '.$guild_data['name'].'</td>
     </tr>
     <tr>
@@ -39 +42 @@
       <td>'.$total_members.' (Online : '.$online_mem['online_mem'].')</td>
     </tr>
-  </table>');
+  </table><br />');
   
   // members info
-  echo('<table border="1">
+  echo('<table class="BaseTable">
     <tr>
       <th align="center">Jméno</th>
       <th align="center">Rasa</th>
-      <th align="center">Class</th>
+      <th align="center">Třída</th>
       <th align="center">Úroveň</th>
-      <th align="center">Rank</th>
-      <th align="center">Poslední přihlášení (Dny)</th>
+      <th align="center">Hodnost</th>
+      <th align="center">Poslední přihlášení (dny)</th>
       <th align="center">Online</th>     
     </tr>');
@@ -57 +60 @@
     $online = $query->fetch_assoc();
           $accid = $online['account'];
-          $llogin = count_days($online['logout_time'], time());
-        if($llogin < 1)
-        {
-                $lastlogin = '<font color="#009900">'.$llogin.'</font>';
-        }
-        if($llogin >= 1)
-        {
-                $lastlogin = '<font color="#0000CC">'.$llogin.'</font>';
-        }
-        if($llogin > 5)
-        {
-                $lastlogin = '<font color="#FFFF00">'.$llogin.'</font>';
-        }
-        if($llogin > 15)
-        {
-                $lastlogin = '<font color="#FF8000">'.$llogin.'</font>';
-        }
-        if($llogin > 30)
-        {
-                $lastlogin = '<font color="#FF0000">'.$llogin.'</font>';
-        }
-        if($llogin > 60)
-        {
-                $lastlogin = '<font color="#FF00FF">'.$llogin.'</font>';
-        }
-        if($llogin > 90)
-        {
-                $lastlogin = '<font color="#8000FF">'.$llogin.'</font>';
-        }
-        $level = $online['level'];
-        if($level > 0)
-                {
-                        $lev = '<font color="#FFFFFF">'.$level.'</font>';
-                }
-                if($level > 9)
-                {
-                        $lev = '<font color="#858585">'.$level.'</font>';
-                }
-                if($level > 19)
-                {
-                        $lev = '<font color="#339900">'.$level.'</font>';
-                }
-                if($level > 29)
-                {
-                        $lev = '<font color="#3300CC">'.$level.'</font>';
-                }
-                if($level > 39)
-                {
-                        $lev = '<font color="#5552FF">'.$level.'</font>';
-                }
-                if($level > 49)
-                {
-                        $lev = '<font color="#FF8000">'.$level.'</font>';
-                }
-                if($level > 59)
-                {
-                        $lev = '<font color="#FF0000">'.$level.'</font>';
-                }
-                if($level > 69)
-                {
-                        $lev = '<font color="#FF00CC">'.$level.'</font>';
-                }
-                if($level > 70)
-                {
-                        $lev = '<font color="#FFF000">'.$level.'</font>';
-                }
-                if($online['gender'] == 0) $gender = '0';
-    else $gender = '1';
+          
+    $LogoutTime = count_days($online['logout_time'], time());
+    $LogoutTimeColorList = array(0 => '#0000CC', 5 => '#FFFF00', 15 => '#FF8000', 30 => '#FF0000', 60 => '#FF00FF', 90 => '#8000FF');
+    $LogoutTimeColor = '#009900';
+    foreach($LogoutTimeColorList as $Time => $Color)
+    {
+      if($LogoutTime > $Time) $LogoutTimeColor = $Color;
+    }
+    
+        $Level = $online['level'];
+    $LevelColorList = array(9 => '#858585', 19 => '#339900', 29 => '#3300CC', 39 => '#5552FF', 49 => '#FF8000', 59 => '#FF0000', 69 => '#FF00CC', 70 => '#FFF000');
+    $LevelColor = '#FFFFFF';
+    foreach($LevelColorList as $Index => $Color)
+    {
+      if($Level > $Index) $LevelColor = $Color;
+    }
+    
+                if($online['gender'] == 0) $gender = 0;
+    else $gender = 1;
     echo('<tr>'.
       '<td align="center">'.$member[2].'</td>'.
-      '<td align="center"><img src="imgs/icons/'.$online['race'].'-'.$gender.'.gif"></td>'.
-      '<td align="center"><img src="imgs/icons/'.$online['class'].'.gif"></td>'.
-      '<td align="center">'.$lev.'</td>'.
+      '<td align="center"><img src="imgs/icons/'.$online['race'].'-'.$gender.'.gif" alt="pohlaví" /></td>'.
+      '<td align="center"><img src="imgs/icons/'.$online['class'].'.gif" alt="třída" /></td>'.
+      '<td align="center" style="color: '.$LevelColor.'">'.$Level.'</td>'.
       '<td align="center">'.$member[4].' ('.$member[1].')</td>'.
-      '<td align="center">'.$lastlogin.'</td>'.
-      '<td align="center">'.(($online['online']) ? '<img src="imgs/inc/on.gif" alt="online" />' : '<img src="imgs/inc/off.gif" alt="offline" />').'</td></td>');
+      '<td align="center" style="color: '.$LogoutTimeColor.'">'.$LogoutTime.'</td>'.
+      '<td align="center">'.(($online['online']) ? '<img src="imgs/inc/on.gif" alt="online" />' : '<img src="imgs/inc/off.gif" alt="offline" />').'</td>'.
+      '</tr>');
   }
   echo('</table>');

trunk/pages/guildy.php

@@ -20 +20 @@
   global $server;
   
-  if($row != '') return('<a href="http://'.$row.'/" target="_blank">www</a>');
+  if($row != '') return('<a href="http://'.$row.'/">www</a>');
   else return('');
 }
@@ -30 +30 @@
 } 
 
-echo('<h3 class="PageTitle">Seznam guild</h3>');
-echo('<table class="BaseTable" style="font-size: small;">
+echo('<h3 class="PageTitle">Seznam spolků</h3>');
+echo('<table class="BaseTable">
   <tr>
     <th>'.MakeLink('', 'fraction').'</th>
@@ -56 +56 @@
   echo('<tr>
     <td align="center">'.FrakceImg($row['fraction']).'</td>
-    <td align="center"><a href="?page=guilda&id='.$row['guildid'].'">'.$row['name'].'</a></td>
+    <td align="center"><a href="?page=guilda&amp;id='.$row['guildid'].'">'.$row['name'].'</a></td>
     <td align="center">'.$row['member_count'].'</td>
     <td align="center">'.$online_mem['online_mem'].'</td>

trunk/pages/online.php

@@ -23 +23 @@
 echo('<h3 class="PageTitle">Online hráči</h3>');
 echo('<div style="text-align: center">Celkem '.$server->MangosOnline().' hráčů.</div>'.
-'<table class="BaseTable" style="font-size: small;">
+'<table class="BaseTable">
   <tr>
     <th align="center">Frakce</th>

trunk/styles/style.css

@@ -73 +73 @@
   z-index: 5;
   float: left;
+  overflow: auto;
 }