Changeset 1677
- Timestamp:
- 05/09/08 00:53:48 (8 months ago)
- Location:
- trunk/htdocs/system/themes/k2
- Files:
-
- 15 modified
-
404.php (modified) (1 diff)
-
commentform.php (modified) (3 diffs)
-
comments.php (modified) (2 diffs)
-
db_profiling.php (modified) (3 diffs)
-
entry.multiple.php (modified) (1 diff)
-
entry.single.php (modified) (1 diff)
-
footer.php (modified) (1 diff)
-
header.php (modified) (1 diff)
-
home.php (modified) (1 diff)
-
loginform.php (modified) (3 diffs)
-
page.single.php (modified) (1 diff)
-
search.php (modified) (2 diffs)
-
searchform.php (modified) (1 diff)
-
sidebar.php (modified) (1 diff)
-
tag.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/htdocs/system/themes/k2/404.php
r1589 r1677 6 6 7 7 <div class="entry-head"> 8 <h3 class="entry-title"> Error!</h3>8 <h3 class="entry-title"><?php _e('Error!'); ?></h3> 9 9 </div> 10 10 11 11 <div class="entry-content"> 12 <p> The requested post was not found.</p>12 <p><?php _e('The requested post was not found.'); ?></p> 13 13 </div> 14 14 -
trunk/htdocs/system/themes/k2/commentform.php
r1477 r1677 4 4 ?> 5 5 <div class="comments"> 6 <h4 id="respond" class="reply"> Leave a Reply</h4>6 <h4 id="respond" class="reply"><?php _e('Leave a Reply'); ?></h4> 7 7 <?php 8 8 if ( Session::has_errors() ) { … … 14 14 <p> 15 15 <input type="text" name="name" id="name" value="<?php echo $commenter_name; ?>" size="22" tabindex="1"> 16 <label for="name"><small><strong> Name</strong></small></label>16 <label for="name"><small><strong><?php _e('Name'); ?></strong></small></label> 17 17 </p> 18 18 <p> 19 19 <input type="text" name="email" id="email" value="<?php echo $commenter_email; ?>" size="22" tabindex="2"> 20 <label for="email"><small><strong> Mail</strong> (will not be published)</small></label>20 <label for="email"><small><strong><?php _e('Mail'); ?></strong> (<?php _e('will not be published'); ?>)</small></label> 21 21 </p> 22 22 <p> 23 23 <input type="text" name="url" id="url" value="<?php echo $commenter_url; ?>" size="22" tabindex="3"> 24 <label for="url"><small><strong> Website</strong></small></label>24 <label for="url"><small><strong><?php _e('Website'); ?></strong></small></label> 25 25 </p> 26 26 </div> … … 31 31 </p> 32 32 <p> 33 <input name="submit" type="submit" id="submit" tabindex="5" value=" Submit">33 <input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit'); ?>"> 34 34 </p> 35 35 <div class="clear"></div> -
trunk/htdocs/system/themes/k2/comments.php
r1591 r1677 6 6 7 7 <div class="comments"> 8 <h4><span id="comments"><?php echo $post->comments->moderated->count; ?> Responses to<?php echo $post->title; ?></span></h4>8 <h4><span id="comments"><?php echo $post->comments->moderated->count; ?> <?php _e('Responses to'); ?> <?php echo $post->title; ?></span></h4> 9 9 <div class="metalinks"> 10 <span class="commentsrsslink"><a href="<?php echo $post->comment_feed_link; ?>"> Feed for this Entry</a></span>10 <span class="commentsrsslink"><a href="<?php echo $post->comment_feed_link; ?>"><?php _e('Feed for this Entry'); ?></a></span> 11 11 </div> 12 12 … … 22 22 ?> 23 23 <li id="comment-<?php echo $comment->id; ?>" <?php echo $class; ?>> 24 <a href="#comment-<?php echo $comment->id; ?>" class="counter" title=" Permanent Link to this Comment"><?php echo $comment->id; ?></a>24 <a href="#comment-<?php echo $comment->id; ?>" class="counter" title="<?php _e('Permanent Link to this Comment'); ?>"><?php echo $comment->id; ?></a> 25 25 <span class="commentauthor"><a href="<?php echo $comment->url; ?>" rel="external"><?php echo $comment->name; ?></a></span> 26 <small class="comment-meta"><a href="#comment-<?php echo $comment->id; ?>" title=" Time of this comment"><?php echo $comment->date; ?></a><?php if ( $comment->status == Comment::STATUS_UNAPPROVED ) : ?> <em>In moderation</em><?php endif; ?></small>26 <small class="comment-meta"><a href="#comment-<?php echo $comment->id; ?>" title="<?php _e('Time of this Comment'); ?>"><?php echo $comment->date; ?></a><?php if ( $comment->status == Comment::STATUS_UNAPPROVED ) : ?> <em><?php _e('In moderation'); ?></em><?php endif; ?></small> 27 27 28 28 <div class="comment-content"> -
trunk/htdocs/system/themes/k2/db_profiling.php
r630 r1677 29 29 </style> 30 30 <div class="prof_container"> 31 <h1 class="prof_header"> DB Profiling</h1>31 <h1 class="prof_header"><?php _e('DB Profiling'); ?></h1> 32 32 <?php 33 33 $profiles= DB::get_profiles(); … … 40 40 </code> 41 41 <div class="prof_time"> 42 <p> Time to Execute:<strong><?php echo $profile->total_time; ?></strong></p>42 <p><?php _e('Time to Execute:'); ?> <strong><?php echo $profile->total_time; ?></strong></p> 43 43 </div> 44 44 <?php if ( !empty( $profile->backtrace ) ) { ?> … … 54 54 ?> 55 55 <div class="prof_time_total"> 56 <p> Total Time Executing Queries:<?php echo $total_time_querying; ?></p>56 <p><?php _e('Total Time Executing Queries:'); ?> <?php echo $total_time_querying; ?></p> 57 57 </div> 58 58 </div> -
trunk/htdocs/system/themes/k2/entry.multiple.php
r1589 r1677 11 11 <small class="entry-meta"> 12 12 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> by <?php echo $post->author->displayname; ?> <?php } ?> 13 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title=" Comments to this post"><?php echo $post->comments->approved->count; ?>13 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post'); ?>"><?php echo $post->comments->approved->count; ?> 14 14 <?php echo _n( 'Comment', 'Comments', $post->comments->approved->count ); ?></a></span> 15 15 <?php if ( $user ) { ?> 16 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title=" Edit post">Edit</a></span>16 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post'); ?>"><?php _e('Edit'); ?></a></span> 17 17 <?php } ?> 18 18 <?php if ( is_array( $post->tags ) ) { ?> -
trunk/htdocs/system/themes/k2/entry.single.php
r1596 r1677 20 20 <small class="entry-meta"> 21 21 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> by <?php echo $post->author->displayname; ?> <?php } ?> 22 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title=" Comments to this post"><?php echo $post->comments->approved->count; ?>22 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post'); ?>"><?php echo $post->comments->approved->count; ?> 23 23 <?php echo _n( 'Comment', 'Comments', $post->comments->approved->count ); ?></a></span> 24 24 <?php if ( $user ) { ?> 25 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title=" Edit post">Edit</a></span>25 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post'); ?>"><?php _e('Edit'); ?></a></span> 26 26 <?php } ?> 27 27 <?php if ( is_array( $post->tags ) ) { ?> -
trunk/htdocs/system/themes/k2/footer.php
r1522 r1677 7 7 8 8 <p id="footer"> 9 <small><?php Options::out('title'); _e(' is powered by'); ?> <a href="http://www.habariproject.org/" title="Habari">Habari</a> <?php _e('and '); ?> a huge amount of10 <a href="http://en.wikipedia.org/wiki/Caffeine" title=" Caffeine" rel="nofollow">C<sub>8</sub>H<sub>10</sub>N<sub>4</sub>O<sub>2</sub></a></small><br>11 <small><a href="<?php URL::out( 'atom_feed', array( 'index' => '1' ) ); ?>"> Atom Entries</a> and <a href="<?php URL::out( 'atom_feed_comments' ); ?>">Atom Comments</a></small>9 <small><?php Options::out('title'); _e(' is powered by'); ?> <a href="http://www.habariproject.org/" title="Habari">Habari</a> <?php _e('and a huge amount of'); ?> 10 <a href="http://en.wikipedia.org/wiki/Caffeine" title="<?php _e('Caffeine'); ?>" rel="nofollow">C<sub>8</sub>H<sub>10</sub>N<sub>4</sub>O<sub>2</sub></a></small><br> 11 <small><a href="<?php URL::out( 'atom_feed', array( 'index' => '1' ) ); ?>"><?php _e('Atom Entries'); ?></a> <?php _e('and'); ?> <a href="<?php URL::out( 'atom_feed_comments' ); ?>"><?php _e('Atom Comments'); ?></a></small> 12 12 </p> 13 13 -
trunk/htdocs/system/themes/k2/header.php
r1589 r1677 32 32 } 33 33 if ( $user ) { ?> 34 <li class="admintab"><a href="<?php Site::out_url( 'admin' ); ?>" title=" Admin area">Admin</a></li>34 <li class="admintab"><a href="<?php Site::out_url( 'admin' ); ?>" title="<?php _e('Admin area'); ?>"><?php _e('Admin'); ?></a></li> 35 35 <?php } ?> 36 36 </ul> -
trunk/htdocs/system/themes/k2/home.php
r1590 r1677 10 10 <h3 class="entry-title"><a href="<?php echo $post->permalink; ?>" title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a></h3> 11 11 <small class="entry-meta"> 12 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> by<?php echo $post->author->displayname; ?> <?php } ?>13 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title=" Comments to this post"><?php echo $post->comments->approved->count; ?>12 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> <?php _e('by'); ?> <?php echo $post->author->displayname; ?> <?php } ?> 13 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post'); ?>"><?php echo $post->comments->approved->count; ?> 14 14 <?php echo _n( 'Comment', 'Comments', $post->comments->approved->count ); ?></a></span> 15 15 <?php if ( $user ) { ?> 16 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title=" Edit post">Edit</a></span>16 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post'); ?>"><?php _e('Edit'); ?></a></span> 17 17 <?php } ?> 18 18 <?php if ( is_array( $post->tags ) ) { ?> -
trunk/htdocs/system/themes/k2/loginform.php
r1077 r1677 3 3 if ( isset( $error ) && ( $error == 'Bad credentials' ) ) { 4 4 ?> 5 <p> That login is incorrect.</p>5 <p><?php _e('That login is incorrect.'); ?></p> 6 6 7 7 <?php … … 9 9 if ( isset( $user ) && ( $user instanceOf User ) ) { 10 10 ?> 11 <p> You are logged in as <a href="<?php URL::out( 'admin', 'page=user&user=' . $user->username ) ?>" title="Edit Your Profile"><?php echo $user->username; ?></a>.</p>12 <p> Want to <a href="<?php Site::out_url( 'habari' ); ?>/user/logout">log out</a>?</p>11 <p><?php _e('You are logged in as'); ?> <a href="<?php URL::out( 'admin', 'page=user&user=' . $user->username ) ?>" title="<?php _e('Edit Your Profile'); ?>"><?php echo $user->username; ?></a>.</p> 12 <p><?php _e('Want to'); ?> <a href="<?php Site::out_url( 'habari' ); ?>/user/logout"><?php _e('log out'); ?></a>?</p> 13 13 <?php 14 14 } … … 18 18 <form method="post" action="<?php URL::out( 'user', array( 'page' => 'login' ) ); ?>" id="loginform"> 19 19 <p> 20 <label for="habari_username"> Name:</label>20 <label for="habari_username"><?php _e('Name:'); ?></label> 21 21 <input type="text" size="25" name="habari_username" id="habari_username"> 22 22 </p> 23 23 <p> 24 <label for="habari_password"> Password:</label>24 <label for="habari_password"><?php _e('Password:'); ?></label> 25 25 <input type="password" size="25" name="habari_password" id="habari_password"> 26 26 </p> 27 27 <?php Plugins::act( 'theme_loginform_controls' ); ?> 28 28 <p> 29 <input type="submit" value=" Sign in">29 <input type="submit" value="<?php _e('Sign in'); ?>"> 30 30 </p> 31 31 </form> -
trunk/htdocs/system/themes/k2/page.single.php
r1589 r1677 6 6 7 7 <div class="entry-head"> 8 <h3 class="entry-title"> Page:<a href="<?php echo $post->permalink; ?>" title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a></h3>8 <h3 class="entry-title"><?php _e('Page:'); ?> <a href="<?php echo $post->permalink; ?>" title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a></h3> 9 9 <small class="entry-meta"> 10 10 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> by <?php echo $post->author->displayname; ?> <?php } ?> 11 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title=" Comments to this post"><?php echo $post->comments->approved->count; ?>11 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post'); ?>"><?php echo $post->comments->approved->count; ?> 12 12 <?php echo _n( 'Comment', 'Comments', $post->comments->approved->count ); ?></a></span> 13 13 <?php if ( $user ) { ?> 14 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title=" Edit post">Edit</a></span>14 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post'); ?>"><?php _e('Edit'); ?></a></span> 15 15 <?php } ?> 16 16 <?php if ( is_array( $post->tags ) ) { ?> -
trunk/htdocs/system/themes/k2/search.php
r1589 r1677 4 4 <div id="primary"> 5 5 <div id="primarycontent" class="hfeed"> 6 <h2> Search results for<?php echo htmlspecialchars( $criteria ); ?></h2>6 <h2><?php _e('Search results for'); ?> <?php echo htmlspecialchars( $criteria ); ?></h2> 7 7 <?php foreach ( $posts as $post ) { ?> 8 8 <div id="post-<?php echo $post->id; ?>" class="<?php echo $post->statusname; ?>"> … … 12 12 <small class="entry-meta"> 13 13 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> by <?php echo $post->author->displayname; ?> <?php } ?> 14 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title=" Comments to this post"><?php echo $post->comments->approved->count; ?>14 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post'); ?>"><?php echo $post->comments->approved->count; ?> 15 15 <?php echo _n( 'Comment', 'Comments', $post->comments->approved->count ); ?></a></span> 16 16 <?php if ( $user ) { ?> 17 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title=" Edit post">Edit</a></span>17 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post'); ?>"><?php _e('Edit'); ?></a></span> 18 18 <?php } ?> 19 19 <?php if ( is_array( $post->tags ) ) { ?> -
trunk/htdocs/system/themes/k2/searchform.php
r1096 r1677 2 2 <?php Plugins::act( 'theme_searchform_before' ); ?> 3 3 <form method="get" id="searchform" action="<?php URL::out('display_search'); ?>"> 4 <p><input type="text" id="s" name="criteria" value="<?php if ( isset( $criteria ) ) { echo htmlentities($criteria, ENT_COMPAT, 'UTF-8'); } ?>"> <input type="submit" id="searchsubmit" value=" Go!"></p>4 <p><input type="text" id="s" name="criteria" value="<?php if ( isset( $criteria ) ) { echo htmlentities($criteria, ENT_COMPAT, 'UTF-8'); } ?>"> <input type="submit" id="searchsubmit" value="<?php _e('Go!'); ?>"></p> 5 5 </form> 6 6 <?php Plugins::act( 'theme_searchform_after' ); ?> -
trunk/htdocs/system/themes/k2/sidebar.php
r1589 r1677 3 3 4 4 <div id="search"> 5 <h2> Search</h2>5 <h2><?php _e('Search'); ?></h2> 6 6 <?php $theme->display ('searchform' ); ?> 7 7 </div> 8 8 9 9 <div class="sb-about"> 10 <h2> About</h2>10 <h2><?php _e('About'); ?></h2> 11 11 <p><?php Options::out('about'); ?></p> 12 12 </div> 13 13 14 14 <div class="sb-user"> 15 <h2> User</h2>15 <h2><?php _e('User'); ?></h2> 16 16 <?php $theme->display ( 'loginform' ); ?> 17 17 </div> -
trunk/htdocs/system/themes/k2/tag.php
r1589 r1677 10 10 <h3 class="entry-title"><a href="<?php echo $post->permalink; ?>" title="<?php echo $post->title; ?>"><?php echo $post->title_out; ?></a></h3> 11 11 <small class="entry-meta"> 12 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> by<?php echo $post->author->displayname; ?> <?php } ?>13 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title=" Comments to this post"><?php echo $post->comments->approved->count; ?>12 <span class="chronodata"><abbr class="published"><?php echo $post->pubdate_out; ?></abbr></span><?php if ( $show_author ) { ?> <?php _e('by'); ?> <?php echo $post->author->displayname; ?> <?php } ?> 13 <span class="commentslink"><a href="<?php echo $post->permalink; ?>#comments" title="<?php _e('Comments to this post'); ?>"><?php echo $post->comments->approved->count; ?> 14 14 <?php echo _n( 'Comment', 'Comments', $post->comments->approved->count ); ?></a></span> 15 15 <?php if ( $user ) { ?> 16 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title=" Edit post">Edit</a></span>16 <span class="entry-edit"><a href="<?php URL::out( 'admin', 'page=publish&slug=' . $post->slug); ?>" title="<?php _e('Edit post'); ?>"><?php _e('Edit'); ?></a></span> 17 17 <?php } ?> 18 18 <?php if ( is_array( $post->tags ) ) { ?>
