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

Merge branch 'master' into talmdal

Browse Source
This commit is contained in:
Tim Almdal 2010-09-11 12:19:09 -07:00
commit 3919ca1206
19 changed files with 1074 additions and 559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/kbd_nav/changelog.txt Normal file
View File

@ -0,0 +1,20 @@
Kbd Navigation Changelog
version 1.5:
- Fix for RTL detection
- Added support for Wind theme
version 1.4:
- Added RTL detection
version 1.3:
- Internal revision
version 1.2:
- Added support for GreyDragon Photo Slideshow navigation - in Photo SB slideshow mode, key navigation is superseded by slideshow navigation.
version 1.1:
- Internal revision
version 1.0:
- Initial release

8
modules/kbd_nav/helpers/kbd_nav_theme.php Normal file
View File

@ -0,0 +1,8 @@
<?php defined("SYSPATH") or die("No direct script access.");
class Kbd_Nav_theme_Core {
static function head($theme) {
$theme->script("kbd_nav.js");
}
}

97
modules/kbd_nav/js/kbd_nav.js Normal file
View File

@ -0,0 +1,97 @@
/**
*
* Copyright (c) 2010 Serguei Dosyukov, http://blog.dragonsoft.us
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
* modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
* IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
*/
$.fn.KbdNavigation = function(options, callback) {
this.options = options || {};
var opt = this.options;
this.callback = callback || null;
var clbk = this.callback;
$(this).bind("keydown", function(event) {
if ($('#sb-body-inner>img#sb-content').is(':visible')) {
return false;
}
var direction = "ltr";
if (document.body) {
if (window.getComputedStyle) {
direction = window.getComputedStyle(document.body, null).direction;
} else if (document.body.currentStyle) {
direction = document.body.currentStyle.direction;
}
}
var lnk = "";
var lnk_first, lnk_prev, lnk_parent, lnk_next, lnk_last;
if(opt.first) { lnk_first = opt.first; } else { lnk_first = $("#g-navi-first").attr("href"); }
if(opt.prev) { lnk_prev = opt.prev; } else { lnk_prev = $("#g-navi-prev").attr("href"); }
if(opt.parent) { lnk_parent = opt.parent; } else { lnk_parent = $("#g-navi-parent").attr("href"); }
if(opt.next) { lnk_next = opt.next; } else { lnk_next = $("#g-navi-next").attr("href"); }
if(opt.last) { lnk_last = opt.last; } else { lnk_last = $("#g-navi-last").attr("href"); }
// Support for standard Wind Theme tags
if(!lnk_first) { lnk_first = $(".g-paginator .ui-icon-seek-first").parent().attr("href"); }
if(!lnk_prev) { lnk_prev = $(".g-paginator .ui-icon-seek-prev").parent().attr("href"); }
if(!lnk_next) { lnk_next = $(".g-paginator .ui-icon-seek-next").parent().attr("href"); }
if(!lnk_last) { lnk_last = $(".g-paginator .ui-icon-seek-end").parent().attr("href"); }
var keyCode = event.keyCode;
if (direction == "rtl") {
switch(keyCode) {
case 0x25: // Left
keyCode = 0x27;
break;
case 0x27: // Right
keyCode = 0x25;
break;
}
}
switch(keyCode) {
case 0x25: // Ctr+Left/Left
if(event.ctrlKey) { lnk = lnk_first; } else { lnk = lnk_prev; }
break;
case 0x26: // Ctrl+Up
if(event.ctrlKey) { lnk = lnk_parent; }
break;
case 0x27: // Ctrl+Right/Right
if(event.ctrlKey) { lnk = lnk_last; } else { lnk = lnk_next; }
break;
}
if(lnk) {
if(typeof clbk == 'function') {
clbk();
return false;
} else {
window.location = lnk;
return true;
}
}
return true;
});
}
$(document).ready( function() {
$(document).KbdNavigation({});
if ($('#sb-content').is(':visible')) { return true; }
});

3
modules/kbd_nav/module.info Normal file
View File

@ -0,0 +1,3 @@
name = "Kbd Navigation"
description = "Adds keyboard navigation to the gallery.<br />Version 1.5 | By <a href=http://blog.dragonsoft.us>Serguei Dosyukov</a> | <a href=http://codex.gallery2.org/Gallery3:Modules:kbd_nav>Visit plugin Site</a> | <a href=http://gallery.menalto.com/node/95438>Support</a>"
version = 5

43
modules/photoannotation/controllers/admin_photoannotation.php Normal file → Executable file
View File

