From 4db66190dae6e597f42b721691f76268ca9c80de Mon Sep 17 00:00:00 2001
From: kevinzluo <kevinz.qu@gmail.com>
Date: Sun, 9 Dec 2018 22:05:59 -0600
Subject: [PATCH 1/2] Add login modal to add activity and ask a question on
 wiki pages

---
 app/views/grids/_notes.html.erb | 55 +++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/views/grids/_notes.html.erb b/app/views/grids/_notes.html.erb
index d2f1134083..df2be15ec9 100644
--- a/app/views/grids/_notes.html.erb
+++ b/app/views/grids/_notes.html.erb
@@ -65,11 +65,30 @@
 
 <a class="grid-embed grid-embed-<%= randomSeed %>" title="Embed this table on another site."><i class="fa fa-code" style="color:#aaa;"></i></a>
 <% if type == "questions" || tagname.include?('question:') %>
-  <p><a href='/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question' class='btn btn-primary add-activity'>Ask a question</a> &nbsp;or <a href='/subscribe/tag/question:<%= tagname %>'>help answer future questions<span class='hidden-sm hidden-xs'> on this topic</span></a></p>
+  <p id = "buttons-<%= randomSeed %>"><a href='/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question' class='btn btn-primary add-activity'>Ask a question</a> &nbsp;or <a href='/subscribe/tag/question:<%= tagname %>'>help answer future questions<span class='hidden-sm hidden-xs'> on this topic</span></a></p>
+<script>
+  $(document).ready(function() {
+    console.log("ready");
+    
+    var href1 = '/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question';
+    var href2 = '/subscribe/tag/question:<%= tagname %>';
+    gridCreateAdditions('#buttons-<%= randomSeed %>', href1, href2);
+  });
+</script>
 <% elsif type == "activity" || tagname.include?('activity:') %>
-  <p><a href='/post?tags=activity:<%= tagname %>,<%= tagname %>,seeks:replications&title=How%20to%20do%20X' class='btn btn-primary add-activity'>Add an activity</a> &nbsp;or <a href='/post?tags=<%= tagname %>,question:<%= tagname %>,request:activity&template=question&title=How%20do%20I...&redirect=question' class='request-activity'>request an activity<span class='hidden-xs hidden-sm'> guide you don't see listed</span></a></p>
+  <p id = "buttons-<%= randomSeed %>"><a href='/post?tags=activity:<%= tagname %>,<%= tagname %>,seeks:replications&title=How%20to%20do%20X' class='btn btn-primary add-activity'>Add an activity</a> &nbsp;or <a href='/post?tags=<%= tagname %>,question:<%= tagname %>,request:activity&template=question&title=How%20do%20I...&redirect=question' class='request-activity'>request an activity<span class='hidden-xs hidden-sm'> guide you don't see listed</span></a></p>
   <p><i>Activities should include a materials list, costs and a step-by-step guide to construction with photos. Learn what <a href="https://publiclab.org/notes/warren/09-17-2016/what-makes-a-good-activity">makes a good activity here</a>.</i>
   </p>
+  <script>
+    $(document).ready(function() {
+      console.log("ready");
+      
+      var href1 = '/post?tags=activity:<%= tagname %>,<%= tagname %>,seeks:replications&title=How%20to%20do%20X';
+      var href2 = '/post?tags=<%= tagname %>,question:<%= tagname %>,request:activity&template=question&title=How%20do%20I...&redirect=question';
+      gridCreateAdditions('#buttons-<%= randomSeed %>', href1, href2);
+      $.getJSON(href1);
+    });
+  </script>
 <% end %>
 
 <script>
@@ -95,6 +114,38 @@
   });
   //setupGridSorters(".<%= className %>-<%= randomSeed %>"); Should order the items by time. Commented out because it reorders the items each time show more/less is clicked
 })()
