Changeset 834


Ignore:
Timestamp:
Aug 19, 2005, 7:00:20 PM (19 years ago)
Author:
plg
Message:
  • improvement : standardization of categories navigation bar on top of administration screen element_set_(global|unit), cat_modify, cat_list, cat_perm.
  • new : direct link to admin/cat_modify from category.php.
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/cat_list.php

    r798 r834  
    6262// |                            initialization                             |
    6363// +-----------------------------------------------------------------------+
     64
    6465$categories = array();
    65 $navigation = $lang['home'];
     66
     67$base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
     68$navigation = '<a class="" href="'.add_session_id($base_url).'">';
     69$navigation.= $lang['home'];
     70$navigation.= '</a>';
     71
    6672// +-----------------------------------------------------------------------+
    6773// |                    virtual categories management                      |
    … …  
    196202  $categories[$row['rank']]['nb_subcats'] = 0;
    197203}
     204
    198205// +-----------------------------------------------------------------------+
    199206// |                            Navigation path                            |
    200207// +-----------------------------------------------------------------------+
     208
    201209if (isset($_GET['parent_id']))
    202210{
    203   $base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list';
    204  
    205   $navigation = '<a class="" href="'.add_session_id($base_url).'">';
    206   $navigation.= $lang['home'];
    207   $navigation.= '</a>';
    208211  $navigation.= $conf['level_separator'];
    209212

  • trunk/admin/cat_modify.php

    r825 r834  
    105105
    106106// Navigation path
    107 $url = PHPWG_ROOT_PATH.'admin.php?page=cat_list&amp;parent_id=';
    108 $navigation = '<a class="" href="'.add_session_id(PHPWG_ROOT_PATH.'admin.php?page=cat_list').'">';
    109 $navigation.= $lang['home'].'</a>'.$conf['level_separator'];
    110 
    111 $navigation.= get_cat_display_name_cache(
     107$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;cat_id=';
     108
     109$navigation = get_cat_display_name_cache(
    112110  $category['uppercats'],
    113   $url);
     111  PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;cat_id='
     112  );
    114113
    115114$form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;cat_id='.$_GET['cat_id'];

  • trunk/admin/element_set.php

    r764 r834  
    105105{
    106106  $cat_infos = get_cat_info($_GET['cat']);
    107   $page['title'] = get_cat_display_name($cat_infos['name'], '', false);
     107  $page['title'] =
     108    get_cat_display_name(
     109      $cat_infos['name'],
     110      PHPWG_ROOT_PATH.'admin.php?page=cat_modify&amp;cat_id=',
     111      false
     112      );
    108113 
    109114  $query = '

  • trunk/admin/element_set_global.php

    r792 r834  
    267267$template->assign_vars(
    268268  array(
    269     'CATEGORY_TITLE'=>$page['title'],
     269    'CATEGORIES_NAV'=>$page['title'],
    270270   
    271271    'L_SUBMIT'=>$lang['submit'],

  • trunk/admin/element_set_unit.php

    r792 r834  
    111111$template->assign_vars(
    112112  array(
    113     'CATEGORY_TITLE'=>$page['title'],
     113    'CATEGORIES_NAV'=>$page['title'],
    114114
    115115    'L_SUBMIT'=>$lang['submit'],

  • trunk/category.php

    r833 r834  
    172172  'U_LOGOUT' => PHPWG_ROOT_PATH.'category.php?act=logout',
    173173  'U_ADMIN'=>add_session_id( PHPWG_ROOT_PATH.'admin.php' ),
    174   'U_PROFILE'=>add_session_id(PHPWG_ROOT_PATH.'profile.php'),
    175   'U_CADDIE'=>add_session_id(PHPWG_ROOT_PATH.'category.php'.get_query_string_diff(array('caddie')).'&amp;caddie=1')
     174  'U_PROFILE'=>add_session_id(PHPWG_ROOT_PATH.'profile.php')
    176175  )
    177176);
    … …  
    313312    'U_SUMMARY'=>add_session_id(PHPWG_ROOT_PATH.'notification.php')
    314313));
     314
     315if (isset($page['cat'])
     316    and is_numeric($page['cat'])
     317    and 'admin' == $user['status'])
     318{
     319  $template->assign_block_vars(
     320    'edit',
     321    array(
     322      'URL' =>
     323        add_session_id(
     324          PHPWG_ROOT_PATH.'admin.php?page=cat_modify'
     325          .'&amp;cat_id='.$page['cat']
     326          )
     327      )
     328    );
     329}
    315330
    316331//------------------------------------------------------ main part : thumbnails
    … …  
    330345  if ('admin' == $user['status'])
    331346  {
    332     $template->assign_block_vars('caddie', array());
     347    $template->assign_block_vars(
     348      'caddie',
     349      array(
     350        'URL' =>
     351          add_session_id(
     352            PHPWG_ROOT_PATH.'category.php'
     353            .get_query_string_diff(array('caddie')).'&amp;caddie=1')
     354        )
     355      );
    333356  }
    334357}

  • trunk/doc/ChangeLog

    r833 r834  
     12005-08-19 Pierrick LE GALL
     2
     3        * improvement : standardization of categories navigation bar on
     4        top of administration screen element_set_(global|unit),
     5        cat_modify, cat_list, cat_perm.
     6
     7        * new : direct link to admin/cat_modify from category.php.
     8
    192005-08-19 Pierrick LE GALL
    210

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

    r817 r834  
    11<h1>{lang:title_categories}</h1>
    22
    3 <div class="admin">{CATEGORIES_NAV}</div>
     3<h2>{CATEGORIES_NAV}</h2>
    44
    55<form id="categoryOrdering" action="" method="post">

  • trunk/template/default/admin/element_set_global.tpl

    r817 r834  
    11<h1>{lang:Batch management}</h1>
    22
    3 <div class="admin">{CATEGORY_TITLE}</div>
     3<h2>{CATEGORIES_NAV}</h2>
    44
    55<p style="text-align:center;">

  • trunk/template/default/admin/element_set_unit.tpl

    r764 r834  
    1 <div class="admin">{CATEGORY_TITLE}</div>
     1<h1>{lang:Batch management}</h1>
     2
     3<h2>{CATEGORIES_NAV}</h2>
    24
    35<p style="text-align:center;">

  • trunk/template/default/category.tpl

    r811 r834  
    9292              <ul class="categoryActions">
    9393                <!-- BEGIN caddie -->
    94                 <li><a href="{U_CADDIE}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" /></a></li>
     94                <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" /></a></li>
    9595                <!-- END caddie -->
     96
     97                <!-- BEGIN edit -->
     98                <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="./template/default/theme/category_edit.png" alt="{lang:edit}"/></a></li>
     99                <!-- END edit -->
    96100              </ul>
    97101              {TITLE}
Note: See TracChangeset for help on using the changeset viewer.