diff options
| -rw-r--r-- | admin/user_perm.php | 15 | ||||
| -rw-r--r-- | template/yoga/admin/user_perm.tpl | 23 | ||||
| -rw-r--r-- | template/yoga/picture_content.tpl | 16 |
3 files changed, 25 insertions, 29 deletions
diff --git a/admin/user_perm.php b/admin/user_perm.php index c5e2348d1..0437eeb0e 100644 --- a/admin/user_perm.php +++ b/admin/user_perm.php @@ -2,9 +2,8 @@ // +-----------------------------------------------------------------------+ // | 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 | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) // | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ @@ -126,7 +125,7 @@ $template->set_filenames( ) ); -$template->assign_vars( +$template->assign( array( 'TITLE' => sprintf( @@ -161,8 +160,6 @@ $result = pwg_query($query); if (mysql_num_rows($result) > 0) { - $template->assign_block_vars('groups', array()); - $cats = array(); while ($row = mysql_fetch_array($result)) { @@ -173,11 +170,9 @@ if (mysql_num_rows($result) > 0) foreach ($cats as $category) { - $template->assign_block_vars( - 'groups.category', - array( - 'NAME' => get_cat_display_name_cache($category['uppercats'], null, false) - ) + $template->append( + 'categories_because_of_groups', + get_cat_display_name_cache($category['uppercats'], null, false) ); } } diff --git a/template/yoga/admin/user_perm.tpl b/template/yoga/admin/user_perm.tpl index e8cefe379..3183c82e7 100644 --- a/template/yoga/admin/user_perm.tpl +++ b/template/yoga/admin/user_perm.tpl @@ -1,22 +1,23 @@ -<!-- DEV TAG: not smarty migrated --> -<h2>{TITLE}</h2> +{* $Id$ *} +<h2>{$TITLE}</h2> -<!-- BEGIN groups --> +{if isset($categories_because_of_groups) } <fieldset> - <legend>{lang:Categories authorized thanks to group associations}</legend> + <legend>{'Categories authorized thanks to group associations'|@translate}</legend> <ul> - <!-- BEGIN category --> - <li>{groups.category.NAME}</li> - <!-- END category --> + {foreach from=$categories_because_of_groups item=cat } + <li>{$cat}</li> + {/foreach} </ul> </fieldset> -<!-- END groups --> +{/if} + <fieldset> - <legend>{lang:Other private categories}</legend> + <legend>{'Other private categories'|@translate}</legend> - <form method="post" action="{F_ACTION}"> - {DOUBLE_SELECT} + <form method="post" action="{$F_ACTION}"> + {$DOUBLE_SELECT} </form> </fieldset> diff --git a/template/yoga/picture_content.tpl b/template/yoga/picture_content.tpl index c2e5e0040..7e15a1bb3 100644 --- a/template/yoga/picture_content.tpl +++ b/template/yoga/picture_content.tpl @@ -1,9 +1,9 @@ -<!-- DEV TAG: not smarty migrated --> -<!-- BEGIN high --> -<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')"> -<!-- END high --> - <img src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}"> -<!-- BEGIN high --> +{* $Id$ *} +{if isset($high) } +<a href="javascript:phpWGOpenWindow('{$high.U_HIGH}','{$high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')"> +{/if} + <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}"> +{if isset($high) } </a> - <p>{lang:picture_high}</p> -<!-- END high --> + <p>{'picture_high'|@translate}</p> +{/if} |