Changeset 2291 for branches

Show
Ignore:
Timestamp:
12/11/10 07:20:57 (18 months ago)
Author:
petsagouris
Message:

[Branch 1.5] Added Content-Style-Type in meta for validating in-line css style attributes.

Location:
branches/1.5/content/themes/default
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.5/content/themes/default/header.php

    r2197 r2291  
    3232<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="en-US"> 
    3333<head profile="http://gmpg.org/xfn/11"> 
    34 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
    35 <meta name="generator" content="Hotaru CMS <?php echo $h->version; ?>" /> 
    36  
     34        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 
     35        <meta name="generator" content="Hotaru CMS <?php echo $h->version; ?>" /> 
    3736        <title><?php echo $h->getTitle(); ?></title> 
    38          
    39                 <?php 
    40                         // plugin hook 
    41                         $result = $h->pluginHook('header_meta'); 
    42                         if (!$result) { ?> 
    43                                 <meta name="description" content="<?php echo $h->lang['header_meta_description']; ?>" /> 
    44                                 <meta name="keywords" content="<?php echo $h->lang['header_meta_keywords']; ?>" /> 
    45                 <?php } ?> 
    46          
     37        <meta http-equiv="Content-Style-Type" content="text/css" /> 
     38        <?php $result = $h->pluginHook('header_meta'); 
     39        if (!$result) { ?> 
     40                <meta name="description" content="<?php echo $h->lang['header_meta_description']; ?>" /> 
     41                <meta name="keywords" content="<?php echo $h->lang['header_meta_keywords']; ?>" /> 
     42        <?php } ?> 
    4743        <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js?ver=1.4.2'></script> 
    4844         

  • branches/1.5/content/themes/default/navigation.php

    r2154 r2291  
    3333<!-- Navigation Bar --> 
    3434<ul class="navigation"> 
    35         <?php   if ($h->currentUser->loggedIn) { 
    36                                 if($h->isActive('avatar')) { 
    37                                         $h->setAvatar($h->currentUser->id, 16); 
    38                                         echo '<li>' . $h->linkAvatar() . '</li>'; 
    39                                 } 
    40                         } ?> 
     35        <?php if (($h->currentUser->loggedIn) && ($h->isActive('avatar'))) { 
     36                $h->setAvatar($h->currentUser->id, 16); 
     37                echo '<li>' . $h->linkAvatar() . '</li>'; 
     38        } ?> 
    4139<?php if ($h->pageName == $h->home) { $status = "id='navigation_active'"; } else { $status = ""; } ?> 
    4240<li <?php echo $status; ?>><a href="<?php echo SITEURL; ?>"><?php echo $h->lang["main_theme_navigation_home"]; ?></a></li><?php $h->pluginHook('navigation'); ?><?php