diff --git a/app/assets/images/MMCCicon_delete_black.png b/app/assets/images/MMCCicon_delete_black.png
new file mode 100644
index 00000000..017a1adf
Binary files /dev/null and b/app/assets/images/MMCCicon_delete_black.png differ
diff --git a/app/assets/images/MMCCicon_delete_grey.png b/app/assets/images/MMCCicon_delete_grey.png
new file mode 100644
index 00000000..4ba2b136
Binary files /dev/null and b/app/assets/images/MMCCicon_delete_grey.png differ
diff --git a/app/assets/images/MMCCicon_hide.png b/app/assets/images/MMCCicon_hide.png
new file mode 100644
index 00000000..80ea7276
Binary files /dev/null and b/app/assets/images/MMCCicon_hide.png differ
diff --git a/app/assets/images/MMCCicon_pop-out_black.png b/app/assets/images/MMCCicon_pop-out_black.png
new file mode 100644
index 00000000..7db39126
Binary files /dev/null and b/app/assets/images/MMCCicon_pop-out_black.png differ
diff --git a/app/assets/images/MMCCicon_remove_from_map_black.png b/app/assets/images/MMCCicon_remove_from_map_black.png
new file mode 100644
index 00000000..9ddc204f
Binary files /dev/null and b/app/assets/images/MMCCicon_remove_from_map_black.png differ
diff --git a/app/assets/images/MMCCicon_remove_from_map_grey.png b/app/assets/images/MMCCicon_remove_from_map_grey.png
new file mode 100644
index 00000000..0e863158
Binary files /dev/null and b/app/assets/images/MMCCicon_remove_from_map_grey.png differ
diff --git a/app/assets/javascripts/Jit/graphsettings-event-handlers.js b/app/assets/javascripts/Jit/graphsettings-event-handlers.js
index a11fbaa7..defdd7bb 100644
--- a/app/assets/javascripts/Jit/graphsettings-event-handlers.js
+++ b/app/assets/javascripts/Jit/graphsettings-event-handlers.js
@@ -146,6 +146,8 @@ function selectNodeOnClickHandler(node, e) {
if (Mconsole.busy) return;
+ selectNode(node);
+
// delete old right click menu
$('.rightclickmenu').remove();
// create new menu for clicked on node
@@ -155,8 +157,8 @@ function selectNodeOnClickHandler(node, e) {
// add the proper options to the menu
var menustring = '
';
- menustring += '
Delete
';
- if (mapid) menustring += '
Remove from Map
';
+ if (userid != null) menustring += '
Delete
';
+ if (mapid && userid != null) menustring += '
Remove from Map
';
menustring += '
Hide until refresh
';
menustring += '
Open In New Tab
';
diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js
index c58facd3..24cbc168 100644
--- a/app/assets/javascripts/Jit/graphsettings.js
+++ b/app/assets/javascripts/Jit/graphsettings.js
@@ -126,6 +126,9 @@ function graphSettings(type, embed) {
}//if
},
onRightClick: function (node, eventInfo, e) {
+ e.preventDefault();
+ e.stopPropagation();
+
if (node && !node.nodeFrom) {
selectNodeOnRightClickHandler(node, e);
}
@@ -200,6 +203,8 @@ function hideCards() {
$('#edit_synapse').hide();
MetamapsModel.edgecardInUse = null;
hideCurrentCard();
+ // delete right click menu
+ $('.rightclickmenu').remove();
}
// defining code to draw edges with arrows pointing in one direction
diff --git a/app/assets/javascripts/Jit/jit2.0.0.js b/app/assets/javascripts/Jit/jit2.0.0.js
index 7938a055..b09808b9 100644
--- a/app/assets/javascripts/Jit/jit2.0.0.js
+++ b/app/assets/javascripts/Jit/jit2.0.0.js
@@ -7230,10 +7230,22 @@ Graph.Label.Native = new Class({
ctx.textBaseline = node.getLabelData('textBaseline');
//START METAMAPS CODE
+
+ // helper function to determine how many lines are needed
+ // Line Splitter Function
+ // copyright Stephen Chapman, 19th April 2006
+ // you may copy this code but please keep the copyright notice as well
+ function splitLine(st,n) {var b = ''; var s = st;while (s.length > n) {var c = s.substring(0,n);var d = c.lastIndexOf(' ');var e =c.lastIndexOf('\n');if (e != -1) d = e; if (d == -1) d = n; b += c.substring(0,d) + '\n';s = s.substring(d+1);}return b+s;}
+ var arrayOfLabelLines = splitLine(node.name,30).split('\n');
//render background
ctx.fillStyle = 'rgba(255, 255, 255, 0.7)';
- var height = 25; //font size + margin
- var width = ctx.measureText(node.name).width + 8;
+ var height = 25 * arrayOfLabelLines.length; //font size + margin
+
+ var index, lineWidths = [];
+ for (index = 0; index < arrayOfLabelLines.length; ++index) {
+ lineWidths.push( ctx.measureText( arrayOfLabelLines[index] ).width )
+ }
+ var width = Math.max.apply(null, lineWidths) + 8;
var x = pos.x - width/2;
var y = pos.y + node.getData("height") + 5;
var radius = 3;
@@ -7276,7 +7288,15 @@ Graph.Label.Native = new Class({
var pos = node.pos.getc(true);
//ctx.fillText(node.name, pos.x, pos.y + node.getData("height") / 2);
// START METAMAPS CODE
- ctx.fillText(node.name, pos.x, pos.y + node.getData("height") + 5);
+ // Line Splitter Function
+ // copyright Stephen Chapman, 19th April 2006
+ // you may copy this code but please keep the copyright notice as well
+ function splitLine(st,n) {var b = ''; var s = st;while (s.length > n) {var c = s.substring(0,n);var d = c.lastIndexOf(' ');var e =c.lastIndexOf('\n');if (e != -1) d = e; if (d == -1) d = n; b += c.substring(0,d) + '\n';s = s.substring(d+1);}return b+s;}
+ var arrayOfLabelLines = splitLine(node.name,30).split('\n');
+ var index;
+ for (index = 0; index < arrayOfLabelLines.length; ++index) {
+ ctx.fillText(arrayOfLabelLines[index], pos.x, pos.y + node.getData("height") + 5 + (25*index));
+ }
// END METAMAPS CODE
},
diff --git a/app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js b/app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js
index eabc3025..a0649ea3 100644
--- a/app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js
+++ b/app/assets/javascripts/Jit/select-edit-delete-nodes-and-edges.js
@@ -427,8 +427,6 @@ function hideNode(nodeid) {
duration: 1000
});
Mconsole.graph.removeNode(nodeid);
- Mconsole.labels.disposeLabel(nodeid);
- delete Mconsole.labels.labels["" + nodeid]
}
function hideSelectedNodes() {
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 3ec38b23..43073b5c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -955,15 +955,37 @@ left: 84px;
color: black;
}
-.rightclickmenu ul li {
- list-style: none;
- padding: 2px 7px;
+.rightclickmenu > ul {
+ padding: 2px;
}
+.rightclickmenu ul li {
+ list-style: none;
+padding: 3px 45px 3px 30px;
+font-family: arial, sans-serif;
+font-size: 17px;
+line-height: 17px;
+background-repeat: no-repeat;
+background-size: 20px 20px;
+background-position: 5px 2px;
+}
.rightclickmenu ul li:hover {
- background: #e4e4e4;
+ background-color: #e4e4e4;
+ background-position: 7px 2px;
cursor:pointer;
}
+.rightclickmenu .rc-delete {
+ background-image: url(MMCCicon_delete_black.png);
+}
+.rightclickmenu .rc-remove {
+ background-image: url(MMCCicon_remove_from_map_black.png);
+}
+.rightclickmenu .rc-hide {
+ background-image: url(MMCCicon_hide.png);
+}
+.rightclickmenu .rc-popout {
+ background-image: url(MMCCicon_pop-out_black.png);
+}
.rightclickmenu p {
padding:7px;
diff --git a/public/assets/Fonts/Lato-Lig-webfont-1435188a694a7d5e29cf4a3288ff3e36.eot b/public/assets/Fonts/Lato-Lig-webfont-1435188a694a7d5e29cf4a3288ff3e36.eot
new file mode 100644
index 00000000..42265967
Binary files /dev/null and b/public/assets/Fonts/Lato-Lig-webfont-1435188a694a7d5e29cf4a3288ff3e36.eot differ
diff --git a/public/assets/Fonts/Lato-Lig-webfont-47c2912f319ae759c3b1cd558b080c33.woff b/public/assets/Fonts/Lato-Lig-webfont-47c2912f319ae759c3b1cd558b080c33.woff
new file mode 100644
index 00000000..0c337a6a
Binary files /dev/null and b/public/assets/Fonts/Lato-Lig-webfont-47c2912f319ae759c3b1cd558b080c33.woff differ
diff --git a/public/assets/Fonts/Lato-Lig-webfont-496f32fb28e2be2d6a4b41f1c7e37cc1.svg b/public/assets/Fonts/Lato-Lig-webfont-496f32fb28e2be2d6a4b41f1c7e37cc1.svg
new file mode 100644
index 00000000..e89a231a
--- /dev/null
+++ b/public/assets/Fonts/Lato-Lig-webfont-496f32fb28e2be2d6a4b41f1c7e37cc1.svg
@@ -0,0 +1,147 @@
+
+
+
\ No newline at end of file
diff --git a/public/assets/Fonts/Lato-Lig-webfont-4b8f0d5ac83e783eb84848ff3254685c.ttf b/public/assets/Fonts/Lato-Lig-webfont-4b8f0d5ac83e783eb84848ff3254685c.ttf
new file mode 100644
index 00000000..86b4e957
Binary files /dev/null and b/public/assets/Fonts/Lato-Lig-webfont-4b8f0d5ac83e783eb84848ff3254685c.ttf differ
diff --git a/public/assets/Fonts/Lato-Lig-webfont.eot b/public/assets/Fonts/Lato-Lig-webfont.eot
new file mode 100644
index 00000000..42265967
Binary files /dev/null and b/public/assets/Fonts/Lato-Lig-webfont.eot differ
diff --git a/public/assets/Fonts/Lato-Lig-webfont.svg b/public/assets/Fonts/Lato-Lig-webfont.svg
new file mode 100644
index 00000000..e89a231a
--- /dev/null
+++ b/public/assets/Fonts/Lato-Lig-webfont.svg
@@ -0,0 +1,147 @@
+
+
+
\ No newline at end of file
diff --git a/public/assets/Fonts/Lato-Lig-webfont.ttf b/public/assets/Fonts/Lato-Lig-webfont.ttf
new file mode 100644
index 00000000..86b4e957
Binary files /dev/null and b/public/assets/Fonts/Lato-Lig-webfont.ttf differ
diff --git a/public/assets/Fonts/Lato-Lig-webfont.woff b/public/assets/Fonts/Lato-Lig-webfont.woff
new file mode 100644
index 00000000..0c337a6a
Binary files /dev/null and b/public/assets/Fonts/Lato-Lig-webfont.woff differ
diff --git a/public/assets/MMCCicon_add-e907e5cd1adb7cee2cacd99aabf8ed5d.png b/public/assets/MMCCicon_add-e907e5cd1adb7cee2cacd99aabf8ed5d.png
new file mode 100644
index 00000000..fdb4045f
Binary files /dev/null and b/public/assets/MMCCicon_add-e907e5cd1adb7cee2cacd99aabf8ed5d.png differ
diff --git a/public/assets/MMCCicon_add.png b/public/assets/MMCCicon_add.png
new file mode 100644
index 00000000..fdb4045f
Binary files /dev/null and b/public/assets/MMCCicon_add.png differ
diff --git a/public/assets/MMCCicon_add_map-b6c2f61965518fcf1a48cd22d18783b5.png b/public/assets/MMCCicon_add_map-b6c2f61965518fcf1a48cd22d18783b5.png
new file mode 100644
index 00000000..af4832b7
Binary files /dev/null and b/public/assets/MMCCicon_add_map-b6c2f61965518fcf1a48cd22d18783b5.png differ
diff --git a/public/assets/MMCCicon_add_map.png b/public/assets/MMCCicon_add_map.png
new file mode 100644
index 00000000..af4832b7
Binary files /dev/null and b/public/assets/MMCCicon_add_map.png differ
diff --git a/public/assets/MMCCicon_commons-51c9d948f0f791cf52aca4e294e48975.png b/public/assets/MMCCicon_commons-51c9d948f0f791cf52aca4e294e48975.png
new file mode 100644
index 00000000..1eed3c5b
Binary files /dev/null and b/public/assets/MMCCicon_commons-51c9d948f0f791cf52aca4e294e48975.png differ
diff --git a/public/assets/MMCCicon_commons.png b/public/assets/MMCCicon_commons.png
new file mode 100644
index 00000000..1eed3c5b
Binary files /dev/null and b/public/assets/MMCCicon_commons.png differ
diff --git a/public/assets/MMCCicon_delete_black-12da9e8e5ebba4f4bdbcf0c51b7edc86.png b/public/assets/MMCCicon_delete_black-12da9e8e5ebba4f4bdbcf0c51b7edc86.png
new file mode 100644
index 00000000..017a1adf
Binary files /dev/null and b/public/assets/MMCCicon_delete_black-12da9e8e5ebba4f4bdbcf0c51b7edc86.png differ
diff --git a/public/assets/MMCCicon_delete_black.png b/public/assets/MMCCicon_delete_black.png
new file mode 100644
index 00000000..017a1adf
Binary files /dev/null and b/public/assets/MMCCicon_delete_black.png differ
diff --git a/public/assets/MMCCicon_delete_grey-139563eb178ac12911430f31c487eff6.png b/public/assets/MMCCicon_delete_grey-139563eb178ac12911430f31c487eff6.png
new file mode 100644
index 00000000..4ba2b136
Binary files /dev/null and b/public/assets/MMCCicon_delete_grey-139563eb178ac12911430f31c487eff6.png differ
diff --git a/public/assets/MMCCicon_delete_grey.png b/public/assets/MMCCicon_delete_grey.png
new file mode 100644
index 00000000..4ba2b136
Binary files /dev/null and b/public/assets/MMCCicon_delete_grey.png differ
diff --git a/public/assets/MMCCicon_filter-8dd344476ca9fb88261938acb66d2c79.png b/public/assets/MMCCicon_filter-8dd344476ca9fb88261938acb66d2c79.png
new file mode 100644
index 00000000..afb23324
Binary files /dev/null and b/public/assets/MMCCicon_filter-8dd344476ca9fb88261938acb66d2c79.png differ
diff --git a/public/assets/MMCCicon_filter.png b/public/assets/MMCCicon_filter.png
new file mode 100644
index 00000000..afb23324
Binary files /dev/null and b/public/assets/MMCCicon_filter.png differ
diff --git a/public/assets/MMCCicon_help-dfde3a342abc809a6508695a75ea9b87.png b/public/assets/MMCCicon_help-dfde3a342abc809a6508695a75ea9b87.png
new file mode 100644
index 00000000..16cd1894
Binary files /dev/null and b/public/assets/MMCCicon_help-dfde3a342abc809a6508695a75ea9b87.png differ
diff --git a/public/assets/MMCCicon_help.png b/public/assets/MMCCicon_help.png
new file mode 100644
index 00000000..16cd1894
Binary files /dev/null and b/public/assets/MMCCicon_help.png differ
diff --git a/public/assets/MMCCicon_hide-e2fcfe3fcaeef87d07322aeea2b2af37.png b/public/assets/MMCCicon_hide-e2fcfe3fcaeef87d07322aeea2b2af37.png
new file mode 100644
index 00000000..80ea7276
Binary files /dev/null and b/public/assets/MMCCicon_hide-e2fcfe3fcaeef87d07322aeea2b2af37.png differ
diff --git a/public/assets/MMCCicon_hide.png b/public/assets/MMCCicon_hide.png
new file mode 100644
index 00000000..80ea7276
Binary files /dev/null and b/public/assets/MMCCicon_hide.png differ
diff --git a/public/assets/MMCCicon_info-76fbf35e20e1bb6facb3e14254543c9c.png b/public/assets/MMCCicon_info-76fbf35e20e1bb6facb3e14254543c9c.png
new file mode 100644
index 00000000..4594cba0
Binary files /dev/null and b/public/assets/MMCCicon_info-76fbf35e20e1bb6facb3e14254543c9c.png differ
diff --git a/public/assets/MMCCicon_info.png b/public/assets/MMCCicon_info.png
new file mode 100644
index 00000000..4594cba0
Binary files /dev/null and b/public/assets/MMCCicon_info.png differ
diff --git a/public/assets/MMCCicon_invite-33ce02d3a0500b602c15e9192c3c4f66.png b/public/assets/MMCCicon_invite-33ce02d3a0500b602c15e9192c3c4f66.png
new file mode 100644
index 00000000..347ddc02
Binary files /dev/null and b/public/assets/MMCCicon_invite-33ce02d3a0500b602c15e9192c3c4f66.png differ
diff --git a/public/assets/MMCCicon_invite.png b/public/assets/MMCCicon_invite.png
new file mode 100644
index 00000000..347ddc02
Binary files /dev/null and b/public/assets/MMCCicon_invite.png differ
diff --git a/public/assets/MMCCicon_logout-2b7d4dfff8cdc4d38089c082ac0c6929.png b/public/assets/MMCCicon_logout-2b7d4dfff8cdc4d38089c082ac0c6929.png
new file mode 100644
index 00000000..5f22796f
Binary files /dev/null and b/public/assets/MMCCicon_logout-2b7d4dfff8cdc4d38089c082ac0c6929.png differ
diff --git a/public/assets/MMCCicon_logout.png b/public/assets/MMCCicon_logout.png
new file mode 100644
index 00000000..5f22796f
Binary files /dev/null and b/public/assets/MMCCicon_logout.png differ
diff --git a/public/assets/MMCCicon_map-77c3768601370ee04d15f7da448fee91.png b/public/assets/MMCCicon_map-77c3768601370ee04d15f7da448fee91.png
new file mode 100644
index 00000000..e1a61d89
Binary files /dev/null and b/public/assets/MMCCicon_map-77c3768601370ee04d15f7da448fee91.png differ
diff --git a/public/assets/MMCCicon_map.png b/public/assets/MMCCicon_map.png
new file mode 100644
index 00000000..e1a61d89
Binary files /dev/null and b/public/assets/MMCCicon_map.png differ
diff --git a/public/assets/MMCCicon_mapper-3d7a6f42563271141b72483efa7701d2.png b/public/assets/MMCCicon_mapper-3d7a6f42563271141b72483efa7701d2.png
new file mode 100644
index 00000000..0e9c3207
Binary files /dev/null and b/public/assets/MMCCicon_mapper-3d7a6f42563271141b72483efa7701d2.png differ
diff --git a/public/assets/MMCCicon_mapper.png b/public/assets/MMCCicon_mapper.png
new file mode 100644
index 00000000..0e9c3207
Binary files /dev/null and b/public/assets/MMCCicon_mapper.png differ
diff --git a/public/assets/MMCCicon_pop-out-f929f9f904f0dde84210a68980110e9b.png b/public/assets/MMCCicon_pop-out-f929f9f904f0dde84210a68980110e9b.png
new file mode 100644
index 00000000..ca3ecd45
Binary files /dev/null and b/public/assets/MMCCicon_pop-out-f929f9f904f0dde84210a68980110e9b.png differ
diff --git a/public/assets/MMCCicon_pop-out.png b/public/assets/MMCCicon_pop-out.png
new file mode 100644
index 00000000..ca3ecd45
Binary files /dev/null and b/public/assets/MMCCicon_pop-out.png differ
diff --git a/public/assets/MMCCicon_pop-out_black-a0fe60f38328f60a42e4e59472c669a2.png b/public/assets/MMCCicon_pop-out_black-a0fe60f38328f60a42e4e59472c669a2.png
new file mode 100644
index 00000000..7db39126
Binary files /dev/null and b/public/assets/MMCCicon_pop-out_black-a0fe60f38328f60a42e4e59472c669a2.png differ
diff --git a/public/assets/MMCCicon_pop-out_black.png b/public/assets/MMCCicon_pop-out_black.png
new file mode 100644
index 00000000..7db39126
Binary files /dev/null and b/public/assets/MMCCicon_pop-out_black.png differ
diff --git a/public/assets/MMCCicon_private-9de86555fbdb4a6acafb0082678c07bd.png b/public/assets/MMCCicon_private-9de86555fbdb4a6acafb0082678c07bd.png
new file mode 100644
index 00000000..50e98e18
Binary files /dev/null and b/public/assets/MMCCicon_private-9de86555fbdb4a6acafb0082678c07bd.png differ
diff --git a/public/assets/MMCCicon_private.png b/public/assets/MMCCicon_private.png
new file mode 100644
index 00000000..50e98e18
Binary files /dev/null and b/public/assets/MMCCicon_private.png differ
diff --git a/public/assets/MMCCicon_public-1f8e2ccd3461f477899c0e0adb8fe501.png b/public/assets/MMCCicon_public-1f8e2ccd3461f477899c0e0adb8fe501.png
new file mode 100644
index 00000000..37a6fd07
Binary files /dev/null and b/public/assets/MMCCicon_public-1f8e2ccd3461f477899c0e0adb8fe501.png differ
diff --git a/public/assets/MMCCicon_public.png b/public/assets/MMCCicon_public.png
new file mode 100644
index 00000000..37a6fd07
Binary files /dev/null and b/public/assets/MMCCicon_public.png differ
diff --git a/public/assets/MMCCicon_realtime_junto-9264f28a0d186ea4b0b66140bcd8ec15.png b/public/assets/MMCCicon_realtime_junto-9264f28a0d186ea4b0b66140bcd8ec15.png
new file mode 100644
index 00000000..4f687b4d
Binary files /dev/null and b/public/assets/MMCCicon_realtime_junto-9264f28a0d186ea4b0b66140bcd8ec15.png differ
diff --git a/public/assets/MMCCicon_realtime_junto.png b/public/assets/MMCCicon_realtime_junto.png
new file mode 100644
index 00000000..4f687b4d
Binary files /dev/null and b/public/assets/MMCCicon_realtime_junto.png differ
diff --git a/public/assets/MMCCicon_remove_from_map_black-b4afbba1fce0be2535c05de7a9efde1c.png b/public/assets/MMCCicon_remove_from_map_black-b4afbba1fce0be2535c05de7a9efde1c.png
new file mode 100644
index 00000000..9ddc204f
Binary files /dev/null and b/public/assets/MMCCicon_remove_from_map_black-b4afbba1fce0be2535c05de7a9efde1c.png differ
diff --git a/public/assets/MMCCicon_remove_from_map_black.png b/public/assets/MMCCicon_remove_from_map_black.png
new file mode 100644
index 00000000..9ddc204f
Binary files /dev/null and b/public/assets/MMCCicon_remove_from_map_black.png differ
diff --git a/public/assets/MMCCicon_remove_from_map_grey-5219f9314ed14579f8cd553d9e09db87.png b/public/assets/MMCCicon_remove_from_map_grey-5219f9314ed14579f8cd553d9e09db87.png
new file mode 100644
index 00000000..0e863158
Binary files /dev/null and b/public/assets/MMCCicon_remove_from_map_grey-5219f9314ed14579f8cd553d9e09db87.png differ
diff --git a/public/assets/MMCCicon_remove_from_map_grey.png b/public/assets/MMCCicon_remove_from_map_grey.png
new file mode 100644
index 00000000..0e863158
Binary files /dev/null and b/public/assets/MMCCicon_remove_from_map_grey.png differ
diff --git a/public/assets/MMCCicon_save_layout-c04a236e34eb85fced16fd4f3e05ed86.png b/public/assets/MMCCicon_save_layout-c04a236e34eb85fced16fd4f3e05ed86.png
new file mode 100644
index 00000000..d163dfb5
Binary files /dev/null and b/public/assets/MMCCicon_save_layout-c04a236e34eb85fced16fd4f3e05ed86.png differ
diff --git a/public/assets/MMCCicon_save_layout.png b/public/assets/MMCCicon_save_layout.png
new file mode 100644
index 00000000..d163dfb5
Binary files /dev/null and b/public/assets/MMCCicon_save_layout.png differ
diff --git a/public/assets/MMCCicon_save_new_map-bacfc82d1c0dc4b5799c3e1fcbc71a61.png b/public/assets/MMCCicon_save_new_map-bacfc82d1c0dc4b5799c3e1fcbc71a61.png
new file mode 100644
index 00000000..9138e632
Binary files /dev/null and b/public/assets/MMCCicon_save_new_map-bacfc82d1c0dc4b5799c3e1fcbc71a61.png differ
diff --git a/public/assets/MMCCicon_save_new_map.png b/public/assets/MMCCicon_save_new_map.png
new file mode 100644
index 00000000..9138e632
Binary files /dev/null and b/public/assets/MMCCicon_save_new_map.png differ
diff --git a/public/assets/MMCCicon_settings-b80201e3f081378771338f2a37afc64b.png b/public/assets/MMCCicon_settings-b80201e3f081378771338f2a37afc64b.png
new file mode 100644
index 00000000..ae56c5a9
Binary files /dev/null and b/public/assets/MMCCicon_settings-b80201e3f081378771338f2a37afc64b.png differ
diff --git a/public/assets/MMCCicon_settings.png b/public/assets/MMCCicon_settings.png
new file mode 100644
index 00000000..ae56c5a9
Binary files /dev/null and b/public/assets/MMCCicon_settings.png differ
diff --git a/public/assets/MMCCicon_synapse-ddb1ae0d586aa9b787244b3648bde538.png b/public/assets/MMCCicon_synapse-ddb1ae0d586aa9b787244b3648bde538.png
new file mode 100644
index 00000000..9fea87f0
Binary files /dev/null and b/public/assets/MMCCicon_synapse-ddb1ae0d586aa9b787244b3648bde538.png differ
diff --git a/public/assets/MMCCicon_synapse.png b/public/assets/MMCCicon_synapse.png
new file mode 100644
index 00000000..9fea87f0
Binary files /dev/null and b/public/assets/MMCCicon_synapse.png differ
diff --git a/public/assets/MMCCicon_topic-f3343e0b8ed9c74cd084e65a9a2ae9a8.png b/public/assets/MMCCicon_topic-f3343e0b8ed9c74cd084e65a9a2ae9a8.png
new file mode 100644
index 00000000..90457c0b
Binary files /dev/null and b/public/assets/MMCCicon_topic-f3343e0b8ed9c74cd084e65a9a2ae9a8.png differ
diff --git a/public/assets/MMCCicon_topic.png b/public/assets/MMCCicon_topic.png
new file mode 100644
index 00000000..90457c0b
Binary files /dev/null and b/public/assets/MMCCicon_topic.png differ
diff --git a/public/assets/MMCCicon_wand-2881f819fcbe04f787bf5d781f302cbc.png b/public/assets/MMCCicon_wand-2881f819fcbe04f787bf5d781f302cbc.png
new file mode 100644
index 00000000..409d1948
Binary files /dev/null and b/public/assets/MMCCicon_wand-2881f819fcbe04f787bf5d781f302cbc.png differ
diff --git a/public/assets/MMCCicon_wand.png b/public/assets/MMCCicon_wand.png
new file mode 100644
index 00000000..409d1948
Binary files /dev/null and b/public/assets/MMCCicon_wand.png differ
diff --git a/public/assets/WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf b/public/assets/WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf
new file mode 100644
index 00000000..20a451f5
Binary files /dev/null and b/public/assets/WebSocketMain-0de980edb45e36785bf9d862baa032bb.swf differ
diff --git a/public/assets/WebSocketMain.swf b/public/assets/WebSocketMain.swf
new file mode 100644
index 00000000..20a451f5
Binary files /dev/null and b/public/assets/WebSocketMain.swf differ
diff --git a/public/assets/WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf b/public/assets/WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf
new file mode 100644
index 00000000..5949ff3d
Binary files /dev/null and b/public/assets/WebSocketMainInsecure-c4377647e57e58cacc692c8a51afc9f8.swf differ
diff --git a/public/assets/WebSocketMainInsecure.swf b/public/assets/WebSocketMainInsecure.swf
new file mode 100644
index 00000000..5949ff3d
Binary files /dev/null and b/public/assets/WebSocketMainInsecure.swf differ
diff --git a/public/assets/account_icon-accfe0ae2fc05f59f0459bb5da3d92a3.png b/public/assets/account_icon-accfe0ae2fc05f59f0459bb5da3d92a3.png
new file mode 100644
index 00000000..403c656d
Binary files /dev/null and b/public/assets/account_icon-accfe0ae2fc05f59f0459bb5da3d92a3.png differ
diff --git a/public/assets/account_icon.png b/public/assets/account_icon.png
new file mode 100644
index 00000000..403c656d
Binary files /dev/null and b/public/assets/account_icon.png differ
diff --git a/public/assets/action-abd8f2e892ebe608b9112249167fb64e.png b/public/assets/action-abd8f2e892ebe608b9112249167fb64e.png
new file mode 100644
index 00000000..1903ba8d
Binary files /dev/null and b/public/assets/action-abd8f2e892ebe608b9112249167fb64e.png differ
diff --git a/public/assets/action.png b/public/assets/action.png
new file mode 100644
index 00000000..1903ba8d
Binary files /dev/null and b/public/assets/action.png differ
diff --git a/public/assets/activity-d115f352e27307a6f15b34bde2c23a5e.png b/public/assets/activity-d115f352e27307a6f15b34bde2c23a5e.png
new file mode 100644
index 00000000..a76c3b3e
Binary files /dev/null and b/public/assets/activity-d115f352e27307a6f15b34bde2c23a5e.png differ
diff --git a/public/assets/activity.png b/public/assets/activity.png
new file mode 100644
index 00000000..a76c3b3e
Binary files /dev/null and b/public/assets/activity.png differ
diff --git a/public/assets/application-360c6083a16b5cd18ed968ac99bcab71.js b/public/assets/application-360c6083a16b5cd18ed968ac99bcab71.js
new file mode 100644
index 00000000..db3e23d9
--- /dev/null
+++ b/public/assets/application-360c6083a16b5cd18ed968ac99bcab71.js
@@ -0,0 +1,31 @@
+/*!
+ * jQuery JavaScript Library v1.8.1
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: Thu Aug 30 2012 17:17:22 GMT-0400 (Eastern Daylight Time)
+ */
+function BestInPlaceEditor(e){this.element=e,this.initOptions(),this.bindForm(),this.initNil(),jQuery(this.activator).bind("click",{editor:this},this.clickHandler)}function openAnalyze(){analyzeOpen=!0,findOpen&&closeFind(),organizeOpen&&closeOrganize(),$("#sideOptionFind").css("z-index","8"),$("#sideOptionAnalyze, #closeAnalyze").css("z-index","10"),$("#sideOptionOrganize").css("z-index","8"),$("#sideOptionAnalyze").animate({width:"100px",height:"76px"},100),$("#closeAnalyze").css("display","block"),$("#sideOptionAnalyze").css("cursor","default");var e=Object.keys(Mconsole.graph.nodes).length,t=0;Mconsole.graph.eachNode(function(e){e.eachAdjacency(function(){t++})}),t/=2,$(".analysis").html("
",n.innerHTML=r,$(n).css({left:t.clientX,top:t.clientY}),$("#wrapper").append(n),$(".rc-delete").click(function(){$(".rightclickmenu").remove();var e=MetamapsModel.selectedNodes.length,t=MetamapsModel.selectedEdges.length,n=e==1?"1 topic":e+" topics",r=t==1?"1 synapse":t+" synapses",i="You have "+n+" and "+r+" selected. ",s=confirm(i+"Are you sure you want to permanently delete them all? This will remove them from all maps they appear on.");s==1&&(deleteSelectedEdges(),deleteSelectedNodes())}),$(".rc-remove").click(function(){$(".rightclickmenu").remove(),hideSelectedEdges(),hideSelectedNodes()}),$(".rc-hide").click(function(){$(".rightclickmenu").remove(),hideSelectedEdges(),hideSelectedNodes()}),$(".rc-popout").click(function(){$(".rightclickmenu").remove();var t=window.open("/topics/"+e.id,"_blank");t.focus()})}function canvasDoubleClickHandler(e,t){var n=MetamapsModel.lastCanvasClick,r=Date.now();MetamapsModel.lastCanvasClick=r,r-n=Mconsole.canvas.scaleOffsetX*d&&Mconsole.canvas.scaleOffsetX*d>=1&&Mconsole.canvas.scale(d,d),Mconsole.canvas.scaleOffsetX<.5?Mconsole.canvas.viz.labels.hideLabels(!0):Mconsole.canvas.scaleOffsetX>.5&&Mconsole.canvas.viz.labels.hideLabels(!1),lastDist=p}}function graphSettings(e,t){var n={injectInto:"infovis",Navigation:{enable:!0,panning:"avoid nodes",zooming:28},Node:{overridable:!0,color:"#2D6A5D",type:"customNode",dim:25},Edge:{overridable:!0,color:"#222222",type:"customEdge",lineWidth:2,alpha:.4},Label:{type:"Native",size:20,family:"arial",textBaseline:"hanging",color:"#000"},Tips:{enable:!1,onShow:function(e,t){}},Events:{enable:!0,enableForEdges:!0,onMouseMove:function(e,t,n){onMouseMoveHandler(e,t,n)},onDragMove:function(e,t,n){onDragMoveTopicHandler(e,t,n)},onDragEnd:function(e,t,n){onDragEndTopicHandler(e,t,n,!1)},onDragCancel:function(e,t,n){onDragCancelHandler(e,t,n,!1)},onTouchStart:function(e,t,n){Mconsole.events.touched=!0,touchPos=t.getPos();var r=Mconsole.canvas,i=r.translateOffsetX;oy=r.translateOffsetY,sx=r.scaleOffsetX,sy=r.scaleOffsetY,touchPos.x*=sx,touchPos.y*=sy,touchPos.x+=i,touchPos.y+=oy,touchDragNode=e},onTouchMove:function(e,t,n){touchDragNode?onDragMoveTopicHandler(touchDragNode,t,n):(touchPanZoomHandler(t,n),Mconsole.labels.hideLabel(Mconsole.graph.getNode(MetamapsModel.showcardInUse)))},onTouchEnd:function(e,t,n){},onTouchCancel:function(e,t,n){},onClick:function(e,t,n){if(MetamapsModel.boxStartCoordinates){Mconsole.busy=!1,MetamapsModel.boxEndCoordinates=t.getPos(),selectNodesWithBox();return}if(n.target.id!="infovis-canvas")return!1;e.nodeFrom?selectEdgeOnClickHandler(e,n):e&&!e.nodeFrom?selectNodeOnClickHandler(e,n):(MetamapsModel.didPan||hideCards(),canvasDoubleClickHandler(t.getPos(),n))},onRightClick:function(e,t,n){n.preventDefault(),n.stopPropagation(),e&&!e.nodeFrom?selectNodeOnRightClickHandler(e,n):e&&e.nodeFrom}},iterations:200,levelDistance:200};return t&&(n.Edge.type="customEdgeEmbed"),e=="centered"&&(n.background={CanvasStyles:{strokeStyle:"#333",lineWidth:1.5}},n.levelDistance=400,n.Events.enableForEdges=!0,n.Events.onDragEnd=function(e,t,n){onDragEndTopicHandler(e,t,n,!1)},n.Events.onDragCancel=function(e,t,n){onDragCancelHandler(e,t,n,!0)}),n}function hideCards(){$("#edit_synapse").hide(),MetamapsModel.edgecardInUse=null,hideCurrentCard(),$(".rightclickmenu").remove()}function drawSelectBox(e,t){Mconsole.plot();var n=Mconsole.canvas.getCtx(),r=MetamapsModel.boxStartCoordinates.x,i=MetamapsModel.boxStartCoordinates.y,s=e.getPos().x,o=e.getPos().y;Mconsole.plot(),n.beginPath(),n.moveTo(r,i),n.lineTo(r,o),n.lineTo(s,o),n.lineTo(s,i),n.lineTo(r,i),n.strokeStyle="black",n.stroke()}function selectNodesWithBox(){var e=MetamapsModel.boxStartCoordinates.x,t=MetamapsModel.boxStartCoordinates.y,n=MetamapsModel.boxEndCoordinates.x,r=MetamapsModel.boxEndCoordinates.y;Mconsole.graph.eachNode(function(i){var s=gType=="centered"?i.pos.toComplex().x:i.pos.x,o=gType=="centered"?i.pos.toComplex().y:i.pos.y;if(es&&s>n&&t>o&&o>r||e>s&&s>n&&to&&o>r){var u=MetamapsModel.selectedNodes.indexOf(i);u==-1?selectNode(i):u!=-1&&deselectNode(i)}}),MetamapsModel.boxStartCoordinates=!1,MetamapsModel.boxEndCoordinates=!1,Mconsole.plot()}function onMouseMoveHandler(e,t,n){if(Mconsole.busy)return;var e=t.getNode(),r=t.getEdge();if(e!=0){MetamapsModel.edgeHoveringOver&&onMouseLeave(MetamapsModel.edgeHoveringOver);return}r==0&&MetamapsModel.edgeHoveringOver!=0?onMouseLeave(MetamapsModel.edgeHoveringOver):r!=0&&MetamapsModel.edgeHoveringOver==0?onMouseEnter(r):r!=0&&MetamapsModel.edgeHoveringOver!=r&&(onMouseLeave(MetamapsModel.edgeHoveringOver),onMouseEnter(r)),MetamapsModel.edgeHoveringOver=r}function onMouseEnter(e){$("canvas").css("cursor","pointer");var t=MetamapsModel.selectedEdges.indexOf(e);t==-1&&(e.setData("showDesc",!0,"current"),e.setDataset("end",{lineWidth:4,alpha:1}),Mconsole.fx.animate({modes:["edge-property:lineWidth:color:alpha"],duration:100}),Mconsole.plot())}function onMouseLeave(e){$("canvas").css("cursor","default");var t=MetamapsModel.selectedEdges.indexOf(e);t==-1&&(e.setData("showDesc",!1,"current"),e.setDataset("end",{lineWidth:2,alpha:.4}),Mconsole.fx.animate({modes:["edge-property:lineWidth:color:alpha"],duration:100})),Mconsole.plot()}function onDragEndTopicHandler(e,t,n,r){if(tempInit&&tempNode2==null)$("#topic_addSynapse").val("true"),$("#new_topic").fadeIn("fast"),addMetacode(),$("#topic_name").focus();else if(tempInit&&tempNode2!=null)$("#topic_addSynapse").val("false"),$("#synapse_topic1id").val(tempNode.id),$("#synapse_topic2id").val(tempNode2.id),$("#new_synapse").fadeIn("fast"),$("#synapse_desc").focus(),tempNode=null,tempNode2=null,tempInit=!1;else if(dragged!=0&&goRealtime){saveLayout(dragged);for(var i=0;i