Changeset 5997


Ignore:
Timestamp:
04/29/10 15:58:40 (9 years ago)
Author:
plg
Message:

bug 1613 fixed: split the "pending" screen into 2 distinct sections :
admin>photos>pending + admin>tools>pending comments.

Location:
trunk
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r5933 r5997  
    119119    'U_CAT_OPTIONS'=> $link_start.'cat_options', 
    120120    'U_CAT_UPDATE'=> $link_start.'site_update&site=1', 
    121     'U_WAITING'=> $link_start.'comments', 
     121    'U_WAITING'=> $link_start.'upload', 
    122122    'U_RATING'=> $link_start.'rating', 
    123123    'U_CADDIE'=> $link_start.'element_set&cat=caddie', 
     
    134134    'U_ADD_PHOTOS' => $link_start.'photos_add', 
    135135    'U_CHANGE_THEME' => PHPWG_ROOT_PATH.'admin.php?change_theme=1', 
     136    'U_PENDING_COMMENTS' => $link_start.'comments', 
    136137    ) 
    137138  ); 
  • trunk/admin/comments.php

    r5381 r5997  
    2828 
    2929include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 
    30 include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php'); 
    3130 
    3231// +-----------------------------------------------------------------------+ 
     
    9796$template->set_filenames(array('comments'=>'comments.tpl')); 
    9897 
    99 // TabSheet initialization 
    100 waiting_tabsheet(); 
    101  
    10298$template->assign( 
    10399  array( 
  • trunk/admin/include/functions.php

    r5745 r5997  
    19091909    case 'photos_add': 
    19101910    case 'upload': 
    1911     case 'comments': // really needs to be moved somewhere else 
    19121911    case 'rating': 
    19131912    case 'tags': 
     
    19421941    case 'maintenance': 
    19431942    case 'thumbnail': 
     1943    case 'comments': 
    19441944      return 4; 
    19451945 
  • trunk/admin/themes/default/template/admin.tpl

    r5745 r5997  
    7474        <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li> 
    7575        <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li> 
     76        <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li> 
    7677      </ul> 
    7778    </dd> 
  • trunk/admin/upload.php

    r5196 r5997  
    2828 
    2929include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 
    30 include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php'); 
    3130 
    3231// +-----------------------------------------------------------------------+ 
     
    138137$template->set_filenames(array('upload'=>'upload.tpl')); 
    139138 
    140 // TabSheet initialization 
    141 waiting_tabsheet(); 
    142  
    143139$template->assign(array( 
    144140  'F_ACTION'=>str_replace( '&', '&amp;', $_SERVER['REQUEST_URI']) 
  • trunk/language/en_UK/admin.lang.php

    r5874 r5997  
    767767$lang['Order of menubar items has been updated successfully.'] = 'Order of menubar items has been updated successfully.'; 
    768768$lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated'; 
     769$lang['Pending Comments'] = 'Pending Comments'; 
    769770?> 
  • trunk/language/fr_FR/admin.lang.php

    r5874 r5997  
    772772$lang['Order of menubar items has been updated successfully.'] = 'L\'ordre des éléments du menu a été mis à jour avec succès.'; 
    773773$lang['This theme was not designed to be directly activated'] = 'Ce thème n\'est pas conçu pour être activé directement'; 
     774$lang['Pending Comments'] = 'Commentaires en attente'; 
    774775?> 
Note: See TracChangeset for help on using the changeset viewer.