com web/php: Added option to site_header to allow a c ustom span(for twitter bootstrap). Calendar pag e needed this. Other minor updates.: cal.ph p
include/header.inc include/layout.inc styles/theme .css views/homepage/sidebar.php

Commit: 72e6b7738de91ebf97cecba605e833194ec9835d Author: Levi Morrison <levim@php.net> Wed, 10 Jul 2013 15:31:16 -0600 Parents: 9629983aa3f8feb5ce98120a8fbdf740efa6478d Branches: responsive Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=72e6b7738de91ebf97cecba605e833194ec9835d Log: Added option to site_header to allow a custom span(for twitter bootstrap). Calendar page needed this. Other minor updates. Changed paths: M cal.php M include/header.inc M include/layout.inc M styles/theme.css M views/homepage/sidebar.php Diff: diff --git a/cal.php b/cal.php index 3248221..b0bb3c7 100644 --- a/cal.php +++ b/cal.php @@ -6,6 +6,7 @@ include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; $site_header_config = array( "current" => "community", "css" => array('calendar.css'), + "layout_span" => 12, ); /* diff --git a/include/header.inc b/include/header.inc index 4b22681..e5599b2 100644 --- a/include/header.inc +++ b/include/header.inc @@ -163,6 +163,5 @@ if (isset($shortname) && $shortname) { </ul> </aside> <?php endif; ?> - -<section id="layout-content" class="<?php echo $curr ?> span9"> +<section id="layout-content" class="<?php echo $curr; ?> span<?php echo $config['layout_span']; ?>"> diff --git a/include/layout.inc b/include/layout.inc index e4a9f50..e9f9c0b 100644 --- a/include/layout.inc +++ b/include/layout.inc @@ -856,9 +856,10 @@ function site_header_beta($title = '', $config = array()) "current" => "", "meta-navigation" => array(), 'classes' => '', + 'layout_span' => 9, ); - $config += $defaults; + $config = array_merge($defaults, $config); $lang = language_convert($config["lang"]); $curr = $config["current"]; diff --git a/styles/theme.css b/styles/theme.css index 1386e35..ff1fa02 100755 --- a/styles/theme.css +++ b/styles/theme.css @@ -697,6 +697,9 @@ table { border-collapse: collapse; border-spacing: 0; } +table td { + vertical-align:top; +} table.standard { border-collapse: collapse; diff --git a/views/homepage/sidebar.php b/views/homepage/sidebar.php index 12318f5..65266ee 100644 --- a/views/homepage/sidebar.php +++ b/views/homepage/sidebar.php @@ -3,9 +3,8 @@ echo $announcements; endif;?> - <h3 class='panel news'><a href='/archive/'>Recent News</a></h3> - <h3 class='panel documentation'><a href='/manual/'>Documentation</a></h3> - <h3 class='panel events'><a href='/conferences/'>Conferences</a></h3> - <h3 class='panel events'><a href='/cal.php'>User Group Events</a></h3> - <h3 class='panel tips'><a href='/tips.php'>Tips and Tricks</a></h3> + <h3 class='panel'><a href='/tips.php'>Tips and Tricks</a></h3> + <h3 class='panel'><a href='/conferences/'>Conferences</a></h3> + <h3 class='panel'><a href='/cal.php'>User Group Events</a></h3> + <h3 class='panel'><a href='/thanks.php'>Special Thanks</a></h3>