');
+ $sTitleHtml = '
'.Dict::S('UI:Preferences:Title').'
';
+ $sTitleHtmlBlock = new Html($sTitleHtml);
+ $oContentLayout->AddMainBlock($sTitleHtmlBlock);
//////////////////////////////////////////////////////////////////////////
//
// User Language selection
//
//////////////////////////////////////////////////////////////////////////
-
- $oP->add('
');
+ $sUserLanguageBlockSelect .= '';
+ $sUserLanguageBlockSelect .= '
';
+ $sUserLanguageBlockSelect .= $oAppContext->GetForForm();
+
+ //$oUserLanguageCancelButton = new Button('ibo-user-language-cancel', Dict::S('UI:Button:Cancel'), '', Dict::S('UI:Button:Cancel'), )
+ $oUserLanguageBlockSelect = new Html($sUserLanguageBlockSelect);
+ $oUserLanguageCancelButton = new Button('ibo-user-language-cancel', Dict::S('UI:Button:Cancel'), '', Dict::S('UI:Button:Cancel'), '', '', '', 'regular', 'secondary', 'window.location.href='.$sURL);
+ $oUserLanguageSubmitButton = new Button('ibo-user-language-submit', Dict::S('UI:Button:Apply'), '', Dict::S('UI:Button:Apply'), 'submit', '', '', 'regular', 'green');
+ $oUserLanguageEndForm = new Html('');
+
+ $oUserLanguageBlock->AddSubBlock($oUserLanguageStartForm);
+ $oUserLanguageBlock->AddSubBlock($oUserLanguageBlockSelect);
+ $oUserLanguageBlock->AddSubBlock($oUserLanguageCancelButton);
+ $oUserLanguageBlock->AddSubBlock($oUserLanguageSubmitButton);
+ $oUserLanguageBlock->AddSubBlock($oUserLanguageEndForm);
+
+ $oContentLayout->AddMainBlock($oUserLanguageBlock);
+
//////////////////////////////////////////////////////////////////////////
//
// Other (miscellaneous) settings
//
//////////////////////////////////////////////////////////////////////////
-
- $oP->add('
');
+ $sMiscSettingsHtml .= '
';
+ $sMiscSettingsHtml .= $oAppContext->GetForForm();
+ $oMiscSettingsCancelButton = new Button('ibo-misc-settings-cancel', Dict::S('UI:Button:Cancel'), '', Dict::S('UI:Button:Cancel'), '', '', '', 'regular', 'secondary', 'window.location.href='.$sURL);
+ $oMiscSettingsSubmitButton = new Button('ibo-misc-settings-submit', Dict::S('UI:Button:Apply'), '', Dict::S('UI:Button:Apply'), 'submit', '', '', 'regular', 'green');
+
+
+ $oMiscSettingsHtml = new Html($sMiscSettingsHtml);
+
+ $sMiscSettingsEndHtml = '';
+ $oMiscSettingsEndHtmlBlock = new Html($sMiscSettingsEndHtml);
+
+ $oMiscSettingsBlock->AddSubBlock($oMiscSettingsStartForm);
+ $oMiscSettingsBlock->AddSubBlock($oMiscSettingsHtml);
+ $oMiscSettingsBlock->AddSubBlock($oMiscSettingsCancelButton);
+ $oMiscSettingsBlock->AddSubBlock($oMiscSettingsSubmitButton);
+ $oMiscSettingsBlock->AddSubBlock($oMiscSettingsEndHtmlBlock);
+
+ $oContentLayout->AddMainBlock($oMiscSettingsBlock);
$oP->add_script(
-<<
0))
{
$('#v_default_page_size').html('');
- $('#other_submit').prop('disabled', false);
+ $('#ibo-misc-settings-submit').prop('disabled', false);
return true;
}
else
{
$('#v_default_page_size').html('
');
- $('#other_submit').prop('disabled', true);
+ $('#ibo-misc-settings-submit').prop('disabled', true);
return false;
}
}
EOF
);
-
//////////////////////////////////////////////////////////////////////////
//
// Favorite Organizations
//
//////////////////////////////////////////////////////////////////////////
- $oP->add('');
+ $sFavoriteOrganizationsHtml .= $oBlock->GetDisplay($oP, 1, array('menu' => false, 'selection_mode' => true, 'selection_type' => 'multiple', 'cssCount'=> '.selectedCount', 'table_id' => 'user_prefs'));
+ $sFavoriteOrganizationsHtml .= $oAppContext->GetForForm();
+ $sFavoriteOrganizationsHtml .= '';
+ $oFavoriteOrganizationsCancelButton = new Button('ibo-favorite-organizations-cancel', Dict::S('UI:Button:Cancel'), '', Dict::S('UI:Button:Cancel'), '', '', '', 'regular', 'secondary', 'window.location.href='.$sURL);
+ $oFavoriteOrganizationsSubmitButton = new Button('ibo-favorite-organizations-submit', Dict::S('UI:Button:Apply'), '', Dict::S('UI:Button:Apply'), 'submit', '', '', 'regular', 'green');
+
+ $sFavoriteOrganizationsEndHtml = '';
+ $oFavoriteOrganizationsEndHtmlBlock = new Html($sFavoriteOrganizationsEndHtml) ;
+
$aFavoriteOrgs = appUserPreferences::GetPref('favorite_orgs', null);
if ($aFavoriteOrgs == null)
{
@@ -202,6 +231,14 @@ EOF
EOF
);
}
+
+ $oFavoriteOrganizationsHtmlBlock = new Html($sFavoriteOrganizationsHtml);
+ $oFavoriteOrganizationsBlock->AddSubBlock($oFavoriteOrganizationsHtmlBlock);
+ $oFavoriteOrganizationsBlock->AddSubBlock($oFavoriteOrganizationsCancelButton);
+ $oFavoriteOrganizationsBlock->AddSubBlock($oFavoriteOrganizationsSubmitButton);
+ $oFavoriteOrganizationsBlock->AddSubBlock($oFavoriteOrganizationsEndHtmlBlock);
+
+ $oContentLayout->AddMainBlock($oFavoriteOrganizationsBlock);
//////////////////////////////////////////////////////////////////////////
//
@@ -209,30 +246,25 @@ EOF
//
//////////////////////////////////////////////////////////////////////////
- $oP->add('');
-
+ $sShortcutsHtml .= '';
$sConfirmDelete = addslashes(Dict::S('UI:ShortcutDelete:Confirm'));
$oP->add_ready_script(
@@ -293,8 +325,9 @@ OnSelectionCountChange();
EOF
);
} // if count > 0
-
- $oP->add('');
+ $oShortcutsHtmlBlock = new Html($sShortcutsHtml);
+ $oShortcutsBlock->AddSubBlock($oShortcutsHtmlBlock);
+ $oContentLayout->AddMainBlock($oShortcutsBlock);
//////////////////////////////////////////////////////////////////////////
//
@@ -316,16 +349,17 @@ EOF
$bNewsroomEnabled = (MetaModel::GetConfig()->Get('newsroom_enabled') !== false);
if ($bNewsroomEnabled && ($iCountProviders > 0))
{
- $oP->add('');
- }
+ $oNewsroomResetCacheButton = new Button('ibo-newsroom-reset-cache', Dict::S('UI:Newsroom:ResetCache'), '', Dict::S('UI:Newsroom:ResetCache'), '', '', '', 'regular', 'red', "$('#ibo-navigation-menu--notifications-menu').newsroom_menu('clearCache')");
+ $oNewsroomCancelButton = new Button('ibo-newsroom-cancel', Dict::S('UI:Button:Cancel'), '', Dict::S('UI:Button:Cancel'), '', '', '', 'regular', 'secondary', 'window.location.href='.$sURL);
+ $oNewsroomSubmitButton = new Button('ibo-newsroom-submit', Dict::S('UI:Button:Apply'), '', Dict::S('UI:Button:Apply'), 'submit', '', '', 'regular', 'green');
- //Todo: factorize as UiBlock
- if (true)
- {
- $sUserPicturesFolder = '../images/user-pictures/';
- $sUserDefaultPicture = appUserPreferences::GetPref('user_picture_placeholder', 'default-placeholder.png');
+
+ $sNewsroomEndHtml = '';
+ $oNewsroomEndHtmlBlock = new Html($sNewsroomEndHtml);
- $oP->add(
- <<
-UI:Preferences:ChooseAPlaceholder+
-
-HTML
- );
- foreach (scandir($sUserPicturesFolder) as $sUserPicture)
+ $oNewsroomHtmlBlock = new Html($sNewsroomHtml);
+ $oNewsroomBlock->AddSubBlock($oNewsroomHtmlBlock);
+ $oNewsroomBlock->AddSubBlock($oNewsroomResetCacheButton);
+ $oNewsroomBlock->AddSubBlock($oNewsroomCancelButton);
+ $oNewsroomBlock->AddSubBlock($oNewsroomSubmitButton);
+ $oNewsroomBlock->AddSubBlock($oNewsroomEndHtmlBlock);
+ $oContentLayout->AddMainBlock($oNewsroomBlock);
+ }
+
+ //////////////////////////////////////////////////////////////////////////
+ //
+ // User picture placeholder
+ //
+ //////////////////////////////////////////////////////////////////////////
+
+ $oUserPicturePlaceHolderBlock = new Panel('ibo-user-picture-placeholder', Dict::S('UI:Preferences:ChooseAPlaceholder'), array(), 'grey');
+
+ $sUserPicturesFolder = '../images/user-pictures/';
+ $sUserDefaultPicture = appUserPreferences::GetPref('user_picture_placeholder', 'default-placeholder.png');
+ $sUserPicturePlaceHolderHtml = '';
+ $sUserPicturePlaceHolderHtml .= '
'.Dict::S('UI:Preferences:ChooseAPlaceholder+').'
';
+ foreach (scandir($sUserPicturesFolder) as $sUserPicture)
+ {
+ if ($sUserPicture === '.' || $sUserPicture === '..')
{
- if ($sUserPicture === '.' || $sUserPicture === '..')
- {
- continue;
- }
- $sAdditionalClass = '';
- if ($sUserDefaultPicture === $sUserPicture)
- {
- $sAdditionalClass = ' ibo-is-active';
- }
- $oP->add('
');
+ continue;
}
- $oP->add_ready_script(
- <<
';
+ }
+ $oP->add_ready_script(
+ <<add(
- <<
-
HTML
- );
- }
-
+ ;
+ $oUserPicturePlaceHolderHtmlBlock = new Html($sUserPicturePlaceHolderHtml);
+ $oUserPicturePlaceHolderBlock->AddSubBlock($oUserPicturePlaceHolderHtmlBlock);
+ $oContentLayout->AddMainBlock($oUserPicturePlaceHolderBlock);
+
/** @var iPreferencesExtension $oLoginExtensionInstance */
foreach (MetaModel::EnumPlugins('iPreferencesExtension') as $oPreferencesExtensionInstance)
{
@@ -421,8 +464,8 @@ HTML
//
// Footer
//
- $oP->add('');
$oP->add_ready_script("$('#fav_page_length').bind('keyup change', function(){ ValidateOtherSettings(); })");
+ $oP->SetContentLayout($oContentLayout);
}
/////////////////////////////////////////////////////////////////////////////
'.Dict::S('UI:Preferences')."