From 152d07d752a6da15518d22deed573e1d26b8193c Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 5 Mar 2008 01:50:08 +0000 Subject: [PATCH] - admin comments, configuration, element_set_global, element_set_unit, thumbnail and double_select migration to smarty - fix in redirect.tpl git-svn-id: http://piwigo.org/svn/trunk@2249 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/comments.php | 16 +- admin/configuration.php | 54 +++---- admin/element_set_global.php | 143 ++++++------------ admin/element_set_unit.php | 37 +++-- admin/notification_by_mail.php | 38 +++-- template/yoga/admin/comments.tpl | 38 ++--- template/yoga/admin/configuration.tpl | 134 ++++++++-------- template/yoga/admin/double_select.tpl | 18 +-- template/yoga/admin/element_set_global.tpl | 168 ++++++++++----------- template/yoga/admin/element_set_unit.tpl | 91 +++++------ template/yoga/admin/thumbnail.tpl | 131 ++++++++-------- template/yoga/redirect.tpl | 2 +- 12 files changed, 402 insertions(+), 468 deletions(-) diff --git a/admin/comments.php b/admin/comments.php index bae32dcb3..a7351ff04 100644 --- a/admin/comments.php +++ b/admin/comments.php @@ -2,7 +2,7 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ // | file : $Id$ // | last update : $Date$ @@ -124,9 +124,9 @@ $template->set_filenames(array('comments'=>'admin/comments.tpl')); // TabSheet initialization waiting_tabsheet(); -$template->assign_vars( +$template->assign( array( - 'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=comments' + 'F_ACTION' => get_root_url().'admin.php?page=comments' ) ); @@ -154,8 +154,8 @@ while ($row = mysql_fetch_assoc($result)) 'tn_ext'=>@$row['tn_ext'] ) ); - $template->assign_block_vars( - 'comment', + $template->append( + 'comments', array( 'U_PICTURE' => PHPWG_ROOT_PATH.'admin.php?page=picture_modify'. @@ -171,11 +171,7 @@ while ($row = mysql_fetch_assoc($result)) array_push($list, $row['id']); } -$template->assign_vars( - array( - 'LIST' => implode(',', $list) - ) - ); +$template->assign('LIST', implode(',', $list) ); // +-----------------------------------------------------------------------+ // | sending html code | diff --git a/admin/configuration.php b/admin/configuration.php index 1f96265ec..9f741ad89 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -49,6 +49,7 @@ else } $main_checkboxes = array( + 'gallery_locked', 'allow_user_registration', 'obligatory_user_mail_address', 'rate', @@ -169,37 +170,23 @@ $tabsheet->select($page['section']); // Assign tabsheet to template $tabsheet->assign(); -$action = PHPWG_ROOT_PATH.'admin.php?page=configuration'; +$action = get_root_url().'admin.php?page=configuration'; $action.= '&section='.$page['section']; $template->assign_vars( array( - 'L_YES'=>l10n('yes'), - 'L_NO'=>l10n('no'), - 'L_SUBMIT'=>l10n('submit'), - 'L_RESET'=>l10n('reset'), - - 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=configuration', + 'U_HELP' => get_root_url().'popuphelp.php?page=configuration', 'F_ACTION'=>$action )); -$html_check='checked="checked"'; - -$include_submit_buttons = true; - switch ($page['section']) { case 'main' : { - $lock_yes = ($conf['gallery_locked']==true)?'checked="checked"':''; - $lock_no = ($conf['gallery_locked']==false)?'checked="checked"':''; - - $template->assign_block_vars( + $template->assign( 'main', array( - 'GALLERY_LOCKED_YES'=>$lock_yes, - 'GALLERY_LOCKED_NO'=>$lock_no, 'CONF_GALLERY_TITLE' => htmlspecialchars($conf['gallery_title']), 'CONF_PAGE_BANNER' => htmlspecialchars($conf['page_banner']), 'CONF_GALLERY_URL' => $conf['gallery_url'], @@ -207,11 +194,12 @@ switch ($page['section']) foreach( $main_checkboxes as $checkbox) { - $template->merge_block_vars( + $template->append( 'main', array( - strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:'' - ) + $checkbox => $conf[$checkbox] + ), + true ); } break; @@ -219,22 +207,21 @@ switch ($page['section']) case 'history' : { //Necessary for merge_block_vars - $template->assign_block_vars('history', array()); - foreach( $history_checkboxes as $checkbox) { - $template->merge_block_vars( + $template->append( 'history', array( - strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:'' - ) + $checkbox => $conf[$checkbox] + ), + true ); } break; } case 'comments' : { - $template->assign_block_vars( + $template->assign( 'comments', array( 'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'], @@ -242,11 +229,12 @@ switch ($page['section']) foreach( $comments_checkboxes as $checkbox) { - $template->merge_block_vars( + $template->append( 'comments', array( - strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:'' - ) + $checkbox => $conf[$checkbox] + ), + true ); } break; @@ -273,17 +261,11 @@ switch ($page['section']) '', $edit_user ); - $template->assign_block_vars('default', array()); - $include_submit_buttons = false; + $template->assign('default', array()); break; } } -if ($include_submit_buttons) -{ - $template->assign_block_vars('include_submit_buttons', array()); -} - //----------------------------------------------------------- sending html code $template->assign_var_from_handle('ADMIN_CONTENT', 'config'); ?> diff --git a/admin/element_set_global.php b/admin/element_set_global.php index a6d3eb282..7cc724b57 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -205,16 +205,14 @@ SELECT id $template->set_filenames( array('element_set_global' => 'admin/element_set_global.tpl')); -$base_url = PHPWG_ROOT_PATH.'admin.php'; +$base_url = get_root_url().'admin.php'; // $form_action = $base_url.'?page=element_set_global'; -$template->assign_vars( +$template->assign( array( 'CATEGORIES_NAV'=>$page['title'], - 'L_SUBMIT'=>l10n('submit'), - 'U_DISPLAY'=>$base_url.get_query_string_diff(array('display')), 'U_UNIT_MODE' @@ -231,47 +229,22 @@ $template->assign_vars( // | caddie options | // +-----------------------------------------------------------------------+ -if ('caddie' == $_GET['cat']) -{ - $template->assign_block_vars('in_caddie', array()); -} -else -{ - $template->assign_block_vars('not_in_caddie', array()); -} +$template->assign('IN_CADDIE', 'caddie' == $_GET['cat'] ? true : false ); // +-----------------------------------------------------------------------+ // | global mode form | // +-----------------------------------------------------------------------+ // Virtualy associate a picture to a category -$blockname = 'associate_option'; - -$template->assign_block_vars( - $blockname, - array('SELECTED' => '', - 'VALUE'=> 0, - 'OPTION' => '------------' - )); - $query = ' SELECT id,name,uppercats,global_rank FROM '.CATEGORIES_TABLE.' ;'; -display_select_cat_wrapper($query, array(), $blockname, true); +display_select_cat_wrapper($query, array(), 'associate_options', true); // Dissociate from a category : categories listed for dissociation can // only represent virtual links. Links to physical categories can't be // broken -$blockname = 'dissociate_option'; - -$template->assign_block_vars( - $blockname, - array('SELECTED' => '', - 'VALUE'=> 0, - 'OPTION' => '------------' - )); - if (count($page['cat_elements_id']) > 0) { $query = ' @@ -284,81 +257,68 @@ SELECT DISTINCT(category_id) AS id, c.name, uppercats, global_rank AND ic.image_id = i.id AND ic.category_id != i.storage_category_id ;'; - display_select_cat_wrapper($query, array(), $blockname, true); + display_select_cat_wrapper($query, array(), 'dissociate_options', true); } $all_tags = get_all_tags(); -if (count($all_tags) == 0) -{ - $add_tag_selection = - '

