diff --git a/pages/preferences.php b/pages/preferences.php index 870c3a2b9..28a7078ba 100644 --- a/pages/preferences.php +++ b/pages/preferences.php @@ -62,20 +62,24 @@ function DisplayPreferences($oP) $oMiscSettingsBlock = new Panel(Dict::S('UI:FavoriteOtherSettings'), array(), 'grey', 'ibo-misc-settings'); $oMiscSettingsStartForm = new Html('
'); - + $iDefaultPageSize = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit()); - $sMiscSettingsHtml = ''; - $sMiscSettingsHtml .= '

'.Dict::Format('UI:Favorites:Default_X_ItemsPerPage', '').'

'; $bShow = utils::IsArchiveMode() || appUserPreferences::GetPref('show_obsolete_data', MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data')); - $sSelected = $bShow ? ' checked="checked"' : ''; - $sDisabled = utils::IsArchiveMode() ? 'disabled="disabled"' : ''; - $sMiscSettingsHtml .= - '

' - .'' - .'' - .'

'; + $sObsoleteSelected = $bShow ? ' checked="checked"' : ''; + $sObsoleteDisabled = utils::IsArchiveMode() ? 'disabled="disabled"' : ''; + + + $sMiscSettingsHtml = ''; + $sMiscSettingsHtml .= '

'.Dict::Format('UI:Favorites:Default_X_ItemsPerPage', + '').'

'; + $sObsoleteLabel = Dict::S('UI:Favorites:ShowObsoleteData'); + $sObsoleteLabelPlus = Dict::S('UI:Favorites:ShowObsoleteData+'); + $sMiscSettingsHtml .= << 

+HTML; $sMiscSettingsHtml .= $oAppContext->GetForForm(); $oMiscSettingsHtml = new Html($sMiscSettingsHtml); @@ -96,7 +100,7 @@ function DisplayPreferences($oP) $oContentLayout->AddMainBlock($oMiscSettingsBlock); $oP->add_script( - <<add_ready_script( - <<AddSubBlock($oShortcutsToolBar); // - Rename button - $oShortcutsRenameButton = ButtonFactory::MakeForSecondaryAction(Dict::S('UI:Button:Rename'), null, null, false, "shortcut_btn_rename"); + $oShortcutsRenameButton = ButtonFactory::MakeForSecondaryAction(Dict::S('UI:Button:Rename'), null, null, false, + "shortcut_btn_rename"); $oShortcutsToolBar->AddSubBlock($oShortcutsRenameButton); // - Delete button - $oShortcutsDeleteButton = ButtonFactory::MakeForSecondaryAction(Dict::S('UI:Button:Delete'), null, null, false, "shortcut_btn_delete"); + $oShortcutsDeleteButton = ButtonFactory::MakeForSecondaryAction(Dict::S('UI:Button:Delete'), null, null, false, + "shortcut_btn_delete"); $oShortcutsToolBar->AddSubBlock($oShortcutsDeleteButton); - - - } // if count > 0 + } $oContentLayout->AddMainBlock($oShortcutsBlock); ////////////////////////////////////////////////////////////////////////// @@ -211,7 +215,6 @@ EOF // Newsroom // ////////////////////////////////////////////////////////////////////////// - $iCountProviders = 0; $oUser = UserRights::GetUserObject(); $aProviders = MetaModel::EnumPlugins('iNewsroomProvider'); @@ -241,8 +244,6 @@ EOF /** * @var iNewsroomProvider[] $aProviders */ - $aProviderParams = array(); - $iCountProviders = 0; $sAppRootUrl = utils::GetAbsoluteUrlAppRoot(); foreach($aProviders as $oProvider) { @@ -434,36 +435,28 @@ $iStep = utils::ReadParam('step', 1); $oPage = new iTopWebPage(Dict::S('UI:Preferences')); $oPage->DisableBreadCrumb(); -$sOperation = utils::ReadParam('operation', ''); - -try -{ - /** @var iPreferencesExtension $oLoginExtensionInstance */ +$sOperation = utils::ReadParam('operation', ''); + +try { $bOperationUsed = false; - foreach(MetaModel::EnumPlugins('iPreferencesExtension') as $oPreferencesExtensionInstance) - { - if ($oPreferencesExtensionInstance->ApplyPreferences($oPage, $sOperation)) - { + /** @var iPreferencesExtension $oLoginExtensionInstance */ + foreach (MetaModel::EnumPlugins('iPreferencesExtension') as $oPreferencesExtensionInstance) { + if ($oPreferencesExtensionInstance->ApplyPreferences($oPage, $sOperation)) { $bOperationUsed = true; break; } } - if (!$bOperationUsed) - { - switch ($sOperation) - { + if (!$bOperationUsed) { + switch ($sOperation) { case 'apply': $oFilter = DBObjectSearch::FromOQL('SELECT Organization'); $sSelectionMode = utils::ReadParam('selectionMode', ''); $aExceptions = utils::ReadParam('storedSelection', array()); - if (($sSelectionMode == 'negative') && (count($aExceptions) == 0)) - { + if (($sSelectionMode == 'negative') && (count($aExceptions) == 0)) { // All Orgs selected appUserPreferences::SetPref('favorite_orgs', null); - } - else - { + } else { // Some organizations selected... store them $aSelectOrgs = utils::ReadMultipleSelection($oFilter); appUserPreferences::SetPref('favorite_orgs', $aSelectOrgs);