From 1f7df00d3cd73eeb8f619b7fe4c082d5ffb602b4 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 18 Oct 2014 12:46:45 -0400 Subject: [PATCH 1/5] setup google analytics and production urls --- app/assets/javascripts/src/Metamaps.js | 3 ++- app/views/layouts/_googleanalytics.html.erb | 2 +- script/phantomjs-save-screenshot.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 74974814..745a46bf 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1588,6 +1588,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', socket: null, isOpen: false, @@ -1610,7 +1611,7 @@ Metamaps.Realtime = { $('body').click(self.close); var railsEnv = $('body').data('env'); - var whichToConnect = railsEnv === 'development' ? self.stringForLocalhost : self.stringForHeroku; + var whichToConnect = railsEnv === 'development' ? self.stringForLocalhost : self.stringForTVW; self.socket = io.connect(whichToConnect); self.startActiveMap(); }, diff --git a/app/views/layouts/_googleanalytics.html.erb b/app/views/layouts/_googleanalytics.html.erb index 104ff8ab..484aa762 100644 --- a/app/views/layouts/_googleanalytics.html.erb +++ b/app/views/layouts/_googleanalytics.html.erb @@ -6,7 +6,7 @@ -
-
- -
-
- - -
-
-

Please Donate To Bitcoin Address: [[address]]

-

-
-
- Donation of [[value]] BTC Received. Thank You. -
-
- [[error]] -
-
- -
-

Tutorial

@@ -203,20 +165,6 @@
<% if authenticated? %> -
-

SHARE INVITE

- -
-

The Metamaps platform is currently in an invite-only beta with the express purpose of creating a high value knowledge ecosystem, as well as building a community of contributors. As a valued beta tester, you have the ability to invite your peers, colleagues and collaborators onto the platform.

-

Copy and send the link + access code below. The access code below is your personal code and can be used multiple times.

-
-

HTTP://METAMAPS.CC/JOIN

- <% mapper = current_user %> -

ACCESS CODE: <%= mapper.code %>

-
- -
- <% # this is the create new map form %>
<%= render :partial => 'layouts/newmap' %> diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index 07aea898..f2bbd85f 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -4,7 +4,7 @@
- <%= 'data-bypass=true' %><% end %>> +
@@ -19,7 +19,6 @@
- <% if authenticated? %>
@@ -39,7 +38,6 @@
- <% end %>
@@ -49,37 +47,27 @@
- <% if authenticated? %>
- <% end %>
- <% if authenticated? %>
- <% end %> - <% if !(controller_name == "sessions" && action_name == "new") %>
- <% if user && user.image %> <%= image_tag user.image.url(:thumb), :size => "32x32" %> - <% elsif !authenticated? %> - SIGN IN -
- <% end %>
<%= render :partial => 'layouts/account' %>
- <% end %> +
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 87f8829d..97da10cd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -51,19 +51,21 @@
+ <% if authenticated? %> <%= render :partial => 'layouts/upperelements' %> + <% end %> <%= yield %> -
<% if authenticated? %> - <% # for creating and pulling in topics and synapses %> - <%= render :partial => 'maps/newtopic' %> - <%= render :partial => 'maps/newsynapse' %> - <% # for populating the change metacode list on the topic card %> - <%= render :partial => 'shared/metacodeoptions' %> +
+ <% # for creating and pulling in topics and synapses %> + <%= render :partial => 'maps/newtopic' %> + <%= render :partial => 'maps/newsynapse' %> + <% # for populating the change metacode list on the topic card %> + <%= render :partial => 'shared/metacodeoptions' %> + <%= render :partial => 'layouts/lowermapelements' %> <% end %> - <%= render :partial => 'layouts/lowermapelements' %>
diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index 71dd5e5b..62affb41 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -8,22 +8,33 @@ <% content_for :title, "Home | Metamaps" %>
-
EXPERIENCE METAMAPS
-
- metamaps.cc is a free and open source platform. It enables individuals, communities, and organizations to build and visualize their shared knowledge and unlock their collective intelligence... -
- -
- REQUEST INVITE - EXPLORE FEATURED MAPS -
+
THE VALUE WEB
+ + <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { class: "loginAnywhere" }) do |f| %> +
+ <%= f.email_field :email, :placeholder => "Email" %> +
+
+ <%= f.password_field :password, :placeholder => "Password" %> +
+
<%= f.submit "SIGN IN" %>
+ <% if devise_mapping.rememberable? -%> +
+ <%= f.label :remember_me, "Stay signed in" %> + <%= f.check_box :remember_me %> +
+
+ <% end -%> +
+
+ <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> + <%= link_to "Forgot password?", new_password_path(resource_name), + :data => { :bypass => 'true'} %> + <% end -%> +
+ <% end %>
-
-
-
- Fork me on GitHub -
-
+