diff options
| author | flop25 <flop25@piwigo.org> | 2013-04-11 13:18:46 +0000 |
|---|---|---|
| committer | flop25 <flop25@piwigo.org> | 2013-04-11 13:18:46 +0000 |
| commit | 0490009705dcef00c7b775e0287a707e0defc15f (patch) | |
| tree | 929d101ef00a95744014662ea546432df3c2589a /admin/themes/default | |
| parent | c22683add2d8dba099d5046c0c4d2ee00e8a1ec5 (diff) | |
bug:2863
display a message on the upload page if "Resized after upload" is checked
git-svn-id: http://piwigo.org/svn/trunk@22135 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes/default')
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 4 | ||||
| -rw-r--r-- | admin/themes/default/theme.css | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index 6794e0407..54186cd64 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -289,6 +289,8 @@ var sizeLimit = Math.round({$upload_max_filesize} / 1024); /* in KBytes */ <fieldset> <legend>{'Select files'|@translate}</legend> + + {if isset($original_resize_maxheight)}<p class="uploadInfo">{'The picture dimensions will be reduced to %dx%d pixels.'|@translate|@sprintf:$original_resize_maxwidth:$original_resize_maxheight}</p>{/if} <p id="uploadWarningsSummary">{$upload_max_filesize_shorthand}B. {$upload_file_types}. {if isset($max_upload_resolution)}{$max_upload_resolution}Mpx{/if} <a class="showInfo" title="{'Learn more'|@translate}">i</a></p> @@ -300,6 +302,8 @@ var sizeLimit = Math.round({$upload_max_filesize} / 1024); /* in KBytes */ {/if} </p> + + {if $upload_mode eq 'html'} <div id="uploadBoxes"></div> <div id="addUploadBox"> diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index dd4a63385..c4ad7923e 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -995,6 +995,7 @@ div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-co #uploadBoxes {margin-top:20px;} #addUploadBox {margin-bottom:2em;} +p.uploadInfo {text-align:left;font-size:90%;color:#999;} p#uploadWarningsSummary {text-align:left;margin-bottom:1em;font-size:90%;color:#999;} p#uploadWarningsSummary .showInfo {position:static;display:inline;padding:1px 6px;margin-left:3px;} p#uploadWarnings {display:none;text-align:left;margin-bottom:1em;font-size:90%;color:#999;} |