- Timestamp:
- Jun 29, 2010, 2:26:43 AM (14 years ago)
- Location:
- trunk/admin
- Files:
-
- 4 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/functions_upload.inc.php
r6617 r6622 142 142 143 143 // update metadata from the uploaded file (exif/iptc) 144 if ($conf['use_exif'] and !function_exists('read_exif_data')) 145 { 146 $conf['use_exif'] = false; 147 } 144 148 update_metadata(array($image_id=>$file_path)); 145 149 -
trunk/admin/photos_add_direct.php
r6620 r6622 444 444 445 445 $setup_errors = array(); 446 $setup_warnings = array(); 446 447 447 448 $error_message = ready_for_upload_message(); … … 454 455 { 455 456 array_push($setup_errors, l10n('GD library is missing')); 457 } 458 459 if ($conf['use_exif'] and !function_exists('read_exif_data')) 460 { 461 array_push( 462 $setup_warnings, 463 l10n('Exif extension not available, admin should disable exif use') 464 ); 456 465 } 457 466 … … 459 468 array( 460 469 'setup_errors'=> $setup_errors, 470 'setup_warnings' => $setup_warnings, 461 471 ) 462 472 ); -
trunk/admin/themes/default/default-layout.css
r6363 r6622 823 823 * Informations box in administration 824 824 */ 825 .infos, .errors {825 .infos, .errors, .warnings { 826 826 text-align: left; 827 827 margin: 5px; … … 846 846 } 847 847 848 .infos li, .errors li { list-style-type:square; } 848 .warnings { 849 color: #ee8800; 850 background-color:#ffdd99; 851 background-image: url(icon/warnings.png); 852 } 853 854 .infos li, .errors li, .warnings li { list-style-type:square; } 849 855 .infos .submit {margin-left:30px;} 850 856 -
trunk/admin/themes/default/template/photos_add_direct.tpl
r6617 r6622 216 216 </div> 217 217 {else} 218 219 {if count($setup_warnings) > 0} 220 <div class="warnings"> 221 <ul> 222 {foreach from=$setup_warnings item=warning} 223 <li>{$warning}</li> 224 {/foreach} 225 </ul> 226 </div> 227 {/if} 228 218 229 219 230 {if !empty($thumbnails)}
Note: See TracChangeset
for help on using the changeset viewer.