Changeset 8436 for extensions/FacebookPlug

Timestamp:

Jan 2, 2011, 2:24:22 AM (13 years ago)

Author:

rub

Message:

Add share icon on picture and album page

Rename footer.lang.php to common.lang.php
Remove use of target to open a new window

Location:

extensions/FacebookPlug/Plugin

Files:

• admin.config.php (modified) (6 diffs)
• icon (added)
• icon/index.php (added)
• icon/share.png (added)
• include/conf.inc.php (modified) (1 diff)
• include/footer.inc.php (modified) (1 diff)
• include/header.inc.php (modified) (4 diffs)
• include/index.inc.php (modified) (3 diffs)
• include/picture.inc.php (modified) (1 diff)
• language/en_UK/admin.config.lang.php (modified) (1 diff)
• language/en_UK/common.lang.php (moved) (moved from extensions/FacebookPlug/Plugin/language/en_UK/footer.lang.php) (1 diff)
• language/fr_FR/admin.config.lang.php (modified) (1 diff)
• language/fr_FR/common.lang.php (moved) (moved from extensions/FacebookPlug/Plugin/language/fr_FR/footer.lang.php) (1 diff)
• language/it_IT/common.lang.php (moved) (moved from extensions/FacebookPlug/Plugin/language/it_IT/footer.lang.php)
• tpl/about.tpl (modified) (1 diff)
• tpl/admin.config.tpl (modified) (1 diff)
• tpl/footer.tpl (modified) (1 diff)
• tpl/share.tpl (added)

extensions/FacebookPlug/Plugin/admin.config.php

@@ -28 +28 @@
 
 // Lingua
-load_language('footer.lang', FBP_DIR.'/');
 load_language('admin.config.lang', FBP_DIR.'/');
 
@@ -51 +50 @@
                l10n('Social plugins'),
                add_url_params($base_url, array('tab' => 'social_plugin')));
+$tabsheet->add('share',
+               l10n('Share'),
+               add_url_params($base_url, array('tab' => 'share')));
 $tabsheet->add('advanced',
                l10n('Advanced'),
@@ -120 +122 @@
     }
 
+    case 'share' :
+    {
+      $conf['fbp']['share_picture'] = ! empty($_POST['FBP_SHARE_PICTURE']);
+      $conf['fbp']['share_album'] = ! empty($_POST['FBP_SHARE_ALBUM']);
+      break;
+    }
+
     case 'advanced' :
     {
@@ -215 +224 @@
     break;
   }
