Changeset 1238

Show
Ignore:
Timestamp:
04/17/08 15:15:45 (8 months ago)
Author:
donncha
Message:

sync home with default theme, fixes #593

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-content/themes/default/comments-popup.php

    r1218 r1238  
    103103<!-- // this is just the end of the motor - don't touch that line either :) --> 
    104104<?php //} ?> 
    105 <p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p> 
     105<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://mu.wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p> 
    106106<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?> 
    107107<script type="text/javascript"> 

  • trunk/wp-content/themes/default/rtl.css

    r1218 r1238  
    11/* 
    2 Theme name: WordPress Default - kubrick - 
     2Theme name: WordPress MU Default - kubrick - 
    33Editors: Navid Kashani 
    44Persian Wordpress Project : wp-persian.com 

  • trunk/wp-content/themes/home/archive.php

    r1069 r1238  
    22 
    33        <div id="content" class="narrowcolumn"> 
    4 <?php is_tag(); ?> 
     4 
    55                <?php if (have_posts()) : ?> 
    66 

  • trunk/wp-content/themes/home/comments-popup.php

    r978 r1238  
    5757 
    5858<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform"> 
    59 <?php if ( $user_ID ) : ?>  
    60         <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p> 
    61 <?php else : ?>  
     59<?php if ( $user_ID ) : ?> 
     60        <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a></p> 
     61<?php else : ?> 
    6262        <p> 
    6363          <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" /> 
    …… 
    103103<!-- // this is just the end of the motor - don't touch that line either :) --> 
    104104<?php //} ?> 
    105 <p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>Wordpress</strong></a></cite></p> 
     105<p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://mu.wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>WordPress</strong></a></cite></p> 
    106106<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?> 
    107107<script type="text/javascript"> 

  • trunk/wp-content/themes/home/comments.php

    r1069 r1238  
    11<?php // Do not delete these lines 
    2         if ('comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) 
     2        if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) 
    33                die ('Please do not load this page directly. Thanks!'); 
    44 
    …… 
    2828 
    2929                <li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>"> 
     30                        <?php echo get_avatar( $comment, 32 ); ?> 
    3031                        <cite><?php comment_author_link() ?></cite> Says: 
    3132                        <?php if ($comment->comment_approved == '0') : ?> 
    …… 
    7475<?php if ( $user_ID ) : ?> 
    7576 
    76 <p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p> 
     77<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="Log out of this account">Log out &raquo;</a></p> 
    7778 
    7879<?php else : ?> 

  • trunk/wp-content/themes/home/footer.php

    r978 r1238  
    33<hr /> 
    44<div id="footer"> 
    5 <!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way, it's our only promotion or advertising. --> 
     5<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. --> 
    66        <p> 
    77                <?php bloginfo('name'); ?> is proudly powered by 

  • trunk/wp-content/themes/home/functions.php

    r1069 r1238  
    8181 
    8282function kubrick_add_theme_page() { 
    83         if ( $_GET['page'] == basename(__FILE__) ) { 
    84                 if ( 'save' == $_REQUEST['action'] ) { 
     83        if ( isset( $_GET['page'] ) && $_GET['page'] == basename(__FILE__) ) { 
     84                if ( isset( $_REQUEST['action'] ) && 'save' == $_REQUEST['action'] ) { 
    8585                        check_admin_referer('kubrick-header'); 
    8686                        if ( isset($_REQUEST['njform']) ) { 
    …… 
    158158        } 
    159159        function PopupWindow_populate(contents) { 
    160                 contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>'; 
     160                contents += '<br /><p style="text-align:center;margin-top:0px;"><input type="button" class="button-secondary" value="<?php echo attribute_escape(__('Close Color Picker')); ?>" onclick="cp.hidePopup(\'prettyplease\')"></input></p>'; 
    161161                this.contents = contents; 
    162162                this.populated = false; 
    …… 
    355355 
    356356function kubrick_theme_page() { 
    357         if ( $_REQUEST['saved'] ) echo '<div id="message" class="updated fade"><p><strong>'.__('Options saved.').'</strong></p></div>'; 
     357        if ( isset( $_REQUEST['saved'] ) ) echo '<div id="message" class="updated fade"><p><strong>'.__('Options saved.').'</strong></p></div>'; 
    358358?> 
    359359<div class='wrap'> 
    …… 
    387387                        <form style="display:inline;" method="post" name="hicolor" id="hicolor" action="<?php echo attribute_escape($_SERVER['REQUEST_URI']); ?>"> 
    388388                                <?php wp_nonce_field('kubrick-header'); ?> 
    389         <input type="button" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input> 
    390                 <input type="button" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input> 
    391                 <input type="button" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input> 
    392                                 <input type="button" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" /> 
    393                                 <input type="button" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" /> 
     389        <input type="button" class="button-secondary" onclick="tgt=document.getElementById('fontcolor');colorSelect(tgt,'pick1');return false;" name="pick1" id="pick1" value="<?php echo attribute_escape(__('Font Color')); ?>"></input> 
     390                <input type="button" class="button-secondary" onclick="tgt=document.getElementById('uppercolor');colorSelect(tgt,'pick2');return false;" name="pick2" id="pick2" value="<?php echo attribute_escape(__('Upper Color')); ?>"></input> 
     391                <input type="button" class="button-secondary" onclick="tgt=document.getElementById('lowercolor');colorSelect(tgt,'pick3');return false;" name="pick3" id="pick3" value="<?php echo attribute_escape(__('Lower Color')); ?>"></input> 
     392                                <input type="button" class="button-secondary" name="revert" value="<?php echo attribute_escape(__('Revert')); ?>" onclick="kRevert()" /> 
     393                                <input type="button" class="button-secondary" value="<?php echo attribute_escape(__('Advanced')); ?>" onclick="toggleAdvanced()" /> 
    394394                                <input type="hidden" name="action" value="save" /> 
    395395                                <input type="hidden" name="fontdisplay" id="fontdisplay" value="<?php echo attribute_escape(kubrick_header_display()); ?>" /> 
    …… 
    398398                                <input type="hidden" name="lowercolor" id="lowercolor" value="<?php echo attribute_escape(kubrick_lower_color()); ?>" /> 
    399399                                <input type="hidden" name="headerimage" id="headerimage" value="<?php echo attribute_escape(kubrick_header_image()); ?>" /> 
    400                                 <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php echo attribute_escape(__('Update Header &raquo;')); ?>" onclick="cp.hidePopup('prettyplease')" /></p> 
     400                                <p class="submit"><input type="submit" name="submitform" class="defbutton" value="<?php echo attribute_escape(__('Update Header')); ?>" onclick="cp.hidePopup('prettyplease')" /></p> 
    401401                        </form> 
    402402                        <div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div> 
    …… 
    407407                                        <label for="advuppercolor"><?php _e('Upper Color (HEX):');?> </label><input type="text" id="advuppercolor" onchange="advUpdate(this.value, 'uppercolor')" value="#<?php echo attribute_escape(kubrick_upper_color()); ?>" /><br /> 
    408408                                        <label for="advlowercolor"><?php _e('Lower Color (HEX):'); ?> </label><input type="text" id="advlowercolor" onchange="advUpdate(this.value, 'lowercolor')" value="#<?php echo attribute_escape(kubrick_lower_color()); ?>" /><br /> 
    409                                         <input type="button" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br /> 
    410                                         <input type="button" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br /> 
     409                                        <input type="button" class="button-secondary" name="default" value="<?php echo attribute_escape(__('Select Default Colors')); ?>" onclick="kDefaults()" /><br /> 
     410                                        <input type="button" class="button-secondary" onclick="toggleDisplay();return false;" name="pick" id="pick" value="<?php echo attribute_escape(__('Toggle Text Display')); ?>"></input><br /> 
    411411                                </form> 
    412412                        </div> 

  • trunk/wp-content/themes/home/header.php

    r978 r1238  
    66 
    77<title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> &raquo; Blog Archive <?php } ?> <?php wp_title(); ?></title> 
    8  
    9 <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats --> 
    108 
    119<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" /> 

  • trunk/wp-content/themes/home/index.php

    r1069 r1238  
    88 
    99                        <div class="post" id="post-<?php the_ID(); ?>"> 
    10                                 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>"><?php the_title(); ?></a></h2> 
     10                                <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2> 
    1111                                <small><?php the_time('F jS, Y') ?>  by <?php the_author() ?></small> 
    1212 

  • trunk/wp-content/themes/home/links.php

    r730 r1238  
    1111<h2>Links:</h2> 
    1212<ul> 
    13 <?php get_links_list(); ?> 
     13<?php wp_list_bookmarks(); ?> 
    1414</ul> 
    1515 

  • trunk/wp-content/themes/home/rtl.css

    r1069 r1238  
    1 /* Based on Arabic (RTL) version of Kubrick theme, converted by Serdal (Serdal.com) */ 
    2  
    3 .narrowcolumn, .alignleft, .widecolumn .smallattachment { float: right; } 
    4 .alignright, #commentform #submit { float: left; } 
    5  
    6 #page, .post, #wp-calendar #prev a { text-align: right; } 
    7  
    8 body, #commentform p { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; } 
    9  
    10 small { font-family: 'Geeza Pro', Tahoma, Arial, Helvetica, Sans-Serif; } 
    11  
    12 h1, h2, h3 { font-family: 'Al Bayan', 'Traditional Arabic', 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; } 
    13  
    14 #sidebar h2 { font-family: 'Al Bayan', 'Traditional Arabic', 'Lucida Grande', Verdana, Sans-Serif; } 
    15  
    16 .commentlist li, #commentform input, #commentform textarea { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; } 
    17  
    18 #sidebar { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; } 
    19  
    20 #wp-calendar caption { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; } 
    21  
    22 acronym, abbr, span.caps { letter-spacing: normal; } 
    23  
    24 #header { margin: 0 1px 0 0; } 
    25  
    26 .narrowcolumn { padding: 0 45px 20px 0; } 
    27  
    28 .widecolumn { margin: 5px 150px 0 0; } 
    29  
    30 .widecolumn .smallattachment { margin: 5px 0px 5px 5px; } 
    31  
    32 .postmetadata { clear: right; } 
    33  
    34 img.alignright { margin: 0 7px 2px 0; } 
    35  
    36 img.alignleft { margin: 0 0 2px 7px; } 
    37  
    38 .entry ol { padding: 0 35px 0 0; } 
    39  
    40 #sidebar ul ul, #sidebar ul ol { margin: 5px 10px 0 0; } 
    41  
    42 #sidebar ul ul ul, #sidebar ul ol { margin: 0 10px 0 0; } 
    43  
    44 #commentform input { margin: 5px 0 1px 5px; } 
    45  
    46 .commentlist p { margin: 10px 0 10px 5px; } 
    47  
    48 html>body .entry li { margin: 7px 10px 8px 0; } 
    49  
    50 html>body .entry ul { 
    51         margin-left: auto; 
    52         margin-right: 0px; 
    53         padding: 0 30px 0 0; 
     1/* 
     2Theme name: WordPress MU Default - kubrick - 
     3Editors: Navid Kashani 
     4Persian Wordpress Project : wp-persian.com 
     5*/ 
     6body, .commentlist li, #commentform input, #commentform textarea, #commentform p, #sidebar, #wp-calendar caption  { 
     7        font-family:tahoma, arial; 
     8} 
     9#page { 
     10        text-align:right; 
     11        direction:rtl; 
     12} 
     13h1, h2, h3, #sidebar h2 { 
     14        font-family:arial, tahoma; 
     15} 
     16.commentlist li .avatar { 
     17        float:left; 
     18} 
     19#header { 
     20        margin:0 1px 0 0; 
     21} 
     22.narrowcolumn { 
     23        float:right; 
     24        padding: 0 45px 20px 0; 
     25} 
     26.widecolumn { 
     27        margin: 5px 150px 0 0; 
     28} 
     29.widecolumn .smallattachment { 
     30        margin: 5px 0 5px 5px; 
     31} 
     32.postmetadata { 
     33        clear:right; 
     34} 
     35#sidebar { 
     36        margin-left: 0; 
     37        margin-right: 545px; 
     38} 
     39img.alignright { 
     40        margin: 0 7px 2px 0; 
    5441} 
    5542 
    56 #sidebar { 
    57         margin-left: auto; 
    58         margin-right: 545px; 
     43img.alignleft { 
     44        margin: 0 0 2px 7px; 
    5945} 
    6046 
    61 #wp-calendar #prev a, html>body .entry ul { 
    62         padding-left: 0; 
    63         padding-right: 10px; 
     47.alignright { 
     48        float: left; 
    6449} 
    6550 
     51.alignleft { 
     52        float: right; 
     53} 
     54code { 
     55        display:block; 
     56        direction:ltr; 
     57        text-align:left; 
     58} 
     59acronym, abbr, span.caps { 
     60        letter-spacing:0; /* fix opera bug */ 
     61} 
     62html>body .entry ul { 
     63        padding:0 10px 0 0; 
     64        text-indent:10px; 
     65} 
     66html>body .entry li { 
     67        margin: 7px 10px 8px 0; 
     68} 
     69.entry ol { 
     70        padding: 0 35px 0 0; 
     71} 
     72#sidebar ul ul, #sidebar ul ol { 
     73        margin: 5px 10px 0 0; 
     74} 
     75#sidebar ul ul ul, #sidebar ul ol { 
     76        margin: 0 10px 0 0; 
     77} 
     78#commentform input { 
     79        margin: 5px 0 1px 5px; 
     80} 
     81#commentform #submit { 
     82        float:left; 
     83} 
     84.commentlist p { 
     85        margin: 10px 0 10px 5px; 
     86} 
     87#wp-calendar #next a { 
     88        padding-right:0; 
     89        padding-left:10px; 
     90        text-align:left; 
     91} 
     92#wp-calendar #prev a { 
     93        padding-left:0; 
     94        padding-right:10px; 
     95        text-align:right; 
     96} 
    6697blockquote { 
    67         border-left: 0; 
    68         border-right: 5px solid #ddd; 
     98        margin: 15px 10px 0 30px; 
    6999        padding-left: 0; 
    70100        padding-right: 20px; 
    71         margin: 15px 10px 0 30px; 
     101        border-left: 0 none; 
     102        border-right: 5px solid #ddd; 
    72103} 
    73  
    74 #wp-calendar #next a { 
    75         padding-right: 0; 
    76         padding-left: 10px; 
    77         text-align: left; 
     104#email, #url { 
     105        direction:ltr; 
    78106} 

  • trunk/wp-content/themes/home/sidebar.php

    r1069 r1238  
    33                        <?php   /* Widgetized sidebar, if you have the plugin installed. */ 
    44                                        if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?> 
    5 <?php if ( function_exists('dynamic_sidebar') && dynamic_sidebar() ) : ?> 
    6  
    7                 </ul> 
    8         </div> 
    9 <?php return; ?> 
    10  
    11 <?php endif; ?> 
    12                          
    135                        <li> 
    146                                <?php include (TEMPLATEPATH . '/searchform.php'); ?> 

  • trunk/wp-content/themes/home/single.php

    r1069 r1238  
    1111 
    1212                <div class="post" id="post-<?php the_ID(); ?>"> 
    13                         <h2><a href="<?php echo get_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2> 
     13                        <h2><?php the_title(); ?></h2> 
    1414 
    1515                        <div class="entry"> 
    …… 
    2828                                                on <?php the_time('l, F jS, Y') ?> at <?php the_time() ?> 
    2929                                                and is filed under <?php the_category(', ') ?>. 
    30                                                 You can follow any responses to this entry through the <?php comments_rss_link('RSS 2.0'); ?> feed. 
     30                                                You can follow any responses to this entry through the <?php post_comments_feed_link('RSS 2.0'); ?> feed. 
    3131 
    3232                                                <?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) { 

  • trunk/wp-content/themes/home/style.css

    r978 r1238  
    1 /*   
     1/* 
    22Theme Name: WordPress mu Default 
    33Theme URI: http://mu.wordpress.org/ 
    …… 
    66Author: Michael Heilemann 
    77Author URI: http://binarybonsai.com/ 
     8Tags: blue, custom header, fixed width, two columns, widgets 
    89 
    910        Kubrick v1.5 
    …… 
    3940        } 
    4041 
    41 #headerimg      {  
    42         margin: 7px 9px 0;  
    43         height: 192px;  
    44         width: 740px;  
    45         }  
     42#headerimg      { 
     43        margin: 7px 9px 0; 
     44        height: 192px; 
     45        width: 740px; 
     46        } 
    4647 
    4748#content { 
    …… 
    7273 
    7374#footer { 
    74         background: #eee url('images/kubrickfooter.jpg') no-repeat top;  
     75        background: #eee url('images/kubrickfooter.jpg') no-repeat top; 
    7576        border: none; 
    7677        } 
    …… 
    139140        } 
    140141 
     142.commentlist li .avatar {  
     143        float: right; 
     144        border: 1px solid #eee; 
     145        padding: 2px; 
     146        background: #fff; 
     147        } 
     148 
    141149.commentlist cite, .commentlist cite a { 
    142150        font-weight: bold; 
    …… 
    211219body { 
    212220        margin: 0 0 20px 0; 
    213         padding: 0;  
     221        padding: 0; 
    214222        } 
    215223 
    …… 
    224232#header { 
    225233        background-color: #73a0c5; 
    226         margin: 0 0 0 1px;  
    227         padding: 0;  
    228         height: 200px;  
     234        margin: 0 0 0 1px; 
     235        padding: 0; 
     236        height: 200px; 
    229237        width: 758px; 
    230238        } 
    …… 
    284292.postmetadata { 
    285293        clear: left; 
     294} 
     295 
     296.clear { 
     297        clear: both; 
    286298} 
    287299 
    …… 
    386398        padding-left: 10px; 
    387399        text-indent: -10px; 
    388         }  
     400        } 
    389401 
    390402html>body .entry li { 
    …… 
    450462#searchform { 
    451463        margin: 10px auto; 
    452         padding: 5px 3px;  
     464        padding: 5px 3px; 
    453465        text-align: center; 
    454466        }