Changeset 752
- Timestamp:
- Jan 13, 2014, 11:10:01 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modules/Translation/Comparison.php
r613 r752 41 41 { 42 42 global $TranslationTree; 43 43 44 $Output = ''; 45 46 if($this->System->User->Licence(LICENCE_USER)) 47 { 44 48 $Output = 'Text je porovnáván vždy ku předešlému (vlevo). Změny jsou zvýrazněny <span class="edit">barvou.</span><br /><br />'; 45 49 … … 114 118 $Output .= '</table>'; 115 119 } else $Output .= ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL); 120 } else $Output .= ShowMessage('Porovnávat můžou pouze překladatelé!', MESSAGE_CRITICAL); 121 116 122 return($Output); 117 } 123 } 118 124 } -
trunk/Modules/Translation/Form.php
r745 r752 128 128 <input type="hidden" name="group" value="'.$GroupId.'" /> 129 129 <input type="hidden" name="entry" value="'.$Line['Entry'].'" /> 130 <input type="hidden" name="ID2" value="'.$TextID.'" /> 131 <select onchange="this.form.submit();" name="ID1"> 132 <option value="-1">Vyberte text k porovnání</option> 133 <option value="-1">Zobrazit/porovnat všechny</option>'; 134 $DataID = $this->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].')'); 135 while($Version = $DataID->fetch_array()) 136 { 137 if($Version['ID'] == $Line['Take']) $Output .= '<option value="'. 138 $Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>'; 139 else 140 { 141 if($Version['Language'] == 0) $Version['UserName'] = 'Předloha'; 142 $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '. 143 $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '. 144 GetVersionWOW($Version['VersionEnd']).')</option>'; 145 } 146 } 147 $Output .= '</select></form>'; 130 <input type="hidden" name="ID2" value="'.$TextID.'" />'; 131 132 if($this->System->User->Licence(LICENCE_USER)) { //allow to compare only to user 133 $Output .= '<select onchange="this.form.submit();" name="ID1"> 134 <option value="-1">Vyberte text k porovnání</option> 135 <option value="-1">Zobrazit/porovnat všechny</option>'; 136 $DataID = $this->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].')'); 137 while($Version = $DataID->fetch_array()) 138 { 139 if($Version['ID'] == $Line['Take']) $Output .= '<option value="'. 140 $Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>'; 141 else 142 { 143 if($Version['Language'] == 0) $Version['UserName'] = 'Předloha'; 144 $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '. 145 $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '. 146 GetVersionWOW($Version['VersionEnd']).')</option>'; 147 } 148 } 149 $Output .= '</select>'; 150 } 151 $Output .= '</form>'; 148 152 } else 149 153 { -
trunk/includes/Version.php
r751 r752 6 6 // and system will need database update. 7 7 8 $Revision = 75 0; // Subversion revision8 $Revision = 751; // Subversion revision 9 9 $DatabaseRevision = 748; // Database structure revision 10 10 $ReleaseTime = '2014-01-12';
Note:
See TracChangeset
for help on using the changeset viewer.