Changeset 14546
- Timestamp:
- Apr 30, 2012, 1:58:44 AM (12 years ago)
- Location:
- trunk/admin
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/configuration_watermark_process.inc.php
r14513 r14546 29 29 $errors = array(); 30 30 $pwatermark = $_POST['w']; 31 32 // step 0 - manage upload if any 33 if (isset($_FILES['watermarkImage']) and !empty($_FILES['watermarkImage']['tmp_name'])) 34 { 35 list($width, $height, $type) = getimagesize($_FILES['watermarkImage']['tmp_name']); 36 if (IMAGETYPE_PNG != $type) 37 { 38 $errors['watermarkImage'] = 'PNG'; 39 } 40 else 41 { 42 $upload_dir = PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'watermarks'; 43 44 include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php'); 45 prepare_directory($upload_dir); 46 47 $new_name = get_filename_wo_extension($_FILES['watermarkImage']['name']).'.png'; 48 $file_path = $upload_dir.'/'.$new_name; 49 50 move_uploaded_file($_FILES['watermarkImage']['tmp_name'], $file_path); 51 52 $pwatermark['file'] = substr($file_path, strlen(PHPWG_ROOT_PATH)); 53 } 54 } 31 55 32 56 // step 1 - sanitize HTML input -
trunk/admin/themes/default/template/configuration.tpl
r14514 r14546 34 34 35 35 {if !isset($default)} 36 <form method="post" action="{$F_ACTION}" class="properties" >36 <form method="post" action="{$F_ACTION}" class="properties"{if isset($watermark)} enctype="multipart/form-data"{/if}> 37 37 {/if} 38 38 <div id="configContent"> … … 480 480 } 481 481 }); 482 483 jQuery(".addWatermarkOpen").click(function(){ 484 jQuery("#addWatermark, #selectWatermark").toggle(); 485 }); 482 486 }); 483 487 {/literal}{/footer_script} 484 485 488 486 489 <fieldset id="watermarkConf"> … … 488 491 <ul> 489 492 <li> 490 < label>{'Select a file'|@translate}</label>493 <span id="selectWatermark"{if isset($ferrors.watermarkImage)} style="display:none"{/if}><label>{'Select a file'|@translate}</label> 491 494 <select name="w[file]" id="wSelect"> 492 495 {html_options options=$watermark_files selected=$watermark.file} 493 496 </select> 494 <br>{'... or '|@translate}<a href="#" class="addWatermarkOpen" title="{'add a new watermark'|@translate}">{'add a new watermark'|@translate}</a> 495 <br><img id="wImg"></img> 497 {'... or '|@translate}<a href="#" class="addWatermarkOpen">{'add a new watermark'|@translate}</a> 498 <br><img id="wImg"></img></span>{* #selectWatermark *} 499 <span id="addWatermark"{if isset($ferrors.watermarkImage)} style="display:inline"{/if}> 500 <a href="#" class="addWatermarkOpen">{'add a new watermark'|@translate}</a> (png) 501 <br><input type="file" size="60" id="watermarkImage" name="watermarkImage"{if isset($ferrors.watermarkImage)} class="dError"{/if}> 502 {if isset($ferrors.watermarkImage)}<span class="dErrorDesc" title="{$ferrors.watermarkImage}">!</span>{/if} 503 </span>{* #addWatermark *} 496 504 </li> 497 505 -
trunk/admin/themes/default/theme.css
r14514 r14546 1113 1113 .dErrorDesc {background-color:red; color:white; padding:0 5px;border-radius:10px; font-weight:bold;cursor:help;} 1114 1114 1115 #wImg {max-height:100px;border:2px solid #ccc;} 1115 #wImg {max-height:100px;border:2px solid #ccc;margin-top:5px;} 1116 #addWatermark {display:none;}
Note: See TracChangeset
for help on using the changeset viewer.