diff --git a/admin.php b/admin.php index a4afaf6c2..b99f72b40 100644 --- a/admin.php +++ b/admin.php @@ -179,7 +179,6 @@ $template->assign( 'U_RECENT_SET'=> $link_start.'batch_manager&cat=recent', 'U_BATCH'=> $link_start.'batch_manager', 'U_TAGS'=> $link_start.'tags', - 'U_THUMBNAILS'=> $link_start.'thumbnail', 'U_USERS'=> $link_start.'user_list', 'U_GROUPS'=> $link_start.'group_list', 'U_PERMALINKS'=> $link_start.'permalinks', diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index aa019ef4a..7eb833898 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -415,7 +415,6 @@ DELETE $updates[$field] = $value; } save_upload_form_config($updates); - $template->delete_compiled_templates(); } trigger_action('element_set_global_action', $action, $collection); @@ -758,12 +757,6 @@ $template->assign( ) ); -function regenerateThumbnails_prefilter($content, $smarty) -{ - return str_replace('{$thumbnail.TN_SRC}', '{$thumbnail.TN_SRC}?rand='.md5(uniqid(rand(), true)), $content); -} -$template->set_prefilter('batch_manager_global', 'regenerateThumbnails_prefilter'); - trigger_action('loc_end_element_set_global'); //----------------------------------------------------------- sending html code diff --git a/admin/include/functions.php b/admin/include/functions.php index a863d6679..2696292ab 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -2015,7 +2015,6 @@ function get_active_menu($menu_page) case 'stats': case 'history': case 'maintenance': - case 'thumbnail': case 'comments': case 'updates': return 4; diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 393cf7157..f4e52cb2c 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -70,9 +70,6 @@ jQuery(document).ready(function(){ldelim}
  • {'Site manager'|@translate}
    • {/if}
  • {'History'|@translate}
    • -{if $ENABLE_SYNCHRONIZATION} -
  • {'Thumbnails'|@translate}
    • -{/if}
  • {'Maintenance'|@translate}
    • {if isset($U_PENDING_COMMENTS)}
  • {'Pending Comments'|@translate}
    • diff --git a/admin/themes/default/template/thumbnail.tpl b/admin/themes/default/template/thumbnail.tpl deleted file mode 100644 index b02e80bfa..000000000 --- a/admin/themes/default/template/thumbnail.tpl +++ /dev/null @@ -1,162 +0,0 @@ -{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'} - -{footer_script} -var width_str = '{'Width'|@translate}'; -var height_str = '{'Height'|@translate}'; -var max_width_str = '{'Maximum Width'|@translate}'; -var max_height_str = '{'Maximum Height'|@translate}'; -var remaining = '{'photos without thumbnail (jpeg and png only)'|@translate}'; -var todo = {$TOTAL_NB_REMAINING}; -var done = 0; - -{literal} -var queuedManager = $.manageAjax.create('queued', { - queue: true, - cacheResponse: false, - maxRequests: 3, - complete: function() { - jQuery("#thumb_remaining").text(todo-(++done) + ' ' + remaining); - if (todo == done) { - jQuery('.waiting_bar, #thumb_remaining, .properties').hide(); - } - } -}); - -function processThumbs(width,height,crop,follow_orientation) { - jQuery('tr.nothumb').each(function() { - var image_path = jQuery(this).find('td.filepath').text(); - var td=this; - queuedManager.add({ - type: 'GET', - url: 'ws.php', - data: { - method: 'pwg.images.resizeThumbnail', - image_path: image_path, - maxwidth: width, - maxheight: height, - crop: crop, - follow_orientation: follow_orientation, - format:'json' - }, - dataType: 'json', - success: (function(row) { return function(data) { - if (data.stat =='ok') { - if (todo < 200) - jQuery(row).find('td.thumbpic').html(''); - jQuery(row).find('td.thumbdim').html(""+data.result.width+" x "+data.result.height); - jQuery(row).find('td.thumbgentime').html(""+data.result.time); - jQuery(row).find('td.thumbsize').html(""+data.result.size); - jQuery(row).removeClass("nothumb"); - } else { - jQuery(row).find('td.thumbdim').html('#ERR#'+data.err+"# : "+data.message); - jQuery(row).removeClass("nothumb"); - jQuery(row).addClass("error"); - } - } - })(td) - }); - }); -} - -function toggleCropFields() { - if (jQuery("#thumb_crop").is(':checked')) { - jQuery("label[for='thumb_maxwidth']").text(width_str); - jQuery("label[for='thumb_maxheight']").text(height_str); - jQuery("#thumb_follow_orientation_li").show(); - } - else { - jQuery("label[for='thumb_maxwidth']").text(max_width_str); - jQuery("label[for='thumb_maxheight']").text(max_height_str); - jQuery("#thumb_follow_orientation_li").hide(); - } -} - -jQuery(document).ready(function(){ - jQuery('input#proceed').click (function () { - var width = jQuery('input[name="thumb_maxwidth"]').val(); - var height = jQuery('input[name="thumb_maxheight"]').val(); - var crop = jQuery('#thumb_crop').is(':checked'); - var follow_orientation = jQuery('#thumb_follow_orientation').is(':checked'); - jQuery(".waiting_bar").toggle(); - if (todo < 200) - jQuery('.thumbpic').show(); - jQuery('.thumbgentime, .thumbsize, .thumbdim').show(); - processThumbs(width,height,crop,follow_orientation); - }); - - toggleCropFields(); - jQuery("#thumb_crop").click(function () {toggleCropFields()}); - - jQuery('.thumbpic, .thumbgentime, .thumbsize, .thumbdim').hide(); -}); -{/literal}{/footer_script} - -
    -

    {'Thumbnail creation'|@translate}

    -
    - -{if !empty($remainings) } -
    - -
    - {'Thumbnail creation'|@translate} - - -
    - -

    - -
    - -
    {$TOTAL_NB_REMAINING} {'photos without thumbnail (jpeg and png only)'|@translate}
    - - - - - - - - - - - - {foreach from=$remainings item=elt name=remain_loop} - - - - - - - - - - - {/foreach} -
     {'Path'|@translate}{'Filesize'|@translate}{'Dimensions'|@translate}{'Thumbnail'|@translate}{'generated in'|@translate}{'Filesize'|@translate}{'Dimensions'|@translate}
    {$smarty.foreach.remain_loop.iteration}{$elt.PATH}{$elt.FILESIZE_IMG}{$elt.WIDTH_IMG} x {$elt.HEIGHT_IMG}   
    -{else} -

    -{'No missing thumbnail'|@translate}

    -{'If you want to regenerate thumbnails, please go to the Batch Manager.'|@translate|@sprintf:"admin.php?page=batch_manager"} -

    -{/if} \ No newline at end of file diff --git a/admin/thumbnail.php b/admin/thumbnail.php deleted file mode 100644 index 7ccea0536..000000000 --- a/admin/thumbnail.php +++ /dev/null @@ -1,140 +0,0 @@ - $param) -{ - $param_name = 'upload_form_'.$param_shortname; - $form_values[$param_shortname] = $conf[$param_name]; -} - -// +-----------------------------------------------------------------------+ -// | search pictures without thumbnails | -// +-----------------------------------------------------------------------+ -$wo_thumbnails = array(); - -// what is the directory to search in ? -$query = ' -SELECT galleries_url FROM '.SITES_TABLE.' - WHERE galleries_url NOT LIKE \'http://%\' -;'; -$result = pwg_query($query); -while ( $row=pwg_db_fetch_assoc($result) ) -{ - $basedir = preg_replace('#/*$#', '', $row['galleries_url']); - $fs = get_fs($basedir); - - // because isset is one hundred time faster than in_array - $fs['thumbnails'] = array_flip($fs['thumbnails']); - - foreach ($fs['elements'] as $path) - { - // only pictures need thumbnails - if (in_array(get_extension($path), $conf['picture_ext'])) - { - $dirname = dirname($path); - $filename = basename($path); - - // only files matching the authorized filename pattern can be considered - // as "without thumbnail" - if (!preg_match('/^[a-zA-Z0-9-_.]+$/', $filename)) - { - continue; - } - - // searching the element - $filename_wo_ext = get_filename_wo_extension($filename); - $tn_ext = ''; - $base_test = $dirname.'/'.$conf['dir_thumbnail'].'/'; - $base_test.= $conf['prefix_thumbnail'].$filename_wo_ext.'.'; - foreach ($conf['picture_ext'] as $ext) - { - if (isset($fs['thumbnails'][$base_test.$ext])) - { - $tn_ext = $ext; - break; - } - } - - if (empty($tn_ext)) - { - array_push($wo_thumbnails, $path); - } - } - } // next element -} // next site id - -// +-----------------------------------------------------------------------+ -// | form & pictures without thumbnails display | -// +-----------------------------------------------------------------------+ -$template->set_filenames( array('thumbnail'=>'thumbnail.tpl') ); - -if (count($wo_thumbnails) > 0) -{ - foreach ($wo_thumbnails as $path) - { - list($width, $height) = getimagesize($path); - $size = floor(filesize($path) / 1024).' KB'; - - $template->append( - 'remainings', - array( - 'PATH'=>$path, - 'FILESIZE_IMG'=>$size, - 'WIDTH_IMG'=>$width, - 'HEIGHT_IMG'=>$height, - ) - ); - } -} - -foreach (array_keys($upload_form_config) as $field) -{ - if (is_bool($upload_form_config[$field]['default'])) - { - $form_values[$field] = $form_values[$field] ? 'checked="checked"' : ''; - } -} - -$template->assign( - array( - 'F_ACTION' => get_root_url().'admin.php?page=thumbnail', - 'values' => $form_values, - 'TOTAL_NB_REMAINING' => count($wo_thumbnails), - 'U_HELP' => get_root_url().'admin/popuphelp.php?page=thumbnail', - ) -); - -$template->assign_var_from_handle('ADMIN_CONTENT', 'thumbnail'); -?> diff --git a/comments.php b/comments.php index a2582eb2d..d1f1a27ec 100644 --- a/comments.php +++ b/comments.php @@ -116,7 +116,7 @@ if (isset($_GET['cat']) and 0 != $_GET['cat']) { $category_ids = array(-1); } - + $page['where_clauses'][] = 'category_id IN ('.implode(',', $category_ids).')'; } @@ -413,7 +413,7 @@ if (count($comments) > 0) // retrieving element informations $elements = array(); $query = ' -SELECT id, name, file, path, representative_ext +SELECT * FROM '.IMAGES_TABLE.' WHERE id IN ('.implode(',', $element_ids).') ;'; @@ -455,7 +455,7 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id } // source of the thumbnail picture - $thumbnail_src = DerivativeImage::thumb_url( $elements[$comment['image_id']] ); + $src_image = new SrcImage($elements[$comment['image_id']]); // link to the full size picture $url = make_picture_url( @@ -469,7 +469,7 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id $tpl_comment = array( 'ID' => $comment['comment_id'], 'U_PICTURE' => $url, - 'TN_SRC' => $thumbnail_src, + 'src_image' => $src_image, 'ALT' => $name, 'AUTHOR' => trigger_event('render_comment_author', $comment['author']), 'DATE'=>format_date($comment['date'], true), @@ -509,11 +509,11 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id if (isset($edit_comment) and ($comment['comment_id'] == $edit_comment)) { - $tpl_comment['IN_EDIT'] = true; - $key = get_ephemeral_key(2, $comment['image_id']); - $tpl_comment['KEY'] = $key; - $tpl_comment['IMAGE_ID'] = $comment['image_id']; - $tpl_comment['CONTENT'] = $comment['content']; + $tpl_comment['IN_EDIT'] = true; + $key = get_ephemeral_key(2, $comment['image_id']); + $tpl_comment['KEY'] = $key; + $tpl_comment['IMAGE_ID'] = $comment['image_id']; + $tpl_comment['CONTENT'] = $comment['content']; } } @@ -534,6 +534,9 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id } } +$derivative_params = trigger_event('get_comments_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); +$template->assign( 'derivative_params', $derivative_params ); + // include menubar $themeconf = $template->get_template_vars('themeconf'); if (!isset($themeconf['hide_menu_on']) OR !in_array('theCommentsPage', $themeconf['hide_menu_on'])) diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php index f29303ac9..c8b728e5a 100644 --- a/include/category_cats.inc.php +++ b/include/category_cats.inc.php @@ -374,7 +374,7 @@ if (count($categories) > 0) $tpl_thumbnails_var[] = $tpl_var; } - $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_SMALL) ); + $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_THUMB) ); $tpl_thumbnails_var = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var, $categories); $template->assign( array( 'category_thumbnails' => $tpl_thumbnails_var, diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php index c9720f488..89e9e9db7 100644 --- a/language/ar_SA/admin.lang.php +++ b/language/ar_SA/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'لتنسيق الملف'; $lang['No missing thumbnail'] = 'لا حاجة لاعادة صنع مصغرات في الوقت الحالي'; $lang['Photo unreachable or no support'] = 'صور لا يمكن الوصول لها او لم تدعم'; $lang['GD version'] = 'GD أصدار'; -$lang['Miniaturization parameters'] = 'تصغير البارامترات'; $lang['generated in'] = 'إنشأت في ..'; $lang['Results of miniaturization'] = 'نتائج التصغير'; $lang['General statistics'] = 'الاحصائيات العامة'; diff --git a/language/ca_ES/admin.lang.php b/language/ca_ES/admin.lang.php index 3b1b51452..c63a9e1db 100644 --- a/language/ca_ES/admin.lang.php +++ b/language/ca_ES/admin.lang.php @@ -351,7 +351,6 @@ $lang['for the file format'] = 'per al format de fitxer'; $lang['No missing thumbnail'] = 'No missing thumbnail'; $lang['Photo unreachable or no support'] = 'Imatge inaccessible o no soportada'; $lang['GD version'] = 'versió GD'; -$lang['Miniaturization parameters'] = 'Paràmetres de miniaturització'; $lang['generated in'] = 'generat en'; $lang['Results of miniaturization'] = 'Resultats de la miniaturització'; $lang['General statistics'] = 'Estadístiques generals'; diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php index 69d1fa0e7..58473c151 100644 --- a/language/cs_CZ/admin.lang.php +++ b/language/cs_CZ/admin.lang.php @@ -349,7 +349,6 @@ $lang['for the file format'] = 'pro formát souboru'; $lang['No missing thumbnail'] = 'Nechybí žádný náhled'; $lang['Photo unreachable or no support'] = 'Fotografie není dostupná nebo podporovaná'; $lang['GD version'] = 'Verze GD knihovny'; -$lang['Miniaturization parameters'] = 'Parametry miniaturizace'; $lang['generated in'] = 'generováno během'; $lang['Results of miniaturization'] = 'Výsledky miniaturizace'; $lang['General statistics'] = 'Celková statistika'; diff --git a/language/da_DK/admin.lang.php b/language/da_DK/admin.lang.php index 9562a6b32..30fe7b0ae 100644 --- a/language/da_DK/admin.lang.php +++ b/language/da_DK/admin.lang.php @@ -350,7 +350,6 @@ $lang['for the file format'] = 'For filformatet'; $lang['No missing thumbnail'] = 'Ingen manglende thumbnail'; $lang['Photo unreachable or no support'] = 'Picture utilgængelig eller ikke understøttet format'; $lang['GD version'] = 'GD version'; -$lang['Miniaturization parameters'] = 'Miniaturisering parametre'; $lang['generated in'] = 'Genereret i'; $lang['Results of miniaturization'] = 'Miniaturisering proces resultater'; $lang['General statistics'] = 'General statistikker'; diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php index cd1225cbf..4d65458bc 100644 --- a/language/de_DE/admin.lang.php +++ b/language/de_DE/admin.lang.php @@ -344,7 +344,6 @@ $lang['for the file format'] = 'für das Format der Datei'; $lang['No missing thumbnail'] = 'Kein Vorschaubild fehlt'; $lang['Photo unreachable or no support'] = 'Foto unerreichbar oder nicht unterstützt'; $lang['GD version'] = 'Version von GD Library'; -$lang['Miniaturization parameters'] = 'Einstellungen für die Vorschaubilderstellung'; $lang['generated in'] = 'generiert in'; $lang['Results of miniaturization'] = 'Ergebnis der Vorschaubilderstellung'; $lang['General statistics'] = 'Allgemeine Statistiken'; diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 23940df59..dc041b02f 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -320,7 +320,6 @@ $lang['GD version'] = "GD version"; $lang['General statistics'] = "General statistics"; $lang['generate file listing.xml on remote site'] = "generate file listing.xml on the remote site"; $lang['generate listing'] = "generate listing"; -$lang['generated in'] = "generated in"; $lang['Get Support on Piwigo Forum'] = 'Get support on Piwigo forum'; $lang['Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'] = 'Give write access (chmod 777) to "%s" directory at the root of your Piwigo installation'; $lang['global mode'] = "global mode"; @@ -349,8 +348,6 @@ $lang['hide details'] = 'hide details'; $lang['Hide'] = "Hide"; $lang['High definition enabled'] = "High definition enabled"; $lang['High definition'] = "High definition"; -$lang['High dimensions'] = 'High resolution dimensions'; -$lang['High filesize'] = "High resolution filesize"; $lang['high'] = "high"; $lang['History'] = "History"; $lang['Hit'] = "Hit"; @@ -359,7 +356,6 @@ $lang['Hoverbox display'] = "Hoverbox display"; $lang['I decide to update anyway'] = 'I decide to update anyway'; $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'; $lang['If you encounter problems or have any question, please send a message to'] = "If you encounter problems or have any question, please send a message to"; -$lang['If you want to regenerate thumbnails, please go to the Batch Manager.'] = 'If you want to regenerate thumbnails, please go to the Batch Manager.'; $lang['Ignore All'] = 'Ignore All'; $lang['Ignore selected anomalies'] = "Ignore selected anomalies"; $lang['Ignore this update'] = 'Ignore this update'; @@ -439,11 +435,8 @@ $lang['Manage this set of %d photos'] = 'Manage this set of %d photos'; $lang['Manage'] = "Manage"; $lang['Manual order'] = 'Manual order'; $lang['manual order'] = 'manual order'; -$lang['max time'] = "max time"; $lang['Maximum file size: %sB.'] = 'Maximum file size: %sB.'; -$lang['maximum height'] = "Maximum height"; $lang['Maximum Height'] = 'Maximum height'; -$lang['maximum width'] = "Maximum width"; $lang['Maximum Width'] = 'Maximum Width'; $lang['Members'] = "Members"; $lang['Menu Management'] = 'Menus'; @@ -451,8 +444,6 @@ $lang['Merge selected tags'] = 'Merge selected tags'; $lang['Merge tags'] = 'Merge tags'; $lang['Metadata synchronization results'] = "Metadata synchronization results"; $lang['Metadata synchronized from file'] = "Metadata synchronized from file"; -$lang['min time'] = "min time"; -$lang['Miniaturization parameters'] = "Miniaturization parameters"; $lang['Minimum privacy level'] = "Minimum privacy level"; $lang['Miscellaneous'] = 'Miscellaneous'; $lang['Missing a temporary folder'] = 'Missing a temporary folder'; @@ -474,7 +465,6 @@ $lang['No destination tag selected'] = 'No destination tag selected'; $lang['No display'] = "No display"; $lang['No file was uploaded'] = 'No file was uploaded'; $lang['No mail to send.'] = "No mail to be sent."; -$lang['No missing thumbnail'] = "No missing thumbnail"; $lang['No photo can be deleted'] = "No photo can be deleted"; $lang['No photo in the current set.'] = 'No photo in the current set.'; $lang['No photo in this album'] = "No photo in this album"; @@ -544,7 +534,6 @@ $lang['Photos generation in progress...'] = 'Photos generation in progress...'; $lang['photos informations synchronized with files metadata'] = "photos informations synchronized with files metadata"; $lang['photos per page'] = "photos per page"; $lang['photos updated in the database'] = "photos updated in the database"; -$lang['photos without thumbnail (jpeg and png only)'] = "photos without thumbnail (jpeg and png only)"; $lang['Photos'] = "Photos"; $lang['Piwigo Administration'] = "Piwigo Administration"; $lang['Piwigo Announcements Newsletter'] = "Piwigo Announcement Newsletter"; @@ -619,7 +608,6 @@ $lang['Reset ignored updates'] = 'Reset ignored updates'; $lang['Resize'] = 'Resize'; $lang['Restore default configuration. You will lose your plugin settings!'] = "Restore default configuration. You will lose your plugin settings!"; $lang['Restore'] = "Restore"; -$lang['Results of miniaturization'] = "Miniaturization process results"; $lang['Save order'] = "Save order"; $lang['Save page visits by administrators'] = "Record pages visited by administrators"; $lang['Save page visits by guests'] = "Record pages visited by guests"; @@ -734,7 +722,6 @@ $lang['This name is already used by another group.'] = "This name is already use $lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'THIS PLUGIN IS NOW PART OF PIWIGO CORE! UNINSTALL IT NOW!'; $lang['This site already exists'] = "This site already exists"; $lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated'; -$lang['Thumbnail creation'] = "Thumbnail creation"; $lang['Thumbnail'] = "Thumbnail"; $lang['Thumbnails generation in progress...'] = 'Thumbnails generation in progress...'; $lang['Time to send mail is limited. Others mails are skipped.'] = "The time to send mail is limited. Others mails have been skipped."; diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index 9ae20edbb..234de6403 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -341,7 +341,6 @@ $lang['for the file format'] = 'para el formato de archivo'; $lang['No missing thumbnail'] = 'No falta ninguna miniatura'; $lang['Photo unreachable or no support'] = 'foto inaccesible o no soportada'; $lang['GD version'] = 'versión de GD'; -$lang['Miniaturization parameters'] = 'Parámetro de miniaturización'; $lang['generated in'] = 'generada en'; $lang['Results of miniaturization'] = 'Los resultados de la miniaturización'; $lang['General statistics'] = 'Estadísticas generales'; diff --git a/language/fa_IR/admin.lang.php b/language/fa_IR/admin.lang.php index 0a5e06156..b55e748d4 100644 --- a/language/fa_IR/admin.lang.php +++ b/language/fa_IR/admin.lang.php @@ -349,7 +349,6 @@ $lang['for the file format'] = "برای نوع فایل(file format)"; $lang['No missing thumbnail'] = "No missing thumbnail"; $lang['Photo unreachable or no support'] = "تصاویر غیرقابل دسترسی یا بدون پشتیبانی سیستم"; $lang['GD version'] = "نصخه GD"; -$lang['Miniaturization parameters'] = "پارامترهای کوچک کردن"; $lang['generated in'] = "تولید در"; $lang['Results of miniaturization'] = "نتیج پردازش کوچک‌سازی"; $lang['General statistics'] = "آمار عمومی"; diff --git a/language/fr_CA/admin.lang.php b/language/fr_CA/admin.lang.php index 4279260e1..ce10dfa9f 100644 --- a/language/fr_CA/admin.lang.php +++ b/language/fr_CA/admin.lang.php @@ -350,7 +350,6 @@ $lang['for the file format'] = "pour le format de fichier"; $lang['No missing thumbnail'] = "Aucune miniature ne manque"; $lang['Photo unreachable or no support'] = "Image inaccessible ou format non supporté"; $lang['GD version'] = "version de GD"; -$lang['Miniaturization parameters'] = "Paramètre de miniaturisation"; $lang['generated in'] = "générée en"; $lang['Results of miniaturization'] = "Résultats de la miniaturisation"; $lang['General statistics'] = "Statistiques générales"; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 95d945440..b01a5b642 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -348,7 +348,6 @@ $lang['for the file format'] = "pour le format de fichier"; $lang['No missing thumbnail'] = "Aucune miniature ne manque"; $lang['Photo unreachable or no support'] = 'Photo inaccessible ou format non supporté'; $lang['GD version'] = "version de GD"; -$lang['Miniaturization parameters'] = "Paramètre de miniaturisation"; $lang['generated in'] = "générée en"; $lang['Results of miniaturization'] = "Résultats de la miniaturisation"; $lang['General statistics'] = "Statistiques générales"; diff --git a/language/he_IL/admin.lang.php b/language/he_IL/admin.lang.php index 4d9ed77c7..d10d0780d 100644 --- a/language/he_IL/admin.lang.php +++ b/language/he_IL/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'עבור פורמט קובץ'; $lang['No missing thumbnail'] = 'אין תמונה חסר'; $lang['Photo unreachable or no support'] = 'תמונה בפורמט נגיש או נתמך'; $lang['GD version'] = 'גרסת ה '; -$lang['Miniaturization parameters'] = 'המזעור הפרמטרים'; $lang['generated in'] = 'נוצר ב'; $lang['Results of miniaturization'] = 'תהליך המזעור תוצאות'; $lang['General statistics'] = 'סטטיסטיקה'; diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php index b761f137a..199e1f00b 100644 --- a/language/hr_HR/admin.lang.php +++ b/language/hr_HR/admin.lang.php @@ -342,7 +342,6 @@ $lang['for the file format'] = 'za zapisni oblik'; $lang['No missing thumbnail'] = 'Nema nedostajućih poveznih sličica'; $lang['Photo unreachable or no support'] = 'Slika nedohvatna ili bez podrške'; $lang['GD version'] = 'GD inačica'; -$lang['Miniaturization parameters'] = 'Postavke umanjivanja'; $lang['generated in'] = 'izrađena u'; $lang['Results of miniaturization'] = 'ishodi umanjivanja'; $lang['General statistics'] = 'Glavna statistika'; diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php index b16eaa311..84cabffd7 100644 --- a/language/hu_HU/admin.lang.php +++ b/language/hu_HU/admin.lang.php @@ -343,7 +343,6 @@ $lang['for the file format'] = 'fájl formátum'; $lang['No missing thumbnail'] = 'Nincs hiányzó bélyegkép'; $lang['Photo unreachable or no support'] = 'Kép nem elérhető, vagy formátuma nem támogatott'; $lang['GD version'] = 'GD verzió'; -$lang['Miniaturization parameters'] = 'Kicsinyítési paraméterek'; $lang['generated in'] = 'létrehozva'; $lang['Results of miniaturization'] = 'Kicsinyítés eredménye'; $lang['General statistics'] = 'Általános statisztika'; @@ -827,7 +826,6 @@ $lang['An error has occured during upgrade.'] = 'Hiba történt frissítés köz $lang['An error has occured during extract. Please check files permissions of your piwigo installation.
    Click here to show log error.'] = 'Hibajelentés (Információ). Kérjük ellenőrizze a telepített fájlok jogosultságait.
    További információkért kattintson ide.'; $lang['Piwigo cannot retrieve upgrade file from server'] = 'Nem tudom letölteni a frissítést a Piwigo fájl szerverről'; $lang['Zoom'] = 'Zoom'; - $lang['High dimensions'] = 'Nagy méret'; $lang['Downloads'] = 'Letöltés'; $lang['Photo name'] = 'Képnév'; diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php index 1cedb52df..59ab8e4eb 100644 --- a/language/it_IT/admin.lang.php +++ b/language/it_IT/admin.lang.php @@ -349,7 +349,6 @@ $lang['for the file format'] = 'per il formato del file'; $lang['No missing thumbnail'] = 'Nessuna miniatura mancante'; $lang['Photo unreachable or no support'] = 'Foto non trovata o non supportata'; $lang['GD version'] = 'versione GD'; -$lang['Miniaturization parameters'] = 'Parametri di miniaturizzazione'; $lang['generated in'] = 'generata in'; $lang['Results of miniaturization'] = 'Risultati della miniaturizzazione'; $lang['General statistics'] = 'Statistiche generali'; diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php index a2cb4a2c8..aef146fa0 100644 --- a/language/ja_JP/admin.lang.php +++ b/language/ja_JP/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'ファイルフォーマット'; $lang['No missing thumbnail'] = '不明なサムネイルはありません。'; $lang['Photo unreachable or no support'] = '写真にアクセスできないか、次の内容がサポートされていません:'; $lang['GD version'] = 'GDバージョン'; -$lang['Miniaturization parameters'] = '縮小化パラメータ'; $lang['generated in'] = '生成時間'; $lang['Results of miniaturization'] = '縮小化の結果'; $lang['General statistics'] = '一般統計'; diff --git a/language/ka_GE/admin.lang.php b/language/ka_GE/admin.lang.php index 78c249fa7..83013d837 100644 --- a/language/ka_GE/admin.lang.php +++ b/language/ka_GE/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'ფაილის ფორმატისა $lang['No missing thumbnail'] = 'მინიატურები აქვს ყველა ფოტოს'; $lang['Photo unreachable or no support'] = 'ფოტო მიუწვდომელია ან არ არის მისი ფორმატის მხარდაჭერა'; $lang['GD version'] = 'ვერსია GD'; -$lang['Miniaturization parameters'] = 'მინიატურიზაციის პარამეტრები'; $lang['generated in'] = 'გენერირებულია'; $lang['Results of miniaturization'] = 'მინიატურიზაციის რეზულტატი'; $lang['General statistics'] = 'საერთო სტატისტიკა'; diff --git a/language/lv_LV/admin.lang.php b/language/lv_LV/admin.lang.php index dc0588674..77947ed5e 100644 --- a/language/lv_LV/admin.lang.php +++ b/language/lv_LV/admin.lang.php @@ -345,7 +345,6 @@ $lang['for the file format'] = 'faila formātam'; $lang['No missing thumbnail'] = 'Piktogrammas ir visiem attēliem'; $lang['Photo unreachable or no support'] = 'foto nesasniedzams vai bez atbalsta'; $lang['GD version'] = 'GD versija'; -$lang['Miniaturization parameters'] = 'Miniaturizēšanas parametri'; $lang['generated in'] = 'uzģenerēts '; $lang['Results of miniaturization'] = 'Miniaturizācijas procesa rezultāti'; $lang['General statistics'] = 'Vispārējā statistika'; diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index 533b23e7e..60837b2a0 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -344,7 +344,6 @@ $lang['for the file format'] = 'voor het bestandsformaat'; $lang['No missing thumbnail'] = 'Geen ontbrekende mini-afbeelding'; $lang['Photo unreachable or no support'] = 'Afbeelding is niet bereikbaar of er is geen support'; $lang['GD version'] = 'GD versie'; -$lang['Miniaturization parameters'] = 'Miniatuur parameters'; $lang['generated in'] = 'gegenereerd in'; $lang['Results of miniaturization'] = 'Resultaat van verkleinen'; $lang['General statistics'] = 'Algemene statistieken'; @@ -838,6 +837,5 @@ $lang['Predefined filter'] = 'Voorgedefinieerd filter'; $lang['With no album'] = 'Zonder album'; $lang['With no tag'] = 'Zonder tag'; $lang['With no virtual album'] = 'Zonder virtueel album'; - $lang['Photo name'] = 'Naam van afbeelding'; ?> \ No newline at end of file diff --git a/language/no_NO/admin.lang.php b/language/no_NO/admin.lang.php index 82befecba..9cadaf66e 100644 --- a/language/no_NO/admin.lang.php +++ b/language/no_NO/admin.lang.php @@ -346,7 +346,6 @@ $lang['for the file format'] = 'for fil format'; $lang['No missing thumbnail'] = 'Ingen manglende miniatyrbilder'; $lang['Photo unreachable or no support'] = 'Bilde ikke tilgjengelig eller i feil filformat'; $lang['GD version'] = 'GD versjon'; -$lang['Miniaturization parameters'] = 'Miniatyr parameter'; $lang['generated in'] = 'generert på'; $lang['Results of miniaturization'] = 'Miniatyr prosess resultat'; $lang['General statistics'] = 'Generell statistikk'; diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php index c962b9eba..491b049e4 100644 --- a/language/pl_PL/admin.lang.php +++ b/language/pl_PL/admin.lang.php @@ -344,7 +344,6 @@ $lang['for the file format'] = 'dla typu pliku'; $lang['No missing thumbnail'] = 'Aktualnie nie ma brakujących miniatur'; $lang['Photo unreachable or no support'] = 'Obraz niedostępny lub brak wsparcia'; $lang['GD version'] = 'Wersja GD'; -$lang['Miniaturization parameters'] = 'Parametry tworzenia miniatur'; $lang['generated in'] = 'wygenerowane w'; $lang['Results of miniaturization'] = 'Wyniki tworzenia miniatur'; $lang['General statistics'] = 'Ogólne statystyki'; diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php index 2c9b8e0b9..31614aa0a 100644 --- a/language/pt_BR/admin.lang.php +++ b/language/pt_BR/admin.lang.php @@ -346,7 +346,6 @@ $lang['for the file format'] = 'para o formato de arquivo'; $lang['No missing thumbnail'] = 'Nenhuma miniatura faltando'; $lang['Photo unreachable or no support'] = 'Imagem não alcançável ou nenhum suporte'; $lang['GD version'] = 'versão GD'; -$lang['Miniaturization parameters'] = 'Parâmetros da miniaturização'; $lang['generated in'] = 'gerado em'; $lang['Results of miniaturization'] = 'Resultados da miniaturização'; $lang['General statistics'] = 'Estatísticas gerais'; diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php index 23f258edf..df870819a 100644 --- a/language/pt_PT/admin.lang.php +++ b/language/pt_PT/admin.lang.php @@ -346,7 +346,6 @@ $lang['for the file format'] = 'para o formato de ficheiro'; $lang['No missing thumbnail'] = 'Nenhuma miniatura em falta'; $lang['Photo unreachable or no support'] = 'Foto não alcançável ou sem suporte'; $lang['GD version'] = 'versão GD'; -$lang['Miniaturization parameters'] = 'Parâmetros da miniaturização'; $lang['generated in'] = 'gerado em'; $lang['Results of miniaturization'] = 'Resultados da miniaturização'; $lang['General statistics'] = 'Estatísticas gerais'; diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php index 5cf69d65e..0578a71a2 100644 --- a/language/ru_RU/admin.lang.php +++ b/language/ru_RU/admin.lang.php @@ -344,7 +344,6 @@ $lang['for the file format'] = 'для файла формата'; $lang['No missing thumbnail'] = 'Миниатюры есть у всех изображений'; $lang['Photo unreachable or no support'] = 'Фотография недоступна или поддержка не возможна'; $lang['GD version'] = 'версия GD'; -$lang['Miniaturization parameters'] = 'Параметры миниатюризации'; $lang['generated in'] = 'создано за'; $lang['Results of miniaturization'] = 'Результаты миниатюризации'; $lang['General statistics'] = 'Общая статистика'; diff --git a/language/sh_RS/admin.lang.php b/language/sh_RS/admin.lang.php index c86178ad3..8a864a205 100644 --- a/language/sh_RS/admin.lang.php +++ b/language/sh_RS/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'za datotečni oblik'; $lang['No missing thumbnail'] = 'Nema nedostajućih poveznih sličica'; $lang['Photo unreachable or no support'] = 'Slika nedostupna ili bez podrške'; $lang['GD version'] = 'GD verzija'; -$lang['Miniaturization parameters'] = 'Parametri umanjivanja'; $lang['generated in'] = 'izrađena u'; $lang['Results of miniaturization'] = 'rezultati umanjivanja'; $lang['General statistics'] = 'Glavna statistika'; diff --git a/language/sk_SK/admin.lang.php b/language/sk_SK/admin.lang.php index 454275b4e..e8c333172 100644 --- a/language/sk_SK/admin.lang.php +++ b/language/sk_SK/admin.lang.php @@ -346,7 +346,6 @@ $lang['for the file format'] = 'pre formát súboru'; $lang['No missing thumbnail'] = 'Nechýba žiaden náhľad'; $lang['Photo unreachable or no support'] = 'Fotografia nie je dostupná alebo podporovaná'; $lang['GD version'] = 'Verzia GD knihovne'; -$lang['Miniaturization parameters'] = 'Parametre miniaturizácie'; $lang['generated in'] = 'generované behom'; $lang['Results of miniaturization'] = 'Výsledky miniaturizácie'; $lang['General statistics'] = 'Celková štatistika'; diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php index e9075422e..777401d51 100644 --- a/language/sr_RS/admin.lang.php +++ b/language/sr_RS/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'за датотечни облик'; $lang['No missing thumbnail'] = 'Нема недостајућих повезних сличица'; $lang['Photo unreachable or no support'] = 'Слика недоступна или без подршке'; $lang['GD version'] = 'ГД верзија'; -$lang['Miniaturization parameters'] = 'Параметри умањивања'; $lang['generated in'] = 'израђена у'; $lang['Results of miniaturization'] = 'резултати умањивања'; $lang['General statistics'] = 'Главна статистика'; diff --git a/language/sv_SE/admin.lang.php b/language/sv_SE/admin.lang.php index 7ff5ebf3f..cdb3094be 100644 --- a/language/sv_SE/admin.lang.php +++ b/language/sv_SE/admin.lang.php @@ -345,7 +345,6 @@ $lang['for the file format'] = 'för filformatet'; $lang['No missing thumbnail'] = 'Inga miniatyrbilder saknas'; $lang['Photo unreachable or no support'] = 'Bilden kunde inte nås eller filformatet stöds inte'; $lang['GD version'] = 'GD version'; -$lang['Miniaturization parameters'] = 'Miniatyriserings parametrar'; $lang['generated in'] = 'generering tog'; $lang['Results of miniaturization'] = 'Resultat av miniatyriserings process'; $lang['General statistics'] = 'Allmän statistik'; diff --git a/language/th_TH/admin.lang.php b/language/th_TH/admin.lang.php index 78f4d750b..edb15c3b5 100644 --- a/language/th_TH/admin.lang.php +++ b/language/th_TH/admin.lang.php @@ -406,7 +406,6 @@ $lang['Menu Management'] = 'จัดการเมนู'; $lang['Metadata synchronization results'] = "ผลลัพธ์การซิงโคไนซ์เมตาดาต้า"; $lang['Metadata synchronized from file'] = "ได้ถูกซิงโคไนซ์เมตาดาต้าจากไฟล์"; $lang['min time'] = "เวลาต่ำสุด"; -$lang['Miniaturization parameters'] = "ตัวแปรการย่อขนาด"; $lang['Minimum privacy level'] = "ระดับของความเป็นส่วนตัวน้อยที่สุด"; $lang['Miscellaneous'] = 'เบ็ดเตล็จ'; $lang['Missing a temporary folder'] = 'ไม่พบโฟลเดอร์ชั่วคราว'; diff --git a/language/tr_TR/admin.lang.php b/language/tr_TR/admin.lang.php index 88dc8e394..3c518cea6 100644 --- a/language/tr_TR/admin.lang.php +++ b/language/tr_TR/admin.lang.php @@ -449,7 +449,6 @@ $lang['Merge tags'] = 'etiketleri birleştir'; $lang['Metadata synchronization results'] = 'Metadata senkronizasyon sonuçları'; $lang['Metadata synchronized from file'] = 'Metadata dosyadan senkronize edildi'; $lang['min time'] = 'men kisa time'; -$lang['Miniaturization parameters'] = 'Minyatürlestirme parametreleri'; $lang['Minimum privacy level'] = 'En az gizlilik seviyesi'; $lang['Miscellaneous'] = 'Karışık'; $lang['Missing a temporary folder'] = 'Geçici bir klasöre eksik'; diff --git a/language/uk_UA/admin.lang.php b/language/uk_UA/admin.lang.php index f225a4795..69f34523a 100644 --- a/language/uk_UA/admin.lang.php +++ b/language/uk_UA/admin.lang.php @@ -375,7 +375,6 @@ $lang['Menu Management'] = 'Меню'; $lang['Metadata synchronization results'] = 'Результати синхронізації метаданих'; $lang['Metadata synchronized from file'] = 'Метадані синхронізовані з файлу'; $lang['min time'] = 'мін. час'; -$lang['Miniaturization parameters'] = 'Параметри мініатюрізації'; $lang['Minimum privacy level'] = 'Мінімальний рівень приватності'; $lang['Miscellaneous'] = 'Різне'; $lang['Missing a temporary folder'] = 'Відсутня тимчасова папка'; diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php index 984991424..506bfbfb3 100644 --- a/language/vi_VN/admin.lang.php +++ b/language/vi_VN/admin.lang.php @@ -347,7 +347,6 @@ $lang['for the file format'] = 'dành cho định dạng file'; $lang['No missing thumbnail'] = 'Không thiếu hình thu nhỏ nào'; $lang['Photo unreachable or no support'] = 'Hình không đọc được hoặc định dạng không được hỗ trợ'; $lang['GD version'] = 'Phiên bản GD'; -$lang['Miniaturization parameters'] = 'Tối thiểu hóa tham số'; $lang['generated in'] = 'được tạo trong'; $lang['Results of miniaturization'] = 'Kết quả tổi thiểu hóa'; $lang['General statistics'] = 'Thống kê tổng quát'; diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php index 3671c3265..b219ea7e1 100644 --- a/language/zh_CN/admin.lang.php +++ b/language/zh_CN/admin.lang.php @@ -345,7 +345,6 @@ $lang['for the file format'] = '对于文件格式'; $lang['No missing thumbnail'] = '没有丢失缩略图'; $lang['Photo unreachable or no support'] = '不支持图片格式或无法显示'; $lang['GD version'] = 'GD版'; -$lang['Miniaturization parameters'] = '缩略图参数'; $lang['generated in'] = '产生于'; $lang['Results of miniaturization'] = '缩略图结果'; $lang['General statistics'] = '普通统计'; diff --git a/language/zh_TW/admin.lang.php b/language/zh_TW/admin.lang.php index 73c6d87a6..6431f87ef 100644 --- a/language/zh_TW/admin.lang.php +++ b/language/zh_TW/admin.lang.php @@ -346,7 +346,6 @@ $lang['for the file format'] = '對於文件格式'; $lang['No missing thumbnail'] = '沒有丟失縮略圖'; $lang['Photo unreachable or no support'] = '不支持圖片格式或無法顯示'; $lang['GD version'] = 'GD版'; -$lang['Miniaturization parameters'] = '縮略圖參數'; $lang['generated in'] = '產生於'; $lang['Results of miniaturization'] = '縮略圖結果'; $lang['General statistics'] = '普通統計'; diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 2ff4d03e8..534d04bd7 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -1,12 +1,22 @@ -{* $Id$ *} +{if isset($comment_derivative_params)} +{strip}{html_style} +.thumbnailCategory DIV.illustration{ldelim} + width: {$comment_derivative_params->max_width()+5}px; +} + +.content .thumbnailCategory .description{ldelim} + height: {$comment_derivative_params->max_height()+5}px; +} +{/html_style}{/strip} +{/if}