@ -48,18 +48,35 @@ class Admin_Photoannotation_Controller extends Admin_Controller {
}
//Load all existing tag annotations
$tag_annotations = ORM::factory("items_face")->where("tag_id", "=", $sourcetag->id)->find_all();
//Disable user notifications so that users don't get flooded with mails
$old_notification_setting = module::get_var("photoannotation", "nonotifications", false);
module::set_var("photoannotation", "nonotifications", true, true);
foreach ($tag_annotations as $tag_annotation) {
photoannotation::saveuser($targetuser->id, $tag_annotation->item_id, $tag_annotation->x1, $tag_annotation->y1, $tag_annotation->x2, $tag_annotation->y2, $tag_annotation->description);
//Delete the old annotation
$tag_annotation->delete();
}
//Remove and delete old tag
if ($form->deletetag->value) {
$this->_remove_tag($sourcetag, true);
} elseif ($form->removetag->value) {
$this->_remove_tag($sourcetag, false);
}
module::set_var("photoannotation", "nonotifications", $old_notification_setting, true);
message::success(t("%count tag annotations (%tagname) have been converted to user annotations (%username)", array("count" => count($tag_annotations), "tagname" => $sourcetag->name, "username" => $targetuser->display_name())));
url::redirect("admin/photoannotation/converter");
}
print $this->_get_converter_view($form);
}
private function _remove_tag($tag, $delete) {
$name = $tag->name;
db::build()->delete("items_tags")->where("tag_id", "=", $tag->id)->execute();
if ($delete) {
$tag->delete();
}
}
public function handler() {
access::verify_csrf();
@ -90,17 +107,19 @@ class Admin_Photoannotation_Controller extends Admin_Controller {
module::set_var(
"photoannotation", "notificationoptout", $form->notifications->notificationoptout->value, true);
module::set_var(
"photoannotation", "newtagsubject", $form->newtagmail->newtagsubject->value);
"photoannotation", "allowguestsearch", $form->notifications->allowguestsearch->value, true);
module::set_var(
"photoannotation", "newtagbody", $form->newtagmail->newtagbody->value);
"photoannotation", "newtagsubject", strip_tags($form->newtagmail->newtagsubject->value));
module::set_var(
"photoannotation", "newcommentsubject", $form->newcommentmail->newcommentsubject->value);
"photoannotation", "newtagbody", strip_tags($form->newtagmail->newtagbody->value));
module::set_var(
"photoannotation", "newcommentbody", $form->newcommentmail->newcommentbody->value);
"photoannotation", "newcommentsubject", strip_tags($form->newcommentmail->newcommentsubject->value));
module::set_var(
"photoannotation", "updatedcommentsubject", $form->updatedcommentmail->updatedcommentsubject->value);
"photoannotation", "newcommentbody", strip_tags($form->newcommentmail->newcommentbody->value));
module::set_var(
"photoannotation", "updatedcommentbody", $form->updatedcommentmail->updatedcommentbody->value);
"photoannotation", "updatedcommentsubject", strip_tags($form->updatedcommentmail->updatedcommentsubject->value));
module::set_var(
"photoannotation", "updatedcommentbody", strip_tags($form->updatedcommentmail->updatedcommentbody->value));
module::set_var(
"photoannotation", "onuserdelete", $form->onuserdelete->onuserdelete->value);
message::success(t("Your settings have been saved."));
@ -221,6 +240,8 @@ class Admin_Photoannotation_Controller extends Admin_Controller {
->options($tag_array);
$form->dropdown("targetuser")->label(t("Select user"))
->options($user_array);
$form->checkbox("deletetag")->label(t("Delete the tag after conversion."));
$form->checkbox("removetag")->label(t("Remove the tag from photos after conversion."));
$form->submit("submit")->value(t("Convert"));
return $form;
}
@ -251,19 +272,21 @@ class Admin_Photoannotation_Controller extends Admin_Controller {
->value(module::get_var("photoannotation", "hovercolor", "990000"))
->rules("valid_alpha_numeric|length[6]");
$group = $form->group("legendsettings")->label(t("Legend settings"));
$group->checkbox("showusers")->label(t("Show face annotation below photo."))
$group->checkbox("showusers")->label(t("Show user annotations below photo."))
->checked(module::get_var("photoannotation", "showusers", false));
$group->checkbox("showfaces")->label(t("Show face annotation below photo."))
$group->checkbox("showfaces")->label(t("Show tag annotations below photo."))
->checked(module::get_var("photoannotation", "showfaces", false));
$group->checkbox("shownotes")->label(t("Show note annotations below photo."))
->checked(module::get_var("photoannotation", "shownotes", false));
$group->checkbox("fullname")->label(t("Show full name of a user instead of the username on annotations (username will be dispayed for users without a full name)."))
->checked(module::get_var("photoannotation", "fullname", false));
$group = $form->group("notifications")->label(t("Notification settings"));
$group = $form->group("notifications")->label(t("Notification and user cloud settings"));
$group->checkbox("nonotifications")->label(t("Disable user notifications."))
->checked(module::get_var("photoannotation", "nonotifications", false));
$group->checkbox("notificationoptout")->label(t("Notify users by default (only applies to new users and user who have not saved their profile after installing this module)."))
->checked(module::get_var("photoannotation", "notificationoptout", false));
$group->checkbox("allowguestsearch")->label(t("Show user cloud and allow user search for guests."))
->checked(module::get_var("photoannotation", "allowguestsearch", false));
$group = $form->group("newtagmail")->label(t("Customize the mail sent to users when a user annotation is created"));
$group->input("newtagsubject")->label(t("Subject"))
->value(module::get_var("photoannotation", "newtagsubject", "Someone tagged a photo of you"));

84
modules/photoannotation/controllers/photoannotation.php
View File

@ -18,6 +18,55 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class photoannotation_Controller extends Controller {
public function showuser() {
if (identity::active_user()->guest && !module::get_var("photoannotation", "allowguestsearch", false)) {
message::error(t("You have to log in to perform a user search."));
url::redirect(url::site());
return;
}
$form = photoannotation::get_user_search_form("g-user-cloud-form");
$user_id = Input::instance()->get("name", "");
if ($user_id == "") {
$user_id = Input::instance()->post("name", "");
}
$getuser = photoannotation::getuser($user_id);
if ($getuser->found) {
url::redirect(user_profile::url($getuser->user->id));
return;
}
$page_size = module::get_var("gallery", "page_size", 9);
$page = Input::instance()->get("page", 1);
$offset = ($page - 1) * $page_size;
// Make sure that the page references a valid offset
if ($page < 1) {
$page = 1;
}
list ($count, $result) = photoannotation::search_user($user_id, $page_size, $offset);
$max_pages = max(ceil($count / $page_size), 1);
if ($page > 1) {
$previous_page_url = url::site("photoannotation/showuser?name=". $user_id ."&amp;page=". ($page - 1));
}
if ($page < $max_pages) {
$next_page_url = url::site("photoannotation/showuser?name=". $user_id ."&amp;page=". ($page + 1));
}
if ($user_id == "") {
$user_id = "*";
}
$template = new Theme_View("page.html", "other", "usersearch");
$template->set_global("position", $page);
$template->set_global("total", $max_pages);
$template->content = new View("photoannotation_user_search.html");
$template->content->search_form = photoannotation::get_user_search_form(g-user-search-form);
$template->content->users = $result;
$template->content->q = $user_id;
$template->content->count = $count;
$template->content->paginator = new View("paginator.html");
$template->content->paginator->previous_page_url = $previous_page_url;
$template->content->paginator->next_page_url = $next_page_url;
print $template;
}
public function save($item_id) {
// Prevent Cross Site Request Forgery
access::verify_csrf();
@ -31,9 +80,26 @@ class photoannotation_Controller extends Controller {
$str_x2 = $_POST["width"] + $str_x1; //Annotation uses area size, tagfaces uses positions
$item_title = $_POST["text"];
$tag_data = $_POST["tagsList"];
$user_id = "";
$user_id = $_POST["userlist"];
$description = $_POST["desc"];
$redir_uri = url::abs_site("{$item->type}s/{$item->id}");
//If this is a user then get the id
if ($user_id != "") {
$getuser = photoannotation::getuser($user_id);
if (!$getuser->found) {
message::error(t("Could not find user %user.", array("user" => $user_id)));
url::redirect($redir_uri);
return;
}
if ($getuser->isguest) {
message::error(t("You cannot create an annotation for the guest user."));
url::redirect($redir_uri);
return;
}
$user_id = $getuser->user->id;
}
//Add tag to item, create tag if not exists
if ($tag_data != "") {
$tag = ORM::factory("tag")->where("name", "=", $tag_data)->find();
@ -161,4 +227,22 @@ class photoannotation_Controller extends Controller {
message::success(t("Annotation deleted."));
url::redirect($redir_uri);
}
public function autocomplete() {
$users = array();
$user_parts = explode(",", Input::instance()->get("q"));
$limit = Input::instance()->get("limit");
$user_part = ltrim(end($user_parts));
$user_list = ORM::factory("user")
->where("name", "LIKE", "{$user_part}%")
->order_by("name", "ASC")
->limit($limit)
->find_all();
foreach ($user_list as $user) {
if ($user->name != "guest") {
$users[] = $user->display_name() ." (". $user->name .")";
}
}
print implode("\n", $users);
}
}

72
modules/photoannotation/css/photoannotation.css
View File

@ -1,3 +1,75 @@
.photoannotation-user-search {
border-bottom-style:solid;
border-bottom-width:1px;
padding: 0.8em 0.8em !important;
}
#g-user-cloud ul {
font-size: 1.2em;
text-align: justify;
}
#g-user-cloud ul li {
display: inline;
line-height: 1.5em;
text-align: justify;
}
#g-user-cloud ul li a {
text-decoration: none;
}
#g-user-cloud ul li span {
display: none;
}
#g-user-cloud ul li.size1 a {
color: #9cf;
font-size: 80%;
font-weight: 100;
}
#g-user-cloud ul li.size2 a {
color: #69f;
font-size: 90%;
font-weight: 300;
}
#g-user-cloud ul li.size3 a {
color: #69c;
font-size: 100%;
font-weight: 500;
}
#g-user-cloud ul li.size4 a {
color: #369;
font-size: 110%;
font-weight: 700;
}
#g-user-cloud ul li.size5 a {
color: #0e2b52;
font-size: 120%;
font-weight: 900;
}
#g-user-cloud ul li.size6 a {
color: #0e2b52;
font-size: 130%;
font-weight: 900;
}
#g-user-cloud ul li.size7 a {
color: #0e2b52;
font-size: 140%;
font-weight: 900;
}
#g-user-cloud ul li a:hover {
color: #f30;
text-decoration: underline;
}
.image-annotate-canvas {
background-position: left top;
background-repeat: no-repeat;

114
modules/photoannotation/helpers/photoannotation.php
View File

@ -18,6 +18,62 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class photoannotation_Core {
static function search_user($q, $page_size, $offset) {
$db = Database::instance();
$q = trim($q, "*");
$q = $db->escape($q) ."*";
if ($q == "*") {
$users = ORM::factory("user");
$count = $users->count_all();
$data = $users->order_by("name", "ASC")->find_all($page_size, $offset);
return array($count, $data);
} else {
$query =
"SELECT SQL_CALC_FOUND_ROWS {users}.*, " .
" MATCH({users}.`name`) AGAINST ('$q' IN BOOLEAN MODE) AS `score` " .
"FROM {users} " .
"WHERE MATCH({users}.`name`) AGAINST ('$q' IN BOOLEAN MODE) " .
"ORDER BY `score` DESC " .
"LIMIT $page_size OFFSET $offset";
$data = $db->query($query);
$count = $db->query("SELECT FOUND_ROWS() as c")->current()->c;
return array($count, new ORM_Iterator(ORM::factory("user"), $data));
}
}
static function get_user_search_form($form_id) {
$form = new Forge("photoannotation/showuser/{$item->id}", "", "post", array("id" => $form_id, "class" => "g-short-form"));
$label = t("Type user name");
$group = $form->group("showuser")->label("Search for a user");
$group->input("name")->label($label)->id("name");
$group->submit("")->value(t("Search"));
return $form;
}
public static function getuser($user_string) {
$user_parts = explode("(", $user_string);
$user_part = rtrim(ltrim(end($user_parts)), ")");
$user = ORM::factory("user")->where("name", "=", $user_part)->find();
$user_firstpart = trim(implode(array_slice($user_parts, 0, count($user_parts)-1)));
if (!$user->loaded() || strcasecmp($user_firstpart, $user->display_name()) <> 0) {
$result->found = false;
$result->isguest = false;
$result->user = "";
return $result;
}
if (identity::guest()->id == $user->id) {
$result->found = true;
$result->isguest = true;
$result->user = "";
return $result;
}
$result->found = true;
$result->isguest = false;
$result->user = $user;
return $result;
}
public static function saveuser($user_id, $item_id, $str_x1, $str_y1, $str_x2, $str_y2, $description) {
//Since we are associating a user we will remove any old annotation of this user on this photo
$item_old_users = ORM::factory("items_user")
@ -94,6 +150,10 @@ class photoannotation_Core {
}
//Only send mail if the notifications are switched on globally
if (!module::get_var("photoannotation", "nonotifications", false)) {
//Check if the use has a valid e-mail
if (!valid::email($recipient->email)) {
return false;
}
//Get the users settings
$notification_settings = self::get_user_notification_settings($recipient);
//Check which type of mail to send
@ -111,6 +171,12 @@ class photoannotation_Core {
case "newcomment":
//Only send if user has this option enabled
if ($notification_settings->comment) {
//Don't send if the notification module is active and the user is watching this item
if (module::is_active("notification")) {
if (notification::is_watching($item, $recipient)) {
return false;
}
}
//Get subject and body and send the mail
$subject = module::get_var("photoannotation", "newcommentsubject", "Someone added a comment to photo of you");
$body = module::get_var("photoannotation", "newcommentbody", "Hello %name, please visit %url to read the comment.");
@ -121,6 +187,12 @@ class photoannotation_Core {
case "updatecomment":
//Only send if user has this option enabled
if ($notification_settings->comment) {
//Don't send if the notification module is active and the user is watching this item
if (module::is_active("notification")) {
if (notification::is_watching($item, $recipient)) {
return false;
}
}
//Get subject and body and send the mail
$subject = module::get_var("photoannotation", "updatedcommentsubject", "Someone updated a comment to photo of you");
$body = module::get_var("photoannotation", "updatedcommentbody", "Hello %name, please visit %url to read the comment.");
@ -134,6 +206,7 @@ class photoannotation_Core {
private static function _send_mail($mailto, $subject, $message) {
//Send the notification mail
$message = nl2br($message);
return Sendmail::factory()
->to($mailto)
->subject($subject)
@ -168,4 +241,45 @@ class photoannotation_Core {
}
return $user_array;
}
static function cloud($count) {
$users = ORM::factory("user")->order_by("name", "ASC")->find_all();
if ($users) {
$cloud = new View("photoannotation_cloud.html");
$fullname = module::get_var("photoannotation", "fullname", false);
foreach ($users as $user) {
$annotations = ORM::factory("items_user")->where("user_id", "=", $user->id)->count_all();
if ($annotations > 0) {
if ($annotations > $maxcount) {
$maxcount = $annotations;
}
if ($fullname) {
$user_array[$user->name]->name = $user->display_name();
} else {
$user_array[$user->name]->name = $user->name;
}
$user_array[$user->name]->size = $annotations;
$user_array[$user->name]->url = user_profile::url($user->id);
}
}
$cloud->users = array_slice($user_array, 0, $count);
$cloud->max_count = $maxcount;
if (!$cloud->max_count) {
return;
}
return $cloud;
}
}
static function comment_count($user_id) {
if (module::is_active("comment")) {
return ORM::factory("comment")->where("author_id", "=", $user_id)->count_all();
} else {
return false;
}
}
static function annotation_count($user_id) {
return ORM::factory("items_user")->where("user_id", "=", $user_id)->count_all();
}
}

40
modules/photoannotation/helpers/photoannotation_block.php Normal file
View File

@ -0,0 +1,40 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2010 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 photoannotation_block_Core {
static function get_site_list() {
return array("photoannotation" => t("Users"));
}
static function get($block_id, $theme) {
$block = "";
if (!identity::active_user()->guest || module::get_var("photoannotation", "allowguestsearch", false)) {
switch ($block_id) {
case "photoannotation":
$block = new Block();
$block->css_id = "g-photoannotation";
$block->title = t("Users");
$block->content = new View("photoannotation_block.html");
$block->content->cloud = photoannotation::cloud(30);
$block->content->form = photoannotation::get_user_search_form("g-user-cloud-form");
}
}
return $block;
}
}

2
modules/photoannotation/helpers/photoannotation_event.php
View File

@ -233,7 +233,7 @@ class photoannotation_event_Core {
$item_users = ORM::factory("items_user")->where("item_id", "=", $comment->item_id)->find_all();
if (count($item_users) > 0) {
foreach ($item_users as $item_user) {
photoannotation::send_notifications($item_user->user_id, $comment->item_id, "updatecomment");
photoannotation::send_notifications($item_user->user_id, $comment->item_id, "updatedcomment");
}
}
}

6
modules/photoannotation/helpers/photoannotation_theme.php
View File

@ -19,9 +19,9 @@
*/
class photoannotation_theme_Core {
static function head($theme) {
if ($theme->page_subtype == "photo") {
$theme->css("photoannotation.css");
$theme->script("jquery.annotate.js");
if ($theme->page_subtype == "photo") {
$theme->script("jquery.annotate.min.js");
$noborder = module::get_var("photoannotation", "noborder", false);
$noclickablehover = module::get_var("photoannotation", "noclickablehover", false);
$nohover = module::get_var("photoannotation", "nohover", false);
@ -74,7 +74,7 @@ class photoannotation_theme_Core {
static function admin_head($theme) {
if (strpos($theme->content->kohana_filename, "admin_photoannotation.html.php")) {
$theme->css("colorpicker.css");
$theme->script("colorpicker.js");
$theme->script("jquery.colorpicker.min.js");
}
}

72
modules/photoannotation/js/jquery.annotate.js
View File

@ -25,7 +25,7 @@
this.csrf = opts.csrf;
this.cssaclass = opts.cssaclass;
this.rtlsupport = opts.rtlsupport;
this.users = opts.users
this.users = opts.users;
// Add the canvas
this.canvas = $('<div class="image-annotate-canvas g-thumbnail"><div class="image-annotate-view"></div><div class="image-annotate-edit"><div class="image-annotate-edit-area"></div></div></div>');
@ -65,7 +65,7 @@
}
// Add the "Add a note" button
if ($('#g-photoannotation-link').length != 0) {
if ($('#g-photoannotation-link').length !== 0) {
this.button = $('#g-photoannotation-link');
this.button.click(function() {
$.fn.annotateImage.add(image, opts.tags, opts.labels, opts.saveUrl, opts.csrf, opts.rtlsupport, opts.users);
@ -156,7 +156,7 @@
ok.click(function() {
var form = $('#image-annotate-edit-form form');
var text = $('#image-annotate-text').val();
$.fn.annotateImage.appendPosition(form, editable)
$.fn.annotateImage.appendPosition(form, editable);
image.mode = 'view';
form.submit();
@ -214,6 +214,7 @@
newNote.text = "";
newNote.description = "";
newNote.notetype = "";
newNote.internaltext = "";
this.note = newNote;
}
@ -236,41 +237,12 @@
var selecteduser = "";
if (this.note.notetype == "face") {
selectedtag = this.note.text;
selecteduser = " selected=\"selected\"";
} else if (this.note.notetype == "user") {
username = this.note.text;
username = this.note.internaltext;
} else {
notetitle = this.note.text;
selecteduser = " selected=\"selected\"";
}
var userdropdown = '<select id="photoannotation-user-list" class="dropdown" style="width: 210px;" name="userlist"><option value="-1"' + selecteduser + '>' + labels[11] + '</option>';
for (var user in users)
{
var userval = users[user];
selecteduser = "";
if (userval.name == this.note.text && this.note.notetype == "user") {
selecteduser = " selected=\"selected\"";
}
userdropdown += '<option value="' + userval.id + '"' + selecteduser + '>' + userval.name + '</option>';
}
userdropdown += '</select>';
var form = $('<div id="image-annotate-edit-form" class="ui-dialog-content ui-widget-content ' + rtlsupport + '">\
<form id="photoannotation-form" action="' + saveUrl + '" method="post">\
<input type="hidden" name="csrf" value="' + csrf + '" /><input type="hidden" name="noteid" value="' + this.note.noteid + '" />\
<input type="hidden" name="notetype" value="' + this.note.notetype + '" />\
<fieldset><legend>' + labels[12] + '</legend>\
<label for="photoannotation-user-list">' + labels[10] + '</label>' + userdropdown +
'<div style="text-align: center"><strong>' + labels[4] + '</strong></div>\
<label for="image-annotate-tag-text">' + labels[0] + '</label>\
<input id="image-annotate-tag-text" class="textbox ui-corner-left ui-corner-right" type="text" name="tagsList" style="width: 210px;" value="' + selectedtag + '" />' +
'<div style="text-align: center"><strong>' + labels[4] + '</strong></div><label for="image-annotate-text">' + labels[1] + '</label>\
<input id="image-annotate-text" class="textbox ui-corner-left ui-corner-right" type="text" name="text" style="width: 210px;" value="' + notetitle + '" />\
</fieldset>\
<fieldset><legend>' + labels[2] + '</legend>\
<textarea id="image-annotate-desc" name="desc" rows="3" style="width: 210px;">' + this.note.description + '</textarea></fieldset</form></div>');
var form = $('<div id="image-annotate-edit-form" class="ui-dialog-content ui-widget-content ' + rtlsupport + '"><form id="photoannotation-form" action="' + saveUrl + '" method="post"><input type="hidden" name="csrf" value="' + csrf + '" /><input type="hidden" name="noteid" value="' + this.note.noteid + '" /><input type="hidden" name="notetype" value="' + this.note.notetype + '" /><fieldset><legend>' + labels[12] + '</legend><label for="photoannotation-user-list">' + labels[10] + '</label><input id="photoannotation-user-list" class="textbox ui-corner-left ui-corner-right" type="text" name="userlist" style="width: 210px;" value="' + username + '" /><div style="text-align: center"><strong>' + labels[4] + '</strong></div><label for="image-annotate-tag-text">' + labels[0] + '</label><input id="image-annotate-tag-text" class="textbox ui-corner-left ui-corner-right" type="text" name="tagsList" style="width: 210px;" value="' + selectedtag + '" /><div style="text-align: center"><strong>' + labels[4] + '</strong></div><label for="image-annotate-text">' + labels[1] + '</label><input id="image-annotate-text" class="textbox ui-corner-left ui-corner-right" type="text" name="text" style="width: 210px;" value="' + notetitle + '" /></fieldset><fieldset><legend>' + labels[2] + '</legend><textarea id="image-annotate-desc" name="desc" rows="3" style="width: 210px;">' + this.note.description + '</textarea></fieldset</form></div>');
this.form = form;
$('body').append(this.form);
$("#photoannotation-form").ready(function() {
@ -282,13 +254,23 @@
cacheLength: 1
}
);
var urlusers = users;
$("input#photoannotation-user-list").autocomplete(
urlusers, {
max: 30,
multiple: false,
cacheLength: 1
}
);
});
$("input#image-annotate-tag-text").change(function() {
$("input#image-annotate-tag-text").keyup(function() {
if ($("input#image-annotate-tag-text").val() != "") {
$("input#image-annotate-text").html("");
$("input#image-annotate-text").val("");
$("input#image-annotate-text").text("");
$("select#photoannotation-user-list").val('-1');
$("input#photoannotation-user-list").html("");
$("input#photoannotation-user-list").val("");
$("input#photoannotation-user-list").text("");
}
});
$("input#image-annotate-text").keyup(function() {
@ -296,10 +278,12 @@
$("input#image-annotate-tag-text").html("");
$("input#image-annotate-tag-text").val("");
$("input#image-annotate-tag-text").text("");
$("select#photoannotation-user-list").val('-1');
$("input#photoannotation-user-list").html("");
$("input#photoannotation-user-list").val("");
$("input#photoannotation-user-list").text("");
}
});
$("select#photoannotation-user-list").keyup(function() {
$("input#photoannotation-user-list").keyup(function() {
if ($("select#photoannotation-user-list").val() != "-1") {
$("input#image-annotate-tag-text").html("");
$("input#image-annotate-tag-text").val("");
@ -352,7 +336,7 @@
this.area.css('left', '');
this.area.css('top', '');
this.form.remove();
}
};
$.fn.annotateView = function(image, note, tags, labels, editable, csrf, deleteUrl, saveUrl, cssaclass, rtlsupport, users) {
/// <summary>
@ -394,7 +378,7 @@
close: function(event, ui) { location.reload(); },
buttons: btns
});
})
});
var form = this;
this.editarea.bind('click',function () {
var alink = $(cssaclass);
@ -402,7 +386,7 @@
alink.attr ('href', '#');
alink.removeAttr ('rel');
form.edit(tags, labels, saveUrl, csrf, rtlsupport, users);
})
});
this.delarea.hide();
this.editarea.hide();
}
@ -474,7 +458,7 @@
alink.attr ('href', '#');
alink.removeAttr ('rel');
window.location = note.url;
})
});
}
};
@ -533,7 +517,7 @@
/// </summary>
this.area.remove();
this.form.remove();
}
};
$.fn.annotateView.prototype.edit = function(tags, labels, saveUrl, csrf, rtlsupport, users) {
/// <summary>
@ -560,7 +544,7 @@
'<input type="hidden" value="' + editable.area.position().left + '" name="left"/>' +
'<input type="hidden" value="' + editable.note.id + '" name="id"/>');
form.append(areaFields);
}
};
$.fn.annotateView.prototype.resetPosition = function(editable, text) {
/// <summary>

1
modules/photoannotation/js/jquery.annotate.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
modules/photoannotation/js/colorpicker.js → modules/photoannotation/js/jquery.colorpicker.js
View File

1
modules/photoannotation/js/jquery.colorpicker.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

17
modules/photoannotation/views/photoannotation_block.html.php Normal file
View File

@ -0,0 +1,17 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
$("#g-user-cloud-form").ready(function() {
var url = $("#g-user-cloud").attr("ref") + "/autocomplete";
$("#g-user-cloud-form input:text").autocomplete(
url, {
max: 30,
multiple: false,
cacheLength: 1
}
);
});
</script>
<div id="g-user-cloud" ref="<?= url::site("photoannotation") ?>">
<?= $cloud ?>
</div>
<?= $form ?>

9
modules/photoannotation/views/photoannotation_cloud.html.php Normal file
View File

@ -0,0 +1,9 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<ul>
<? foreach ($users as $user): ?>
<li class="size<?=(int)(($user->size / $max_count) * 7) ?>">
<span><?= $user->size ?> photos are tagged with </span>
<a href="<?= $user->url ?>"><?= html::clean($user->name) ?></a>
</li>
<? endforeach ?>
</ul>

21
modules/photoannotation/views/photoannotation_highlight_block.html.php
View File

@ -9,7 +9,6 @@
$existingNotes = ORM::factory("items_note")
->where("item_id", "=", $item->id)
->find_all();
$users = ORM::factory("user")->order_by("name", "ASC")->find_all();
$fullname = module::get_var("photoannotation", "fullname", false);
$showusers = module::get_var("photoannotation", "showusers", false);
$showfaces = module::get_var("photoannotation", "showfaces", false);
@ -37,8 +36,8 @@
foreach ($existingUsers as $oneUser) {
$oneTag = ORM::factory("user", $oneUser->user_id);
if ($oneTag->loaded()) {
if ($fullname && ($oneTag->full_name != "")) {
$user_text = $oneTag->full_name;
if ($fullname) {
$user_text = $oneTag->display_name();
} else {
$user_text = $oneTag->name;
}
@ -50,6 +49,7 @@
$jscode .= "\"width\": ". ($oneUser->x2 - $oneUser->x1) .",\n";
$jscode .= "\"height\": ". ($oneUser->y2 - $oneUser->y1) .",\n";
$jscode .= "\"text\": \"". html::clean($user_text) ."\",\n";
$jscode .= "\"internaltext\": \"". $oneTag->display_name() ." (". $oneTag->name .")\",\n";
$jscode .= "\"description\": \"". html::clean($oneUser->description) ."\",\n";
$jscode .= "\"noteid\": ". $oneUser->id .",\n";
$jscode .= "\"notetype\": \"user\",\n";
@ -110,19 +110,6 @@
$legend_display = $legend_users . "<br />" . $legend_faces . "<br />" . $legend_notes;
$legend_display = str_replace("<br /><br />", "<br />", $legend_display);
}
$users_arraystring = "users: [ ";
foreach ($users as $user) {
if ($fullname && ($user->full_name != "")) {
$user_text = $user->full_name;
} else {
$user_text = $user->name;
}
if ($user->name != "guest") {
$users_arraystring .= "{'name':'". html::clean($user_text) ."','id':'". $user->id ."'},";
}
}
$users_arraystring = trim($users_arraystring, ",");
$users_arraystring .= " ],";
$labels_arraystring = "labels: [ '". t("Tag:") ."','". t("Note Title:") ."','". t("Description (optional)") ."','". t("Are you sure you want to delete this annotation?") ."','". t("or") ."','". t("Yes") ."','". t("No") ."','". t("Confirm deletion") ."','". t("Save") ."','". t("Cancel") ."','". t("User:") ."','". t("No user selected") ."','". t("Select one of the following") ."' ],";
?>
<script type="text/javascript">
@ -138,7 +125,7 @@
tags: '<?= url::site("tags/autocomplete") ?>',
<?= $labels_arraystring ?>
<?= $jscode ?>
<?= $users_arraystring ?>
users: '<?= url::site("photoannotation/autocomplete") ?>',
rtlsupport: '<?= $rtl_support ?>',
useAjax: false,
cssaclass: '<?= $css_a_class ?>',

55
modules/photoannotation/views/photoannotation_user_search.html.php Normal file
View File

@ -0,0 +1,55 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
$("#g-user-search-form").ready(function() {
var url = $("#g-user-search-results").attr("ref") + "/autocomplete";
$("#g-user-search-form input:text").autocomplete(
url, {
max: 30,
multiple: false,
cacheLength: 1
}
);
});
</script>
<div id="g-user-search-results" ref="<?= url::site("photoannotation") ?>">
<h1><?= t("Search results") ?></h1>
<?= $search_form ?>
<? if (count($users)): ?>
<div class="g-message photoannotation-user-search">
<?= t("%count users found for <b>%term</b>", array("count" => $count, "term" => $q)) ?>
</div>
<? foreach ($users as $user): ?>
<? $profile_link = "<a href=\"". user_profile::url($user->id) ."\">" ?>
<div class="g-block">
<h2><img src="<?= $user->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
alt="<?= html::clean_attribute($user->display_name()) ?>"
class="g-avatar" width="40" height="40" />
<?= $profile_link . $user->name ?></a></h2>
<div>
<table class="g-message">
<tbody>
<tr>
<th style="width: 20%"><?= t("Full name") ?></th>
<td><?= $user->display_name() ?></td>
</tr>
<tr>
<th style="width: 20%"><?= t("Tagged photos") ?></th>
<td colspan="2"><?= photoannotation::annotation_count($user->id) ?></td>
</tr>
<? if (module::is_active("comment")): ?>
<tr>
<th style="width: 20%"><?= t("Comments") ?></th>
<td colspan="2"><?= photoannotation::comment_count($user->id) ?></td>
</tr>
<? endif ?>
</tbody></table>
</div>
</div>
<? endforeach ?>
<?= $paginator ?>
<? else: ?>
<div class="photoannotation-user-search">
<?= t("No users found for <b>%term</b>", array("term" => $q)) ?>
</div>
<? endif; ?>
</div>