1
0

Removed error with test.com, added pinterest support and the support for only module and block page display.

This commit is contained in:
Jason Hardin 2012-09-01 19:18:56 -07:00
parent 6b4f1856a5
commit 1cd9f66665
7 changed files with 127 additions and 77 deletions

View File

@ -42,6 +42,8 @@ class Admin_Social_Share_Controller extends Admin_Controller {
module::set_var("social_share", "google_enabled", $form->google_settings->google_enabled->value); module::set_var("social_share", "google_enabled", $form->google_settings->google_enabled->value);
module::set_var("social_share", "google_size", $form->google_settings->google_size->value); module::set_var("social_share", "google_size", $form->google_settings->google_size->value);
module::set_var("social_share", "google_annotation", $form->google_settings->google_annotation->value); module::set_var("social_share", "google_annotation", $form->google_settings->google_annotation->value);
module::set_var("social_share", "pinterest_enabled", $form->pinterest_settings->pinterest_enabled->value);
module::set_var("social_share", "pinterest_count_location", $form->pinterest_settings->pinterest_count_location->value);
module::set_var("social_share", "twitter_enabled", $form->twitter_settings->twitter_enabled->value); module::set_var("social_share", "twitter_enabled", $form->twitter_settings->twitter_enabled->value);
module::set_var("social_share", "twitter_count_location", $form->twitter_settings->twitter_count_location->value); module::set_var("social_share", "twitter_count_location", $form->twitter_settings->twitter_count_location->value);
module::set_var("social_share", "twitter_size", $form->twitter_settings->twitter_size->value); module::set_var("social_share", "twitter_size", $form->twitter_settings->twitter_size->value);
@ -62,6 +64,12 @@ class Admin_Social_Share_Controller extends Admin_Controller {
private function _get_form() { private function _get_form() {
$form = new Forge("admin/social_share/handler", "", "post", array("id" => "g-admin-form")); $form = new Forge("admin/social_share/handler", "", "post", array("id" => "g-admin-form"));
/// General Settings
$group_general = $form->group("general_settings")->label(t("General Settings"));
$group_general->checkbox("general_impage_only")->label(t("Display the enabled buttons on image and movie pages only"))
->checked(module::get_var("social_share", "general_impage_only", true) == 1);
/// Facebook settings
$group_facebook_share = $form->group("facebook_share_settings")->label(t("Facebook Share Button Settings")); $group_facebook_share = $form->group("facebook_share_settings")->label(t("Facebook Share Button Settings"));
$group_facebook_share->checkbox("facebook_share_enabled")->label(t("Display the button")) $group_facebook_share->checkbox("facebook_share_enabled")->label(t("Display the button"))
->checked(module::get_var("social_share", "facebook_share_enabled", false) == 1); ->checked(module::get_var("social_share", "facebook_share_enabled", false) == 1);
@ -108,6 +116,7 @@ class Admin_Social_Share_Controller extends Admin_Controller {
"box_count" => t("Box count"))) "box_count" => t("Box count")))
->selected(module::get_var("social_share", "facebook_like_layout")); ->selected(module::get_var("social_share", "facebook_like_layout"));
/// Google settings
$group_google = $form->group("google_settings")->label(t("Google+ +1 Button Settings")); $group_google = $form->group("google_settings")->label(t("Google+ +1 Button Settings"));
$group_google->checkbox("google_enabled")->label(t("Display the button")) $group_google->checkbox("google_enabled")->label(t("Display the button"))
->checked(module::get_var("social_share", "google_enabled", false) == 1); ->checked(module::get_var("social_share", "google_enabled", false) == 1);
@ -125,6 +134,18 @@ class Admin_Social_Share_Controller extends Admin_Controller {
"none" => t("None"))) "none" => t("None")))
->selected(module::get_var("social_share", "google_annotation")); ->selected(module::get_var("social_share", "google_annotation"));
/// Pinterest settings
$group_pinterest = $form->group("pinterest_settings")->label(t("Pinterest Pinit Settings"));
$group_pinterest->checkbox("pinterest_enabled")->label(t("Display the button"))
->checked(module::get_var("social_share", "pinterest_enabled", false) == 1);
$group_pinterest->dropdown("pinterest_count_location")
->label(t("Tweet count location"))
->options(array("horizontal" => t("Horizontal"),
"vertical" => t("Vertical"),
"none" => t("None")))
->selected(module::get_var("social_share", "pinterest_count_location"));
/// Twitter settings
$group_twitter = $form->group("twitter_settings")->label(t("Twitter Tweet Settings")); $group_twitter = $form->group("twitter_settings")->label(t("Twitter Tweet Settings"));
$group_twitter->checkbox("twitter_enabled")->label(t("Display the button")) $group_twitter->checkbox("twitter_enabled")->label(t("Display the button"))
->checked(module::get_var("social_share", "twitter_enabled", false) == 1); ->checked(module::get_var("social_share", "twitter_enabled", false) == 1);

View File

