From 0e3486ddc555025ec3bd5eda7001fbc8975075ef Mon Sep 17 00:00:00 2001 From: Bashar Jabbour Date: Sat, 29 Nov 2014 16:27:43 -0500 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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: