diff --git a/3.0/modules/author/helpers/author_block.php b/3.0/modules/author/helpers/author_block.php index 71f479e1..bae1139a 100644 --- a/3.0/modules/author/helpers/author_block.php +++ b/3.0/modules/author/helpers/author_block.php @@ -23,26 +23,35 @@ class author_block_Core { } static function get($block_id, $theme) { + $block = ""; + $item = $theme->item; - if ($block_id != 'author' || $item->is_album() ) { - return ''; + + if ((!isset($theme->item)) || ($item->is_album())) { + return; } - $record = db::build() - ->select("author") - ->from("author_records") - ->where("item_id", "=", $item->id) - ->execute() - ->current(); + + switch ($block_id) { + case "author": + $record = ORM::factory("author_record")->where("item_id", "=", $item->id)->find(); + + $byline = ""; + if ($record->loaded()) { + $byline = $record->author; + } + + if ($byline == '') { + $byline = author::fix($item); + } - $byline = $record->author; - if ($byline == '') { - $byline = author::fix($item); + $block = new Block(); + $block->css_id = "g-author"; + $block->content = new View("author_block.html"); + $block->content->author = $byline; + + break; } - - $block = new Block(); - $block->content = new View("author_block.html"); - $block->content->author = $byline; - return $block; + } } diff --git a/3.0/modules/carousel/controllers/admin_carousel.php b/3.0/modules/carousel/controllers/admin_carousel.php index 0852ec3f..7740f691 100644 --- a/3.0/modules/carousel/controllers/admin_carousel.php +++ b/3.0/modules/carousel/controllers/admin_carousel.php @@ -100,14 +100,14 @@ class Admin_Carousel_Controller extends Admin_Controller { $shortrange["$key"] = sprintf("%.1f", (float)$i / 2); } if (module::get_var("carousel", "autoscroll") == true) { - $disableme == "false"; + $disableme = "false"; } else { - $disableme == "true"; + $disableme = "true"; } $form = new Forge("admin/carousel/handler", "", "post", array("id" => "g-admin-form")); $group = $form->group("carousel")->label(t("General carousel settings")); - $group->checkbox("circular")->label(t('Enable the carousel to be circular so it starts over again from the beggining.')) + $group->checkbox("circular")->label(t('Enable the carousel to be circular so it starts over again from the beginning.')) ->checked(module::get_var("carousel", "circular", "0")); $group->checkbox("autoscroll")->label(t('Carousel should auto scroll. Toggle value to change settings below.')) ->onClick("toggle()") @@ -135,7 +135,7 @@ class Admin_Carousel_Controller extends Admin_Controller { $group->dropdown("visible2")->label(t('Enter number of thumbs to show. (height of carousel)')) ->options($shortrange) ->selected(module::get_var("carousel", "visible2", "1")); - $group->dropdown("quantity2")->label(t("Choose the toal quantity of thumbs in recent carousel.")) + $group->dropdown("quantity2")->label(t("Choose the total quantity of thumbs in recent carousel.")) ->options($range) ->selected(module::get_var("carousel", "quantity2", "25")); $group->checkbox("onalbum2")->label(t("Show on album & collection pages")) @@ -152,7 +152,7 @@ class Admin_Carousel_Controller extends Admin_Controller { $group->dropdown("visible3")->label(t('Enter number of thumbs to show. (height of carousel)')) ->options($shortrange) ->selected(module::get_var("carousel", "visible3", "1")); - $group->dropdown("quantity3")->label(t("Choose the toal quantity of thumbs in popular carousel.")) + $group->dropdown("quantity3")->label(t("Choose the total quantity of thumbs in popular carousel.")) ->options($range) ->selected(module::get_var("carousel", "quantity3", "25")); $group->checkbox("onalbum3")->label(t("Show on album & collection pages")) @@ -169,7 +169,7 @@ class Admin_Carousel_Controller extends Admin_Controller { $group->dropdown("visible")->label(t('Enter number of thumbs to show. (height of carousel)')) ->options($shortrange) ->selected(module::get_var("carousel", "visible", "1")); - $group->dropdown("quantity")->label(t("Choose the toal quantity of thumbs in random carousel.")) + $group->dropdown("quantity")->label(t("Choose the total quantity of thumbs in random carousel.")) ->options($range) ->selected(module::get_var("carousel", "quantity", "25")); $group->checkbox("onalbum")->label(t("Show on album & collection pages")) @@ -180,4 +180,4 @@ class Admin_Carousel_Controller extends Admin_Controller { $form->submit("submit")->value(t("Save")); return $form; } -} \ No newline at end of file +} diff --git a/3.0/modules/carousel/views/admin_carousel.html.php b/3.0/modules/carousel/views/admin_carousel.html.php index 8c3197e2..775a088d 100644 --- a/3.0/modules/carousel/views/admin_carousel.html.php +++ b/3.0/modules/carousel/views/admin_carousel.html.php @@ -17,7 +17,10 @@ window.onload=toggle;

-

- Use mouse wheel to scroll thought the images.") ?>

+

+ +
+ +

diff --git a/3.0/modules/social_share/controllers/admin_social_share.php b/3.0/modules/social_share/controllers/admin_social_share.php index 7c2aac32..3f247cff 100644 --- a/3.0/modules/social_share/controllers/admin_social_share.php +++ b/3.0/modules/social_share/controllers/admin_social_share.php @@ -27,6 +27,7 @@ class Admin_Social_Share_Controller extends Admin_Controller { $form = $this->_get_form(); if ($form->validate()) { + module::set_var("social_share", "general_impage_only", $form->general_settings->general_impage_only->value); module::set_var("social_share", "facebook_share_enabled", $form->facebook_share_settings->facebook_share_enabled->value); module::set_var("social_share", "facebook_share_layout", $form->facebook_share_settings->facebook_share_layout->value); module::set_var("social_share", "facebook_share_link_text", $form->facebook_share_settings->facebook_share_link_text->value); @@ -42,6 +43,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_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", "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_count_location", $form->twitter_settings->twitter_count_location->value); module::set_var("social_share", "twitter_size", $form->twitter_settings->twitter_size->value); @@ -62,6 +65,12 @@ class Admin_Social_Share_Controller extends Admin_Controller { private function _get_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 share 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")) ->checked(module::get_var("social_share", "facebook_share_enabled", false) == 1); @@ -73,7 +82,8 @@ class Admin_Social_Share_Controller extends Admin_Controller { ->selected(module::get_var("social_share", "facebook_share_layout")); $group_facebook_share->input("facebook_share_link_text")->label(t('Enter the text to place next to the Facebook icon.')) ->value(module::get_var("social_share", "facebook_share_link_text", "Share")); - + +/// Facebook like settings $group_facebook_like = $form->group("facebook_like_settings")->label(t("Facebook Like Button Settings")); $group_facebook_like->checkbox("facebook_like_enabled")->label(t("Display the button")) ->checked(module::get_var("social_share", "facebook_like_enabled", false) == 1); @@ -107,7 +117,8 @@ class Admin_Social_Share_Controller extends Admin_Controller { "button_count" => t("Button count"), "box_count" => t("Box count"))) ->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->checkbox("google_enabled")->label(t("Display the button")) ->checked(module::get_var("social_share", "google_enabled", false) == 1); @@ -125,6 +136,18 @@ class Admin_Social_Share_Controller extends Admin_Controller { "none" => t("None"))) ->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->checkbox("twitter_enabled")->label(t("Display the button")) ->checked(module::get_var("social_share", "twitter_enabled", false) == 1); diff --git a/3.0/modules/social_share/helpers/social_share_block.php b/3.0/modules/social_share/helpers/social_share_block.php index 6f592da3..4f4829d0 100644 --- a/3.0/modules/social_share/helpers/social_share_block.php +++ b/3.0/modules/social_share/helpers/social_share_block.php @@ -18,30 +18,37 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class social_share_block_Core { - static function get_site_list() { - return array( - "social_share" => t("Social Share")); - } + static function get_site_list() { + return array("social_share" => t("Social Share")); + } - static function get($block_id, $theme) { - - $block = new Block(); - $block->css_id = "g-social-share"; - $block->title = 'Share With Friends'; - $block->content = ''; - if(module::get_var("social_share", "facebook_share_enabled")){ - $block->content .= new View("facebook_share.html"); - } - if(module::get_var("social_share", "facebook_like_enabled")){ - $block->content .= new View("facebook_like.html"); - } - if(module::get_var("social_share", "google_enabled")){ - $block->content .= new View("google.html"); - } - if(module::get_var("social_share", "twitter_enabled")){ - $block->content .= new View("twitter.html"); - } - - return $block; - } + 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->css_id = "g-social-share"; + $block->title = 'Share With Friends'; + $block->content = ''; + if(module::get_var("social_share", "facebook_share_enabled")){ + $block->content .= new View("facebook_share.html"); + } + if(module::get_var("social_share", "facebook_like_enabled")){ + $block->content .= new View("facebook_like.html"); + } + if(module::get_var("social_share", "google_enabled")){ + $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")){ + $block->content .= new View("twitter.html"); + } + + return $block; + } + } } \ No newline at end of file diff --git a/3.0/modules/social_share/helpers/social_share_installer.php b/3.0/modules/social_share/helpers/social_share_installer.php index 153589c1..8fe06371 100644 --- a/3.0/modules/social_share/helpers/social_share_installer.php +++ b/3.0/modules/social_share/helpers/social_share_installer.php @@ -18,39 +18,46 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class social_share_installer { - static function deactivate() { - module::clear_var("social_share", "facebook_share_enabled"); - module::clear_var("social_share", "facebook_share_layout"); - module::clear_var("social_share", "facebook_share_link_text"); - module::clear_var("social_share", "facebook_like_enabled"); - module::clear_var("social_share", "facebook_like_appId"); - module::clear_var("social_share", "facebook_like_adminId"); - module::clear_var("social_share", "facebook_like_site_name"); - module::clear_var("social_share", "facebook_like_code_type"); - module::clear_var("social_share", "facebook_like_show_faces"); - module::clear_var("social_share", "facebook_like_send"); - module::clear_var("social_share", "facebook_like_action"); - module::clear_var("social_share", "facebook_like_layout"); - module::clear_var("social_share", "google_enabled"); - module::clear_var("social_share", "google_size"); - module::clear_var("social_share", "google_annotation"); - module::clear_var("social_share", "twitter_enabled"); - module::clear_var("social_share", "twitter_count_location"); - module::clear_var("social_share", "twitter_size"); - } - static function upgrade($version) { - if ($version < 1) { - module::set_version("social_share", $version = 1); + 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_layout"); + module::clear_var("social_share", "facebook_share_link_text"); + module::clear_var("social_share", "facebook_like_enabled"); + module::clear_var("social_share", "facebook_like_appId"); + module::clear_var("social_share", "facebook_like_adminId"); + module::clear_var("social_share", "facebook_like_site_name"); + module::clear_var("social_share", "facebook_like_code_type"); + module::clear_var("social_share", "facebook_like_show_faces"); + module::clear_var("social_share", "facebook_like_send"); + module::clear_var("social_share", "facebook_like_action"); + module::clear_var("social_share", "facebook_like_layout"); + module::clear_var("social_share", "google_enabled"); + module::clear_var("social_share", "google_size"); + 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_count_location"); + module::clear_var("social_share", "twitter_size"); } + static function upgrade($version) { + if ($version < 1) { + module::set_version("social_share", $version = 1); + } - if ($version < 2) { - module::set_var("social_share", "facebook_share_enabled", module::get_var("social_share", "facebook")); - module::clear_var("social_share", "facebook"); - module::set_var("social_share", "google_enabled", module::get_var("social_share", "google")); - module::clear_var("social_share", "google"); - module::set_var("social_share", "twitter_enabled", module::get_var("social_share", "twitter")); - module::clear_var("social_share", "twitter"); - module::set_version("social_share", $version = 2); + if ($version < 2) { + module::set_var("social_share", "facebook_share_enabled", module::get_var("social_share", "facebook")); + module::clear_var("social_share", "facebook"); + module::set_var("social_share", "google_enabled", module::get_var("social_share", "google")); + module::clear_var("social_share", "google"); + module::set_var("social_share", "twitter_enabled", module::get_var("social_share", "twitter")); + module::clear_var("social_share", "twitter"); + module::set_version("social_share", $version = 2); + } + + if ($version < 3) { + module::set_version("social_share", $version = 3); + } } - } } \ No newline at end of file diff --git a/3.0/modules/social_share/helpers/social_share_theme.php b/3.0/modules/social_share/helpers/social_share_theme.php index 02a2542c..9a8ec958 100644 --- a/3.0/modules/social_share/helpers/social_share_theme.php +++ b/3.0/modules/social_share/helpers/social_share_theme.php @@ -18,21 +18,24 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class social_share_theme_Core { - static function head($theme) { - if ($theme->item()) { - $item = $theme->item(); - $url = $item->thumb_url(true); - $appId = module::get_var("social_share", "facebook_like_appId"); - $adminId = module::get_var("social_share", "facebook_like_adminId"); - $site_name = module::get_var("social_share", "facebook_like_site_name"); - $selfURL = url::abs_current(true); - return "\t - title\"/> - - - - - "; - } - } + static function head($theme) { + $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(); + $url = $item->thumb_url(true); + $appId = module::get_var("social_share", "facebook_like_appId"); + $adminId = module::get_var("social_share", "facebook_like_adminId"); + $site_name = module::get_var("social_share", "facebook_like_site_name"); + $selfURL = url::abs_current(true); + return "\t + title\"/> + + + + + "; + } + } } \ No newline at end of file diff --git a/3.0/modules/social_share/module.info b/3.0/modules/social_share/module.info index 288bdf7d..fd1f963a 100644 --- a/3.0/modules/social_share/module.info +++ b/3.0/modules/social_share/module.info @@ -1,6 +1,6 @@ name = "Social Share" description = "Adds links to share the page to social media sites in the sidebar." -version = 2 +version = 3 author_name = "jasonhardin" author_url = "http://codex.gallery2.org/User:psychoph" info_url = "http://codex.gallery2.org/Gallery3:Modules:social_share" diff --git a/3.0/modules/social_share/views/facebook_like.html.php b/3.0/modules/social_share/views/facebook_like.html.php index a831607e..a2c28ad1 100644 --- a/3.0/modules/social_share/views/facebook_like.html.php +++ b/3.0/modules/social_share/views/facebook_like.html.php @@ -17,7 +17,6 @@ if (module::get_var("social_share", "facebook_like_send")) { $send = "false"; } ?> -
@@ -28,14 +27,13 @@ if (module::get_var("social_share", "facebook_like_send")) { &show_faces= &width=180 &locale= -&action= +&action= &colorscheme=light&height=" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:180px; height:px;" allowTransparency="true">
\ No newline at end of file diff --git a/3.0/modules/social_share/views/google.html.php b/3.0/modules/social_share/views/google.html.php index f928a358..f6bb2642 100644 --- a/3.0/modules/social_share/views/google.html.php +++ b/3.0/modules/social_share/views/google.html.php @@ -11,7 +11,7 @@ (function() { var po = document.createElement('script'); po.type = 'text/javascript'; - x2po.async = true; + po.async = true; po.src = 'https://apis.google.com/js/plusone.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); })(); diff --git a/3.0/modules/social_share/views/pinterest.html.php b/3.0/modules/social_share/views/pinterest.html.php new file mode 100644 index 00000000..8d40d42a --- /dev/null +++ b/3.0/modules/social_share/views/pinterest.html.php @@ -0,0 +1,14 @@ +item()) { + $url = urlencode(url::abs_current(true)); + $item = $theme->item(); + $media = urlencode($item->thumb_url(true)); + $description=urlencode($item->description); +?> +
+ "> + + + +
+ \ No newline at end of file diff --git a/3.0/themes/browny_wind/views/page.html.php b/3.0/themes/browny_wind/views/page.html.php index f0ee5b5f..c3e212c5 100644 --- a/3.0/themes/browny_wind/views/page.html.php +++ b/3.0/themes/browny_wind/views/page.html.php @@ -1,4 +1,5 @@ + html_attributes() ?> xml:lang="en" lang="en"> @@ -10,11 +11,11 @@ item()): ?> - item()->title ?> + item()->title) ?> tag()): ?> $theme->tag()->name)) ?> - title ?> + title) ?> @@ -24,7 +25,7 @@ " /> page_type == "collection"): ?> - + thumb_proportion($theme->item())) != 1): ?> + + url("icons/pear_logo_sml.png"); + } ?> + - diff --git a/3.0/themes/pear4gallery3/views/search.html.php b/3.0/themes/pear4gallery3/views/search.html.php index 3436a00c..cf7d99f1 100644 --- a/3.0/themes/pear4gallery3/views/search.html.php +++ b/3.0/themes/pear4gallery3/views/search.html.php @@ -1,48 +1,18 @@ - -
" id="g-search-form" class="g-short-form"> -
- - - - -
-
- -
-

