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.

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

Beta #1

Open
wants to merge 104 commits into
base: beta
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
c1826e6
Update package.json
wafels Jun 21, 2018
8dd49ac
Finalized changes to arXiv search, added helioviewer-guide
Aug 16, 2018
d3be465
Merge remote-tracking branch 'origin/master'
Oct 30, 2018
e166950
Update to align with the live site at helioviewer.org
dgarciabriseno Nov 18, 2021
12e51de
Update index.php (#322)
btaylor-sesda Nov 19, 2021
41096e8
Get version info from git
dgarciabriseno Dec 21, 2021
44834bf
Update build.xml
btaylor-sesda Jan 5, 2022
58729dc
Revert "Update build.xml"
dgarciabriseno Jan 20, 2022
44cc0f0
update about dialog to correctly get the tag's date
dgarciabriseno Jan 20, 2022
9911709
Ignore carriage returns in jsmin.py and make executable
dgarciabriseno Jan 6, 2022
1bcdb5c
add git attributes to force LF on jsmin.py for it to be executable
dgarciabriseno Jan 6, 2022
bd414ef
Add files via upload
btaylor-sesda Jan 20, 2022
576b709
Update index.php
btaylor-sesda Jan 20, 2022
15b1dab
Update Tutorial.js
btaylor-sesda Jan 24, 2022
6a65edd
Update jquery.bonevojage.js
btaylor-sesda Jan 28, 2022
9967cef
Update several plugins (#328)
dgarciabriseno Jan 25, 2022
7fe0f7f
Update embedded youtube videos in the glossary
dgarciabriseno Feb 4, 2022
7f05bc5
Create CustomHandling.js
btaylor-sesda Feb 15, 2022
46c5df0
Update index.php and update CustomHandling.js
btaylor-sesda Feb 15, 2022
aa9fdfc
Update dated blog urls
dgarciabriseno Feb 15, 2022
6f05567
update jsmin.py with python3 support
dgarciabriseno Feb 15, 2022
97402b3
Update CustomHandling.js
btaylor-sesda Feb 16, 2022
cb2168c
Update index.php
btaylor-sesda Feb 16, 2022
e973e69
Update CustomHandling.js
btaylor-sesda Feb 16, 2022
26b8579
Update CustomHandling.js
btaylor-sesda Feb 22, 2022
b4e4015
Update dialogs.css
btaylor-sesda Feb 28, 2022
d1286b7
Add files via upload
btaylor-sesda Mar 1, 2022
e94ea7c
Update Tutorial.js
btaylor-sesda Mar 1, 2022
c52cfff
Update helioviewer-web.css
btaylor-sesda Mar 1, 2022
5d4a66c
Update Tutorial.js
btaylor-sesda Mar 1, 2022
85f4977
Update helioviewer-web.css
btaylor-sesda Mar 1, 2022
743b4dc
Update Tutorial.js
btaylor-sesda Mar 1, 2022
eb34f7c
Update Tutorial.js
btaylor-sesda Mar 1, 2022
e471bb6
Update dialogs.css
btaylor-sesda Mar 1, 2022
bcef6d1
Update dialogs.css
btaylor-sesda Mar 1, 2022
ddb3965
Update dialogs.css
btaylor-sesda Mar 1, 2022
9a3b8c2
Add files via upload
btaylor-sesda Mar 2, 2022
9600ab6
Update helioviewer-web.css
btaylor-sesda Mar 2, 2022
a8ca5fb
Update dot-luv.css
btaylor-sesda Mar 2, 2022
2904e67
Update dot-luv.css
btaylor-sesda Mar 2, 2022
17066d7
Update dot-luv.css
btaylor-sesda Mar 2, 2022
c7e3729
Update dot-luv.css
btaylor-sesda Mar 2, 2022
929d587
Update dot-luv.css
btaylor-sesda Mar 2, 2022
a2ea5b2
Update Tutorial.js
btaylor-sesda Mar 4, 2022
c76dd1f
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
314eb99
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
d870961
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
f0bbe18
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
72f3134
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
6c26f31
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
6753068
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
5976486
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
b67029d
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
3646622
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
90d7294
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
9851f68
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
4ed82db
Update CustomHandling.js
btaylor-sesda Mar 7, 2022
bdf1e99
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
d6d6877
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
551f782
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
1fdefd6
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
831d093
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
8d7e0bf
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
e176960
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
7d6dcf9
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
d9c71f8
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
7580d65
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
f367b77
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
6626bcd
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
9a9a218
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
92e9015
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
57dbf44
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
89d53ff
Update CustomHandling.js
btaylor-sesda Mar 8, 2022
b49c81a
Update CustomHandling.js
btaylor-sesda Mar 9, 2022
939a40b
Update CustomHandling.js
btaylor-sesda Mar 9, 2022
f15e6b1
Update CustomHandling.js
btaylor-sesda Mar 9, 2022
2851cd2
Update CustomHandling.js
btaylor-sesda Mar 9, 2022
6398c52
Update helioviewer-web.css
btaylor-sesda Mar 9, 2022
ad5a660
Update CustomHandling.js
btaylor-sesda Mar 9, 2022
fb017fe
Update CustomHandling.js
btaylor-sesda Mar 9, 2022
ea0d67a
Update MovieManagerUI.js (#340)
dgarciabriseno Mar 9, 2022
addb4ee
Add regenerate movie threshold to config (#341)
dgarciabriseno Mar 11, 2022
c93da2f
Update CustomHandling.js
btaylor-sesda Mar 17, 2022
15bd89d
Update CustomHandling.js
btaylor-sesda May 10, 2022
0e40376
Update CustomHandling.js
btaylor-sesda May 10, 2022
835876c
Update CustomHandling.js
btaylor-sesda May 10, 2022
ecb7998
Update CustomHandling.js
btaylor-sesda May 10, 2022
2265c9b
Update CustomHandling.js
btaylor-sesda May 10, 2022
c579f96
Update CustomHandling.js
btaylor-sesda May 10, 2022
50268f8
Update Config.js
btaylor-sesda May 25, 2022
5fc9b12
Update Config.js
btaylor-sesda May 25, 2022
ce977ca
Update Config.js
btaylor-sesda Jun 29, 2022
2bd5466
Update CustomHandling.js
btaylor-sesda Jun 30, 2022
6dfdeaa
Remove legacy url from index.php
Jul 14, 2022
7dc0985
Merge branch 'beta' of github.com:Helioviewer-Project/helioviewer.org…
Jul 14, 2022
d6b05d7
Security updates (#395)
dgarciabriseno Oct 24, 2022
921ead0
Implement mobile support (#400)
dgarciabriseno Nov 23, 2022
e6934f4
Fix multiline strings to fix syntax error.
dgarciabriseno Nov 23, 2022
ba9f29b
Update media-manager.css
btaylor-sesda Aug 2, 2022
64560c3
Update media-manager.css
btaylor-sesda Aug 3, 2022
f0f2c9c
Add helios backlinks
dgarciabriseno Nov 30, 2022
9f13cd3
remove whitespace
dgarciabriseno Dec 1, 2022
aefb2be
Update youtube sharing css. (#403)
btaylor-sesda Dec 5, 2022
5bd2a5f
Merge pull request #404 from Helioviewer-Project/beta
dgarciabriseno Dec 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# workaround for windows hosts running in a docker container
# to be able to build js
jsmin.py eol=lf
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "resources/lib/mediaelement"]
path = resources/lib/mediaelement
url = https://github.com/mediaelement/mediaelement.git
[submodule "resources/lib/jquery.browser"]
path = resources/lib/jquery.browser
url = https://github.com/gabceb/jquery-browser-plugin.git
[submodule "resources/lib/jquery.jgrowl"]
path = resources/lib/jquery.jgrowl
url = https://github.com/stanlemon/jGrowl.git
11 changes: 3 additions & 8 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ To request a new feature or to report a bug, visit

https://github.com/Helioviewer-Project

For the most up-to-date documentation on Helioviewer.org and related efforts,
see the official wiki at

http://wiki.helioviewer.org/wiki/

======================================================================

Expand All @@ -39,7 +35,7 @@ following software:
INSTALLATION:

Instructions for installing Helioviewer.org are available online at
http://wiki.helioviewer.org/wiki/Installing_Helioviewer.org
https://helioviewer-project.github.io/install/

LICENSE:

Expand All @@ -52,8 +48,7 @@ CREDITS:

Helioviewer.org is part of the Helioviewer Project, an open-source project
for the visualization of solar and heliospheric data. The Helioviewer
Project is funded by ESA and NASA. For more information, please see the
wiki above.
Project is funded by ESA and NASA.

Helioviewer.org acknowledges the support of the following instrument teams,
mission teams and institutions - SDO(NASA), SOHO(ESA/NASA), STEREO(NASA),
Expand All @@ -63,4 +58,4 @@ Belgium, LMSAL, SDAC, Stanford University, Montana State University/FFT
Helioviewer.org acknowledges the use of the following tools:
- www.browserstack.com, for testing the web application on multiple browsers
and OSs,
- www.highcharts.com, for interactive JavaScript charts.
- www.highcharts.com, for interactive JavaScript charts.
42 changes: 41 additions & 1 deletion dialogs/about.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,37 @@
<?php
// Returns the latest git tag, which is equivalent to the latest
// version string.
function get_version() {
// Gets the most recent tag even if it's not the current commit.
$result = shell_exec("git describe --tags --abbrev=0");
// Command will fail if git isn't installed or if it's not a git repository.
// In that case, return version unknown.
if (!$result) {
return "Unknown";
}

return trim($result);
}

// Get the current commit date to show as the "Last Updated" time.
function get_date() {
$result = shell_exec("git show -s --format=%as");
if (!$result) {
return "Unknown";
}
return trim($result);
}

function print_version_info() {
$date = get_date();
$version = get_version();
echo $date . " (" . $version . ")";
}
?>

<img src="resources/images/logos/about_white.png" alt="Helioviewer.org Logo"><br>
<div style="width:100%; text-align: center;">
<span style="margin-left: auto; margin-right: auto; font-size:small;">Last Updated: 2017/03/10 (v3.2.0)</span>
<span style="margin-left: auto; margin-right: auto; font-size:small;">Last Updated: <?php print_version_info()?></span>
</div>
<br />

Expand Down Expand Up @@ -37,6 +67,16 @@
<b>Helioviewer.org makes use of the following tools:</b><br />
<a href="https://www.browserstack.com/" target="_blank">BrowserStack</a> - Cross Browser Testing Tool.<br/>
<a href="http://www.highcharts.com/" target="_blank">Highcharts</a> - Interactive JavaScript charts for your webpage.<br/>
<a href="https://sunpy.org/" target="_blank">SunPy</a> - Solar data analysis environment for Python. <br/>
<a href="https://github.com/nikolaposa/rate-limit" target="_blank">Rate-Limit</a> - API level rate-limiting by Nikola Posa. <br/>
<a href="https://redis.io/" target="_blank">Redis</a> - Open source (BSD licensed), in-memory data structure store. <br/>
</span>
<br/>
<span style="margin-left:auto; margin-right: auto;">
<b>YouTube API Client Acknowledgements:</b><br />
<a href="https://www.youtube.com/terms" target="_blank">YouTube Terms of Service (ToS)</a> <br/>
<a href="https://policies.google.com/privacy" target="_blank">Google Privacy Policy</a> <br/>
<a href="https://security.google.com/settings/security/permissions" target="_blank">Revoke YouTube API Access for Helioviewer.org</a> <br/>

</span>
</div>
30 changes: 15 additions & 15 deletions dialogs/glossary.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--
Helioviewer.org Visual Glossary

Dimensions to use for movies/screenshots:

1280x960

Hint: on a 1920x1080 display using the Chrome web browser with bookmarks
hidden, you would want to resize the browser to 1898x1157 to be able
to create full-viewport Helioviewer.org videos with the desired dimensions.
Expand Down Expand Up @@ -78,7 +78,7 @@
<div class='glossary-text'>2,500 km thick (1,600 mi) layer of plasma above the Sun’s photosphere. Temperatures range from ~4500 K to 60,000 K (110,000 to 8,000°F). The word chromosphere means, literally, “color sphere” and refers to its reddish color when seen with the naked eye during a total solar eclipse.</div>
</td>
</tr>
<!-- Convection -->
<!-- Convection -->
<tr name='convection' class=''>
<td>
</td>
Expand Down Expand Up @@ -153,11 +153,11 @@
<!--CME-->
<tr name='cme' class='g-basic g-fe'>
<td>
<iframe class="youtube-player" type="text/html" src="http://www.youtube.com/embed/TWySQHjIRSg" frameborder="0"></iframe>
<iframe class="youtube-player" type="text/html" src="https://www.youtube.com/embed/TWySQHjIRSg" frameborder="0"></iframe>
</td>
<td>
<div class='glossary-title'>Coronal Mass Ejection (CME)</div>
<div class='glossary-text'>A catastrophic expansion of a part of the coronal magnetic field that causes a huge bubble of plasma and magnetic field to erupt from the Sun. A CME can last for several hours and travels though space at a million miles per hour. CMEs are usually accompanied by a solar flare. The charged particles and magnetic fields associated with CMEs can cause power and communications outages, damage to satellites, and health problems for astronauts. They usually take about three days to reach Earth, but very fast ones can arrive in under a day.</div>
<div class='glossary-text'>A catastrophic expansion of a part of the coronal magnetic field that causes a huge bubble of plasma and magnetic field to erupt from the Sun. A CME can last for several hours and travels though space at a million miles per hour. CMEs are usually accompanied by a solar flare. The charged particles and magnetic fields associated with CMEs can cause power and communications outages, damage to satellites, and health problems for astronauts. They usually take about three days to reach Earth, but very fast ones can arrive in under a day.</div>
</td>
</tr>
<!--EIT-->
Expand Down Expand Up @@ -227,11 +227,11 @@
<!--Flare-->
<tr name='flare' class='g-basic g-fe'>
<td>
<iframe class="youtube-player" type="text/html" src="http://www.youtube.com/embed/dU0sJm2wgYc" frameborder="0"></iframe>
<iframe class="youtube-player" type="text/html" src="https://www.youtube.com/embed/dU0sJm2wgYc" frameborder="0"></iframe>
</td>
<td>
<div class='glossary-title'>Flare</div>
<div class='glossary-text'>A rapid release of vast magnetic energy in a sunspot region, causing temperatures to rise tens of millions of degrees in a small area above the solar surface. The resulting radiation surge can cause blackouts of communication signals and damage to satellites. Flares can produce dangerous EUV radiation, X-rays, gamma rays, and high-energy protons.</div>
<div class='glossary-text'>A rapid release of vast magnetic energy in a sunspot region, causing temperatures to rise tens of millions of degrees in a small area above the solar surface. The resulting radiation surge can cause blackouts of communication signals and damage to satellites. Flares can produce dangerous EUV radiation, X-rays, gamma rays, and high-energy protons.</div>
</td>
</tr>
<!--Gamma Rays-->
Expand Down Expand Up @@ -294,7 +294,7 @@
</td>
<td>
<div class='glossary-title'>Ionization</div>
<div class='glossary-text'>A process that produces ions, typically collisions between atoms or electrons, or by interaction with electromagnetic radiation.
<div class='glossary-text'>A process that produces ions, typically collisions between atoms or electrons, or by interaction with electromagnetic radiation.
</td>
</tr>
<!--Irradiation-->
Expand Down Expand Up @@ -341,7 +341,7 @@
<div class='glossary-title'>Magnetogram</div>
<div class='glossary-text'>A magnetogram is an image of the Sun's magnetic flux. They are derived by using emission lines which are magnetically sensitive, which allows the magnetic flux present to be calculated. Currently, only line-of-sight magnetic flux measurements - the amount of magnetic flux that lies along the line-of-sight between the instrument and Sun - are available on Helioviewer.org, from the HMI and MDI instruments. Magnetograms are important as the Sun's magnetic field is thought to play an important role in solar activity.</div>
</td>
</tr>
</tr>
<!--Magnetosphere-->
<tr name='magnetosphere' class=''>
<td>
Expand All @@ -357,7 +357,7 @@
</td>
<td>
<div class='glossary-title'>Maunder Minimum</div>
<div class='glossary-text'>From 1645 to 1715, scientists believe there was a decrease in the total energy output from the Sun, as indicated by little or no sunspot activity. This period coincided with a climate event on Earth known as the Little Ice Age.</div>
<div class='glossary-text'>From 1645 to 1715, scientists believe there was a decrease in the total energy output from the Sun, as indicated by little or no sunspot activity. This period coincided with a climate event on Earth known as the Little Ice Age.</div>
</td>
</tr>
<!--MDI-->
Expand Down Expand Up @@ -390,7 +390,7 @@
<!--Prominence-->
<tr name='prominence' class='g-basic g-fe'>
<td>
<iframe class="youtube-player" type="text/html" src="http://www.youtube.com/embed/BosmntuHHLo" frameborder="0"></iframe>
<iframe class="youtube-player" type="text/html" src="https://www.youtube.com/embed/BosmntuHHLo" frameborder="0"></iframe>
</td>
<td>
<div class='glossary-title'>Prominence</div>
Expand Down Expand Up @@ -429,7 +429,7 @@
<i>More Info:</i><br />
<div class='glossary-links'>
<a href='http://www.nasa.gov/mission_pages/sdo/main/index.html' target="_blank">SDO Homepage</a>
</div>
</div>
</div>
</td>
</tr>
Expand Down Expand Up @@ -516,7 +516,7 @@
<div class='glossary-text'>Dark areas on the Sun created by strong magnetic fields beneath the Sun’s surface. Sunspots appear dark because they are cooler than the surrounding areas of the photosphere. They range in size from 2,400 km (1,500 mi) to several times Earth’s size. Sunspots usually occur in pairs or groups of opposite magnetic polarity that rotate with the surface of the Sun. They are the footprints of magnetic loops pushing through the surface and holding plasma below. Manifesting intense magnetic activity, sunspots host secondary phenomena such as coronal loops and reconnection events. Most solar flares and coronal mass ejections originate in magnetically active regions around visible sunspot groupings. Similar phenomena indirectly observed on stars are commonly called starspots and both light and dark spots have been measured.</div>
</td>
</tr>

<!--Sunspot Group-->
<tr name='sunspot-group' class='g-fe'>
<td>
Expand All @@ -528,7 +528,7 @@
<div class='glossary-text'>A cluster of multiple sunspots.</div>
</td>
</tr>

<!--Total Solar Irradiance-->
<tr name='total-solar-irradiance' class=''>
<td>
Expand Down
Loading