Changeset 2273


Ignore:
Timestamp:
Mar 11, 2008, 2:51:47 AM (16 years ago)
Author:
rvelices
Message:

group_list, group_perm and site_manager go smarty

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/group_list.php

    r2201 r2273  
    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->set_filenames(array('group_list' => 'admin/group_list.tpl'));
    156156
    157 $template->assign_vars(
     157$template->assign(
    158158  array(
    159     'F_ADD_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=group_list',
    160     'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=group_list',
     159    'F_ADD_ACTION' => get_root_url().'admin.php?page=group_list',
     160    'U_HELP' => get_root_url().'popuphelp.php?page=group_list',
    161161    )
    162162  );
    … …  
    173173$result = pwg_query($query);
    174174
    175 $admin_url = PHPWG_ROOT_PATH.'admin.php?page=';
     175$admin_url = get_root_url().'admin.php?page=';
    176176$perm_url    = $admin_url.'group_perm&group_id=';
    177177$del_url     = $admin_url.'group_list&delete=';
    … …  
    179179$toggle_is_default_url     = $admin_url.'group_list&toggle_is_default=';
    180180
    181 $num = 0;
    182181while ($row = mysql_fetch_array($result))
    183182{
    … …  
    189188  list($counter) = mysql_fetch_row(pwg_query($query));
    190189 
    191   $template->assign_block_vars(
    192     'group',
     190  $template->append(
     191    'groups',
    193192    array(
    194       'CLASS' => ($num++ % 2 == 1) ? 'row2' : 'row1',
    195193      'NAME' => $row['name'],
    196194      'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''),

  • trunk/admin/group_perm.php

    r2268 r2273  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 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$
    … …  
    133132  );
    134133
    135 $template->assign_vars(
     134$template->assign(
    136135  array(
    137136    'TITLE' =>
    … …  
    143142    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
    144143    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
    145     'L_CAT_OPTIONS_INFO'=>l10n('permuser_info'),
    146144
    147145    'F_ACTION' =>
    148         PHPWG_ROOT_PATH.
     146        get_root_url().
    149147        'admin.php?page=group_perm&group_id='.
    150148        $page['group']

  • trunk/admin/site_manager.php

    r1903 r2273  
    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$
    … …  
    5150  if($lines = @file($url))
    5251  {
    53     $template->assign_block_vars('remote_output', array());
    5452    // cleaning lines from HTML tags
    5553    foreach ($lines as $line)
    … …  
    5856      if (preg_match('/^PWG-([A-Z]+)-/', $line, $matches))
    5957      {
    60         $template->assign_block_vars(
    61           'remote_output.remote_line',
     58        $template->append(
     59          'remote_output',
    6260          array(
    6361            'CLASS' => 'remote'.ucfirst(strtolower($matches[1])),
    … …  
    118116        $clf_url.= '?action=test';
    119117        $clf_url.= '&version='.PHPWG_VERSION;
    120         if ($lines = @file($clf_url))
     118        if ( ($lines = @file($clf_url)) !== false)
    121119        {
    122120          $first_line = strip_tags($lines[0]);
    … …  
    177175    {
    178176      $title = $galleries_url.' : '.l10n('remote_site_generate');
    179       $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
    180177      remote_output($galleries_url.'create_listing_file.php?action=generate');
    181178      break;
    … …  
    184181    {
    185182      $title = $galleries_url.' : '.l10n('remote_site_test');
    186       $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
    187183      remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION);
    188184      break;
    … …  
    191187    {
    192188      $title = $galleries_url.' : '.l10n('remote_site_clean');
    193       $template->assign_vars(array('REMOTE_SITE_TITLE'=>$title));
    194189      remote_output($galleries_url.'create_listing_file.php?action=clean');
    195190      break;
    … …  
    205200}
    206201
    207 $template->assign_vars( array(
    208   'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=site_manager',
    209   'F_ACTION' => PHPWG_ROOT_PATH.'admin.php'
     202$template->assign( array(
     203  'U_HELP'    => get_root_url().'popuphelp.php?page=site_manager',
     204  'F_ACTION'  => get_root_url().'admin.php'
    210205                .get_query_string_diff( array('action','site') )
    211206  ) );
    … …  
    236231$result = pwg_query($query);
    237232
    238 if (mysql_num_rows($result) > 0)
    239 {
    240   $template->assign_block_vars('sites', array());
    241 }
    242233while ($row = mysql_fetch_array($result))
    243234{
    … …  
    251242  $update_url.= '?page=site_update';
    252243  $update_url.= '&site='.$row['id'];
    253   $template->assign_block_vars(
    254     'sites.site',
     244 
     245  $tpl_var =
    255246    array(
    256247      'NAME' => $row['galleries_url'],
    … …  
    259250      'IMAGES' => isset($row['nb_images']) ? $row['nb_images'] : 0,
    260251      'U_SYNCHRONIZE' => $update_url
    261      )
    262    );
     252     );
     253    
    263254   if ($is_remote)
    264255   {
    265      $template->assign_block_vars('sites.site.remote',
     256     $tpl_var['remote'] =
    266257       array(
    267258         'U_TEST' => $base_url.'test',
    268259         'U_GENERATE' => $row['galleries_url'].'create_listing_file.php?action=generate',
    269260         'U_CLEAN' => $base_url.'clean',
    270          )
    271        );
     261         );
    272262   }
    273263
    274264  if ($row['id'] != 1)
    275265  {
    276     $template->assign_block_vars( 'sites.site.delete',
    277       array('U_DELETE' => $base_url.'delete') );
    278   }
     266    $tpl_var['U_DELETE'] = $base_url.'delete';
     267  }
     268
     269  $plugin_links = array();
     270  //$plugin_links is array of array composed of U_HREF, U_HINT & U_CAPTION
     271  $plugin_links =
     272    trigger_event('get_admins_site_links',
     273      $plugin_links, $row['id'], $is_remote);
     274  $tpl_var['plugin_links'] = $plugin_links;
     275
     276  $template->append('sites', $tpl_var);
    279277
    280278  if ( isset($local_listing_site_url) and
    … …  
    282280  {
    283281    $local_listing_site_id = $row['id'];
    284     $template->assign_block_vars( 'local_listing',
     282    $template->assign( 'local_listing',
    285283        array(
    286284          'URL' =>  $local_listing_site_url,
     285          'U_SYNCHRONIZE' => $update_url.'&local_listing=1'
    287286        )
    288287      );
    289 
    290     $template->assign_block_vars( 'local_listing.update',
    291           array(
    292             'U_SYNCHRONIZE' => $update_url.'&local_listing=1'
    293             )
    294         );
    295   }
    296  
    297   $plugin_links = array();
    298   //$plugin_links is array of array composed of U_HREF, U_HINT & U_CAPTION
    299   $plugin_links =
    300     trigger_event('get_admins_site_links',
    301       $plugin_links, $row['id'], $is_remote);
    302 
    303   // plugin_links
    304   if (count($plugin_links) > 0)
    305   {
    306     foreach ($plugin_links as $plugin_link)
    307     {
    308       $template->assign_block_vars('sites.site.plugin_links.plugin_link', $plugin_link);
    309     }
    310   }
    311 
     288  }
    312289}
    313290
    314291if ( isset($local_listing_site_url) and !isset($local_listing_site_id) )
    315292{
    316   $template->assign_block_vars( 'local_listing',
     293  $template->assign( 'local_listing',
    317294      array(
    318295        'URL' =>  $local_listing_site_url,
     296        'CREATE' => true
    319297      )
    320298    );
    321 
    322   $template->assign_block_vars( 'local_listing.create',
    323         array('NAME' => $local_listing_site_url)
    324       );
    325299}
    326300

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

    r2222 r2273  
    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="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    65  </ul>
    7   <h2>{lang:title_groups}</h2>
     6  <h2>{'title_groups'|@translate}</h2>
    87</div>
    98
    10 <form method="post" name="add_user" action="{F_ADD_ACTION}" class="properties">
     9<form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
    1110  <fieldset>
    12     <legend>{lang:Add group}</legend>
     11    <legend>{'Add group'|@translate}</legend>
    1312
    1413    <span class="property">
    15       <label for="groupname">{lang:Group name}</label>
     14      <label for="groupname">{'Group name'|@translate}</label>
    1615    </span>
    1716    <input type="text" id="groupname" name="groupname" maxlength="50" size="20" />
    1817
    1918    <p>
    20       <input class="submit" type="submit" name="submit_add" value="{lang:Add}" {TAG_INPUT_ENABLED}/>
     19      <input class="submit" type="submit" name="submit_add" value="{'Add'|@translate}" {$TAG_INPUT_ENABLED}/>
    2120    </p>
    2221  </fieldset>
    … …  
    2524<table class="table2">
    2625  <tr class="throw">
    27     <th>{lang:Group name}</th>
    28     <th>{lang:Members}</th>
    29     <th>{lang:Actions}</th>
     26    <th>{'Group name'|@translate}</th>
     27    <th>{'Members'|@translate}</th>
     28    <th>{'Actions'|@translate}</th>
    3029  </tr>
    31   <!-- BEGIN group -->
    32   <tr class="{group.CLASS}">
    33     <td>{group.NAME}<i><small>{group.IS_DEFAULT}</small></i></td>
    34     <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
     30  {if not empty($groups)}
     31  {foreach from=$groups item=group name=group_loop}
     32  <tr class="{if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}">
     33    <td>{$group.NAME}<i><small>{$group.IS_DEFAULT}</small></i></td>
     34    <td><a href="{$group.U_MEMBERS}">{$group.MEMBERS}</a></td>
    3535    <td style="text-align:center;">
    36       <a href="{group.U_PERM}">
    37         <img src="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" id="btn_permissions" alt="{lang:permissions}" title="{lang:permissions}" /></a>
    38       <a href="{group.U_DELETE}" onclick="return confirm('{lang:Action: }' + document.getElementById('btn_delete').title + '\n\n' + '{lang:Are you sure?}');">
    39         <img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none" id="btn_delete" alt="{lang:delete}" title="{lang:delete}" {TAG_INPUT_ENABLED}/></a>
    40       <a href="{group.U_ISDEFAULT}" onclick="return confirm('{lang:Action: }' + document.getElementById('btn_toggle_is_default_group').title + '\n\n' + '{lang:Are you sure?}');">
    41         <img src="{themeconf:icon_dir}/toggle_is_default_group.png" class="button" style="border:none" id="btn_toggle_is_default_group" alt="{lang:toggle_is_default_group}" title="{lang:toggle_is_default_group}" {TAG_INPUT_ENABLED}/></a>
     36      <a href="{$group.U_PERM}">
     37        <img src="{$ROOT_URL}{$themeconf.icon_dir}/permissions.png" class="button" style="border:none" id="btn_permissions" alt="{'permissions'|@translate}" title="{'permissions'|@translate}" /></a>
     38      <a href="{$group.U_DELETE}" onclick="return confirm( document.getElementById('btn_delete').title + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
     39        <img src="{$ROOT_URL}{$themeconf.icon_dir}/delete.png" class="button" style="border:none" id="btn_delete" alt="{'delete'|@translate}" title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}/></a>
     40      <a href="{$group.U_ISDEFAULT}" onclick="return confirm( document.getElementById('btn_toggle_is_default_group').title + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
     41        <img src="{$ROOT_URL}{$themeconf.icon_dir}/toggle_is_default_group.png" class="button" style="border:none" id="btn_toggle_is_default_group" alt="{'toggle_is_default_group'|@translate}" title="{'toggle_is_default_group'|@translate}" {$TAG_INPUT_ENABLED}/></a>
    4242    </td>
    4343  </tr>
    44   <!-- END group -->
     44  {/foreach}
     45  {/if}
    4546</table>

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

    r2222 r2273  
    1 <!-- DEV TAG: not smarty migrated -->
    2 <h2>{TITLE}</h2>
     1{* $Id *}
     2<h2>{$TITLE}</h2>
    33
    4 <form method="post" action="{F_ACTION}">
    5   {DOUBLE_SELECT}
     4<form method="post" action="{$F_ACTION}">
     5  {$DOUBLE_SELECT}
    66</form>
    77
    8 <p>{lang:Only private categories are listed}</p>
     8<p>{'Only private categories are listed'|@translate}</p>

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

    r2222 r2273  
    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="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
    65  </ul>
    7   <h2>{lang:Site manager}</h2>
     6  <h2>{'Site manager'|@translate}</h2>
    87</div>
    98
    10 <!-- BEGIN remote_output -->
     9{if not empty($remote_output)}
    1110<div class="remoteOutput">
    1211  <ul>
    13     <!-- BEGIN remote_line -->
    14     <li class="{remote_output.remote_line.CLASS}">{remote_output.remote_line.CONTENT}</li>
    15     <!-- END remote_line -->
     12    {foreach from=$remote_output item=remote_line}
     13    <li class="{$remote_line.CLASS}">{$remote_line.CONTENT}</li>
     14    {/foreach}
    1615  </ul>
    1716</div>
    18 <!-- END remote_output -->
     17{/if}
    1918
    20 <!-- BEGIN local_listing -->
    21 {lang:remote_site_local_found} {local_listing.URL}
    22 <!-- BEGIN create -->
    23 <form action="" method="post">
     19{if isset($local_listing)}
     20{'remote_site_local_found'|@translate} {$local_listing.URL}
     21{if isset($local_listing.CREATE)}
     22<form action="{$F_ACTION}" method="post">
    2423  <p>
    25     {lang:remote_site_local_create}:
     24    {'remote_site_local_create'|@translate}:
    2625    <input type="hidden" name="no_check" value="1"/>
    27     <input type="hidden" name="galleries_url" value="{local_listing.URL}" />
    28     <input type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED} />
     26    <input type="hidden" name="galleries_url" value="{$local_listing.URL}" />
     27    <input type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} />
    2928  </p>
    3029</form>
    31 <!-- END create -->
    32 <!-- BEGIN update -->
    33 <a href="{local_listing.update.U_SYNCHRONIZE}" title="{lang:remote_site_local_update}">{lang:site_synchronize}</a>
    34 <!-- END update -->
    35 <!-- END local_listing -->
     30{/if}
     31{if isset($local_listing.U_SYNCHRONIZE)}
     32&nbsp;<a href="{$local_listing.U_SYNCHRONIZE}" title="{'remote_site_local_update'|@translate}">{'site_synchronize'|@translate}</a>
     33<br/><br/>
     34{/if}
     35{/if}
    3636
    37 <!-- BEGIN sites -->
     37{if not empty($sites)}
    3838<table border="1" cellpadding="0" cellspacing="0">
    39   <!-- BEGIN site -->
    40   <tr align="left"><td>
    41     <a href="{sites.site.NAME}">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:Categories}, {sites.site.IMAGES} {lang:picture}s)
     39  {foreach from=$sites item=site}
     40  <tr style="text-align:left"><td>
     41    <a href="{$site.NAME}">{$site.NAME}</a><br/>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})
    4242  </td><td>
    43     [<a href="{sites.site.U_SYNCHRONIZE}" title="{lang:site_synchronize_hint}">{lang:site_synchronize}</a>]
    44     <!-- BEGIN delete -->
    45       [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"
    46                 title="{lang:site_delete_hint}" {TAG_INPUT_ENABLED}>{lang:site_delete}</a>]
    47     <!-- END delete -->
    48     <!-- BEGIN remote -->
    49       <br>
    50       [<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_test}</a>]
    51       [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_generate}</a>]
    52       [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_clean}</a>]
    53     <!-- END remote -->
    54     <!-- BEGIN plugin_links -->
     43    [<a href="{$site.U_SYNCHRONIZE}" title="{'site_synchronize_hint'|@translate}">{'site_synchronize'|@translate}</a>]
     44    {if isset($site.U_DELETE)}
     45      [<a href="{$site.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|escape:'javascript'}');"
     46                title="{'site_delete_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'site_delete'|@translate}</a>]
     47    {/if}
     48    {if isset($site.remote)}
     49      <br/>
     50      [<a href="{$site.remote.U_TEST}" title="{'remote_site_test_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_test'|@translate}</a>]
     51      [<a href="{$site.remote.U_GENERATE}" title="{'remote_site_generate_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_generate'|@translate}</a>]
     52      [<a href="{$site.remote.U_CLEAN}" title="{'remote_site_clean_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_clean'|@translate}</a>]
     53    {/if}
     54    {if not empty($site.plugin_links)}
    5555        <br>
    56       <!-- BEGIN plugin_link -->
    57         [<a href="{sites.site.plugin_links.plugin_link.U_HREF}" title='{sites.site.plugin_links.plugin_link.U_HINT}' {TAG_INPUT_ENABLED}>{sites.site.plugin_links.plugin_link.U_CAPTION}</a>]
    58       <!-- END plugin_link -->
    59     <!-- END plugin_links -->
     56      {foreach from=$site.plugin_links item=plugin_link}
     57        [<a href="{$plugin_link.U_HREF}" title='{$plugin_link.U_HINT}' {$TAG_INPUT_ENABLED}>{$plugin_link.U_CAPTION}</a>]
     58      {/foreach}
     59    {/if}
    6060  </td></tr>
    61   <!-- END site -->
     61  {/foreach}
    6262</table>
    63 <!-- END sites -->
     63{/if}
    6464
    65 <form action="{F_ACTION}" method="post">
     65<form action="{$F_ACTION}" method="post">
    6666  <p>
    67     <label for="galleries_url" >{lang:site_create}</label>
     67    <label for="galleries_url" >{'site_create'|@translate}</label>
    6868    <input type="text" name="galleries_url" id="galleries_url" />
    6969  </p>
    7070  <p>
    71     <input class="submit" type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED} />
     71    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} />
    7272  </p>
    7373</form>
Note: See TracChangeset for help on using the changeset viewer.