Changeset 80 for trunk

Timestamp:

Feb 10, 2009, 3:22:31 PM (16 years ago)

Author:

maron

Message:

Porovnávání dvou vybraných, odkaz na porovnávání

Location:

trunk

Files:

• comparison.php (modified) (2 diffs)
• form.php (modified) (1 diff)
• style/style.css (modified) (1 diff)

trunk/comparison.php

@@ -43 +43 @@
   $Textentry = $_GET['entry'];  
 
-  $DataID = $Database->SQLCommand('SELECT * FROM '.$Table.' Where entry = '.$Textentry);
+
+        if ((array_key_exists('ID1', $_GET)) and ($_GET['ID1'] <> -1)) { //porovnání pouze 2 textů
+                $TextID1 = $_GET['ID1'];  
+                $TextID2 = $_GET['ID2'];  
+                $WhereID = " AND (ID = $TextID1 OR ID = $TextID2 OR Language = 0)";     
+        } else $WhereID = '';
+
+  $DataID = $Database->SQLCommand('SELECT * FROM '.$Table.' Where entry = '.$Textentry.$WhereID);
   $i = 0;
   while($Line = mysql_fetch_assoc($DataID)) {
@@ -86 +93 @@
         <th>'.$TextItem['Name'].'</th>');
           for ($i = 0; $i < count($Line); $i++) {
-        if ($i >= 1) {
+        if ($i > 1) {
           echo ('<td>');
           CompareString($Line[$i][$TextItem['Column']],$Line[$i-1][$TextItem['Column']]);

trunk/form.php

@@ -42 +42 @@
     echo(' <b>Anglická, původní verze</b><br />');
   }
-    
-  $number_version = mysql_fetch_array($Database->SQLCommand('SELECT count(*) FROM '.$Table.' Where entry = '.$Line['entry'].' AND Language <> 0'));
-  echo('Počet verzí: <b>'.$number_version['count(*)'].'</b> '); 
-  echo('<a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['entry'].'">Zobrazit všechny verze tohoto překladu</a>');
-    
+   
+  $version = mysql_fetch_array($Database->SQLCommand('SELECT count(*) FROM '.$Table.' Where entry = '.$Line['entry'].' AND Language <> 0'));
+  if ($version['count(*)'] > 1) {
+    echo('<form action="comparison.php" method="get">Počet verzí: <b>'.$version['count(*)'].'</b>  
+            <input type="hidden" name="group" value="'.$GroupId.'" />
+            <input type="hidden" name="entry" value="'.$Line['entry'].'" />
+        <input type="hidden" name="ID2" value="'.$TextID.'" />
+        <select onchange="this.form.submit();" name="ID1">
+        <option value="-1">Vyberte text k porovnání</option>
+        <option value="-1">Zobrazit/porovnat všechny</option>'); 
+         $DataID = $Database->SQLCommand('SELECT *, (SELECT user.user FROM user WHERE user.id = '.$Table.'.user) as User  FROM '.$Table.' Where entry = '.$Line['entry'].' AND Language <> 0 AND ID <> '.$Line['ID']);  
+         while($version = mysql_fetch_array($DataID))
+         {     
+                if ($version['ID'] == $Line['Take']) echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].' (převzato)</option>');   
+        else echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].'</option>');
+     }
+     echo('</select>');         
+   // echo('<a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['entry'].'">Zobrazit všechny verze tohoto překladu</a>');
+  } else {
+          echo('Počet verzí: <b>'.$version['count(*)'].'</b> '); 
+  }
+
 //    Speciální znaky: $B - Odřádkování, $N - Jméno, $C - povolání
   echo('<form action="save.php?group='.$GroupId.'" method="post"><div>');

trunk/style/style.css

@@ -77 +77 @@
 /***************Porovnávání textu**********/
 #edit {
-background-color: #E8E8E8;
+background-color: #DB7093;
 }