IDI-3: Update existing IDI theme to match what's actually currently o…

…n the dev site.
jhung · Mar 13, 2012 · d56b504 · d56b504
1 parent 8606d00
commit d56b504
Show file tree

Hide file tree

Showing 148 changed files with 1,962 additions and 36,564 deletions.
diff --git a/footer.php b/footer.php
@@ -1,7 +1,11 @@
 	</div>
 	<footer role="contentinfo" class="fl-site-footer fl-push">
-		<?php dynamic_sidebar('sidebar-3'); ?>
-		<?php dynamic_sidebar('sidebar-4'); ?>		
+		<div class="fl-font-size-90">
+			<?php dynamic_sidebar('sidebar-4'); ?>		
+		</div>
+		<div class="footer-address">
+			<?php dynamic_sidebar('sidebar-3'); ?>
+		</div>
 	</footer>
 </div>
 

diff --git a/front-page.php b/front-page.php
@@ -32,11 +32,11 @@ function submitForm() {
 
  	<div id="list-wiki" class="fl-col-flex2">
  		<div class="fl-col">
- 			<h2>Join the <acronym title="Inclusive Design Institute">IDI</acronym> mailing list</h2>
+ 			<h2>Join the <abbr title="Inclusive Design Institute">IDI</abbr> mailing list</h2>
  			<div id="listForm">
 				<form id="myForm" method="post" action="<?php bloginfo('template_url'); ?>/mailinglist.php" onsubmit="return submitForm()">
 					<input type="email" name="listEmail" id="listEmail" value="Your email address" /> 
-					<input type="submit" value="Submit" />
+					<input type="submit" value="submit" />
 				</form>			
  			</div>
  		</div>
@@ -54,37 +54,40 @@ function submitForm() {
 				<a href="research#design">Design and Development</a>
 			</li>
 			<li id="menu-item-31" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-31">
-				<a href="http://dev.inclusivedesign.ca/wordpress/implementation-and-information-practices/">Implementation and Information Practices</a>
+				<a href="research#implementation">Implementation and Information Practices</a>
 			</li>
 			<li id="menu-item-32" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-32">
-				<a href="http://dev.inclusivedesign.ca/wordpress/business-case-policies-standards-and-legislation/">Business Case, Policies, Standards and Legislation</a>
+				<a href="research#business">Business Case, Policies, Standards and Legislation</a>
 			</li>
 			<li id="menu-item-30" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-30">
-				<a href="http://dev.inclusivedesign.ca/wordpress/mobile-and-pervasive-computing/">Mobile and Pervasive Computing</a>
+				<a href="research#mobile">Mobile and Pervasive Computing</a>
 			</li>
 		</ul>				
-			<?php /*wp_nav_menu( array( 'sort_column' => 'menu_order', 'menu_class' => 'nav', 'theme_location' => 'research-menu' ) ); */ ?>
 		</nav>
  	</div>
 
 	<div class="fl-col-flex3 front-cols">
 		<?php 
 
 		$the_query = new WP_Query( array('posts_per_page'=>2) ); 
+
 		while ($the_query->have_posts()): 
 			$the_query->the_post(); 		
 			global $more; 
 			$more = 0; 
+
+
 		?>
  		<div class="fl-col post"> 						
 			<?php		
-			echo '<h2 class="fl-font-size-130">';
-			the_title();
-			echo '</h2>';			
 			echo '<div class="date">';
 			the_time('F jS, Y');
-			echo '</div>';
-			the_content("<div class='fl-site-read-more'>More</div>");
+			echo '</div>';			
+			echo '<h2 class="fl-font-size-130">';
+			the_title();
+			echo '</h2>';	
+			remove_filter (�the_content�, �wpautop�); 
+			the_content("<span class='fl-site-read-more'>read more</span>");
 			?>
  		</div>
  		<?php endwhile; ?>

diff --git a/functions.php b/functions.php
@@ -25,13 +25,15 @@ function register_my_menu() {
 	register_sidebar( array(
 		'name' => __( 'Footer Area One', 'idi_theme' ),
 		'id' => 'sidebar-3',
-		'description' => __( 'An optional widget area for your site footer', 'idi_theme' )
+		'description' => __( 'An optional widget area for your site footer', 'idi_theme' ),
+		'before_widget' => "",
+ 		'after_widget' => ""			
 	) );
 
 	register_sidebar( array(
 		'name' => __( 'Footer Area Two', 'idi_theme' ),
 		'id' => 'sidebar-4',
-		'description' => __( 'An optional widget area for your site footer', 'idi_theme' )
+		'description' => __( 'An optional widget area for your site footer', 'idi_theme' )	
 	) );    
 }
 ?>
diff --git a/header.php b/header.php
@@ -77,7 +77,7 @@
 	<header class="fl-site-header">
 		<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>"><h1 class="fl-site-logo fl-force-left"><span class="fl-hidden-accessible"><?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?></span></h1></a>
 
-		<nav role="navigation" class="fl-site-nav-main fl-force-right fl-font-size-110">
+		<nav role="navigation" class="fl-site-nav-main fl-force-right fl-font-size-120">
 			<?php wp_nav_menu( array( 'sort_column' => 'menu_order', 'theme_location' => 'primary-menu' ) ); ?>
 		</nav>
     </header>  

diff --git a/images/idi_logo.png → images/_idi_logo.png b/images/idi_logo.png → images/_idi_logo.png
diff --git a/images/arrow_sm_blue_right.png b/images/arrow_sm_blue_right.png
diff --git a/images/circle_check_white.png b/images/circle_check_white.png
diff --git a/images/gear_white.png b/images/gear_white.png
diff --git a/images/idi_logo.jpg b/images/idi_logo.jpg
diff --git a/images/idi_logo_bg.png b/images/idi_logo_bg.png
diff --git a/images/mail.png b/images/mail.png
diff --git a/images/people/Darren-Lawless.jpg b/images/people/Darren-Lawless.jpg
diff --git a/images/people/Deb-Fels.jpg b/images/people/Deb-Fels.jpg
diff --git a/images/people/Francois-Desjardins.jpg b/images/people/Francois-Desjardins.jpg
diff --git a/images/people/Jutta-Treviranus.jpg b/images/people/Jutta-Treviranus.jpg
diff --git a/images/people/Matt-Ratto.jpg b/images/people/Matt-Ratto.jpg
diff --git a/images/people/Robert-Luke.png b/images/people/Robert-Luke.png
diff --git a/images/people/Ron-Owston.jpg b/images/people/Ron-Owston.jpg
diff --git a/images/phone.png b/images/phone.png
diff --git a/images/themes/arrow_sm_black_right.png b/images/themes/arrow_sm_black_right.png
diff --git a/images/themes/arrow_sm_yellow_right.png b/images/themes/arrow_sm_yellow_right.png
diff --git a/images/themes/circle_check_black.png b/images/themes/circle_check_black.png
diff --git a/images/themes/circle_check_yellow.png b/images/themes/circle_check_yellow.png
diff --git a/images/themes/footer_sep_black.png b/images/themes/footer_sep_black.png
diff --git a/images/themes/footer_sep_white.png b/images/themes/footer_sep_white.png
diff --git a/images/themes/footer_sep_yellow.png b/images/themes/footer_sep_yellow.png
diff --git a/images/themes/idi_logo_black.png b/images/themes/idi_logo_black.png
diff --git a/images/themes/idi_logo_white.png b/images/themes/idi_logo_white.png
diff --git a/images/themes/idi_logo_yellow.png b/images/themes/idi_logo_yellow.png
diff --git a/images/themes/mail_black.png b/images/themes/mail_black.png
diff --git a/images/themes/mail_yellow.png b/images/themes/mail_yellow.png
diff --git a/images/themes/phone_black.png b/images/themes/phone_black.png
diff --git a/images/themes/phone_yellow.png b/images/themes/phone_yellow.png
diff --git a/images/themes/triangle_down_blackpng.png b/images/themes/triangle_down_blackpng.png
diff --git a/images/themes/triangle_down_yellow.png b/images/themes/triangle_down_yellow.png
diff --git a/images/themes/triangle_up_black.png b/images/themes/triangle_up_black.png
diff --git a/images/themes/triangle_up_yellow.png b/images/themes/triangle_up_yellow.png
diff --git a/images/themes/twitter_bird_black.png b/images/themes/twitter_bird_black.png
diff --git a/images/themes/twitter_bird_white.png b/images/themes/twitter_bird_white.png
diff --git a/images/themes/twitter_bird_yellow.png b/images/themes/twitter_bird_yellow.png
diff --git a/images/tilebg.jpg b/images/tilebg.jpg
diff --git a/images/triangle_up_white.png b/images/triangle_up_white.png
diff --git a/index.php b/index.php
@@ -21,12 +21,11 @@
         <?php if(have_posts()) : ?><?php while(have_posts()) : the_post(); ?>
 
         <div class="post">
-        <h3><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3>
-        <div class="date"><?php the_time('F jS, Y') ?></div>
-
+        <div class="date"><?php the_time('F jS, Y') ?></div>        
+        <h3><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3> 
             <div class="entry">
                 <?php the_post_thumbnail(); ?>
-                <?php the_content(); ?>                
+                <?php the_content("<div class='fl-site-read-more'>read more</div>"); ?>                
             </div>
         </div>
 		<?php endwhile; ?>