manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Social links and icons are now editables

Browse source
This commit is contained in:
Manuel Cillero 2017-08-07 23:17:27 +02:00
parent ab55a69459
commit 7baa51d5a8
8 changed files with 89 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
includes/theme.inc
View file

@ -1878,7 +1878,7 @@ function template_preprocess_page(&$variables) {
$head_title[] = variable_get('site_slogan', '');
}
}
$variables['head_title'] = implode(' | ', $head_title);
$variables['head_title'] = implode(' - ', $head_title);
$variables['base_path'] = base_path();
$variables['front_page'] = url();
$variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb());

2
includes/theme.maintenance.inc
View file

@ -241,7 +241,7 @@ function template_preprocess_maintenance_page(&$variables) {
$head_title[] = variable_get('site_slogan', '');
}
}
$variables['head_title'] = implode(' | ', $head_title);
$variables['head_title'] = implode(' - ', $head_title);
$variables['base_path'] = base_path();
$variables['breadcrumb'] = '';
$variables['feed_icons'] = '';

45
modules/system/system.admin.inc
View file

@ -1155,7 +1155,7 @@ function system_site_information_settings() {
$form['site_name'] = array(
'#type' => 'textfield',
'#title' => t('Name'),
'#default_value' => variable_get('site_name', 'Drupal'),
'#default_value' => variable_get('site_name', 'SuiteDesk'),
'#description' => t('The name of this website.'),
'#required' => TRUE
);
@ -1178,6 +1178,36 @@ function system_site_information_settings() {
'#default_value' => variable_get('site_mission', ''),
'#description' => t("Your site's mission or focus statement (often prominently displayed on the front page).")
);
$form['site_twitter'] = array(
'#type' => 'textfield',
'#title' => t('Twitter URL'),
'#default_value' => variable_get('site_twitter', ''),
'#description' => t('URL address of your Twitter account.')
);
$form['site_facebook'] = array(
'#type' => 'textfield',
'#title' => t('Facebook URL'),
'#default_value' => variable_get('site_facebook', ''),
'#description' => t('URL address of your Facebook page.')
);
$form['site_linkedin'] = array(
'#type' => 'textfield',
'#title' => t('LinkedIn URL'),
'#default_value' => variable_get('site_linkedin', ''),
'#description' => t('URL address of your LinkedIn account.')
);
$form['site_contact'] = array(
'#type' => 'textfield',
'#title' => t('Web contact URL'),
'#default_value' => variable_get('site_contact', ''),
'#description' => t('URL address of your contact page.')
);
$form['site_rss'] = array(
'#type' => 'textfield',
'#title' => t('Feed URL'),
'#default_value' => variable_get('site_rss', ''),
'#description' => t('Source feed of your main website.')
);
$form['site_footer'] = array(
'#type' => 'textarea',
'#title' => t('Footer message'),
@ -1213,6 +1243,13 @@ function system_site_information_settings_validate($form, &$form_state) {
if ($error = user_validate_mail($form_state['values']['site_mail'])) {
form_set_error('site_mail', $error);
}
// Validate social links.
unset($_SESSION['socialmenu']);
_system_site_information_validate_url($form_state, 'site_twitter');
_system_site_information_validate_url($form_state, 'site_facebook');
_system_site_information_validate_url($form_state, 'site_linkedin');
_system_site_information_validate_url($form_state, 'site_contact');
_system_site_information_validate_url($form_state, 'site_rss');
// Validate front page path.
$item = array('link_path' => $form_state['values']['site_frontpage']);
$normal_path = drupal_get_normal_path($item['link_path']);
@ -1225,6 +1262,12 @@ function system_site_information_settings_validate($form, &$form_state) {
}
}
function _system_site_information_validate_url(&$form_state, $site_field) {
if (!empty($form_state['values'][$site_field]) && !valid_url($form_state['values'][$site_field], TRUE)) {
form_set_error($site_field, t("The path '@path' is not valid.", array('@path' => $form_state['values'][$site_field])));
}
}
/**
* Form builder; Configure error reporting settings.
*

4
modules/user/user.module
View file

@ -1317,7 +1317,7 @@ function user_login(&$form_state) {
'#required' => TRUE,
);
$form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'Drupal')));
$form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'SuiteDesk')));
$form['pass'] = array('#type' => 'password',
'#title' => t('Password'),
'#description' => t('Enter the password that accompanies your username.'),
@ -2184,7 +2184,7 @@ function user_mail_tokens($account, $language) {
global $base_url;
$tokens = array(
'!username' => $account->name,
'!site' => variable_get('site_name', 'Drupal'),
'!site' => variable_get('site_name', 'SuiteDesk'),
'!login_url' => user_pass_reset_url($account),
'!uri' => $base_url,
'!uri_brief' => preg_replace('!^https?://!', '', $base_url),

26
themes/zuitedesk/template.php
View file

@ -140,7 +140,7 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
if (!$vars['logged_in']) {
$vars['head_title'] = t('Welcome to @site_name', array('@site_name' => $vars['site_name'] ? $vars['site_name'] : 'SuiteDesk'));
}
elseif ($vars['head_title'] == 'SuiteDesk | SuiteDesk') {
elseif ($vars['head_title'] == 'SuiteDesk - SuiteDesk') {
$vars['head_title'] = 'SuiteDesk';
}
else {
@ -221,6 +221,18 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
$vars['primary_links'] = '<h2 class="element-invisible">' . t('Main menu') . '</h2>';
$vars['primary_links'] .= '<ul id="main-menu" class="nav navbar-nav navbar-right clearfix">' . $pl . '</ul>';
// Social menu: secondary links.
if (empty($_SESSION['socialmenu'])) {
$sl = '';
$sl .= _zuitedesk_social_link('site_rss', 'Rss', 'rss');
$sl .= _zuitedesk_social_link('site_twitter', 'Twitter', 'twitter');
$sl .= _zuitedesk_social_link('site_facebook', 'Facebook', 'facebook');
$sl .= _zuitedesk_social_link('site_linkedin', 'Linkedin', 'linkedin');
$sl .= _zuitedesk_social_link('site_contact', 'Mail', 'mail');
$_SESSION['socialmenu'] = $sl;
}
$vars['secondary_links'] = $_SESSION['socialmenu'];
// Special class and bootstrap tour for SuiteDesk pages:
$vars['classes_array'][] = 'suitedesk';
@ -277,6 +289,18 @@ function _zuitedesk_submenu(&$submenu, $text) {
return !empty($submenu) ? '<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">' . $text . ' <span class="caret"></span></a><ul class="dropdown-menu">' . $submenu . '</ul></li>' : '';
}
function _zuitedesk_social_link($site_field, $title, $class) {
$link = '';
$site_link = variable_get($site_field, '');
if (!empty($site_link)) {
$link .= '<li class="social-link-' . $class . '">';
$link .= '<a href="' . $site_link . '" title="' . $title . '" class="icon-' . $class . '">';
$link .= '<span class="element-invisible">' . $title . '</span></a>';
$link .= '</li>';
}
return $link;
}
/**
* Override or insert variables into the node templates.
*

14
themes/zuitedesk/templates/page-front.tpl.php
View file

@ -59,11 +59,7 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
print '<li class="lang-item">' . $ESlink . '</li>';
print '<li class="lang-item">' . $ENlink . '</li>';
?>
<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>
<li class="social-link-facebook"><a href="http://facebook.com/manuelcillero" title="Facebook" target="_blank" class="icon-facebook"><span class="element-invisible">Facebook</span></a></li>
<li class="social-link-linkedin"><a href="http://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span class="element-invisible">LinkedIn</span></a></li>
<li class="social-link-mail"><a href="http://manuel.cillero.es/contact" title="Mail" target="_blank" class="icon-mail"><span class="element-invisible">Mail</span></a></li>
<?php print $secondary_links; ?>
</ul>
</div></div><!-- /.section, /#navigation-top -->
@ -430,13 +426,11 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
<footer id="socket"><div class="section">
<span class='copyright'><?php print date('Y') . ' &copy; ' . ($site_name ? check_plain($site_name) : 'SuiteDesk'); ?></span>
<?php if ($secondary_links): ?>
<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>
<li class="social-link-facebook"><a href="http://facebook.com/manuelcillero" title="Facebook" target="_blank" class="icon-facebook"><span class="element-invisible">Facebook</span></a></li>
<li class="social-link-linkedin"><a href="http://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span class="element-invisible">LinkedIn</span></a></li>
<li class="social-link-mail"><a href="http://manuel.cillero.es/contact" title="Mail" target="_blank" class="icon-mail"><span class="element-invisible">Mail</span></a></li>
<?php print $secondary_links; ?>
</ul>
<?php endif; ?>
</div></footer><!-- /.section, /#socket -->
<?php if (user_is_anonymous()): ?>

14
themes/zuitedesk/templates/page.tpl.php
View file

@ -153,11 +153,7 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
print '<li class="lang-item">' . $ESlink . '</li>';
print '<li class="lang-item">' . $ENlink . '</li>';
?>
<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>
<li class="social-link-facebook"><a href="http://facebook.com/manuelcillero" title="Facebook" target="_blank" class="icon-facebook"><span class="element-invisible">Facebook</span></a></li>
<li class="social-link-linkedin"><a href="http://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span class="element-invisible">LinkedIn</span></a></li>
<li class="social-link-mail"><a href="http://manuel.cillero.es/contact" title="Mail" target="_blank" class="icon-mail"><span class="element-invisible">Mail</span></a></li>
<?php print $secondary_links; ?>
</ul>
</div></div><!-- /.section, /#navigation-top -->
@ -259,13 +255,11 @@ if ($site_name) print '<meta property="og:site_name" content="'. $site_name ."\"
<footer id="socket"><div class="section">
<span class='copyright'><?php print date('Y') . ' &copy; ' . ($site_name ? check_plain($site_name) : 'SuiteDesk'); ?></span>
<?php if ($secondary_links): ?>
<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>
<li class="social-link-facebook"><a href="http://facebook.com/manuelcillero" title="Facebook" target="_blank" class="icon-facebook"><span class="element-invisible">Facebook</span></a></li>
<li class="social-link-linkedin"><a href="http://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span class="element-invisible">LinkedIn</span></a></li>
<li class="social-link-mail"><a href="http://manuel.cillero.es/contact" title="Mail" target="_blank" class="icon-mail"><span class="element-invisible">Mail</span></a></li>
<?php print $secondary_links; ?>
</ul>
<?php endif; ?>
</div></footer><!-- /.section, /#socket -->
</div><!-- /#page-wrapper -->

15
themes/zuitedesk/zuitedesk.info
View file

@ -1,6 +1,6 @@
name = SuiteDesk Theme
description = SuiteDesk Theme Zen.
version = 0.2.23
version = 0.2.24
screenshot = screenshot.png
@ -101,15 +101,16 @@ regions[page_closure] = Page closure
; http://drupal.org/node/171205#features
features[] = logo
features[] = favicon
; features[] = name
; features[] = slogan
; features[] = mission
features[] = node_user_picture
features[] = comment_user_picture
features[] = search
features[] = favicon
features[] = primary_links
features[] = secondary_links
; features[] = node_user_picture
; features[] = comment_user_picture
; features[] = search
; features[] = primary_links
; features[] = secondary_links