'. - l10n('No tag defined. Use Administration>Pictures>Tags'). - '

'; -} -else -{ - $add_tag_selection = get_html_tag_selection( - $all_tags, - 'add_tags' +if (count($all_tags) > 0) +{// add tags + $template->assign( + array( + 'ADD_TAG_SELECTION' => get_html_tag_selection( + $all_tags, + 'add_tags' + ), + ) ); } -// add tags -$template->assign_vars( - array( - 'ADD_TAG_SELECTION' => $add_tag_selection, - ) - ); - if (count($page['cat_elements_id']) > 0) { // remove tags $tags = get_common_tags($page['cat_elements_id'], -1); usort($tags, 'name_compare'); - $template->assign_vars( + $template->assign( array( 'DEL_TAG_SELECTION' => get_html_tag_selection($tags, 'del_tags'), ) ); } + // creation date $day = empty($_POST['date_creation_day']) ? date('j') : $_POST['date_creation_day']; -get_day_list('date_creation_day', $day); -if (!empty($_POST['date_creation_month'])) -{ - $month = $_POST['date_creation_month']; -} -else -{ - $month = date('n'); -} -get_month_list('date_creation_month', $month); +$month = +empty($_POST['date_creation_month']) ? date('n') : $_POST['date_creation_month']; -if (!empty($_POST['date_creation_year'])) -{ - $year = $_POST['date_creation_year']; -} -else -{ - $year = date('Y'); -} -$template->assign_vars(array('DATE_CREATION_YEAR_VALUE'=>$year)); +$year = +empty($_POST['date_creation_year']) ? date('Y') : $_POST['date_creation_year']; + +$month_list = $lang['month']; +$month_list[0]='------------'; +ksort($month_list); +$template->assign( array( + 'month_list' => $month_list, + 'DATE_CREATION_DAY' => (int)$day, + 'DATE_CREATION_MONTH'=> (int)$month, + 'DATE_CREATION_YEAR' => (int)$year, + ) + ); // image level options -$blockname = 'level_option'; +$tpl_options = array(); foreach ($conf['available_permission_levels'] as $level) { - $template->assign_block_vars( - $blockname, - array( - 'VALUE' => $level, - 'CONTENT' => l10n( sprintf('Level %d', $level) ), - )); + $tpl_options[$level] = l10n( sprintf('Level %d', $level) ); } +$template->assign( + array( + 'level_options'=> $tpl_options, + ) + ); // +-----------------------------------------------------------------------+ // | global mode thumbnails | @@ -389,7 +349,7 @@ if (count($page['cat_elements_id']) > 0) $page['start'], $page['nb_images'] ); - $template->assign_vars(array('NAV_BAR' => $nav_bar)); + $template->assign('NAV_BAR', $nav_bar); $query = ' SELECT id,path,tn_ext,file,filesize,level @@ -402,34 +362,21 @@ SELECT id,path,tn_ext,file,filesize,level $result = pwg_query($query); // template thumbnail initialization - if (mysql_num_rows($result) > 0) - { - $template->assign_block_vars('thumbnails', array()); - } while ($row = mysql_fetch_assoc($result)) { $src = get_thumbnail_url($row); - $template->assign_block_vars( - 'thumbnails.thumbnail', + $template->append( + 'thumbnails', array( 'ID' => $row['id'], - 'SRC' => $src, - 'ALT' => $row['file'], - 'TITLE' => get_thumbnail_title($row) + 'TN_SRC' => $src, + 'FILE' => $row['file'], + 'TITLE' => get_thumbnail_title($row), + 'LEVEL' => $row['level'] ) ); - - if ( $row['level']>0 ) - { - $template->assign_block_vars('thumbnails.thumbnail.level', - array( - 'LEVEL' => $row['level'], - 'TITLE' => l10n( sprintf('Level %d', $row['level']) ), - ) - ); - } } } diff --git a/admin/element_set_unit.php b/admin/element_set_unit.php index cefd8ee4c..a9541f576 100644 --- a/admin/element_set_unit.php +++ b/admin/element_set_unit.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -49,7 +48,7 @@ check_status(ACCESS_ADMINISTRATOR); if (isset($_POST['submit'])) { - $collection = explode(',', $_POST['list']); + $collection = explode(',', $_POST['element_ids']); $datas = array(); @@ -134,14 +133,14 @@ $template->set_filenames( $base_url = PHPWG_ROOT_PATH.'admin.php'; -// $form_action = $base_url.'?page=element_set_global'; +$month_list = $lang['month']; +$month_list[0]='------------'; +ksort($month_list); -$template->assign_vars( +$template->assign( array( 'CATEGORIES_NAV'=>$page['title'], - 'L_SUBMIT'=>l10n('submit'), - 'U_ELEMENTS_PAGE' =>$base_url.get_query_string_diff(array('display','start')), @@ -152,6 +151,8 @@ $template->assign_vars( .'&mode=global', 'F_ACTION'=>$base_url.get_query_string_diff(array()), + + 'month_list' => $month_list ) ); @@ -186,7 +187,7 @@ if (count($page['cat_elements_id']) > 0) $page['start'], $page['nb_images'] ); - $template->assign_vars(array('NAV_BAR' => $nav_bar)); + $template->assign(array('NAV_BAR' => $nav_bar)); // tags $all_tags = get_all_tags(); @@ -223,7 +224,7 @@ SELECT tag_id } else { - list($year,$month,$day) = array('','',''); + list($year,$month,$day) = array('',0,0); } if (count($all_tags) > 0) @@ -242,32 +243,30 @@ SELECT tag_id '

