glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed capitalization issues. tidied up topic pages. added center this topic icon

Browse source
This commit is contained in:
Connor Turland 2014-03-02 16:36:18 -08:00
parent c20c3b0e54
commit 5fe3eb8f00
6 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/MMCCicon_center.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 656 B

15
app/assets/javascripts/Jit/graphsettings-event-handlers.js
View file

@ -1,12 +1,17 @@
function selectEdgeOnClickHandler(adj, e) { function selectEdgeOnClickHandler(adj, e) {
if (Mconsole.busy) return; if (Mconsole.busy) return;
// catch right click on mac, which is often like ctrl+click
if (navigator.platform.indexOf("Mac")!=-1 && e.ctrlKey) {
selectEdgeOnRightClickHandler(adj, e)
return;
}
if (synapseWasDoubleClicked()) { if (synapseWasDoubleClicked()) {
synapseDoubleClickHandler(adj, e); synapseDoubleClickHandler(adj, e);
return; return;
} }
var edgeIsSelected = MetamapsModel.selectedEdges.indexOf(adj); var edgeIsSelected = MetamapsModel.selectedEdges.indexOf(adj);
if (edgeIsSelected == -1) edgeIsSelected = false; if (edgeIsSelected == -1) edgeIsSelected = false;
else if (edgeIsSelected != -1) edgeIsSelected = true; else if (edgeIsSelected != -1) edgeIsSelected = true;
@ -50,7 +55,7 @@ function selectEdgeOnRightClickHandler(adj, e) {
var menustring = '<ul>'; var menustring = '<ul>';
if (userid != null) menustring += '<li class="rc-delete">Delete</li>'; if (userid != null) menustring += '<li class="rc-delete">Delete</li>';
if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from Map</li>'; if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from map</li>';
menustring += '<li class="rc-hide">Hide until refresh</li>'; menustring += '<li class="rc-hide">Hide until refresh</li>';
if (userid) { if (userid) {
var options = '<ul><li class="changeP toCommons">commons</li> \ var options = '<ul><li class="changeP toCommons">commons</li> \
@ -252,11 +257,11 @@ function selectNodeOnClickHandler(node, e) {
var menustring = '<ul>'; var menustring = '<ul>';
if (userid != null) menustring += '<li class="rc-delete">Delete</li>'; if (userid != null) menustring += '<li class="rc-delete">Delete</li>';
if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from Map</li>'; if (mapid && userid != null) menustring += '<li class="rc-remove">Remove from map</li>';
menustring += '<li class="rc-hide">Hide until refresh</li>'; menustring += '<li class="rc-hide">Hide until refresh</li>';
if (!mapid) menustring += '<li class="rc-center">Center This Topic</li>'; if (!mapid) menustring += '<li class="rc-center">Center this topic</li>';
menustring += '<li class="rc-popout">Open In New Tab</li>'; menustring += '<li class="rc-popout">Open in new tab</li>';
if (userid) { if (userid) {
var options = '<ul><li class="changeP toCommons">commons</li> \ var options = '<ul><li class="changeP toCommons">commons</li> \
<li class="changeP toPublic">public</li> \ <li class="changeP toPublic">public</li> \

2
app/assets/javascripts/Jit/graphsettings.js
View file

@ -167,7 +167,7 @@ function graphSettings(type, embed) {
lineWidth: 1.5 lineWidth: 1.5
} }
}; };
t.levelDistance = 400; t.levelDistance = 280;
t.Events.enableForEdges = true; t.Events.enableForEdges = true;
t.Events.onDragEnd = function(node, eventInfo, e) { t.Events.onDragEnd = function(node, eventInfo, e) {
//different because we can't go realtime //different because we can't go realtime

2
app/assets/javascripts/Jit/jit2.0.0.js
View file

@ -3156,7 +3156,7 @@ var Canvas;
this.viz = viz; this.viz = viz;
this.config = $.merge({ this.config = $.merge({
idSuffix: '-bkcanvas', idSuffix: '-bkcanvas',
levelDistance: 400, levelDistance: 280,
numberOfCircles: 4, numberOfCircles: 4,
CanvasStyles: {}, CanvasStyles: {},
offset: 0 offset: 0

3
app/assets/stylesheets/application.css
View file

@ -1326,6 +1326,9 @@ background-position: 5px 2px;
.rightclickmenu .rc-hide { .rightclickmenu .rc-hide {
background-image: url(MMCCicon_hide.png); background-image: url(MMCCicon_hide.png);
} }
.rightclickmenu .rc-center {
background-image: url(MMCCicon_center.png);
}
.rightclickmenu .rc-popout { .rightclickmenu .rc-popout {
background-image: url(MMCCicon_pop-out_black.png); background-image: url(MMCCicon_pop-out_black.png);
} }

4
app/views/topics/show.html.erb
View file

@ -18,7 +18,9 @@
<% if authenticated? %> <% if authenticated? %>
<div class="sidebarFork"> <div class="sidebarFork">
<div class="sidebarForkIcon"></div> <div class="sidebarForkIcon hoverForTip">
<div class="tip">Save As New Map</div>
</div>
<div class="sidebarForkBox"></div> <div class="sidebarForkBox"></div>
</div> </div>
<% end %> <% end %>