New global copyright notice in footer and refine pages title

This commit is contained in:
Manuel Cillero 2017-08-07 09:35:47 +02:00
parent e95c8d8233
commit 77cacdc7c7
7 changed files with 24 additions and 19 deletions

View file

@ -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;
}

View file

@ -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();

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

View file

@ -136,6 +136,14 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
// Remove pre-navigation links in header.
$vars['head'] = preg_replace('/<link rel=\"(prev|up|next)\"[^>]*>\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'));

View file

@ -3,7 +3,7 @@
<head>
<?php print $head; ?>
<title>manuel.cillero.es | SuiteDesk</title>
<title><?php print $head_title ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<?php
@ -77,7 +77,7 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="<?php print $language->language != 'es' ? "$base_url/$language->language" : $base_url; ?>" title="<?php print t('SuiteDesk homepage'); ?>" class="logo"><?php print '<img src="'. check_url($logo) .'" alt="'. $site_title .'" id="logo" />'; ?></a>
<a href="<?php print $language->language != 'es' ? "$base_url/$language->language" : $base_url; ?>" title="<?php print t('@site_name homepage', array('@site_name' => $site_name)); ?>" class="logo"><?php print '<img src="'. check_url($logo) .'" alt="'. $site_name .'" id="logo" />'; ?></a>
</div>
<div id="navbar-main" class="collapse navbar-collapse">
<?php print $primary_links; ?>
@ -429,7 +429,7 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
<a href="#" id="scroll-top-link" class="icon-up-open"></a>
<footer id="socket"><div class="section">
<span class='copyright'>2009-<?php print date('Y'); ?> &copy; manuel.cillero.es</span>
<span class='copyright'><?php print date('Y') . ' &copy; ' . ($site_name ? check_plain($site_name) : 'SuiteDesk'); ?></span>
<ul class="social-menu">
<li class="social-link-rss"><a href="http://manuel.cillero.es/feed" title="Rss" class="icon-rss"><span class="element-invisible">RSS</span></a></li>
<li class="social-link-twitter"><a href="http://twitter.com/manuelcillero" title="Twitter" target="_blank" class="icon-twitter"><span class="element-invisible">Twitter</span></a></li>

View file

@ -104,9 +104,7 @@
<head>
<?php print $head; ?>
<title><?php
// Suffix for public (U+00B0), authorised (U+207B) and private (U+00AA) nodes:
print str_replace(array('°', 'ª', '⁻'), '', $head_title); ?></title>
<title><?php print $head_title ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<?php
@ -173,7 +171,7 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a href="<?php print $language->language != 'es' ? "$base_url/$language->language" : $base_url; ?>" title="<?php print t('SuiteDesk homepage'); ?>" class="logo"><?php print '<img src="'. check_url($logo) .'" alt="'. $site_title .'" id="logo" />'; ?></a>
<a href="<?php print $language->language != 'es' ? "$base_url/$language->language" : $base_url; ?>" title="<?php print t('@site_name homepage', array('@site_name' => $site_name)); ?>" class="logo"><?php print '<img src="'. check_url($logo) .'" alt="'. $site_name .'" id="logo" />'; ?></a>
</div>
<div id="navbar-main" class="collapse navbar-collapse">
<?php print $primary_links; ?>
@ -260,7 +258,7 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
<a href="#" id="scroll-top-link" class="icon-up-open"></a>
<footer id="socket"><div class="section">
<span class='copyright'>2009-<?php print date('Y'); ?> &copy; manuel.cillero.es</span>
<span class='copyright'><?php print date('Y') . ' &copy; ' . ($site_name ? check_plain($site_name) : 'SuiteDesk'); ?></span>
<ul class="social-menu">
<li class="social-link-rss"><a href="http://manuel.cillero.es/feed" title="Rss" class="icon-rss"><span class="element-invisible">RSS</span></a></li>
<li class="social-link-twitter"><a href="http://twitter.com/manuelcillero" title="Twitter" target="_blank" class="icon-twitter"><span class="element-invisible">Twitter</span></a></li>

View file

@ -1,6 +1,6 @@
name = SuiteDesk Theme
description = SuiteDesk Theme Zen.
version = 0.2.21
version = 0.2.23
screenshot = screenshot.png