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

rejig urls, switch support image, add default map image

Browse source
This commit is contained in:
Connor Turland 2014-10-23 19:54:39 -04:00
parent e61a32ebaa
commit 189f04780c
7 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/feedback_sprite.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/assets/images/missing-map.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
app/assets/images/support_tab_sprite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

5
app/assets/javascripts/src/Metamaps.js
View file

@ -1587,9 +1587,7 @@ Metamaps.Util = {
*/ */
Metamaps.Realtime = { Metamaps.Realtime = {
stringForLocalhost: 'http://localhost:5001', stringForLocalhost: 'http://localhost:5001',
stringForMetamaps: 'http://metamaps.cc:5001', stringForTVW: 'http://metamaps.thevalueweb.org:5001',
stringForTVW: 'http://tvw.mooo.com:5001',
stringForHeroku: 'http://gentle-savannah-1303.herokuapp.com',
socket: null, socket: null,
isOpen: false, isOpen: false,
changing: false, changing: false,
@ -3722,6 +3720,7 @@ Metamaps.Map.CheatSheet = {
init: function () { init: function () {
// tab the cheatsheet // tab the cheatsheet
$('#cheatSheet').tabs(); $('#cheatSheet').tabs();
$('#cheatSheet').tabs("disable", 1); // TODO re-enable once the tutorials are in
$('#quickReference').tabs().addClass("ui-tabs-vertical ui-helper-clearfix"); $('#quickReference').tabs().addClass("ui-tabs-vertical ui-helper-clearfix");
$("#quickReference .ui-tabs-nav li").removeClass("ui-corner-top").addClass("ui-corner-left"); $("#quickReference .ui-tabs-nav li").removeClass("ui-corner-top").addClass("ui-corner-left");

3
app/assets/stylesheets/uservoice.css
View file

@ -2,8 +2,7 @@
--------------------------------------------------------*/ --------------------------------------------------------*/
div.uv-icon.uv-bottom-left { div.uv-icon.uv-bottom-left {
background-image:url(feedback_sprite.png); background-image:url(support_tab_sprite.png);
background-color:#222222;
color:#FFFFFF; color:#FFFFFF;
cursor:pointer; cursor:pointer;
height:108px; height:108px;

2
app/views/layouts/application.html.erb
View file

@ -17,7 +17,7 @@
<% if Rails.env.production? %> <% if Rails.env.production? %>
<!-- for metamaps.thevalueweb.com --> <!-- for metamaps.thevalueweb.org -->
<script src="//use.typekit.net/jcy0yfj.js"></script> <script src="//use.typekit.net/jcy0yfj.js"></script>
<% elsif Rails.env.development? %> <% elsif Rails.env.development? %>
<!-- for localhost development --> <!-- for localhost development -->

2
script/phantomjs-save-screenshot.js
View file

@ -9,7 +9,7 @@ if (args.length <= 1) {
//configurable variables - CHANGE ME //configurable variables - CHANGE ME
var mapID = args[1]; var mapID = args[1];
var environment = args[2]; var environment = args[2];
var address = environment === 'development' ? 'http://localhost:3000' : 'http://tvw.mooo.com'; var address = environment === 'development' ? 'http://localhost:3000' : 'http://metamaps.thevalueweb.org';
var url = address + '/maps/' + mapID; var url = address + '/maps/' + mapID;
var width = 940; var width = 940;
var height = 630; var height = 630;