From df22a29ed4bb006c6eb441906fdbe9bdbd031404 Mon Sep 17 00:00:00 2001 From: reliberate Date: Thu, 5 May 2016 12:57:08 -0600 Subject: [PATCH] Theme: Integrate ability to use Google Fonts. --- core/default_settings/app_languages.php | 39 ++++++ .../default_settings/default_setting_edit.php | 30 ++++ core/domain_settings/app_languages.php | 39 ++++++ core/domain_settings/domain_setting_edit.php | 30 ++++ core/users/app_languages.php | 39 ++++++ core/users/user_setting_edit.php | 30 ++++ resources/fonts/root.php | 90 ++++++++++++ resources/fonts/web_font_loader.php | 106 ++++++++++++++ resources/functions.php | 132 ++++++++++++++++++ themes/default/app_defaults.php | 39 +++++- themes/default/css.php | 26 ++++ themes/default/template.php | 10 ++ 12 files changed, 605 insertions(+), 5 deletions(-) create mode 100644 resources/fonts/root.php create mode 100644 resources/fonts/web_font_loader.php diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php index 432ac90a4a..d33f37fa79 100644 --- a/core/default_settings/app_languages.php +++ b/core/default_settings/app_languages.php @@ -113,6 +113,20 @@ $text['message-copy_failed']['sv-se'] = "Ingen inställning markerad eller ogilt $text['message-copy_failed']['uk'] = ""; $text['message-copy_failed']['de-at'] = "Keine Einstellungen ausgewählt oder ungültige Domain"; +$text['label-web_fonts']['en-us'] = "Web Fonts"; +$text['label-web_fonts']['es-cl'] = "Fuentes web"; +$text['label-web_fonts']['pt-pt'] = "Fontes da web"; +$text['label-web_fonts']['fr-fr'] = "Polices Web"; +$text['label-web_fonts']['pt-br'] = "Polices Web"; +$text['label-web_fonts']['pl'] = "Czcionki sieci"; +$text['label-web_fonts']['he'] = "גופני אינטרנט"; +$text['label-web_fonts']['uk'] = "веб-шрифти"; +$text['label-web_fonts']['sv-se'] = "web teckensnitt"; +$text['label-web_fonts']['de-at'] = "Web Fonts"; +$text['label-web_fonts']['ro'] = "Fonturi web"; +$text['label-web_fonts']['fa'] = ""; +$text['label-web_fonts']['ar-eg'] = "الخطوط على شبكة الإنترنت"; + $text['label-top']['en-us'] = "Top"; $text['label-top']['es-cl'] = "encima"; $text['label-top']['pt-pt'] = "Topo"; @@ -166,6 +180,20 @@ $text['label-static']['ro'] = "Static"; $text['label-static']['fa'] = ""; $text['label-static']['ar-eg'] = "ساكن"; +$text['label-reference']['en-us'] = "See"; +$text['label-reference']['es-cl'] = "Referencia"; +$text['label-reference']['pt-pt'] = "Referência"; +$text['label-reference']['fr-fr'] = "Référence"; +$text['label-reference']['pt-br'] = "Referência"; +$text['label-reference']['pl'] = "Odniesienie"; +$text['label-reference']['he'] = "התייחסות"; +$text['label-reference']['uk'] = "посилання"; +$text['label-reference']['sv-se'] = "Referens"; +$text['label-reference']['de-at'] = "Referenz"; +$text['label-reference']['ro'] = "Referinţă"; +$text['label-reference']['fa'] = ""; +$text['label-reference']['ar-eg'] = "مرجع"; + $text['label-right']['en-us'] = "Right"; $text['label-right']['es-cl'] = "Derecha"; $text['label-right']['pt-pt'] = "Certo"; @@ -180,6 +208,17 @@ $text['label-right']['ro'] = "Dreapta"; $text['label-right']['fa'] = ""; $text['label-right']['ar-eg'] = "حق"; +$text['label-other']['en-us'] = "Other"; +$text['label-other']['es-cl'] = "Otro"; +$text['label-other']['pt-pt'] = "Outro"; +$text['label-other']['fr-fr'] = "Autre"; +$text['label-other']['pt-br'] = "Outro"; +$text['label-other']['pl'] = "Inne"; +$text['label-other']['uk'] = ""; +$text['label-other']['sv-se'] = "Annat"; +$text['label-other']['de-at'] = "Andere"; +$text['label-other']['he'] = "אחר"; + $text['label-normal']['en-us'] = "Normal"; $text['label-normal']['es-cl'] = "Normal"; $text['label-normal']['pt-pt'] = "Normal"; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 15f7b9f68a..f167dfbfb4 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -448,6 +448,33 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) { echo " \n"; } + elseif ($category == "theme" && substr_count($subcategory, "_font") > 0 && $name == "text") { + $default_setting_value = str_replace('"', "'", $default_setting_value); + if ($fonts = get_available_fonts('alpha')) { + echo " "; + echo " \n"; + } + else { + echo " \n"; + } + } elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) { echo " \n"; } + elseif ($category == "theme" && substr_count($subcategory, "_font") > 0 && $name == "text") { + $row['domain_setting_value'] = str_replace('"', "'", $row['domain_setting_value']); + if ($fonts = get_available_fonts('alpha')) { + echo " "; + echo " \n"; + } + else { + echo " \n"; + } + } elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) { echo " \n"; } + elseif ($category == "theme" && substr_count($subcategory, "_font") > 0 && $name == "text") { + $row['user_setting_value'] = str_replace('"', "'", $row['user_setting_value']); + if ($fonts = get_available_fonts('alpha')) { + echo " "; + echo " \n"; + } + else { + echo " \n"; + } + } elseif ($category == "fax" && $subcategory == "page_size" && $name == "text" ) { echo "