+
+function gridCreateAdditions(selector, href1, href2) {
+  var current_user = $('ul.nav.navbar-nav.navbar-right').children('li:nth-of-type(2)').text().trim() !== "Login"
+  if(!current_user) {
+    
+    console.log("Button looking for:", selector);
+    if($(selector).length) console.log("something");
+    console.log('a[href="' + href1 + '"]');
+    var a1 = $(selector).find('a[href="' + href1 + '"]');
+    if(a1.length) console.log("Found a1");
+    a1.attr({
+      'href': '',
+      'data-toggle': 'modal',
+      'data-target': '#loginModal'
+    });
+    a1.on('click', function() {
+      $.getJSON(href1);
+    });
+    
+    var a2 = $(selector).find('a[href="' + href2 + '"]');
+    if(a2.length) console.log("Found a2");
+    a2.attr({
+      'href': '',
+      'data-toggle': 'modal',
+      'data-target': '#loginModal'
+    });
+    a2.on('click', function() {
+      $.getJSON(href2);
+    });
+    console.log("END-------------------");
+  }
+}
 </script>
 <style>
   a.grid-embed {

From 012fc1b72710f064b051ac00d8c6044f7f1c176c Mon Sep 17 00:00:00 2001
From: kevinzluo <kevinz.qu@gmail.com>
Date: Sun, 9 Dec 2018 22:30:41 -0600
Subject: [PATCH 2/2] Add for only question button

---
 app/views/grids/_notes.html.erb | 53 ++++++++-------------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/app/views/grids/_notes.html.erb b/app/views/grids/_notes.html.erb
index df2be15ec9..f0bea36e06 100644
--- a/app/views/grids/_notes.html.erb
+++ b/app/views/grids/_notes.html.erb
@@ -65,30 +65,17 @@
 
 <a class="grid-embed grid-embed-<%= randomSeed %>" title="Embed this table on another site."><i class="fa fa-code" style="color:#aaa;"></i></a>
 <% if type == "questions" || tagname.include?('question:') %>
-  <p id = "buttons-<%= randomSeed %>"><a href='/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question' class='btn btn-primary add-activity'>Ask a question</a> &nbsp;or <a href='/subscribe/tag/question:<%= tagname %>'>help answer future questions<span class='hidden-sm hidden-xs'> on this topic</span></a></p>
-<script>
-  $(document).ready(function() {
-    console.log("ready");
-    
-    var href1 = '/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question';
-    var href2 = '/subscribe/tag/question:<%= tagname %>';
-    gridCreateAdditions('#buttons-<%= randomSeed %>', href1, href2);
-  });
-</script>
+  <p id= "buttons-<%= randomSeed %>"><a href='/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question' class='btn btn-primary add-activity'>Ask a question</a> &nbsp;or <a href='/subscribe/tag/question:<%= tagname %>'>help answer future questions<span class='hidden-sm hidden-xs'> on this topic</span></a></p>
+  <script>
+    $(document).ready(function() {      
+      var href = '/post?tags=question:<%= tagname %>,<%= tagname %>&template=question&title=How%20do%20I...&redirect=question';
+      gridLinkModal('#buttons-<%= randomSeed %>', href);
+    });
+  </script>
 <% elsif type == "activity" || tagname.include?('activity:') %>
   <p id = "buttons-<%= randomSeed %>"><a href='/post?tags=activity:<%= tagname %>,<%= tagname %>,seeks:replications&title=How%20to%20do%20X' class='btn btn-primary add-activity'>Add an activity</a> &nbsp;or <a href='/post?tags=<%= tagname %>,question:<%= tagname %>,request:activity&template=question&title=How%20do%20I...&redirect=question' class='request-activity'>request an activity<span class='hidden-xs hidden-sm'> guide you don't see listed</span></a></p>
   <p><i>Activities should include a materials list, costs and a step-by-step guide to construction with photos. Learn what <a href="https://publiclab.org/notes/warren/09-17-2016/what-makes-a-good-activity">makes a good activity here</a>.</i>
   </p>
-  <script>
-    $(document).ready(function() {
-      console.log("ready");
-      
-      var href1 = '/post?tags=activity:<%= tagname %>,<%= tagname %>,seeks:replications&title=How%20to%20do%20X';
-      var href2 = '/post?tags=<%= tagname %>,question:<%= tagname %>,request:activity&template=question&title=How%20do%20I...&redirect=question';
-      gridCreateAdditions('#buttons-<%= randomSeed %>', href1, href2);
-      $.getJSON(href1);
-    });
-  </script>
 <% end %>
 
 <script>
@@ -115,35 +102,19 @@
   //setupGridSorters(".<%= className %>-<%= randomSeed %>"); Should order the items by time. Commented out because it reorders the items each time show more/less is clicked
 })()
 
-function gridCreateAdditions(selector, href1, href2) {
+function gridLinkModal(selector, href) {
   var current_user = $('ul.nav.navbar-nav.navbar-right').children('li:nth-of-type(2)').text().trim() !== "Login"
   if(!current_user) {
     
-    console.log("Button looking for:", selector);
-    if($(selector).length) console.log("something");
-    console.log('a[href="' + href1 + '"]');
-    var a1 = $(selector).find('a[href="' + href1 + '"]');
-    if(a1.length) console.log("Found a1");
-    a1.attr({
-      'href': '',
-      'data-toggle': 'modal',
-      'data-target': '#loginModal'
-    });
-    a1.on('click', function() {
-      $.getJSON(href1);
-    });
-    
-    var a2 = $(selector).find('a[href="' + href2 + '"]');
-    if(a2.length) console.log("Found a2");
-    a2.attr({
+    var anchor = $(selector).find('a[href="' + href + '"]');
+    anchor.attr({
       'href': '',
       'data-toggle': 'modal',
       'data-target': '#loginModal'
     });
-    a2.on('click', function() {
-      $.getJSON(href2);
+    anchor.on('click', function() {
+      $.getJSON(href);
     });
-    console.log("END-------------------");
   }
 }
 </script>