diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php index 148e25f64..cc0db72b9 100644 --- a/dictionaries/de.dictionary.itop.ui.php +++ b/dictionaries/de.dictionary.itop.ui.php @@ -788,5 +788,6 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm 'UI:FavoriteOrganizations+' => '', 'UI:NavigateAwayConfirmationMessage' => 'Alle Änderungen werden verworfen.', 'UI:Create_Class_InState' => 'Lege %1$s an in Status: ', + 'UI:Button:Refresh' => 'Neu laden', )); ?> diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index d43174c5d..f27957f95 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -963,5 +963,6 @@ When associated with a trigger, each action is given an "order" number, specifyi 'Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting "All Organizations" in the drop-down list.', 'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.', 'UI:Create_Class_InState' => 'Create the %1$s in state: ', + 'UI:Button:Refresh' => 'Refresh', )); ?> diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index c57c2d2a5..e2aa45ba5 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -806,5 +806,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'Ceci n\'est pas un réglage de sécurité. Les objets de toutes les organisations sont toujours visibles en choisissant "Toutes les Organisations" dans le menu.', 'UI:NavigateAwayConfirmationMessage' => 'Toute modification sera perdue.', 'UI:Create_Class_InState' => 'Créer l\'objet %1$s dans l\'état: ', + 'UI:Button:Refresh' => 'Rafraîchir', )); ?> diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php index a02abe27f..605c2ad18 100755 --- a/dictionaries/hu.dictionary.itop.ui.php +++ b/dictionaries/hu.dictionary.itop.ui.php @@ -772,5 +772,6 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az 'UI:ActionNotAllowed' => 'Ennek a műveletnek a végrehajtása nem engedélyezett ezen az objektumon.', 'UI:BulkAction:NoObjectSelected' => 'Válasszon ki legalább egy objketumot a művelet végrehajtásához', 'UI:AttemptingToChangeASlaveAttribute_Name' => '%1$s mező nem írható, mert a szinkronizációnál használt kulcs. Érték változatlan maradt.', + 'UI:Button:Refresh' => 'Frissítés', )); ?> \ No newline at end of file diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php index 035fb8855..3b668b6ba 100644 --- a/dictionaries/it.dictionary.itop.ui.php +++ b/dictionaries/it.dictionary.itop.ui.php @@ -908,5 +908,6 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine" 'UI:ActionNotAllowed' => 'Non hai i permessi per eseguire questa azione su questi oggetti.', 'UI:BulkAction:NoObjectSelected' => 'Si prega di selezionare almeno un oggetto per eseguire questa operazione', 'UI:AttemptingToChangeASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore rimane invariato.', + 'UI:Button:Refresh' => 'Ricarica', )); ?> diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php index fbebc17f0..42e3c594c 100644 --- a/dictionaries/ja.dictionary.itop.ui.php +++ b/dictionaries/ja.dictionary.itop.ui.php @@ -907,6 +907,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'Portal:RemoveAttachment' => ' 添付を除去する ', // ' Remove Attachment ', 'Portal:Attachment_No_To_Ticket_Name' => '#%1$d を$2$s ($3$s)に添付する', // 'Attachment #%1$d to %2$s (%3$s)', 'Enum:Undefined' => '定義されていません', // 'Undefined', + 'UI:Button:Refresh' => '更新', // 'Refresh', )); diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php index 284c24c0e..6ddc964a3 100644 --- a/dictionaries/pt_br.dictionary.itop.ui.php +++ b/dictionaries/pt_br.dictionary.itop.ui.php @@ -960,5 +960,6 @@ Quando associada a um gatilho, cada ação é dada um número "ordem", especific 'Note-se que esta não é uma configuração de segurança, objetos de qualquer organização ainda são visíveis e podem ser acessadas selecionando a opção "Todas as Organizações" na lista drop-down.', 'UI:NavigateAwayConfirmationMessage' => 'Qualquer modificação será descartada.', 'UI:Create_Class_InState' => 'Criar o %1$s em estado: ', + 'UI:Button:Refresh' => 'Atualizar', )); ?> diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php index 540872128..8ea40903c 100644 --- a/dictionaries/ru.dictionary.itop.ui.php +++ b/dictionaries/ru.dictionary.itop.ui.php @@ -872,6 +872,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'Portal:ErrorNoContactForThisUser' => 'Ошибка: текющий пользователь не ассоциирован с Контактом/Человеком. Пожалуйста свяжитесь с вашим администратором.', 'Enum:Undefined' => 'Неопределён', + 'UI:Button:Refresh' => 'Обновить', )); diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php index ebc686fdf..e4d9a9264 100644 --- a/dictionaries/tr.dictionary.itop.ui.php +++ b/dictionaries/tr.dictionary.itop.ui.php @@ -871,8 +871,6 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe 'Portal:ErrorNoContactForThisUser' => 'Hata: mevcut kullanıcının irtibat bilgisi yok. Sistem yöneticisi ile irtibata geçiniz.', 'Enum:Undefined' => 'Tanımsız', + 'UI:Button:Refresh' => 'Yenile', )); - - - ?> diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php index 70b724e7a..6d867e29d 100644 --- a/dictionaries/zh.dictionary.itop.ui.php +++ b/dictionaries/zh.dictionary.itop.ui.php @@ -869,6 +869,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Portal:ErrorNoContactForThisUser' => '错误: 当前用户没有和一个联系人或人员关联. 请联系您的系统管理员.', 'Enum:Undefined' => '未定义', + 'UI:Button:Refresh' => '刷新', )); diff --git a/navigator/iTop/Navigator.as b/navigator/iTop/Navigator.as index 5d24d98f0..1955d8e3a 100644 --- a/navigator/iTop/Navigator.as +++ b/navigator/iTop/Navigator.as @@ -48,6 +48,7 @@ m_aNodes = new Array(); m_sExclude = ''; m_fZoom = 1; + m_oLoader = null; initParameters(); var success = true; if (ExternalInterface.available) @@ -168,6 +169,10 @@ var myString:String = m_sDataUrl+sSeparator+'relation='+m_sRelation+'&class='+m_sObjClass+'&id='+m_sObjId+'&exclude='+m_sExclude; trace("Requesting:"+myString); var myXMLURL:URLRequest = new URLRequest(myString); + if (m_oLoader != null) + { + m_oLoader.close(); + } m_oLoader = new URLLoader(); m_oLoader.addEventListener(Event.COMPLETE, onXMLLoadComplete); m_oLoader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onXMLLoadError); diff --git a/navigator/navigator.swf b/navigator/navigator.swf index 0b5600984..33d705007 100755 Binary files a/navigator/navigator.swf and b/navigator/navigator.swf differ diff --git a/pages/UI.php b/pages/UI.php index 329c04605..9a5e22bc6 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -2056,10 +2056,11 @@ EOF $idx = 0; foreach($aSortedElements as $sSubClass => $sClassName) { - $oP->add(" "); + $oP->add(" "); $idx++; } - $oP->add("\n"); + $oP->add("

"); + $oP->add("\n"); $oP->add("
\n"); $oP->add("
".Dict::S('UI:ElementsDisplayed')."
\n"); @@ -2123,6 +2124,8 @@ EOF <<