Changeset 850 for trunk

Timestamp:

Jan 17, 2016, 8:15:03 PM (9 years ago)

Author:

chronos

Message:

• Added: List of latest forum posts on front page.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Dictionary/Dictionary.php (modified) (1 diff)
• Modules/Download/Download.php (modified) (2 diffs)
• Modules/Forum/Forum.php (modified) (4 diffs)
• Modules/FrontPage/FrontPage.php (modified) (3 diffs)
• Modules/News/News.php (modified) (1 diff)
• Modules/Translation/Translation.php (modified) (3 diffs)
• Modules/User/Profile.php (modified) (1 diff)
• includes/System.php (modified) (1 diff)
• locale/cs.php (modified) (3 diffs)
• style/style.css (modified) (3 diffs)

trunk/Application/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 849; // Subversion revision
+$Revision = 850; // Subversion revision
 $DatabaseRevision = 849; // Database structure revision
 $ReleaseTime = '2016-01-17';

trunk/Modules/Dictionary/Dictionary.php

@@ -274 +274 @@
     $TableColumns = array(
       array('Name' => 'Original', 'Title' => T('English')),
-      array('Name' => 'Translated', 'Title' => $LanguageName),
+      array('Name' => 'Translated', 'Title' => T($LanguageName)),
     );
     if(!is_numeric($_SESSION['language'])) $TableColumns[] = array('Name' => 'LangName', 'Title' => T('Language'));

trunk/Modules/Download/Download.php

@@ -19 +19 @@
     $this->System->RegisterMenuItem(array(
       'Title' => T('Download'),
-      'Hint' => T('List of czech to download'),
+      'Hint' => T('List of files for download'),
       'Link' => $this->System->Link('/download/'),
       'Permission' => LICENCE_ANONYMOUS,
@@ -79 +79 @@
   function ShowDownload()
   {
-    $Output = '<h3>'.T('Download czech').'</h3><br />';
+    $Output = '<h3>'.T('Download files').'</h3><br />';
 
     $Output .= T('Additional files: modified wow.exe, fonts to game, translated interface aowow and more can be found on page').

trunk/Modules/Forum/Forum.php

@@ -35 +35 @@
       'Icon' => '',
     ), 17);
+  }
+
+  function ShowBox()
+  {
+    $Parser = new HTML_BBCodeParser2(array('filters' => array('Basic', 'Extended',
+      'Images', 'Links', 'Lists', 'Email')));
+    $Count = 20;
+    $Output = '<strong><a href="'.$this->System->Link('/forum/').'">'.T('Last forum posts').':</a></strong>';
+
+    $Query = 'SELECT `ForumText`.`Text`, `ForumText`.`Date`, `User`.`Name` AS `UserName`, '.
+      '`User`.`Id` AS `UserId`, `ForumText`.`Thread` '.
+      'FROM `ForumText` '.
+      'JOIN `User` ON `User`.`Id` = `ForumText`.`User` '.
+      'ORDER BY `Date` DESC LIMIT '.$Count;
+    $DbResult = $this->Database->query($Query);
+    $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('User').'</th><th>'.T('Post').'</th></tr>';
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $Output .= '<tr>'.
+        '<td><a href="'.$this->System->Link('/forum/?Thread='.$DbRow['Thread']).'">'.HumanDate($DbRow['Date']).'</a></td>'.
+        '<td><a href="'.$this->System->Link('/user/?user='.$DbRow['UserId']).'">'.$DbRow['UserName'].'</a></td>'.
+        '<td>'.$Parser->qparse($DbRow['Text']).'</td>'.
+        '</tr>';
+    }
+    $Output .= '</table>';
+    return($Output);
   }
 }