'; } - $template->assign_block_vars( - 'element', + $template->append( + 'elements', array( + 'ID' => $row['id'], + 'TN_SRC' => $src, 'LEGEND' => !empty($row['name']) ? $row['name'] : get_name_from_file($row['file']), 'U_EDIT' => PHPWG_ROOT_PATH.'admin.php?page=picture_modify'. '&image_id='.$row['id'], - 'ID' => $row['id'], - 'FILENAME' => $row['path'], - 'TN_SRC' => $src, 'NAME' => @$row['name'], 'AUTHOR' => @$row['author'], 'DESCRIPTION' => @$row['comment'], 'DATE_CREATION_YEAR' => $year, + 'DATE_CREATION_MONTH' => (int)$month, + 'DATE_CREATION_DAY' => (int)$day, 'TAG_SELECTION' => $tag_selection, ) ); - - get_day_list('element.date_creation_day', $day); - get_month_list('element.date_creation_month', $month); } - $template->assign_vars(array('IDS_LIST' => implode(',', $element_ids))); + $template->assign('ELEMENT_IDS', implode(',', $element_ids)); } // +-----------------------------------------------------------------------+ diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index 38fd8cfb6..913d65283 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -689,19 +689,37 @@ switch ($page['mode']) ); $data_users = get_user_notifications('subscribe'); + + $opt_true=array(); + $opt_true_selected=array(); + $opt_false=array(); + $opt_false_selected=array(); foreach ($data_users as $nbm_user) { - $template->assign_block_vars( - (get_boolean($nbm_user['enabled']) ? 'category_option_true' : 'category_option_false'), - array('SELECTED' => ( // Keep selected user where enabled are not changed when change has been notify - get_boolean($nbm_user['enabled']) ? (isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true'])) - : (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false'])) - ) ? 'selected="selected"' : '', - 'VALUE' => $nbm_user['check_key'], - 'OPTION' => $nbm_user['username'].'['.get_email_address_as_display_text($nbm_user['mail_address']).']' - )); + if ( get_boolean($nbm_user['enabled']) ) + { + $opt_true[ $nbm_user['check_key'] ] = $nbm_user['username'].'['.get_email_address_as_display_text($nbm_user['mail_address']).']'; + if ((isset($_POST['falsify']) and isset($_POST['cat_true']) and in_array($nbm_user['check_key'], $_POST['cat_true'])) ) + { + $opt_true_selected[] = $nbm_user['check_key']; + } + } + else + { + $opt_false[ $nbm_user['check_key'] ] = $nbm_user['username'].'['.get_email_address_as_display_text($nbm_user['mail_address']).']'; + if (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false'])) + { + $opt_false_selected[] = $nbm_user['check_key']; + } + } } - + $template->assign( array( + 'category_option_true' => $opt_true, + 'category_option_true_selected' => $opt_true_selected, + 'category_option_false' => $opt_false, + 'category_option_true' => $opt_false_selected, + ) + ); break; } diff --git a/template/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl index 4a4b5fef4..84b1677c6 100644 --- a/template/yoga/admin/comments.tpl +++ b/template/yoga/admin/comments.tpl @@ -1,31 +1,33 @@ - - +{* $Id$ *}
-

