Changeset 1629


Ignore:
Timestamp:
Dec 2, 2006, 7:28:12 PM (17 years ago)
Author:
chrisaga
Message:

merge from trunk r1626:1627 : meta and links in the header

Location:
branches/branch-1_6-hk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1_6-hk/include/page_header.php

    r1570 r1629  
    5353    ));
    5454
     55// picture header infos
     56if (isset($header_infos))
     57{
     58  $template->assign_block_vars( 'header_meta', $header_infos);
     59}
    5560// refresh
    5661if ( isset( $refresh ) and intval($refresh) >= 0 and isset( $url_link ) and isset( $redirect_msg ) )

  • branches/branch-1_6-hk/index.php

    r1553 r1629  
    9494$title = $page['title'];
    9595$page['body_id'] = 'theCategoryPage';
    96 include(PHPWG_ROOT_PATH.'include/page_header.php');
    9796
    9897$template->set_filenames( array('index'=>'index.tpl') );
    … …  
    264263      );
    265264  }
     265  $header_infos['COMMENT'] = strip_tags($page['comment']);
    266266}
    267267//------------------------------------------------------------ log informations
    268268pwg_log('category', $page['title']);
    269269
     270include(PHPWG_ROOT_PATH.'include/page_header.php');
    270271$template->parse('index');
    271272include(PHPWG_ROOT_PATH.'include/page_tail.php');

  • branches/branch-1_6-hk/picture.php

    r1504 r1629  
    431431}
    432432
    433 include(PHPWG_ROOT_PATH.'include/page_header.php');
    434433$template->set_filenames(array('picture'=>'picture.tpl'));
    435434
    … …  
    593592
    594593//--------------------------------------------------------- picture information
     594$header_infos = array();        //for html header use
    595595// legend
    596596if (isset($picture['current']['comment'])
    … …  
    602602      'COMMENT_IMG' => nl2br($picture['current']['comment'])
    603603      ));
     604  $header_infos['COMMENT'] = strip_tags($picture['current']['comment']);
    604605}
    605606
    … …  
    618619//       .'">'.$picture['current']['author'].'</a>';
    619620    $picture['current']['author'];
     621  $header_infos['INFO_AUTHOR'] = $picture['current']['author'];
    620622}
    621623else
    … …  
    705707{
    706708  $tags = array();
     709  $tag_names = array();
    707710
    708711  while ($row = mysql_fetch_array($result))
    … …  
    723726      .'">'.$row['name'].'</a>'
    724727      );
     728    array_push( $tag_names, $row['name'] );
    725729  }
    726730
    727731  $infos['INFO_TAGS'] = implode(', ', $tags);
     732  $header_infos['INFO_TAGS'] = implode(', ', $tag_names);
    728733}
    729734else
    … …  
    776781pwg_log('picture', $page['title'], $picture['current']['file']);
    777782
     783include(PHPWG_ROOT_PATH.'include/page_header.php');
    778784$template->parse('picture');
    779785include(PHPWG_ROOT_PATH.'include/page_tail.php');

  • branches/branch-1_6-hk/search.php

    r1313 r1629  
    174174$title= $lang['search_title'];
    175175$page['body_id'] = 'theSearchPage';
    176 include(PHPWG_ROOT_PATH.'include/page_header.php');
    177176
    178177$template->set_filenames( array('search'=>'search.tpl') );
    … …  
    238237//------------------------------------------------------------ log informations
    239238pwg_log( 'search', $title );
     239include(PHPWG_ROOT_PATH.'include/page_header.php');
    240240$template->parse('search');
    241241include(PHPWG_ROOT_PATH.'include/page_tail.php');

  • branches/branch-1_6-hk/template/yoga/header.tpl

    r1492 r1629  
    44<head>
    55<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
     6<meta name="robots" content="index, follow">
     7<meta name="generator" content="PhpWebGallery (aka PWG), see www.phpwebgallery.net">
     8<!-- BEGIN header_meta -->
     9<meta name="author" content="{header_meta.INFO_AUTHOR}">
     10<meta name="keywords" content="{header_meta.INFO_TAGS}">
     11<meta name="description" content="{header_meta.COMMENT}">
     12<!-- END header_meta -->
     13<title>{GALLERY_TITLE} :: {PAGE_TITLE}</title>
    614<link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico">
     15<link rel="start" title="{lang:home}" href="{U_HOME}" >
     16<link rel="search" title="{lang:search}" href="{pwg_root}search.php" >
     17<!-- BEGIN first -->
     18<link rel="first" title="{lang:first_page}" href="{first.U_IMG}" >
     19<link rel="up" title="{lang:thumbails}" href="{U_UP}" >
     20<!-- END first -->
     21<!-- BEGIN previous -->
     22<link rel="prev" title="{lang:previous_page}" href="{previous.U_IMG}" >
     23<!-- END previous -->
     24<!-- BEGIN next -->
     25<link rel="next" title="{lang:next_page}" href="{next.U_IMG}" >
     26<!-- END next -->
     27<!-- BEGIN last -->
     28<link rel="last" title="{lang:last_page}" href="{last.U_IMG}" >
     29<link rel="up" title="{lang:thumbails}" href="{U_UP}" >
     30<!-- END last -->
    731<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css">
    832<!-- the next css is used to fix khtml (Konqueror/Safari) issue
    … …  
    2246<meta http-equiv="refresh" content="{REFRESH_TIME};url={U_REFRESH}">
    2347<!-- END refresh -->
    24 <title>{GALLERY_TITLE}:{PAGE_TITLE}</title>
    2548<script type="text/javascript" src="{pwg_root}include/scripts.js"></script>
    2649<!--[if lt IE 7]>
Note: See TracChangeset for help on using the changeset viewer.