@@ -73 +99 @@
   {
     $Output = '';
-
     $Text = $_POST['text'];
-
     $DbResult = $this->System->Database->query('UPDATE `ForumText` SET `Text`="'.$_POST['text'].'" WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
-
     $Output .= ShowMessage(T('Text edited.'));
-
-
     return ($Output);
   }
@@ -178 +199 @@
     $Output .= $PageList['Output'];
     $Output .= '<div class="shoutbox">';
-    $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `Thread` = '.
+    $DbResult = $this->System->Database->query('SELECT * FROM `ForumText` WHERE `Thread` = '.
       ($_GET['Thread']*1).' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
     while($Line = $DbResult->fetch_assoc()) {
       if ($this->System->User->Id == $Line['User'])
-        $edit = '<a href="?Edit='.$Line['ID'].'">editovat</a>';
+        $edit = '<a href="?Edit='.$Line['ID'].'">'.T('edit').'</a>';
       else $edit = '';
       $Output .= '<div><span style="float:right;">'.$edit.' ('.HumanDate($Line['Date']).
@@ -197 +218 @@
     if($this->System->User->Licence(LICENCE_USER))
     {
-        $Output .= '<form action="?Thread='.$_GET['Thread'].'" method="post">'.
-            '<fieldset><legend>'.T('New Forum Message').'</legend>'.
-            T('User').': ';
-        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+      $Output .= '<form action="?Thread='.$_GET['Thread'].'" method="post">'.
+        '<fieldset><legend>'.T('New Forum Message').'</legend>'.
+        T('User').': ';
+      if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
         else $Output .= '<input type="text" name="user" /><br />';
-        $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.
-      '<textarea onkeydown="ResizeTextArea(this)" name="text" cols="80"></textarea> <br/>'.
-      '<input type="hidden" name="a" value="add2"/>'.
-      '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
-      '</form>';
+      $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.
+        '<textarea onkeydown="ResizeTextArea(this)" name="text" cols="80"></textarea> <br/>'.
+        '<input type="hidden" name="a" value="add2"/>'.
+        '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
+        '</form>';
     } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
     return($Output);

trunk/Modules/FrontPage/FrontPage.php

@@ -11 +11 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Main welcome page';
-    $this->Dependencies = array('News', 'User', 'ShoutBox', 'Translation');
+    $this->Dependencies = array('News', 'User', 'ShoutBox', 'Translation', 'Log',
+      'Forum');
   }
 
@@ -79 +80 @@
     if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
 
-    $Output .= '<br />'.
-      '<table class="Home"><tr><td colspan="3">'.$this->ShowWelcome().
+    $Output .= ''.
+      '<table class="Home"><tr><td colspan="2">'.$this->ShowWelcome().
       '</td></tr>';
-    $Output .= '<tr><td colspan="3"><h3><a href="'.$this->System->Link('/download/').'">'.T('Download Czech File').'</a></h3></td></tr>';
+    $Output .= '<tr><td colspan="3"><h3><a href="'.$this->System->Link('/download/').'">'.T('Download files').'</a></h3></td></tr>';
 
-    $Output .= '<tr><td class="SideBox">'.$this->ShowLastTranslated().'</td>'.
-        '<td class="news-box">'.$this->System->ModuleManager->Modules['News']->ShowBox().'</td>'.
-        '<td class="SideBox">'.$this->System->ModuleManager->Modules['ShoutBox']->ShowBox().'</td>'.
-        '</tr></table>';
+    $Output .= '<tr>'.
+      '<td class="news-box">'.$this->System->ModuleManager->Modules['News']->ShowBox().'</td>'.
+      '<td class="SideBox">'.$this->System->ModuleManager->Modules['ShoutBox']->ShowBox().'</td>'.
+      '</tr></table>'.
+      '<table class="Home"><tr>'.
+      '<td class="news-box">'.$this->System->ModuleManager->Modules['Forum']->ShowBox().'</td>'.
+      '<td class="SideBox">'.$this->System->ModuleManager->Modules['Translation']->ShowBox().'</td>'.
+      '</tr></table>';
      return($Output);
-  }
-
-  function ShowLastTranslated()
-  {
-    $Count = 40;
-    $Output = '<strong>'.T('Last translated').':</strong>';
-
-    $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
-    $Query = '';
-    $UnionItems = array();
-    $DbResult = $this->Database->query($GroupListQuery);
-    if($DbResult->num_rows > 0)
-    {
-      while($DbRow = $DbResult->fetch_assoc())
-      {
-        $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
-            'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
-            $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
-            $DbRow['TablePrefix'].'` AS `T`'.
-            ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
-            $Count.') AS `T`';
-      }
-      $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
-          ' FROM ('.implode(' UNION ', $UnionItems).') AS `TT`'.
-          ' JOIN `User` ON `User`.`Id` = `TT`.`User`'.
-          ' ORDER BY `ModifyTime` DESC LIMIT '.$Count;
-      $DbResult = $this->Database->query($Query);
-      $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('Who').'</th><th>'.T('New').'</th><th>'.T('Source').'</th><th>'.T('Group').'</th></tr>';
-      while($DbRow = $DbResult->fetch_assoc())
-      {
-        $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
-            '<td><a href="'.$this->System->Link('/user/?user='.$DbRow['UserId']).'">'.$DbRow['UserName'].'</a></td>'.
-            '<td><a href="'.$this->System->Link('/form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID']).'">'.$DbRow['ID'].'</a></td>'.
-            '<td><a href="'.$this->System->Link('/form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take']).'">'.$DbRow['Take'].'</a></td>'.
-            '<td><a href="'.$this->System->Link('/TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter').'">'.T($DbRow['GroupName']).'</a></td></tr>';
-      }
-      $Output .= '</table>';
-    }
-    return($Output);
   }
 
