Changeset 500 for trunk

Timestamp:

Jan 31, 2013, 11:20:59 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Nechtěné skrývání rámečku nabídky v pravém menu překladových skupin při pohybu myši.
• Opraveno: Nezobrazování seznamu překladových položek.

Location:

trunk

Files:

• TranslationList.php (modified) (2 diffs)
• includes/global.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• sql/updates/498.sql (modified) (2 diffs)
• team.php (modified) (1 diff)

trunk/TranslationList.php

@@ -192 +192 @@
   
   $Query = 'SELECT `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
-    '`T`.`Name`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`)'.
+    '`T`.`'.$TranslationTree[$Filter['Group']]['Items'][0]['Column'].'`, '.
+    '(SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`) '.
     'AS `UserName` FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL'];
   //echo($Query);
@@ -358 +359 @@
 
 ?>
-  

trunk/includes/global.php

@@ -164 +164 @@
   foreach($TranslationTree as $Group)
   {
-    echo('<div id="menuitem-group'.$Group['Id'].'" onmousemove="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">'.
+    echo('<div id="menuitem-group'.$Group['Id'].'" onmouseover="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">'.
       '<a href="'.$System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;action=filter').'">'.$Group['Name'].'</a></div>'.
-      '<div id="group'.$Group['Id'].'" class="hidden-menu-item" onmousemove="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">');
+      '<div id="group'.$Group['Id'].'" class="hidden-menu-item" onmouseover="show(\'group'.$Group['Id'].'\')" onmouseout="hide(\'group'.$Group['Id'].'\')">');
     echo('&nbsp;<a title="Zde můžete začít překládat" href="'.$System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=1&amp;user=0&amp;entry=&amp;text=').'">Nepřeložené</a><br />'.
     '&nbsp;<a title="Přeložené texty, můžete zde hlasovat, nebo opravovat překlady" href="'.$System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=2&amp;user=0&amp;entry=&amp;text=').'">Přeložené</a><br />'); 

trunk/index.php

@@ -39 +39 @@
   {
     //echo($DbRow['Name'].', ');
-    $UnionItems[] = 'SELECT * 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` != 0) ORDER BY `T`.`ModifyTime` DESC LIMIT '.$Count.') AS `T`';
+    $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` != 0) ORDER BY `T`.`ModifyTime` DESC LIMIT '.
+    $Count.') AS `T`';
   }
   $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName` FROM ('.implode(' UNION ', $UnionItems).') AS `TT`'.
@@ -63 +67 @@
 function ShowRSSChannel()
 {
-  global $System, $Config, $System;
+  global $System, $Config;
   
   $Items = array();  
@@ -135 +139 @@
       'Items' => $Items,
     )));
-  }
+  } else echo('Žádný kanál');
 }
 

trunk/sql/updates/498.sql

@@ -68 +68 @@
 ALTER TABLE `CzWoWPackageVersion` ADD FOREIGN KEY ( `User` ) REFERENCES `User` (
 `ID`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
+ALTER TABLE `Log` CHANGE `User` `User` INT( 11 ) NULL DEFAULT NULL ;
+UPDATE `Log` SET `User` = NULL WHERE `User` =0;
 ALTER TABLE `Log` ADD FOREIGN KEY ( `User` ) REFERENCES `User` (
 `ID`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
 ALTER TABLE `Log` ADD FOREIGN KEY ( `Type` ) REFERENCES `LogType` (
 `Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
-ALTER TABLE `Log` CHANGE `User` `User` INT( 11 ) NULL DEFAULT NULL ;
 ALTER TABLE `News` ADD FOREIGN KEY ( `User` ) REFERENCES `User` (
 `ID`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
@@ -104 +105 @@
 ALTER TABLE `ExportTask` ADD FOREIGN KEY ( `Export` ) REFERENCES `Export` (
 `Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
-ALTER TABLE `ExportLanguage` ADD INDEX ( `Sequence` ) 
+ALTER TABLE `ExportLanguage` ADD INDEX ( `Sequence` ) ;
 ALTER TABLE `ExportLanguage` ADD INDEX ( `Language` ) ;
 ALTER TABLE `ExportLanguage` ADD INDEX ( `Export` ) ;

trunk/team.php

@@ -177 +177 @@
 function TeamShow()
 {
-  global $System, $TranslationTree, $User, $Config;
+  global $System, $User, $Config;
   
   if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))