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

Version 4 RC: Implemented user search, minified JavaScript

Browse Source
This commit is contained in:
hukoeth 2010-09-08 22:55:33 +08:00 committed by Bharat Mediratta
parent 3c7d2c5218
commit b7ee10fce4
11 changed files with 676 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,50 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class photoannotation_Controller extends Controller {
public function showuser($item_id) {
$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/". $item_id ."?name=". $user_id ."&amp;page=". ($page - 1));
}
if ($page < $max_pages) {
$next_page_url = url::site("photoannotation/showuser/". $item_id ."?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();
@ -37,21 +81,18 @@ class photoannotation_Controller extends Controller {
$redir_uri = url::abs_site("{$item->type}s/{$item->id}");
//If this is a user then get the id
if ($user_id != "") {
$user_parts = explode("(", $user_id);
$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) {
$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 (strcasecmp($user->name, "guest") == 0) {
if ($getuser->isguest) {
message::error(t("You cannot create an annotation for the guest user."));
url::redirect($redir_uri);
return;
}
$user_id = $user->id;
$user_id = $getuser->user->id;
}
//Add tag to item, create tag if not exists

6
modules/photoannotation/css/photoannotation.css
View File

@ -1,4 +1,8 @@
/* Tag cloud ~~~~~~~~~~~~~~~~~~~~~~~ */
.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;

68
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")
@ -202,4 +258,16 @@ class photoannotation_Core {
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();
}
}

4
modules/photoannotation/helpers/photoannotation_block.php
View File

@ -31,8 +31,8 @@ class photoannotation_block_Core {
$block->title = t("Users");
$block->content = new View("photoannotation_block.html");
$block->content->cloud = photoannotation::cloud(30);
$block->content->form = "";
}
$block->content->form = photoannotation::get_user_search_form("g-user-cloud-form");
}
return $block;
}
}

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

@ -21,7 +21,7 @@ class photoannotation_theme_Core {
static function head($theme) {
$theme->css("photoannotation.css");
if ($theme->page_subtype == "photo") {
$theme->script("jquery.annotate.js");
$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");
}
}

37
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();
@ -242,24 +242,7 @@
} else {
notetitle = this.note.text;
}
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>');
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() {
@ -353,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>
@ -395,7 +378,7 @@
close: function(event, ui) { location.reload(); },
buttons: btns
});
})
});
var form = this;
this.editarea.bind('click',function () {
var alink = $(cssaclass);
@ -403,7 +386,7 @@
alink.attr ('href', '#');
alink.removeAttr ('rel');
form.edit(tags, labels, saveUrl, csrf, rtlsupport, users);
})
});
this.delarea.hide();
this.editarea.hide();
}
@ -475,7 +458,7 @@
alink.attr ('href', '#');
alink.removeAttr ('rel');
window.location = note.url;
})
});
}
};
@ -534,7 +517,7 @@
/// </summary>
this.area.remove();
this.form.remove();
}
};
$.fn.annotateView.prototype.edit = function(tags, labels, saveUrl, csrf, rtlsupport, users) {
/// <summary>
@ -561,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

9
modules/photoannotation/views/photoannotation_block.html.php
View File

@ -9,15 +9,6 @@
cacheLength: 1
}
);
$("#g-user-cloud-form").ajaxForm({
dataType: "json",
success: function(data) {
if (data.result == "success") {
$("#g-user-cloud").html(data.cloud);
}
$("#g-add-user-form").resetForm();
}
});
});
</script>
<div id="g-user-cloud" ref="<?= url::site("photoannotation") ?>">

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>