@@ -160 +126 @@
     // Echo text even if it is hidden because of caching by external searching engines
     return('<div style="'.$HideWelcome.'">'.
-        '<div id="bannertitle">'.$this->System->Config['Web']['Title'].'</div>'.
-        T('Open web system for translation texts from game World of Warcraft (WoW).<br/>'.
-        '<ul>'.
-        '<li>The project is operated as open and professes princips of freedom and openness. That is why texts are free to download.</li>'.
-        '<li>The project serve for team translation. Anybody can contribute by translating texts and made link public e.g. banner at own web.</li>'.
-        '<li>The project is not focused only to one server but allows collectively translation to people from various servers. Translators can translate in teams by name of own server and export texts only from selected translators.</li>'.
-        '<li>Translated texts can be freely downloaded in various forms like XML, SQL, Addon and Lua. So translated texts can be simply imported to own free server or used in other projects.</li>'.
-        '<li>Aim of the project is to translate all game texts. Not just texts of quests.</li>'.
-        '<li>Thanks for sophisticated system of selectable exports you can download any part of translation, even just quests. And so exclude translation of items, creatures and others.</li>'.
-        '<li>Texts can be translated to multiple languages, e.g. Czech and Slovak.</li>'.
-        '</ul>').'</div>'.$Action);
+      '<div id="bannertitle">'.$this->System->Config['Web']['Title'].'</div>'.
+      T('Open web system for translation texts from game World of Warcraft (WoW).<br/>'.
+      '<ul>'.
+      '<li>The project is operated as open and professes princips of freedom and openness. That is why texts are free to download.</li>'.
+      '<li>The project serve for team translation. Anybody can contribute by translating texts and made link public e.g. banner at own web.</li>'.
+      '<li>The project is not focused only to one server but allows collectively translation to people from various servers. Translators can translate in teams by name of own server and export texts only from selected translators.</li>'.
+      '<li>Translated texts can be freely downloaded in various forms like XML, SQL, Addon and Lua. So translated texts can be simply imported to own free server or used in other projects.</li>'.
+      '<li>Aim of the project is to translate all game texts. Not just texts of quests.</li>'.
+      '<li>Thanks for sophisticated system of selectable exports you can download any part of translation, even just quests. And so exclude translation of items, creatures and others.</li>'.
+      '<li>Texts can be translated to multiple languages, e.g. Czech and Slovak.</li>'.
+      '</ul>').'</div>'.$Action);
   }
 }

trunk/Modules/News/News.php

@@ -29 +29 @@
   function ShowBox()
   {
-    $Output = '<strong><a href="'.$this->System->Link('/news/').'">'.T('News').':</a></strong><div class="NewsBox">';
+    $Count = 6;
+    $Output = '<strong><a href="'.$this->System->Link('/news/').'">'.T('News').':</a></strong>'.
+    '<div class="NewsBox">';
     $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`, `News`.`Id` '.
-      ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+      ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT '.$Count);
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/Modules/Translation/Translation.php

@@ -49 +49 @@
       'Icon' => '',
     ));
-    /*
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
     {
@@ -68 +67 @@
       }
     }
-    */
   }
 
@@ -96 +94 @@
     return($Output);
   }
+
+  function ShowBox()
+  {
+    $Count = 40;
+    $Output = '<strong>'.T('Last translated').':</strong>';
+
+    $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
+    $Query = '';
+    $UnionItems = array();
+    $DbResult = $this->Database->query($GroupListQuery);
+    if($DbResult->num_rows > 0)
+    {
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
+            'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
+            $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
+            $DbRow['TablePrefix'].'` AS `T`'.
+            ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
+            $Count.') AS `T`';
+      }
+      $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
+          ' FROM ('.implode(' UNION ', $UnionItems).') AS `TT`'.
+          ' JOIN `User` ON `User`.`Id` = `TT`.`User`'.
+          ' ORDER BY `ModifyTime` DESC LIMIT '.$Count;
+      $DbResult = $this->Database->query($Query);
+      $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('Who').'</th><th>'.T('New').'</th><th>'.T('Source').'</th><th>'.T('Group').'</th></tr>';
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
+            '<td><a href="'.$this->System->Link('/user/?user='.$DbRow['UserId']).'">'.$DbRow['UserName'].'</a></td>'.
+            '<td><a href="'.$this->System->Link('/form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID']).'">'.$DbRow['ID'].'</a></td>'.
+            '<td><a href="'.$this->System->Link('/form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take']).'">'.$DbRow['Take'].'</a></td>'.
+            '<td><a href="'.$this->System->Link('/TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter').'">'.T($DbRow['GroupName']).'</a></td></tr>';
+      }
+      $Output .= '</table>';
+    }
+    return($Output);
+  }
 }

