From 04131886b42766ec1f3dda2427000f2e97da3877 Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Fri, 2 Jun 2017 12:27:05 -0500 Subject: [PATCH 1/3] INTERIM-65 Change wordmark link default --- theme-settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme-settings.php b/theme-settings.php index 632db09..dc985a1 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -80,8 +80,8 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) $form['suitcase_interim_config']['suitcase_interim_config_logo']['suitcase_interim_config_level_1_url'] = array( '#type' => 'textfield', '#title' => t('Wordmark URL'), - '#description' => t('Full URL the Iowa State University wordmark should link to. Defaults to \'http://www.iastate.edu/\''), - '#default_value' => variable_get('suitcase_interim_config_level_1_url', 'http://www.iastate.edu/'), + '#description' => t('Full URL the Iowa State University wordmark should link to. Defaults to site\'s homepage.'), + '#default_value' => variable_get('suitcase_interim_config_level_1_url', NULL), '#weight' => 2, ); From 0c6ce177e9fe1cda117311ceb93505ee7baea053 Mon Sep 17 00:00:00 2001 From: Nick Booher Date: Mon, 5 Jun 2017 06:53:04 -0500 Subject: [PATCH 2/3] INTERIM-65 Remove fallback wordmark URL --- templates/region--branding.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php index ad22363..d3be6a0 100644 --- a/templates/region--branding.tpl.php +++ b/templates/region--branding.tpl.php @@ -4,9 +4,9 @@ - Iowa State University + Iowa State University - Iowa State University - <?php print $site_name; ?> + Iowa State University - <?php print $site_name; ?> From 2f03876ab6fc6f637f990fca3a06f1920ae6318a Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Mon, 5 Jun 2017 09:50:55 -0500 Subject: [PATCH 3/3] INTERIM-65 Changed default wordmark URL to not be empty --- theme-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme-settings.php b/theme-settings.php index dc985a1..39cac14 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -81,7 +81,7 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) '#type' => 'textfield', '#title' => t('Wordmark URL'), '#description' => t('Full URL the Iowa State University wordmark should link to. Defaults to site\'s homepage.'), - '#default_value' => variable_get('suitcase_interim_config_level_1_url', NULL), + '#default_value' => variable_get('suitcase_interim_config_level_1_url', $GLOBALS['base_url']), '#weight' => 2, );