List available image sizes.

This commit is contained in:
Solomon Peachy 2008-10-25 12:34:09 -04:00
parent a11fa86ec2
commit 0675e4571a
4 changed files with 17 additions and 21 deletions

View File

@ -40,6 +40,7 @@ For further information about Photo Organizer, see its web site at:
parallelize imports across multiple processors in the near
future.
[add] Remember per-folder/album sort order and view type.
[add] List available image sizes. (will improve this later)
2.36.1 (September 27, 2008)

View File

@ -3116,41 +3116,33 @@ function po_log($msg, $level = PEAR_LOG_NOTICE) {
function emit_files_list($database, $photo_id, $version_id) {
global $po_user;
global $po_options;
global $strings;
$ret = "";
$query = pg_query($database, "select f.size, f.filesize, f.x_res, f.y_res, f.watermark, p.hide_original, p.users, v.original_image_name from files f, photo_version v, photo p where f.version = $version_id and v.identifier = f.version and p.identifier = v.photo order by f.size");
$ret .= "<table class=\"profile\">";
$ret .= emit_th("XXXres");
$ret .= emit_th("XXXfilesize");
$ret .= emit_th("XXXwatermark");
$ret .= emit_th("", "colspan=2");
$ret .= "<div id=\"image_sizes\">$strings[photo_sizes]<ul>";
for ($i = 0 ; $i < pg_num_rows($query); $i++) {
$row = pg_fetch_assoc($query, $i);
if (($row['users'] != $po_user['id']) &&
($po_user['type'] != PO_USER_TYPE_ADMIN) &&
($row['hide_original'] != 'f') &&
($row['size'] == 0)) {
(($row['size'] == 0) || ($row['size'] == 4))) {
continue;
}
$ret .= "<tr>";
$ret .= emit_td("$row[x_res] X $row[y_res]");
$ret .= emit_td($row['filesize']);
$tooltip = "$row[x_res] X $row[y_res] : $row[filesize] bytes ";
if ($row['watermark']) {
$ret .= emit_td($row['watermark']);
} else {
$ret .= emit_td(emit_a(generate_link('photo', $photo_id, array('ver'=>$version_id))));
$tooltip .= " : WM $row[watermark] ";
}
if ($row['size'] == 0) {
$ret .= emit_td($row['original_image_name']);
} else {
$ret .= emit_td(emit_a(generate_link('image', $photo_id, array('ver'=>$version_id, 'size'=>$row['size'])),"XXXview"));
}
$ret .= emit_td(emit_a(generate_link('image', $photo_id, array('ver'=>$version_id, 'size'=>$row['size'], 'down'=>'true')),"XXXdownload"));
$ret .= "</tr>\n";
// if original_image_name != [jpg|jpeg|png]
$ret .= "<li>".emit_a(generate_link('image', $photo_id, array('ver'=>$version_id, 'size'=>$row['size'], 'down'=>'true')),$tooltip) ."</li>";
}
$ret .= "</table>";
$ret .= "</ul></div>";
return $ret;
}

View File

@ -215,6 +215,8 @@ $strings['photo_purchase'] = 'Purchase this image';
$strings['photo_rating_text'] = 'Your score is %s.';
$strings['photo_sizes'] = 'Available sizes';
/* User stuff */
$strings['user_first_name'] = 'First Name';
$strings['user_last_name'] = 'Last Name';

View File

@ -270,7 +270,8 @@ print "</td>\n";
print "</tr>\n</table>";
print "</div>";
// print emit_files_list($database, $photo_id, $version);
if (($po_user['id'] == $owner_id) || ($po_user['type'] == PO_USER_TYPE_ADMIN))
print emit_files_list($database, $photo_id, $version);
/* Generate the photo menu */