diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index b47cb8586d..3c41d3abac 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -212,6 +212,7 @@ echo "
\n"; echo "
".$text['title-default_settings']." (".number_format($num_rows).")
\n"; echo "
\n"; + echo button::create(['type'=>'button','label'=>$text['label-domain'],'icon'=>$_SESSION['theme']['button_icon_all'],'style'=>'','link'=>PROJECT_PATH.'/core/domain_settings/domain_settings.php?id='.$domain_uuid]); echo button::create(['label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'button_reload','link'=>'default_settings_reload.php'.($search != '' ? '?search='.urlencode($search) : null),'style'=>'margin-right: 15px;']); if (permission_exists('default_setting_add')) { echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'default_setting_edit.php']); diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php index abd72c85c4..669af0762a 100644 --- a/core/domain_settings/app_languages.php +++ b/core/domain_settings/app_languages.php @@ -664,6 +664,27 @@ $text['label-multiple']['pt-br'] = "Multiple"; $text['label-multiple']['pt-pt'] = "Multiple"; $text['label-multiple']['ro-ro'] = "Multiple"; +$text['select-global']['en-us'] = "Global"; +$text['select-global']['en-gb'] = "Global"; +$text['select-global']['ar-eg'] = ""; +$text['select-global']['de-at'] = "Global"; //copied from de-de +$text['select-global']['de-ch'] = "Global"; //copied from de-de +$text['select-global']['de-de'] = "Global"; +$text['select-global']['es-cl'] = "Global"; +$text['select-global']['es-mx'] = "Global"; //copied from es-cl +$text['select-global']['fr-ca'] = "Global"; //copied from fr-fr +$text['select-global']['fr-fr'] = "Global"; +$text['select-global']['he-il'] = "כללי"; +$text['select-global']['it-it'] = "Globale"; +$text['select-global']['nl-nl'] = "Globaal"; +$text['select-global']['pl-pl'] = "Globalny"; +$text['select-global']['pt-br'] = "Global"; //copied from pt-pt +$text['select-global']['pt-pt'] = "Global"; +$text['select-global']['ro-ro'] = "Global"; +$text['select-global']['ru-ru'] = "Глобальный"; +$text['select-global']['sv-se'] = "Global"; +$text['select-global']['uk-ua'] = "Global"; + $text['header-settings']['en-us'] = "Settings"; $text['header-settings']['en-gb'] = "Settings"; $text['header-settings']['ar-eg'] = ""; diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index ed4d245101..b7689f35da 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -164,6 +164,7 @@ echo "
\n"; echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'action_bar_sub_button_back','style'=>'','link'=>PROJECT_PATH.'/core/domains/domains.php']); if (permission_exists('default_setting_view') && $num_rows) { + echo button::create(['type'=>'button','label'=>$text['select-global'],'icon'=>$_SESSION['theme']['button_icon_all'],'style'=>'','link'=>PROJECT_PATH.'/core/default_settings/default_settings.php']); echo button::create(['type'=>'button','label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'style'=>'margin-right: 15px;','link'=>PROJECT_PATH.'/core/default_settings/default_settings_reload.php?id='.$domain_uuid]); } if (permission_exists('domain_setting_add')) {