- - - - paginator() ?> - - + + + + + set_global("children", $items);// = $items; + print $v;?> +

- %term", array("term" => $q)) ?> + %term", array("term" => $q)) ?>

- - -
+ diff --git a/3.0/themes/pear4gallery3/views/thumbs.html.php b/3.0/themes/pear4gallery3/views/thumbs.html.php index 716ad657..fe61e065 100644 --- a/3.0/themes/pear4gallery3/views/thumbs.html.php +++ b/3.0/themes/pear4gallery3/views/thumbs.html.php @@ -6,7 +6,7 @@ 50) break; ?> is_album()): ?> - url()."/'+getAlbumHash(skimimg);"; ?> + url()."/'+getAlbumHash((typeof skimimg === 'undefined') ? 0 : skimimg);"; ?> is_photo()): ?> @@ -55,9 +55,7 @@ endif; $child): ?> is_album() || $child->is_movie())): ?> -slideshowImages[] = (['resize_url() ?>', 'id ?>', 'width ?>','height ?>', 'title, ENT_QUOTES) ?>', '', 'url() ?>']); - - +slideshowImages[] = (['resize_url() ?>', 'id ?>', 'resize_width ?>','resize_height ?>', 'title, ENT_QUOTES) ?>', '', 'url() ?>']);