Changeset 1367


Ignore:
Timestamp:
Jun 19, 2006, 7:53:48 PM (18 years ago)
Author:
chrisaga
Message:

Improve : split menubar from main template (index.tpl) = feature 354

Location:
branches/branch-1_6
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1_6/index.php

    r1144 r1367  
    169169    );
    170170}
     171// include menubar
     172include(PHPWG_ROOT_PATH.'include/menubar.inc.php');
    171173
    172174$template->assign_vars(
    173175  array(
    174     'NB_PICTURE' => $user['nb_total_images'],
    175176    'TITLE' => $template_title,
    176     'USERNAME' => $user['username'],
    177     'TOP_NUMBER' => $conf['top_number'],
    178     'MENU_CATEGORIES_CONTENT' => get_categories_menu(),
    179 
    180     'F_IDENTIFY' => get_root_url().'identification.php',
    181     'T_RECENT' => $icon_recent,
    182 
    183     'U_HOME' => make_index_URL(),
    184     'U_REGISTER' => get_root_url().'register.php',
    185     'U_LOST_PASSWORD' => get_root_url().'password.php',
    186     'U_LOGOUT' => add_url_params(make_index_URL(), array('act'=>'logout') ),
    187     'U_ADMIN'=> get_root_url().'admin.php',
    188     'U_PROFILE'=> get_root_url().'profile.php',
     177    'TOP_NUMBER' => $conf['top_number'],        // still used ?
     178    'T_RECENT' => $icon_recent,                 // still used ?
    189179    )
    190180  );
    … …  
    199189    );
    200190}
    201 //-------------------------------------------------------------- external links
    202 if (count($conf['links']) > 0)
    203 {
    204   $template->assign_block_vars('links', array());
    205 
    206   foreach ($conf['links'] as $url => $label)
    207   {
    208     $template->assign_block_vars(
    209       'links.link',
    210       array(
    211         'URL' => $url,
    212         'LABEL' => $label
    213         )
    214       );
    215   }
    216 }
    217 //------------------------------------------------------------------------ tags
    218 if ('tags' == $page['section'])
    219 {
    220   $template->assign_block_vars('tags', array());
    221 
    222   // display tags associated to currently tagged items, less current tags
    223   $tags = array();
    224 
    225   if ( !empty($page['items']) )
    226   {
    227     $query = '
    228 SELECT tag_id, name, url_name, count(*) counter
    229   FROM '.IMAGE_TAG_TABLE.'
    230     INNER JOIN '.TAGS_TABLE.' ON tag_id = id
    231   WHERE image_id IN ('.implode(',', $items).')
    232     AND tag_id NOT IN ('.implode(',', $page['tag_ids']).')
    233   GROUP BY tag_id
    234   ORDER BY name ASC
    235 ;';
    236     $result = pwg_query($query);
    237     while($row = mysql_fetch_array($result))
    238     {
    239       array_push($tags, $row);
    240     }
    241   }
    242 
    243   $tags = add_level_to_tags($tags);
    244 
    245   foreach ($tags as $tag)
    246   {
    247     $template->assign_block_vars(
    248       'tags.tag',
    249       array(
    250         'URL_ADD' => make_index_URL(
    251           array(
    252             'tags' => array_merge(
    253               $page['tags'],
    254               array(
    255                 array(
    256                   'id' => $tag['tag_id'],
    257                   'url_name' => $tag['url_name'],
    258                   ),
    259                 )
    260               )
    261             )
    262           ),
    263 
    264         'URL' => make_index_URL(
    265           array(
    266             'tags' => array(
    267               array(
    268                 'id' => $tag['tag_id'],
    269                 'url_name' => $tag['url_name'],
    270                 ),
    271               )
    272             )
    273           ),
    274 
    275         'NAME' => $tag['name'],
    276 
    277         'TITLE' => l10n('See pictures linked to this tag only'),
    278 
    279         'TITLE_ADD' => sprintf(
    280           l10n('%d pictures are also linked to current tags'),
    281           $tag['counter']
    282           ),
    283 
    284         'CLASS' => 'tagLevel'.$tag['level']
    285         )
    286       );
    287   }
    288 }
    289 //---------------------------------------------------------- special categories
    290 // favorites categories
    291 if ( !$user['is_the_guest'] )
    292 {
    293   $template->assign_block_vars('username', array());
    294 
    295   $template->assign_block_vars(
    296     'special_cat',
    297     array(
    298       'URL' => make_index_URL(array('section' => 'favorites')),
    299       'TITLE' => $lang['favorite_cat_hint'],
    300       'NAME' => $lang['favorite_cat']
    301       ));
    302 }
    303 // most visited
    304 $template->assign_block_vars(
    305   'special_cat',
    306   array(
    307     'URL' => make_index_URL(array('section' => 'most_visited')),
    308     'TITLE' => $lang['most_visited_cat_hint'],
    309     'NAME' => $lang['most_visited_cat']
    310     ));
    311 // best rated
    312 if ($conf['rate'])
    313 {
    314   $template->assign_block_vars(
    315     'special_cat',
    316     array(
    317       'URL' => make_index_URL(array('section' => 'best_rated')),
    318       'TITLE' => $lang['best_rated_cat_hint'],
    319       'NAME' => $lang['best_rated_cat']
    320       )
    321     );
    322 }
    323 // random
    324 $template->assign_block_vars(
    325   'special_cat',
    326   array(
    327     'URL' => get_root_url().'random.php',
    328     'TITLE' => $lang['random_cat_hint'],
    329     'NAME' => $lang['random_cat']
    330     ));
    331 // recent pics
    332 $template->assign_block_vars(
    333   'special_cat',
    334   array(
    335     'URL' => make_index_URL(array('section' => 'recent_pics')),
    336     'TITLE' => $lang['recent_pics_cat_hint'],
    337     'NAME' => $lang['recent_pics_cat']
    338     ));
    339 // recent cats
    340 $template->assign_block_vars(
    341   'special_cat',
    342   array(
    343     'URL' => make_index_URL(array('section' => 'recent_cats')),
    344     'TITLE' => $lang['recent_cats_cat_hint'],
    345     'NAME' => $lang['recent_cats_cat']
    346     ));
    347 
    348 // calendar
    349 $template->assign_block_vars(
    350   'special_cat',
    351   array(
    352     'URL' =>
    353       make_index_URL(
    354         array(
    355           'chronology_field' => ($conf['calendar_datefield']=='date_available'
    356                                   ? 'posted' : 'created'),
    357            'chronology_style'=> 'monthly',
    358            'chronology_view' => 'calendar'
    359         )
    360       ),
    361     'TITLE' => $lang['calendar_hint'],
    362     'NAME' => $lang['calendar']
    363     )
    364   );
    365 //--------------------------------------------------------------------- summary
    366 
    367 if ($user['is_the_guest'])
    368 {
    369   $template->assign_block_vars('register', array());
    370   $template->assign_block_vars('login', array());
    371 
    372   $template->assign_block_vars('quickconnect', array());
    373   if ($conf['authorize_remembering'])
    374   {
    375     $template->assign_block_vars('quickconnect.remember_me', array());
    376   }
    377 }
    378 else
    379 {
    380   $template->assign_block_vars('hello', array());
    381 
    382   if (is_autorize_status(ACCESS_CLASSIC))
    383   {
    384     $template->assign_block_vars('profile', array());
    385   }
    386 
    387   // the logout link has no meaning with Apache authentication : it is not
    388   // possible to logout with this kind of authentication.
    389   if (!$conf['apache_authentication'])
    390   {
    391     $template->assign_block_vars('logout', array());
    392   }
    393 
    394   if (is_admin())
    395   {
    396     $template->assign_block_vars('admin', array());
    397   }
    398 }
    399 
    400 // tags link
    401 $template->assign_block_vars(
    402   'summary',
    403   array(
    404     'TITLE' => l10n('See available tags'),
    405     'NAME' => l10n('Tags'),
    406     'U_SUMMARY'=> get_root_url().'tags.php',
    407     )
    408   );
    409 
    410 // search link
    411 $template->assign_block_vars(
    412   'summary',
    413   array(
    414     'TITLE'=>$lang['hint_search'],
    415     'NAME'=>$lang['search'],
    416     'U_SUMMARY'=> get_root_url().'search.php',
    417     'REL'=> 'rel="search"'
    418     )
    419   );
    420 
    421 // comments link
    422 $template->assign_block_vars(
    423   'summary',
    424   array(
    425     'TITLE'=>$lang['hint_comments'],
    426     'NAME'=>$lang['comments'],
    427     'U_SUMMARY'=> get_root_url().'comments.php',
    428     )
    429   );
    430 
    431 // about link
    432 $template->assign_block_vars(
    433   'summary',
    434   array(
    435     'TITLE'     => $lang['about_page_title'],
    436     'NAME'      => $lang['About'],
    437     'U_SUMMARY' => get_root_url().'about.php',
    438     )
    439   );
    440 
    441 // notification
    442 $template->assign_block_vars(
    443   'summary',
    444   array(
    445     'TITLE'=>l10n('notification'),
    446     'NAME'=>l10n('Notification'),
    447     'U_SUMMARY'=> get_root_url().'notification.php',
    448     'REL'=> 'rel="nofollow"'
    449     )
    450   );
    451191
    452192if (isset($page['category']) and is_admin())

  • branches/branch-1_6/template/yoga/index.tpl

    r1134 r1367  
    11<!-- $Id$ -->
    2 <div id="menubar">
    3 <!-- BEGIN links -->
    4 <dl>
    5   <dt>{lang:Links}</dt>
    6   <dd>
    7     <ul>
    8       <!-- BEGIN link -->
    9       <li><a href="{links.link.URL}">{links.link.LABEL}</a></li>
    10       <!-- END link -->
    11     </ul>
    12   </dd>
    13 </dl>
    14 <!-- END links -->
    15 <dl>
    16   <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
    17   <dd>
    18     {MENU_CATEGORIES_CONTENT}
    19     <p class="totalImages">{NB_PICTURE} {lang:total}</p>
    20   </dd>
    21 </dl>
    22 
    23 <!-- BEGIN tags -->
    24 <dl>
    25   <dt>{lang:Related tags}</dt>
    26   <dd>
    27     <ul id="menuTagCloud">
    28       <!-- BEGIN tag -->
    29       <li>
    30         <a href="{tags.tag.URL_ADD}" title="{tags.tag.TITLE_ADD}"><img src="{pwg_root}{themeconf:icon_dir}/add_tag.png" alt="+"></a>
    31         <a href="{tags.tag.URL}" class="{tags.tag.CLASS}" title="{tags.tag.TITLE}">{tags.tag.NAME}</a>
    32       </li>
    33       <!-- END tag -->
    34     </ul>
    35   </dd>
    36 </dl>
    37 <!-- END tags -->
    38 
    39 <dl>
    40   <dt>{lang:special_categories}</dt>
    41   <dd>
    42     <ul>
    43       <!-- BEGIN special_cat -->
    44       <li><a href="{special_cat.URL}" title="{special_cat.TITLE}">{special_cat.NAME}</a></li>
    45       <!-- END special_cat -->
    46     </ul>
    47   </dd>
    48 </dl>
    49 <dl>
    50   <dt>{lang:title_menu}</dt>
    51   <dd>
    52     <ul>
    53       <!-- BEGIN summary -->
    54       <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li>
    55       <!-- END summary -->
    56       <!-- BEGIN upload -->
    57       <li><a href="{upload.U_UPLOAD}">{lang:upload_picture}</a></li>
    58       <!-- END upload -->
    59     </ul>
    60   </dd>
    61 </dl>
    62 <dl>
    63   <dt>{lang:identification}</dt>
    64   <dd>
    65     <!-- BEGIN hello -->
    66     <p>{lang:hello}&nbsp;{USERNAME}&nbsp;!</p>
    67     <!-- END hello -->
    68     <ul>
    69       <!-- BEGIN register -->
    70       <li><a href="{U_REGISTER}" rel="nofollow">{lang:ident_register}</a></li>
    71       <!-- END register -->
    72       <!-- BEGIN login -->
    73       <li><a href="{F_IDENTIFY}" rel="nofollow">{lang:Connection}</a></li>
    74       <!-- END login -->
    75       <!-- BEGIN logout -->
    76       <li><a href="{U_LOGOUT}">{lang:logout}</a></li>
    77       <!-- END logout -->
    78       <!-- BEGIN profile -->
    79       <li><a href="{U_PROFILE}" title="{lang:hint_customize}">{lang:customize}</a></li>
    80       <!-- END profile -->
    81       <!-- BEGIN admin -->
    82       <li><a href="{U_ADMIN}" title="{lang:hint_admin}">{lang:admin}</a></li>
    83       <!-- END admin -->
    84     </ul>
    85     <!-- BEGIN quickconnect -->
    86     <form method="post" action="{F_IDENTIFY}" class="filter" id="quickconnect">
    87       <fieldset>
    88         <legend>{lang:Quick connect}</legend>
    89 
    90         <label>
    91           {lang:Username}
    92           <input type="text" name="username" size="15" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
    93         </label>
    94 
    95         <label>
    96           {lang:password}
    97           <input type="password" name="password" size="15" onfocus="this.className='focus';" onblur="this.className='nofocus';">
    98         </label>
    99 
    100         <!-- BEGIN remember_me -->
    101         <label>
    102           {lang:remember_me}
    103           <input type="checkbox" name="remember_me" value="1">
    104         </label>
    105         <!-- END remember_me -->
    106 
    107         <p>
    108          <input type="submit" name="login" value="{lang:submit}">
    109         </p>
    110     <ul class="actions">
    111       <li><a href="{U_LOST_PASSWORD}" title="{lang:Forgot your password?}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/lost_password.png" class="button" alt="{lang:Forgot your password?}"></a></li>
    112       <li><a href="{U_REGISTER}" title="{lang:Create a new account}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/register.png" class="button" alt="{lang:register}"/></a></li>
    113     </ul>
    114 
    115       </fieldset>
    116     </form>
    117     <!-- END quickconnect -->
    118 
    119   </dd>
    120 </dl>
    121 </div> <!-- menubar -->
    122 
     2{MENUBAR}
    1233<div id="content">
    1244  <div class="titrePage">

  • branches/branch-1_6/template/yoga/mainpage_categories.tpl

    • Property svn:keywords set to Author Date Id Revision
Note: See TracChangeset for help on using the changeset viewer.