Permalink
Browse files

Merge branch 'master' into development

fixed conflict in gitignore
Conflicts:
	.gitignore
  • Loading branch information...
2 parents ec5d358 + 1040fca commit 85eb321b9ae7c91c0755710b3318e700d6bb307e @curtismchale committed Nov 9, 2010
Showing with 34 additions and 28 deletions.
  1. +1 −0 .gitignore
  2. +16 −10 assets/includes/functions/sidebars.php
  3. +2 −5 footer.php
  4. +4 −4 functions.php
  5. +11 −9 header.php
View
@@ -6,3 +6,4 @@ _notes
dwsync.xml
*~
*.swp
+*.tmproj
@@ -1,14 +1,20 @@
<?php // this is the collecting point for all sidebars in the theme
-// register sidebar one
- if ( function_exists('register_sidebar') ) {
- register_sidebar(array(
- 'name'=>'sidebar',
- 'description'=>'add description of the sidebar into functions file',
+
+add_action( 'widgets_init', 'sfn_add_sidebars' );
+
+function sfn_add_sidebars() {
+
+ register_sidebar( array(
+ 'id' => 'sidebar',
+ 'name' => 'sidebar',
+ 'description' => 'add description of the sidebar into functions file',
'before_widget' => '<li id="%1$s" class="widget %2$s">',
- 'after_widget' => '</li>',
- 'before_title' => '<h2 class="widgettitle">',
- 'after_title' => '</h2>',
+ 'after_widget' => '</li>',
+ 'before_title' => '<h2 class="widgettitle">',
+ 'after_title' => '</h2>',
));
- // copy the function above and place here to have multiple sidebars
- } // end function check for register sidebar
+
+ // repeat register sidebar to add more sidebars
+
+} // end sfn_add_sidebars
?>
View
@@ -1,6 +1,6 @@
<div class="clear"></div>
</div><!-- /#content -->
-
+
<div class="footer">
<p class="copyright">&copy; <?php echo date("Y"); echo " "; echo bloginfo('name'); ?></p>
@@ -15,10 +15,7 @@
<!-- adding jQuery.validate plugin for comment validation client side -->
<script type="text/javascript" src="<?php bloginfo('stylesheet_directory'); ?>/assets/js/jquery.validate.min.js"></script>
- <!-- calling js for site -->
- <script type="text/javascript" src="<?php bloginfo('stylesheet_directory'); ?>/assets/js/scripts.js"></script>
-
- <?php
+ <?php
// Display Analytics, etc. from admin menu
echo get_option('cmnzth_footer_scripts');
?>
View
@@ -31,18 +31,18 @@ function improved_trim_excerpt($text) {
function jQueryFooter() {
if (!is_admin()){
wp_deregister_script('jquery');
- wp_register_script('jquery', ("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"), false, '1.4.2',true);
+ wp_register_script('jquery', ("http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"), false, '1.4.3',true);
wp_enqueue_script('jquery');
}
-}
+}
add_action('init', 'jQueryFooter');
function restatement_footer_scripts() {
if (!is_admin()){
$js='/assets/js/scripts.js';
wp_register_script('scripts', get_stylesheet_directory_uri().$js,array('jquery'),filemtime(STYLESHEETPATH.$js),true);
wp_print_scripts('scripts');
}
-}
+}
add_action('wp_footer', 'restatement_footer_scripts');
// remove version number from jQuery
add_filter('script_loader_src','restatement_scripts_unversion');
@@ -71,7 +71,7 @@ function my_new_contactmethods( $contactmethods ) {
remove_action('wp_head', 'parent_post_rel_link', 10, 0); // kill the prev link
remove_action('wp_head', 'start_post_rel_link', 10, 0); // kill the start link
remove_action('wp_head', 'feed_links', 2); // kill post and comment feeds
-remove_action('wp_head', 'feed_links_extra', 3); // kill category, author, and other extra feeds
+remove_action('wp_head', 'feed_links_extra', 3); // kill category, author, and other extra feeds
remove_action('wp_head', 'adjacent_posts_rel_link', 10, 0); // kill adjacent post links
remove_action('wp_head', 'wp_generator'); // kill the wordpress version number
// removing a really bad filter idea by Matt M
View
@@ -21,13 +21,13 @@
<meta http-equiv="content-type" content="<?php bloginfo('html_type') ?>; charset=<?php bloginfo('charset') ?>" />
<meta name="description" content="<?php bloginfo('description') ?>" />
-
+
<link rel="image_src" link="<?php bloginfo('stylesheet_directory'); ?>/screenshot.png" />
-
+
<link rel="icon" type="image/png" link="<?php bloginfo('stylesheet_directory'); ?>/favicon.ico" />
<?php if(is_search()) { ?>
- <meta name="robots" content="noindex, nofollow" />
+ <meta name="robots" content="noindex, nofollow" />
<?php }?>
<?php
@@ -41,18 +41,18 @@
<?php wp_head(); ?>
<link rel="stylesheet" type="text/css" href="<?php bloginfo('stylesheet_url'); ?>" media="screen" />
-
+
<!-- adding HTML5 support for IE -->
- <!--[if lt IE 9]>
- <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+ <!--[if lt IE 9]>
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link rel="shortcut icon" href="<?php echo get_option('cmnzth_favicon'); ?>" />
- <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php echo get_option('cmnzth_rss_feed'); ?>" />
+ <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> RSS Feed" href="<?php echo get_option('cmnzth_rss_feed'); ?>" />
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-
+
<!-- facebook site image -->
<link rel="image_src" href="<?php bloginfo('stylesheet_directory');?>/screenshot.png" />
@@ -62,7 +62,9 @@
$url = explode('/',$_SERVER['REQUEST_URI']);
$dir = $url[1] ? $url[1] : 'home';
?>
-
+<!--
+ TODO body_class
+-->
<body id="<?php echo $dir ?>">
<div id="main-wrapper">

0 comments on commit 85eb321

Please sign in to comment.