{lang:waiting} {TABSHEET_TITLE}

- {TABSHEET} +

{'waiting'|@translate} {$TABSHEET_TITLE}

+ {$TABSHEET}
-

{lang:User comments validation}

+

{'User comments validation'|@translate}

-
- +{if !empty($comments) } + + + {foreach from=$comments item=comment}
- -

{comment.AUTHOR} - {comment.DATE}

-
{comment.CONTENT}
+ +

{$comment.AUTHOR} - {$comment.DATE}

+
{$comment.CONTENT}
    -
    • -
    • +
    • +
- + {/foreach}

- - - - - + + + + +

+{/if} \ No newline at end of file diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl index 2b1e0a5a3..cccb879af 100644 --- a/template/yoga/admin/configuration.tpl +++ b/template/yoga/admin/configuration.tpl @@ -1,163 +1,165 @@ - - +{* $Id$ *}
-

{lang:title_configuration} {TABSHEET_TITLE}

- {TABSHEET} +

{'title_configuration'|@translate} {$TABSHEET_TITLE}

+ {$TABSHEET}
-
+ - +{if isset($main)}
  • - + - +
  • - + - +
  • - + - -
    • - -
  • - {lang:Lock gallery} - - +
    +
  • -
    • - -
  • - -
    • - -
  • -
  • +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