@ -19,12 +19,15 @@
*/ */
class social_share_block_Core { class social_share_block_Core {
static function get_site_list() { static function get_site_list() {
return array( return array("social_share" => t("Social Share"));
"social_share" => t("Social Share"));
} }
static function get($block_id, $theme) { static function get($block_id, $theme) {
/// Check if the user wants to show the block on all pages or just the image and movie page types.
$impageonly = module::get_var("social_share", "general_impage_only");
$showblock = !$impageonly || ($impageonly && ($theme->page_subtype == "photo") || ($theme->page_subtype == "movie"));
if ($showblock){
$block = new Block(); $block = new Block();
$block->css_id = "g-social-share"; $block->css_id = "g-social-share";
$block->title = 'Share With Friends'; $block->title = 'Share With Friends';
@ -38,10 +41,14 @@ class social_share_block_Core {
if(module::get_var("social_share", "google_enabled")){ if(module::get_var("social_share", "google_enabled")){
$block->content .= new View("google.html"); $block->content .= new View("google.html");
} }
if(module::get_var("social_share", "pinterest_enabled")){
$block->content .= new View("pinterest.html");
}
if(module::get_var("social_share", "twitter_enabled")){ if(module::get_var("social_share", "twitter_enabled")){
$block->content .= new View("twitter.html"); $block->content .= new View("twitter.html");
} }
return $block; return $block;
} }
}
} }

View File

@ -19,6 +19,7 @@
*/ */
class social_share_installer { class social_share_installer {
static function deactivate() { static function deactivate() {
module::clear_var("social_share", "general_impage_only");
module::clear_var("social_share", "facebook_share_enabled"); module::clear_var("social_share", "facebook_share_enabled");
module::clear_var("social_share", "facebook_share_layout"); module::clear_var("social_share", "facebook_share_layout");
module::clear_var("social_share", "facebook_share_link_text"); module::clear_var("social_share", "facebook_share_link_text");
@ -34,6 +35,8 @@ class social_share_installer {
module::clear_var("social_share", "google_enabled"); module::clear_var("social_share", "google_enabled");
module::clear_var("social_share", "google_size"); module::clear_var("social_share", "google_size");
module::clear_var("social_share", "google_annotation"); module::clear_var("social_share", "google_annotation");
module::clear_var("social_share", "pinterest_enabled");
module::clear_var("social_share", "pinterest_count_location");
module::clear_var("social_share", "twitter_enabled"); module::clear_var("social_share", "twitter_enabled");
module::clear_var("social_share", "twitter_count_location"); module::clear_var("social_share", "twitter_count_location");
module::clear_var("social_share", "twitter_size"); module::clear_var("social_share", "twitter_size");
@ -52,5 +55,9 @@ class social_share_installer {
module::clear_var("social_share", "twitter"); module::clear_var("social_share", "twitter");
module::set_version("social_share", $version = 2); module::set_version("social_share", $version = 2);
} }
if ($version < 3) {
module::set_version("social_share", $version = 3);
}
} }
} }

View File

@ -19,7 +19,10 @@
*/ */
class social_share_theme_Core { class social_share_theme_Core {
static function head($theme) { static function head($theme) {
if ($theme->item()) { $impageonly = module::get_var("social_share", "general_impage_only");
$showblock = !$impageonly || ($impageonly && ($theme->page_subtype == "photo") || ($theme->page_subtype == "movie"));
if ($showblock && $theme->item()) {
$item = $theme->item(); $item = $theme->item();
$url = $item->thumb_url(true); $url = $item->thumb_url(true);
$appId = module::get_var("social_share", "facebook_like_appId"); $appId = module::get_var("social_share", "facebook_like_appId");

View File

@ -1,6 +1,6 @@
name = "Social Share" name = "Social Share"
description = "Adds links to share the page to social media sites in the sidebar." description = "Adds links to share the page to social media sites in the sidebar."
version = 2 version = 3
author_name = "jasonhardin" author_name = "jasonhardin"
author_url = "http://codex.gallery2.org/User:psychoph" author_url = "http://codex.gallery2.org/User:psychoph"
info_url = "http://codex.gallery2.org/Gallery3:Modules:social_share" info_url = "http://codex.gallery2.org/Gallery3:Modules:social_share"

View File

@ -46,7 +46,6 @@ if (module::get_var("social_share", "facebook_like_send")) {
<?php if($codeType == 'xfbml'){?> <?php if($codeType == 'xfbml'){?>
<fb:like href="<?= $selfURL; ?>" send="<?= $send ?>" width="180" show_faces="<?= $show_faces ?>" layout="<?= $layout?>" action="<?= $layout ?>"></fb:like> <fb:like href="<?= $selfURL; ?>" send="<?= $send ?>" width="180" show_faces="<?= $show_faces ?>" layout="<?= $layout?>" action="<?= $layout ?>"></fb:like>
<fb:like href="http://test.com" send="true" width="180" show_faces="false"></fb:like>
<?php } else { ?> <?php } else { ?>

View File

@ -0,0 +1,13 @@
<?php defined("SYSPATH") or die("No direct script access.");
$url = url::abs_current(true);
$description="need to find out how to get this";
if ($theme->item()) {
$item = $theme->item();
$media = $item->thumb_url(true);
?>
<script type="text/javascript" src="//assets.pinterest.com/js/pinit.js"></script>
<a href="http://pinterest.com/pin/create/button/?url=<?= $url; ?>&media=<?= $media; ?>&description=<?= $description; ?>" class="pin-it-button" count-layout="<?= module::get_var("social_share", "pinterest_count_location") ?>">
<img border="0" src="//assets.pinterest.com/images/PinExt.png" title="Pin It" />
</a>
<?php } ?>