Changeset 26

Show
Ignore:
Timestamp:
05/21/03 11:29:44 (6 years ago)
Author:
saxmatt
Message:

Final semantic touch ups. <div> placement fix.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/index.php

    r21 r26  
    77     
    88    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
    9      
     9    <meta name="generator" content="WordPress .7" /> <!-- leave this for stats --> 
     10 
    1011    <style type="text/css" media="screen"> 
    11         @import url( layout2b.css ); 
     12        @import url( <?php echo $siteurl; ?>/layout2b.css ); 
    1213    </style> 
    1314     
    14     <link rel="stylesheet" type="text/css" media="print" href="print.css" /> 
     15    <link rel="stylesheet" type="text/css" media="print" href="<?php echo $siteurl; ?>/print.css" /> 
    1516    <link rel="alternate" type="text/xml" title="RDF" href="<?php bloginfo('rdf_url'); ?>" /> 
    1617    <link rel="alternate" type="text/xml" title="RSS" href="<?php bloginfo('rss2_url'); ?>" /> 
    1718    <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" /> 
    18     <?php comments_popup_script() ?> 
     19    <?php // comments_popup_script(); // off by default ?> 
    1920</head> 
    2021 
    …… 
    3132<?php the_date('','<h2>','</h2>'); ?> 
    3233 
    33 <h3 class="storyTitle"><a href="<?php permalink_link() ?>"><?php the_title(); ?></a> <a href="?cat=<?php the_category_ID() ?>" title="Category: <?php the_category() ?>" class="storyCategory">[<?php the_category() ?>]</a> - <span class="storyAuthor"><?php the_author() ?></span> @ <?php the_time() ?> 
     34<h3 class="storytitle"><a href="<?php permalink_link() ?>"><?php the_title(); ?></a> <a href="?cat=<?php the_category_ID() ?>" title="Category: <?php the_category() ?>" class="storycategory">[<?php the_category() ?>]</a> - <span class="storyauthor"><?php the_author() ?></span> @ <?php the_time() ?> 
    3435</h3> 
    3536 
     37<<<<<<< index.php 
     38<div class="storycontent"> 
     39 
     40======= 
    3641<div class="storyContent"> 
     42>>>>>>> 1.8 
    3743<?php the_content(); ?> 
    3844 
    …… 
    4248<?php trackback_popup_link('TrackBack (0)', 'TrackBack (1)', 'TrackBack (%)') ?>  
    4349<?php pingback_popup_link('PingBack (0)', 'PingBack (1)', 'PingBack (%)') ?> 
     50</div> 
    4451 
    4552<?php trackback_rdf() ?> 
    …… 
    5461<?php include ('b2pingbacks.php'); ?> 
    5562 
    56 </div> 
     63 
    5764 
    5865</div> 
    …… 
    6572</div> 
    6673 
    67 <p class="centerP"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org"><strong>Wordpress</strong></a></cite> 
    68 </p> 
     74<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org"><strong>Wordpress</strong></a></cite></p> 
    6975 
    7076 
    …… 
    95101 <li>Archives: 
    96102    <ul> 
    97      <?php include("b2archives.php"); // fix this too ?> 
     103     <?php get_archives('monthly'); ?> 
    98104    </ul> 
    99105 </li>