+  case 'share' :
+  {
+    $template->assign(
+      $page['tab'],
+      array(
+        'FBP_SHARE_PICTURE' => fbp_checked($conf['fbp']['share_picture']),
+        'FBP_SHARE_ALBUM' => fbp_checked($conf['fbp']['share_album']),
+        ));
+    break;
+  }
   case 'advanced' :
   {
@@ -243 +262 @@
 
 // Global value
-$template->assign('FBP_PATH', FBP_PATH);
 $template->assign('FBP_ACTION', add_url_params($base_url, array('tab' => $page['tab'])));
 //~ $template->block_html_head('', '<link rel="stylesheet" type="text/css" href="'.FBP_PATH.'/css/admin.config.css">', $smarty, $repeat);
@@ -252 +270 @@
 
 //Apply tpl
-$template->set_filename('plugin_admin_content', FBP_DIR.'/tpl/admin.config.tpl');
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+$template->set_filename('fbp_plugin_admin_content', FBP_DIR.'/tpl/admin.config.tpl');
+$template->assign_var_from_handle('ADMIN_CONTENT', 'fbp_plugin_admin_content');
 
 ?>

extensions/FacebookPlug/Plugin/include/conf.inc.php

@@ -37 +37 @@
     'add_application_footer' => true,
     'picture_url_type' => 'page',
+    'share_picture' => true,
+    'share_album' => true,
     'allow_fb_access_private_page' => true,
     'social_plugin_like_button' => array(),

extensions/FacebookPlug/Plugin/include/footer.inc.php

@@ -31 +31 @@
   if ((script_basename() != 'admin') and ($conf['fbp']['add_group_footer'] or $conf['fbp']['add_application_footer']))
   {
-
-    // Lingua
-    load_language('footer.lang', FBP_DIR.'/');
-
     $template->assign('FACEBOOK_PIWIGO_GROUP_URL', FACEBOOK_PIWIGO_GROUP_URL);
     $template->assign('FACEBOOK_PIWIGO_APPLICATION_URL', FACEBOOK_PIWIGO_APPLICATION_URL);

extensions/FacebookPlug/Plugin/include/header.inc.php

@@ -74 +74 @@
   global $template, $conf, $user, $page;
 
+  // Lingua
+  load_language('common.lang', FBP_DIR.'/');
+
   // Get init facebook
   $page['fbp']['do_facebook_init'] = trigger_event('fbp_do_facebook_init', $conf['fbp']['force_facebook_init']);
@@ -82 +85 @@
     // define language
     $template->assign('FACEBOOK_LANGUAGE', fbp_get_fb_language());
+    $template->assign('FBP_PATH', FBP_PATH);
     $template->assign('fbp', $conf['fbp']);
     //~ $template->smarty->register_modifier('boolean_to_string', 'boolean_to_string');
@@ -132 +136 @@
         (script_basename() == 'picture')
         and
-        ($conf['fbp']['social_plugin_like_button']['enabled'] or $conf['fbp']['social_plugin_facepile']['enabled'] or $conf['fbp']['social_plugin_comments']['enabled'])
+        ($conf['fbp']['social_plugin_like_button']['enabled'] or $conf['fbp']['social_plugin_facepile']['enabled'] or $conf['fbp']['social_plugin_comments']['enabled'] or $conf['fbp']['share_picture'])
       )
       or
@@ -138 +142 @@
         (script_basename() == 'index')
         and
-        ($conf['fbp']['social_plugin_activity_feed']['enabled'] or $conf['fbp']['social_plugin_like_box']['enabled'])
+        ($conf['fbp']['social_plugin_activity_feed']['enabled'] or $conf['fbp']['social_plugin_like_box']['enabled'] or $conf['fbp']['share_album'])
       )
       or

extensions/FacebookPlug/Plugin/include/index.inc.php

@@ -65 +65 @@
   $page['fbp']['url'] = duplicate_index_url(array(''), array('start', 'flat', 'chronology_date', 'chronology_field', 'chronology_style', 'chronology_view'));
   unset_make_full_url();
-
-/*global $template;
-//$link_url = '<a name="fb_share" type="icon" share_url="{$fbp_page.url}"></a>
-$link_url = '<a name="fb_share" type="icon" share_url="'.$page['fbp']['url'].'" title="test"></a>
-<script src="http://static.ak.fbcdn.net/connect.php/js/FB.Share" 
-        type="text/javascript">
-</script>
-';
-$template->concat(
-        'PLUGIN_INDEX_ACTIONS',
-        '<li>'.$link_url.'</li>');*/
 }
 
@@ -129 +118 @@
 }
 
+function fbp_loc_end_index()
+{
+  global $template;
+
+  $template->assign('FBP_SHARE_LI', true);
+
+  $tpl = 'share';
+  $template->set_filename('fbp_'.$tpl, FBP_DIR.'/tpl/'.$tpl.'.tpl');
+  $template->concat(
+        'PLUGIN_INDEX_ACTIONS',
+        $template->parse('fbp_'.$tpl, true)
+        );
+}
+
 if ($conf['fbp']['social_plugin_activity_feed']['enabled'] or $conf['fbp']['social_plugin_like_box']['enabled'])
 {
@@ -139 +142 @@
 add_event_handler('loc_begin_index_thumbnails', 'fbp_loc_begin_index_thumbnails', EVENT_HANDLER_PRIORITY_NEUTRAL, 1);
 
+if ($conf['fbp']['share_album'])
+{
+  add_event_handler('loc_end_index', 'fbp_loc_end_index', EVENT_HANDLER_PRIORITY_NEUTRAL+999 /* In order to be last*/);
+}
+
 ?>

extensions/FacebookPlug/Plugin/include/picture.inc.php

@@ -72 +72 @@
     {
       // XFBML implementation
-      $template->set_filename($tpl, FBP_DIR.'/tpl/'.$tpl.'.tpl');
-      $content .= $template->parse($tpl, true);
+      $template->set_filename('fbp_'.$tpl, FBP_DIR.'/tpl/'.$tpl.'.tpl');
+      $content .= $template->parse('fbp_'.$tpl, true);
     }
   }
-
-/*global $template;
-$link_url = '<a name="fb_share" type="icon" share_url="'.$page['fbp']['url'].'"></a>
-<script src="http://static.ak.fbcdn.net/connect.php/js/FB.Share" 
-        type="text/javascript">
-</script>
-';
-$template->concat(
-        'PLUGIN_PICTURE_ACTIONS',
-        $link_url);*/
 
   return $content;
 }
 
+function fbp_loc_end_picture()
+{
+  global $template;
+
+  $template->assign('FBP_SHARE_LI', false);
+
+  $tpl = 'share';
+  $template->set_filename('fbp_'.$tpl, FBP_DIR.'/tpl/'.$tpl.'.tpl');
+  $template->concat(
+        'PLUGIN_PICTURE_ACTIONS',
+        $template->parse('fbp_'.$tpl, true)
+        );
+}
+
 add_event_handler('render_element_content', 'fbp_render_element_content', EVENT_HANDLER_PRIORITY_NEUTRAL+1 /*in order to have picture content*/, 2);
 
+if ($conf['fbp']['share_picture'])
+{
+  add_event_handler('loc_end_picture', 'fbp_loc_end_picture');//, EVENT_HANDLER_PRIORITY_NEUTRAL+999 /* In order to be last*/);
+}
+
 ?>

extensions/FacebookPlug/Plugin/language/en_UK/admin.config.lang.php

@@ -86 +86 @@
 $lang['Other options are available by programming'] = 'Other options are available by programming';
 $lang['Activity'] = 'Activity';
-//~ $lang[''] = '';
-//~ $lang[''] = '';
-//~ $lang[''] = '';
-//~ $lang[''] = '';
-//~ $lang[''] = '';
+$lang['Share'] = 'Share';
+$lang['Share picture page'] = 'Share picture page';
+$lang['Add a icon link on each picture page to share on Facebook'] = 'Add a icon link on each picture page to share on Facebook';
+$lang['Share album page'] = 'Share album page';
+$lang['Add a icon link on each album page to share on Facebook'] = 'Add a icon link on each album page to share on Facebook';
 //~ $lang[''] = '';
 //~ $lang[''] = '';

extensions/FacebookPlug/Plugin/language/en_UK/common.lang.php

@@ -27 +27 @@
 $lang['Join Facebook Piwigo group'] = 'Join Facebook Piwigo group';
 $lang['Via Facebook Piwigo application'] = 'Via Facebook Piwigo application';
+$lang['Share on Facebook'] = 'Share on Facebook';
 
 ?>

extensions/FacebookPlug/Plugin/language/fr_FR/admin.config.lang.php

@@ -86 +86 @@
 $lang['Other options are available by programming'] = 'D\'autres options sont disponibles par programmation';
 $lang['Activity'] = 'Activité';
