Skip to content

Commit

Permalink
Merge remote-tracking branch 'acheetham/IDI-15-content' into development
Browse files Browse the repository at this point in the history
* acheetham/IDI-15-content:
  IDI-15: The rest of the bios from UT
  IDI-15: Updates to people and bios from UT
  IDI-15: Update Sheridan's institution name and link
  • Loading branch information
acheetham committed May 17, 2012
2 parents 0c156f4 + a6344d4 commit fd55f4d
Show file tree
Hide file tree
Showing 11 changed files with 119 additions and 26 deletions.
128 changes: 104 additions & 24 deletions about.php

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions cluster-leads-mobile.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,9 @@
<a href="<?php echo get_home_url(); ?>/research/utoronto" class="idi-project-lead-org">University of Toronto</a>
<div class="idi-project-lead-blurb">Assistant Professor, Occupational Therapy</div>
</div>

<div class="idi-project-lead">
<a href="<?php echo get_home_url(); ?>/about/#Ratto" class="idi-project-lead-name">Matt Ratto</a>
<a href="<?php echo get_home_url(); ?>/research/utoronto" class="idi-project-lead-org">University of Toronto</a>
<div class="idi-project-lead-blurb">Professor, Faculty of Information</div>
</div>
Binary file added images/people/Chau.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/people/Grimes.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/people/McEwen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/people/Michalko.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/people/Ratto.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/people/Titchkosky.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions institution.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
echo apply_filters('the_content', $page_data->post_content);
?>
</div>
</div>

</div>

<?php
Expand Down
5 changes: 5 additions & 0 deletions sidebar-about-nav.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,32 @@
<a class="idi-about-nav-header" href="#people">People</a>
<ul>
<li><a href="#Baecker">Ron Baecker</a></li>
<li><a href="#Chau">Tom Chau</a></li>
<li><a href="#Church">Kathryn Church</a></li>
<li><a href="#Desjardins" lang="fr">Francois Desjardins</a></li>
<li><a href="#Diamond">Sara Diamond</a></li>
<li><a href="#Fels">Deborah Fels</a></li>
<li><a href="#Florida">Richard Florida</a></li>
<li><a href="#Frazee">Catherine Frazee</a></li>
<li><a href="#Humphrey">David Humphrey</a></li>
<li><a href="#Grimes">Sara M. Grimes</a></li>
<li><a href="#Jadad" lang="es">Alejandro (Alex) Jadad</a></li>
<li><a href="#Luke">Robert Luke</a></li>
<li><a href="#McEwen">Rhonda McEwen</a></li>
<li><a href="#Mercer">Dawn Mercer</a></li>
<li><a href="#Michalko">Rod Michalko</a></li>
<li><a href="#Mihailidis">Alex Mihailidis</a></li>
<li><a href="#Muirhead">Bill Muirhead</a></li>
<li><a href="#Owston">Ronald Owston</a></li>
<li><a href="#Pennefather">Peter Pennefather</a></li>
<li><a href="#Ratto">Matt Ratto</a></li>
<li><a href="#Rioux">Marcia Rioux</a></li>
<li><a href="#Scardemalia">Marlene Scardemalia</a></li>
<li><a href="#Slotta">Jim Slotta</a></li>
<li><a href="#Cantwell-Smith">Brian Cantwell Smith</a></li>
<li><a href="#Stolarick">Kevin Stolarick</a></li>
<li><a href="#Treviranus" lang="de">Jutta Treviranus</a></li>
<li><a href="#Titchkosky" lang="de">Tanya Titchkosky</a></li>
</ul>
</nav>

Expand Down
4 changes: 2 additions & 2 deletions sidebar-sheridan.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="idi-inst-site-links">
<p><a class="idi-external-link" href="http://www.sheridancollege.ca/about%20sheridan/sheridan%20research/centres/vdi.aspx/">visit VDI site</a></p>
<p><a class="idi-external-link" href="http://www.sheridancollege.ca/Services/Sheridan%20Research.aspx">visit ARI site</a></p>
<p><a class="idi-external-link" href="http://www.sheridancollege.ca/">visit Sheridan site</a></p>
</div>

<div class="idi-contact-info">
<h3>Contact</h3>
<address>
<div class="idi-mailing-address">
Visualization Design Institute<br/>
Applied Research and Innovation<br/>
Sheridan College<br/>
<a href="http://g.co/maps/exr7d">
1430 Trafalgar Road</a><br/>
Expand Down

0 comments on commit fd55f4d

Please sign in to comment.