Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small add #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Small add #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions 404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

<div class="row">
<div class="span11 columns">
global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<div class="page-header">
<h1><?php _e( 'Not Found', 'twentyten' ); ?></h1>
Expand All @@ -25,9 +27,6 @@
</script>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>

<?php get_footer(); ?>
<?php get_footer(); ?>
15 changes: 7 additions & 8 deletions archive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

<?php
/* Queue the first post, that way we know
* what date we're dealing with (if that is the case).
*
Expand All @@ -23,10 +22,12 @@
*/
if ( have_posts() )
the_post();
?>

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span11 columns">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<div class="page-header">
<h1>
Expand Down Expand Up @@ -57,8 +58,6 @@
?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
<?php get_footer(); ?>
13 changes: 5 additions & 8 deletions attachment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

<div class="row">
<div class="span11 columns">
global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>

Expand Down Expand Up @@ -99,9 +99,6 @@
<?php endwhile; ?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>

<?php get_footer(); ?>
<?php get_footer(); ?>
12 changes: 6 additions & 6 deletions author.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
*/
if ( have_posts() )
the_post();
?>

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span11 columns">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<div class="page-header">
<h1><?php printf( __( 'Author Archives: %s', 'twentyten' ), "<a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
Expand Down Expand Up @@ -53,8 +55,6 @@
?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
<?php get_footer(); ?>
15 changes: 8 additions & 7 deletions category.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

<div class="row">
<div class="span11 columns">
global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<div class="page-header">
<h1><?php
printf( __( 'Category Archives: %s', 'twentyten' ), '' . single_cat_title( '', false ) . '' );
Expand All @@ -31,8 +34,6 @@
?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
<?php get_footer(); ?>
15 changes: 8 additions & 7 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span11 columns">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">
<?php
/* Run the loop to output the posts.
* If you want to overload this in a child theme then include a file
Expand All @@ -24,9 +28,6 @@
get_template_part( 'loop', 'index' );
?>
</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>

<?php get_footer(); ?>
<?php get_footer(); ?>
15 changes: 8 additions & 7 deletions page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

<div class="row">
<div class="span11 columns">
global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>

<div class="page-header">
Expand All @@ -42,8 +45,6 @@
<?php endwhile; ?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
<?php get_footer(); ?>
13 changes: 7 additions & 6 deletions search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span11 columns">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<?php if ( have_posts() ) : ?>
<div class="page-header">
Expand All @@ -37,8 +40,6 @@
<?php endif; ?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
<?php get_footer(); ?>
14 changes: 12 additions & 2 deletions sidebar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@
* @subpackage wpbootstrap
* @since wpbootstrap 0.1
*/
?>

<ul class="unstyled sidebar">

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options );

if ($sa_settings['sidebar_size'] > 0) : ?>

<div class="span<?php echo $sa_settings['sidebar_size']; ?> columns">

<ul class="unstyled sidebar">


<?php
Expand Down Expand Up @@ -64,3 +71,6 @@
<?php dynamic_sidebar( 'secondary-widget-area' ); ?>

</ul>

</div>
<?php endif; ?>
14 changes: 7 additions & 7 deletions single.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span11 columns">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">

<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
<article>
Expand Down Expand Up @@ -99,9 +102,6 @@
<?php endwhile; // end of the loop. ?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>

<?php get_footer(); ?>
<?php get_footer(); ?>
13 changes: 7 additions & 6 deletions tag.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
* @since wpbootstrap 0.1
*/

get_header(); ?>
get_header();

global $sa_options;
$sa_settings = get_option( 'sa_options', $sa_options ); ?>

<div class="row">
<div class="span11 columns">
<div class="span<?php echo 16 - $sa_settings['sidebar_size'] ?> columns">
<div class="page-header">
<h1><?php
printf( __( 'Tag Archives: %s', 'twentyten' ), '' . single_tag_title( '', false ) . '' );
Expand All @@ -26,8 +29,6 @@
?>

</div>
<div class="span5 columns">
<?php get_sidebar(); ?>
</div>
<?php get_sidebar(); ?>
</div>
<?php get_footer(); ?>
<?php get_footer(); ?>