diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index fc7ccf0c1..92d7aed39 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -1202,6 +1202,7 @@ When associated with a trigger, each action is given an "order" number, specifyi 'UI:AboutBox' => 'About iTop...', 'UI:About:Title' => 'About iTop', + 'UI:About:DataModel' => 'Data model', 'UI:About:Support' => 'Support information', 'UI:About:Licenses' => 'Licenses', 'UI:About:Modules' => 'Installed modules', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index f894dbef4..4fd9dca37 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -1043,6 +1043,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'UI:AboutBox' => 'A propos d\'iTop...', 'UI:About:Title' => 'A propos d\'iTop', + 'UI:About:DataModel' => 'Modèle de données', 'UI:About:Support' => 'Informations pour le support', 'UI:About:Licenses' => 'Licences', 'UI:About:Modules' => 'Modules installés', diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 394f64a59..420061b8e 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -1102,11 +1102,10 @@ EOF $oPage->SetContentType('text/html'); $sDialogTitle = addslashes(Dict::S('UI:About:Title')); - $sOkButtonLabel = addslashes(Dict::S('UI:Button:Ok')); $oPage->add_ready_script( <<add("
"); - $oPage->p('iTop '.$sVersionString); - $oPage->p('Data model '.$sDataModelVersion); - - $oPage->p('MySQL '.$sMySQLVersion); - $oPage->p('PHP '.$sPHPVersion); + $oPage->add('
'); + $oPage->add(''); + $oPage->add(''); + $oPage->add(''); + $oPage->add(''); + $oPage->add(''); + $oPage->add('
'); + $oPage->add($sVersionString.'
'); + $oPage->add(Dict::S('UI:About:DataModel').': '.$sDataModelVersion.'
'); + $oPage->add('MySQL: '.$sMySQLVersion.'
'); + $oPage->add('PHP: '.$sPHPVersion.'
'); + $oPage->add('
'); + $oPage->add("
"); $oPage->add("
"); $oPage->add('
'); $oPage->add(''.Dict::S('UI:About:Licenses').''); - $oPage->add('
    '); + $oPage->add('
      '); foreach($aLicenses as $index => $oLicense) { $oPage->add('
    • '.$oLicense->product.', © '.$oLicense->author.' is licensed under the '.$oLicense->license_type.' license. (Details)'); @@ -1191,14 +1198,14 @@ EOF $oPage->add('
      '); $oPage->add(''.Dict::S('UI:About:Modules').''); //$oPage->add(print_r($aAvailableModules, true)); - $oPage->add("
      "); + $oPage->add("
      "); $oPage->add('
        '); foreach ($aAvailableModules as $sModuleId => $aModuleData) { if ($sModuleId == '_Root_') continue; if (!$aModuleData['visible']) continue; if ($aModuleData['version_db'] == '') continue; - $oPage->add('
      • '.$aModuleData['label'].' '.$aModuleData['version_db'].'
      • '); + $oPage->add('
      • '.$aModuleData['label'].' ('.$aModuleData['version_db'].')
      • '); } $oPage->add('
      '); $oPage->add("
      "); @@ -1208,9 +1215,11 @@ EOF // MUST NOT be localized, as the information given here will be sent to the support $oPage->add("".Dict::S('UI:About:Support')."
      \n"); $oPage->add("
      "); - $oPage->add('