Changeset 469

Timestamp:

Apr 20, 2010, 7:16:40 AM (14 years ago)

Author:

george

Message:

• Upraveno: Kecátko přemístěno na hlavní stránku z důvodu nárůstu počtu překladových skupin a jeho posunutí směrem dolů mimo běžně viditelnou plochu.

Location:

trunk

Files:

• includes/global.php (modified) (2 diffs)
• index.php (modified) (3 diffs)
• sql/updates/469.sql (added)
• style/style.css (modified) (5 diffs)

trunk/includes/global.php

@@ -43 +43 @@
   global $System, $Config, $User, $System;
   
-  echo('<strong><a href="'.$System->Link('/action.php?action=ShoutBoxView').'">Kecátko:</a></strong>');
+  $Output = '<strong><a href="'.$System->Link('/action.php?action=ShoutBoxView').'">Kecátko:</a></strong>';
   if($User->Licence(LICENCE_USER)) 
-    echo(' <a href="'.$System->Link('/action.php?action=shoutbox').'">Vložit</a>');
-  echo('<div class="box"><table>');
+    $Output .= ' <a href="'.$System->Link('/action.php?action=shoutbox').'">Vložit</a>';
+  $Output .= '<div class="box"><table>';
   $DbResult = $System->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
   while($Line = $DbResult->fetch_assoc())
-    echo('<tr><td><strong>'.$Line['User'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>');
-  echo('</table></div>');
+    $Output .= '<tr><td><strong>'.$Line['User'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>';
+  $Output .= '</table></div>';
+  return($Output);
 }
 
@@ -295 +296 @@
     echo('<td class="menu2">');
     ShowTranslatedMenu();
-    echo('<br />');
-    ShowShoutBox();
+    //echo('<br />');
+    //ShowShoutBox();
     echo('</td>'.
   '</tr><tr>'.

trunk/index.php

@@ -29 +29 @@
 
   $Count = 40;
-  $Output = '<strong>Poslední překlady:</strong><div class="NewsBox">';
+  $Output = '<strong>Poslední překlady:</strong>';
+  //'<div class="NewsBox">';
   
   $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
@@ -47 +48 @@
   //echo($System->Database->error);
   //echo($Query);
+  $Output .= '<table class="MiniTable"><tr><th>Datum</th><th>Kdo</th><th>Nový</th><th>Zdroj</th><th>Skupina</th></tr>';
   while($DbRow = $DbResult->fetch_assoc())
   {
-    $Output .= '<strong>'.HumanDate($DbRow['ModifyTime']).' '.$DbRow['UserName'].'</strong> přeložil text <a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a> převzatý z textu <a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a> ve skupině <a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a><br />';  
+    $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
+    '<td>'.$DbRow['UserName'].'</td>'.
+    '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a></td>'.
+    '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a></td>'.
+    '<td><a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a></td></tr>';  
   }
+  $Output .= '</table>';
   return($Output);
 }
@@ -175 +182 @@
   
   echo('<br />'.  
-  '<table class="Home"><tr><td colspan="2">'.$Welcome.
-  '</td></tr><tr><td>'.ShowLastTranslated().'</td><td class="news-box">'.ShowNews().'</td></tr></table>'); 
+  '<table class="Home"><tr><td colspan="3">'.$Welcome.
+  '</td></tr>'.
+  '<tr><td>'.ShowLastTranslated().'</td>'.
+  '<td class="news-box">'.ShowNews().'</td>'.
+  '<td>'.ShowShoutBox().'</td>'.
+  '</tr></table>'); 
          
   ShowFooter();

trunk/style/style.css

@@ -198 +198 @@
   background:#ffffff  url('../images/content.jpg') no-repeat top right;
   vertical-align: top;
-  padding: 5px;
+  padding: 5px 5px 5px 0px;
   margin-left: 0px;
 }
@@ -271 +271 @@
 }
 
-.BaseTable td
+.BaseTable tr td
 {
   border-width: 1px;
@@ -280 +280 @@
 }
 
-.BaseTable th
+.BaseTable tr th
 {
   border-width: 1px;
@@ -322 +322 @@
 {
   vertical-align: top;
-  padding-left: 10px;
+  padding-right: 5px;
 }
  
@@ -471 +471 @@
   padding-right: 5px;
 }
+
+.MiniTable
+{
+  margin: 2px auto 2px auto;
+  border-width: 0px;
+  border-color: black;
+  border-style: solid;
+  border-collapse: collapse;
+  border-spacing: 0px 0px 0px 0px;
+  font-size: small;
+  background-color: #E8E8E8;
+}
+
+.MiniTable tr td
+{
+  border-width: 1px;
+  border-color: #c43300;
+  border-style: solid;
+  padding: 1px 1px 1px 1px;
+  margin: 0px 0px 0px 0px;
+  text-align: center;
+  vertical-align: middle;
+}
+
+.MiniTable tr th
+{
+  border-width: 1px;
+  border-color: #c43300;
+  border-style: solid;
+  margin: 0px 0px 0px 0px;
+  padding: 1px 1px 1px 1px;
+  text-align: center;
+  vertical-align: middle;
+}