- +{/if} - +{if isset($history)}
  • - +
  • - +
  • - +
- +{/if} - + +{if isset($comments)}
  • - + - +
- +{/if} - -{PROFILE_CONTENT} - +{if isset($default)} +{$PROFILE_CONTENT} +{/if} - +{if !isset($default)}

- - + +

- +{/if}
diff --git a/template/yoga/admin/double_select.tpl b/template/yoga/admin/double_select.tpl index ca789b3df..aeed8500a 100644 --- a/template/yoga/admin/double_select.tpl +++ b/template/yoga/admin/double_select.tpl @@ -1,24 +1,20 @@ - +{* $Id$ *}
-

{L_CAT_OPTIONS_TRUE}

+

{$L_CAT_OPTIONS_TRUE}

-

+

-

{L_CAT_OPTIONS_FALSE}

+

{$L_CAT_OPTIONS_FALSE}

-

+

diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl index e50c121dd..7a21c0073 100644 --- a/template/yoga/admin/element_set_global.tpl +++ b/template/yoga/admin/element_set_global.tpl @@ -1,152 +1,150 @@ - - -

{lang:Batch management}

+{* $Id$ *} -

{CATEGORIES_NAV}

+

{'Batch management'|@translate}

+ +

{$CATEGORIES_NAV}

- {lang:global mode} - | {lang:unit mode} + {'global mode'|@translate} + | {'unit mode'|@translate}

- {lang:Display options} + {'Display options'|@translate} -

