diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb b/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
index 2e17ffae..fc2ba6fc 100644
--- a/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
+++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
@@ -614,14 +614,14 @@ Metamaps.GlobalUI.Search = {
self.hideLoader();
- if (datum.rtype != "noresult") {
+ if (["topic", "map", "mapper"].indexOf(datum.rtype) !== -1) {
self.close(0, true);
var win;
- if (dataset == "topics") {
+ if (datum.rtype == "topic") {
Metamaps.Router.topics(datum.id);
- } else if (dataset == "maps") {
+ } else if (datum.rtype == "map") {
Metamaps.Router.maps(datum.id);
- } else if (dataset == "mappers") {
+ } else if (datum.rtype == "mapper") {
Metamaps.Router.explore("mapper", datum.id);
}
}
diff --git a/app/assets/javascripts/src/Metamaps.js.erb b/app/assets/javascripts/src/Metamaps.js.erb
index 33cb15ef..069fdc21 100644
--- a/app/assets/javascripts/src/Metamaps.js.erb
+++ b/app/assets/javascripts/src/Metamaps.js.erb
@@ -928,8 +928,11 @@ Metamaps.TopicCard = {
setTimeout(function () {
var text = $(element).val();
if (event.type=="paste" || (event.type=="keyup" && event.which==13)){
- if (text.slice(0, 4) !== 'http') {
- text='http://'+text;
+ // TODO evaluate converting this to '//' no matter what (infer protocol)
+ if (text.slice(0, 7) !== 'http://' &&
+ text.slice(0, 8) !== 'https://' &&
+ text.slice(0, 2) !== '//') {
+ text='//'+text;
}
topic.save({
link: text
@@ -1897,7 +1900,7 @@ Metamaps.Util = {
return (url.match(/\.(jpeg|jpg|gif|png)$/) != null);
},
checkURLisYoutubeVideo: function (url) {
- return (url.match(/^http:\/\/(?:www\.)?youtube.com\/watch\?(?=[^?]*v=\w+)(?:[^\s?]+)?$/) != null);
+ return (url.match(/^https?:\/\/(?:www\.)?youtube.com\/watch\?(?=[^?]*v=\w+)(?:[^\s?]+)?$/) != null);
}
}; // end Metamaps.Util
@@ -1907,9 +1910,9 @@ Metamaps.Util = {
*
*/
Metamaps.Realtime = {
- stringForLocalhost: 'http://localhost:5001',
- stringForMetamaps: 'http://metamaps.cc:5001',
- stringForHeroku: 'http://gentle-savannah-1303.herokuapp.com',
+ stringForLocalhost: '//localhost:5001',
+ stringForMetamaps: 'https://realtime.metamaps.cc',
+ stringForHeroku: 'https://gentle-savannah-1303.herokuapp.com',
socket: null,
isOpen: false,
changing: false,
@@ -2548,7 +2551,7 @@ Metamaps.Realtime = {
Metamaps.Topic.renderTopic(mapping, topic, false, false);
}
else if (!cancel) {
- setTimeout(test, 10);
+ setTimeout(waitThenRenderTopic, 10);
}
}
@@ -2646,7 +2649,7 @@ Metamaps.Realtime = {
Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, false);
}
else if (!cancel) {
- setTimeout(test, 10);
+ setTimeout(waitThenRenderSynapse, 10);
}
}
diff --git a/app/assets/stylesheets/search.scss.erb b/app/assets/stylesheets/search.scss.erb
index 607a561f..0f806f96 100644
--- a/app/assets/stylesheets/search.scss.erb
+++ b/app/assets/stylesheets/search.scss.erb
@@ -19,12 +19,6 @@
}
}
-.explorePage .sidebarSearchField,
-.explorePage .sidebarSearch .tt-hint {
- width: 380px;
- padding: 5px 10px 5px 10px;
-}
-
.sidebarSearchIcon {
float: left;
width: 72px;
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 89b6fa09..74d56340 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,7 +11,13 @@ class ApplicationController < ActionController::Base
helper_method :admin?
def after_sign_in_path_for(resource)
- sign_in_url = url_for(:action => 'new', :controller => 'sessions', :only_path => false, :protocol => 'http')
+ unsafe_uri = request.env["REQUEST_URI"]
+ if unsafe_uri.starts_with?('http') && !unsafe_uri.starts_with?('https')
+ protocol = 'http'
+ else
+ protocol = 'https'
+ end
+ sign_in_url = url_for(:action => 'new', :controller => 'sessions', :only_path => false, :protocol => protocol)
if request.referer == sign_in_url
super
@@ -58,9 +64,9 @@ private
end
def get_invite_link
- unsafe_uri = request.env["REQUEST_URI"] || 'http://metamaps.cc'
+ unsafe_uri = request.env["REQUEST_URI"] || 'https://metamaps.cc'
valid_url = /^https?:\/\/([\w\.-]+)(:\d{1,5})?\/?$/
- safe_uri = (unsafe_uri.match(valid_url)) ? unsafe_uri : 'http://metamaps.cc/'
+ safe_uri = (unsafe_uri.match(valid_url)) ? unsafe_uri : '//metamaps.cc/'
@invite_link = "#{safe_uri}join" + (current_user ? "?code=#{current_user.code}" : "")
end
end
diff --git a/app/models/metacode.rb b/app/models/metacode.rb
index 51ac4fa5..03b0f0c0 100644
--- a/app/models/metacode.rb
+++ b/app/models/metacode.rb
@@ -13,11 +13,4 @@ class Metacode < ActiveRecord::Base
return true if self.metacode_sets.include? metacode_set
return false
end
-
- #output json with asset_paths merged in
- def as_json(options)
- json = super(options.merge!(methods: :asset_path_icon))
- json["icon"] = json["asset_path_icon"]
- json.except("asset_path_icon")
- end
end
diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb
index 46ab2edf..1ea13866 100644
--- a/app/views/layouts/_lightboxes.html.erb
+++ b/app/views/layouts/_lightboxes.html.erb
@@ -46,6 +46,7 @@
+ <% # TODO enable ssl on blog.metamaps.cc %>
blog
@@ -58,7 +59,8 @@
-
+ <% # TODO switch to https:// once we're confident %>
+
terms
@@ -115,7 +117,7 @@
Google Plus *
Hackpad *
Loomio *
- Twitter *
+ Twitter *
Hipchat
Google Hangouts
Vimeo
@@ -152,6 +154,7 @@
Chrome
Firefox
Safari
+ <% # TODO https for blog.metamaps.cc %>
While it's downloading, explore our blog,
watch the tutorials, or visit our knowledge base!
@@ -200,13 +203,14 @@
Want to help with design, code, community building, or communications for Metamaps? We're an open value network, which for us means we want to invite and empower peers to participate in creating value together.
+ <% # TODO change this link to https once it works %>
To be a USER, request an invite! We'll expect you to abide by our terms of service.
To be a CONTRIBUTOR, simply enter our spaces and join the conversation! We'll expect you to follow some guidelines.
MEMBERS are contributors who act as stewards and guardians of the collective and are responsible for maintaining our culture and purpose. We're working on a set of agreements to formalize what it means to be a member.
- We welcome people of all skillsets to create value within our network. There's open possibilities for designers, researchers, academics, strategists, and facilitators to contribute. If you're a developer, help us advance the code and take a look around our Github.
+ We welcome people of all skillsets to create value within our network. There's open possibilities for designers, researchers, academics, strategists, and facilitators to contribute. If you're a developer, help us advance the code and take a look around our Github.
Thanks for your interest in helping out with Metamaps! Hopefully this gets you pointed in the right direction to get involved. The next step is to read the links on this page and then contribute!
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9911466a..8057d576 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,7 +16,7 @@
<%= javascript_include_tag "application" %>
-
+
@@ -141,16 +141,12 @@
// set up uservoice with signed in user
<% if authenticated? && ENV['SSO_KEY'] %>
- USERVOICE.load(Metamaps.Active.Mapper.name, Metamaps.Active.Mapper.id, "<%= user.email %>", "<%= current_sso_token %>");
+ USERVOICE.load(Metamaps.Active.Mapper.name, Metamaps.Active.Mapper.id, "<%= user.email %>", "<%= current_sso_token %>");
<% else %>
- USERVOICE.load();
+ USERVOICE.load();
<% end %>
-<% if !authenticated? %>
-
-<% end %>
-
<%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %>