Skip to content

Commit

Permalink
index.php: use Font Awesome 5.15.4, plus others (#108)
Browse files Browse the repository at this point in the history
* index.php: use Font Awesome 5.15.4

* This required changing some icons and adding a " " to get the spacing correct.
* Also changed icons in the camera pop out to match what's on the Global Allsky Map, for consistency.

* index.php: no need to support IE9

* Delete excanvas.min.js

This file was only needed to support IE9, which we're no longer doing.

* index.html: don't support IE9

In the main index.html file, the check was for "lt IE9", whereas the check in this file was for "IE".

* index.php: add comment

Explain why 50.
  • Loading branch information
EricClaeys authored May 2, 2022
1 parent b5a487a commit 2149e56
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
19 changes: 10 additions & 9 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta property="og:url" content="http://www.thomasjacquin/allsky/" />
<meta property="og:image" content="http://www.thomasjacquin.com/allsky/image.jpg" />
<link rel="shortcut icon" type="image/png" href="allsky-favicon.png">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300' rel='stylesheet' type='text/css'>
Expand All @@ -21,7 +21,6 @@
crossorigin="anonymous"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
<script src="moment.js" type="text/javascript"></script>
<!--[if lt IE 9]><script src="virtualsky/excanvas.min.js"></script><![endif]-->
<script src="virtualsky/stuquery.js" type="text/javascript"></script>
<script src="virtualsky/virtualsky.js" type="text/javascript"></script>
<script src="ng-lodash.min.js"></script>
Expand All @@ -41,13 +40,13 @@
</div>
<div class="info animated slideInRight" ng-show="showInfo==true">
<ul>
<li><i class="fa fa-fw fa-map"></i>Location: <span>{{location}}</span></li>
<li><i class="fa fa-fw fa-map-marker-alt"></i>&nbsp; Location: <span>{{location}}</span></li>
<li><i class="fa fa-fw fa-map-marker"></i>Latitude: <span>{{latitude < 0 ? latitude * -1 + 'S' : latitude + 'N'}}</span></li>
<li><i class="fa fa-fw fa-map-marker"></i>Longitude: <span>{{longitude < 0 ? longitude * -1 + 'W' : longitude + 'E'}}</span></li>
<li><i class="fa fa-fw fa-camera"></i>Camera: <span>{{camera}}</span></li>
<li><i class="fa fa-fw fa-eye"></i>Lens: <span>{{lens}}</span></li>
<li><i class="fa fa-fw fa-gears"></i>Computer: <span>{{computer}}</span></li>
<li><i class="fa fa-fw fa-user"></i>Owner: <span>{{owner}}</span></li>
<li><i class="fa fa-fw fa-camera-retro"></i>&nbsp; Camera: <span>{{camera}}</span></li>
<li><i class="fa fa-fw fa-dot-circle"></i>&nbsp; Lens: <span>{{lens}}</span></li>
<li><i class="fa fa-fw fa-microchip"></i>&nbsp; Computer: <span>{{computer}}</span></li>
<li><i class="fa fa-fw fa-user"></i>&nbsp; Owner: <span>{{owner}}</span></li>
</ul>
</div>
<span class="notification" compile="notification"></span>
Expand All @@ -56,7 +55,7 @@
<li><i class="fa fa-2x fa-fw allsky-constellation" id="overlayBtn" title="Show constellations overlay" ng-click="toggleOverlay()" ng-class="{'active': showOverlay}"></i></li>
<li><a href="videos" title="Archived Timelapses"><i class="fa fa-2x fa-fw fa-play-circle"></i></a></li>
<li><a href="keograms" title="Archived Keograms"><i class="fa fa-2x fa-fw fa-barcode"></i></a></li>
<li><a href="startrails" title="Archived Startrails"><i class="fa fa-2x fa-fw fa-circle-o-notch"></i></a></li>
<li><a href="startrails" title="Archived Startrails"><i class="fa fa-2x fa-fw fa-circle-notch"></i></a></li>
<li><i class="fa fa-2x fa-fw fa-camera" title="Information about the camera" ng-click="toggleInfo()" ng-class="{'active': showInfo}" style="margin-top: 5px; font-size: 1.9em"></i></li>
</ul>

Expand All @@ -71,7 +70,9 @@

<div class="diy"><a href="http://thomasjacquin.com/make-your-own-allsky-camera"><i class="fa fa-gear"></i> Make Your Own</a></div>

<?php if (file_exists("analyticsTracking.js") && filesize("analyticsTracking.js") > 50) { ?>
<?php if (file_exists("analyticsTracking.js") && filesize("analyticsTracking.js") > 50) {
// The initial analyticsTracking.js file has a comment line "//Include your Google Analytics code here" which is < 50 characters.
?>
<script src="analyticsTracking.js"></script>
<?php } ?>
</body>
Expand Down
Loading

0 comments on commit 2149e56

Please sign in to comment.