Currect the image preview urls. Fixes 48.

This commit is contained in:
Starbeamrainbowlabs 2015-12-16 19:14:09 +00:00
parent f0e18ebf64
commit c6a70e42c5
3 changed files with 5 additions and 5 deletions

View File

@ -2240,14 +2240,14 @@ register_module([
$mime_type = $pageindex->{$env->page}->uploadedfilemime; $mime_type = $pageindex->{$env->page}->uploadedfilemime;
$dimensions = getimagesize($env->storage_prefix . $filepath); $dimensions = getimagesize($env->storage_prefix . $filepath);
$preview_sizes = [ 256, 512, 768, 1024, 1536 ]; $preview_sizes = [ 256, 512, 768, 1024, 1440 ];
$preview_html = "<figure class='preview'> $preview_html = "<figure class='preview'>
<img src='?action=preview&size=$settings->default_preview_size&page=" . rawurlencode($env->page) . "' /> <img src='?action=preview&size=$settings->default_preview_size&page=" . rawurlencode($env->page) . "' />
<nav class='image-controls'> <nav class='image-controls'>
<ul><li><a href='" . ($env->storage_prefix == "./" ? $filepath : "?action=preview&size=original&page=" . rawurlencode($env->page)) . "'>&#x01f304; Original image</a></li> <ul><li><a href='" . ($env->storage_prefix == "./" ? $filepath : "?action=preview&size=original&page=" . rawurlencode($env->page)) . "'>&#x01f304; Original image</a></li>
<li>Other Sizes: "; <li>Other Sizes: ";
foreach($preview_sizes as $size) foreach($preview_sizes as $size)
$preview_html .= "<a href='?action=preview&size='$size>$size" . "px</a> "; $preview_html .= "<a href='?action=preview&page=" . rawurlencode($env->page) . "&size=$size'>$size" . "px</a> ";
$preview_html .= "</li></ul></nav> $preview_html .= "</li></ul></nav>
</figure> </figure>
<h2>File Information</h2> <h2>File Information</h2>

View File

@ -59,7 +59,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File:' prefix.",
"id": "feature-upload", "id": "feature-upload",
"lastupdate": 1447053880, "lastupdate": 1450293208,
"optional": false "optional": false
}, },
{ {

View File

@ -235,14 +235,14 @@ register_module([
$mime_type = $pageindex->{$env->page}->uploadedfilemime; $mime_type = $pageindex->{$env->page}->uploadedfilemime;
$dimensions = getimagesize($env->storage_prefix . $filepath); $dimensions = getimagesize($env->storage_prefix . $filepath);
$preview_sizes = [ 256, 512, 768, 1024, 1536 ]; $preview_sizes = [ 256, 512, 768, 1024, 1440 ];
$preview_html = "<figure class='preview'> $preview_html = "<figure class='preview'>
<img src='?action=preview&size=$settings->default_preview_size&page=" . rawurlencode($env->page) . "' /> <img src='?action=preview&size=$settings->default_preview_size&page=" . rawurlencode($env->page) . "' />
<nav class='image-controls'> <nav class='image-controls'>
<ul><li><a href='" . ($env->storage_prefix == "./" ? $filepath : "?action=preview&size=original&page=" . rawurlencode($env->page)) . "'>&#x01f304; Original image</a></li> <ul><li><a href='" . ($env->storage_prefix == "./" ? $filepath : "?action=preview&size=original&page=" . rawurlencode($env->page)) . "'>&#x01f304; Original image</a></li>
<li>Other Sizes: "; <li>Other Sizes: ";
foreach($preview_sizes as $size) foreach($preview_sizes as $size)
$preview_html .= "<a href='?action=preview&size='$size>$size" . "px</a> "; $preview_html .= "<a href='?action=preview&page=" . rawurlencode($env->page) . "&size=$size'>$size" . "px</a> ";
$preview_html .= "</li></ul></nav> $preview_html .= "</li></ul></nav>
</figure> </figure>
<h2>File Information</h2> <h2>File Information</h2>