+$lang['Share'] = 'Partager';
+$lang['Share picture page'] = 'Partager la page "image"';
+$lang['Add a icon link on each picture page to share on Facebook'] = 'Ajout d\'une icone contenant un lien afin de partager sur Facebook chaque page \'image\'';
+$lang['Share album page'] = 'Partager la page "album"';
+$lang['Add a icon link on each album page to share on Facebook'] = 'Ajout d\'une icone contenant un lien afin de partager sur Facebook chaque page \'album\'';
 
 

extensions/FacebookPlug/Plugin/language/fr_FR/common.lang.php

@@ -27 +27 @@
 $lang['Join Facebook Piwigo group'] = 'Rejoindre le groupe Piwigo sur Facebook';
 $lang['Via Facebook Piwigo application'] = 'Via l\'application Piwigo sur Facebook';
+$lang['Share on Facebook'] = 'Partager sur Facebook';
 
 ?>

extensions/FacebookPlug/Plugin/tpl/about.tpl

@@ -1 +1 @@
 <p>{'Visit Piwigo on Facebook website:'|@translate}</p>
-<p id="linkToPiwigo"><a href="{$FACEBOOK_PIWIGO_GROUP_URL}" target="_bank">{'Piwigo group'|@translate}</a>
-<p id="linkToPiwigo"><a href="{$FACEBOOK_PIWIGO_APPLICATION_URL}" target="_bank">{'Piwigo application'|@translate}</a></p>
+<p id="linkToPiwigo"><a href="{$FACEBOOK_PIWIGO_GROUP_URL}" onclick="window.open(this.href); return false;">{'Piwigo group'|@translate}</a>
+<p id="linkToPiwigo"><a href="{$FACEBOOK_PIWIGO_APPLICATION_URL}" onclick="window.open(this.href); return false;">{'Piwigo application'|@translate}</a></p>

extensions/FacebookPlug/Plugin/tpl/admin.config.tpl

@@ -223 +223 @@
 <p><i>{'Other options are available by programming'|@translate}</i></p>
 {/if}{* isset $social_plugin*}
+
+{if isset($share)}
+<fieldset>
+  <legend>{'Options'|@translate}</legend>
+  <ul>
+    <li>
+      <label>
+        <span class="property">{'Share picture page'|@translate}</span>
+        <a class="HelptipTip" href="#" title="{'Add a icon link on each picture page to share on Facebook'|@translate}"><sup>{' (?)'|@translate}</sup></a>
+        <input type="checkbox" name="FBP_SHARE_PICTURE" {$share.FBP_SHARE_PICTURE} />
+      </label>
+    </li>
+    <li>
+      <label>
+        <span class="property">{'Share album page'|@translate}</span>
+        <a class="HelptipTip" href="#" title="{'Add a icon link on each album page to share on Facebook'|@translate}"><sup>{' (?)'|@translate}</sup></a>
+        <input type="checkbox" name="FBP_SHARE_ALBUM" {$share.FBP_SHARE_ALBUM} />
+      </label>
+    </li>
+  </ul>
+</fieldset>
+{/if}{* isset $share*}
 
 {if isset($advanced)}

extensions/FacebookPlug/Plugin/tpl/footer.tpl

@@ -1 +1 @@
 {if $fbp.add_group_footer}
- - <a href="{$FACEBOOK_PIWIGO_GROUP_URL}" target="_bank" class="Piwigo">{'Join Facebook Piwigo group'|@translate}</a>
+ - <a href="{$FACEBOOK_PIWIGO_GROUP_URL}" onclick="window.open(this.href); return false;" class="Piwigo">{'Join Facebook Piwigo group'|@translate}</a>
 {/if}
 {if $fbp.add_application_footer}
- - <a href="{$FACEBOOK_PIWIGO_APPLICATION_URL}" target="_bank" {*class="Piwigo"*}>{'Via Facebook Piwigo application'|@translate}</a>
+ - <a href="{$FACEBOOK_PIWIGO_APPLICATION_URL}" onclick="window.open(this.href); return false;" {*class="Piwigo"*}>{'Via Facebook Piwigo application'|@translate}</a>
 {/if}