trunk/Modules/User/Profile.php

@@ -122 +122 @@
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
     $Count = 20;
-    $Output = '<strong>'.T('Lastest forum posts:').'</strong>';
+    $Output = '<strong>'.T('Latest forum posts:').'</strong>';
 
     $Output .= '<div class="shoutbox">';

trunk/includes/System.php

@@ -45 +45 @@
     );
     $GlobalLocaleManager = $this->LocaleManager;
-    $this->LinkLocaleExceptions = array('images', 'style', 'tmp', 'files');
+    $this->LinkLocaleExceptions = array('images', 'style', 'tmp', 'files', 'aowow');
 
     $this->PathItems = ProcessURL();

trunk/locale/cs.php

@@ -139 +139 @@
       'Settings saved' => 'Nastavení uloženo',
       'Export allways from all users' => 'Exportovat vždy od všech uživatelů',
-      'Download Czech File' => 'Stáhnout češtinu',
       'Imported' => 'Importováno',
       'URL' => 'URL',
@@ -196 +195 @@
       'Show all untranslated' => 'Zobrazit všechny nepřeložené',
       'Translation not found' => 'Překlad nenalezen.',
-      'List of czech to download' => 'Seznam češtin ke stažení',
+      'List of files for download' => 'Seznam souborů ke stažení',
       'Accessories for client' => 'Doplňky pro klienta',
       'Tool to command line, which search and edit file wow.exe for support editing files GlueStrings.lua and GlobalStrings.lua.' => 'Nástroj příkazové řádky, který hledá a upravuje dle binárního vzoru obsah Wow.exe pro podporu překládání souborů GlueStrings.lua a GlobalStrings.lua.',
       'Designed for one-time creation of new modified version of wow.exe. Help can be called with the --help option. The ability to modify future versions not guaranteed.' => 'Určeno pro jednorázové vytvoření upravených nových verzí Wow.exe. Nápovědu lze vyvolat pomocí parametru --help. Schopnost upravit budoucí verze není zaručena.',
       'Specific modified version of WoW.exe for free servers with support for translation Lua files' => 'Konkrétní verze upraveného WoW.exe pro free servery s podporou překládání Lua souborů',
-      'Download czech' => 'Stažení češtiny',
+      'Download files' => 'Stažení souborů',
       'Additional files: modified wow.exe, fonts to game, translated interface aowow and more can be found on page' => 'Doplňkové soubory: upravené wow.exe, fonty do hry, přeložené rozhraní aowow a další najdete na stránce',
       'If none of these files is suitable for you, for example, to the Czech without the translated interface. You can generate your own section in section' => 'Pokud vám nevyhovuje žádný z následujících souborů, například chcete češtinu bez přeloženého rozhraní. Můžete si vygenerovat vlastní v sekci',
@@ -495 +494 @@
         'You joined new team' => 'Vstoupil jsi do nového týmu',
         'You are now not member of any team' => 'Nyní nejste členem žádného týmu',
+        'Last forum posts' => 'Poslední příspěvky fóra',
+        'edit' => 'upravit',
+        'Post' => 'Příspěvek',
       ),
       'URL' => array(

trunk/style/style.css

@@ -259 +259 @@
   overflow: auto; 
   width: 100%;
-  height: 1000px;
+  height: 500px;
   font-size: 80%;
   border-width: 1px;
@@ -396 +396 @@
 .news-box
 {
-  width: 50%;
+  width: 60%;
 }
 
@@ -567 +567 @@
 .SideBox
 {
-  width: 25%;
+  width: 40%;
 }