diff --git a/includes/theme.inc b/includes/theme.inc index fbb4634..19e5b2e 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -606,7 +606,7 @@ function list_themes($refresh = FALSE) { * implementations for named objects. * @param ... * Additional arguments to pass along to the theme function. - * + * * @return * An HTML string that generates the themed output. */ @@ -1279,7 +1279,7 @@ function theme_links($links, $attributes = array('class' => 'links')) { * @param $getsize * If set to TRUE, the image's dimension are fetched and added as width/height attributes. * Defaults to TRUE. Must be set to FALSE if $path is a full URL. - * + * * @return * A string containing the image tag. */ @@ -1870,10 +1870,10 @@ function template_preprocess_page(&$variables) { // Construct page title if (drupal_get_title()) { - $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); + $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'SuiteDesk')); } else { - $head_title = array(variable_get('site_name', 'Drupal')); + $head_title = array(variable_get('site_name', 'SuiteDesk')); if (variable_get('site_slogan', '')) { $head_title[] = variable_get('site_slogan', ''); } @@ -1894,7 +1894,7 @@ function template_preprocess_page(&$variables) { $variables['primary_links'] = theme_get_setting('toggle_primary_links') ? menu_primary_links() : array(); $variables['secondary_links'] = theme_get_setting('toggle_secondary_links') ? menu_secondary_links() : array(); $variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''); - $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : ''); + $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'SuiteDesk')) : ''); $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : ''); $variables['css'] = drupal_add_css(); $variables['styles'] = drupal_get_css(); @@ -2053,4 +2053,3 @@ function template_preprocess_block(&$variables) { $variables['template_files'][] = 'block-'. $variables['block']->module; $variables['template_files'][] = 'block-'. $variables['block']->module .'-'. $variables['block']->delta; } - diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index cf3fb4c..10b3c1a 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -233,10 +233,10 @@ function template_preprocess_maintenance_page(&$variables) { // Construct page title if (drupal_get_title()) { - $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); + $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'SuiteDesk')); } else { - $head_title = array(variable_get('site_name', 'Drupal')); + $head_title = array(variable_get('site_name', 'SuiteDesk')); if (variable_get('site_slogan', '')) { $head_title[] = variable_get('site_slogan', ''); } @@ -256,7 +256,7 @@ function template_preprocess_maintenance_page(&$variables) { $variables['primary_links'] = array(); $variables['secondary_links'] = array(); $variables['search_box'] = ''; - $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); + $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'SuiteDesk') : ''); $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); $variables['css'] = drupal_add_css(); $variables['styles'] = drupal_get_css(); diff --git a/themes/zuitedesk/screenshot.png b/themes/zuitedesk/screenshot.png index f6f3e70..4c03b6c 100644 Binary files a/themes/zuitedesk/screenshot.png and b/themes/zuitedesk/screenshot.png differ diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php index 3a68e00..8aaf1d1 100644 --- a/themes/zuitedesk/template.php +++ b/themes/zuitedesk/template.php @@ -136,6 +136,14 @@ function zuitedesk_preprocess_page(&$vars, $hook) { // Remove pre-navigation links in header. $vars['head'] = preg_replace('/]*>\n/', '', $vars['head']); + // Refine title; suffix for public (U+00B0), authorised (U+207B) and private (U+00AA) nodes: + if ($vars['head_title'] == 'SuiteDesk | SuiteDesk') { + $vars['head_title'] = 'SuiteDesk'; + } + else { + $vars['head_title'] = str_replace(array('°', 'ª', '⁻'), '', $vars['head_title']); + } + // We need to re-do the $layout and body classes because // template_preprocess_page() assumes sidebars are named 'left' and 'right'. if (!empty($vars['sidebar_main'])) { @@ -151,7 +159,7 @@ function zuitedesk_preprocess_page(&$vars, $hook) { $pl = ''; if ($vars['logged_in'] && !empty($deskmenu)) { // Home option: - $pl .= _zuitedesk_option(TRUE, "$lang/", t('Desktop'), NULL, t('Workspace')); + $pl .= _zuitedesk_option(TRUE, "$lang/", t('Home'), NULL, t('Workspace')); // Mission submenu: $submenu = ''; $submenu .= _zuitedesk_option(!empty($_SESSION['SuiteCRM_Session_ID']), "$lang/suitecrm", 'SuiteCRM', 'crm', t('Core sales, customer service and marketing processes with SuiteCRM')); diff --git a/themes/zuitedesk/templates/page-front.tpl.php b/themes/zuitedesk/templates/page-front.tpl.php index 31ed2d5..6f32e3c 100644 --- a/themes/zuitedesk/templates/page-front.tpl.php +++ b/themes/zuitedesk/templates/page-front.tpl.php @@ -3,7 +3,7 @@ -manuel.cillero.es | SuiteDesk +<?php print $head_title ?> - language" : $base_url; ?>" title="" class="logo">'; ?> + language" : $base_url; ?>" title=" $site_name)); ?>" class="logo">'; ?>