Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat homebutton #9

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Feat homebutton #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
23110cd
Added hover underlines to Options
adrianwyard Sep 5, 2018
cc25162
Merge pull request #1 from adrianwyard/iOS-temp-fix
adrianwyard Sep 22, 2018
cd39435
Merge pull request #2 from adrianwyard/hover-underlines
adrianwyard Sep 22, 2018
2145345
Switch in-page links to fully qualified URLs
adrianwyard Sep 24, 2018
7ad7c0b
Fix cookie expiration durations
princecharming519 Sep 25, 2018
af77e75
Not needed
adrianwyard Sep 26, 2018
55589d6
adding Home button
princecharming519 Sep 27, 2018
053288d
Merge branch 'master' into feat-homebutton
princecharming519 Sep 27, 2018
7142cba
Update size and spacing
adrianwyard Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions img/home-1.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 11 additions & 11 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,19 @@
<span class="cndce-options-commentary-name"></span>
</label>
</div>

</div>
</div>
<br>
<br>
</div>

</div>

<center><button class="ok cndce-ok">OK</button></center>




</div>

<div id="cndce-video-information">
Expand All @@ -95,18 +95,18 @@

<div id="cndce-commentary-iframe-container" class="cndce-iframe-scroll-container">
<iframe id="cndce-commentary-iframe"></iframe>

</div>
</div>
</div>


<div id="cndce-iframe-section" class="cndce-section">
<div data-resize="y" class="cndce-resize top"></div>

<div id="cndce-browser-container">
<div class="cndce-browser-top">
<img class="cndce-browser-icon" src="./img/globe-1.svg">
<a href="./pages/welcome.html" target="tpo"><img class="cndce-browser-icon" src="./img/home-1.svg"></a>
<div class="cndce-browser-address"><input type="text" disabled></div>


Expand Down Expand Up @@ -141,22 +141,22 @@
http://www.theplanetsonline.com
</div>
</div>

<div class="cndce-browser-tab"></div>
<div class="cndce-browser-tab"></div>
</div>
</div>
<div id="cndce-browser-iframe-container" class="cndce-iframe-scroll-container">
<iframe name="tpo" src="./pages/welcome.html"></iframe>

</div>
</div>


</div>
</div>





Expand Down
21 changes: 0 additions & 21 deletions pages/home.html
View file
Open in desktop

This file was deleted.

135 changes: 72 additions & 63 deletions pages/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,78 @@
<!DOCTYPE html>
<html>

<head>
<title>The Planets Online (test release 1.07) - Welcome</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" >
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="./pages.css">
<title>The Planets Online - Home</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="./pages.css">
</head>

