From d08774d8bc5d9f1b22fb97dfe4666a23f6f267b8 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Tue, 25 Nov 2014 15:06:30 -0500 Subject: [PATCH 01/45] changed user image settings. added mapper profile page --- app/assets/images/profile_card_sprite.png | Bin 0 -> 1980 bytes .../javascripts/src/Metamaps.Backbone.js | 11 ++- .../javascripts/src/Metamaps.GlobalUI.js | 11 ++- app/assets/javascripts/src/Metamaps.Router.js | 32 ++++++-- app/assets/javascripts/src/Metamaps.Views.js | 54 ++++++++++++- app/assets/stylesheets/base.css | 75 ++++++++++++++++++ app/assets/stylesheets/clean.css | 17 ++++ app/controllers/maps_controller.rb | 21 ++--- app/controllers/users_controller.rb | 17 ++++ app/helpers/maps_helper.rb | 4 +- app/helpers/synapses_helper.rb | 2 +- app/helpers/topics_helper.rb | 2 +- app/helpers/users_helper.rb | 2 +- app/models/user.rb | 7 +- app/views/layouts/_account.html.erb | 2 +- app/views/layouts/_templates.html.erb | 21 +++++ app/views/layouts/_upperelements.html.erb | 4 +- app/views/maps/_mapinfobox.html.erb | 8 +- app/views/maps/index.html.erb | 6 ++ app/views/shared/_filterBox.html.erb | 2 +- app/views/users/edit.html.erb | 2 +- config/routes.rb | 4 +- public/famous/main.js | 39 +++++++-- 23 files changed, 294 insertions(+), 49 deletions(-) create mode 100644 app/assets/images/profile_card_sprite.png diff --git a/app/assets/images/profile_card_sprite.png b/app/assets/images/profile_card_sprite.png new file mode 100644 index 0000000000000000000000000000000000000000..2b6eb216adabae11c707798a87e0538126e9e777 GIT binary patch literal 1980 zcmV;t2SfOYP)001xu1^@s6mZ@=W00009a7bBm000XU z000XU0RWnu7ytkO8FWQhbW?9;ba!ELWdK2BZ(?O2No`?gWm08fWO;GPWjp`?2T4gp zK~#9!>|6^h+H$S_3w@^aGQ z;bD>gpggRuuAcmaj^fW;=08IN@sV!)Z8$IBisyS#56e!$@D@UqFDwH*op`AzW{O0wP z5pP|n9n0l%Y-YKjnSFkK_6^Xq5|NM(*02z zOrz>{(v?tj=)P1u5N%>&!YU?sdU~=72uT#NmL}6IL}^D1(z>boSp!?M-nwSJwG?#d zF~|qSo12?s^Yin@JGSTbTDcI~S4=YbKo}^WP^~~9)s!e{VoAu`jecqm$5R+U4()X#)~yW(a#fIOci#KdgKfMXcsqa-AO$wth{R}|zMq}ENpsU?#< zpv?E!jo7*%=??J&VUCfU?8bCdBehh3e`XqRAlLWy_GaY-y+p}K(Oh3&OBE@_F-Pd~ z&I4(8UbiChSG+;XLgA{UQ3qlqNRl1!dK;pi^#J_uuE-Ph93HkpM%l>_NQ*WWkmoZc zA0ba)v}+n2i#(xBdT+&yd==rI*a=QEh(Y6ZF8ElGWyOvtLSY(;iGeBKrVSUSx-lSn z4s`~B-xumvR00Dn+~41`ySuxuzo)0C+0@jO9~JC*nMD{zR=@^!6sJ zn%P7{dFc|>ITLv#8Pd0GQa6&oouD0cVOlKT&x`pC3b?oQ1>+JCYmhH6^$RNvqY@FL zdj)DKd_s#@{6X&rg!Fb~Zw1_}s*HT225Cbz2IOmL^tJEE*B1f3su9$Zmt_*Hm|UkS ze3GDmB~^bdC>UfSFE1~x^7!~@EjDlh79gOWJO}5yfwbXw49KS=2+bf}qP&N5q^an7 zBw|~Tc*pS6HLv%yG4ECcYX^{x1{zpYaC38GDV9n^M8vPJuhuUG&XKEUY+u0lu|h<| zletjc0e<2n2ByJdKB58lkB4)L0p7ptrhxD7@3!d|6(Apq-F2J@NZL@2h!oosq6_1dw%D&g}`2~WJ znx9DnF9e+Q@$fLc4b5mv#a@8#0qLN!3=(wV7S-aoDFMlf>60Ol?+*(ur3Lb>_+8;W zlqlGScwK|Ys~zyv+=GmCO~{87ixY4h1T;x*lQs-vE*S4&+u?Y_U;x*grdDHNg30Ed zhC)1RURX2tg!-ESHx2%41?r?8<4EOM@B}pm5?alQP}Kr z+OK1FHmA2_+b2J&2N7>R2kduPunnVgya!FqCb#d5y-|nMup9tjBXBA$&b)ZsFUh89B_ z&<%%7K|SnunRgf&6=pVNmc;MFKzY_UA&T(DRMQ$3a4$jlUQE?5kQ|?11uU?XLnu#8 zMx*L7`>@DIBHvmJ)o*Cz(=oy92apgQU00&g(8xyuk9w5fiLp^Xw5K%8b~zESXLzlL z1e35$NqBX2 0 ? (models.length < 20 ? "loadedAll" : 2) : 1; }, url: function() { - return '/explore/' + this.id + '.json'; + if (!this.mapperId) { + return '/explore/' + this.id + '.json'; + } + else { + return '/explore/mapper/' + this.mapperId + '.json'; + } }, comparator: function (a, b) { a = a.get(this.sortBy); diff --git a/app/assets/javascripts/src/Metamaps.GlobalUI.js b/app/assets/javascripts/src/Metamaps.GlobalUI.js index b93c6ab4..ce83ae80 100644 --- a/app/assets/javascripts/src/Metamaps.GlobalUI.js +++ b/app/assets/javascripts/src/Metamaps.GlobalUI.js @@ -90,9 +90,17 @@ Metamaps.GlobalUI = { if (Metamaps.Active.Mapper) Metamaps.Active.Mapper = new Metamaps.Backbone.Mapper(Metamaps.Active.Mapper); var myCollection = Metamaps.Maps.Mine ? Metamaps.Maps.Mine : []; + var mapperCollection = []; + var mapperOptionsObj = {id: 'mapper', sortBy: 'name' }; + if (Metamaps.Maps.Mapper) { + mapperCollection = Metamaps.Maps.Mapper.models; + mapperOptionsObj.mapperId = Metamaps.Maps.Mapper.id; + } var featuredCollection = Metamaps.Maps.Featured ? Metamaps.Maps.Featured : []; var activeCollection = Metamaps.Maps.Active ? Metamaps.Maps.Active : []; Metamaps.Maps.Mine = new Metamaps.Backbone.MapsCollection(myCollection, {id: 'mine', sortBy: 'name' }); + // 'Mapper' refers to another mapper + Metamaps.Maps.Mapper = new Metamaps.Backbone.MapsCollection(mapperCollection, mapperOptionsObj); Metamaps.Maps.Featured = new Metamaps.Backbone.MapsCollection(featuredCollection, {id: 'featured', sortBy: 'name' }); Metamaps.Maps.Active = new Metamaps.Backbone.MapsCollection(activeCollection, {id: 'active', sortBy: 'updated_at' }); }, @@ -600,8 +608,7 @@ Metamaps.GlobalUI.Search = { } else if (dataset == "maps") { Metamaps.Router.maps(datum.id); } else if (dataset == "mappers") { - win = window.open('/maps/mappers/' + datum.id, '_blank'); - win.focus(); + Metamaps.Router.explore("mapper", datum.id); } } }, diff --git a/app/assets/javascripts/src/Metamaps.Router.js b/app/assets/javascripts/src/Metamaps.Router.js index 466326d2..fae8f38e 100644 --- a/app/assets/javascripts/src/Metamaps.Router.js +++ b/app/assets/javascripts/src/Metamaps.Router.js @@ -6,6 +6,7 @@ routes: { "": "home", // #home "explore/:section": "explore", // #explore/active + "explore/:section/:id": "explore", // #explore/mapper/1234 "maps/:id": "maps" // #maps/7 }, home: function () { @@ -64,13 +65,18 @@ Metamaps.Active.Map = null; Metamaps.Active.Topic = null; }, - explore: function (section) { + explore: function (section, id) { // just capitalize the variable section - // either 'mine', 'featured', or 'active' + // either 'featured', 'mapper', or 'active' var capitalize = section.charAt(0).toUpperCase() + section.slice(1); - document.title = 'Explore ' + capitalize + ' Maps | Metamaps'; + if (capitalize === "featured" || capitalize === "active") { + document.title = 'Explore ' + capitalize + ' Maps | Metamaps'; + } + else if (capitalize === "mapper") { + document.title = 'Explore Maps | Metamaps'; + } $('.wrapper').removeClass('homePage mapPage topicPage'); $('.wrapper').addClass('explorePage'); @@ -78,6 +84,17 @@ Metamaps.currentSection = "explore"; Metamaps.currentPage = section; + // this will mean it's a mapper page being loaded + if (id) { + if (Metamaps.Maps.Mapper.mapperId !== id) { + // empty the collection if we are trying to load the maps + // collection of a different mapper than we had previously + Metamaps.Maps.Mapper.reset(); + Metamaps.Maps.Mapper.page = 1; + } + Metamaps.Maps.Mapper.mapperId = id; + } + Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps[capitalize] ); if (Metamaps.Maps[capitalize].length === 0) { Metamaps.Loading.show(); @@ -86,7 +103,12 @@ }, 300); // wait 300 milliseconds till the other animations are done to do the fetch } else { - Metamaps.Views.exploreMaps.render(); + if (id) { + Metamaps.Views.exploreMaps.fetchUserThenRender(); + } + else { + Metamaps.Views.exploreMaps.render(); + } } Metamaps.GlobalUI.Search.open(); @@ -96,7 +118,7 @@ Metamaps.Famous.maps.resetScroll(); // sets the scroll back to the top Metamaps.Famous.maps.show(); - Metamaps.Famous.explore.set(section); + Metamaps.Famous.explore.set(section, id); Metamaps.Famous.explore.show(); Metamaps.Famous.viz.hide(); diff --git a/app/assets/javascripts/src/Metamaps.Views.js b/app/assets/javascripts/src/Metamaps.Views.js index 3d00991e..eab536ba 100644 --- a/app/assets/javascripts/src/Metamaps.Views.js +++ b/app/assets/javascripts/src/Metamaps.Views.js @@ -5,6 +5,20 @@ Metamaps.Views.init = function () { + Metamaps.Views.MapperCard = Backbone.View.extend({ + + template: Hogan.compile( $('#mapperCardTemplate').html() ), + + tagName: "div", + + className: "mapper", + + render: function () { + this.$el.html( this.template.render(this.model) ); + return this; + } + }); + Metamaps.Views.MapCard = Backbone.View.extend({ template: Hogan.compile( $('#mapCardTemplate').html() ), @@ -40,12 +54,20 @@ Metamaps.Views.init = function () { this.listenTo(this.collection, 'successOnFetch', this.handleSuccess); this.listenTo(this.collection, 'errorOnFetch', this.handleError); }, - render: function () { + render: function (mapperObj) { var that = this; this.el.innerHTML = ""; + // in case it is a page where we have to display the mapper card + if (mapperObj) { + var view = new Metamaps.Views.MapperCard({ model: mapperObj }); + + that.el.appendChild( view.render().el ); + } + + this.collection.each(function (map) { var view = new Metamaps.Views.MapCard({ model: map }); @@ -70,15 +92,41 @@ Metamaps.Views.init = function () { Metamaps.Loading.hide(); setTimeout(function(){ - var path = Metamaps.currentSection == "" ? "" : "/explore/" + Metamaps.currentPage; + var path = Metamaps.currentSection == "" ? "" : "/explore/" + Metamaps.currentPage; + + // alter url if for mapper profile page + if (that.collection && that.collection.mapperId) { + path += "/" + that.collection.mapperId; + } + Metamaps.Router.navigate(path); }, 500); }, handleSuccess: function () { - this.render(); + var that = this; + + if (this.collection && this.collection.id === "mapper") { + this.fetchUserThenRender(); + } + else { + this.render(); + } }, handleError: function () { console.log('error loading maps!'); //TODO + }, + fetchUserThenRender: function () { + var that = this; + // first load the mapper object and then call the render function + $.ajax({ + url: "/users/" + this.collection.mapperId + "/details.json", + success: function (response) { + that.render(response); + }, + error: function () { + + } + }); } }); diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 5837e16d..2285bbe3 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -937,4 +937,79 @@ font-family: 'din-regular', helvetica, sans-serif; .sCountColor { font-family: 'din-medium', sans-serif; color: #DAB539; +} + + +/* mapper card */ + +.mapper { + float: left; + width:220px; + height:340px; + font-size: 12px; + text-align: left; + overflow: visible; + background: #E0E0E0; + border-radius:2px; + margin:16px 16px 16px 19px; + box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16); +} + +.mapperCard { + width:100%; + height:308px; + padding: 16px 0; + color:#424242; +} + +.mapperImage { + margin: 16px auto 0; + width: 96px; +} +.mapperImage img { + border-radius: 48px; + box-shadow: 0px 3px 3px rgba(0,0,0,0.23); +} + +.mapperName { + font-size: 24px; + text-align: center; + margin-top: 24px; + padding: 0 16px; + white-space: nowrap; + text-overflow: ellipsis; + width: 189px; + overflow: hidden; +} + +.mapperInfo { + color: #DB5D5D; + text-align:center; + margin-top: 16px; +} + +.mapperMetadata { + background: url(profile_card_sprite.png) no-repeat center 0; + height: 64px; + width: 160px; + margin: 16px auto 0; +} +.mapperMetadata .metadataSection { + width: 32%; + display: inline-block; + text-align: center; +} +.mapperMetadata .metadataSection div { + font-size: 16px; + color: #424242; + margin: 14px 0; +} +.mapperMetadata .metadataMaps { + color: #DB5D5D; +} +.mapperMetadata .metadataTopics { + color: #4FC059; +} +.mapperMetadata .metadataSynapses { + color: #DAB539; } \ No newline at end of file diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 28d3aac0..69a8625a 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -1074,6 +1074,23 @@ border-bottom: 2px solid #00BCD4; } +.exploreMapsButton.mapperButton { + height: 40px; + padding: 0; +} +.mapperButton img.exploreMapperImage { + float: left; + border-radius: 12px; + margin-top: 8px; + margin-right: 8px; +} +.exploreMapperName { + white-space: nowrap; + float: left; + margin-top: 12px; +} + + .exploreMapsButton .exploreMapsIcon { background-repeat: no-repeat; width:32px; diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb index 58f778d9..268093f1 100644 --- a/app/controllers/maps_controller.rb +++ b/app/controllers/maps_controller.rb @@ -6,10 +6,9 @@ class MapsController < ApplicationController autocomplete :map, :name, :full => true, :extra_data => [:user_id] - # GET /maps/recent - # GET /maps/featured - # GET /maps/new - # GET /maps/mappers/:id + # GET /explore/active + # GET /explore/featured + # GET /explore/mapper/:id def index if request.path == "/explore" @@ -19,6 +18,7 @@ class MapsController < ApplicationController @current = current_user @user = nil @maps = [] + @mapperId = nil if !params[:page] page = 1 @@ -39,21 +39,12 @@ class MapsController < ApplicationController redirect_to activemaps_url and return end # don't need to exclude private maps because they all belong to you - @maps = Map.where("maps.user_id = ?", @current.id).order("name ASC").page(page).per(20) @request = "you" - elsif request.path.index('/explore/mappers/') != nil # looking for maps by a mapper + elsif request.path.index('/explore/mapper/') != nil # looking for maps by a mapper @user = User.find(params[:id]) @maps = Map.where("maps.user_id = ? AND maps.permission != ?", @user.id, "private").order("name ASC").page(page).per(20) - @request = "other" - - elsif request.path.index('/explore/topics/') != nil # looking for maps by a certain topic they include - @topic = Topic.find(params[:id]).authorize_to_show(@current) - if !@topic - redirect_to featuredmaps_url, notice: "Access denied." and return - end - @maps = @topic.maps.delete_if {|m| m.permission == "private" && (!authenticated? || (authenticated? && @current.id != m.user_id)) } - @request = "topic" + @request = "mapper" end respond_to do |format| diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a8989bc6..58ef2d96 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -67,6 +67,23 @@ class UsersController < ApplicationController end end + # GET /users/:id/details [.json] + def details + @user = User.find(params[:id]) + + @details = Hash.new + + @details['name'] = @user.name + @details['created_at'] = @user.created_at.strftime("%m/%d/%Y") + @details['image'] = @user.image.url(:ninetysix) + @details['generation'] = @user.generation + @details['numSynapses'] = @user.synapses.count + @details['numTopics'] = @user.topics.count + @details['numMaps'] = @user.maps.count + + render json: @details + end + # PUT /user/updatemetacodes def updatemetacodes @user = current_user diff --git a/app/helpers/maps_helper.rb b/app/helpers/maps_helper.rb index de514252..0c9b3a08 100644 --- a/app/helpers/maps_helper.rb +++ b/app/helpers/maps_helper.rb @@ -18,9 +18,9 @@ module MapsHelper contributorTip = '' firstContributorImage = '/assets/user.png' if m.contributors.count > 0 - firstContributorImage = m.contributors[0].image.url(:square) + firstContributorImage = m.contributors[0].image.url(:thirtytwo) m.contributors.each_with_index do |c, index| - userImage = c.image.url(:square) + userImage = c.image.url(:thirtytwo) name = c.name contributorTip += '
  • ' + '' + name + '
    • ' end diff --git a/app/helpers/synapses_helper.rb b/app/helpers/synapses_helper.rb index a13a1be2..19286bcd 100644 --- a/app/helpers/synapses_helper.rb +++ b/app/helpers/synapses_helper.rb @@ -25,7 +25,7 @@ module SynapsesHelper synapse['permission'] = s.permission synapse['mapCount'] = s.maps.count synapse['originator'] = s.user.name - synapse['originatorImage'] = s.user.image.url(:square) + synapse['originatorImage'] = s.user.image.url(:thirtytwo) synapse['rtype'] = "synapse" temp.push synapse diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb index 6732f17e..cf0076a3 100644 --- a/app/helpers/topics_helper.rb +++ b/app/helpers/topics_helper.rb @@ -15,7 +15,7 @@ module TopicsHelper topic['mapCount'] = t.maps.count topic['synapseCount'] = t.synapses.count topic['originator'] = t.user.name - topic['originatorImage'] = t.user.image.url(:square) + topic['originatorImage'] = t.user.image.url(:thirtytwo) topic['rtype'] = "topic" temp.push topic diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index a390eb83..977e5709 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -8,7 +8,7 @@ module UsersHelper user['id'] = u.id user['label'] = u.name user['value'] = u.name - user['profile'] = u.image.url(:square) + user['profile'] = u.image.url(:sixtyfour) user['mapCount'] = u.maps.count user['generation'] = u.generation user['created_at'] = u.created_at.strftime("%m/%d/%Y") diff --git a/app/models/user.rb b/app/models/user.rb index 8596a771..11062046 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -32,7 +32,10 @@ class User < ActiveRecord::Base # This method associates the attribute ":image" with a file attachment has_attached_file :image, :styles => { - :square => ['84x84#', :png] + :thirtytwo => ['32x32#', :png], + :sixtyfour => ['64x64#', :png], + :ninetysix => ['96x96#', :png], + :onetwentyeight => ['128x128#', :png] }, :default_url => "/assets/user.png" @@ -42,7 +45,7 @@ class User < ActiveRecord::Base def as_json(options={}) { :id => self.id, :name => self.name, - :image => self.image.url(:square) + :image => self.image.url(:sixtyfour) } end diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb index b48cde3d..6150eebf 100644 --- a/app/views/layouts/_account.html.erb +++ b/app/views/layouts/_account.html.erb @@ -5,7 +5,7 @@ <% if authenticated? %> <% account = current_user %> - <%= image_tag user.image.url(:square), :size => "48x48", :class => "sidebarAccountImage" %> + <%= image_tag user.image.url(:sixtyfour), :size => "48x48", :class => "sidebarAccountImage" %>

    <%= account.name.split[0...1][0] %>

    • diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index 176556cc..9c7549d2 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -72,6 +72,27 @@ + + <% elsif authenticated? %> - <% content_for :title, "My Maps | Metamaps" %> + <% content_for :title, "Explore Active Maps | Metamaps" %>
      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 space and join the conversation! We'll expect you to follow some guidelines.

      +

      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.

      From f02aa53637d299ce55426ecdbad85a28579ca4d8 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 11:17:11 -0500 Subject: [PATCH 22/45] fixed feedback tab, added support us button --- app/assets/stylesheets/clean.css | 12 ++++++++++++ app/assets/stylesheets/uservoice.css | 4 ++-- app/views/layouts/_upperelements.html.erb | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 5b61853b..c046bbe9 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -637,6 +637,18 @@ box-shadow: 0 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16); } +.supportUs.upperRightEl { + cursor: pointer; + color: #4fc059; + font-size: 14px; + height: 14px; + margin: 9px 8px 9px 0; + display: none; +} +.homePage .supportUs, .explorePage .supportUs { + display: block; +} + .upperRightMapButtons { position: relative; top: -42px; /* puts it just offscreen */ diff --git a/app/assets/stylesheets/uservoice.css b/app/assets/stylesheets/uservoice.css index b548658f..02b92b9e 100644 --- a/app/assets/stylesheets/uservoice.css +++ b/app/assets/stylesheets/uservoice.css @@ -7,9 +7,10 @@ div.uv-icon.uv-bottom-left { background-image:url(feedback_sprite.png); + background-repeat: no-repeat; color:#FFFFFF; cursor:pointer; - height:108px; + height:110px; left:0; margin-left:0px; text-indent:-100000px; @@ -17,7 +18,6 @@ div.uv-icon.uv-bottom-left { width:25px; z-index:100000; opacity: 1; - } div.uv-icon.uv-bottom-left:hover { diff --git a/app/views/layouts/_upperelements.html.erb b/app/views/layouts/_upperelements.html.erb index b10cabb7..adb1a65e 100644 --- a/app/views/layouts/_upperelements.html.erb +++ b/app/views/layouts/_upperelements.html.erb @@ -18,6 +18,7 @@
      +
      SUPPORT US!
      <% if authenticated? %> From 6ae98169e04498e7773781a5fc640212090db9cc Mon Sep 17 00:00:00 2001 From: poietic Date: Sat, 29 Nov 2014 08:20:17 -0800 Subject: [PATCH 23/45] box shadow for lightboxes --- app/assets/stylesheets/application.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a7502895..d08260c0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1991,6 +1991,7 @@ and it won't be important on password protected instances */ height: 434px; background-color: #e0e0e0; padding: 64px 124px 64px 124px; + box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19) border-radius: 2px; } .lightboxContent h3 { From da087a4c72ff1e9c0faf28ea068637c720ad09ea Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 11:26:47 -0500 Subject: [PATCH 24/45] css for lightbox links --- app/assets/stylesheets/application.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a7502895..95c68475 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -2255,6 +2255,11 @@ and it won't be important on password protected instances */ padding-bottom:12px; } + +#getInvolved a, #donate a { + color: #c04f4f; + text-decoration: underline; +} #about > p, #getInvolved > p, #invite > p, #colophon p, #donate > p { margin: 0px 0px 10px 0px; line-height: 20px; From 0f0db1662ea90b1e0c408ddbe86b2dd03a0becc4 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 11:34:20 -0500 Subject: [PATCH 25/45] one semicolon --- app/assets/stylesheets/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a7fa56b8..14904971 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1991,7 +1991,7 @@ and it won't be important on password protected instances */ height: 434px; background-color: #e0e0e0; padding: 64px 124px 64px 124px; - box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19) + box-shadow: 0px 6px 3px rgba(0, 0, 0, 0.23), 10px 10px 10px rgba(0, 0, 0, 0.19); border-radius: 2px; } .lightboxContent h3 { From f938ffade315794bcefb5a760be98f3ea89a85d7 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 12:25:11 -0500 Subject: [PATCH 26/45] homepage changes --- app/assets/stylesheets/clean.css | 8 ++++---- app/views/main/home.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index c046bbe9..26cd9141 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -723,7 +723,7 @@ width: 100%; } .fullWidthWrapper.withVideo { - height: 350px; + height: 315px; background: #757575; } @@ -764,7 +764,7 @@ .homeWrapper .callToAction { float: left; width: 216px; - padding: 24px 0 24px 24px; + padding: 8px 0 8px 24px; color: #F5F5F5; } .callToAction h3 { @@ -794,14 +794,14 @@ } .callToAction .requestInviteCTA { background-color: #4fc059; - margin-bottom: 16px; + margin-bottom: 12px; } .callToAction .requestInviteCTA:hover { background-color: #49ad4e; } .callToAction .exploreFeaturedCTA { background-color: #a354cd; - margin-bottom: 16px; + margin-bottom: 12px; } .callToAction .exploreFeaturedCTA:hover { background-color: #9150bc; diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index 8816d34f..06fb1564 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -15,7 +15,7 @@
      - +

      Who finds it useful?

      Designers, inventors, artists, educators, strategists, consultants, facilitators, organizers, systems thinkers, changemakers, analysts, students, researchers... maybe you!

      From 453758a9ffdc7048b4a6e1b01676ae1d3bc52342 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 29 Nov 2014 15:23:53 -0500 Subject: [PATCH 27/45] use lambda to store currentPage so explore/mine doesn't get rendered incorrectly in url as explore/ --- app/assets/javascripts/src/Metamaps.Views.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.Views.js b/app/assets/javascripts/src/Metamaps.Views.js index eab536ba..36fc0d2c 100644 --- a/app/assets/javascripts/src/Metamaps.Views.js +++ b/app/assets/javascripts/src/Metamaps.Views.js @@ -91,8 +91,14 @@ Metamaps.Views.init = function () { } Metamaps.Loading.hide(); - setTimeout(function(){ - var path = Metamaps.currentSection == "" ? "" : "/explore/" + Metamaps.currentPage; + + console.log("OK current page is " + Metamaps.currentPage); + console.log(Metamaps); + setTimeout((function(localCurrentPage){ return function(){ + console.log("YEAH current page is " + Metamaps.currentPage); + console.log("YEAH current page passed is " + localCurrentPage); + console.log(Metamaps); + var path = (Metamaps.currentSection == "") ? "" : "/explore/" + localCurrentPage; // alter url if for mapper profile page if (that.collection && that.collection.mapperId) { @@ -100,7 +106,7 @@ Metamaps.Views.init = function () { } Metamaps.Router.navigate(path); - }, 500); + }})(Metamaps.currentPage), 500); }, handleSuccess: function () { var that = this; @@ -133,4 +139,4 @@ Metamaps.Views.init = function () { Metamaps.Views.exploreMaps = new mapsWrapper(); }; -})(); \ No newline at end of file +})(); From 5f347bff6785fe49444c4b8534312c12a5c4093d Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 29 Nov 2014 15:24:34 -0500 Subject: [PATCH 28/45] remove console.logs whoops --- app/assets/javascripts/src/Metamaps.Views.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.Views.js b/app/assets/javascripts/src/Metamaps.Views.js index 36fc0d2c..b56a599f 100644 --- a/app/assets/javascripts/src/Metamaps.Views.js +++ b/app/assets/javascripts/src/Metamaps.Views.js @@ -92,12 +92,7 @@ Metamaps.Views.init = function () { Metamaps.Loading.hide(); - console.log("OK current page is " + Metamaps.currentPage); - console.log(Metamaps); setTimeout((function(localCurrentPage){ return function(){ - console.log("YEAH current page is " + Metamaps.currentPage); - console.log("YEAH current page passed is " + localCurrentPage); - console.log(Metamaps); var path = (Metamaps.currentSection == "") ? "" : "/explore/" + localCurrentPage; // alter url if for mapper profile page From fe3d2808621ffe79bb342fd1d6ac5ea6f5753cb9 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 29 Nov 2014 15:29:16 -0500 Subject: [PATCH 29/45] remove console.log from Connor --- app/assets/javascripts/src/Metamaps.Router.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/src/Metamaps.Router.js b/app/assets/javascripts/src/Metamaps.Router.js index 5c5d6879..6d9e2012 100644 --- a/app/assets/javascripts/src/Metamaps.Router.js +++ b/app/assets/javascripts/src/Metamaps.Router.js @@ -225,7 +225,6 @@ if (href.attr === "") Metamaps.Router.home(); else { - console.log(segments); Metamaps.Router[segments[0]](segments[1], segments[2]); } } From 93227f0e2fd8eb70271a87edac51240cfc52d0b3 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 15:36:03 -0500 Subject: [PATCH 30/45] fixed synapse selection and removal of multiple topics bugs --- app/assets/javascripts/src/Metamaps.JIT.js | 32 ++++++++++++---------- app/assets/javascripts/src/Metamaps.js | 30 +++++--------------- 2 files changed, 25 insertions(+), 37 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js index f27bbb02..ee6068bb 100644 --- a/app/assets/javascripts/src/Metamaps.JIT.js +++ b/app/assets/javascripts/src/Metamaps.JIT.js @@ -1129,11 +1129,18 @@ Metamaps.JIT = { sY = -1 * sY; eY = -1 * eY - Metamaps.Synapses.each(function(synapse) { - var fromNodeX = synapse.get('edge').nodeFrom.pos.x; - var fromNodeY = -1 * synapse.get('edge').nodeFrom.pos.y; - var toNodeX = synapse.get('edge').nodeTo.pos.x; - var toNodeY = -1 * synapse.get('edge').nodeTo.pos.y; + var edgesToToggle = []; + Metamaps.Synapses.each(function(synapse) { + var e = synapse.get('edge'); + if (edgesToToggle.indexOf(e) === -1) { + edgesToToggle.push(e); + } + }); + edgesToToggle.forEach(function(edge) { + var fromNodeX = edge.nodeFrom.pos.x; + var fromNodeY = -1 * edge.nodeFrom.pos.y; + var toNodeX = edge.nodeTo.pos.x; + var toNodeY = -1 * edge.nodeTo.pos.y; var maxX = fromNodeX; var maxY = fromNodeY; @@ -1209,21 +1216,18 @@ Metamaps.JIT = { //The test synapse was selected! - // make sure the edge hasn't been hidden from the page - var node1id = synapse.get('edge').nodeFrom.id; - var node2id = synapse.get('edge').nodeTo.id; - var edge = Metamaps.Visualize.mGraph.graph.getAdjacence(node1id, node2id); - if(selectTest){ + if(selectTest){ + // shiftKey = toggleSelect, otherwise if(e.shiftKey){ - if(Metamaps.Selected.Edges.indexOf(synapse.get('edge')) != -1 ){ - Metamaps.Control.deselectEdge(synapse.get('edge')); + if(Metamaps.Selected.Edges.indexOf(edge) != -1 ){ + Metamaps.Control.deselectEdge(edge); } else{ - if (edge) Metamaps.Control.selectEdge(synapse.get('edge')); + Metamaps.Control.selectEdge(edge); } } else{ - if (edge) Metamaps.Control.selectEdge(synapse.get('edge')); + Metamaps.Control.selectEdge(edge); } } }); diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 5bce8987..e27d6423 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -2818,20 +2818,8 @@ Metamaps.Control = { } Metamaps.Control.deselectNode(node); - - node.setData('alpha', 0, 'end'); - node.eachAdjacency(function (adj) { - adj.setData('alpha', 0, 'end'); - }); - Metamaps.Visualize.mGraph.fx.animate({ - modes: ['node-property:alpha', - 'edge-property:alpha' - ], - duration: 500 - }); - setTimeout(function () { - Metamaps.Visualize.mGraph.graph.removeNode(nodeid); - }, 500); + Metamaps.Visualize.mGraph.graph.removeNode(nodeid); + Metamaps.Visualize.mGraph.plot(); Metamaps.Filter.checkMetacodes(); Metamaps.Filter.checkMappers(); }, @@ -2996,17 +2984,13 @@ Metamaps.Control = { hideEdge: function (edge) { var from = edge.nodeFrom.id; var to = edge.nodeTo.id; - edge.setData('alpha', 0, 'end'); Metamaps.Control.deselectEdge(edge); - Metamaps.Visualize.mGraph.fx.animate({ - modes: ['edge-property:alpha'], - duration: 500 - }); - setTimeout(function () { + if (Metamaps.Visualize.mGraph.graph.getAdjacence(from, to)) { Metamaps.Visualize.mGraph.graph.removeAdjacence(from, to); - }, 500); - Metamaps.Filter.checkSynapses(); - Metamaps.Filter.checkMappers(); + Metamaps.Visualize.mGraph.plot(); + Metamaps.Filter.checkSynapses(); + Metamaps.Filter.checkMappers(); + } }, updateSelectedPermissions: function (permission) { From 739eba71bb0ced9d6d97c1d2b00ec00fd8c0e161 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sat, 29 Nov 2014 15:51:31 -0500 Subject: [PATCH 31/45] only one router setTimeout function at a time - make it erase old functions if new one --- app/assets/javascripts/src/Metamaps.Views.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.Views.js b/app/assets/javascripts/src/Metamaps.Views.js index b56a599f..00f1b7f6 100644 --- a/app/assets/javascripts/src/Metamaps.Views.js +++ b/app/assets/javascripts/src/Metamaps.Views.js @@ -9,7 +9,7 @@ Metamaps.Views.init = function () { template: Hogan.compile( $('#mapperCardTemplate').html() ), - tagName: "div", + tagNamea: "div", className: "mapper", @@ -92,7 +92,8 @@ Metamaps.Views.init = function () { Metamaps.Loading.hide(); - setTimeout((function(localCurrentPage){ return function(){ + clearTimeout(Metamaps.routerTimeoutFunctionIds); + Metamaps.routerTimeoutId = setTimeout((function(localCurrentPage){ return function(){ var path = (Metamaps.currentSection == "") ? "" : "/explore/" + localCurrentPage; // alter url if for mapper profile page From ce3ab9903a4fe9a2debeaf6c85afc45fcfcbb353 Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sat, 29 Nov 2014 15:56:38 -0500 Subject: [PATCH 32/45] make map contributor list dropdown into links to profiles --- app/assets/javascripts/src/Metamaps.js | 8 +++++--- app/assets/stylesheets/application.css | 3 +++ app/views/maps/_mapinfobox.html.erb | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 5bce8987..6acdb68c 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -4781,6 +4781,8 @@ Metamaps.Map.InfoBox = { $('.mapContributors .tip').unbind().click(function(event){ event.stopPropagation(); }); + $('.mapContributors .tip li a').click(Metamaps.Router.intercept); + $('.mapInfoBox').unbind('.hideTip').bind('click.hideTip', function(){ $('.mapContributors .tip').hide(); }); @@ -4794,15 +4796,15 @@ Metamaps.Map.InfoBox = { var self = Metamaps.Map.InfoBox; var string = ""; - + console.log("hello!!") string += "
        "; Metamaps.Mappers.each(function(m){ - string += '
      • ' + m.get("name") + '
        • '; + string += '
      • ' + '' + m.get("name") + '
        • '; }); string += "
      "; - + console.log(string); return string; }, updateNumbers: function () { diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 14904971..f3b855fa 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1708,6 +1708,9 @@ h3.realtimeBoxTitle { color: white; } +.mapContributors .tip li a { + color: white; +} .mapContributors div:after { content: ''; position: absolute; diff --git a/app/views/maps/_mapinfobox.html.erb b/app/views/maps/_mapinfobox.html.erb index c6b3b3c9..4305b3a7 100644 --- a/app/views/maps/_mapinfobox.html.erb +++ b/app/views/maps/_mapinfobox.html.erb @@ -23,8 +23,8 @@ <% end %> <%= @map.contributors.count %>
        <% @map.contributors.each_with_index do |c, index| %> -
      • - <%= c.name %> +
      • + <%= c.name %>
        • <% end %>
      From 694d36b6a652cba0042e640a2b15e599e30f0d5f Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sat, 29 Nov 2014 16:05:56 -0500 Subject: [PATCH 33/45] ctrl+click doesn't zoom awkwardly --- app/assets/javascripts/src/Metamaps.JIT.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js index ee6068bb..51240234 100644 --- a/app/assets/javascripts/src/Metamaps.JIT.js +++ b/app/assets/javascripts/src/Metamaps.JIT.js @@ -380,11 +380,21 @@ Metamaps.JIT = { if(e.ctrlKey){ Metamaps.Visualize.mGraph.busy = false; Metamaps.Mouse.boxEndCoordinates = eventInfo.getPos(); - Metamaps.JIT.zoomToBox(e); + + var bS = Metamaps.Mouse.boxStartCoordinates; + var bE = Metamaps.Mouse.boxEndCoordinates; + if (Math.abs(bS.x - bE.x) > 20 && Math.abs(bS.y - bE.y) > 20) { + Metamaps.JIT.zoomToBox(e); + return; + } + else { + Metamaps.Mouse.boxStartCoordinates = null; + Metamaps.Mouse.boxEndCoordinates = null; + } //console.log('called zoom to box'); - return; } - else if (e.shiftKey) { + + if (e.shiftKey) { Metamaps.Visualize.mGraph.busy = false; Metamaps.Mouse.boxEndCoordinates = eventInfo.getPos(); Metamaps.JIT.selectWithBox(e); From 0e3486ddc555025ec3bd5eda7001fbc8975075ef Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sat, 29 Nov 2014 16:27:43 -0500 Subject: [PATCH 34/45] make topic card mapper icon link to mapper profile --- app/views/layouts/_templates.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index 820feb09..afd9de52 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -234,7 +234,7 @@
      {{{metacode_select}}}
      - +
      {{username}}
      From b883d03b4edf9abf2775530b77fc902359312022 Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sat, 29 Nov 2014 16:36:57 -0500 Subject: [PATCH 35/45] make synapse card mapper icon link to mapper profile --- app/assets/javascripts/src/Metamaps.js | 32 +++++++++++++++++++------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 8faaeac7..5129e209 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1394,7 +1394,7 @@ Metamaps.SynapseCard = { }, add_user_info: function (synapse) { var u = '
      '; - u += '' + u += ' ' u += '
      ' + synapse.get("user_name") + '
      '; $('#editSynLowerBar').append(u); @@ -2818,8 +2818,20 @@ Metamaps.Control = { } Metamaps.Control.deselectNode(node); - Metamaps.Visualize.mGraph.graph.removeNode(nodeid); - Metamaps.Visualize.mGraph.plot(); + + node.setData('alpha', 0, 'end'); + node.eachAdjacency(function (adj) { + adj.setData('alpha', 0, 'end'); + }); + Metamaps.Visualize.mGraph.fx.animate({ + modes: ['node-property:alpha', + 'edge-property:alpha' + ], + duration: 500 + }); + setTimeout(function () { + Metamaps.Visualize.mGraph.graph.removeNode(nodeid); + }, 500); Metamaps.Filter.checkMetacodes(); Metamaps.Filter.checkMappers(); }, @@ -2984,13 +2996,17 @@ Metamaps.Control = { hideEdge: function (edge) { var from = edge.nodeFrom.id; var to = edge.nodeTo.id; + edge.setData('alpha', 0, 'end'); Metamaps.Control.deselectEdge(edge); - if (Metamaps.Visualize.mGraph.graph.getAdjacence(from, to)) { + Metamaps.Visualize.mGraph.fx.animate({ + modes: ['edge-property:alpha'], + duration: 500 + }); + setTimeout(function () { Metamaps.Visualize.mGraph.graph.removeAdjacence(from, to); - Metamaps.Visualize.mGraph.plot(); - Metamaps.Filter.checkSynapses(); - Metamaps.Filter.checkMappers(); - } + }, 500); + Metamaps.Filter.checkSynapses(); + Metamaps.Filter.checkMappers(); }, updateSelectedPermissions: function (permission) { From 2aacd545ec3d8517c56047366d1f552197c21e3d Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sat, 29 Nov 2014 17:27:33 -0500 Subject: [PATCH 36/45] solved text bolding issue on mac --- app/assets/stylesheets/application.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f3b855fa..f4120faf 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -81,6 +81,8 @@ body { background: #d8d9da url(shattered_@2X.png); font-family: 'din-medium', helvetica, sans-serif; color: #424242; + -moz-osx-font-smoothing: grayscale; + } h1, h2, @@ -118,6 +120,7 @@ input[type="submit"] { border-radius: 2px; -webkit-user-select: none; font-family: 'din-medium', helvetica, sans-serif; + -webkit-font-smoothing: inherit; } button.button:hover, a.button:hover, From 2b7d70dfe8c83a439566f4e5316a202c22805a20 Mon Sep 17 00:00:00 2001 From: poietic Date: Sat, 29 Nov 2014 21:12:02 -0800 Subject: [PATCH 37/45] changed metacodes --- .../{gen_foresight.png => gen_aim.png} | Bin .../{gen_storyline.png => gen_story.png} | Bin .../{gen_concept.png => gen_subject.png} | Bin test/fixtures/metacodes.yml | 12 ++++++------ 4 files changed, 6 insertions(+), 6 deletions(-) rename app/assets/images/icons/generics_96px/{gen_foresight.png => gen_aim.png} (100%) rename app/assets/images/icons/generics_96px/{gen_storyline.png => gen_story.png} (100%) rename app/assets/images/icons/generics_96px/{gen_concept.png => gen_subject.png} (100%) diff --git a/app/assets/images/icons/generics_96px/gen_foresight.png b/app/assets/images/icons/generics_96px/gen_aim.png similarity index 100% rename from app/assets/images/icons/generics_96px/gen_foresight.png rename to app/assets/images/icons/generics_96px/gen_aim.png diff --git a/app/assets/images/icons/generics_96px/gen_storyline.png b/app/assets/images/icons/generics_96px/gen_story.png similarity index 100% rename from app/assets/images/icons/generics_96px/gen_storyline.png rename to app/assets/images/icons/generics_96px/gen_story.png diff --git a/app/assets/images/icons/generics_96px/gen_concept.png b/app/assets/images/icons/generics_96px/gen_subject.png similarity index 100% rename from app/assets/images/icons/generics_96px/gen_concept.png rename to app/assets/images/icons/generics_96px/gen_subject.png diff --git a/test/fixtures/metacodes.yml b/test/fixtures/metacodes.yml index 06682ed3..02ec0663 100644 --- a/test/fixtures/metacodes.yml +++ b/test/fixtures/metacodes.yml @@ -25,8 +25,8 @@ four: color: #ABB49F five: - name: Evolution - icon: /assets/icons/blueprint_96px/bp_evolution.png + name: Process + icon: /assets/icons/blueprint_96px/bp_process.png color: #BDB25E six: @@ -125,8 +125,8 @@ twenty-four: color: #CF7C74 twenty-five: - name: Concept - icon: /assets/icons/generics_96px/gen_concept.png + name: Subject + icon: /assets/icons/generics_96px/gen_subject.png color: #8293D8 twenty-six: @@ -155,8 +155,8 @@ thirty: color: #54A19D thirty-one: - name: Foresight - icon: /assets/icons/generics_96px/gen_foresight.png + name: Aim + icon: /assets/icons/generics_96px/gen_aim.png color: #B0B0B0 thirty-two: From ce7bec98ed06ac0790746bb04816e54857d7be00 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 30 Nov 2014 13:47:41 -0500 Subject: [PATCH 38/45] fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo --- app/assets/stylesheets/clean.css | 1 + app/views/main/home.html.erb | 4 ++-- public/famous/main.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 26cd9141..16d5a606 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -30,6 +30,7 @@ width: 100%; height: 100%; margin:0; + z-index: 0; } #yield { diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb index 06fb1564..918f713f 100644 --- a/app/views/main/home.html.erb +++ b/app/views/main/home.html.erb @@ -32,9 +32,9 @@
      -
      +
      - Fork me on GitHub + Fork me on GitHub