Skip to content

Commit

Permalink
Merge branch 'gh-pages'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nwalton3
nwalton3 committed Nov 18, 2013
2 parents 423ca7d + 94b7652 commit a40fc63
Show file tree
Hide file tree
Showing 135 changed files with 2,116 additions and 5,424 deletions.
192 changes: 134 additions & 58 deletions 404.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@
}

</style>
<body><!--[if lt IE 7]>
<p class="chromeframe">You are using an<strong>outdated</strong>browser. Please<a href="http://browsehappy.com/">upgrade your browser</a>or<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>to improve your experience.</p><![endif]-->
<body>
<!--[if lt IE 7]>
<p class="chromeframe">You are using an<strong>outdated</strong>browser. Please<a href="http://browsehappy.com/">upgrade your browser</a>or<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>to improve your experience.</p>
<![endif]-->
<header id="main-header" role="banner">
<div id="header-top" class="wrapper">
<div id="logo">
Expand All @@ -70,9 +72,11 @@ <h1><a id="site-name" href="#" title="Change this link to your organization's ho
</div>
</header>
<div id="search-menu">
<div id="search-container" role="search"><!--
<div id="search-container" role="search">
<!--
The default search form, linking to BYU's search page. If a user does not have javascript enabled, they'll get this form.
If they have javascript, this content will be replaced with Google's custom search (from the script at the bottom of the page).-->
If they have javascript, this content will be replaced with Google's custom search (from the script at the bottom of the page).
-->
<form id="basic-search" action="http://home.byu.edu/home/search" role="form">
<label for="search" class="visuallyhidden">Search</label>
<input id="search" type="search" name="search">
Expand Down Expand Up @@ -129,35 +133,47 @@ <h2>I&rsquo;m still lost</h2>
<tr>
<td>Armenian</td>
<td class="script">Ես կորցրել եմ</td>
</tr><!--tr
</tr>
<!--tr
<td>Aymara</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Base 64</td>
<td>SSdtIGxvc3Q=</td>
</tr>
<tr>
<td>Basque</td>
<td>Nago galdu</td>
</tr><!--tr
</tr>
<!--tr
<td>Bicolano</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Binary</td>
<td>01001001 01011100 00100111 01101101 00100000 01101100 01101111 01110011 01110100</td>
</tr>
<tr class="program">
<td>Bulgarian</td>
<td>Аз съм загубен</td>
</tr><!--tr
</tr>
<!--tr
<td>Burmese</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Cakchiquel</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Cambodian</td>
<td> </td>--><!--tr.program
<td> </td>
-->
<!--tr.program
<td>Cantonese</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Catalan</td>
<td>Estic perdut</td>
Expand Down Expand Up @@ -193,15 +209,19 @@ <h2>I&rsquo;m still lost</h2>
<tr class="program">
<td>Estonian</td>
<td>Olen kaotanud</td>
</tr><!--tr
</tr>
<!--tr
<td>Fijian</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>Finnish</td>
<td>Olen menettänyt</td>
</tr><!--tr
</tr>
<!--tr
<td>FLANG</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>French</td>
<td>Je suis perdu</td>
Expand All @@ -212,9 +232,11 @@ <h2>I&rsquo;m still lost</h2>

