Changeset 2223


Ignore:
Timestamp:
Feb 28, 2008, 3:41:48 AM (16 years ago)
Author:
rvelices
Message:
  • migrate many templates to smarty
Location:
trunk
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/about.php

    r2126 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6262if ( isset($lang['Theme: '.$user['theme']]) )
    6363{
    64   $template->assign_block_vars(
    65   'theme',
    66   array(
    67     'ABOUT' => l10n('Theme: '.$user['theme']),
    68     )
    69   );
     64  $template->assign(
     65    'THEME_ABOUT',l10n('Theme: '.$user['theme'])
     66    );
    7067}
    71 $template->assign_vars(
    72   array(
    73     'U_HOME' => make_index_url(),
    74     )
    75   );
    7668
    77 $template->assign_var('ABOUT_MESSAGE', load_language('about.html','','',true) );
     69$template->assign('ABOUT_MESSAGE', load_language('about.html','','',true) );
    7870
    79 $template->parse('about');
     71$template->pparse('about');
    8072include(PHPWG_ROOT_PATH.'include/page_tail.php');
    8173?>

  • trunk/admin/advanced_feature.php

    r1912 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    7 // | branch        : BSF (Best So Far)
    8 // | file          : $RCSfile$
     7// | file          : $Id$
    98// | last update   : $Date$
    109// | last modifier : $Author$
    … …  
    9089// +-----------------------------------------------------------------------+
    9190
    92 $template->set_filenames(array('advanced_feature'=>'admin/advanced_feature.tpl'));
     91$template->set_filename('advanced_feature', 'admin/advanced_feature.tpl');
    9392
    9493$start_url = get_root_url().'admin.php?page=advanced_feature&action=';
    9594
    96 $template->assign_vars(
     95$template->assign(
    9796  array
    9897  (
    … …  
    101100
    102101// advanced_features
    103 if (count($advanced_features) > 0)
    104 {
    105   foreach ($advanced_features as $advanced_feature)
    106   {
    107     $template->assign_block_vars('advanced_features.advanced_feature', $advanced_feature);
    108   }
    109 }
     102$template->assign('advanced_features', $advanced_features);
    110103
    111104// +-----------------------------------------------------------------------+

  • trunk/admin/cat_list.php

    r2201 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    155155// |                       template initialization                         |
    156156// +-----------------------------------------------------------------------+
    157 $template->set_filenames(array('categories'=>'admin/cat_list.tpl'));
     157$template->set_filename('categories', 'admin/cat_list.tpl');
    158158
    159159$form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
    … …  
    163163}
    164164
    165 $template->assign_vars(array(
     165$template->assign(array(
    166166  'CATEGORIES_NAV'=>$navigation,
    167167  'F_ACTION'=>$form_action,
    168 
    169   'L_ADD_VIRTUAL'=>l10n('cat_add'),
    170   'L_SUBMIT'=>l10n('submit'),
    171   'L_STORAGE'=>l10n('storage'),
    172   'L_NB_IMG'=>l10n('pictures'),
    173   'L_MOVE_UP'=>l10n('up'),
    174   'L_EDIT'=>l10n('edit'),
    175   'L_DELETE'=>l10n('delete'),
    176168 ));
    177169
    178 $tpl = array('cat_first','cat_last');
    179170// +-----------------------------------------------------------------------+
    180171// |                          Categories display                           |
    … …  
    221212    $categories[$row['id_uppercat']]['nb_subcats'] = $row['nb_subcats'];
    222213  }
    223 
    224   $template->assign_block_vars('categories', array());
    225 }
    226 
     214}
     215
     216$template->assign('categories', array());
    227217foreach ($categories as $category)
    228218{
    229   // TODO : not used anymore ?
    230   //$images_folder = PHPWG_ROOT_PATH.'template/';
    231   //$images_folder.= $user['template'].'/admin/images';
    232 
    233219  $base_url = PHPWG_ROOT_PATH.'admin.php?page=';
    234220  $cat_list_url = $base_url.'cat_list';
    … …  
    240226  }
    241227
    242   $template->assign_block_vars(
    243     'categories.category',
     228  $tpl_cat =
    244229    array(
    245230      'NAME'       => $category['name'],
    … …  
    255240      'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
    256241      'U_EDIT'     => $base_url.'cat_modify&cat_id='.$category['id'],
    257       )
     242     
     243      'IS_VIRTUAL' => empty($category['dir'])
    258244    );
    259245
    260246  if (empty($category['dir']))
    261247  {
    262     $template->assign_block_vars(
    263       'categories.category.delete',
    264       array(
    265         'URL'=>$self_url.'&delete='.$category['id']
    266         )
    267       );
    268     $template->assign_block_vars(
    269       'categories.category.virtual',
    270       array(
    271         'CLASS' => 'virtual_cat',
    272         )
    273       );
     248    $tpl_cat['U_DELETE'] = $self_url.'&delete='.$category['id'];
    274249  }
    275250
    276251  if ($category['nb_images'] > 0)
    277252  {
    278     $template->assign_block_vars(
    279       'categories.category.elements',
    280       array(
    281         'URL'=>$base_url.'element_set&cat='.$category['id']
    282         )
    283       );
     253    $tpl_cat['U_MANAGE_ELEMENTS']=
     254      $base_url.'element_set&cat='.$category['id'];
    284255  }
    285256
    286257  if ('private' == $category['status'])
    287258  {
    288     $template->assign_block_vars(
    289       'categories.category.permissions',
    290       array(
    291         'URL'=>$base_url.'cat_perm&cat='.$category['id']
    292         )
    293       );
    294   }
    295 }
    296 // Add a link to Page bottom only if needed (10 or more categories)
    297 if ( isset($category['rank']) and $category['rank'] > 9 )
    298 {
    299   $template->assign_block_vars('eop_link', array('ICON'=>'Displayed'));
     259    $tpl_cat['U_MANAGE_PERMISSIONS']=
     260      $base_url.'cat_perm&cat='.$category['id'];
     261  }
     262  $template->append('categories', $tpl_cat);
    300263}
    301264// +-----------------------------------------------------------------------+

  • trunk/admin/cat_modify.php

    r2201 r2223  
    4444}
    4545
    46 $template->set_filenames( array('categories'=>'admin/cat_modify.tpl') );
    47 
    4846//--------------------------------------------------------- form criteria check
    4947if (isset($_POST['submit']))
    … …  
    209207$category['is_virtual'] = empty($category['dir']) ? true : false;
    210208
     209
    211210// Navigation path
    212211$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=';
    … …  
    218217
    219218$form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='.$_GET['cat_id'];
    220 $status = ($category['status']=='public')?'STATUS_PUBLIC':'STATUS_PRIVATE';
    221 $lock = ($category['visible']=='true')?'UNLOCKED':'LOCKED';
    222 
    223 if ($category['commentable'] == 'true')
    224 {
    225   $commentable = 'COMMENTABLE_TRUE';
    226 }
    227 else
    228 {
    229   $commentable = 'COMMENTABLE_FALSE';
    230 }
    231 if ($category['uploadable'] == 'true')
    232 {
    233   $uploadable = 'UPLOADABLE_TRUE';
    234 }
    235 else
    236 {
    237   $uploadable = 'UPLOADABLE_FALSE';
    238 }
    239219
    240220//----------------------------------------------------- template initialization
     221$template->set_filename( 'categories', 'admin/cat_modify.tpl');
    241222
    242223$base_url = PHPWG_ROOT_PATH.'admin.php?page=';
    … …  
    249230}
    250231
    251 $template->assign_vars(
     232$template->assign(
    252233  array(
    253234    'CATEGORIES_NAV'     => $navigation,
    254     'CAT_NAME'           => $category['name'],
    255     'CAT_COMMENT'        => $category['comment'],
    256 
    257     $status              => 'checked="checked"',
    258     $lock                => 'checked="checked"',
    259     $commentable         => 'checked="checked"',
    260     $uploadable          => 'checked="checked"',
     235    'CAT_NAME'           => @htmlspecialchars($category['name']),
     236    'CAT_COMMENT'        => @htmlspecialchars($category['comment']),
     237
     238    'status_values'     => array('public','private'),
     239    'false_true'        => array('false', 'true'),
     240    'no_yes'            => array('no','yes'),
     241
     242    'CAT_STATUS'        => $category['status'],
     243    'CAT_VISIBLE'       => $category['visible'],
     244    'CAT_COMMENTABLE'   => $category['commentable'],
     245    'CAT_UPLOADABLE'    => $category['uploadable'],
    261246
    262247    'IMG_ORDER_DEFAULT'  => empty($category['image_order']) ?
    263248                              'checked="checked"' : '',
    264 
    265     'L_EDIT_NAME'        => l10n('name'),
    266     'L_STORAGE'          => l10n('storage'),
    267     'L_REMOTE_SITE'      => l10n('remote_site'),
    268     'L_EDIT_COMMENT'     => l10n('description'),
    269     'L_EDIT_STATUS'      => l10n('conf_access'),
    270     'L_STATUS_PUBLIC'    => l10n('public'),
    271     'L_STATUS_PRIVATE'   => l10n('private'),
    272     'L_EDIT_LOCK'        => l10n('lock'),
    273     'L_EDIT_UPLOADABLE'  => l10n('editcat_uploadable'),
    274     'L_EDIT_COMMENTABLE' => l10n('comments'),
    275     'L_YES'              => l10n('yes'),
    276     'L_NO'               => l10n('no'),
    277     'L_SUBMIT'           => l10n('submit'),
    278     'L_SET_RANDOM_REPRESENTANT'=>l10n('cat_representant'),
    279249
    280250    'U_JUMPTO' => make_index_url(
    … …  
    296266if ('private' == $category['status'])
    297267{
    298   $template->assign_block_vars(
    299     'permissions',
    300     array(
    301       'URL'=>$base_url.'cat_perm&cat='.$category['id']
    302         )
     268  $template->assign( 'U_MANAGE_PERMISSIONS',
     269      $base_url.'cat_perm&cat='.$category['id']
    303270    );
    304271}
    … …  
    307274if ($category['nb_images'] > 0)
    308275{
    309   $template->assign_block_vars(
    310     'elements',
     276  $template->assign( 'U_MANAGE_ELEMENTS',
     277        $base_url.'element_set&cat='.$category['id']
     278    );
     279}
     280
     281if ($category['is_virtual'])
     282{
     283  $template->assign(
    311284    array(
    312       'URL'=>$base_url.'element_set&cat='.$category['id']
     285      'U_DELETE' => $self_url.'&delete='.$category['id'],
    313286      )
    314287    );
    315288}
     289else
     290{
     291  $category['cat_full_dir'] = get_complete_dir($_GET['cat_id']);
     292  $template->assign(
     293    array(
     294      'CAT_FULL_DIR'       => preg_replace('/\/$/',
     295                                    '',
     296                                    $category['cat_full_dir'] )
     297      )
     298    );
     299  if (!url_is_remote($category['cat_full_dir']) )
     300  {
     301    $template->assign('SHOW_UPLOADABLE', true);
     302  }
     303}
    316304
    317305// image order management
    318 $matches = array();
    319 if ( !empty( $category['image_order'] ) )
    320 {
    321   preg_match_all('/([a-z_]+) *(?:(asc|desc)(?:ending)?)? *(?:, *|$)/i',
    322     $category['image_order'], $matches);
    323 }
    324306
    325307$sort_fields = array(
    … …  
    333315  );
    334316
     317$sort_directions = array(
     318  'ASC' => l10n('ascending'),
     319  'DESC' => l10n('descending'),
     320  );
     321
     322$template->assign( 'image_order_field_options', $sort_fields);
     323$template->assign( 'image_order_direction_options', $sort_directions);
     324
     325$matches = array();
     326if ( !empty( $category['image_order'] ) )
     327{
     328  preg_match_all('/([a-z_]+) *(?:(asc|desc)(?:ending)?)? *(?:, *|$)/i',
     329    $category['image_order'], $matches);
     330}
     331
    335332for ($i=0; $i<3; $i++) // 3 fields
    336333{
    337   $template->assign_block_vars('image_order', array('NUMBER'=>$i+1) );
    338   foreach ($sort_fields as $sort_field => $name)
    339   {
    340     $selected='';
    341     if ( isset($matches[1][$i]) and $matches[1][$i]==$sort_field )
    342     {
    343       $selected='selected="selected"';
    344     }
    345     elseif ( empty($sort_field) )
    346     {
    347       $selected='selected="selected"';
    348     }
    349 
    350     $template->assign_block_vars('image_order.field',
    351       array(
    352         'SELECTED' => $selected,
    353         'VALUE' => $sort_field,
    354         'OPTION' => $name
    355         )
    356       );
    357   }
    358 
    359   $template->assign_block_vars('image_order.order',
    360     array(
    361       'SELECTED' =>
    362         ( empty($matches[2][$i]) or strcasecmp($matches[2][$i],'ASC')==0 )
    363           ? 'selected="selected"' : '',
    364       'VALUE' => 'ASC',
    365       'OPTION' => 'Ascending'
    366       )
    367     );
    368 
    369   $template->assign_block_vars('image_order.order',
    370     array(
    371       'SELECTED' =>
    372         ( isset($matches[2][$i]) and strcasecmp($matches[2][$i],'DESC')==0 )
    373           ? 'selected="selected"' : '',
    374       'VALUE' => 'DESC',
    375       'OPTION' => 'Descending'
    376       )
    377     );
     334  $tpl_image_order_select = array(
     335      'ID' => $i+1,
     336      'FIELD' => array(''),
     337      'DIRECTION' => array('ASC'),
     338    );
     339 
     340  if ( isset($matches[1][$i]) )
     341  {
     342    $tpl_image_order_select['FIELD'] = array($matches[1][$i]);
     343  }
     344 
     345  if (isset($matches[2][$i]) and strcasecmp($matches[2][$i],'DESC')==0)
     346  {
     347    $tpl_image_order_select['DIRECTION'] = array('DESC');
     348  }
     349  $template->append( 'image_orders', $tpl_image_order_select);
    378350}
    379351
    … …  
    383355    or !empty($category['representative_picture_id']))
    384356{
    385   $template->assign_block_vars('representant', array());
     357  $tpl_representant = array();
    386358
    387359  // picture to display : the identified representant or the generic random
    … …  
    399371    $url.= '&amp;image_id='.$category['representative_picture_id'];
    400372
    401     $template->assign_block_vars(
    402       'representant.picture',
     373    $tpl_representant['picture'] =
    403374      array(
    404375        'SRC' => $src,
    405376        'URL' => $url
    406         )
    407377      );
    408378  }
    409   else // $category['nb_images'] > 0
    410   {
    411     $template->assign_block_vars('representant.random', array());
    412   }
    413379
    414380  // can the admin choose to set a new random representant ?
    415   if ($category['nb_images'] > 0)
    416   {
    417     $template->assign_block_vars('representant.set_random', array());
    418   }
     381  $tpl_representant['ALLOW_SET_RANDOM'] = ($category['nb_images']>0) ? true : false;
    419382
    420383  // can the admin delete the current representant ?
    … …  
    426389     and !empty($category['representative_picture_id'])))
    427390  {
    428     $template->assign_block_vars('representant.delete_representant', array());
    429   }
    430 }
    431 
    432 if (!$category['is_virtual'])
    433 {
    434   $template->assign_block_vars(
    435     'storage',
    436     array('CATEGORY_DIR'=>preg_replace('/\/$/',
    437                                        '',
    438                                        get_complete_dir($category['id']))));
    439 }
    440 else
    441 {
    442   $template->assign_block_vars(
    443     'delete',
    444     array(
    445       'URL'=>$self_url.'&amp;delete='.$category['id']
    446       )
    447     );
    448 
    449   $template->assign_block_vars('move', array());
    450 
     391    $tpl_representant['ALLOW_DELETE'] = true;
     392  }
     393  $template->assign('representant', $tpl_representant);
     394}
     395
     396if ($category['is_virtual'])
     397{
    451398  // the category can be moved in any category but in itself, in any
    452399  // sub-category
    453400  $unmovables = get_subcat_ids(array($category['id']));
    454401
    455   $blockname = 'move.parent_option';
    456 
    457   $template->assign_block_vars(
    458     $blockname,
    459     array(
    460       'SELECTED'
    461         => empty($category['id_uppercat']) ? 'selected="selected"' : '',
    462       'VALUE'=> 0,
    463       'OPTION' => '------------'
    464       )
    465     );
    466 
    467402  $query = '
    468403SELECT id,name,uppercats,global_rank
    … …  
    474409    $query,
    475410    empty($category['id_uppercat']) ? array() : array($category['id_uppercat']),
    476     $blockname
    477     );
    478 }
    479 
    480 $category['cat_dir'] = get_complete_dir($_GET['cat_id']);
    481 if (is_numeric($category['site_id']) and url_is_remote($category['cat_dir']) )
    482 {
    483   $query = '
    484 SELECT galleries_url
    485   FROM '.SITES_TABLE.'
    486   WHERE id = '.$category['site_id'].'
    487 ;';
    488   list($galleries_url) = mysql_fetch_array(pwg_query($query));
    489   $template->assign_block_vars('server', array('SITE_URL' => $galleries_url));
    490 }
    491 
    492 if (!$category['is_virtual'] and !url_is_remote($category['cat_dir']) )
    493 {
    494   $template->assign_block_vars('upload' ,array());
    495 }
    496 
    497 $blockname = 'category_option_parent';
    498 
    499 $template->assign_block_vars(
    500   $blockname,
    501   array(
    502     'VALUE'=> 0,
    503     'OPTION' => '------------'
    504     )
    505   );
    506 
     411    'move_cat_options'
     412    );
     413}
     414
     415
     416// create virtual in parent and link
    507417$query = '
    508418SELECT id,name,uppercats,global_rank
    509419  FROM '.CATEGORIES_TABLE.'
    510420;';
    511 
    512421display_select_cat_wrapper(
    513422  $query,
    514423  array(),
    515   $blockname
     424  'create_new_parent_options'
    516425  );
     426
    517427
    518428// destination categories
    … …  
    522432  WHERE id != '.$category['id'].'
    523433;';
    524 
    525434display_select_cat_wrapper(
    526435  $query,
    527436  array(),
    528   'category_option_destination'
     437  'category_destination_options'
    529438  );
    530439
    … …  
    636545  ORDER BY name ASC
    637546;';
    638   $result = pwg_query($query);
    639 
    640   while ($row = mysql_fetch_array($result))
    641   {
    642     $template->assign_block_vars(
    643       'group_mail.group_option',
    644       array(
    645         'VALUE' => $row['id'],
    646         'OPTION' => $row['name'],
    647         )
    648       );
    649   }
     547  $template->assign('group_mail_options',
     548      simple_hash_from_query($query, 'id', 'name')
     549    );
    650550}
    651551

  • trunk/admin/cat_move.php

    r1961 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6565// |                       template initialization                         |
    6666// +-----------------------------------------------------------------------+
     67$template->set_filename('cat_move', 'admin/cat_move.tpl');
    6768
    68 $template->set_filenames(
    69   array(
    70     'cat_move' => 'admin/cat_move.tpl'
    71     )
    72   );
    73 
    74 $template->assign_vars(
     69$template->assign(
    7570  array(
    7671    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_move',
    … …  
    8883  WHERE dir IS NULL
    8984;';
    90 
    9185display_select_cat_wrapper(
    9286  $query,
    9387  array(),
    94   'category_option_selection'
    95   );
    96 
    97 $blockname = 'category_option_parent';
    98 
    99 $template->assign_block_vars(
    100   $blockname,
    101   array(
    102     'VALUE'=> 0,
    103     'OPTION' => '------------'
    104     )
     88  'category_to_move_options'
    10589  );
    10690
    … …  
    11397  $query,
    11498  array(),
    115   $blockname
     99  'category_parent_options'
    116100  );
    117101

  • trunk/admin/cat_options.php

    r2201 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    150150  );
    151151
    152 $page['section'] = isset($_GET['section']) ? $_GET['section'] : 'upload';
     152$page['section'] = isset($_GET['section']) ? $_GET['section'] : 'status';
    153153$base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_options&amp;section=';
    154154
    155 $template->assign_vars(
     155$template->assign(
    156156  array(
    157     'L_SUBMIT'=>l10n('submit'),
    158     'L_RESET'=>l10n('reset'),
    159 
    160157    'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_options',
    161    
    162158    'F_ACTION'=>$base_url.$page['section']
    163159   )
    … …  
    166162// TabSheet initialization
    167163$opt_link = $link_start.'cat_options&amp;section=';
    168 $page['tabsheet'] = array
     164$tabsheet = array
    169165(
     166  'status' => array
     167   (
     168    'caption' => l10n('cat_security'),
     169    'url' => $opt_link.'status'
     170   ),
     171  'visible' => array
     172   (
     173    'caption' => l10n('lock'),
     174    'url' => $opt_link.'visible'
     175   ),
    170176  'upload' => array
    171177   (
    … …  
    178184    'url' => $opt_link.'comments'
    179185   ),
    180   'visible' => array
    181    (
    182     'caption' => l10n('lock'),
    183     'url' => $opt_link.'visible'
    184    ),
    185   'status' => array
    186    (
    187     'caption' => l10n('cat_security'),
    188     'url' => $opt_link.'status'
    189    )
    190186);
    191187
    192188if ($conf['allow_random_representative'])
    193189{
    194   $page['tabsheet']['representative'] =
     190  $tabsheet['representative'] =
    195191    array
    196192    (
    … …  
    199195    );
    200196}
    201 $page['tabsheet'][$page['section']]['selected'] = true;
     197$tabsheet[$page['section']]['selected'] = true;
    202198
    203199// Assign tabsheet to template
    204 template_assign_tabsheet();
     200$template->assign(
     201    array(
     202      'tabsheet' => $tabsheet,
     203      'TABSHEET_TITLE' => $tabsheet[$page['section']]['caption']
     204    )
     205  );
    205206
    206207// +-----------------------------------------------------------------------+
    … …  
    237238    AND site_id = 1
    238239;';
    239     $template->assign_vars(
     240    $template->assign(
    240241      array(
    241242        'L_SECTION' => l10n('cat_upload_title'),
    … …  
    258259  WHERE commentable = \'false\'
    259260;';
    260     $template->assign_vars(
     261    $template->assign(
    261262      array(
    262263        'L_SECTION' => l10n('cat_comments_title'),
    … …  
    279280  WHERE visible = \'false\'
    280281;';
    281     $template->assign_vars(
     282    $template->assign(
    282283      array(
    283284        'L_SECTION' => l10n('cat_lock_title'),
    … …  
    300301  WHERE status = \'private\'
    301302;';
    302     $template->assign_vars(
     303    $template->assign(
    303304      array(
    304305        'L_SECTION' => l10n('cat_status_title'),
    … …  
    322323    AND representative_picture_id IS NULL
    323324;';
    324     $template->assign_vars(
     325    $template->assign(
    325326      array(
    326327        'L_SECTION' => l10n('Representative'),

  • trunk/admin/cat_perm.php

    r1961 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    7373// +-----------------------------------------------------------------------+
    7474
    75 if (isset($_POST) and false)
    76 {
    77   echo '<pre>';
    78   print_r($_POST);
    79   echo '</pre>';
    80 }
    8175
    8276if (isset($_POST['deny_groups_submit'])
    … …  
    203197// +-----------------------------------------------------------------------+
    204198
    205 $template->set_filenames(array('cat_perm'=>'admin/cat_perm.tpl'));
     199$template->set_filename('cat_perm', 'admin/cat_perm.tpl');
    206200
    207201$template->assign_vars(
    … …  
    231225  ORDER BY name ASC
    232226;';
    233 $result = pwg_query($query);
    234 
    235 while ($row = mysql_fetch_array($result))
    236 {
    237   $groups[$row['id']] = $row['name'];
    238 }
    239 
     227$groups = simple_hash_from_query($query, 'id', 'name');
     228$template->assign('all_groups', $groups);
     229
     230// groups granted to access the category
    240231$query = '
    241232SELECT group_id
    … …  
    244235;';
    245236$group_granted_ids = array_from_query($query, 'group_id');
    246 
    247 // groups granted to access the category
    248 foreach ($group_granted_ids as $group_id)
    249 {
    250   $template->assign_block_vars(
    251     'group_granted',
    252     array(
    253       'NAME'=>$groups[$group_id],
    254       'ID'=>$group_id
    255       )
    256     );
    257 }
     237$template->assign('group_granted_ids', $group_granted_ids);
     238
    258239
    259240// groups denied
    260 foreach (array_diff(array_keys($groups), $group_granted_ids) as $group_id)
    261 {
    262   $template->assign_block_vars(
    263     'group_denied',
    264     array(
    265       'NAME'=>$groups[$group_id],
    266       'ID'=>$group_id
    267       )
    268     );
    269 }
     241$template->assign('group_denied_ids',
     242      array_diff(array_keys($groups), $group_granted_ids)
     243  );
    270244
    271245// users...
    … …  
    277251  FROM '.USERS_TABLE.'
    278252;';
    279 $result = pwg_query($query);
    280 while($row = mysql_fetch_array($result))
    281 {
    282   $users[$row['id']] = $row['username'];
    283 }
     253$users = simple_hash_from_query($query, 'id', 'username');
     254$template->assign('all_users', $users);
     255
    284256
    285257$query = '
    … …  
    290262$user_granted_direct_ids = array_from_query($query, 'user_id');
    291263
    292 foreach ($user_granted_direct_ids as $user_id)
    293 {
    294   $template->assign_block_vars(
    295     'user_granted',
    296     array(
    297       'NAME'=>$users[$user_id],
    298       'ID'=>$user_id
    299       )
    300     );
    301 }
     264$template->assign('user_granted_direct_ids', $user_granted_direct_ids);
     265
     266
    302267
    303268$user_granted_indirect_ids = array();
    … …  
    336301  foreach ($user_granted_indirect_ids as $user_id)
    337302  {
    338     $group = '';
    339    
    340303    foreach ($granted_groups as $group_id => $group_users)
    341304    {
    342305      if (in_array($user_id, $group_users))
    343306      {
    344         $group = $groups[$group_id];
     307        $template->append(
     308          'user_granted_indirects',
     309          array(
     310            'USER'=>$users[$user_id],
     311            'GROUP'=>$groups[$group_id]
     312            )
     313          );
    345314        break;
    346315      }
    347316    }
    348    
    349     $template->assign_block_vars(
    350       'user_granted_indirect',
    351       array(
    352         'NAME'=>$users[$user_id],
    353         'GROUP'=>$group
    354         )
    355       );
    356317  }
    357318}
    … …  
    360321                              $user_granted_indirect_ids,
    361322                              $user_granted_direct_ids);
    362 
    363 foreach ($user_denied_ids as $user_id)
    364 {
    365   $template->assign_block_vars(
    366     'user_denied',
    367     array(
    368       'NAME'=>$users[$user_id],
    369       'ID'=>$user_id
    370       )
    371     );
    372 }
     323$template->assign('user_denied_ids', $user_denied_ids);
    373324
    374325

  • trunk/admin/include/functions_tabsheet.inc.php

    r1912 r2223  
    4242{
    4343  global $page, $template;
     44//THIS SHOULD BE DEPRECATED ?
     45 
     46  $template->set_filename('tabsheet', 'admin/tabsheet.tpl');
     47  $template->assign('tabsheet', $page['tabsheet']);
    4448
    45   if (count($page['tabsheet']) > 0)
     49  foreach ($page['tabsheet'] as $tab_name => $tab)
    4650  {
    47     $template->set_filename('tabsheet', 'admin/tabsheet.tpl');
     51    $is_selected = isset($tab['selected']) and $tab['selected'] === true;
     52    if ($is_selected)
     53    {
     54      $template->assign_vars(
     55        array('TABSHEET_TITLE' => '['.$tab['caption'].']'));
     56      break;
     57    }
     58  }
    4859
    49     foreach ($page['tabsheet'] as $tab_name => $tab)
    50     {
    51       $is_selected = isset($tab['selected']) and $tab['selected'] === true;
    52       $template->assign_block_vars
    53       (
    54         'tab',
    55         array
    56         (
    57           'CLASSNAME' => ($is_selected ? 'selected_tab' : 'normal_tab'),
    58           'URL' => $tab['url'],
    59           'CAPTION' => $tab['caption']
    60         )
    61       );
    62 
    63       if ($is_selected)
    64       {
    65         $template->assign_vars(
    66           array('TABSHEET_TITLE' => '['.$tab['caption'].']'));
    67       }
    68     }
    69 
    70     $template->assign_var_from_handle('TABSHEET', 'tabsheet');
    71   }
     60  $template->assign_var_from_handle('TABSHEET', 'tabsheet');
     61  $template->clear_assign('tabsheet');
    7262}
    7363

  • trunk/admin/permalinks.php

    r2119 r2223  
    22// +-----------------------------------------------------------------------+
    33// | PhpWebGallery - a PHP based picture gallery                           |
    4 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     4// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    55// +-----------------------------------------------------------------------+
    66// | file          : $Id$
    … …  
    7373    if ( isset($template_var) )
    7474    {
    75       $template->assign_var( $template_var.strtoupper($field),
     75      $template->assign( $template_var.strtoupper($field),
    7676            '<a href="'.$url.$anchor.'" title="'.l10n('Sort order').'">'.$disp.'</a>'
    7777         );
    … …  
    147147  usort($categories, 'global_rank_compare');
    148148}
    149 foreach ($categories as $cat)
    150 {
    151   $template->assign_block_vars( 'permalink', $cat );
    152 }
    153 
     149$template->assign( 'permalinks', $categories );
    154150
    155151// --- generate display of old permalinks --------------------------------------
    … …  
    168164}
    169165$result = pwg_query($query);
     166$deleted_permalinks=array();
    170167while ( $row=mysql_fetch_assoc($result) )
    171168{
    … …  
    176173        array( 'delete_permanent'=> $row['permalink'] )
    177174      );
    178   $template->assign_block_vars( 'deleted_permalink', $row );
     175  $deleted_permalinks[] = $row;
    179176}
    180 
    181 $template->assign_var('U_HELP', get_root_url().'popuphelp.php?page=permalinks');
     177$template->assign('deleted_permalinks', $deleted_permalinks);
     178$template->assign('U_HELP', get_root_url().'popuphelp.php?page=permalinks');
    182179
    183180$template->assign_var_from_handle('ADMIN_CONTENT', 'permalinks');

  • trunk/admin/rating.php

    r1912 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    6 // +-----------------------------------------------------------------------+
    7 // | branch        : BSF (Best So Far)
    8 // | file          : $RCSfile$
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
     6// +-----------------------------------------------------------------------+
     7// | file          : $Id$
    98// | last update   : $Date$
    109// | last modifier : $Author$
    … …  
    116115// +-----------------------------------------------------------------------+
    117116
    118 $template->set_filenames(array('rating'=>'admin/rating.tpl'));
    119 
    120 $template->assign_vars(
     117$template->set_filename('rating', 'admin/rating.tpl');
     118
     119$template->assign(
    121120  array(
    122121    'NAVBAR' => create_navigation_bar(
    … …  
    125124      $start,
    126125      $elements_per_page
    127       )
     126      ),
     127    'F_ACTION' => PHPWG_ROOT_PATH.'admin.php',
     128    'DISPLAY' => $elements_per_page,
     129    'NB_ELEMENTS' => $nb_images,
    128130    )
    129131  );
    130132
    131133
    132 $template->assign_vars(
    133   array(
    134     'F_ACTION' => PHPWG_ROOT_PATH.'admin.php',
    135     'DISPLAY' => $elements_per_page,
    136     'NB_ELEMENTS' => $nb_images
    137     )
    138   );
    139134
    140135$available_order_by= array(
    … …  
    152147for ($i=0; $i<count($available_order_by); $i++)
    153148{
    154   $template->assign_block_vars(
    155     'order_by',
    156     array(
    157       'VALUE' => $i,
    158       'CONTENT' => $available_order_by[$i][0],
    159       'SELECTED' => $i==$order_by_index ? 'SELECTED' : ''
    160       )
     149  $template->append(
     150    'order_by_options',
     151    $available_order_by[$i][0]
    161152    );
    162153}
     154$template->assign('order_by_options_selected', array($order_by_index) );
     155
    163156
    164157$user_options = array(
    165   array(
    166     'value' => 'all',
    167     'content' => l10n('all'),
    168     ),
    169   array(
    170     'value' => 'user',
    171     'content' => l10n('Users'),
    172     ),
    173   array(
    174     'value' => 'guest',
    175     'content' => l10n('Guests'),
    176     ),
     158  'all'   => l10n('all'),
     159  'user'  => l10n('Users'),
     160  'guest' => l10n('Guests'),
    177161  );
    178162
    179 foreach ($user_options as $user_option)
    180 {
    181   $template->assign_block_vars(
    182     'user_option',
    183     array(
    184       'VALUE' => $user_option['value'],
    185       'CONTENT' => $user_option['content'],
    186       'SELECTED' =>
    187         (isset($_GET['users']) and $_GET['users'] == $user_option['value'])
    188         ? 'selected="selected"'
    189         : '',
    190       )
    191     );
    192 }
     163$template->assign('user_options', $user_options );
     164$template->assign('user_options_selected', array(@$_GET['users']) );
     165
    193166
    194167$query = '
    … …  
    218191}
    219192
     193$template->assign( 'images', array() );
    220194foreach ($images as $image)
    221195{
    … …  
    232206  $nb_rates = mysql_num_rows($result);
    233207
    234   $template->assign_block_vars('image',
     208  $tpl_image =
    235209     array(
    236210       'U_THUMB' => $thumbnail_src,
    … …  
    239213       'STD_RATE' => $image['std_rates'],
    240214       'SUM_RATE' => $image['sum_rates'],
    241        'NB_RATES' =>  $image['nb_rates'],
    242        'NB_RATES_TOTAL' =>  $nb_rates,
     215       'NB_RATES' => (int)$image['nb_rates'],
     216       'NB_RATES_TOTAL' => (int)$nb_rates,
    243217       'FILE' => $image['file'],
    244        'NB_RATES_PLUS1' => $nb_rates+1,
    245      )
     218       'rates'  => array()
    246219   );
    247220
    … …  
    271244    }
    272245
    273     $template->assign_block_vars('image.rate',
     246    $tpl_image['rates'][] =
    274247       array(
    275248         'DATE' => format_date($row['date']),
    … …  
    277250         'USER' => $user,
    278251         'U_DELETE' => $url_del
    279        )
    280252     );
    281253  }
    282 }
    283 //print_r($template->_tpldata);
     254  $template->append( 'images', $tpl_image );
     255}
     256
    284257// +-----------------------------------------------------------------------+
    285258// |                           sending html code                           |

  • trunk/comments.php

    r2134 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    3737
    3838$sort_order = array(
    39   'descending' => 'DESC',
    40   'ascending' => 'ASC'
     39  'DESC' => l10n('descending'),
     40  'ASC'  => l10n('ascending')
    4141  );
    4242
    4343// sort_by : database fields proposed for sorting comments list
    4444$sort_by = array(
    45   'date' => 'comment date',
    46   'image_id' => 'picture'
     45  'date' => l10n('comment date'),
     46  'image_id' => l10n('picture')
    4747  );
    4848
    … …  
    7676// order to sort
    7777//
    78 $page['sort_order'] = $sort_order['descending'];
     78$page['sort_order'] = 'DESC';
    7979// if the form was submitted, it overloads default behaviour
    8080if (isset($_GET['sort_order']))
    8181{
    82   $page['sort_order'] = $sort_order[$_GET['sort_order']];
     82  $page['sort_order'] = $_GET['sort_order'];
    8383}
    8484
    … …  
    177177
    178178$template->set_filenames(array('comments'=>'comments.tpl'));
    179 $template->assign_vars(
     179$template->assign(
    180180  array(
    181     'L_COMMENT_TITLE' => $title,
    182 
    183181    'F_ACTION'=>PHPWG_ROOT_PATH.'comments.php',
    184182    'F_KEYWORD'=>@htmlspecialchars(stripslashes($_GET['keyword'])),
    185183    'F_AUTHOR'=>@htmlspecialchars(stripslashes($_GET['author'])),
    186 
    187     'U_HOME' => make_index_url(),
    188184    )
    189185  );
    … …  
    194190
    195191// Search in a particular category
    196 $blockname = 'category';
    197 
    198 $template->assign_block_vars(
    199   $blockname,
    200   array('SELECTED' => '',
    201         'VALUE'=> 0,
    202         'OPTION' => '------------'
    203     ));
     192$blockname = 'categories';
    204193
    205194$query = '
    … …  
    219208
    220209// Filter on recent comments...
    221 $blockname = 'since_option';
    222 
     210$tpl_var=array();
    223211foreach ($since_options as $id => $option)
    224212{
    225   $selected = ($id == $page['since']) ? 'selected="selected"' : '';
    226 
    227   $template->assign_block_vars(
    228     $blockname,
    229     array('SELECTED' => $selected,
    230           'VALUE'=> $id,
    231           'CONTENT' => $option['label']
    232       ));
    233 }
     213  $tpl_var[ $id ] = $option['label'];
     214}
     215$template->assign( 'since_options', $tpl_var);
     216$template->assign( 'since_options_selected', $page['since']);
    234217
    235218// Sort by
    236 $blockname = 'sort_by_option';
    237 
    238 foreach ($sort_by as $key => $value)
    239 {
    240   $selected = ($key == $page['sort_by']) ? 'selected="selected"' : '';
    241 
    242   $template->assign_block_vars(
    243     $blockname,
    244     array('SELECTED' => $selected,
    245           'VALUE'=> $key,
    246           'CONTENT' => l10n($value)
    247       ));
    248 }
     219$template->assign( 'sort_by_options', $sort_by);
     220$template->assign( 'sort_by_options_selected', $page['sort_by']);
    249221
    250222// Sorting order
    251 $blockname = 'sort_order_option';
    252 
    253 foreach (array_keys($sort_order) as $option)
    254 {
    255   $selected = ($option == $page['sort_order']) ? 'selected="selected"' : '';
    256 
    257   $template->assign_block_vars(
    258     $blockname,
    259     array('SELECTED' => $selected,
    260           'VALUE'=> $option,
    261           'CONTENT' => l10n($option)
    262       ));
    263 }
     223$template->assign( 'sort_order_options', $sort_order);
     224$template->assign( 'sort_order_options_selected', $page['sort_order']);
     225
    264226
    265227// Number of items
    266228$blockname = 'items_number_option';
    267 
     229$tpl_var=array();
    268230foreach ($items_number as $option)
    269231{
    270   $selected = ($option == $page['items_number']) ? 'selected="selected"' : '';
    271 
    272   $template->assign_block_vars(
    273     $blockname,
    274     array('SELECTED' => $selected,
    275           'VALUE'=> $option,
    276           'CONTENT' => is_numeric($option) ? $option : l10n($option)
    277       ));
    278 }
     232  $tpl_var[ $option ] = is_numeric($option) ? $option : l10n($option);
     233}
     234$template->assign( 'item_number_options', $tpl_var);
     235$template->assign( 'item_number_options_selected', $page['items_number']);
     236
    279237
    280238// +-----------------------------------------------------------------------+
    … …  
    311269                                '');
    312270
    313 $template->assign_vars(array('NAVBAR' => $navbar));
     271$template->assign('NAVBAR', $navbar);
    314272
    315273// +-----------------------------------------------------------------------+
    … …  
    404362    }
    405363
    406     $template->assign_block_vars(
    407       'comment',
     364    $tpl_comment =
    408365      array(
    409366        'U_PICTURE' => $url,
    … …  
    413370        'DATE'=>format_date($comment['date'],'mysql_datetime',true),
    414371        'CONTENT'=>trigger_event('render_comment_content',$comment['content']),
    415         ));
     372        );
    416373
    417374    if ( is_admin() )
    418375    {
    419376      $url = get_root_url().'comments.php'.get_query_string_diff(array('delete','validate'));
    420       $template->assign_block_vars(
    421         'comment.action_delete',
    422         array(
    423           'U_DELETE' => add_url_params($url,
     377      $tpl_comment['U_DELETE'] = add_url_params($url,
    424378                          array('delete'=>$comment['comment_id'])
    425                          ),
    426           ));
     379                         );
     380
    427381      if ($comment['validated'] != 'true')
    428382      {
    429         $template->assign_block_vars(
    430           'comment.action_validate',
    431           array(
    432             'U_VALIDATE' => add_url_params($url,
     383        $tpl_comment['U_VALIDATE'] = add_url_params($url,
    433384                            array('validate'=>$comment['comment_id'])
    434                            ),
    435             ));
     385                           );
    436386      }
    437387    }
     388    $template->append('comments', $tpl_comment);
    438389  }
    439390}
    … …  
    442393// +-----------------------------------------------------------------------+
    443394include(PHPWG_ROOT_PATH.'include/page_header.php');
    444 $template->parse('comments');
     395$template->pparse('comments');
    445396include(PHPWG_ROOT_PATH.'include/page_tail.php');
    446397?>

  • trunk/identification.php

    r2029 r2223  
    7171$template->set_filenames( array('identification'=>'identification.tpl') );
    7272
    73 $template->assign_vars(
     73$template->assign(
    7474  array(
    75     'U_REGISTER' => PHPWG_ROOT_PATH.'register.php',
    76     'U_LOST_PASSWORD' => PHPWG_ROOT_PATH.'password.php',
    77     'U_HOME' => make_index_url(),
     75    'U_LOST_PASSWORD' => get_root_url().'password.php',
    7876    'U_REDIRECT' => $redirect_to,
    7977
    80     'F_LOGIN_ACTION' => PHPWG_ROOT_PATH.'identification.php'
     78    'F_LOGIN_ACTION' => get_root_url().'identification.php',
     79    'authorize_remembering' => $conf['authorize_remembering'],
    8180    ));
    8281
    83 if ($conf['authorize_remembering'])
    84 {
    85   $template->assign_block_vars('remember_me',array());
    86 }
    8782if ($conf['allow_user_registration'])
    8883{
    89   $template->assign_block_vars('register',array());
     84  $template->assign('U_REGISTER', get_root_url().'register.php' );
    9085}
    9186
    … …  
    9388if ( sizeof( $errors ) != 0 )
    9489{
    95   $template->assign_block_vars('errors',array());
    96   for ( $i = 0; $i < sizeof( $errors ); $i++ )
    97   {
    98     $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i]));
    99   }
     90  $template->assign('errors', $errors);
    10091}
    101 //-------------------------------------------------------------- visit as guest
    102 $template->assign_block_vars('free_access',array());
     92
    10393//----------------------------------------------------------- html code display
    104 $template->parse('identification');
     94$template->pparse('identification');
    10595include(PHPWG_ROOT_PATH.'include/page_tail.php');
    10696?>

  • trunk/include/functions_category.inc.php

    r2117 r2223  
    279279  global $template;
    280280
     281  // TODO - remove from here after old template removed
    281282  foreach ($categories as $category)
    282283  {
    … …  
    300301    }
    301302
    302     $template->assign_block_vars(
     303    $template->_old->assign_block_vars(
    303304      $blockname,
    304305      array('SELECTED'=>$selected,
    … …  
    307308        ));
    308309  }
     310  // TODO - remove until here after old template removed
     311  $tpl_cats = array();
     312  foreach ($categories as $category)
     313  {
     314    if ($fullname)
     315    {
     316      $option = get_cat_display_name_cache($category['uppercats'],
     317                                           null,
     318                                           false);
     319    }
     320    else
     321    {
     322      $option = str_repeat('&nbsp;',
     323                           (3 * substr_count($category['global_rank'], '.')));
     324      $option.= '- '.$category['name'];
     325    }
     326    $tpl_cats[ $category['id'] ] = $option;
     327  }
     328
     329  $template->smarty->assign( $blockname, $tpl_cats);
     330  $template->smarty->assign( $blockname.'_selected', $selecteds);
    309331}
    310332

  • trunk/password.php

    r1951 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    147147$title = l10n('Forgot your password?');
    148148$page['body_id'] = 'thePasswordPage';
    149 include(PHPWG_ROOT_PATH.'include/page_header.php');
     149
    150150$template->set_filenames(array('password'=>'password.tpl'));
    151 
    152 $template->assign_vars(
    153   array(
    154     'U_HOME' => make_index_url(),
     151$template->assign( array(
     152    'F_ACTION'=> get_root_url().'password.php'
    155153    )
    156154  );
    157 
    158155// +-----------------------------------------------------------------------+
    159156// |                        infos & errors display                         |
    160157// +-----------------------------------------------------------------------+
    161 
    162 if (count($page['errors']) != 0)
    163 {
    164   $template->assign_block_vars('errors', array());
    165  
    166   foreach ($page['errors'] as $error)
    167   {
    168     $template->assign_block_vars(
    169       'errors.error',
    170       array(
    171         'ERROR' => $error
    172         )
    173       );
    174   }
    175 }
    176 
    177 if (count($page['infos']) != 0)
    178 {
    179   $template->assign_block_vars('infos', array());
    180  
    181   foreach ($page['infos'] as $info)
    182   {
    183     $template->assign_block_vars(
    184       'infos.info',
    185       array(
    186         'INFO' => $info
    187         )
    188       );
    189   }
    190 }
     158$template->assign('errors', $page['errors']);
     159$template->assign('infos', $page['infos']);
    191160
    192161// +-----------------------------------------------------------------------+
    193162// |                           html code display                           |
    194163// +-----------------------------------------------------------------------+
    195 
    196 $template->parse('password');
     164include(PHPWG_ROOT_PATH.'include/page_header.php');
     165$template->pparse('password');
    197166include(PHPWG_ROOT_PATH.'include/page_tail.php');
    198167

  • trunk/plugins/admin_multi_view/controller.php

    r2127 r2223  
    1111  pwg_unset_session_var( 'multiview_show_queries' );
    1212  pwg_unset_session_var( 'multiview_debug_l10n' );
     13  pwg_unset_session_var( 'multiview_debug_template' );
    1314?>
    1415
    … …  
    6970}
    7071
     72
     73if ( isset($_GET['debug_template']) )
     74{
     75  if ( $_GET['debug_template']>0 )
     76    pwg_set_session_var( 'multiview_debug_template', 1 );
     77  else
     78    pwg_unset_session_var( 'multiview_debug_template' );
     79  $refresh_main = true;
     80}
     81
    7182$my_url = get_root_url().'plugins/'.basename(dirname(__FILE__)).'/'.basename(__FILE__);
    7283$my_template = '';
    … …  
    110121
    111122$debug_l10n_html='';
    112 if (!$conf['show_queries'])
     123if (!$conf['debug_l10n'])
    113124{
    114125  $debug_l10n_html = '<br/>';
    … …  
    118129    $debug_l10n_html.='<a href="'.$my_url.'?debug_l10n=0">Revert debug language</a>';
    119130}
     131
     132$debug_template_html='';
     133if (!$conf['debug_template'])
     134{
     135  $debug_template_html = '<br/>';
     136  if ( !pwg_get_session_var( 'multiview_debug_template', 0 ) )
     137    $debug_template_html.='<a href="'.$my_url.'?debug_template=1">Debug template</a>';
     138  else
     139    $debug_template_html.='<a href="'.$my_url.'?debug_template=0">Revert debug template</a>';
     140}
     141
    120142?>
    121143<html>
    … …  
    157179<?php echo $show_queries_html; ?>
    158180<?php echo $debug_l10n_html; ?>
     181<?php echo $debug_template_html; ?>
    159182
    160183<script type="text/javascript">

  • trunk/plugins/admin_multi_view/is_admin.inc.php

    r2108 r2223  
    2424  if (pwg_get_session_var( 'multiview_debug_l10n', 0 ))
    2525    $conf['debug_l10n'] = true;
     26  if (pwg_get_session_var( 'multiview_debug_template', 0 ))
     27    $conf['debug_template'] = true;
    2628}
    2729

  • trunk/popuphelp.php

    r2138 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6565}
    6666
    67 $template->set_filenames(array('popuphelp' => 'popuphelp.tpl'));
     67$template->set_filename('popuphelp','popuphelp.tpl');
    6868
    69 $template->assign_vars(
     69$template->assign(
    7070  array
    7171  (
    … …  
    7777// +-----------------------------------------------------------------------+
    7878
    79 $template->parse('popuphelp');
     79$template->pparse('popuphelp');
    8080
    8181include(PHPWG_ROOT_PATH.'include/page_tail.php');

  • trunk/search.php

    r2014 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    161161//----------------------------------------------------- template initialization
    162162
    163 // start date
    164 get_day_list('start_day', @$_POST['start_day']);
    165 get_month_list('start_month', @$_POST['start_month']);
    166 // end date
    167 get_day_list('end_day', @$_POST['end_day']);
    168 get_month_list('end_month', @$_POST['end_month']);
    169 
    170163//
    171164// Start output of page
    … …  
    174167$page['body_id'] = 'theSearchPage';
    175168
    176 $template->set_filenames( array('search'=>'search.tpl') );
    177 
    178 $template->assign_vars(
     169$template->set_filename('search' ,'search.tpl' );
     170
     171$month_list = $lang['month'];
     172$month_list[0]='------------';
     173ksort($month_list);
     174
     175$template->assign(
    179176  array(
    180     'TODAY_DAY' => date('d', time()),
    181     'TODAY_MONTH' => date('m', time()),
    182     'TODAY_YEAR' => date('Y', time()),
    183     'S_SEARCH_ACTION' => 'search.php',
     177    'F_SEARCH_ACTION' => 'search.php',
    184178    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=search',
    185     'U_HOME' => make_index_url(),
     179   
     180    'month_list' => $month_list,
     181    'START_DAY_SELECTED' => @$_POST['start_day'],
     182    'START_MONTH_SELECTED' => @$_POST['start_month'],
     183    'END_DAY_SELECTED' => @$_POST['end_day'],
     184    'END_MONTH_SELECTED' => @$_POST['end_month'],
    186185    )
    187186  );
    … …  
    193192  usort( $available_tags, 'name_compare');
    194193
    195   $template->assign_block_vars('tags', array());
    196  
    197   $template->assign_vars(
    198     array(
    199       'TAG_SELECTION' => get_html_tag_selection(
     194  $template->assign(
     195    'TAG_SELECTION',
     196    get_html_tag_selection(
    200197        $available_tags,
    201198        'tags',
    202199        isset($_POST['tags']) ? $_POST['tags'] : array()
    203         ),
    204       )
     200        )
    205201    );
    206202}
    … …  
    220216  ).'
    221217;';
    222 
    223 $selecteds = array();
    224 display_select_cat_wrapper($query, $selecteds, 'category_option', false);
     218display_select_cat_wrapper($query, array(), 'category_options', false);
    225219
    226220//-------------------------------------------------------------- errors display
    227221if (sizeof($errors) != 0)
    228222{
    229   $template->assign_block_vars('errors',array());
    230   foreach ($errors as $error)
    231   {
    232     $template->assign_block_vars('errors.error',array('ERROR'=>$error));
    233   }
     223  $template->assign('errors', $errors);
    234224}
    235225//------------------------------------------------------------ log informations
    236226include(PHPWG_ROOT_PATH.'include/page_header.php');
    237 $template->parse('search');
     227$template->pparse('search');
    238228include(PHPWG_ROOT_PATH.'include/page_tail.php');
    239229?>

  • trunk/search_rules.php

    r2138 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | file          : $Id$
    … …  
    6565if (isset($search['q']))
    6666{
    67   $template->assign_block_vars(
    68     'words',
    69     array(
    70       'CONTENT' => $search['q']
    71         )
    72     );
     67  $template->append( 'search_words', $search['q'] );
    7368}
    7469else
    7570{
    76   $template->assign_vars(
     71  $template->assign(
    7772    array(
    7873      'INTRODUCTION'
    … …  
    8681if (isset($search['fields']['allwords']))
    8782{
    88   $template->assign_block_vars(
    89     'words',
    90     array(
    91       'CONTENT' => sprintf(
     83  $template->append( 'search_words',
     84      sprintf(
    9285        l10n('searched words : %s'),
    9386        join(', ', $search['fields']['allwords']['words'])
    9487        )
    95       )
    96     );
     88      );
    9789}
    9890
    9991if (isset($search['fields']['tags']))
    10092{
    101   $template->assign_block_vars(
    102     'tags',
    103     array(
    104       'LIST_INTRO' => ($search['fields']['tags']['mode'] == 'AND')
    105         ? l10n('All tags must match')
    106         : l10n('At least one tag must match')
    107       )
    108     );
    109 
     93  $template->assign('SEARCH_TAGS_MODE', $search['fields']['tags']['mode']);
     94 
    11095  $query = '
    11196SELECT name
    … …  
    11398  WHERE id IN ('.implode(',', $search['fields']['tags']['words']).')
    11499;';
    115   $result = pwg_query($query);
    116   while ($row = mysql_fetch_array($result))
    117   {
    118     $template->assign_block_vars(
    119       'tags.tag',
    120       array(
    121         'NAME' => $row['name'],
    122         )
    123       );
    124   }
     100  $template->assign(
     101      'search_tags',
     102      array_from_query($query, 'name')
     103    );
    125104}
    126105
    127106if (isset($search['fields']['author']))
    128107{
    129   $template->assign_block_vars(
    130     'words',
    131     array(
    132       'CONTENT' => sprintf(
     108  $template->append(
     109    'search_words',
     110     sprintf(
    133111          l10n('author(s) : %s'),
    134112          join(', ', $search['fields']['author']['words'])
    135113        )
    136       )
    137     );
     114      );
    138115}
    139116
    … …  
    149126    $cat_ids = $search['fields']['cat']['words'];
    150127  }
    151 
    152   $template->assign_block_vars(
    153     'categories',
    154     array(
    155       'LIST_INTRO' => l10n('Categories'),
    156       )
    157     );
    158128
    159129  $query = '
    … …  
    178148  foreach ($categories as $category)
    179149  {
    180     $template->assign_block_vars(
    181       'categories.category',
    182       array(
    183         'NAME' => get_cat_display_name_cache(
     150    $template->append(
     151      'search_categories',
     152      get_cat_display_name_cache(
    184153          $category['uppercats'],
    185154          null,                      // no url on category names
    186155          false                    // no blank replacement
    187156          )
    188         )
    189157      );
    190158  }
    … …  
    220188  if (isset($search['fields'][ $keys['date'] ]))
    221189  {
    222     $template->assign_block_vars(
    223       $datefield,
    224       array(
    225         'CONTENT' => sprintf(
     190    $template->assign(
     191      strtoupper($datefield),
     192      sprintf(
    226193          l10n($lang_items['date']),
    227194          format_date($search['fields'][ $keys['date'] ])
    228           ),
    229         )
     195          )
    230196      );
    231197  }
    … …  
    233199          and isset($search['fields'][ $keys['after'] ]))
    234200  {
    235     $template->assign_block_vars(
    236       $datefield,
    237       array(
    238         'CONTENT' => sprintf(
     201    $template->assign(
     202      strtoupper($datefield),
     203      sprintf(
    239204          l10n($lang_items['period']),
    240205
    … …  
    244209          format_date($search['fields'][ $keys['before'] ]['date']),
    245210          inc_exc_str($search['fields'][ $keys['before'] ]['inc'])
    246           ),
    247         )
     211          )
    248212      );
    249213  }
    250214  elseif (isset($search['fields'][ $keys['before'] ]))
    251215  {
    252     $template->assign_block_vars(
    253       $datefield,
    254       array(
    255         'CONTENT' => sprintf(
     216    $template->assign(
     217      strtoupper($datefield),
     218      sprintf(
    256219          l10n($lang_items['before']),
    257220
    258221          format_date($search['fields'][ $keys['before'] ]['date']),
    259222          inc_exc_str($search['fields'][ $keys['before'] ]['inc'])
    260           ),
    261         )
     223          )
    262224      );
    263225  }
    264226  elseif (isset($search['fields'][ $keys['after'] ]))
    265227  {
    266     $template->assign_block_vars(
    267       $datefield,
    268       array(
    269         'CONTENT' => sprintf(
     228    $template->assign(
     229      strtoupper($datefield),
     230      sprintf(
    270231          l10n($lang_items['after']),
    271232
    … …  
    273234          inc_exc_str($search['fields'][ $keys['after'] ]['inc'])
    274235          )
    275         )
    276236      );
    277237  }
    … …  
    282242// +-----------------------------------------------------------------------+
    283243
    284 $template->parse('search_rules');
     244$template->pparse('search_rules');
    285245include(PHPWG_ROOT_PATH.'include/page_tail.php');
    286246?>

  • trunk/tags.php

    r2107 r2223  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    7 // | branch        : BSF (Best So Far)
    87// | file          : $Id$
    98// | last update   : $Date$
    … …  
    6261
    6362$template->set_filenames(array('tags'=>'tags.tpl'));
    64 $template->assign_vars(
    65   array(
    66     'U_HOME' => make_index_url(),
    67     )
    68   );
    6963
    7064// +-----------------------------------------------------------------------+
    … …  
    8983foreach ($tags as $tag)
    9084{
    91   $template->assign_block_vars(
    92     'tag',
     85  $template->append(
     86    'tags',
    9387    array(
    9488      'URL' => make_index_url(
    … …  
    106100
    107101include(PHPWG_ROOT_PATH.'include/page_header.php');
    108 $template->parse('tags');
     102$template->pparse('tags');
    109103include(PHPWG_ROOT_PATH.'include/page_tail.php');
    110104?>

  • trunk/template/yoga/about.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
     1{* $Id$ *}
    22<div id="content">
    33  <div class="titrePage">
    44    <ul class="categoryActions">
    55      <li>
    6         <a href="{U_HOME}" title="{lang:return to homepage}">
    7           <img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/>
     6        <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
     7          <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/>
    88        </a>
    99      </li>
    1010    </ul>
    11     <h2>{lang:About}</h2>
     11    <h2>{'About'|@translate}</h2>
    1212  </div>
    1313  <ul>
    14   {ABOUT_MESSAGE}
    15   <!-- BEGIN theme -->
    16   <li>{theme.ABOUT}</li>
    17   <!-- END theme -->
     14  {$ABOUT_MESSAGE}
     15  {if isset($THEME_ABOUT) }
     16  <li>{$THEME_ABOUT}</li>
     17  {/if}
    1818  </ul>
    1919</div>

  • trunk/template/yoga/admin/advanced_feature.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div class="titrePage">
    43  <ul class="categoryActions">
    5     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
     4    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    65  </ul>
    7   <h2>{lang:Advanced_features}</h2>
     6  <h2>{'Advanced_features'|@translate}</h2>
    87</div>
    98
    109<ul>
    11   <!-- BEGIN advanced_features -->
    12     <!-- BEGIN advanced_feature -->
    13       <li><a href="{advanced_features.advanced_feature.URL}" {TAG_INPUT_ENABLED}>{advanced_features.advanced_feature.CAPTION}</a></li>
    14     <!-- END advanced_feature -->
    15   <!-- END advanced_features -->
     10  {foreach from=$advanced_features item=feature}
     11    <li><a href="{$feature.URL}" {$TAG_INPUT_ENABLED}>{$feature.CAPTION}</a></li>
     12  {/foreach}
    1613</ul>

  • trunk/template/yoga/admin/cat_list.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
    3 <h2>{lang:title_categories}</h2>
     1{* $Id$ *}
     2<h2>{'title_categories'|@translate}</h2>
    43
    5 <h3>{CATEGORIES_NAV}</h3>
     4<h3>{$CATEGORIES_NAV}</h3>
    65
    7 <form id="addVirtual" action="{F_ACTION}" method="post">
     6<form id="addVirtual" action="{$F_ACTION}" method="post">
    87  <p>
    9     {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
    10     <input class="submit" type="submit" value="{L_SUBMIT}" name="submitAdd" {TAG_INPUT_ENABLED} />
    11     <!-- BEGIN eop_link -->
    12     <a href="#EoP" class="button"><img src="{themeconf:icon_dir}/page_end.png" class="button" alt="{lang:page_end}" /></a>
    13     <!-- END eop_link -->
     8    {'cat_add'|@translate} : <input type="text" name="virtual_name" />
     9    <input class="submit" type="submit" value="{'submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED} />
     10    {if count($categories)>9 }
     11    <a href="#EoP" class="button"><img src="{$themeconf.icon_dir}/page_end.png" class="button" alt="{'page_end'|@translate}" /></a>
     12    {/if}
    1413  </p>
    1514</form>
    1615
    17 <!-- BEGIN categories -->
    18 <form id="categoryOrdering" action="{F_ACTION}" method="post">
     16{if count($categories) }
     17<form id="categoryOrdering" action="{$F_ACTION}" method="post">
    1918  <p>
    20     <input class="submit" name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
    21     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
     19    <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} />
     20    <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} />
    2221  </p>
    2322  <ul class="categoryUl">
    2423
    25     <!-- BEGIN category -->
    26     <li class="categoryLi
    27           <!-- BEGIN virtual -->
    28           {categories.category.virtual.CLASS}
    29           <!-- END virtual -->
    30     "> <!-- category {category.ID} -->
    31 
     24    {foreach from=$categories item=category}
     25    <li class="categoryLi{if $category.IS_VIRTUAL} virtual_cat{/if}">
     26      <!-- category {$category.ID} -->
    3227      <ul class="categoryActions">
    33         <li><a href="{categories.category.U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to category}" /></a></li>
    34         <li><a href="{categories.category.U_EDIT}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
    35         <!-- BEGIN elements -->
    36         <li><a href="{categories.category.elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
    37         <!-- END elements -->
    38         <li><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li>
    39         <!-- BEGIN permissions -->
    40         <li><a href="{categories.category.permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
    41         <!-- END permissions -->
    42         <!-- BEGIN delete -->
    43         <li><a href="{categories.category.delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
    44         <!-- END delete -->
     28        <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
     29        <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"/></a></li>
     30        {if isset($category.U_MANAGE_ELEMENTS) }
     31        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
     32        {/if}
     33        <li><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>
     34        {if isset($category.U_MANAGE_PERMISSIONS) }
     35        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li>
     36        {/if}
     37        {if isset($category.U_DELETE) }
     38        <li><a href="{$category.U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li>
     39        {/if}
    4540      </ul>
    4641
    4742      <p>
    48       <strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong>
    49       <!-- BEGIN virtual -->
    50       <img src="{themeconf:icon_dir}/virt_category.png" class="button" alt="{lang:virtual_category}" />
    51       <!-- END virtual -->
     43      <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}">{$category.NAME}</a></strong>
     44      {if $category.IS_VIRTUAL}
     45      <img src="{$themeconf.icon_dir}/virt_category.png" class="button" alt="{'virtual_category'|@translate}" />
     46      {/if}
    5247      </p>
    5348
    5449      <p>
    5550        <label>
    56           {lang:Position} :
    57           <input type="text" size="4" name="catOrd[{categories.category.ID}]" maxlength="4" value="{categories.category.RANK}" />
     51          {'Position'|@translate} :
     52          <input type="text" size="4" name="catOrd[{$category.ID}]" maxlength="4" value="{$category.RANK}" />
    5853        </label>
    5954      </p>
    6055
    6156    </li>
    62     <!-- END category -->
     57    {/foreach}
    6358  </ul>
    6459  <p>
    65     <input class="submit" name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
    66     <input class="submit" name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
     60    <input class="submit" name="submitOrder" type="submit" value="{'Save order'|@translate}" {$TAG_INPUT_ENABLED} />
     61    <input class="submit" name="submitOrderAlphaNum" type="submit" value="{'Order alphanumerically'|@translate}" {$TAG_INPUT_ENABLED} />
    6762  </p>
    6863
    6964</form>
    70 <!-- END categories -->
    71 
     65{/if}

  • trunk/template/yoga/admin/cat_modify.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div class="titrePage">
    43  <ul class="categoryActions">
    5     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
     4    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    65  </ul>
    7   <h2>{lang:title_edit_cat}</h2>
     6  <h2>{'title_edit_cat'|@translate}</h2>
    87</div>
    98
    10 <h3>{CATEGORIES_NAV}</h3>
     9<h3>{$CATEGORIES_NAV}</h3>
    1110
    1211<ul class="categoryActions">
    13   <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to category}" /></a></li>
    14   <!-- BEGIN elements -->
    15   <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
    16   <!-- END elements -->
    17   <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li>
    18   <!-- BEGIN permissions -->
    19   <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
    20   <!-- END permissions -->
    21   <!-- BEGIN delete -->
    22   <li><a href="{delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
    23   <!-- END delete -->
     12  <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
     13  {if isset($U_MANAGE_ELEMENTS) }
     14  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
     15  {/if}
     16  <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>
     17  {if isset($U_MANAGE_PERMISSIONS) }
     18  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li>
     19  {/if}
     20  {if isset($U_DELETE) }
     21  <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li>
     22  {/if}
    2423</ul>
    2524
    26 <form action="{F_ACTION}" method="POST" id="catModify">
     25<form action="{$F_ACTION}" method="POST" id="catModify">
    2726
    2827<fieldset>
    29   <legend>{lang:Informations}</legend>
    30   <table>
    31     <!-- BEGIN server -->
    32     <tr>
    33       <td><strong>{L_REMOTE_SITE}</strong></td>
    34       <td>{server.SITE_URL}</td>
    35     </tr>
    36     <!-- END server -->
    37     <!-- BEGIN storage -->
    38     <tr>
    39       <td><strong>{L_STORAGE}</strong></td>
    40       <td class="row1">{storage.CATEGORY_DIR}</td>
    41     </tr>
    42     <!-- END storage -->
    43     <tr>
    44       <td><strong>{L_EDIT_NAME}</strong></td>
    45       <td>
    46         <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
    47       </td>
    48     </tr>
    49     <tr>
    50       <td><strong>{L_EDIT_COMMENT}</strong></td>
    51       <td>
    52         <textarea cols="50" rows="5" name="comment" class="description">{CAT_COMMENT}</textarea>
    53       </td>
    54     </tr>
    55   </table>
    56 </fieldset>
    57 
    58 <!-- BEGIN move -->
     28  <legend>{'Informations'|@translate}</legend>
     29  <table>
     30
     31    {if isset($CAT_FULL_DIR) }
     32    <tr>
     33      <td><strong>{'storage'|@translate}</strong></td>
     34      <td class="row1">{$CAT_FULL_DIR}</td>
     35    </tr>
     36    {/if}
     37   
     38    <tr>
     39      <td><strong>{'name'|@translate}</strong></td>
     40      <td>
     41        <input type="text" name="name" value="{$CAT_NAME}" maxlength="60"/>
     42      </td>
     43    </tr>
     44    <tr>
     45      <td><strong>{'description'|@translate}</strong></td>
     46      <td>
     47        <textarea cols="50" rows="5" name="comment" class="description">{$CAT_COMMENT}</textarea>
     48      </td>
     49    </tr>
     50  </table>
     51</fieldset>
     52
     53{if isset($move_cat_options) }
    5954<fieldset id="move">
    60   <legend>{lang:Move}</legend>
    61   {lang:Parent category}
     55  <legend>{'Move'|@translate}</legend>
     56  {'Parent category'|@translate}
    6257  <select class="categoryDropDown" name="parent">
    63     <!-- BEGIN parent_option -->
    64     <option class="{move.parent_option.CLASS}" {move.parent_option.SELECTED} value="{move.parent_option.VALUE}">{move.parent_option.OPTION}</option>
    65     <!-- END parent_option -->
     58    <option value="0">------------</option>
     59    {html_options options=$move_cat_options selected=$move_cat_options_selected }
    6660  </select>
    6761</fieldset>
    68 <!-- END move -->
     62{/if}
    6963
    7064<fieldset id="options">
    71   <legend>{lang:Options}</legend>
    72   <table>
    73     <tr>
    74       <td><strong>{L_EDIT_STATUS}</strong>
    75       <td>
    76     <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
    77     <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
    78       </td>
    79     </tr>
    80     <tr>
    81       <td><strong>{L_EDIT_LOCK}</strong>
    82       <td>
    83     <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
    84     <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
    85       </td>
    86     </tr>
    87     <tr>
    88       <td><strong>{L_EDIT_COMMENTABLE}</strong>
    89       <td>
    90           <input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
    91           <input type="radio"  name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
    92       </td>
    93     </tr>
    94     <!-- BEGIN upload -->
    95     <tr>
    96       <td><strong>{L_EDIT_UPLOADABLE}</strong>
    97       <td>
    98           <input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
    99           <input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
    100       </td>
    101     </tr>
    102     <!-- END upload -->
     65  <legend>{'Options'|@translate}</legend>
     66  <table>
     67    <tr>
     68      <td><strong>{'conf_access'|@translate}</strong>
     69      <td>
     70        {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
     71      </td>
     72    </tr>
     73    <tr>
     74      <td><strong>{'lock'|@translate}</strong>
     75      <td>
     76        {html_radios name='visible' values=$false_true output=$no_yes|translate selected=$CAT_VISIBLE}
     77      </td>
     78    </tr>
     79    <tr>
     80      <td><strong>{'comments'|@translate}</strong>
     81      <td>
     82        {html_radios name='commentable' values=$false_true output=$no_yes|translate selected=$CAT_COMMENTABLE}
     83      </td>
     84    </tr>
     85    {if isset($SHOW_UPLOADABLE) }
     86    <tr>
     87      <td><strong>{'editcat_uploadable'|@translate}</strong>
     88      <td>
     89        {html_radios name='uploadable' values=$false_true output=$no_yes|translate selected=$CAT_UPLOADABLE}
     90      </td>
     91    </tr>
     92    {/if}
    10393  </table>
    10494</fieldset>
    10595
    10696<fieldset id="image_order">
    107   <legend>{lang:Sort order}</legend>
    108   <input type="checkbox" name="image_order_default" id="image_order_default" {IMG_ORDER_DEFAULT} />
    109   <label for="image_order_default">{lang:Use default sort order}</label>
     97  <legend>{'Sort order'|@translate}</legend>
     98  <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT} />
     99  <label for="image_order_default">{'Use default sort order'|@translate}</label>
    110100  <br/>
    111101  <input type="checkbox" name="image_order_subcats" id="image_order_subcats" />
    112   <label for="image_order_subcats">{lang:Apply to subcategories}</label>
     102  <label for="image_order_subcats">{'Apply to subcategories'|@translate}</label>
    113103  <br/>
    114   <!-- BEGIN image_order -->
    115     <select name="order_field_{image_order.NUMBER}">
    116     <!-- BEGIN field -->
    117       <option value="{image_order.field.VALUE}" {image_order.field.SELECTED}>{image_order.field.OPTION}</option>
    118     <!-- END field -->
     104 
     105  {foreach from=$image_orders item=order}
     106    <select name="order_field_{$order.ID}">
     107      {html_options options=$image_order_field_options selected=$order.FIELD }}
    119108    </select>
    120     <select name="order_direction_{image_order.NUMBER}">
    121     <!-- BEGIN order -->
    122       <option value="{image_order.order.VALUE}" {image_order.order.SELECTED}>{image_order.order.OPTION}</option>
    123     <!-- END order -->
     109    <select name="order_direction_{$order.ID}">
     110      {html_options options=$image_order_direction_options selected=$order.DIRECTION }}
    124111    </select><br/>
    125   <!-- END image_order -->
     112  {/foreach}
     113 
    126114</fieldset>
    127115
    128116<p style="text-align:center;">
    129   <input class="submit" type="submit" value="{L_SUBMIT}" name="submit" {TAG_INPUT_ENABLED}/>
    130   <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
     117  <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
     118  <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
    131119</p>
    132120
    133 <!-- BEGIN representant -->
     121{if isset($representant) }
    134122<fieldset id="representant">
    135   <legend>{lang:Representant}</legend>
     123  <legend>{'Representant'|@translate}</legend>
    136124  <table>
    137125    <tr>
    138126      <td align="center">
    139         <!-- BEGIN picture -->
    140         <a href="{representant.picture.URL}"><img src="{representant.picture.SRC}" alt="" class="miniature" /></a>
    141         <!-- END picture -->
    142 
    143         <!-- BEGIN random -->
    144         <img src="{themeconf:icon_dir}/category_representant_random.png" class="button" alt="{lang:Random picture}" class="miniature" />
    145         <!-- END random -->
    146       </td>
    147       <td>
    148         <!-- BEGIN set_random -->
    149         <p><input class="submit" type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" {TAG_INPUT_ENABLED}/></p>
    150         <!-- END set_random -->
    151 
    152         <!-- BEGIN delete_representant -->
    153         <p><input class="submit" type="submit" name="delete_representant" value="{lang:Delete Representant}" /></p>
    154         <!-- END delete_representant -->
    155       </td>
    156     </tr>
    157   </table>
    158 </fieldset>
    159 <!-- END representant -->
     127        {if isset($representant.picture) }
     128        <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" class="miniature" /></a>
     129        {else}
     130        <img src="{$themeconf.icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature" />
     131        {/if}
     132      </td>
     133      <td>
     134        {if $representant.ALLOW_SET_RANDOM }
     135        <p><input class="submit" type="submit" name="set_random_representant" value="{'cat_representant'|@translate}" {$TAG_INPUT_ENABLED}/></p>
     136        {/if}
     137
     138        {if isset($representant.ALLOW_DELETE) }
     139        <p><input class="submit" type="submit" name="delete_representant" value="{'Delete Representant'|@translate}" /></p>
     140        {/if}
     141      </td>
     142    </tr>
     143  </table>
     144</fieldset>
     145{/if}
    160146
    161147</form>
    162148
    163 <form action="{F_ACTION}" method="POST" id="links">
     149<form action="{$F_ACTION}" method="POST" id="links">
    164150
    165151<fieldset id="linkAllNew">
    166   <legend>{lang:Link all category elements to a new category}</legend>
    167 
    168   <table>
    169     <tr>
    170       <td>{lang:Virtual category name}</td>
     152  <legend>{'Link all category elements to a new category'|@translate}</legend>
     153
     154  <table>
     155    <tr>
     156      <td>{'Virtual category name'|@translate}</td>
    171157      <td><input type="text" name="virtual_name"></td>
    172158    </tr>
    173159
    174160    <tr>
    175       <td>{lang:Parent category}</td>
     161      <td>{'Parent category'|@translate}</td>
    176162      <td>
    177163        <select class="categoryDropDown" name="parent">
    178           <!-- BEGIN category_option_parent -->
    179           <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
    180           <!-- END category_option_parent -->
     164          <option value="0">------------</option>
     165          {html_options options=$create_new_parent_options }
    181166        </select>
    182167      </td>
    … …  
    185170
    186171  <p>
    187     <input class="submit" type="submit" value="{lang:Submit}" name="submitAdd" {TAG_INPUT_ENABLED}/>
    188     <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
     172    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}/>
     173    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
    189174  </p>
    190175
    … …  
    192177
    193178<fieldset id="linkAllExist">
    194   <legend>{lang:Link all category elements to some existing categories}</legend>
    195 
    196   <table>
    197     <tr>
    198       <td>{lang:Categories}</td>
     179  <legend>{'Link all category elements to some existing categories'|@translate}</legend>
     180
     181  <table>
     182    <tr>
     183      <td>{'Categories'|@translate}</td>
    199184      <td>
    200185        <select class="categoryList" name="destinations[]" multiple="multiple" size="5">
    201           <!-- BEGIN category_option_destination -->
    202           <option {category_option_destination.SELECTED} value="{category_option_destination.VALUE}">{category_option_destination.OPTION}</option>
    203           <!-- END category_option_destination -->
     186          {html_options options=$category_destination_options }
    204187        </select>
    205188      </td>
    … …  
    208191
    209192  <p>
    210     <input class="submit" type="submit" value="{lang:Submit}" name="submitDestinations" {TAG_INPUT_ENABLED}/>
    211     <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
     193    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitDestinations" {$TAG_INPUT_ENABLED}/>
     194    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
    212195  </p>
    213196
    214197</fieldset>
    215198
    216 <!-- BEGIN group_mail -->
     199{if isset($group_mail_options)}
    217200<fieldset id="emailCatInfo">
    218   <legend>{lang:Send an information email to group members}</legend>
    219 
    220   <table>
    221     <tr>
    222       <td><strong>{lang:Group}</strong></td>
     201  <legend>{'Send an information email to group members'|@translate}</legend>
     202
     203  <table>
     204    <tr>
     205      <td><strong>{'Group'|@translate}</strong></td>
    223206      <td>
    224207        <select name="group">
    225           <!-- BEGIN group_option -->
    226           <option value="{group_mail.group_option.VALUE}">{group_mail.group_option.OPTION}</option>
    227           <!-- END group_option -->
     208          {html_options options=$group_mail_options}
    228209        </select>
    229210      </td>
    230211    </tr>
    231212    <tr>
    232       <td><strong>{lang:mail_content}</strong></td>
    233       <td>
    234         <textarea cols="50" rows="5" name="mail_content" class="description">{MAIL_CONTENT}</textarea>
     213      <td><strong>{'mail_content'|@translate}</strong></td>
     214      <td>
     215        <textarea cols="50" rows="5" name="mail_content" class="description">{$MAIL_CONTENT}</textarea>
    235216      </td>
    236217    </tr>
    … …  
    239220
    240221  <p>
    241     <input class="submit" type="submit" value="{lang:Submit}" name="submitEmail" {TAG_INPUT_ENABLED}/>
    242     <input class="submit" type="reset" value="{lang:Reset}" name="reset" />
     222    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitEmail" {$TAG_INPUT_ENABLED}/>
     223    <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
    243224  </p>
    244225
    245226</fieldset>
    246 <!-- END group_mail -->
     227{/if}
    247228
    248229</form>

  • trunk/template/yoga/admin/cat_move.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
     2
    33<div class="titrePage">
    44  <ul class="categoryActions">
    5     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
     5    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    66  </ul>
    7   <h2>{lang:Move categories}</h2>
     7  <h2>{'Move categories'|@translate}</h2>
    88</div>
    99
    10 <form method="post" action="{F_ACTION}" class="filter" id="catMove">
     10<form method="post" action="{$F_ACTION}" class="filter" id="catMove">
    1111  <fieldset>
    12     <legend>{lang:Virtual categories movement}</legend>
     12    <legend>{'Virtual categories movement'|@translate}</legend>
    1313
    1414    <label>
    15       {lang:Virtual categories to move}
     15      {'Virtual categories to move'|@translate}
    1616
    1717      <select class="categoryList" name="selection[]" multiple="multiple">
    18         <!-- BEGIN category_option_selection -->
    19         <option {category_option_selection.SELECTED} value="{category_option_selection.VALUE}">{category_option_selection.OPTION}</option>
    20         <!-- END category_option_selection -->
     18        {html_options options=$category_to_move_options}
    2119      </select>
    2220    </label>
    2321
    2422    <label>
    25       {lang:New parent category}
     23      {'New parent category'|@translate}
    2624
    2725      <select class="categoryDropDown" name="parent">
    28         <!-- BEGIN category_option_parent -->
    29         <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
    30         <!-- END category_option_parent -->
     26        <option value="0">------------</option>
     27        {html_options options=$category_parent_options}
    3128      </select>
    3229    </label>
    … …  
    3532
    3633  <p>
    37     <input class="submit" type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
    38     <input class="submit" type="reset" name="reset" value="{lang:Reset}">
     34    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
     35    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
    3936  </p>
    4037

  • trunk/template/yoga/admin/cat_options.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div class="titrePage">
    43  <ul class="categoryActions">
    5     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
     4    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    65  </ul>
    7   <h2>{lang:cat_options_title} {TABSHEET_TITLE}</h2>
    8   {TABSHEET}
     6  <h2>{'cat_options_title'|@translate} {$TABSHEET_TITLE}</h2>
     7  {include file='admin/tabsheet.tpl'}
    98</div>
    109
    11 <form method="post" action="{F_ACTION}" id="cat_options">
     10<form method="post" action="{$F_ACTION}" id="cat_options">
    1211  <fieldset>
    13     <legend>{L_SECTION}</legend>
    14     {DOUBLE_SELECT}
     12    <legend>{$L_SECTION}</legend>
     13    {$DOUBLE_SELECT}
    1514  </fieldset>
    1615</form>
    1716
    18 <p class="information">{L_CAT_OPTIONS_INFO}</p>
    19 

  • trunk/template/yoga/admin/cat_perm.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
     1{* $Id$ *}
    22<div class="titrePage">
    33  <ul class="categoryActions">
    4     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
     4    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    55  </ul>
    6   <h2>{lang:Manage permissions for a category}</h2>
     6  <h2>{'Manage permissions for a category'|@translate}</h2>
    77</div>
    88
    9 <h3>{CATEGORIES_NAV}</h3>
     9<h3>{$CATEGORIES_NAV}</h3>
    1010
    11 <form action="{F_ACTION}" method="post" id="categoryPermissions">
     11<form action="{$F_ACTION}" method="post" id="categoryPermissions">
    1212
    13   <h4>{lang:Groups}</h4>
     13  <h4>{'Groups'|@translate}</h4>
    1414
    1515  <fieldset>
    16     <legend>{lang:Permission granted}</legend>
     16    <legend>{'Permission granted'|@translate}</legend>
    1717    <ul>
    18       <!-- BEGIN group_granted -->
    19       <li><label><input type="checkbox" name="deny_groups[]" value="{group_granted.ID}" /> {group_granted.NAME}</label></li>
    20       <!-- END group_granted -->
     18      {foreach from=$group_granted_ids item=id}
     19      <li><label><input type="checkbox" name="deny_groups[]" value="{$id}" /> {$all_groups[$id]}</label></li>
     20      {/foreach}
    2121    </ul>
    22     <input class="submit" type="submit" name="deny_groups_submit" value="{lang:Deny selected groups}" {TAG_INPUT_ENABLED}/>
     22    <input class="submit" type="submit" name="deny_groups_submit" value="{'Deny selected groups'|@translate}" {$TAG_INPUT_ENABLED}/>
    2323  </fieldset>
    2424
    2525  <fieldset>
    26     <legend>{lang:Permission denied}</legend>
     26    <legend>{'Permission denied'|@translate}</legend>
    2727    <ul>
    28       <!-- BEGIN group_denied -->
    29       <li><label><input type="checkbox" name="grant_groups[]" value="{group_denied.ID}"> {group_denied.NAME}</label></li>
    30       <!-- END group_denied -->
     28      {foreach from=$group_denied_ids item=id}
     29      <li><label><input type="checkbox" name="grant_groups[]" value="{$id}"> {$all_groups[$id]}</label></li>
     30      {/foreach}
    3131    </ul>
    32     <input class="submit" type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" {TAG_INPUT_ENABLED}/>
     32    <input class="submit" type="submit" name="grant_groups_submit" value="{'Grant selected groups'|@translate}" {$TAG_INPUT_ENABLED}/>
    3333  </fieldset>
    3434
    35   <h4>{lang:Users}</h4>
    36  
     35  <h4>{'Users'|@translate}</h4>
     36
    3737  <fieldset>
    38     <legend>{lang:Permission granted}</legend>
     38    <legend>{'Permission granted'|@translate}</legend>
    3939    <ul>
    40       <!-- BEGIN user_granted -->
    41       <li><label><input type="checkbox" name="deny_users[]" value="{user_granted.ID}" /> {user_granted.NAME}</label></li>
    42       <!-- END user_granted -->
     40      {foreach from=$user_granted_direct_ids item=id}
     41      <li><label><input type="checkbox" name="deny_users[]" value="{$id}" /> {$all_users[$id]}</label></li>
     42      {/foreach}
    4343    </ul>
    44     <input class="submit" type="submit" name="deny_users_submit" value="{lang:Deny selected users}" {TAG_INPUT_ENABLED}/>
     44    <input class="submit" type="submit" name="deny_users_submit" value="{'Deny selected users'|@translate}" {$TAG_INPUT_ENABLED}/>
    4545  </fieldset>
    4646
    4747  <fieldset>
    48     <legend>{lang:Permission granted thanks to a group}</legend>
     48    <legend>{'Permission granted thanks to a group'|@translate}</legend>
     49    {if isset($user_granted_indirects) }
    4950    <ul>
    50       <!-- BEGIN user_granted_indirect -->
    51       <li>{user_granted_indirect.NAME} ({user_granted_indirect.GROUP})</li>
    52       <!-- END user_granted_indirect -->
     51      {foreach from=$user_granted_indirects item=user_group}
     52      <li>{$user_group.USER} ({$user_group.GROUP})</li>
     53      {/foreach}
    5354    </ul>
     55    {/if}
    5456  </fieldset>
    5557
    5658  <fieldset>
    57     <legend>{lang:Permission denied}</legend>
     59    <legend>{'Permission denied'|@translate}</legend>
    5860    <ul>
    59       <!-- BEGIN user_denied -->
    60       <li><label><input type="checkbox" name="grant_users[]" value="{user_denied.ID}"> {user_denied.NAME}</label></li>
    61       <!-- END user_denied -->
     61      {foreach from=$user_denied_ids item=id}
     62      <li><label><input type="checkbox" name="grant_users[]" value="{$id}"> {$all_users[$id]}</label></li>
     63      {/foreach}
    6264    </ul>
    63     <input class="submit" type="submit" name="grant_users_submit" value="{lang:Grant selected users}" {TAG_INPUT_ENABLED}/>
     65    <input class="submit" type="submit" name="grant_users_submit" value="{'Grant selected users'|@translate}" {$TAG_INPUT_ENABLED}/>
    6466  </fieldset>
    6567

  • trunk/template/yoga/admin/permalinks.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
     1{* $Id$ *}
    22<div class="titrePage">
    33  <ul class="categoryActions">
    4     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
     4    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    55  </ul>
    6   <h2>{lang:Permalinks}</h2>
     6  <h2>{'Permalinks'|@translate}</h2>
    77</div>
    88
    9 <form method="post" action="{F_ACTION}">
    10 <fieldset><legend>{lang:Add/delete a permalink}</legend>
    11   <label>{lang:Category}:
     9<form method="post" action="{$F_ACTION}">
     10<fieldset><legend>{'Add/delete a permalink'|@translate}</legend>
     11  <label>{'Category'|@translate}:
    1212    <select name="cat_id">
    1313      <option value="0">------</option>
    14 <!-- BEGIN categories -->
    15       <option value="{categories.VALUE}" {categories.SELECTED}>{categories.OPTION}</option>
    16 <!-- END categories -->
     14      {html_options options=$categories selected=$categories_selected}
    1715    </select>
    1816  </label>
    1917
    20   <label>{lang:Permalink}:
     18  <label>{'Permalink'|@translate}:
    2119    <input name="permalink" />
    2220  </label>
    2321
    24   <label>{lang:Save to permalink history}:
     22  <label>{'Save to permalink history'|@translate}:
    2523    <input type="checkbox" name="save" checked="checked" />
    2624  </label>
    2725
    2826  <p>
    29     <input type="submit" class="submit" name="set_permalink" value="{lang:submit}" {TAG_INPUT_ENABLED}/>
     27    <input type="submit" class="submit" name="set_permalink" value="{'submit'|@translate}" {$TAG_INPUT_ENABLED}/>
    3028  </p>
    3129  </fieldset>
    3230</form>
    3331
    34 <h3>{lang:Permalinks}</h3>
     32<h3>{'Permalinks'|@translate}</h3>
    3533<table class="table2">
    3634  <tr class="throw">
    37     <td>Id {SORT_ID}</td>
    38     <td>{lang:Category} {SORT_NAME}</td>
    39     <td>{lang:Permalink} {SORT_PERMALINK}</td>
     35    <td>Id {$SORT_ID}</td>
     36    <td>{'Category'|@translate} {$SORT_NAME}</td>
     37    <td>{'Permalink'|@translate} {$SORT_PERMALINK}</td>
    4038  </tr>
    41 <!-- BEGIN permalink -->
     39{foreach from=$permalinks item=permalink}
    4240  <tr>
    43     <td>{permalink.id}</td>
    44     <td>{permalink.name}</td>
    45     <td>{permalink.permalink}</td>
     41    <td>{$permalink.id}</td>
     42    <td>{$permalink.name}</td>
     43    <td>{$permalink.permalink}</td>
    4644  </tr>
    47 <!-- END permalink -->
     45{/foreach}
    4846</table>
    4947
    50 <h3>{lang:Permalink history} <a name="old_permalinks"></a></h3>
     48<h3>{'Permalink history'|@translate} <a name="old_permalinks"></a></h3>
    5149<table class="table2">
    5250  <tr class="throw">
    53     <td>Id {SORT_OLD_CAT_ID}</td>
    54     <td>{lang:Category}</td>
    55     <td>{lang:Permalink} {SORT_OLD_PERMALINK}</td>
    56     <td>Deleted on {SORT_OLD_DATE_DELETED}</td>
    57     <td>Last hit {SORT_OLD_LAST_HIT}</td>
    58     <td>Hit {SORT_OLD_HIT}</td>
     51    <td>Id {$SORT_OLD_CAT_ID}</td>
     52    <td>{'Category'|@translate}</td>
     53    <td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
     54    <td>Deleted on {$SORT_OLD_DATE_DELETED}</td>
     55    <td>Last hit {$SORT_OLD_LAST_HIT}</td>
     56    <td>Hit {$SORT_OLD_HIT}</td>
    5957    <td></td>
    6058  </tr>
    61 <!-- BEGIN deleted_permalink -->
     59{foreach from=$deleted_permalinks item=permalink}
    6260  <tr>
    63     <td>{deleted_permalink.cat_id}</td>
    64     <td>{deleted_permalink.name}</td>
    65     <td>{deleted_permalink.permalink}</td>
    66     <td>{deleted_permalink.date_deleted}</td>
    67     <td>{deleted_permalink.last_hit}</td>
    68     <td>{deleted_permalink.hit}</td>
    69     <td><a href="{deleted_permalink.U_DELETE}" {TAG_INPUT_ENABLED}><img src="{pwg_root}{themeconf:icon_dir}/delete.png" alt="Delete"></a></td>
     61    <td>{$permalink.cat_id}</td>
     62    <td>{$permalink.name}</td>
     63    <td>{$permalink.permalink}</td>
     64    <td>{$permalink.date_deleted}</td>
     65    <td>{$permalink.last_hit}</td>
     66    <td>{$permalink.hit}</td>
     67    <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" alt="Delete"></a></td>
    7068  </tr>
    71 <!-- END deleted_permalink -->
     69{/foreach}
    7270</table>

  • trunk/template/yoga/admin/rating.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <h2>{lang:Rating} [{NB_ELEMENTS} {lang:elements}]</h2>
     1{* $Id$ *}
     2<h2>{'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
    33
    4 <form action="{F_ACTION}" method="GET" id="update" class="filter">
     4<form action="{$F_ACTION}" method="GET" id="update" class="filter">
    55  <fieldset>
    6     <legend>{lang:Filter}</legend>
     6    <legend>{'Filter'|@translate}</legend>
    77
    88    <label>
    9       {lang:Sort by}
     9      {'Sort by'|@translate}
    1010      <select name="order_by">
    11         <!-- BEGIN order_by -->
    12         <option value="{order_by.VALUE}" {order_by.SELECTED}>{order_by.CONTENT}</option>
    13         <!-- END order_by -->
     11        {html_options options=$order_by_options selected=$order_by_options_selected}
    1412      </select>
    1513    </label>
    1614
    1715    <label>
    18       {lang:Users}
     16      {'Users'|@translate}
    1917      <select name="users">
    20         <!-- BEGIN user_option -->
    21         <option value="{user_option.VALUE}" {user_option.SELECTED}>{user_option.CONTENT}</option>
    22         <!-- END user_option -->
     18        {html_options options=$user_options selected=$user_options_selected}
    2319      </select>
    2420    </label>
    2521
    2622    <label>
    27       {lang:Number of items}
    28       <input type="text" name="display" size="2" value="{DISPLAY}">
     23      {'Number of items'|@translate}
     24      <input type="text" name="display" size="2" value="{$DISPLAY}">
    2925    </label>
    3026
    31     <input class="submit" type="submit" name="submit_filter" value="{lang:Submit}" />
     27    <input class="submit" type="submit" name="submit_filter" value="{'Submit'|@translate}" />
    3228    <input type="hidden" name="page" value="rating" />
    3329  </fieldset>
    3430</form>
    3531
    36 <div class="navigationBar">{NAVBAR}</div>
     32<div class="navigationBar">{$NAVBAR}</div>
    3733<table width="99%">
    3834<tr class="throw">
    39   <td>{lang:File}</td>
    40   <td>{lang:Number of rates}</td>
    41   <td>{lang:Average rate}</td>
    42   <td>{lang:Controversy}</td>
    43   <td>{lang:Sum of rates}</td>
    44   <td>{lang:Rate}</td>
    45   <td>{lang:Username}</td>
    46   <td>{lang:Rate date}</td>
     35  <td>{'File'|@translate}</td>
     36  <td>{'Number of rates'|@translate}</td>
     37  <td>{'Average rate'|@translate}</td>
     38  <td>{'Controversy'|@translate}</td>
     39  <td>{'Sum of rates'|@translate}</td>
     40  <td>{'Rate'|@translate}</td>
     41  <td>{'Username'|@translate}</td>
     42  <td>{'Rate date'|@translate}</td>
    4743  <td></td>
    4844</tr>
    49 <!-- BEGIN image -->
     45{foreach from=$images item=image}
    5046<tr valign="bottom">
    51   <td rowspan="{image.NB_RATES_PLUS1}"><a href="{image.U_URL}"><img src="{image.U_THUMB}" alt="{image.FILE}" title="{image.FILE}"></a></td>
    52   <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.NB_RATES}/{image.NB_RATES_TOTAL}</strong></td>
    53   <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.AVG_RATE}</strong></td>
    54   <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.STD_RATE}</strong></td>
    55   <td rowspan="{image.NB_RATES_PLUS1}" style="border-right: 1px solid;" ><strong>{image.SUM_RATE}</strong></td>
     47  <td rowspan="{$image.NB_RATES_TOTAL+1}"><a href="{$image.U_URL}"><img src="{$image.U_THUMB}" alt="{$image.FILE}" title="{$image.FILE}"></a></td>
     48  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.NB_RATES}/{$image.NB_RATES_TOTAL}</strong></td>
     49  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.AVG_RATE}</strong></td>
     50  <td rowspan="{$image.NB_RATES_TOTAL+1}"><strong>{$image.STD_RATE}</strong></td>
     51  <td rowspan="{$image.NB_RATES_TOTAL+1}" style="border-right: 1px solid;" ><strong>{$image.SUM_RATE}</strong></td>
    5652</tr>
    57 <!-- BEGIN rate -->
     53{foreach from=$image.rates item=rate}
    5854<tr>
    59     <td>{image.rate.RATE}</td>
    60     <td><b>{image.rate.USER}</b></td>
    61     <td><span class="date">{image.rate.DATE}</span></td>
    62     <td><a href="{image.rate.U_DELETE}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/></a></td>
     55    <td>{$rate.RATE}</td>
     56    <td><b>{$rate.USER}</b></td>
     57    <td><span class="date">{$rate.DATE}</span></td>
     58    <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"/></a></td>
    6359</tr>
    64 <!-- END rate -->
    65 <!-- END image -->
     60{/foreach} {*rates*}
     61{/foreach} {*images*}
    6662</table>
    6763
    68 <div class="navigationBar">{NAVBAR}</div>
     64<div class="navigationBar">{$NAVBAR}</div>

  • trunk/template/yoga/admin/tabsheet.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
     2{if isset($tabsheet) and count($tabsheet)}
    33<ul class="tabsheet">
    4 <!-- BEGIN tab -->
    5   <li class="{tab.CLASSNAME}"><a href="{tab.URL}">{tab.CAPTION}</a></li>
    6 <!-- END tab -->
     4{foreach from=$tabsheet item=tab}
     5  <li class="{if isset($tab.selected) and $tab.selected}selected_tab{else}normal_tab{/if}"><a href="{$tab.url}">{$tab.caption}</a></li>
     6{/foreach}
    77</ul>
     8{/if}

  • trunk/template/yoga/comments.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div id="content">
    43
    54  <div class="titrePage">
    65    <ul class="categoryActions">
    7       <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    87    </ul>
    9     <h2>{lang:User comments}</h2>
     8    <h2>{'User comments'|@translate}</h2>
    109  </div>
    1110
    12 <form class="filter" action="{F_ACTION}" method="get">
     11<form class="filter" action="{$F_ACTION}" method="get">
    1312
    1413  <fieldset>
    15     <legend>{lang:Filter}</legend>
     14    <legend>{'Filter'|@translate}</legend>
    1615
    17     <label>{lang:Keyword}<input type="text" name="keyword" value="{F_KEYWORD}" /></label>
     16    <label>{'Keyword'|@translate}<input type="text" name="keyword" value="{$F_KEYWORD}" /></label>
    1817
    19     <label>{lang:Author}<input type="text" name="author" value="{F_AUTHOR}" /></label>
     18    <label>{'Author'|@translate}<input type="text" name="author" value="{$F_AUTHOR}" /></label>
    2019
    2120    <label>
    22       {lang:Category}
     21      {'Category'|@translate}
    2322      <select name="cat">
    24         <!-- BEGIN category -->
    25         <option {category.SELECTED} value="{category.VALUE}">{category.OPTION}</option>
    26         <!-- END category -->
     23        <option value="0">------------</option>
     24        {html_options options=$categories selected=$categories_selected}
    2725      </select>
    2826    </label>
    2927
    3028    <label>
    31       {lang:Since}
     29      {'Since'|@translate}
    3230      <select name="since">
    33         <!-- BEGIN since_option -->
    34         <option {since_option.SELECTED} value="{since_option.VALUE}">{since_option.CONTENT}</option>
    35         <!-- END since_option -->
     31        {html_options options=$since_options selected=$since_options_selected}
    3632      </select>
    3733    </label>
    … …  
    4137  <fieldset>
    4238
    43     <legend>{lang:Display}</legend>
     39    <legend>{'Display'|@translate}</legend>
    4440
    4541    <label>
    46       {lang:Sort by}
     42      {'Sort by'|@translate}
    4743      <select name="sort_by">
    48         <!-- BEGIN sort_by_option -->
    49         <option value="{sort_by_option.VALUE}" {sort_by_option.SELECTED} >{sort_by_option.CONTENT}</option>
    50         <!-- END sort_by_option -->
     44        {html_options options=$sort_by_options selected=$sort_by_options_selected}
    5145      </select>
    5246    </label>
    5347
    5448    <label>
    55       {lang:Sort order}
     49      {'Sort order'|@translate}
    5650      <select name="sort_order">
    57         <!-- BEGIN sort_order_option -->
    58         <option value="{sort_order_option.VALUE}" {sort_order_option.SELECTED} >{sort_order_option.CONTENT}</option>
    59         <!-- END sort_order_option -->
     51        {html_options options=$sort_order_options selected=$sort_order_options_selected}
    6052      </select>
    6153    </label>
    6254
    6355    <label>
    64       {lang:Number of items}
     56      {'Number of items'|@translate}
    6557      <select name="items_number">
    66         <!-- BEGIN items_number_option -->
    67         <option value="{items_number_option.VALUE}" {items_number_option.SELECTED} >{items_number_option.CONTENT}</option>
    68         <!-- END items_option -->
     58        {html_options options=$item_number_options selected=$item_number_options_selected}
    6959      </select>
    7060    </label>
    … …  
    7262  </fieldset>
    7363
    74   <p><input class="submit" type="submit" value="{lang:Filter and display}"></p>
     64  <p><input class="submit" type="submit" value="{'Filter and display'|@translate}"></p>
    7565
    7666</form>
    7767
    78 <div class="navigationBar">{NAVBAR}</div>
     68<div class="navigationBar">{$NAVBAR}</div>
    7969
     70{if isset($comments)}
    8071<div id="comments">
    8172
    82   <!-- BEGIN comment -->
     73  {foreach from=$comments item=comment}
    8374  <div class="comment">
    84     <a class="illustration" href="{comment.U_PICTURE}"><img src="{comment.TN_SRC}" alt="{comment.ALT}" /></a>
    85     <p class="commentHeader"><span class="author">{comment.AUTHOR}</span> - <span class="date">{comment.DATE}</span>
    86     <!-- BEGIN action_delete -->
    87     <a href="{comment.action_delete.U_DELETE}" title="{lang:comments_del}">
    88       <img src="{pwg_root}{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/>
     75    <a class="illustration" href="{$comment.U_PICTURE}"><img src="{$comment.TN_SRC}" alt="{$comment.ALT}" /></a>
     76    <p class="commentHeader"><span class="author">{$comment.AUTHOR}</span> - <span class="date">{$comment.DATE}</span>
     77
     78    {if isset($comment.U_DELETE)}
     79    <a href="{$comment.U_DELETE}" title="{'comments_del'|@translate}">
     80      <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"/>
    8981    </a>
    90     <!-- END action_delete -->
    91     <!-- BEGIN action_validate -->
    92     <a href="{comment.action_validate.U_VALIDATE}" title="validate this comment">
    93       <img src="{pwg_root}{themeconf:icon_dir}/validate_s.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[validate]"/>
     82    {/if}
     83
     84    {if isset($comment.U_VALIDATE)}
     85    <a href="{$comment.U_VALIDATE}" title="validate this comment">
     86      <img src="{$ROOT_URL}{$themeconf.icon_dir}/validate_s.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[validate]"/>
    9487    </a>
    95     <!-- END action_validate -->
     88    {/if}
     89
    9690    </p>
    97     <blockquote>{comment.CONTENT}</blockquote>
     91    <blockquote>{$comment.CONTENT}</blockquote>
    9892    <hr class="separation">
    9993  </div>
    100 
    101   <!-- END comment -->
    102 
     94 
     95  {/foreach}
    10396</div>
     97{/if}
    10498
    10599</div> <!-- content -->

  • trunk/template/yoga/identification.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div id="content">
    43
    54  <div class="titrePage">
    65    <ul class="categoryActions">
    7       <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
    8 <!-- BEGIN register -->
    9       <li><a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
    10 <!-- END register -->
    11       <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
     7      {if isset($U_REGISTER) }
     8      <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt="{'register'|@translate}"/></a></li>
     9      {/if}
     10      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    1211    </ul>
    13     <h2>{lang:Identification}</h2>
     12    <h2>{'Identification'|@translate}</h2>
    1413  </div>
    1514
    16   <!-- BEGIN errors -->
     15  {if isset($errors) }
    1716  <div class="errors">
    1817    <ul>
    19       <!-- BEGIN error -->
    20       <li>{errors.error.ERROR}</li>
    21       <!-- END error -->
     18      {foreach from=$errors item=error}
     19      <li>{$error}</li>
     20      {/foreach}
    2221    </ul>
    2322  </div>
    24   <!-- END errors -->
     23  {/if}
    2524
    26 <form action="{F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
     25<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
    2726  <fieldset>
    28     <legend>{lang:Connection settings}</legend>
     27    <legend>{'Connection settings'|@translate}</legend>
    2928
    30     <input type="hidden" name="redirect" value="{U_REDIRECT}">
     29    <input type="hidden" name="redirect" value="{$U_REDIRECT}">
    3130
    3231    <ul>
    3332      <li>
    3433        <span class="property">
    35           <label for="username">{lang:Username}</label>
     34          <label for="username">{'Username'|@translate}</label>
    3635        </span>
    37         <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" />
     36        <input tabindex="1" class="login" type="text" name="username" id="username" size="25" maxlength="40" />
    3837      </li>
    3938
    4039      <li>
    4140        <span class="property">
    42           <label for="password">{lang:Password}</label>
     41          <label for="password">{'Password'|@translate}</label>
    4342        </span>
    4443        <input tabindex="2" class="login" type="password" name="password" id="password" size="25" maxlength="25" />
    4544      </li>
    4645
    47       <!-- BEGIN remember_me -->
     46      {if $authorize_remembering }
    4847      <li>
    4948        <span class="property">
    50           <label for="remember_me">{lang:remember_me}</label>
     49          <label for="remember_me">{'remember_me'|@translate}</label>
    5150        </span>
    5251        <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
    5352      </li>
    54       <!-- END remember_me -->
     53      {/if}
    5554    </ul>
    5655  </fieldset>
    5756
    58   <p><input class="submit" tabindex="4" type="submit" name="login" value="{lang:submit}"></p>
     57  <p><input class="submit" tabindex="4" type="submit" name="login" value="{'submit'|@translate}"></p>
    5958</form>
    6059
    … …  
    6463
    6564  <p>
    66 <!-- BEGIN register -->
    67     <a href="{U_REGISTER}" title="{lang:Create a new account}"><img src="{themeconf:icon_dir}/register.png" class="button" alt=""> {lang:Register}</a>
    68 <!-- END register -->
    69     <a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}"><img src="{themeconf:icon_dir}/lost_password.png" class="button" alt=""> {lang:Forgot your password?}</a>
     65    {if isset($U_REGISTER) }
     66    <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$themeconf.icon_dir}/register.png" class="button" alt=""> {'Register'|@translate}</a>
     67    {/if}
     68    <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$themeconf.icon_dir}/lost_password.png" class="button" alt=""> {'Forgot your password?'|@translate}</a>
    7069  </p>
    7170

  • trunk/template/yoga/notification.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
     1{* $Id$ *}
    22<div id="content">
    33
    44  <div class="titrePage">
    55    <ul class="categoryActions">
    6       <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    77    </ul>
    8     <h2>{lang:Notification}</h2>
     8    <h2>{'Notification'|@translate}</h2>
    99  </div>
    1010
    11   <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p>
     11  <p>{'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'|@translate}</p>
    1212
    13   <p><a href="{U_FEED_IMAGE_ONLY}">{lang:Image only RSS feed}</a></p>
    14   <p><a href="{U_FEED}">{lang:Complete RSS feed}</a></p>
     13  <p><a href="{$U_FEED_IMAGE_ONLY}">{'Image only RSS feed'|@translate}</a></p>
     14  <p><a href="{$U_FEED}">{'Complete RSS feed'|@translate}</a></p>
    1515</div>

  • trunk/template/yoga/password.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div id="content">
    43
    54  <div class="titrePage">
    65    <ul class="categoryActions">
    7       <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    87    </ul>
    9     <h2>{lang:Password forgotten}</h2>
     8    <h2>{'Password forgotten'|@translate}</h2>
    109  </div>
    1110
    12   <!-- BEGIN errors -->
     11  {if count($errors)}
    1312  <div class="errors">
    1413    <ul>
    15       <!-- BEGIN error -->
    16       <li>{errors.error.ERROR}</li>
    17       <!-- END error -->
     14      {foreach from=$errors item=error}
     15      <li>{$error}</li>
     16      {/foreach}
    1817    </ul>
    1918  </div>
    20   <!-- END errors -->
     19  {/if}
    2120
    22   <!-- BEGIN infos -->
     21  {if count($infos)}
    2322  <div class="infos">
    2423    <ul>
    25       <!-- BEGIN info -->
    26       <li>{infos.info.INFO}</li>
    27       <!-- END info -->
     24      {foreach from=$infos item=info}
     25      <li>{$info}</li>
     26      {/foreach}
    2827    </ul>
    2928  </div>
    30   <!-- END infos -->
     29  {/if}
    3130
    32 <form action="{F_ACTION}" method="post" class="properties">
     31<form action="{$F_ACTION}" method="post" class="properties">
    3332  <fieldset>
    34     <legend>{lang:Retrieve password}</legend>
     33    <legend>{'Retrieve password'|@translate}</legend>
    3534
    3635    <ul>
    3736      <li>
    3837        <span class="property">
    39           <label for="mail_address">{lang:Email address}</label>
     38          <label for="mail_address">{'Email address'|@translate}</label>
    4039        </span>
    4140        <input class="login" type="text" name="mail_address" id="mail_address" size="40" maxlength="40" >
    … …  
    4342      <li>
    4443        <span class="property">
    45           <label for="no_mail_address">{lang:No email address}</label>
     44          <label for="no_mail_address">{'No email address'|@translate}</label>
    4645        </span>
    4746        <input type="checkbox" id="no_mail_address" name="no_mail_address" value="1">
    … …  
    5049  </fieldset>
    5150
    52   <p><input class="submit" type="submit" name="submit" value="{lang:Send new password}"></p>
     51  <p><input class="submit" type="submit" name="submit" value="{'Send new password'|@translate}"></p>
    5352</form>
    5453

  • trunk/template/yoga/picture.tpl

    r2222 r2223  
    5858  </div>
    5959  {NAV_BUTTONS}
    60   </div>
    61 
    6260</div> <!-- imageToolBar -->
    6361

  • trunk/template/yoga/popuphelp.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
     1{* $Id$ *}
    22<div id="content">
    3 {HELP_CONTENT}
     3{$HELP_CONTENT}
    44</div> <!-- content -->
    55
    6 <p id="pageBottomActions"><a href="#" onclick="window.close();" title="{lang:Close this window}"><img src="{themeconf:icon_dir}/exit.png" class="button" alt="close"></a></p>
     6<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{'Close this window'|@translate}"><img src="{$themeconf.icon_dir}/exit.png" class="button" alt="close"></a></p>

  • trunk/template/yoga/search.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div id="content">
    43
    54  <div class="titrePage">
    65    <ul class="categoryActions">
    7       <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}" rel="nofollow"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
    8       <li><a href="{U_HOME}" title="{lang:return to homepage}" rel="home"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
     7      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    98    </ul>
    10     <h2>{lang:Search}</h2>
     9    <h2>{'Search'|@translate}</h2>
    1110  </div>
    1211
    13 <form class="filter" method="post" name="search" action="{S_SEARCH_ACTION}">
    14 <!-- BEGIN errors -->
     12{if isset($errors) }
    1513<div class="errors">
    1614  <ul>
    17     <!-- BEGIN error -->
    18     <li>{errors.error.ERROR}</li>
    19     <!-- END error -->
     15    {foreach from=$errors item=error}
     16    <li>{$error}</li>
     17    {/foreach}
    2018  </ul>
    2119</div>
    22 <!-- END errors -->
     20{/if}
     21
     22<form class="filter" method="post" name="search" action="{$F_SEARCH_ACTION}">
    2323<fieldset>
    24   <legend>{lang:Filter}</legend>
    25   <label>{lang:search_keywords}
     24  <legend>{'Filter'|@translate}</legend>
     25  <label>{'search_keywords'|@translate}
    2626    <input type="text" style="width: 300px" name="search_allwords" size="30"  />
    2727  </label>
    2828  <ul>
    2929    <li><label>
    30       <input type="radio" name="mode" value="AND" checked="checked" />{lang:search_mode_and}
     30      <input type="radio" name="mode" value="AND" checked="checked" />{'search_mode_and'|@translate}
    3131    </label></li>
    3232    <li><label>
    33       <input type="radio" name="mode" value="OR" />{lang:search_mode_or}
     33      <input type="radio" name="mode" value="OR" />{'search_mode_or'|@translate}
    3434    </label></li>
    3535  </ul>
    36   <label>{lang:search_author}
     36  <label>{'search_author'|@translate}
    3737    <input type="text" style="width: 300px" name="search_author" size="30"  />
    3838  </label>
    3939</fieldset>
    4040
    41 <!-- BEGIN tags -->
     41{if isset($TAG_SELECTION)}
    4242<fieldset>
    43   <legend>{lang:Search tags}</legend>
    44   {TAG_SELECTION}
    45   <label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {lang:All tags}</span></label>
    46   <label><span><input type="radio" name="tag_mode" value="OR" /> {lang:Any tag}</span></label>
     43  <legend>{'Search tags'|@translate}</legend>
     44  {$TAG_SELECTION}
     45  <label><span><input type="radio" name="tag_mode" value="AND" checked="checked" /> {'All tags'|@translate}</span></label>
     46  <label><span><input type="radio" name="tag_mode" value="OR" /> {'Any tag'|@translate}</span></label>
    4747</fieldset>
    48 <!-- END tags -->
     48{/if}
    4949
    5050<fieldset>
    51   <legend>{lang:search_date}</legend>
     51  <legend>{'search_date'|@translate}</legend>
    5252  <ul>
    53     <li><label>{lang:search_date_type}</label></li>
     53    <li><label>{'search_date_type'|@translate}</label></li>
    5454    <li><label>
    55       <input type="radio" name="date_type" value="date_creation" checked="checked" />{lang:Creation date}
     55      <input type="radio" name="date_type" value="date_creation" checked="checked" />{'Creation date'|@translate}
    5656    </label></li>
    5757    <li><label>
    58       <input type="radio" name="date_type" value="date_available" />{lang:Post date}
     58      <input type="radio" name="date_type" value="date_available" />{'Post date'|@translate}
    5959    </label></li>
    6060  </ul>
    6161  <ul>
    62     <li><label>{lang:search_date_from}</label></li>
     62    <li><label>{'search_date_from'|@translate}</label></li>
    6363    <li>
    6464      <select name="start_day">
    65         <!-- BEGIN start_day -->
    66         <option {start_day.SELECTED} value="{start_day.VALUE}">{start_day.OPTION}</option>
    67         <!-- END start_day -->
     65          <option value="0">--</option>
     66        {section name=day start=1 loop=31}
     67          <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$START_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
     68        {/section}
    6869      </select>
    6970      <select name="start_month">
    70         <!-- BEGIN start_month -->
    71         <option {start_month.SELECTED} value="{start_month.VALUE}">{start_month.OPTION}</option>
    72         <!-- END start_month -->
     71        {html_options options=$month_list selected=$START_MONTH_SELECTED}
    7372      </select>
    7473      <input name="start_year" type="text" size="4" maxlength="4" >
    7574    </li>
    7675    <li>
    77       <a href="#" onClick="document.search.start_day.value={TODAY_DAY};document.search.start_month.value={TODAY_MONTH};document.search.start_year.value={TODAY_YEAR};return false;">{lang:today}</a>
     76      <a href="#" onClick="document.search.start_day.value={$smarty.now|date_format:"%d"};document.search.start_month.value={$smarty.now|date_format:"%m"};document.search.start_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
    7877    </li>
    7978  </ul>
    8079  <ul>
    81     <li><label>{lang:search_date_to}</label></li>
     80    <li><label>{'search_date_to'|@translate}</label></li>
    8281    <li>
    8382      <select name="end_day">
    84         <!-- BEGIN end_day -->
    85         <option {end_day.SELECTED} value="{end_day.VALUE}">{end_day.OPTION}</option>
    86         <!-- END end_day -->
     83          <option value="0">--</option>
     84        {section name=day start=1 loop=31}
     85          <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$END_DAY_SELECTED}selected="selected"{/if}>{$smarty.section.day.index}</option>
     86        {/section}
    8787      </select>
    8888      <select name="end_month">
    89         <!-- BEGIN end_month -->
    90         <option {end_month.SELECTED} value="{end_month.VALUE}">{end_month.OPTION}</option>
    91         <!-- END end_month -->
     89        {html_options options=$month_list selected=$END_MONTH_SELECTED}
    9290      </select>
    9391      <input name="end_year" type="text" size="4" maxlength="4" >
    9492    </li>
    9593    <li>
    96       <a href="#" onClick="document.search.end_day.value={TODAY_DAY};document.search.end_month.value={TODAY_MONTH};document.search.end_year.value={TODAY_YEAR};return false;">{lang:today}</a>
     94      <a href="#" onClick="document.search.end_day.value={$smarty.now|date_format:"%d"};document.search.end_month.value={$smarty.now|date_format:"%m"};document.search.end_year.value={$smarty.now|date_format:"%Y"};return false;">{'today'|@translate}</a>
    9795    </li>
    9896  </ul>
    … …  
    10098
    10199<fieldset>
    102   <legend>{lang:search_options}</legend>
    103   <label>{lang:search_categories}
     100  <legend>{'search_options'|@translate}</legend>
     101  <label>{'search_categories'|@translate}
    104102    <select class="categoryList" name="cat[]" multiple="multiple" >
    105       <!-- BEGIN category_option -->
    106       <option value="{category_option.VALUE}">{category_option.OPTION}</option>
    107       <!-- END category_option -->
     103      {html_options options=$category_options selected=$category_options_selected}
    108104    </select>
    109105  </label>
    110106  <ul>
    111     <li><label>{lang:search_subcats_included}</label></li>
     107    <li><label>{'search_subcats_included'|@translate}</label></li>
    112108    <li><label>
    113       <input type="radio" name="subcats-included" value="1" checked="checked" />{lang:yes}
     109      <input type="radio" name="subcats-included" value="1" checked="checked" />{'yes'|@translate}
    114110    </label></li>
    115111    <li><label>
    116       <input type="radio" name="subcats-included" value="0" />{lang:no}
     112      <input type="radio" name="subcats-included" value="0" />{'no'|@translate}
    117113    </label></li>
    118114  </ul>
    119115  <ul>
    120     <li><label>{lang:search_sort}</label></li>
     116    <li><label>{'search_sort'|@translate}</label></li>
    121117    <li><label>
    122       <input type="radio" name="sd" value="AND" />{lang:search_ascending}
     118      <input type="radio" name="sd" value="AND" />{'search_ascending'|@translate}
    123119    </label></li>
    124120    <li><label>
    125       <input type="radio" name="sd" value="d" checked="checked" />{lang:search_descending}
     121      <input type="radio" name="sd" value="d" checked="checked" />{'search_descending'|@translate}
    126122    </label></li>
    127123  </ul>
    128124</fieldset>
    129125<p>
    130   <input class="submit" type="submit" name="submit" value="{lang:submit}" />
    131   <input class="submit" type="reset" value="{lang:reset}" />
     126  <input class="submit" type="submit" name="submit" value="{'submit'|@translate}" />
     127  <input class="submit" type="reset" value="{'reset'|@translate}" />
    132128</p>
    133129</form>

  • trunk/template/yoga/search_rules.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
     1{* $Id$ *}
    22<div id="content">
    3 <h2>{lang:Search rules}</h2>
     3<h2>{'Search rules'|@translate}</h2>
    44
    5 <p>{INTRODUCTION}</p>
     5{if isset($INTRODUCTION) }
     6<p>{$INTRODUCTION}</p>
     7{/if}
    68
    79<ul>
    810
    9   <!-- BEGIN words -->
    10   <li>{words.CONTENT}</li>
    11   <!-- END words -->
     11  {if isset($search_words) }
     12  {foreach from=$search_words item=v}
     13  <li>{$v}</li>
     14  {/foreach}
     15  {/if}
    1216
    13   <!-- BEGIN tags -->
     17  {if isset($SEARCH_TAGS_MODE) }
    1418  <li>
    15     <p>{tags.LIST_INTRO}</p>
     19    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'All tags must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
     20    <ul>
     21      {foreach from=$search_tags item=v}
     22      <li>{$v}</li>
     23      {/foreach}
     24    </ul>
     25  </li>
     26  {/if}
     27 
     28  {if isset($DATE_CREATION) }
     29  <li>{$DATE_CREATION}</li>
     30  {/if}
     31
     32  {if isset($DATE_AVAILABLE) }
     33  <li>{$DATE_AVAILABLE}</li>
     34  {/if}
     35
     36  {if isset($search_categories) }
     37  <li>
     38    <p>{'Categories'|@translate}</p>
    1639
    1740    <ul>
    18       <!-- BEGIN tag -->
    19       <li>{tags.tag.NAME}</li>
    20       <!-- END tag -->
     41      {foreach from=$search_categories item=v}
     42      <li>{$v}</li>
     43      {/foreach}
    2144    </ul>
    2245  </li>
    23   <!-- END tags -->
    24  
    25   <!-- BEGIN author -->
    26   <li>{author.CONTENT}</li>
    27   <!-- END author -->
    28 
    29   <!-- BEGIN date_creation -->
    30   <li>{date_creation.CONTENT}</li>
    31   <!-- END date_creation -->
    32 
    33   <!-- BEGIN date_available -->
    34   <li>{date_available.CONTENT}</li>
    35   <!-- END date_available -->
    36 
    37   <!-- BEGIN categories -->
    38   <li>
    39     <p>{categories.LIST_INTRO}</p>
    40 
    41     <ul>
    42       <!-- BEGIN category -->
    43       <li>{categories.category.NAME}</li>
    44       <!-- END category -->
    45     </ul>
    46   </li>
    47   <!-- END categories -->
     46  {/if}
    4847 
    4948</ul>
    … …  
    5251
    5352<p id="pageBottomActions">
    54   <a href="#" onclick="window.close();" title="{lang:Close this window}">
    55     <img src="{themeconf:icon_dir}/exit.png" class="button" alt="close">
     53  <a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
     54    <img src="{$themeconf.icon_dir}/exit.png" class="button" alt="close">
    5655  </a>
    5756</p>

  • trunk/template/yoga/tags.tpl

    r2222 r2223  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <!-- $Id$ -->
     1{* $Id$ *}
    32<div id="content">
    43
    54  <div class="titrePage">
    65    <ul class="categoryActions">
    7       <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
     6      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
    87    </ul>
    9     <h2>{lang:Tags}</h2>
     8    <h2>{'Tags'|@translate}</h2>
    109  </div>
    1110
     11  {if isset($tags)}
    1212  <ul id="fullTagCloud">
    13     <!-- BEGIN tag -->
    14     <li><a href="{tag.URL}" class="{tag.CLASS}" title="{tag.TITLE}">{tag.NAME}</a></li>
    15     <!-- END tag -->
    16     <li>&nbsp;</li> <!-- FIXME W3C HTML Conformity said: No empty UL -->
     13    {foreach from=$tags item=tag}
     14    <li><a href="{$tag.URL}" class="{$tag.CLASS}" title="{$tag.TITLE}">{$tag.NAME}</a></li>
     15    {/foreach}
    1716  </ul>
     17  {/if}
    1818
    1919</div> <!-- content -->
Note: See TracChangeset for help on using the changeset viewer.