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

Bugfix: Legend wouldn't show when adding first annotation to a photo

Browse Source
This commit is contained in:
hukoeth 2010-09-23 18:05:05 +08:00 committed by Bharat Mediratta
parent 0f8daf1a46
commit b5290b154c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,11 +58,6 @@
$jscode .= "\"url\": \"". user_profile::url($oneUser->user_id) ."\" },\n";
}
}
$display = "none";
if ($legend_users != "") {
$display = "block";
}
$legend_users = t("<span id=\"photoannotation-legend-user\" style=\"display: ". $display ."\">People on this photo: ") . $legend_users ."</span>";
foreach ($existingFaces as $oneFace) {
$oneTag = ORM::factory("tag", $oneFace->tag_id);
if ($oneTag->loaded()) {
@ -81,11 +76,6 @@
$jscode .= "\"url\": \"". $oneTag->url() ."\" },\n";
}
}
$display = "none";
if ($legend_faces != "") {
$display = "block";
}
$legend_faces = t("<span id=\"photoannotation-legend-face\" style=\"display: ". $display ."\">Faces on this photo: ") . $legend_faces ."</span>";
foreach ($existingNotes as $oneNote) {
if ($shownotes) {
$legend_notes .= "<span id=\"photoannotation-legend-note-". $oneNote->id . "\">". html::clean($oneNote->title) ."</span> ";
@ -103,12 +93,22 @@
}
$jscode = trim($jscode, ",\n");
$jscode .= " ],";
$display = "none";
if ($legend_notes != "") {
$display = "block";
}
$legend_notes = t("<span id=\"photoannotation-legend-note\" style=\"display: ". $display ."\">Notes on this photo: ") . $legend_notes ."</span>";
}
$display = "none";
if ($legend_users != "") {
$display = "block";
}
$legend_users = t("<span id=\"photoannotation-legend-user\" style=\"display: ". $display ."\">People on this photo: ") . $legend_users ."</span>";
$display = "none";
if ($legend_faces != "") {
$display = "block";
}
$legend_faces = t("<span id=\"photoannotation-legend-face\" style=\"display: ". $display ."\">Faces on this photo: ") . $legend_faces ."</span>";
$display = "none";
if ($legend_notes != "") {
$display = "block";
}
$legend_notes = t("<span id=\"photoannotation-legend-note\" style=\"display: ". $display ."\">Notes on this photo: ") . $legend_notes ."</span>";
$legend_display = $legend_users . $legend_faces . $legend_notes;
$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("Person:") ."','". t("No user selected") ."','". t("Select one of the following") ."','". t("An error ocurred while saving annotation") ."','". t("OK") ."','". t("An error ocurred while deleting annotation") ."','". t("View fullsize") ."' ],";
?>