Could you tell me where the <span class="sc">MARB</span> is?
</td>
</tr><!--tr
</tr>
<!--tr
<td>Ga</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Georgian</td>
<td class="script">მე დაკარგა</td>
Expand All @@ -234,15 +256,19 @@ <h2>I&rsquo;m still lost</h2>
<tr>
<td>Haitian Creole</td>
<td>Mwen pèdi</td>
</tr><!--tr
</tr>
<!--tr
<td>Hawaiian</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>Hebrew</td>
<td class="rtl">אני אבוד</td>
</tr><!--tr
</tr>
<!--tr
<td>Hiligaynon</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Hindi</td>
<td class="script">मैं हार गया हूँ</td>
Expand All @@ -258,13 +284,19 @@ <h2>I&rsquo;m still lost</h2>
<tr class="program">
<td>Icelandic</td>
<td>Ég er týndur</td>
</tr><!--tr
</tr>
<!--tr
<td>Ilangot</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Ilocano</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Ilonggo/Hiligaynon</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Indonesian</td>
<td>Saya tersesat</td>
Expand All @@ -284,11 +316,15 @@ <h2>I&rsquo;m still lost</h2>
<tr>
<td>Javanese</td>
<td>Aku ilang</td>
</tr><!--tr
</tr>
<!--tr
<td>K'iche</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Kazakh</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Klingon</td>
<td>DaqwIj vISovbe'</td>
Expand Down Expand Up @@ -316,29 +352,47 @@ <h2>I&rsquo;m still lost</h2>
<tr class="program">
<td>Lithuanian</td>
<td>Aš pasiklydau</td>
</tr><!--tr
</tr>
<!--tr
<td>Malagasy</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Malay</td>
<td>Saya hilang</td>
</tr><!--tr
</tr>
<!--tr
<td>Mandarin</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Maori</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Marshallese</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Maya/Mopan</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Mongolian</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Navajo</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Niuean</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Norse</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>Norwegian</td>
<td>Jeg tapte</td>
Expand All @@ -354,21 +408,27 @@ <h2>I&rsquo;m still lost</h2>
<tr class="program">
<td>Portuguese</td>
<td>Eu estou perdido</td>
</tr><!--tr
</tr>
<!--tr
<td>Quechua</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Rarotongan</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>Romanian</td>
<td>Am pierdut</td>
</tr>
<tr class="program">
<td>Russian</td>
<td>Я потерялся</td>
</tr><!--tr
</tr>
<!--tr
<td>Samoan</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>Serbian/Croatian</td>
<td>Изгубио сам се</td>
Expand Down Expand Up @@ -396,25 +456,35 @@ <h2>I&rsquo;m still lost</h2>
<tr>
<td>Tagalog</td>
<td>Naliligaw ako</td>
</tr><!--tr
</tr>
<!--tr
<td>Tahitian</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Taiwanese</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Tennyson</td>
<td>'Tis better to have loved and lost than never to have loved at all</td>-->
<td>'Tis better to have loved and lost than never to have loved at all</td>
-->
<tr>
<td>Thai</td>
<td class="script">ฉันหลงทาง</td>
</tr>
<tr>
<td>Tolkein</td>
<td>Not all those who wander are lost</td>
</tr><!--tr
</tr>
<!--tr
<td>Tongan</td>
<td> </td>--><!--tr
<td> </td>
-->
<!--tr
<td>Trukese</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Turkish</td>
<td>Kayboldum</td>
Expand All @@ -426,15 +496,19 @@ <h2>I&rsquo;m still lost</h2>
<tr>
<td>Urdu</td>
<td class="rtl big">میں کھو گیا ہوں</td>
</tr><!--tr
</tr>
<!--tr
<td>Vanuatu</td>
<td> </td>-->
<td> </td>
-->
<tr>
<td>Vietnamese</td>
<td>Tôi bị mất</td>
</tr><!--tr
</tr>
<!--tr
<td>Waray-Waray</td>
<td> </td>-->
<td> </td>
-->
<tr class="program">
<td>Welsh</td>
<td>Rwy'n colli</td>
Expand Down Expand Up @@ -595,7 +669,9 @@ <h2>Footer Column 4</h2><a href="">Menu item 1</a><a href="">Menu item 2</a><a h
<!--a#byu(href='http://byu.edu/') Brigham Young University--><a id="byui" href="http://byui.edu/" class="ir">BYU-Idaho</a><a id="byuh" href="http://byuh.edu/" class="ir">BYU-Hawaii</a><a id="ldsbc" href="http://www.ldsbc.edu/" class="ir">LDS Business College</a><a id="lds" href="http://lds.org/">The Church of Jesus Christ of Latter-day Saints</a>
</div>
</div>
</footer><!--CONTENT END-->
</footer>
<!--CONTENT END
-->
<script>
/* Google Analytics: change UA-XXXXX-X to be your site's ID. */
var _gaq=[['_setAccount', pageSettings.google_analytics_key],['_trackPageview']];
Expand Down
16 changes: 11 additions & 5 deletions 500.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@
}

</style>
<body><!--[if lt IE 7]>
<p class="chromeframe">You are using an<strong>outdated</strong>browser. Please<a href="http://browsehappy.com/">upgrade your browser</a>or<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>to improve your experience.</p><![endif]-->
<body>
<!--[if lt IE 7]>
<p class="chromeframe">You are using an<strong>outdated</strong>browser. Please<a href="http://browsehappy.com/">upgrade your browser</a>or<a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a>to improve your experience.</p>
<![endif]-->
<header id="main-header" role="banner">
<div id="header-top" class="wrapper">
<div id="logo">
Expand All @@ -70,9 +72,11 @@ <h1><a id="site-name" href="#" title="Change this link to your organization's ho
</div>
</header>
<div id="search-menu">
<div id="search-container" role="search"><!--
<div id="search-container" role="search">
<!--
The default search form, linking to BYU's search page. If a user does not have javascript enabled, they'll get this form.
If they have javascript, this content will be replaced with Google's custom search (from the script at the bottom of the page).-->
If they have javascript, this content will be replaced with Google's custom search (from the script at the bottom of the page).
-->
<form id="basic-search" action="http://home.byu.edu/home/search" role="form">
<label for="search" class="visuallyhidden">Search</label>
<input id="search" type="search" name="search">
Expand Down Expand Up @@ -252,7 +256,9 @@ <h2>Footer Column 4</h2><a href="">Menu item 1</a><a href="">Menu item 2</a><a h
<!--a#byu(href='http://byu.edu/') Brigham Young University--><a id="byui" href="http://byui.edu/" class="ir">BYU-Idaho</a><a id="byuh" href="http://byuh.edu/" class="ir">BYU-Hawaii</a><a id="ldsbc" href="http://www.ldsbc.edu/" class="ir">LDS Business College</a><a id="lds" href="http://lds.org/">The Church of Jesus Christ of Latter-day Saints</a>
</div>
</div>
</footer><!--CONTENT END-->
</footer>
<!--CONTENT END
-->
<script>
/* Google Analytics: change UA-XXXXX-X to be your site's ID. */
var _gaq=[['_setAccount', pageSettings.google_analytics_key],['_trackPageview']];
Expand Down
Loading

0 comments on commit a40fc63

Please sign in to comment.