diff --git a/css/sharebar.css b/css/sharebar.css index 03acbe2..4dd3730 100644 --- a/css/sharebar.css +++ b/css/sharebar.css @@ -1,11 +1,12 @@ -body ul#sharebar { display: none; position: absolute; width: 65px; float: left; background: #fff; padding: 0; text-align: center; border: 1px solid #ccc; list-style: none; margin: 0; z-index: 99; } +body ul#sharebar { display : none; position: absolute; width: 180px; float: left; background: #fff; padding: 15px 0 0 0; text-align: center; border: 1px solid #ccc; list-style: none; margin: 0; z-index: 99; } body ul#sharebar li { display: block; margin: 5px; padding: 0; overflow: hidden; text-align: center; } body ul#sharebarp { background: #fff; padding: 0; text-align: center; border: 1px solid #ccc; list-style: none; margin: 0; } body ul#sharebarp li { display: block; margin: 5px; padding: 0; overflow: hidden; text-align: center; } -body ul#sharebarx { display: none; list-style: none; width: 100%; float: left; margin: 0 0 10px; padding: 0; } +body ul#sharebarx { list-style: none; width: 100%; float: left; margin: 10px 0 10px; padding: 0; } body ul#sharebarx a { line-height: 14px; text-decoration: none; } -body ul#sharebarx li { float: left; margin-right: 20px; line-height: 18px; } +body ul#sharebarx li { float: left; margin: 0 20px 8px 0; line-height: 18px; border-bottom: 1px dotted #CCCCCC; text-align: left; width: 91%;} body ul#sharebarx li .st_email { margin: 0 15px !important; } +body #sharebar { position: absolute; width: 106px; float: left; background: #fff; padding-left: 10px; text-align: center; border:4px solid #DDDDDD; border-radius:10px; list-style: none; margin: 0; z-index: 99; } .sharebar-button { font-size: 11px; font-family: Verdana, Arial; padding: 2px 4px; background: #f7f7f7; color: #444; border: 1px solid #ddd; display: block;margin: 0 0 5px; } .sharebar-button:hover { border-color: #aaa; } diff --git a/sharebar.admin.inc b/sharebar.admin.inc index ac760e4..dbc26ba 100644 --- a/sharebar.admin.inc +++ b/sharebar.admin.inc @@ -1,9 +1,15 @@ '.t('Buttons').''; - $out .= '
'.l('Add New Button','admin/config/sharebar/add').'
'; + $out = '

'. t('Buttons') .'

