diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js
index dff655ce..6099fd0f 100644
--- a/app/assets/javascripts/src/Metamaps.JIT.js
+++ b/app/assets/javascripts/src/Metamaps.JIT.js
@@ -1322,9 +1322,9 @@ Metamaps.JIT = {
var disabled = authorized ? "" : "disabled";
- if (Metamaps.Active.Map) menustring += '
Hide until refresh';
- if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'Remove from map';
- if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'Delete';
+ if (Metamaps.Active.Map) menustring += 'Hide until refreshCtrl+H
';
+ if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'Remove from mapCtrl+M
';
+ if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += 'DeleteCtrl+D
';
if (Metamaps.Active.Topic) {
@@ -1337,6 +1337,8 @@ Metamaps.JIT = {
private \
';
+ menustring += '';
+
menustring += 'Change permissions' + options + '';
var metacodeOptions = $('#metacodeOptions').html();
@@ -1344,6 +1346,11 @@ Metamaps.JIT = {
menustring += 'Change metacode' + metacodeOptions + '';
}
if (Metamaps.Active.Topic) {
+
+ if (!Metamaps.Active.Mapper) {
+ menustring += '';
+ }
+
// set up the get sibling menu as a "lazy load"
// only fill in the submenu when they hover over the get siblings list item
var siblingMenu = ' \
@@ -1575,9 +1582,11 @@ Metamaps.JIT = {
var disabled = authorized ? "" : "disabled";
- if (Metamaps.Active.Map) menustring += '- Hide until refresh
';
- if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '- Remove from map
';
- if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '- Delete
';
+ if (Metamaps.Active.Map) menustring += '- Hide until refresh
Ctrl+H
';
+ if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '- Remove from map
Ctrl+M
';
+ if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '- Delete
Ctrl+D
';
+
+ if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '';
if (Metamaps.Active.Mapper) {
var permOptions = '- commons
\
diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js
index 09e3e27a..ca750473 100644
--- a/app/assets/javascripts/src/Metamaps.js
+++ b/app/assets/javascripts/src/Metamaps.js
@@ -1316,7 +1316,12 @@ Metamaps.SynapseCard = {
//if edge data is blank or just whitespace, populate it with data_nil
if ($('#edit_synapse_desc').html().trim() == '') {
- $('#edit_synapse_desc').html(data_nil);
+ if (synapse.authorizeToEdit(Metamaps.Active.Mapper)) {
+ $('#edit_synapse_desc').html(data_nil);
+ }
+ else {
+ $('#edit_synapse_desc').html("(no description)");
+ }
}
$('#edit_synapse_desc').bind("ajax:success", function () {
@@ -3537,7 +3542,9 @@ Metamaps.Listeners = {
case 69: //if e or E is pressed
if (e.ctrlKey){
e.preventDefault();
- Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
+ if (Metamaps.Active.Map) {
+ Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas);
+ }
}
break;
case 77: //if m or M is pressed
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 9d9e1abe..c51011e3 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1177,6 +1177,14 @@ h3.realtimeBoxTitle {
color: black;
box-shadow: 0px 3px 3px rgba(0,0,0,0.12), 0 3px 3px rgba(0,0,0,0.24);
}
+
+.rightclickmenu .rc-spacer {
+ width:100%;
+ height:0;
+ border-top:1px solid #EBEBEB;
+ margin: 6px 0;
+ padding: 0;
+}
.rightclickmenu > ul {
}
@@ -1199,6 +1207,14 @@ h3.realtimeBoxTitle {
background-color: transparent;
cursor: default;
}
+
+.rc-keyboard {
+ position: absolute;
+ top: 6px;
+ right: 12px;
+ color: #757575;
+}
+
.rightclickmenu > ul > li .rc-icon {
position: absolute;
top: 0;
diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css
index b09f1cb6..866ce768 100644
--- a/app/assets/stylesheets/clean.css
+++ b/app/assets/stylesheets/clean.css
@@ -704,7 +704,7 @@
/* homepage */
.homeWrapper.homeText {
- margin-top: 10%;
+ margin-top: 5%;
}
.fullWidthWrapper {