Changeset 1915


Ignore:
Timestamp:
Mar 16, 2007, 7:49:19 PM (17 years ago)
Author:
rub
Message:

Add the last (before 1.8) tabsheet on administration menu (Waiting elements).
Small change way mail function.

Location:
trunk
Files:
1 added
9 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/admin.php

    r1912 r1915  
    9393    'U_CAT_OPTIONS'=> $link_start.'cat_options',
    9494    'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
    95     'U_WAITING'=> $link_start.'waiting',
    96     'U_COMMENTS'=> $link_start.'comments',
     95    'U_WAITING'=> $link_start.'comments',
    9796    'U_RATING'=> $link_start.'rating',
    9897    'U_CADDIE'=> $link_start.'element_set&cat=caddie',

  • trunk/admin/cat_modify.php

    r1908 r1915  
    567567    get_str_email_format(true), /* TODO add a checkbox in order to choose format*/
    568568    get_l10n_args('Come to visit %s', $category['name']),
     569    'admin',
    569570    'cat_group_info',
    570571    array

  • trunk/admin/comments.php

    r1900 r1915  
    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-2007 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$
    … …  
    3231
    3332include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     33include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php');
    3434
    3535// +-----------------------------------------------------------------------+
    … …  
    122122$template->set_filenames(array('comments'=>'admin/comments.tpl'));
    123123
     124// TabSheet initialization
     125waiting_tabsheet();
     126
    124127$template->assign_vars(
    125128  array(

  • trunk/admin/upload.php

    r1914 r1915  
    2424// | USA.                                                                  |
    2525// +-----------------------------------------------------------------------+
     26
    2627if( !defined("PHPWG_ROOT_PATH") )
    2728{
    … …  
    3031
    3132include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     33include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php');
    3234
    3335// +-----------------------------------------------------------------------+
    … …  
    137139
    138140//----------------------------------------------------- template initialization
    139 $template->set_filenames(array('waiting'=>'admin/waiting.tpl'));
     141$template->set_filenames(array('upload'=>'admin/upload.tpl'));
     142
     143// TabSheet initialization
     144waiting_tabsheet();
     145
    140146$template->assign_vars(array(
    141147  'F_ACTION'=>str_replace( '&', '&', $_SERVER['REQUEST_URI'])
    … …  
    215221
    216222//----------------------------------------------------------- sending html code
    217 $template->assign_var_from_handle('ADMIN_CONTENT', 'waiting');
     223$template->assign_var_from_handle('ADMIN_CONTENT', 'upload');
    218224?>

  • trunk/include/functions_mail.inc.php

    r1914 r1915  
    328328 *   - email_format: mail format
    329329 *   - keyargs_subject: mail subject on l10n_args format
     330 *   - dirname: short name of directory including template
    330331 *   - tpl_shortname: short template name without extension
    331332 *   - assign_vars: array used to assign_vars to mail template
    … …  
    336337function pwg_mail_group(
    337338  $group_id, $email_format, $keyargs_subject,
    338   $tpl_shortname, $assign_vars = array(), $language_selected = '')
     339  $dirname, $tpl_shortname,
     340  $assign_vars = array(), $language_selected = '')
    339341{
    340342  global $conf;
    … …  
    408410        $mail_template = get_mail_template($email_format, $elem);
    409411        $mail_template->set_filename($tpl_shortname,
    410           (IN_ADMIN ? 'admin/' : '').$tpl_shortname.'.tpl');
     412          (empty($dirname) ? '' : $dirname.'/').$tpl_shortname.'.tpl');
    411413        $mail_template->assign_vars($assign_vars);
    412414

  • trunk/language/en_UK.iso-8859-1/admin.lang.php

    r1908 r1915  
    426426$lang['title_thumbnails'] = 'Thumbnail creation';
    427427$lang['title_update'] = 'Database synchronization with files';
    428 $lang['title_waiting'] = 'Pictures waiting for validation';
     428$lang['title_upload'] = 'Pictures waiting for validation';
    429429$lang['tn_all'] = 'all';
    430430$lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)';
    … …  
    493493$lang['update_wrong_dirname_short'] = 'wrong filename';
    494494$lang['upload'] = 'Upload';
     495$lang['upload_pictures'] = 'Pictures';
    495496$lang['user "%s" added'] = 'user "%s" added';
    496497$lang['user_status'] = 'User status';

  • trunk/language/fr_FR.iso-8859-1/admin.lang.php

    r1908 r1915  
    426426$lang['title_thumbnails'] = 'Création des miniatures';
    427427$lang['title_update'] = 'Synchronisation de la base de données à partir des fichiers';
    428 $lang['title_waiting'] = 'Images en attente de validation';
     428$lang['title_upload'] = 'Images en attente de validation';
    429429$lang['tn_all'] = 'tout';
    430430$lang['tn_alone_title'] = 'image sans miniature (jpeg et png uniquement)';
    … …  
    493493$lang['update_wrong_dirname_short'] = 'nom de fichier erroné';
    494494$lang['upload'] = 'Ajout';
     495$lang['upload_pictures'] = 'Images';
    495496$lang['user "%s" added'] = 'utilisateur "%s" ajouté';
    496497$lang['user_status'] = 'Statut de l\'utilisateur';

  • trunk/template/yoga/admin.tpl

    r1900 r1915  
    3939        <li><a href="{U_WAITING}">{lang:waiting}</a></li>
    4040        <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
    41         <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
    4241        <li><a href="{U_RATING}">{lang:Rating}</a></li>
    4342        <li><a href="{U_TAGS}">{lang:Tags}</a></li>

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

    r1900 r1915  
    1 <h2>{lang:User comments validation}</h2>
     1<!-- $Id$ -->
     2<div class="titrePage">
     3  <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
     4  {TABSHEET}
     5</div>
     6
     7<h3>{lang:User comments validation}</h3>
    28
    39<form method="post" action="{F_ACTION}">

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

    r1914 r1915  
    11<!-- $Id$ -->
    2 <h2>{lang:title_waiting}</h2>
     2<div class="titrePage">
     3  <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
     4  {TABSHEET}
     5</div>
     6
     7<h3>{lang:title_upload}</h3>
    38
    49<form action="{F_ACTION}" method="post" id="waiting">

  • trunk/upload.php

    r1908 r1915  
    228228      include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
    229229
    230       $waiting_url = get_absolute_root_url().'admin.php?page=waiting';
     230      $waiting_url = get_absolute_root_url().'admin.php?page=upload';
    231231
    232232      $keyargs_content = array
Note: See TracChangeset for help on using the changeset viewer.