public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge pull request #105 from rWatcher/master

Browse Source 
Tag Albums Update
This commit is contained in:
Bharat Mediratta 2012-04-02 19:19:52 -07:00
commit 68fb900e19
8 changed files with 152 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
3.0/modules/minislideshow/helpers/minislideshow_event.php
View File

@ -49,13 +49,15 @@ class minislideshow_event_Core {
static function album_menu($menu, $theme) {
// Add an option to access the slideshow from the album view.
$menu
->append(Menu::factory("link")
->id("minislideshow")
->label(t("View MiniSlide Show"))
->url(url::site("minislideshow/showslideshow/" . $theme->item()->id))
->css_class("g-dialog-link")
->css_id("g-mini-slideshow-link"));
if ($theme->item()->children_count(array(array("type", "=", "photo")))) {
$menu
->append(Menu::factory("link")
->id("minislideshow")
->label(t("View MiniSlide Show"))
->url(url::site("minislideshow/showslideshow/" . $theme->item()->id))
->css_class("g-dialog-link")
->css_id("g-mini-slideshow-link"));
}
}
static function photo_menu($menu, $theme) {

91
3.0/modules/tag_albums/controllers/tag_albums.php
View File

@ -18,6 +18,48 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class tag_albums_Controller extends Controller {
public function make_tag_album_cover($id, $tag_id, $album_id) {
if (!identity::active_user()->admin) {
message::error(t("You do not have sufficient privileges to do this"));
url::redirect("tag_albums/show/" . $id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($item->name));
}
$item = ORM::factory("item", $id);
if (($album_id > 0) && ($tag_id == 0)) {
// If we are dealing with a dynamic album, set it's thumbnail to this pics.
// Based on modules/gallery/helpers/item.php
$album_tags = ORM::factory("tags_album_id")
->where("id", "=", $album_id)
->find_all();
if (count($album_tags) > 0) {
$parent = ORM::factory("item", $album_tags[0]->album_id);
$parent->album_cover_item_id = $item->id;
$parent->thumb_dirty = 1;
graphics::generate($parent);
$parent->save();
$grand_parent = $parent->parent();
if ($grand_parent && access::can("edit", $grand_parent) &&
$grand_parent->album_cover_item_id == null) {
item::make_album_cover($parent);
}
}
message::success(t("Made " . $item->title . " this album's cover"));
url::redirect("tag_albums/show/" . $id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($item->name));
} else {
// If setting a thumbnail for an auto-generated all tags->tag album.
$record = ORM::factory("tags_album_tag_cover")->where("tag_id", "=", $tag_id)->find();
if (!$record->loaded()) {
$record->tag_id = $tag_id;
}
$record->photo_id = $id;
$record->save();
message::success(t("Made " . $item->title . " this album's cover"));
url::redirect("tag_albums/show/" . $id . "/" . $tag_id . "/" . $album_id . "/" . urlencode($item->name));
}
}
public function album($id) {
// Displays a dynamic page containing items that have been
// tagged with one or more tags.
@ -318,21 +360,48 @@ class tag_albums_Controller extends Controller {
}
// Generate an arry of "fake" items, one for each tag on the page.
// Grab thumbnails from the most recently uploaded item for each tag, if available.
// Grab thumbnails from a admin-specified photo, or the most recently
// uploaded item for each tag, if available.
$children_array = Array();
foreach ($display_tags as $one_tag) {
$tag_item = ORM::factory("item")
->viewable()
->join("items_tags", "items.id", "items_tags.item_id")
->where("items_tags.tag_id", "=", $one_tag->id)
->order_by("items.id", "DESC")
->find_all(1, 0);
$child_tag = new Tag_Albums_Item($one_tag->name, url::site("tag_albums/tag/" . $one_tag->id . "/" . $id . "/" . urlencode($one_tag->name)), "album", 0);
if (count($tag_item) > 0) {
if ($tag_item[0]->has_thumb()) {
$child_tag->set_thumb($tag_item[0]->thumb_url(), $tag_item[0]->thumb_width, $tag_item[0]->thumb_height);
$tag_thumb_url = "";
$tag_thumb_width = "";
$tag_thumb_height = "";
// Check and see if the admin specified a photo to use for this tags thumbnail.
$record = ORM::factory("tags_album_tag_cover")->where("tag_id", "=", $one_tag->id)->find();
if ($record->loaded()) {
$tag_thumb_item = ORM::factory("item", $record->photo_id);
if ($tag_thumb_item->loaded()) {
$tag_thumb_url = $tag_thumb_item->thumb_url();
$tag_thumb_width = $tag_thumb_item->thumb_width;
$tag_thumb_height = $tag_thumb_item->thumb_height;
}
}
// If no pre-specified thumbnail was found, use the most recently uploaded photo (if available).
if ($tag_thumb_url == "") {
$tag_item = ORM::factory("item")
->viewable()
->join("items_tags", "items.id", "items_tags.item_id")
->where("items_tags.tag_id", "=", $one_tag->id)
->order_by("items.id", "DESC")
->find_all(1, 0);
if (count($tag_item) > 0) {
if ($tag_item[0]->has_thumb()) {
$tag_thumb_url = $tag_item[0]->thumb_url();
$tag_thumb_width = $tag_item[0]->thumb_width;
$tag_thumb_height = $tag_item[0]->thumb_height;
}
}
}
// Create a new object to represent this virtual album, and add it to the array of objects for
// this page.
$child_tag = new Tag_Albums_Item($one_tag->name, url::site("tag_albums/tag/" . $one_tag->id . "/" . $id . "/" . urlencode($one_tag->name)), "album", 0);
if ($tag_thumb_url != "") {
$child_tag->set_thumb($tag_thumb_url, $tag_thumb_width, $tag_thumb_height);
}
$children_array[] = $child_tag;
}
$children = new Tag_Albums_Children($children_array);

15
3.0/modules/tag_albums/helpers/tag_albums_event.php
View File

@ -106,4 +106,19 @@ class tag_albums_event_Core {
db::build()->delete("tags_album_ids")->where("album_id", "=", $item->id)->execute();
}
}
static function site_menu($menu, $theme) {
if ($item = $theme->item()) {
if ($item->is_photo()) {
if ((identity::active_user()->admin) && (isset($theme->is_tagalbum_page))) {
$menu->get("options_menu")
->append(Menu::factory("link")
->id("g-tag-albums-set-cover")
->label(t("Choose as the tag album cover"))
->css_id("g-tag-albums-set-cover")
->url(url::site("tag_albums/make_tag_album_cover/" . $item->id . "/" . $theme->tag_id . "/" . $theme->album_id)));
}
}
}
}
}

20
3.0/modules/tag_albums/helpers/tag_albums_installer.php
View File

@ -29,6 +29,14 @@ class tag_albums_installer {
KEY(`album_id`, `id`))
DEFAULT CHARSET=utf8;");
$db->query("CREATE TABLE IF NOT EXISTS {tags_album_tag_covers} (
`id` int(9) NOT NULL auto_increment,
`tag_id` int(9) NOT NULL,
`photo_id` int(9) NOT NULL,
PRIMARY KEY (`id`),
KEY(`tag_id`, `id`))
DEFAULT CHARSET=utf8;");
// Set up some default values.
module::set_var("tag_albums", "tag_sort_by", "name");
module::set_var("tag_albums", "tag_sort_direction", "ASC");
@ -43,12 +51,24 @@ class tag_albums_installer {
}
static function upgrade($version) {
$db = Database::instance();
if ($version == 1) {
module::set_var("tag_albums", "tag_index", "default");
module::set_var("tag_albums", "tag_index_scope", "0");
module::set_var("tag_albums", "tag_index_filter", "0");
module::set_version("tag_albums", 2);
}
if ($version == 2) {
$db->query("CREATE TABLE IF NOT EXISTS {tags_album_tag_covers} (
`id` int(9) NOT NULL auto_increment,
`tag_id` int(9) NOT NULL,
`photo_id` int(9) NOT NULL,
PRIMARY KEY (`id`),
KEY(`tag_id`, `id`))
DEFAULT CHARSET=utf8;");
module::set_version("tag_albums", 3);
}
}
static function deactivate() {

21
3.0/modules/tag_albums/models/tags_album_tag_cover.php Normal file
View File

@ -0,0 +1,21 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2012 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class Tags_Album_Tag_Cover_Model extends ORM {
}

2
3.0/modules/tag_albums/module.info
View File

@ -1,6 +1,6 @@
name = "Tag Albums"
description = "Creates dynamic albums based on tags."
version = 2
version = 3
author_name = "rWatcher"
author_url = "http://codex.gallery2.org/User:RWatcher"
info_url = "http://codex.gallery2.org/Gallery3:Modules:tag_albums"

4
3.0/modules/tagsmap/css/tagsmap_menu.css
View File

@ -1,3 +1,7 @@
#g-view-menu #g-tagsmap-link {
background-image: url('../images/ico-view-tagsmap.png');
}
#g-tagsmap-dialog {
color: black;
}
#g-tagsmap-dialog a { color: blue !important; }

4
3.0/modules/tagsmap/views/tagsmap_googlemap.html.php
View File

@ -34,8 +34,8 @@
function createMarker(point, description, tagURL, tagName) {
var marker = new GMarker(point);
GEvent.addListener(marker, "click", function() {
var myHtml = description + "<br/><br/>" +
"Tag: <a href=\"" + tagURL + "\">" + tagName + "</a>";
var myHtml = "<div id=\"g-tagsmap-dialog\">" + description + "<br/><br/>" +
"Tag: <a href=\"" + tagURL + "\">" + tagName + "</a></div>";
map.openInfoWindowHtml(point, myHtml);
});
return marker;