diff --git a/app/assets/images/feedback_sprite.png b/app/assets/images/feedback_sprite.png deleted file mode 100755 index fc7998d3..00000000 Binary files a/app/assets/images/feedback_sprite.png and /dev/null differ diff --git a/app/assets/images/missing-map.png b/app/assets/images/missing-map.png index 5a51221a..54cbd843 100644 Binary files a/app/assets/images/missing-map.png and b/app/assets/images/missing-map.png differ diff --git a/app/assets/images/support_tab_sprite.png b/app/assets/images/support_tab_sprite.png new file mode 100644 index 00000000..0e72381c Binary files /dev/null and b/app/assets/images/support_tab_sprite.png differ diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index a8aa73c7..4f226134 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1587,9 +1587,7 @@ Metamaps.Util = { */ Metamaps.Realtime = { stringForLocalhost: 'http://localhost:5001', - stringForMetamaps: 'http://metamaps.cc:5001', - stringForTVW: 'http://tvw.mooo.com:5001', - stringForHeroku: 'http://gentle-savannah-1303.herokuapp.com', + stringForTVW: 'http://metamaps.thevalueweb.org:5001', socket: null, isOpen: false, changing: false, @@ -3722,6 +3720,7 @@ Metamaps.Map.CheatSheet = { init: function () { // tab the cheatsheet $('#cheatSheet').tabs(); + $('#cheatSheet').tabs("disable", 1); // TODO re-enable once the tutorials are in $('#quickReference').tabs().addClass("ui-tabs-vertical ui-helper-clearfix"); $("#quickReference .ui-tabs-nav li").removeClass("ui-corner-top").addClass("ui-corner-left"); diff --git a/app/assets/stylesheets/uservoice.css b/app/assets/stylesheets/uservoice.css index 1eaaf9d7..525cb046 100644 --- a/app/assets/stylesheets/uservoice.css +++ b/app/assets/stylesheets/uservoice.css @@ -2,8 +2,7 @@ --------------------------------------------------------*/ div.uv-icon.uv-bottom-left { - background-image:url(feedback_sprite.png); - background-color:#222222; + background-image:url(support_tab_sprite.png); color:#FFFFFF; cursor:pointer; height:108px; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8b8b6611..1bae75a2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -17,7 +17,7 @@ <% if Rails.env.production? %> - + <% elsif Rails.env.development? %> diff --git a/script/phantomjs-save-screenshot.js b/script/phantomjs-save-screenshot.js index f65c7b7e..add46d0d 100755 --- a/script/phantomjs-save-screenshot.js +++ b/script/phantomjs-save-screenshot.js @@ -9,7 +9,7 @@ if (args.length <= 1) { //configurable variables - CHANGE ME var mapID = args[1]; 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 width = 940; var height = 630;