<body topmargin="10" leftmargin="10">
<h2>Welcome (test release 1.07)</h2>
<p>'The Planets Online' is a fun way to learn about the planets, science, music, and much more - all while accompanied by an orchestra.</p>
<p>Click the '<img height=12 width=12 src="/img/settings-1.svg"> OPTIONS' button above to choose from a number of different commentaries.</p>
<p>As the music plays the comments will be updated and previews of related web pages will appear in this window.</p>
<p>A broad range of commentaries are coming soon, including:</p>
<ul>
<li><b>About the Music</b> - learn about the composer Gustav Holst and his inspiration for <i>The Planets</i></li>
<li><b>About the (real) Planets</b> - an introduction to the planets in our solar system</li>
<li><b>Science Sources</b> - links to NASA, ESA, etc. showing the original images</li>
<li><b>Space Missions & Projects</b> - about the spacecraft, telescopes, landers & rovers exploring our solar system</li>
<li><b>Meet the Scientists</b> - the astronomers and technicians who made the images</li>
<li><b>Music Composition</b> - Holst's techniques and innovations</li>
<li><b>Performance Technology</b> - how the visuals were performed live</li>
<li><b>Visual Story-telling</b> - how the visuals were choreographed with the music</li>
<li><b>Trivia and ‘What’s wrong with this picture?’</b> - learn where 'artistic' images replaced real ones</li>
<li><b>Just for Kids</b></li>
</ul>
<h3>Requirements</h3>
<p>The Planets Online makes extensive use of features in modern browsers, so please make sure yours is up to date.</p>
<h3>For Teachers</h3>
<p>This site can help students of all ages learn about a variety of subjects and includes features specifically for teachers. For example, you can send students special links that draw their attention to particular comments, images, and music selections. The following link shows web pages from NASA, so would be of interest to an astronomy class: <a href="http://www.theplanetsonline.com/?commentary=science-sources" target="_top">theplanetsonline.com/?commentary=science-sources</a>. And this next link would be suitable for a music class: <a href="http://www.theplanetsonline.com/?commentary=music" target="_top">theplanetsonline.com/?commentary=music</a>. For more details see the <a href="../pages/teachers-guide.html">Teacher’s Guide</a>. </p>
<h3 id="about">About the concert</h3>
<p>'The Planets Op. 32' by Gustav Holst</p>
<p>Performed by the <a href="http://www.auburnsymphony.org" target="tpo-external">Auburn Symphony Orchestra</a></p>
<p>Conducted by <a href="https://www.northwestsymphonyorchestra.org/conducter/" target="tpo-external">Anthony Spain</a></p>
<p>Featuring the Seattle Pacific University Women's Chorus</p>
<p>Choreographed visuals and lighting: 'The Planets Live' by <a href="http://www.theplanetslive.com" target="tpo-external">Adrian Wyard</a></p>
<p>Sound by Bill Levey</p>
<h3 id="sources">About the source material</h3>
<p>While many of the visuals are original animations everything shown has some basis in fact and has as its source data from telescopes, orbiting spacecraft, or rovers on the planets' surfaces. Source images, video, and computer modeling courtesy of <a href="http://www.nasa.gov" target="tpo-external">NASA</a>, <a href="https://www.jpl.nasa.gov" target="tpo-external">JPL-Caltech</a>, <a href="http://www.swri.org" target="tpo-external">SwRI</a>, <a href="http://www.dlr.de/dlr/en" target="tpo-external">DLR</a>, <a href="http://www.esa.int" target="tpo-external">ESA</a>, <a href="http://www.jhuapl.edu" target="tpo-external">Johns Hopkins University Applied Physics Laboratory</a>, <a href="http://www.nasa.gov/centers/goddard/home" target="tpo-external">Goddard Space Flight Center</a>, <a href="http://www.stsci.edu" target="tpo-external">The Space Telescope Science Institute</a>, <a href="http://avl.ncsa.illinois.edu" target="tpo-external">The Advanced Visualization Laboratory at the NCSA</a> (esp. Drs. B. Robertson &amp; L. Hernquist), <a href="https://carnegiescience.edu" target="tpo-external">Carnegie Institution of Washington</a>, <a href="http://usgs.gov" target="tpo-external">USGS</a>, <a href="http://www.caltech.edu" target="tpo-external">California Institute of Technology</a>, <a href="http://www.lpi.usra.edu" target="tpo-external">Lunar &amp; Planetary Institute</a> (esp. Dr. P Schenk), <a href="http://www.msss.com" target="tpo-external">Malin Space Science Systems</a>, <a href="https://www.lpl.arizona.edu" target="tpo-external">The Lunar and Planetary Laboratory</a> at the <a href="http://www.arizona.edu" target="tpo-external">University of Arizona</a> (esp. Dr. P Smith) and the <a href="http://www.geo.fu-berlin.de/en/geog/index.html" target="tpo-external">Institute of Geological Sciences at The Free University of Berlin</a>. Special thanks to <a href="https://www.youtube.com/watch?v=Esj5juUzhpU" target="tpo-external">Bard Canning</a> for the enhanced Mars descent, <a href="http://www.turbosquid.com/Search/Artists/ArthurLepage" target="tpo-external">Arthur Lepage</a> for 3D modeling, and <a href="https://www.flickr.com/photos/andyinsea/" target="tpo-external">Andy Ermolli</a> for deep space astrophotography.</p>
<h3 id="contributors">About the commentators</h3>
<p>Science Sources, Performance Technology, Trivia, and Visual story-telling: <a href="http://www.adrianwyard.com" target="tpo-external">Adrian Wyard</a></p>
<p>Music Composition: TBA</p>
<p>Space Missions: TBA</p>
<h3 id="site">About this web site</h3>
<p>This site was designed by Adrian Wyard, coded by Candice Canoso & Pablo Ramirez, and funded by Counterbalance Foundation.</p>
<p>Please send any issues, feedback, or enquiries to: [email protected]</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<p>&nbsp;</p>
<h2>The Planets Online - Home</h2>
<p>'The Planets Online' is a fun way to learn about the planets, science, music, and much more - all while
accompanied by an orchestra.</p>
<p>Below you will find a list of commentaries. If you turn some on, comments will be shown and previews of related
web pages will appear as the music plays.</p>
<h3>Comment Channels</h3>
<table cellspacing="0" cellpadding="2">
<tbody>
<tr class="com1">
<td><input type="checkbox" id="music"></td>
<td><b>About the music </b></td>
<td class="com1">The composer's background and his inspiration for The Planets</td>
</tr>
<tr class="com2">
<td><input type="checkbox" id="science"></td>
<td><b>About the (real) Planets </b></td>
<td>An introduction to the planets in our solar system</td>
<tr class="com3">
<td><input type="checkbox" id="science-sources"></td>
<td><b>Science Sources </b></td>
<td>links to NASA, ESA, etc. showing the original images</td>
<tr class="com4">
<td><input type="checkbox" id="tech"></td>
<td><b>Space Missions & Projects </b></td>
<td>About the spacecraft, telescopes, landers & rovers</td>
<tr class="com5">
<td><input type="checkbox" id="scientists"></td>
<td><b>Meet the Scientists </b> </td>
<td>The astronomers and technicians who made the images</td>
<tr class="com6">
<td><input type="checkbox" id="musiccomp"></td>
<td><b>Music Composition </b></td>
<td>Learn about Holst's techniques and innovations</td>
<tr class="com9">
<td><input type="checkbox" id="perftech"></td>
<td><b>Performance Technology </b></td>
<td>How the visuals were performed live</td>
<tr class="com9">
<td><input type="checkbox" id="visuals"></td>
<td><b>Visual Story-telling </b></td>
<td>How the visuals were created and then choreographed</td>
<tr class="com10">
<td><input type="checkbox" id="trivia"></td>
<td><b>Trivia and ‘What’s wrong with this picture?'&nbsp;&nbsp;</b></td>
<td>See where 'artistic' images replaced real ones</td>
<tr class="com11">
<td><input type="checkbox" id="kids"></td>
<td><b>Just for Kids </b></td>
<td> </td>
</tr>
</tbody>
</table>
<h3>Videos</h3>
<p><input type="radio" id="radio1"> <b>Orchestra with images on screen</b></p>
<p><input type="radio" id="radio2"> <b>Images only</b></p>
<h3>A Note for Teachers</h3>
<p>This site can help students of all ages learn about a variety of subjects and includes features specifically for
teachers. For example, you can send students special links that draw their attention to particular comments,
images, and music selections. The following link shows web pages from NASA, so would be of interest to an
astronomy class: <a href="http://www.theplanetsonline.com/?commentary=science-sources" target="_top">theplanetsonline.com/?commentary=science-sources</a>.
And this next link would be suitable for a music class: <a href="http://www.theplanetsonline.com/?commentary=music"
target="_top">theplanetsonline.com/?commentary=music</a>. For more details see the <a href="../pages/teachers-guide.html">Teacher’s
Guide</a>.</p>
<h3><a href="../pages/about.html">About the concert, source material, commentators, and web site</a></h3>
</body>
</html>

</html>
Loading