From ac40c0af484b1049895db2c5ac09e1acb829abf8 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 08:21:09 -0500 Subject: [PATCH 01/11] touched up tooltips --- .../icons/{Open Data => opendata_96px}/OD_API.png | Bin .../OD_Business Data.png | Bin .../OD_Cloud-hosted Data.png | Bin .../OD_Creative Commons Data.png | Bin .../OD_Data Analyst.png | Bin .../{Open Data => opendata_96px}/OD_Data Mining.png | Bin .../OD_Data Scientist.png | Bin .../icons/{Open Data => opendata_96px}/OD_Data.png | Bin .../{Open Data => opendata_96px}/OD_Database.png | Bin .../{Open Data => opendata_96px}/OD_Geolocation.png | Bin .../OD_Government Data.png | Bin .../{Open Data => opendata_96px}/OD_Hacker.png | Bin .../{Open Data => opendata_96px}/OD_Map Data.png | Bin .../{Open Data => opendata_96px}/OD_Mapper.png | Bin .../{Open Data => opendata_96px}/OD_Metadata.png | Bin .../{Open Data => opendata_96px}/OD_Open Data.png | Bin .../OD_Open Innovation.png | Bin .../{Open Data => opendata_96px}/OD_Startup.png | Bin .../{Open Data => opendata_96px}/OD_algorithm.png | Bin app/assets/stylesheets/clean.css | 6 +++++- app/views/layouts/_lowermapelements.html.erb | 2 +- app/views/layouts/_upperelements.html.erb | 4 ++-- 22 files changed, 8 insertions(+), 4 deletions(-) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_API.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Business Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Cloud-hosted Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Creative Commons Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data Analyst.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data Mining.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data Scientist.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Database.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Geolocation.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Government Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Hacker.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Map Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Mapper.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Metadata.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Open Data.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Open Innovation.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_Startup.png (100%) rename app/assets/images/icons/{Open Data => opendata_96px}/OD_algorithm.png (100%) diff --git a/app/assets/images/icons/Open Data/OD_API.png b/app/assets/images/icons/opendata_96px/OD_API.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_API.png rename to app/assets/images/icons/opendata_96px/OD_API.png diff --git a/app/assets/images/icons/Open Data/OD_Business Data.png b/app/assets/images/icons/opendata_96px/OD_Business Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Business Data.png rename to app/assets/images/icons/opendata_96px/OD_Business Data.png diff --git a/app/assets/images/icons/Open Data/OD_Cloud-hosted Data.png b/app/assets/images/icons/opendata_96px/OD_Cloud-hosted Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Cloud-hosted Data.png rename to app/assets/images/icons/opendata_96px/OD_Cloud-hosted Data.png diff --git a/app/assets/images/icons/Open Data/OD_Creative Commons Data.png b/app/assets/images/icons/opendata_96px/OD_Creative Commons Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Creative Commons Data.png rename to app/assets/images/icons/opendata_96px/OD_Creative Commons Data.png diff --git a/app/assets/images/icons/Open Data/OD_Data Analyst.png b/app/assets/images/icons/opendata_96px/OD_Data Analyst.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data Analyst.png rename to app/assets/images/icons/opendata_96px/OD_Data Analyst.png diff --git a/app/assets/images/icons/Open Data/OD_Data Mining.png b/app/assets/images/icons/opendata_96px/OD_Data Mining.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data Mining.png rename to app/assets/images/icons/opendata_96px/OD_Data Mining.png diff --git a/app/assets/images/icons/Open Data/OD_Data Scientist.png b/app/assets/images/icons/opendata_96px/OD_Data Scientist.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data Scientist.png rename to app/assets/images/icons/opendata_96px/OD_Data Scientist.png diff --git a/app/assets/images/icons/Open Data/OD_Data.png b/app/assets/images/icons/opendata_96px/OD_Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Data.png rename to app/assets/images/icons/opendata_96px/OD_Data.png diff --git a/app/assets/images/icons/Open Data/OD_Database.png b/app/assets/images/icons/opendata_96px/OD_Database.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Database.png rename to app/assets/images/icons/opendata_96px/OD_Database.png diff --git a/app/assets/images/icons/Open Data/OD_Geolocation.png b/app/assets/images/icons/opendata_96px/OD_Geolocation.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Geolocation.png rename to app/assets/images/icons/opendata_96px/OD_Geolocation.png diff --git a/app/assets/images/icons/Open Data/OD_Government Data.png b/app/assets/images/icons/opendata_96px/OD_Government Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Government Data.png rename to app/assets/images/icons/opendata_96px/OD_Government Data.png diff --git a/app/assets/images/icons/Open Data/OD_Hacker.png b/app/assets/images/icons/opendata_96px/OD_Hacker.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Hacker.png rename to app/assets/images/icons/opendata_96px/OD_Hacker.png diff --git a/app/assets/images/icons/Open Data/OD_Map Data.png b/app/assets/images/icons/opendata_96px/OD_Map Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Map Data.png rename to app/assets/images/icons/opendata_96px/OD_Map Data.png diff --git a/app/assets/images/icons/Open Data/OD_Mapper.png b/app/assets/images/icons/opendata_96px/OD_Mapper.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Mapper.png rename to app/assets/images/icons/opendata_96px/OD_Mapper.png diff --git a/app/assets/images/icons/Open Data/OD_Metadata.png b/app/assets/images/icons/opendata_96px/OD_Metadata.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Metadata.png rename to app/assets/images/icons/opendata_96px/OD_Metadata.png diff --git a/app/assets/images/icons/Open Data/OD_Open Data.png b/app/assets/images/icons/opendata_96px/OD_Open Data.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Open Data.png rename to app/assets/images/icons/opendata_96px/OD_Open Data.png diff --git a/app/assets/images/icons/Open Data/OD_Open Innovation.png b/app/assets/images/icons/opendata_96px/OD_Open Innovation.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Open Innovation.png rename to app/assets/images/icons/opendata_96px/OD_Open Innovation.png diff --git a/app/assets/images/icons/Open Data/OD_Startup.png b/app/assets/images/icons/opendata_96px/OD_Startup.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_Startup.png rename to app/assets/images/icons/opendata_96px/OD_Startup.png diff --git a/app/assets/images/icons/Open Data/OD_algorithm.png b/app/assets/images/icons/opendata_96px/OD_algorithm.png similarity index 100% rename from app/assets/images/icons/Open Data/OD_algorithm.png rename to app/assets/images/icons/opendata_96px/OD_algorithm.png diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 50177050..3461e768 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -704,6 +704,10 @@ .mapPage .infoAndHelp, .topicPage .infoAndHelp{ right: 70px; } +.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheat .tooltipsAbove { + left: 29px; +} + .infoAndHelp { position: fixed; bottom: 20px; @@ -878,7 +882,7 @@ } .openCheatsheet .tooltipsAbove { - left: 29px; + left: -4px; } .sidebarAccountIcon .tooltipsUnder { diff --git a/app/views/layouts/_lowermapelements.html.erb b/app/views/layouts/_lowermapelements.html.erb index 918b89c1..50e4296e 100644 --- a/app/views/layouts/_lowermapelements.html.erb +++ b/app/views/layouts/_lowermapelements.html.erb @@ -2,7 +2,7 @@
Capture Screenshot
Center View
Zoom In
-
Zoom In
+
Zoom Out
diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index 167641d4..3efa9cd4 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -52,7 +52,7 @@ <% if authenticated? %>
-
Save to new map
+
Save To New Map
<% end %> @@ -61,7 +61,7 @@ <% if authenticated? %> -
Create new map
+
Create New Map
<% end %> From 4e8dabba364185e4eb3e49275cf9ec9f92013fbb Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 20:21:16 -0500 Subject: [PATCH 02/11] removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code --- .buildpacks | 3 +-- Procfile | 3 +-- app/assets/javascripts/src/Metamaps.js | 4 ++-- app/assets/stylesheets/application.css | 8 +++----- app/assets/stylesheets/clean.css | 6 +++--- app/views/layouts/_lightboxes.html.erb | 2 ++ app/views/users/registrations/new.html.erb | 2 +- buildpackswithphantom.txt | 2 ++ 8 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 buildpackswithphantom.txt diff --git a/.buildpacks b/.buildpacks index 47d4c0e8..b68505fc 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,2 +1 @@ -https://github.com/heroku/heroku-buildpack-ruby.git -https://github.com/stomita/heroku-buildpack-phantomjs.git \ No newline at end of file +https://github.com/heroku/heroku-buildpack-ruby.git \ No newline at end of file diff --git a/Procfile b/Procfile index 3a5d09e8..c6cfa4cd 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1 @@ -web: bundle exec rails server -p $PORT -worker: bundle exec sidekiq -c 5 -v \ No newline at end of file +web: bundle exec rails server -p $PORT \ No newline at end of file diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 9f82b40e..8b217563 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1043,8 +1043,8 @@ Metamaps.TopicCard = { }); $(showCard).find('.best_in_place_desc').bind("ajax:success", function () { - this.innerHTML = this.innerHTML.replace(/\r/g, '') - var desc = $(this).html(); + this.innerHTML = this.innerHTML.replace(/\r/g, ''); + var desc = $(this).html() === $(this).data('nil') ? "" : $(this).html(); topic.set("desc", desc); topic.trigger('saved'); }); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1c72ee8e..cc37c590 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -141,7 +141,7 @@ input[type="submit"]:active { } .leaveSpace { display: block; - height: 50px; + height: 25px; } .hidden { display: none; @@ -2113,10 +2113,8 @@ and it won't be important on password protected instances */ padding-bottom:12px; } -#about > p, #getInvolved > p, #invite > p, #colophon p { -/* color: #000; - font-size: 16px;*/ - margin: 0px 0px 20px 0px; +#about > p, #getInvolved > p, #invite > p, #colophon p, #donate > p { + margin: 0px 0px 10px 0px; line-height: 20px; } #about ul { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 3461e768..6f8d2399 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -796,7 +796,7 @@ } .zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .takeScreenshot:hover .tooltips, .sidebarCollaborateIcon:hover .tooltipsUnder, - .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .sidebarAccountIcon:hover .tooltipsUnder, + .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .authenticated .sidebarAccountIcon:hover .tooltipsUnder, .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove { display: block; } @@ -903,11 +903,11 @@ border-bottom: 5px solid transparent; } -.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarAccountIcon div:after { +.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarAccountIcon .tooltipsUnder:after { left: 38%; } -.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon div:after { +.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after { content: ''; position: absolute; top: 128%; diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 47fbd3f0..9e6c20ce 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -158,6 +158,7 @@
<%= f.submit "Sign up!" %>
diff --git a/buildpackswithphantom.txt b/buildpackswithphantom.txt new file mode 100644 index 00000000..47d4c0e8 --- /dev/null +++ b/buildpackswithphantom.txt @@ -0,0 +1,2 @@ +https://github.com/heroku/heroku-buildpack-ruby.git +https://github.com/stomita/heroku-buildpack-phantomjs.git \ No newline at end of file From e0c9aba857bf23bc36e1f4925a79a8bc5e0751b1 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 20:54:51 -0500 Subject: [PATCH 03/11] auto sign out of uservoice --- app/assets/javascripts/src/Metamaps.GlobalUI.js | 4 ++-- app/views/layouts/application.html.erb | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js index 7f5ce542..3a52961d 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -324,7 +324,7 @@ Metamaps.GlobalUI.Account = { Metamaps.Realtime.close(); Metamaps.Filter.close(); - $('.sidebarAccountIcon div').addClass('hide'); + $('.sidebarAccountIcon .tooltipsUnder').addClass('hide'); if (!self.isOpen && !self.changing) { @@ -339,7 +339,7 @@ Metamaps.GlobalUI.Account = { close: function () { var self = Metamaps.GlobalUI.Account; - $('.sidebarAccountIcon div').removeClass('hide'); + $('.sidebarAccountIcon .tooltipsUnder').removeClass('hide'); if (!self.changing) { self.changing = true; $('.sidebarAccountBox #user_email').blur(); diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bea00881..ec4fb149 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -147,6 +147,10 @@ <% end %> +<% if !authenticated? %> + +<% end %> + <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %> From dc37b280e13e288d4fdbad92c743705eb929d2a9 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 21:03:24 -0500 Subject: [PATCH 04/11] another test for uservoice auto signout --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ec4fb149..57b5dcc2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -148,7 +148,7 @@ <% if !authenticated? %> - + <% end %> <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %> From beb05f1f39c1b8a24cce45f84c67d75fb1857579 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 21:11:51 -0500 Subject: [PATCH 05/11] another test for uservoice auto signout. this time with iframe --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 57b5dcc2..7b54e6ae 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -148,7 +148,7 @@ <% if !authenticated? %> - + <% end %> <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %> From 2cf91d39b4e50e0f02551b581397583587ce4d8a Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 14 Nov 2014 21:19:14 -0500 Subject: [PATCH 06/11] another test for uservoice auto signout. this time with iframe and json --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7b54e6ae..8b559fad 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -148,7 +148,7 @@ <% if !authenticated? %> - + <% end %> <%= render :partial => 'layouts/googleanalytics' if Rails.env.production? %> From 23d5527adcf3bcceb608ea77a0499c903aee99ed Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 15 Nov 2014 17:43:24 -0500 Subject: [PATCH 07/11] lots of little fixes --- Gemfile | 5 ----- app/assets/javascripts/src/Metamaps.js | 6 ++++-- app/assets/stylesheets/application.css | 3 +++ app/assets/stylesheets/base.css | 4 ++-- app/assets/stylesheets/clean.css | 2 +- app/controllers/main_controller.rb | 2 +- public/404.html | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 35c39e14..e21cca7e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,6 @@ gem 'rails', '3.2.17' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'phantomjs' - gem 'devise' gem 'redis' gem 'pg' @@ -19,9 +17,6 @@ gem 'rails3-jquery-autocomplete' gem 'best_in_place' #in-place editing gem 'kaminari' # pagination gem 'uservoice-ruby' -gem 'sidekiq' # worker processes -gem 'sinatra', require: false -gem 'slim' gem 'paperclip' gem 'aws-sdk' diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 8b217563..a2c88d04 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1289,7 +1289,7 @@ Metamaps.SynapseCard = { }); }, add_drop_down: function (edge, synapse) { - var list, i, synapses, l; + var list, i, synapses, l, desc; synapses = edge.getData("synapses"); l = synapses.length; @@ -1311,7 +1311,9 @@ Metamaps.SynapseCard = { list = '
    '; for (i = 0; i < l; i++) { if (synapses[i] !== synapse) { // don't add the current one to the list - list += '
  • ' + synapses[i].get('desc') + '
    • '; + desc = synapses[i].get('desc'); + desc = desc === "" || desc === null ? "(no description)" : desc; + list += '
  • ' + desc + '
    • '; } } list += '
' diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index cc37c590..c3cecf5d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1902,6 +1902,9 @@ and it won't be important on password protected instances */ color: #424242; text-align: left; } +.lightboxContent li { + list-style: none; +} .openLightbox { cursor: pointer; } diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 3cce20a2..3f7fec10 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -732,14 +732,14 @@ font-family: 'din-regular', helvetica, sans-serif; border-bottom: 1px solid #BBBBBB; } #switchSynapseList li { - padding: 8px; + padding: 8px 8px 8px 68px; cursor: pointer; font-family: 'din-regular'; font-size: 14px; line-height: 16px; } #switchSynapseList li:hover { - background: #E0E0E0; + background: #DAB539; } #edgeUser { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 6f8d2399..a19a8bfc 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -704,7 +704,7 @@ .mapPage .infoAndHelp, .topicPage .infoAndHelp{ right: 70px; } -.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheat .tooltipsAbove { +.mapPage .openCheatsheet .tooltipsAbove, .topicPage .openCheatsheet .tooltipsAbove { left: 29px; } diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index f9c7240f..873c3835 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -196,7 +196,7 @@ class MainController < ApplicationController if term && !term.empty? @synapses = Synapse.select('DISTINCT "desc"'). where('LOWER("desc") like ?', '%' + term.downcase + '%').limit(5).order('"desc"') - + render json: autocomplete_synapse_generic_json(@synapses) elsif topic1id && !topic1id.empty? diff --git a/public/404.html b/public/404.html index 0cc86728..643a5ded 100644 --- a/public/404.html +++ b/public/404.html @@ -26,14 +26,14 @@ } body { - background: #d8d9da url(shattered_@2X.png); + background: #d8d9da url(/assets/shattered_@2X.png); font-family: 'din-regular', helvetica, sans-serif; color: #424242; text-align: justify; font-size: 18px; line-height: 18px; } - .title a { + .dialog a { color:#c04f4f; } .title{ @@ -85,7 +85,7 @@ box-shadow: 0px 1px 1.5px rgba(0,0,0,0.12), 0 1px 1px rgba(0,0,0,0.24); margin: 0 auto; text-decoration: none; - color: #FFFFFF; + color: #FFFFFF !important; cursor: pointer; } From 951bd8d4a5492fa9d0e714a29b013a469d46b80a Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 16 Nov 2014 12:35:06 -0500 Subject: [PATCH 08/11] removed sidekiq leftovers. altered synapse results to only return unique --- Gemfile.lock | 27 --------------------------- app/controllers/main_controller.rb | 19 +++++++++++++++++-- config/initializers/sidekiq.rb | 9 --------- config/routes.rb | 5 ----- 4 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 config/initializers/sidekiq.rb diff --git a/Gemfile.lock b/Gemfile.lock index d89e5183..e46dfc6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,8 +41,6 @@ GEM rails (~> 3.1) builder (3.0.4) cancan (1.6.10) - celluloid (0.15.2) - timers (~> 1.1.0) climate_control (0.0.3) activesupport (>= 3.0) cocaine (0.5.4) @@ -54,7 +52,6 @@ GEM coffee-script-source execjs coffee-script-source (1.8.0) - connection_pool (2.0.0) devise (3.4.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -100,13 +97,10 @@ GEM mime-types pg (0.17.1) pg (0.17.1-x86-mingw32) - phantomjs (1.9.7.1) polyglot (0.3.5) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-protection (1.5.3) - rack rack-ssl (1.3.4) rack rack-test (0.6.2) @@ -132,8 +126,6 @@ GEM rdoc (3.12.2) json (~> 1.4) redis (3.1.0) - redis-namespace (1.5.1) - redis (~> 3.0, >= 3.0.4) responders (1.1.1) railties (>= 3.2, < 4.2) sass (3.4.5) @@ -141,29 +133,14 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - sidekiq (3.2.5) - celluloid (= 0.15.2) - connection_pool (>= 2.0.0) - json - redis (>= 3.0.6) - redis-namespace (>= 1.3.1) - sinatra (1.4.5) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - slim (2.0.3) - temple (~> 0.6.6) - tilt (>= 1.3.3, < 2.1) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - temple (0.6.8) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - timers (1.1.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -196,13 +173,9 @@ DEPENDENCIES kaminari paperclip pg - phantomjs rails (= 3.2.17) rails3-jquery-autocomplete redis sass-rails - sidekiq - sinatra - slim uglifier (>= 1.0.3) uservoice-ruby diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 873c3835..177c7f13 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -194,8 +194,23 @@ class MainController < ApplicationController topic2id = params[:topic2id] if term && !term.empty? - @synapses = Synapse.select('DISTINCT "desc"'). - where('LOWER("desc") like ?', '%' + term.downcase + '%').limit(5).order('"desc"') + @synapses = Synapse.select('DISTINCT "desc"').where('LOWER("desc") like ?', '%' + term.downcase + '%').order('"desc"') + + # remove any duplicate synapse types that just differ by + # leading or trailing whitespaces + collectedDesc = [] + @synapses.delete_if {|s| + desc = s.desc == nil || s.desc == "" ? "" : s.desc.strip + if collectedDesc.index(desc) == nil + collectedDesc.push(desc) + boolean = false + else + boolean = true + end + } + + #limit to 5 results + @synapses = @synapses.slice(0,5) render json: autocomplete_synapse_generic_json(@synapses) diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb deleted file mode 100644 index 6a2d1b9c..00000000 --- a/config/initializers/sidekiq.rb +++ /dev/null @@ -1,9 +0,0 @@ -redis_url = Rails.env.development? ? 'redis://localhost:6379/0' : ENV['REDISTOGO_URL'] - -Sidekiq.configure_server do |config| - config.redis = { :url => redis_url, :namespace => 'metamaps' } -end - -Sidekiq.configure_client do |config| - config.redis = { :url => redis_url, :namespace => 'metamaps' } -end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index f5ad183f..33532701 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,11 +1,6 @@ -require 'sidekiq/web' - Metamaps::Application.routes.draw do root to: 'main#home', via: :get - - #To debug sidekiq and monitor processes, enable this route - #mount Sidekiq::Web, at: '/sidekiq' match 'request', to: 'main#requestinvite', via: :get, as: :request From 718299613444839c4bea2d279bc4b2e46b336721 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 16 Nov 2014 12:39:41 -0500 Subject: [PATCH 09/11] removed other sidekiq stuff. --- app/models/map.rb | 13 ------------- app/workers/grab_map_screenshot_worker.rb | 10 ---------- 2 files changed, 23 deletions(-) delete mode 100644 app/workers/grab_map_screenshot_worker.rb diff --git a/app/models/map.rb b/app/models/map.rb index 91bc0a11..b5a6de09 100644 --- a/app/models/map.rb +++ b/app/models/map.rb @@ -8,8 +8,6 @@ class Map < ActiveRecord::Base has_many :topics, :through => :topicmappings has_many :synapses, :through => :synapsemappings - #after_touch :save_screenshot - # This method associates the attribute ":image" with a file attachment has_attached_file :screenshot, :styles => { :thumb => ['188x126#', :png] @@ -121,17 +119,6 @@ class Map < ActiveRecord::Base return true end - def save_screenshot - # TODO - this will grab a map every single frickin' time a map is touched - # we need a system to throttle the amount to 1/hour or something like that - # maybe have a flag - last time this map was screenshotted - # don't update if it was less than an hour ago - # except this has the issue of a user updating map 7x, and it only screenshotting after - # the first time. We only want it to screenhsot the 7th time. - # We need to store a timestamp somewhere and do processing every hour, I think. - GrabMapScreenshotWorker.perform_async(self.id) - end - def decode_base64(imgBase64) decoded_data = Base64.decode64(imgBase64) diff --git a/app/workers/grab_map_screenshot_worker.rb b/app/workers/grab_map_screenshot_worker.rb deleted file mode 100644 index b3d97e4f..00000000 --- a/app/workers/grab_map_screenshot_worker.rb +++ /dev/null @@ -1,10 +0,0 @@ -# app/workers/grab_map_screenshot_worker.rb -class GrabMapScreenshotWorker - include Sidekiq::Worker - - def perform(map_id) - imgBase64 = `phantomjs ./script/phantomjs-save-screenshot.js #{map_id} #{Rails.env}` - map = Map.find(map_id) - map.decode_base64(imgBase64) - end -end From fe5d682fc2f910b4540d9061ef159aedc7aa3ef1 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 16 Nov 2014 15:17:32 -0500 Subject: [PATCH 10/11] finished synapse autocomplete styling --- app/assets/javascripts/src/Metamaps.js | 2 +- app/assets/stylesheets/application.css | 83 ++++++++++++++++++-------- app/helpers/synapses_helper.rb | 2 +- app/views/layouts/_templates.html.erb | 6 +- 4 files changed, 62 insertions(+), 31 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index a2c88d04..5d31e22b 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -741,7 +741,7 @@ Metamaps.Create = { } }, engine: Hogan, - header: "

Existing Synapses

" + header: "

Existing synapses

" } ]); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c3cecf5d..c235ebdd 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -581,7 +581,7 @@ input[type="submit"]:active { } .new_synapse #synapse_desc, .new_synapse .tt-hint { - width: 244px; + width: 258px; background: #FFFFFF; height: 14px; margin: 0; @@ -1359,7 +1359,7 @@ float: left; #new_topic .tt-suggestion, #new_synapse .tt-suggestion { background: #F5F5F5; - width: 256px; + width: 270px; position: relative; } #new_topic .autocompleteSection { @@ -1380,9 +1380,9 @@ float: left; line-height: 14px; font-size: 14px; padding: 9px 0 9px 8px; + display: inline-block; } -#new_topic .expandTopicMetadata, -#new_synapse .expandSynapseMetadata { +#new_topic .expandTopicMetadata { display:none; width: 16px; height: 16px; @@ -1394,19 +1394,14 @@ float: left; background-position: 0 -32px; } #new_topic .tt-suggestion.tt-is-under-cursor .expandTopicMetadata, -#new_topic .tt-suggestion.tt-is-under-mouse-cursor .expandTopicMetadata, -#new_synapse .tt-suggestion.tt-is-under-cursor .expandSynapseMetadata, -#new_synapse .tt-suggestion.tt-is-under-mouse-cursor .expandSynapseMetadata { +#new_topic .tt-suggestion.tt-is-under-mouse-cursor .expandTopicMetadata { display: block; } #new_topic .tt-suggestion.tt-is-under-cursor .topicMetadata, -#new_topic .tt-suggestion.tt-is-under-mouse-cursor .topicMetadata, -#new_synapse .tt-suggestion.tt-is-under-cursor .synapseMetadata, -#new_synapse .tt-suggestion.tt-is-under-mouse-cursor .synapseMetadata { +#new_topic .tt-suggestion.tt-is-under-mouse-cursor .topicMetadata { display: block; } -#new_topic .topicMetadata, -#new_synapse .synapseMetadata { +#new_topic .topicMetadata { position: absolute; display: none; top: -18px; @@ -1417,8 +1412,7 @@ float: left; font-family: 'din-regular', helvetica, sans-serif; font-size: 14px; } -#new_topic .topicPermission, -#new_synapse .synapsePermission { +#new_topic .topicPermission { width: 32px; height: 32px; background-repeat: no-repeat; @@ -1439,8 +1433,7 @@ float: left; #new_synapse .synapsePermission.private { background-position: -32px 0; } -#new_topic .topicNumMaps, -#new_synapse .synapseNumMaps { +#new_topic .topicNumMaps { height: 14px; padding: 1px 0 1px 32px; background-image: url(metamap16.png); @@ -1458,14 +1451,12 @@ float: left; position: absolute; bottom: 10px; } -#new_topic .topicOriginatorIcon, -#new_synapse .synapseOriginatorIcon { +#new_topic .topicOriginatorIcon { position: absolute; top: 8px; right: 8px; } -#new_topic .topicOriginatorIcon img, -#new_synapse .synapseOriginatorIcon img { +#new_topic .topicOriginatorIcon img { border-radius: 12px; } #new_topic .topicOriginatorIcon:hover .tip, @@ -1493,17 +1484,59 @@ float: left; background: #F5F5F5; } #new_synapse .tt-dropdown-menu h3 { - font-family: 'vinyl', helvetica, sans-serif; - text-transform: uppercase; - font-style: italic; - font-size: 14pxpx; + font-size: 14px; line-height: 16px; - margin: 3px; + padding: 8px; + border-top: 1px solid #BFBFBF; + color: #808080; } #new_synapse .tt-suggestion .resultnoresult .synapsePermission, #new_synapse .tt-suggestion .resultnoresult .synapseOriginatorIcon { display: none; } + +#new_synapse .synapseMetadata { + width: 64px; + padding-left: 4px; + height: 32px; + position: absolute; + left: 202px; + top: 0; +} +#new_synapse .synapseOriginatorIcon { + position: absolute; + top: 4px; +} +#new_synapse .synapseOriginatorIcon .tooltips { + right: 36px; + top: -2px; +} +#new_synapse .synapseOriginatorIcon .tooltips:after { + content: ''; + position: absolute; + top: 57%; + left: 100%; + margin-top: -6px; + width: 0; + height: 0; + border-left: 4px solid #000000; + border-top: 5px solid transparent; + border-bottom: 5px solid transparent; +} +#new_synapse .synapseOriginatorIcon:hover .tooltips { + display:block; +} +#new_synapse .synapseOriginatorIcon img { + border-radius: 12px; +} +#new_synapse .synapsePermission { + position: absolute; + left: 32px; + width: 32px; + height: 32px; + background-repeat: no-repeat; + background-image: url(permissions32_sprite.png); +} /* map info box */ /* map info box */ diff --git a/app/helpers/synapses_helper.rb b/app/helpers/synapses_helper.rb index 350cb0fc..5f040e2b 100644 --- a/app/helpers/synapses_helper.rb +++ b/app/helpers/synapses_helper.rb @@ -20,7 +20,7 @@ module SynapsesHelper synapses.each do |s| synapse = {} synapse['id'] = s.id - synapse['label'] = s.desc + synapse['label'] = s.desc == nil || s.desc == "" ? "(no description)" : s.desc synapse['value'] = s.desc synapse['permission'] = s.permission synapse['mapCount'] = s.maps.count diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index cf48949b..aa0c5378 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -156,13 +156,11 @@