{lang:elements per page}: - 20 - | 50 - | 100 - | {lang:all} +

{'elements per page'|@translate}: + 20 + | 50 + | 100 + | {'all'|@translate}

-
+
- {lang:Elements} + {'Elements'|@translate} -
{NAV_BAR}
+ {if !empty($NAV_BAR)}
{$NAV_BAR}
{/if} - +{if !empty($thumbnails)}
    - + {foreach from=$thumbnails item=thumbnail}
    • - + {/foreach}
- +{/if}
- {lang:Form} + {'Form'|@translate} - + - + - - + + + {if !empty($DEL_TAG_SELECTION)} - - + + + {/if} - + - + - + - + @@ -154,35 +152,33 @@
{lang:associate to category}{'associate to category'|@translate} - + + {html_options options=$associate_options }
{lang:dissociate from category}{'dissociate from category'|@translate}
{lang:add tags}{ADD_TAG_SELECTION}{'add tags'|@translate}{if !empty($ADD_TAG_SELECTION)}{$ADD_TAG_SELECTION}{else}

{'No tag defined. Use Administration>Pictures>Tags'|@translate}

{/if}
{lang:remove tags}{DEL_TAG_SELECTION}{'remove tags'|@translate}{$DEL_TAG_SELECTION}
{lang:Author}{'Author'|@translate} - {lang:leave} - {lang:unset} - {lang:set to} - + + + +
{lang:title}{'title'|@translate} - {lang:leave} - {lang:unset} - {lang:set to} - + + + +
{lang:Creation date}{'Creation date'|@translate} - {lang:leave} - {lang:unset} - {lang:set to} - {'leave'|@translate} + + + - + {html_options options=$month_list selected=$DATE_CREATION_MONTH} - + value="{$DATE_CREATION_YEAR}" />
{lang:Minimum privacy level}{'Minimum privacy level'|@translate} - - - {'leave'|@translate} + +

- {lang:target} - - + {'target'|@translate} + +

-

+

- {lang:Caddie management} + {'Caddie management'|@translate}
    - -
    • -
    • - + {if ($IN_CADDIE)} +
    • +
    • + {else} +
    • + {/if} - -
    • - - -
    • +
-

+

diff --git a/template/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl index 921acc9fa..11fb54470 100644 --- a/template/yoga/admin/element_set_unit.tpl +++ b/template/yoga/admin/element_set_unit.tpl @@ -1,90 +1,93 @@ - -

{lang:Batch management}

+{* $Id$ *} -

{CATEGORIES_NAV}

+

{'Batch management'|@translate}

+ +

{$CATEGORIES_NAV}

- {lang:global mode} - | {lang:unit mode} + {'global mode'|@translate} + | {'unit mode'|@translate}

- +
- - {lang:Display options} - -

{lang:elements per page} : - 5 - | 10 - | 50 - | {lang:all} + {'Display options'|@translate} +

{'elements per page'|@translate} : + 5 + | 10 + | 50 + | {'all'|@translate}

-
{NAV_BAR}
+{if !empty($NAV_BAR) } +
{$NAV_BAR}
+{/if} - +{if !empty($elements) } + +{foreach from=$elements item=element}
- {element.LEGEND} + {$element.LEGEND} - + - - + + - - + + - + - - + + - - + +
{lang:Name}{'Name'|@translate}
{lang:Author}{'Author'|@translate}
{lang:Creation date}{'Creation date'|@translate} - - {lang:set to} - {'unset'|@translate} + + + - + {html_options options=$month_list selected=$element.DATE_CREATION_MONTH} - + value="{$element.DATE_CREATION_YEAR}" />
{lang:Tags}{element.TAG_SELECTION}{'Tags'|@translate}{$element.TAG_SELECTION}
{lang:Description}{'Description'|@translate}
- +{/foreach}

- - + +

