diff --git a/config/default/default.settings.php b/config/default/default.settings.php
index 3aa140f..1fa42b1 100644
--- a/config/default/default.settings.php
+++ b/config/default/default.settings.php
@@ -51,14 +51,14 @@ ini_set('url_rewriter.tags', '');
$conf = array(
// Site main values:
'site_name' => 'My SuiteDesk site',
-# 'anonymous' => 'Visitor',
// Social links:
-# 'site_twitter' => 'http://twitter.com/username',
-# 'site_facebook' => 'http://facebook.com/userpage',
-# 'site_linkedin' => 'http://linkedin.com/in/username',
-# 'site_contact' => 'https://www.example.com/contact',
-# 'site_rss' => 'https://www.example.com/feed',
+# 'social_website' => 'http://www.example.com',
+# 'social_rss' => 'http://www.example.com/feed',
+# 'social_twitter' => 'http://twitter.com/username',
+# 'social_facebook' => 'http://facebook.com/userpage',
+# 'social_linkedin' => 'http://linkedin.com/in/username',
+# 'social_contact' => 'http://www.example.com/contact',
// Reverse proxy:
# 'reverse_proxy' => TRUE,
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 0a1fde9..4ab16b5 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1178,36 +1178,44 @@ 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(
+
+ $form['social_website'] = array(
'#type' => 'textfield',
- '#title' => t('Twitter URL'),
- '#default_value' => variable_get('site_twitter', ''),
- '#description' => t('URL address of your Twitter account.')
+ '#title' => t('Website URL'),
+ '#default_value' => variable_get('social_website', ''),
+ '#description' => t('Your main website.')
);
- $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(
+ $form['social_rss'] = array(
'#type' => 'textfield',
'#title' => t('Feed URL'),
- '#default_value' => variable_get('site_rss', ''),
+ '#default_value' => variable_get('social_rss', ''),
'#description' => t('Source feed of your main website.')
);
+ $form['social_twitter'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Twitter URL'),
+ '#default_value' => variable_get('social_twitter', ''),
+ '#description' => t('URL address of your Twitter account.')
+ );
+ $form['social_facebook'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Facebook URL'),
+ '#default_value' => variable_get('social_facebook', ''),
+ '#description' => t('URL address of your Facebook page.')
+ );
+ $form['social_linkedin'] = array(
+ '#type' => 'textfield',
+ '#title' => t('LinkedIn URL'),
+ '#default_value' => variable_get('social_linkedin', ''),
+ '#description' => t('URL address of your LinkedIn account.')
+ );
+ $form['social_contact'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Web contact URL'),
+ '#default_value' => variable_get('social_contact', ''),
+ '#description' => t('URL address of your contact page.')
+ );
+
$form['site_footer'] = array(
'#type' => 'textarea',
'#title' => t('Footer message'),
@@ -1245,11 +1253,11 @@ function system_site_information_settings_validate($form, &$form_state) {
}
// 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');
+ _system_site_information_validate_url($form_state, 'social_twitter');
+ _system_site_information_validate_url($form_state, 'social_facebook');
+ _system_site_information_validate_url($form_state, 'social_linkedin');
+ _system_site_information_validate_url($form_state, 'social_contact');
+ _system_site_information_validate_url($form_state, 'social_rss');
// Validate front page path.
$item = array('link_path' => $form_state['values']['site_frontpage']);
$normal_path = drupal_get_normal_path($item['link_path']);
diff --git a/themes/zuitedesk/css/fonticons.css b/themes/zuitedesk/css/fonticons.css
index 869cc9f..5e24e34 100755
--- a/themes/zuitedesk/css/fonticons.css
+++ b/themes/zuitedesk/css/fonticons.css
@@ -1,11 +1,11 @@
@font-face {
font-family: 'fonticons';
- src: url('../font/fonticons.eot?27716456');
- src: url('../font/fonticons.eot?27716456#iefix') format('embedded-opentype'),
- url('../font/fonticons.woff2?27716456') format('woff2'),
- url('../font/fonticons.woff?27716456') format('woff'),
- url('../font/fonticons.ttf?27716456') format('truetype'),
- url('../font/fonticons.svg?27716456#fonticons') format('svg');
+ src: url('../font/fonticons.eot?63556011');
+ src: url('../font/fonticons.eot?63556011#iefix') format('embedded-opentype'),
+ url('../font/fonticons.woff2?63556011') format('woff2'),
+ url('../font/fonticons.woff?63556011') format('woff'),
+ url('../font/fonticons.ttf?63556011') format('truetype'),
+ url('../font/fonticons.svg?63556011#fonticons') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -15,7 +15,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fonticons';
- src: url('../font/fonticons.svg?27716456#fonticons') format('svg');
+ src: url('../font/fonticons.svg?63556011#fonticons') format('svg');
}
}
*/
@@ -102,6 +102,7 @@
.icon-reply:before { content: '\e82c'; } /* '' */
.icon-help:before { content: '\e82d'; } /* '' */
.icon-pdf:before { content: '\e82e'; } /* '' */
+.icon-www:before { content: '\e82f'; } /* '' */
.icon-ticket:before { content: '\e830'; } /* '' */
.icon-print:before { content: '\e831'; } /* '' */
.icon-project:before { content: '\e832'; } /* '' */
diff --git a/themes/zuitedesk/font/fonticons.eot b/themes/zuitedesk/font/fonticons.eot
index a34b524..e55bf6d 100755
Binary files a/themes/zuitedesk/font/fonticons.eot and b/themes/zuitedesk/font/fonticons.eot differ
diff --git a/themes/zuitedesk/font/fonticons.svg b/themes/zuitedesk/font/fonticons.svg
index f79a5ec..22e4f05 100755
--- a/themes/zuitedesk/font/fonticons.svg
+++ b/themes/zuitedesk/font/fonticons.svg
@@ -100,6 +100,8 @@
+
+
diff --git a/themes/zuitedesk/font/fonticons.ttf b/themes/zuitedesk/font/fonticons.ttf
index b4b26b3..deac888 100755
Binary files a/themes/zuitedesk/font/fonticons.ttf and b/themes/zuitedesk/font/fonticons.ttf differ
diff --git a/themes/zuitedesk/font/fonticons.woff b/themes/zuitedesk/font/fonticons.woff
index 2222222..86ac76b 100755
Binary files a/themes/zuitedesk/font/fonticons.woff and b/themes/zuitedesk/font/fonticons.woff differ
diff --git a/themes/zuitedesk/font/fonticons.woff2 b/themes/zuitedesk/font/fonticons.woff2
index ed0cd14..40c0d48 100755
Binary files a/themes/zuitedesk/font/fonticons.woff2 and b/themes/zuitedesk/font/fonticons.woff2 differ
diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php
index 93d9196..97ce56f 100644
--- a/themes/zuitedesk/template.php
+++ b/themes/zuitedesk/template.php
@@ -227,13 +227,14 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
$vars['primary_links'] .= '';
// Social menu: secondary links.
- if (empty($_SESSION['socialmenu'])) {
+ if (user_is_anonymous() || 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');
+ $sl .= _zuitedesk_social_link('social_website', t('Website'), 'www');
+ $sl .= _zuitedesk_social_link('social_rss', 'Rss', 'rss');
+ $sl .= _zuitedesk_social_link('social_twitter', 'Twitter', 'twitter');
+ $sl .= _zuitedesk_social_link('social_facebook', 'Facebook', 'facebook');
+ $sl .= _zuitedesk_social_link('social_linkedin', 'Linkedin', 'linkedin');
+ $sl .= _zuitedesk_social_link('social_contact', 'Mail', 'mail');
$_SESSION['socialmenu'] = $sl;
}
$vars['secondary_links'] = $_SESSION['socialmenu'];
@@ -294,12 +295,14 @@ function _zuitedesk_submenu(&$submenu, $text) {
return !empty($submenu) ? '' . $text . ' ' : '';
}
-function _zuitedesk_social_link($site_field, $title, $class) {
+function _zuitedesk_social_link($social_field, $title, $class) {
+ global $conf;
+
$link = '';
- $site_link = variable_get($site_field, '');
- if (!empty($site_link)) {
+ $social_link = variable_get($social_field, $conf[$social_field]);
+ if (!empty($social_link)) {
$link .= '';
- $link .= '';
+ $link .= '';
$link .= '' . $title . '';
$link .= '';
}
diff --git a/themes/zuitedesk/zuitedesk.info b/themes/zuitedesk/zuitedesk.info
index a30576b..3f263d9 100644
--- a/themes/zuitedesk/zuitedesk.info
+++ b/themes/zuitedesk/zuitedesk.info
@@ -1,6 +1,6 @@
name = SuiteDesk Theme
description = SuiteDesk Theme Zen.
-version = 0.2.38
+version = 0.2.39
screenshot = screenshot.png