glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

merge changes from metamapscc instance branch (#913)

Browse source 
* homepage video fallback

* public/50x.html

* remove blog from public/ html pages

* remove video file since it's on metamaps.cc server

* eslint
This commit is contained in:
Devin Howard 2016-11-09 09:34:10 -05:00 committed by GitHub
parent a176cdf231
commit 4533a0f2fe
6 changed files with 57 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/metamaps-intro-poster.webp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 32 KiB

2
app/assets/javascripts/application.js
View file

@ -1,3 +1,4 @@
// eslint-disable spaced-comment
// This is a manifest file that'll be compiled into application.js, which will include all the files
// listed below.
//
@ -16,3 +17,4 @@
//= require_directory ./lib
//= require ./webpacked/metamaps.bundle
//= require ./Metamaps.ServerData
//= require homepageVimeoFallback

29
app/assets/javascripts/homepageVimeoFallback.js Normal file
View file

@ -0,0 +1,29 @@
/* global $ */
$(document).ready(function () {
if (window.location.pathname === '/') {
$.ajax({
type: 'GET',
url: 'https://player.vimeo.com',
error: function (e) {
$('.homeVideo').hide()
$('.homeVideo').replaceWith($('<video/>', {
poster: '/assets/metamaps-intro-poster.webp',
width: '560',
height: '315',
class: 'homeVideo',
controls: ''
}))
$('.homeVideo').append($('<source/>', {
src: 'https://metamaps.cc/videos/metamaps-intro.mp4',
type: 'video/mp4'
}))
$('.homeVideo').append(
'<p>You can watch our instruction video at ' +
'<a href="https://metamaps.cc/videos/metamaps-intro.mp4">' +
'https://metamaps.cc/videos/metamaps-intro.mp4</a>.'
)
}
})
}// if
})

1
public/404.html
View file

@ -120,7 +120,6 @@
<p>Therefore there is nothing to see here, nothing to behold here, nothing to be here, maybe there is but definitely not here.</p>
<p>Therefore, move along! Nothing is ending here<a href="http://spacecollective.org/Wildcat/8942/Some-nothings-are-like-elephants-really-big-elephants" target="_blank">...</a></p>
<a href="/explore/featured" class="button exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
<a href="http://blog.metamaps.cc" class="button blogCTA">GO TO OUR BLOG</a>
</div>
<div class="picture">

3
public/503.html
View file

@ -116,9 +116,8 @@
<h1 class="title">503 - Down for Maintenance</h1>
<p>Metamaps is offline!</p>
<p>Don't worry, this is intentional. We're probably just turning on some great new features.</p>
<p>In the meantime, you can visit our blog, or aimlessly search YouTube until we're back online.</p>
<p>In the meantime, you can visit our Twitter, or aimlessly search YouTube until we're back online.</p>
<a href="https://twitter.com/metamapps" class="button blogCTA">GO TO OUR TWITTER FEED</a>
<a href="http://blog.metamaps.cc" class="button blogCTA">GO TO OUR BLOG</a>
</div>
<div class="picture">

25
public/50x.html Normal file
View file

@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>We're really sorry, but something went wrong (500)</title>
<style type="text/css">
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
div.dialog {
width: 25em;
padding: 0 4em;
margin: 4em auto 0 auto;
border: 1px solid #ccc;
border-right-color: #999;
border-bottom-color: #999;
}
h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
</style>
</head>
<body>
<!-- This file lives in public/500.html -->
<div class="dialog">
<h1>We're really sorry, but something went wrong.</h1>
</div>
</body>
</html>