- +{/if}
diff --git a/template/yoga/admin/thumbnail.tpl b/template/yoga/admin/thumbnail.tpl index 7070d449d..6bb652caa 100644 --- a/template/yoga/admin/thumbnail.tpl +++ b/template/yoga/admin/thumbnail.tpl @@ -1,130 +1,123 @@ - - +{* $Id$ *}
-

{lang:title_thumbnails}

+

{'title_thumbnails'|@translate}

- -
{L_RESULTS}
+{if isset($results) } +
{'tn_results_title'|@translate}
- - - - - - + + + + + - - - - - - - - + {foreach from=$results.elements item=elt} + + + + + + - + {/foreach}
{L_PATH}{L_THUMBNAIL}{L_GENERATED}{L_FILESIZE}{L_WIDTH}{L_HEIGHT}{'path'|@translate}{'thumbnail'|@translate}{'tn_results_gen_time'|@translate}{'filesize'|@translate}{'Dimensions'|@translate}
{results.picture.PATH}{results.picture.GEN_TIME}{results.picture.TN_FILESIZE_IMG}{results.picture.TN_WIDTH_IMG}{results.picture.TN_HEIGHT_IMG}
{$elt.PATH}{$elt.GEN_TIME}{$elt.TN_FILESIZE_IMG}{$elt.TN_WIDTH_IMG} x {$elt.TN_HEIGHT_IMG}
- + - - + + - - + + - - + + - - + + - - + +
{L_TN_STATS}{'tn_stats'|@translate}
{L_TN_NB_STATS}{results.TN_NB}{'tn_stats_nb'|@translate}{$results.TN_NB}
{L_TN_TOTAL}{results.TN_TOTAL}{'tn_stats_total'|@translate}{$results.TN_TOTAL}
{L_TN_MAX}{results.TN_MAX}{'tn_stats_max'|@translate}{$results.TN_MAX}
{L_TN_MIN}{results.TN_MIN}{'tn_stats_min'|@translate}{$results.TN_MIN}
{L_TN_AVERAGE}{results.TN_AVERAGE}{'tn_stats_mean'|@translate}{$results.TN_AVERAGE}

- +{/if} - -
+{if isset($params) } +
- {L_PARAMS} + {'tn_params_title'|@translate}
  • - {L_GD} + {'tn_params_GD'|@translate}
  • - + - +
  • - + - +
  • - {lang:Number of thumbnails to create} - - - - + {'Number of thumbnails to create'|@translate} + + + +
-

+

- +{/if} {*isset params*} - -
[ {L_UNLINK} ]
- - - -
{remainings.TOTAL_IMG} {L_REMAINING}
+{if !empty($remainings) } +
{$TOTAL_NB_REMAINING} {'tn_alone_title'|@translate}
- - - - + + + - - - - - - - + {foreach from=$remainings item=elt name=remain_loop} + + + + + - + {/foreach}
 {L_PATH}{L_FILESIZE}{L_WIDTH}{L_HEIGHT}{'path'|@translate}{'filesize'|@translate}{'Dimensions'|@translate}
{remainings.remaining.NB_IMG}
{remainings.remaining.PATH}
{remainings.remaining.FILESIZE_IMG}
{remainings.remaining.WIDTH_IMG}
{remainings.remaining.HEIGHT_IMG}
{$smarty.foreach.remain_loop.iteration}
{$elt.PATH}
{$elt.FILESIZE_IMG}
{$elt.WIDTH_IMG} x {$elt.HEIGHT_IMG}
- +{else} +
[ {'tn_no_missing'|@translate} ]
+{/if} diff --git a/template/yoga/redirect.tpl b/template/yoga/redirect.tpl index 308411aec..aa007426f 100644 --- a/template/yoga/redirect.tpl +++ b/template/yoga/redirect.tpl @@ -1,3 +1,3 @@ {* $Id$ *}

{$REDIRECT_MSG}

-

{'click_to_redirect'|@translate}

+

{'click_to_redirect'|@translate}