'; + $out .= '
'. l('Add New Button', 'admin/settings/sharebar/add') .'
'; $buttons = unserialize(variable_get('sharebar_buttons', SHAREBAR_BUTTONS_DEF)); if (is_array($buttons) and count($buttons)) { usort($buttons, "sharebar_cmp_up"); @@ -14,30 +20,30 @@ function theme_sharebar_buttons_table($variables) { $row[] = array('data' => $value->big_button); $row[] = array('data' => $value->small_button); $row[] = array('data' => $value->weight); - $row[] = array('data' => l('Edit', 'admin/config/sharebar/edit/'.$value->machine_name).' | '.l('Delete', 'admin/config/sharebar/del/'.$value->machine_name)); + $row[] = array('data' => l('Edit', 'admin/settings/sharebar/edit/'. $value->machine_name) .' | '. l('Delete', 'admin/settings/sharebar/del/'. $value->machine_name)); $rows[] = $row; } } if (count($rows)) { $header = array( t('Enabled'), - t('Name'), - t('Big Button'), + t('Name'), + t('Big Button'), t('Small Button'), t('Weight'), t('Actions'), ); - $out .= theme('table', array('header' => $header, 'rows' => $rows)); - } else { - $out .= ''.t('No data').''; + $out .= theme('table', $header, $rows); + } + else { + $out .= ''. t('No data') .''; } - return $out; } -function sharebar_addbutton($form, &$form_state, $edit = array()) { +function sharebar_addbutton($edit = array()) { $mname = arg(4); $button->name = $button->machine_name = $button->big_button = $button->small_button = $button->enabled = $button->weight = ''; if ($mname) { @@ -54,16 +60,13 @@ function sharebar_addbutton($form, &$form_state, $edit = array()) { '#required' => TRUE, ); $form['machine_name'] = array( - '#type' => 'machine_name', - '#default_value' => $button->machine_name, + '#type' => 'hidden', + '#default_value' => $button->name, '#maxlength' => 21, - '#machine_name' => array( - 'exists' => 'sharebar_machine_name_load', - ), ); $form['old_machine_name'] = array( '#type' => 'value', - '#value' => $button->machine_name, + '#value' => $button->name, ); $form['big_button'] = array( '#type' => 'textarea', @@ -78,10 +81,10 @@ function sharebar_addbutton($form, &$form_state, $edit = array()) { '#required' => TRUE, ); $form['enabled'] = array( - '#type' => 'checkbox', - '#title' => t('Enabled'), - '#default_value' => $button->enabled, - ); + '#type' => 'checkbox', + '#title' => t('Enabled'), + '#default_value' => $button->enabled, + ); $form['weight'] = array( '#type' => 'weight', @@ -95,7 +98,6 @@ function sharebar_addbutton($form, &$form_state, $edit = array()) { // } $form['submit'] = array('#type' => 'submit', '#value' => t('Save')); - return $form; } @@ -107,28 +109,26 @@ function sharebar_addbutton_submit($form, &$form_state) { $form_state['confirm_delete'] = TRUE; return; } - //drupal_set_message(serialize($form_state['values'])); $buttons = unserialize(variable_get('sharebar_buttons', SHAREBAR_BUTTONS_DEF)); - - if ($form_state['values']['old_machine_name'] != '' and $form_state['values']['old_machine_name'] != $form_state['values']['machine_name']) { + + if ($form_state['values']['old_machine_name'] != '' and $form_state['values']['old_machine_name'] != $form_state['values']['name']) { unset($buttons[$form_state['values']['old_machine_name']]); //$form_state['values']['machine_name'] = $form_state['values']['old_machine_name']; } - $buttons[$form_state['values']['machine_name']]->machine_name = $form_state['values']['machine_name']; - $buttons[$form_state['values']['machine_name']]->name = $form_state['values']['name']; - $buttons[$form_state['values']['machine_name']]->big_button = $form_state['values']['big_button']; - $buttons[$form_state['values']['machine_name']]->small_button = $form_state['values']['small_button']; - $buttons[$form_state['values']['machine_name']]->enabled = $form_state['values']['enabled']; - $buttons[$form_state['values']['machine_name']]->weight = $form_state['values']['weight']; + $buttons[$form_state['values']['name']]->machine_name = $form_state['values']['name']; + $buttons[$form_state['values']['name']]->name = $form_state['values']['name']; + $buttons[$form_state['values']['name']]->big_button = $form_state['values']['big_button']; + $buttons[$form_state['values']['name']]->small_button = $form_state['values']['small_button']; + $buttons[$form_state['values']['name']]->enabled = $form_state['values']['enabled']; + $buttons[$form_state['values']['name']]->weight = $form_state['values']['weight']; variable_set('sharebar_buttons', serialize($buttons)); - - $form_state['redirect'] = 'admin/config/sharebar/settings'; + $form_state['redirect'] = 'admin/settings/sharebar/setting'; } -function sharebar_button_confirm_delete($form, &$form_state) { +function sharebar_button_confirm_delete() { $mname = arg(4); if ($mname) { $buttons = unserialize(variable_get('sharebar_buttons', SHAREBAR_BUTTONS_DEF)); @@ -148,7 +148,7 @@ function sharebar_button_confirm_delete($form, &$form_state) { return confirm_form($form, t('Are you sure you want to delete the button %title?', array('%title' => $button->name)), - 'admin/config/sharebar/settings', + 'admin/settings/sharebar/setting', t('This action cannot be undone.'), t('Delete'), t('Cancel')); @@ -160,7 +160,7 @@ function sharebar_button_confirm_delete($form, &$form_state) { * @see taxonomy_term_confirm_delete() */ function sharebar_button_confirm_delete_submit($form, &$form_state) { - taxonomy_term_delete($form_state['values']['tid']); + taxonomy_del_term($form_state['values']['tid']); taxonomy_check_vocabulary_hierarchy($form['#vocabulary'], $form_state['values']); $mname = arg(4); if ($form_state['values']['machine_name']) { @@ -174,11 +174,11 @@ function sharebar_button_confirm_delete_submit($form, &$form_state) { drupal_set_message(t('Deleted buttons %name.', array('%name' => $form_state['values']['name']))); watchdog('ShareBar', 'Deleted buttons %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE); - $form_state['redirect'] = 'admin/config/sharebar/settings'; + $form_state['redirect'] = 'admin/settings/sharebar/setting'; cache_clear_all(); return; } - +/* function sharebar_machine_name_load($name) { $buttons = unserialize(variable_get('sharebar_buttons', SHAREBAR_BUTTONS_DEF)); if (is_array($buttons) and count($buttons)) { @@ -186,7 +186,7 @@ function sharebar_machine_name_load($name) { } return reset($button); } - +*/ /** * Form builder; Configure the sharebar system. * @@ -215,156 +215,153 @@ function sharebar_settings() { ', 'inline'); - $form['buttons'] = array( + $form['sharebar']['buttons'] = array( '#theme' => 'sharebar_buttons_table', '#weight' => 0, ); - //////////////////// - // Add Sharebar - $form['addsharebar'] = array( - '#type' => 'fieldset', - '#weight' => 1, - '#title' => t('Add Sharebar'), + // Add Sharebar + $form['sharebar']['addsharebar'] = array( + '#type' => 'fieldset', + '#weight' => 1, + '#title' => t('Add Sharebar'), '#description' => t('The following settings allow you to automatically add the Sharebar to your pages.'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - - $form['addsharebar']['sharebar_bar_posts_enabled'] = array( - '#type' => 'checkbox', - '#title' => t('Automatically add Sharebar to Article nodes? (only affects article nodes)'), - '#default_value' => variable_get('sharebar_bar_posts_enabled', true), - ); - - $form['addsharebar']['sharebar_bar_pages_enabled'] = array( - '#type' => 'checkbox', - '#title' => t('Automatically add Sharebar to Basic page? (only affects basic pages)'), - '#default_value' => variable_get('sharebar_bar_pages_enabled', true), - ); - - //////////////////// - // Display Options - $form['displayoptions'] = array( - '#type' => 'fieldset', - '#weight' => 2, - '#title' => t('Display Options'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - - $form['displayoptions']['sharebar_bar_horizontal'] = array( - '#type' => 'checkbox', - '#title' => t('Display horizontal Sharebar if the page is resized to less than 1000px?'), - '#default_value' => variable_get('sharebar_bar_horizontal', TRUE), - ); - - $form['displayoptions']['sharebar_bar_oncontent'] = array( - '#type' => 'checkbox', - '#title' => t('Display Sharebar in content'), - '#default_value' => variable_get('sharebar_bar_oncontent', TRUE), - ); - - $form['displayoptions']['sharebar_bar_credit'] = array( - '#type' => 'checkbox', - '#title' => t('Display credit link back to the Sharebar plugin? If disabled, please consider donating.'), - '#default_value' => variable_get('sharebar_bar_credit', TRUE), - ); - - $form['displayoptions']['sharebar_bar_toptoffset'] = array( - '#type' => 'textfield', - '#title' => t('Top Offset'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_toptoffset', 0), - ); - - $form['displayoptions']['sharebar_bar_position'] = array( + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['sharebar']['addsharebar']['sharebar_bar_posts_enabled'] = array( + '#type' => 'checkbox', + '#title' => t('Automatically add Sharebar to Article nodes? (only affects article nodes)'), + '#default_value' => variable_get('sharebar_bar_posts_enabled', TRUE), + ); + + $form['sharebar']['addsharebar']['sharebar_bar_pages_enabled'] = array( + '#type' => 'checkbox', + '#title' => t('Automatically add Sharebar to Basic page? (only affects basic pages)'), + '#default_value' => variable_get('sharebar_bar_pages_enabled', TRUE), + ); + + // Display Options + $form['sharebar']['displayoptions'] = array( + '#type' => 'fieldset', + '#weight' => 2, + '#title' => t('Display Options'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['sharebar']['displayoptions']['sharebar_bar_horizontal'] = array( + '#type' => 'checkbox', + '#title' => t('Display horizontal Sharebar if the page is resized to less than 1000px?'), + '#default_value' => variable_get('sharebar_bar_horizontal', TRUE), + ); + + $form['sharebar']['displayoptions']['sharebar_bar_oncontent'] = array( + '#type' => 'checkbox', + '#title' => t('Display Sharebar in content'), + '#default_value' => variable_get('sharebar_bar_oncontent', TRUE), + ); + + $form['sharebar']['displayoptions']['sharebar_bar_credit'] = array( + '#type' => 'checkbox', + '#title' => t('Display credit link back to the Sharebar plugin? If disabled, please consider donating.'), + '#default_value' => variable_get('sharebar_bar_credit', TRUE), + ); + + $form['sharebar']['displayoptions']['sharebar_bar_toptoffset'] = array( + '#type' => 'textfield', + '#title' => t('Top Offset'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_toptoffset', 0), + ); + + $form['sharebar']['displayoptions']['sharebar_bar_position'] = array( '#type' => 'select', '#title' => t('Sharebar Position'), '#default_value' => variable_get('sharebar_bar_position', 'left'), '#options' => array('left' => 'Left', 'right' => 'Right'), ); - $form['displayoptions']['sharebar_bar_leftoffset'] = array( - '#type' => 'textfield', - '#title' => t('Left Offset (used when positioned to left)'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_leftoffset', 10), - ); - - $form['displayoptions']['sharebar_bar_rightoffset'] = array( - '#type' => 'textfield', - '#title' => t('Right Offset (used when positioned to right)'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_rightoffset', 10), - ); - - $form['displayoptions']['sharebar_bar_width'] = array( - '#type' => 'textfield', - '#title' => t('Minimum width in pixels required to show vertical Sharebar to the left of post (cannot be blank)'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_width', 1000), - ); - - //////////////////// - // Customize - $form['customize'] = array( - '#type' => 'fieldset', - '#weight' => 3, - '#title' => t('Customize'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - - $form['customize']['sharebar_bar_swidth'] = array( - '#type' => 'textfield', - '#title' => t('Sharebar Width'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_swidth', 75), - ); - - $form['customize']['sharebar_bar_twitter_username'] = array( - '#type' => 'textfield', - '#title' => t('Twitter Username'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_twitter_username', 'themesnap'), - ); - - $form['customize']['sharebar_bar_background'] = array( - '#type' => 'textfield', - '#title' => t('Sharebar Background Color'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_background', 'FFFFFF'), - ); - - $form['customize']['sharebar_bar_border'] = array( - '#type' => 'textfield', - '#title' => t('Sharebar Border Color'), - '#size' => 10, - '#default_value' => variable_get('sharebar_bar_border', 'CCCCCC'), - ); - - $form['#attributes'] = array('enctype' => 'multipart/form-data'); + $form['sharebar']['displayoptions']['sharebar_bar_leftoffset'] = array( + '#type' => 'textfield', + '#title' => t('Left Offset (used when positioned to left)'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_leftoffset', 10), + ); + + $form['sharebar']['displayoptions']['sharebar_bar_rightoffset'] = array( + '#type' => 'textfield', + '#title' => t('Right Offset (used when positioned to right)'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_rightoffset', 10), + ); + + $form['sharebar']['displayoptions']['sharebar_bar_width'] = array( + '#type' => 'textfield', + '#title' => t('Minimum width in pixels required to show vertical Sharebar to the left of post (cannot be blank)'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_width', 1000), + ); + // Customize + $form['sharebar']['customize'] = array( + '#type' => 'fieldset', + '#weight' => 3, + '#title' => t('Customize'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['sharebar']['customize']['sharebar_bar_swidth'] = array( + '#type' => 'textfield', + '#title' => t('Sharebar Width'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_swidth', 75), + ); + + $form['sharebar']['customize']['sharebar_bar_twitter_username'] = array( + '#type' => 'textfield', + '#title' => t('Twitter Username'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_twitter_username', 'themesnap'), + ); + + $form['sharebar']['customize']['sharebar_bar_background'] = array( + '#type' => 'textfield', + '#title' => t('Sharebar Background Color'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_background', 'FFFFFF'), + ); + + $form['sharebar']['customize']['sharebar_bar_border'] = array( + '#type' => 'textfield', + '#title' => t('Sharebar Border Color'), + '#size' => 10, + '#default_value' => variable_get('sharebar_bar_border', 'CCCCCC'), + ); + + $form['sharebar']['#attributes'] = array('enctype' => 'multipart/form-data'); return system_settings_form($form); } -function sharebar_get_setting_str($str,$tag){ - $n1 = strpos($str,$tag) + strlen($tag) + 1 ; - $n2 = strpos($str,$tag,$n1) - 2; - return substr($str, $n1, $n2 - $n1); +function sharebar_get_setting_str($str, $tag) { + $n1 = strpos($str, $tag) + drupal_strlen($tag) + 1 ; + $n2 = strpos($str, $tag, $n1) - 2; + return drupal_substr($str, $n1, $n2 - $n1); } function sharebar_admin_menu_block_page() { $item = menu_get_item(); - if ($content = system_admin_menu_block($item)) { - $output = theme('admin_block_content', array('content' => $content)); + $content = array(); + $content = system_admin_menu_block($item); + if (!empty($content)) { + $output = theme('admin_block_content', $content); } else { $output = t('You do not have any administrative items.'); } return $output; -} - +} \ No newline at end of file diff --git a/sharebar.info b/sharebar.info index 0d5e561..6c3f0e7 100644 --- a/sharebar.info +++ b/sharebar.info @@ -1,7 +1,4 @@ name = ShareBar description = Provides the ability to add social media sharing icons to pages within your website -core = 7.x - -version = "7.x-1.0" -core = "7.x" -datestamp = "1204449902" \ No newline at end of file +core = 6.x +version = 6.x-1.x-dev \ No newline at end of file diff --git a/sharebar.module b/sharebar.module index 53341b6..75f449d 100644 --- a/sharebar.module +++ b/sharebar.module @@ -1,7 +1,7 @@ (function() { var s = document.createElement(\'SCRIPT\), s1 = document.getElementsByTagName(\'SCRIPT\')[0]; s.type = \'text/javascript\'; s.async = true; s.src = \'http://widgets.digg.com/buttons.js\'; s1.parentNode.insertBefore(s, s1); })(); ";s:12:"small_button";s:318:"";s:7:"enabled";i:1;s:6:"weight";s:1:"0";}s:7:"twitter";O:8:"stdClass":6:{s:12:"machine_name";s:7:"twitter";s:4:"name";s:7:"twitter";s:10:"big_button";s:201:"Tweet";s:12:"small_button";s:203:"Tweet";s:7:"enabled";i:1;s:6:"weight";s:1:"1";}s:8:"facebook";O:8:"stdClass":6:{s:12:"machine_name";s:8:"facebook";s:4:"name";s:8:"facebook";s:10:"big_button";s:277:"";s:12:"small_button";s:280:"";s:7:"enabled";i:1;s:6:"weight";s:1:"3";}s:9:"sharethis";O:8:"stdClass":6:{s:12:"machine_name";s:9:"sharethis";s:4:"name";s:9:"sharethis";s:10:"big_button";s:251:"";s:12:"small_button";s:164:"";s:7:"enabled";i:1;s:6:"weight";s:1:"4";}s:4:"buzz";O:8:"stdClass":6:{s:12:"machine_name";s:4:"buzz";s:4:"name";s:4:"buzz";s:10:"big_button";s:221:"";s:12:"small_button";s:220:"";s:7:"enabled";i:1;s:6:"weight";s:1:"5";}s:6:"reddit";O:8:"stdClass":6:{s:12:"machine_name";s:6:"reddit";s:4:"name";s:6:"reddit";s:10:"big_button";s:89:"";s:12:"small_button";s:89:"";s:7:"enabled";i:1;s:6:"weight";s:1:"6";}s:5:"dzone";O:8:"stdClass":6:{s:12:"machine_name";s:5:"dzone";s:4:"name";s:5:"dzone";s:10:"big_button";s:94:"";s:12:"small_button";s:94:"";s:7:"enabled";i:1;s:6:"weight";s:1:"8";}s:11:"stumbleupon";O:8:"stdClass":6:{s:12:"machine_name";s:11:"stumbleupon";s:4:"name";s:11:"stumbleupon";s:10:"big_button";s:70:"";s:12:"small_button";s:70:"";s:7:"enabled";i:1;s:6:"weight";s:1:"8";}s:5:"yahoo";O:8:"stdClass":6:{s:12:"machine_name";s:5:"yahoo";s:4:"name";s:5:"yahoo";s:10:"big_button";s:101:"";s:12:"small_button";s:106:"";s:7:"enabled";i:1;s:6:"weight";s:1:"9";}s:11:"designfloat";O:8:"stdClass":6:{s:12:"machine_name";s:11:"designfloat";s:4:"name";s:11:"designfloat";s:10:"big_button";s:150:"";s:12:"small_button";s:149:"";s:7:"enabled";i:1;s:6:"weight";s:2:"10";}s:5:"email";O:8:"stdClass":6:{s:12:"machine_name";s:5:"email";s:4:"name";s:5:"email";s:10:"big_button";s:71:"Email";s:12:"small_button";s:71:"Email";s:7:"enabled";i:1;s:6:"weight";s:2:"11";}}'); -define('SHAREBAR_CREDIT_URL','http://www.socialseo.com/drupal-development/sharebar-module.html'); +define('SHAREBAR_CREDIT_URL', 'http://www.socialseo.com/drupal-development/sharebar-module.html'); /** @@ -16,7 +16,7 @@ function sharebar_perm() { */ function sharebar_menu() { // Administration pages. - $items['admin/config/sharebar'] = array( + $items['admin/settings/sharebar'] = array( 'title' => 'ShareBar', 'description' => 'Configure ShareBar', 'position' => 'left', @@ -24,9 +24,9 @@ function sharebar_menu() { 'access arguments' => array('access ShareBar administer'), 'file' => 'sharebar.admin.inc', ); - $items['admin/config/sharebar/settings'] = array( - 'title' => t('Configure ShareBar'), - 'description' => 'Configure ShareBar', + $items['admin/settings/sharebar/setting'] = array( + 'title' => 'Configure ShareBar', + 'description' => 'Configure ShareBar', 'page callback' => 'drupal_get_form', 'page arguments' => array('sharebar_settings'), 'access callback' => 'user_access', @@ -35,8 +35,8 @@ function sharebar_menu() { 'file' => 'sharebar.admin.inc', 'weight' => -10, ); - $items['admin/config/sharebar/add'] = array( - 'title' => t('Add New Button'), + $items['admin/settings/sharebar/add'] = array( + 'title' => 'Add New Button', 'page callback' => 'drupal_get_form', 'page arguments' => array('sharebar_addbutton'), 'access callback' => 'user_access', @@ -44,8 +44,8 @@ function sharebar_menu() { 'type' => MENU_CALLBACK, 'file' => 'sharebar.admin.inc', ); - $items['admin/config/sharebar/edit'] = array( - 'title' => t('Edit Button'), + $items['admin/settings/sharebar/edit'] = array( + 'title' => 'Edit Button', 'page callback' => 'drupal_get_form', 'page arguments' => array('sharebar_addbutton'), 'access callback' => 'user_access', @@ -53,8 +53,8 @@ function sharebar_menu() { 'type' => MENU_CALLBACK, 'file' => 'sharebar.admin.inc', ); - $items['admin/config/sharebar/del'] = array( - 'title' => t('Delete Button'), + $items['admin/settings/sharebar/del'] = array( + 'title' => 'Delete Button', 'page callback' => 'drupal_get_form', 'page arguments' => array('sharebar_button_confirm_delete'), 'access callback' => 'user_access', @@ -73,76 +73,107 @@ function sharebar_theme() { return array( 'sharebar_buttons_table' => array( 'file' => 'sharebar.admin.inc', - 'variables' => array('var' => ''), + 'variables' => array('var' => ''), ), ); } function sharebar_init() { - if (arg(0) != 'admin') if ((arg(0) == 'node' and is_numeric(arg(1)) and arg(2) == '' and variable_get('sharebar_bar_posts_enabled', true)) or (!(arg(0) == 'node' and is_numeric(arg(1))) and arg(1) != 'add' and arg(2) != 'edit' and arg(3) != 'edit' and variable_get('sharebar_bar_pages_enabled', true))) { - drupal_add_css(drupal_get_path('module', 'sharebar') . '/css/sharebar.css'); + if ((arg(0) != 'admin' && variable_get('sharebar_bar_posts_enabled', TRUE) && arg(1) != 'add' && arg(2) != 'edit' && arg(3) != 'edit')) { + drupal_add_css(drupal_get_path('module', 'sharebar') . '/css/sharebar.css'); if (!variable_get('sharebar_bar_oncontent', TRUE)) { - if(variable_get('sharebar_bar_horizontal', true)) $hori = 'true'; else $hori = 'false'; - $width = variable_get('sharebar_bar_width', 1000); + if (variable_get('sharebar_bar_horizontal', TRUE)) { + $hori = 'true'; + } + else { + $hori = 'false'; + } + $width = variable_get('sharebar_bar_width', 1000); $swidth = variable_get('sharebar_bar_swidth', 75); $position = variable_get('sharebar_bar_position', 'left'); $leftoffset = variable_get('sharebar_bar_leftoffset', 10); $rightoffset = variable_get('sharebar_bar_rightoffset', 10); drupal_add_js(drupal_get_path('module', 'sharebar') . '/js/sharebar.js'); - drupal_add_js('jQuery(document).ready(function($) { $(\'.sharebar\').sharebar({horizontal:\''.$hori.'\',swidth:\''.$swidth.'\',minwidth:'.$width.',position:\''.$position.'\',leftOffset:'.$leftoffset.',rightOffset:'.$rightoffset.'}); });', 'inline'); + drupal_add_js('jQuery(document).ready(function($) { $(\'.sharebar\').sharebar({horizontal:\''. $hori .'\',swidth:\''. $swidth .'\',minwidth:'. $width .',position:\''. $position .'\',leftOffset:'. $leftoffset .',rightOffset:'. $rightoffset .'}); });', 'inline'); + //print dsm(drupal_add_js('jQuery(document).ready(function($) { $(\'.sharebar\').sharebar({horizontal:\''. $hori .'\',swidth:\''. $swidth .'\',minwidth:'. $width .',position:\''. $position .'\',leftOffset:'. $leftoffset .',rightOffset:'. $rightoffset .'}); });', 'inline')); } } } -function sharebar_preprocess_region(&$variables) { - if ($variables['region'] == 'content') { - //drupal_set_message('
'. check_plain(print_r($variables['region'], 1)) .'
'); - if (arg(0) != 'admin') if ((arg(0) == 'node' and is_numeric(arg(1)) and arg(2) == '' and variable_get('sharebar_bar_posts_enabled', true)) or (!(arg(0) == 'node' and is_numeric(arg(1))) and arg(1) != 'add' and arg(2) != 'edit' and arg(3) != 'edit' and variable_get('sharebar_bar_pages_enabled', true))) { +/** + * + * Implementation of hook_block(). + * @param unknown_type $op + * @param unknown_type $delta + * @param unknown_type $edit + */ +function sharebar_block($op = 'list', $delta = 0, $edit = array()) { + switch ($op) { + case 'list': + $blocks = array(); + $blocks['sharebar_get_bar'] = array('info' => t('Display Sharebar')); + return $blocks; + + case 'view': + $block = array(); + switch ($delta) { + case 'sharebar_get_bar': + $block['subject'] = t(''); + $block['content'] = sharebar_get_bar(); + break; + } + return $block; + } +} + +function sharebar_get_bar() { + //drupal_set_message('
'. check_plain(print_r($variables['region'], 1)) .'
'); + if ((arg(0) != 'admin' && variable_get('sharebar_bar_posts_enabled', TRUE) && arg(1) != 'add' && arg(2) != 'edit' && arg(3) != 'edit')) { $strh = ''; - $sbg = variable_get('sharebar_bar_background', 'FFFFFF'); - $sborder = variable_get('sharebar_bar_border', 'CCCCCC'); + $sbg = variable_get('sharebar_bar_background', 'FFFFFF'); + $sborder = variable_get('sharebar_bar_border', 'CCCCCC'); $credit = variable_get('sharebar_bar_credit', TRUE); if (variable_get('sharebar_bar_oncontent', TRUE)) { if (variable_get('sharebar_bar_position', 'left') == 'left') { - $mar = ' margin-right:'.variable_get('sharebar_bar_rightoffset', 10).'px;'; - } else { - $mar = ' margin-left:'.variable_get('sharebar_bar_leftoffset', 10).'px;'; + $mar = ' margin-right:'. variable_get('sharebar_bar_rightoffset', 10) .'px;'; + } + else { + $mar = ' margin-left:'. variable_get('sharebar_bar_leftoffset', 10) .'px;'; } $cls = 'sharebarp'; - $sty = 'width: '.variable_get('sharebar_bar_swidth', 75).'px; float: '.variable_get('sharebar_bar_position', 'left').';'.$mar; - } else { + $sty = 'width: '. variable_get('sharebar_bar_swidth', 75) .'px; float: '. variable_get('sharebar_bar_position', 'left') .';'. $mar; + } + else { $cls = 'sharebar'; $sty = ''; } - $str = '