diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 7492633b1..b34868657 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.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$ @@ -208,19 +208,17 @@ $category['is_virtual'] = empty($category['dir']) ? true : false; // Navigation path -$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='; - $navigation = get_cat_display_name_cache( $category['uppercats'], - PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=' + get_root_url().'admin.php?page=cat_modify&cat_id=' ); -$form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='.$_GET['cat_id']; +$form_action = get_root_url().'admin.php?page=cat_modify&cat_id='.$_GET['cat_id']; //----------------------------------------------------- template initialization $template->set_filename( 'categories', 'admin/cat_modify.tpl'); -$base_url = PHPWG_ROOT_PATH.'admin.php?page='; +$base_url = get_root_url().'admin.php?page='; $cat_list_url = $base_url.'cat_list'; $self_url = $cat_list_url; @@ -236,8 +234,6 @@ $template->assign( 'CAT_COMMENT' => @htmlspecialchars($category['comment']), 'status_values' => array('public','private'), - 'false_true' => array('false', 'true'), - 'no_yes' => array('no','yes'), 'CAT_STATUS' => $category['status'], 'CAT_VISIBLE' => $category['visible'], @@ -256,7 +252,7 @@ $template->assign( 'MAIL_CONTENT' => empty($_POST['mail_content']) ? '' : stripslashes($_POST['mail_content']), 'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'], - 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_modify', + 'U_HELP' => get_root_url().'popuphelp.php?page=cat_modify', 'F_ACTION' => $form_action, ) @@ -367,7 +363,7 @@ SELECT id,tn_ext,path ;'; $row = mysql_fetch_array(pwg_query($query)); $src = get_thumbnail_url($row); - $url = PHPWG_ROOT_PATH.'admin.php?page=picture_modify'; + $url = get_root_url().'admin.php?page=picture_modify'; $url.= '&image_id='.$category['representative_picture_id']; $tpl_representant['picture'] = diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php index 52c7f2642..db6584ade 100644 --- a/admin/include/check_integrity.class.php +++ b/admin/include/check_integrity.class.php @@ -259,14 +259,14 @@ class check_integrity { $submit_ignore = true; } - + $template->append('c13y_list', $c13y_display); } $template->assign('c13y_show_submit_automatic_correction', $submit_automatic_correction); $template->assign('c13y_show_submit_ignore', $submit_ignore); - $template->concat_var('ADMIN_CONTENT', $template->parse('check_integrity', true)); + $template->concat('ADMIN_CONTENT', $template->parse('check_integrity', true)); } } diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index 9dae9b692..f728c69d0 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -582,7 +582,7 @@ $template->set_filenames ) ); -$template->assign_vars +$template->assign ( array ( @@ -628,43 +628,30 @@ if ($must_repost) $repost_submit_name = 'send_submit'; } - $template->assign_block_vars - ( - 'repost', - array - ( - 'REPOST_SUBMIT_NAME' => $repost_submit_name - ) - ); + $template->assign('REPOST_SUBMIT_NAME', $repost_submit_name); } switch ($page['mode']) { case 'param' : { - $template->assign_block_vars( + $template->assign( $page['mode'], array( - 'SEND_HTML_MAIL_YES' => ($conf['nbm_send_html_mail'] ? 'checked="checked"' : ''), - 'SEND_HTML_MAIL_NO' => (!$conf['nbm_send_html_mail'] ? 'checked="checked"' : ''), + 'SEND_HTML_MAIL' => $conf['nbm_send_html_mail'], 'SEND_MAIL_AS' => $conf['nbm_send_mail_as'], - 'SEND_DETAILED_CONTENT_YES' => ($conf['nbm_send_detailed_content'] ? 'checked="checked"' : ''), - 'SEND_DETAILED_CONTENT_NO' => (!$conf['nbm_send_detailed_content'] ? 'checked="checked"' : ''), + 'SEND_DETAILED_CONTENT' => $conf['nbm_send_detailed_content'], 'COMPLEMENTARY_MAIL_CONTENT' => $conf['nbm_complementary_mail_content'], - 'SEND_RECENT_POST_DATES_YES' => ($conf['nbm_send_recent_post_dates'] ? 'checked="checked"' : ''), - 'SEND_RECENT_POST_DATES_NO' => (!$conf['nbm_send_recent_post_dates'] ? 'checked="checked"' : '') + 'SEND_RECENT_POST_DATES' => $conf['nbm_send_recent_post_dates'], )); break; } case 'subscribe' : { - $template->assign_block_vars( - $page['mode'], - array( - )); + $template->assign( $page['mode'], true ); - $template->assign_vars( + $template->assign( array( 'L_CAT_OPTIONS_TRUE' => l10n('nbm_subscribe_col'), 'L_CAT_OPTIONS_FALSE' => l10n('nbm_unsubscribe_col') @@ -700,41 +687,35 @@ switch ($page['mode']) 'category_option_true' => $opt_true, 'category_option_true_selected' => $opt_true_selected, 'category_option_false' => $opt_false, - 'category_option_true_selected' => $opt_false_selected, + 'category_option_false_selected' => $opt_false_selected, ) ); + $template->assign_var_from_handle('DOUBLE_SELECT', 'double_select'); break; } case 'send' : { - $template->assign_block_vars($page['mode'], array()); + $tpl_var = array('users'=> array() ); $data_users = do_action_send_mail_notification('list_to_send'); - if (count($data_users) == 0) - { - $template->assign_block_vars($page['mode'].'.send_empty', array()); - } - else - { - $template->assign_block_vars( - $page['mode'].'.send_data', - array( - 'CUSTOMIZE_MAIL_CONTENT' => isset($_POST['send_customize_mail_content']) ? stripslashes($_POST['send_customize_mail_content']) : $conf['nbm_complementary_mail_content'] - )); + $tpl_var['CUSTOMIZE_MAIL_CONTENT'] = + isset($_POST['send_customize_mail_content']) + ? stripslashes($_POST['send_customize_mail_content']) + : $conf['nbm_complementary_mail_content']; - foreach ($data_users as $num => $nbm_user) + if (count($data_users)) + { + foreach ($data_users as $nbm_user) { if ( (!$must_repost) or // Not timeout, normal treatment (($must_repost) and in_array($nbm_user['check_key'], $_POST['send_selection'])) // Must be repost, show only user to send ) { - $template->assign_block_vars( - $page['mode'].'.send_data.user_send_mail', + $tpl_var['users'][] = array( - 'CLASS' => ($num % 2 == 1) ? 'nbm_user2' : 'nbm_user1', 'ID' => $nbm_user['check_key'], 'CHECKED' => ( // not check if not selected, on init select $nbm_user['username'], 'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']), 'LAST_SEND'=> $nbm_user['last_send'] - )); + ); } } } - + $template->assign($page['mode'], $tpl_var); break; } } @@ -755,7 +736,6 @@ switch ($page['mode']) // +-----------------------------------------------------------------------+ // | Sending html code | // +-----------------------------------------------------------------------+ -$template->assign_var_from_handle('DOUBLE_SELECT', 'double_select'); $template->assign_var_from_handle('ADMIN_CONTENT', 'notification_by_mail'); ?> \ No newline at end of file diff --git a/admin/user_list.php b/admin/user_list.php index 3b7194594..992e90c58 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -440,7 +440,7 @@ DELETE FROM '.USER_GROUP_TABLE.' } redirect( - PHPWG_ROOT_PATH. + get_root_url(). 'admin.php'. get_query_string_diff(array(), false) ); @@ -483,11 +483,11 @@ else $template->assign( array( - 'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=user_list', + 'U_HELP' => get_root_url().'popuphelp.php?page=user_list', 'F_ADD_ACTION' => $base_url, 'F_USERNAME' => @htmlentities($_GET['username']), - 'F_FILTER_ACTION' => PHPWG_ROOT_PATH.'admin.php' + 'F_FILTER_ACTION' => get_root_url().'admin.php' )); // Hide radio-button if not allow to assign adviser @@ -524,34 +524,13 @@ $template->assign('direction_selected', if (isset($_POST['pref_submit'])) { -// echo '
'; print_r($_POST); echo '
'; $template->assign( array( - 'ADVISER_YES' => 'true' == (isset($_POST['adviser']) and $_POST['adviser']) ? 'checked="checked"' : '', - 'ADVISER_NO' => 'false' == (isset($_POST['adviser']) and $_POST['adviser']) ? 'checked="checked"' : '', 'NB_IMAGE_LINE' => $_POST['nb_image_line'], 'NB_LINE_PAGE' => $_POST['nb_line_page'], 'MAXWIDTH' => $_POST['maxwidth'], 'MAXHEIGHT' => $_POST['maxheight'], 'RECENT_PERIOD' => $_POST['recent_period'], - 'EXPAND_YES' => 'true' == $_POST['expand'] ? 'checked="checked"' : '', - 'EXPAND_NO' => 'false' == $_POST['expand'] ? 'checked="checked"' : '', - 'SHOW_NB_COMMENTS_YES' => 'true' == $_POST['show_nb_comments'] ? 'checked="checked"' : '', - 'SHOW_NB_COMMENTS_NO' => 'false' == $_POST['show_nb_comments'] ? 'checked="checked"' : '', - 'SHOW_NB_HITS_YES' => 'true' == $_POST['show_nb_hits'] ? 'checked="checked"' : '', - 'SHOW_NB_HITS_NO' => 'false' == $_POST['show_nb_hits'] ? 'checked="checked"' : '', - 'ENABLED_HIGH_YES' => 'true' == $_POST['enabled_high'] ? 'checked="checked"' : '', - 'ENABLED_HIGH_NO' => 'false' == $_POST['enabled_high'] ? 'checked="checked"' : '', - - 'STATUS_ACTION_SET' => 'set' == $_POST['status_action'] ? 'checked="checked"' : '', - 'LEVEL_ACTION_SET' => 'set' == $_POST['level_action'] ? 'checked="checked"' : '', - 'NB_IMAGE_LINE_ACTION_SET' => 'set' == $_POST['nb_image_line_action'] ? 'checked="checked"' : '', - 'NB_LINE_PAGE_ACTION_SET' => 'set' == $_POST['nb_line_page_action'] ? 'checked="checked"' : '', - 'TEMPLATE_ACTION_SET' => 'set' == $_POST['template_action'] ? 'checked="checked"' : '', - 'LANGUAGE_ACTION_SET' => 'set' == $_POST['language_action'] ? 'checked="checked"' : '', - 'RECENT_PERIOD_ACTION_SET' => 'set' == $_POST['recent_period_action'] ? 'checked="checked"' : '', - 'MAXWIDTH_ACTION_SET' => 'set' == $_POST['maxwidth_action'] ? 'checked="checked"' : '', - 'MAXHEIGHT_ACTION_SET' => 'set' == $_POST['maxheight_action'] ? 'checked="checked"' : '', )); } else @@ -645,9 +624,11 @@ foreach ($page['filtered_users'] as $num => $local_user) $visible_user_list[] = $local_user; } +// allow plugins to fill template var plugin_user_list_column_titles and +// plugin_columns/plugin_actions for each user in the list $visible_user_list = trigger_event('loc_visible_user_list', $visible_user_list); -foreach ($visible_user_list as $num => $local_user) +foreach ($visible_user_list as $local_user) { $groups_string = preg_replace( '/(\d+)/e', @@ -696,9 +677,10 @@ foreach ($visible_user_list as $num => $local_user) 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, 'PROPERTIES' => implode( ', ', $properties), + 'plugin_columns' => isset($local_user['plugin_columns']) ? $local_user['plugin_columns'] : array(), + 'plugin_actions' => isset($local_user['plugin_actions']) ? $local_user['plugin_actions'] : array(), ) ); - trigger_action('loc_append_user_list', $local_user); } // +-----------------------------------------------------------------------+ diff --git a/include/page_tail.php b/include/page_tail.php index 4e5f88074..df0aa59a8 100644 --- a/include/page_tail.php +++ b/include/page_tail.php @@ -27,7 +27,7 @@ $template->set_filenames(array('tail'=>'footer.tpl')); trigger_action('loc_begin_page_tail'); -$template->assign_vars( +$template->assign( array( 'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '', 'PHPWG_URL' => PHPWG_URL, diff --git a/include/template.class.php b/include/template.class.php index b35d02c13..d4f0ef680 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -78,10 +78,9 @@ class Template { $this->smarty->compile_dir = $compile_dir; - $this->smarty->register_function( 'lang', array('Template', 'fn_l10n') ); - $this->smarty->assign_by_ref( 'pwg', new PwgTemplateAdapter() ); $this->smarty->register_modifier( 'translate', array('Template', 'mod_translate') ); + $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') ); if ( !empty($theme) ) { @@ -127,7 +126,6 @@ class Template { file_put_contents($this->smarty->compile_dir.'/index.htm', ''); } - /** DEPRECATED */ function get_themeconf($val) { $tc = $this->smarty->get_template_vars('themeconf'); @@ -182,18 +180,6 @@ class Template { $this->assign( $varname, $varval ); } - /** - * Inserts the uncompiled code for $handle as the value of $varname in the - * root-level. This can be used to effectively include a template in the - * middle of another template. - * This is equivalent to assign($varname, $this->parse($handle, true)) - */ - function assign_var_from_handle($varname, $handle) - { - $this->assign($varname, $this->parse($handle, true)); - return true; - } - /** * DEPRECATED - backward compatibility only */ @@ -253,6 +239,66 @@ class Template { return true; } + /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */ + function assign($tpl_var, $value = null) + { + $this->smarty->assign( $tpl_var, $value ); + + if ( is_array($tpl_var) ) + $this->_old->assign_vars( $tpl_var ); + else + $this->_old->assign_var( $tpl_var, $value ); + } + + /** + * Inserts the uncompiled code for $handle as the value of $varname in the + * root-level. This can be used to effectively include a template in the + * middle of another template. + * This is equivalent to assign($varname, $this->parse($handle, true)) + */ + function assign_var_from_handle($varname, $handle) + { + $this->assign($varname, $this->parse($handle, true)); + return true; + } + + /** see smarty append http://www.smarty.net/manual/en/api.append.php */ + function append($tpl_var, $value=null, $merge=false) + { + $this->smarty->append( $tpl_var, $value, $merge ); + } + + /** + * Root-level variable concatenation. Appends a string to an existing + * variable assignment with the same name. + */ + function concat($tpl_var, $value) + { + $old_val = & $this->smarty->get_template_vars($tpl_var); + if ( isset($old_val) ) + { + $old_val .= $value; + $this->_old->concat_var( $tpl_var, $value ); + } + else + { + $this->assign($tpl_var, $value); + } + } + + /** see smarty append http://www.smarty.net/manual/en/api.clear_assign.php */ + function clear_assign($tpl_var) + { + $this->smarty->clear_assign( $tpl_var ); + } + + /** see smarty get_template_vars http://www.smarty.net/manual/en/api.get_template_vars.php */ + function &get_template_vars($name=null) + { + return $this->smarty->get_template_vars( $name ); + } + + /** * Load the file for the handle, eventually compile the file and run the compiled * code. This will add the output to the results or return the result if $return @@ -330,65 +376,22 @@ class Template { } /** - * Root-level variable concatenation. Appends a string to an existing - * variable assignment with the same name. - */ - function concat_var($tpl_var, $value) - { - $old_val = & $this->smarty->get_template_vars($tpl_var); - if ( isset($old_val) ) - { - $old_val .= $value; - $this->_old->concat_var( $tpl_var, $value ); - } - else - { - $this->assign($tpl_var, $value); - } - } - - /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */ - function assign($tpl_var, $value = null) - { - $this->smarty->assign( $tpl_var, $value ); - - if ( is_array($tpl_var) ) - $this->_old->assign_vars( $tpl_var ); - else - $this->_old->assign_var( $tpl_var, $value ); - } - - /** see smarty append http://www.smarty.net/manual/en/api.append.php */ - function append($tpl_var, $value=null, $merge=false) - { - $this->smarty->append( $tpl_var, $value, $merge ); - } - - /** see smarty get_template_vars http://www.smarty.net/manual/en/api.get_template_vars.php */ - function &get_template_vars($name=null) - { - return $this->smarty->get_template_vars( $name ); - } - - /** see smarty append http://www.smarty.net/manual/en/api.clear_assign.php */ - function clear_assign($tpl_var) - { - $this->smarty->clear_assign( $tpl_var ); - } - - /*static*/ function fn_l10n($params, &$smarty) - { - return l10n($params['t']); - } - - /** - * translate variable modifiers - translates a text to the currently loaded + * translate variable modifier - translates a text to the currently loaded * language */ /*static*/ function mod_translate($text) { return l10n($text); } + + /** + * explode variable modifier - similar to php explode + * 'Yes;No'|@explode:';' -> array('Yes', 'No') + */ + /*static*/ function mod_explode($text, $delimiter=',') + { + return explode($delimiter, $text); + } } /** diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php index 11a4c4ddd..f6fc135a3 100644 --- a/plugins/language_switch/language_switch.inc.php +++ b/plugins/language_switch/language_switch.inc.php @@ -1,4 +1,4 @@ - $code ) ); $qlc_alt = ucwords( $displayname ); $qlc_title = $qlc_alt; - $qlc_img = PHPWG_PLUGINS_PATH.'language_switch/icons/' + $qlc_img = 'plugins/language_switch/icons/' . $code . '.gif'; - - if ( $code !== $user['language'] and file_exists($qlc_img) ) + + if ( $code !== $user['language'] and file_exists(PHPWG_ROOT_PATH.$qlc_img) ) { - $template -> concat_var( 'PLUGIN_INDEX_ACTIONS', - '
  • ' + $template->concat( 'PLUGIN_INDEX_ACTIONS', + '<li><a href=' . $qlc_alt . '
    • '); } } diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl index dc9c98dc3..88e07e329 100644 --- a/template/yoga/admin/cat_modify.tpl +++ b/template/yoga/admin/cat_modify.tpl @@ -1,7 +1,7 @@ {* $Id$ *}

    {'title_edit_cat'|@translate}

    @@ -11,14 +11,14 @@ @@ -73,20 +73,20 @@ {'lock'|@translate} - {html_radios name='visible' values=$false_true output=$no_yes|translate selected=$CAT_VISIBLE} + {html_radios name='visible' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE} {'comments'|@translate} - {html_radios name='commentable' values=$false_true output=$no_yes|translate selected=$CAT_COMMENTABLE} + {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE} {if isset($SHOW_UPLOADABLE) } {'editcat_uploadable'|@translate} - {html_radios name='uploadable' values=$false_true output=$no_yes|translate selected=$CAT_UPLOADABLE} + {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE} {/if} @@ -114,7 +114,7 @@

    - +

    @@ -127,7 +127,7 @@ {if isset($representant.picture) } {else} - {'Random picture'|@translate} + {'Random picture'|@translate} {/if} diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl index 3afa4161b..eb5e2a0f9 100644 --- a/template/yoga/admin/notification_by_mail.tpl +++ b/template/yoga/admin/notification_by_mail.tpl @@ -1,125 +1,124 @@ - - +{* $Id$ *} +
    -

    {lang:nbm_send_mail_to_users} {TABSHEET_TITLE}

    - {TABSHEET} +

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

    + {$TABSHEET}
    -
    - + + {if isset($REPOST_SUBMIT_NAME)}
    - +
    - + {/if} - + {if isset($param)}
    - {lang:nbm_title_param} + {'nbm_title_param'|@translate} - + - + - + - - + +
    - - + +
    - -
    {lang:nbm_info_send_mail_as} + +
    {'nbm_info_send_mail_as'|@translate}
    - - + +
    - -
    {lang:nbm_info_send_recent_post_dates} + +
    {'nbm_info_send_recent_post_dates'|@translate}     		- - + +

    - - + +

    - + {/if}{* isset $param*} - + {if isset($subscribe)}
    - {lang:nbm_title_subscribe} -

    {lang:nbm_warning_subscribe_unsubscribe}

    - {DOUBLE_SELECT} + {'nbm_title_subscribe'|@translate} +

    {'nbm_warning_subscribe_unsubscribe'|@translate}

    + {$DOUBLE_SELECT}
    - + {/if}{* isset $subscribe*} - - -

    {lang:nbm_no_user_available_to_send_L1}

    + {if isset($send)} + {if empty($send.users)} +

    {'nbm_no_user_available_to_send_L1'|@translate}

    - {lang:nbm_no_user_available_to_send_L2}
    - {lang:nbm_no_user_available_to_send_L3} + {'nbm_no_user_available_to_send_L2'|@translate}
    + {'nbm_no_user_available_to_send_L3'|@translate}

    - - + {else}
    - {lang:nbm_title_send} + {'nbm_title_send'|@translate} - - - - + + + + - - - - - - + {foreach from=$send.users item=u name=user_loop} + + + + + - + {/foreach}
    {lang:nbm_col_user}{lang:nbm_col_mail}{lang:nbm_col_last_send}{lang:nbm_col_check_user_send_mail}{'nbm_col_user'|@translate}{'nbm_col_mail'|@translate}{'nbm_col_last_send'|@translate}{'nbm_col_check_user_send_mail'|@translate}

    - {lang:Check all} - / {lang:Uncheck all} + {'Check all'|@translate} + / {'Uncheck all'|@translate}

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

    - +

    - - + {/if} + {/if}{* isset $send*}
    diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl index 25b0e705e..db67093f6 100644 --- a/template/yoga/admin/user_list.tpl +++ b/template/yoga/admin/user_list.tpl @@ -12,7 +12,7 @@ - + @@ -43,13 +43,13 @@ {html_options name=direction options=$direction_options selected=$direction_selected} - + -
    + @@ -59,9 +59,11 @@ - {foreach from=$cpl_title_user item=title} + {if not empty($plugin_user_list_column_titles)} + {foreach from=$plugin_user_list_column_titles item=title} {/foreach} + {/if} {foreach from=$users item=user name=users_loop} @@ -72,13 +74,13 @@ - {foreach from=$cpl_user[$smarty.foreach.users_loop.index] item=data} + {foreach from=$user.plugin_columns item=data} {/foreach} @@ -103,8 +105,8 @@ @@ -116,8 +118,8 @@ {/if} @@ -160,8 +162,8 @@ @@ -169,8 +171,8 @@ @@ -190,7 +192,7 @@ @@ -200,7 +202,7 @@ @@ -221,8 +223,8 @@ @@ -232,7 +234,7 @@ @@ -243,8 +245,8 @@ @@ -253,8 +255,8 @@ @@ -263,8 +265,8 @@ @@ -273,7 +275,7 @@ @@ -285,7 +287,7 @@ diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl index dc22315a3..90fe76420 100644 --- a/template/yoga/search.tpl +++ b/template/yoga/search.tpl @@ -3,8 +3,8 @@
      -
    • (?)
      • -
    • {'home'|@translate}
      • +
    • (?)
      • +
    • {'home'|@translate}

    {'Search'|@translate}

    @@ -106,16 +106,16 @@

    - - + +

    {'Email address'|@translate} {'Groups'|@translate} {'properties'|@translate}{$title}{'Actions'|@translate}
    {$user.EMAIL} {$user.GROUPS} {$user.PROPERTIES}{$data} {'permissions'|@translate} {'Profile'|@translate} - {foreach from=$cpl_link_user[$smarty.foreach.users_loop.index] item=data} + {foreach from=$user.plugin_actions item=data} {$data} {/foreach} {'Status'|@translate} - - {'set to'|@translate} + / {'set to'|@translate} - - + +
    / {'set to'|@translate} - - + +
    {'Privacy level'|@translate} - - {'set to'|@translate} + {'nb_image_per_row'|@translate} - + {'nb_row_per_page'|@translate} - + @@ -210,8 +212,8 @@ {'theme'|@translate} - - {'set to'|@translate} + {'language'|@translate} - - {'set to'|@translate} + {'recent_period'|@translate} - + / {'set to'|@translate} - - + +
    / {'set to'|@translate} - - + +
    / {'set to'|@translate} - - + +
    - + - +