Merge branch 'master' of github.com:Connoropolous/metamaps_gen002

This commit is contained in:
Connor Turland 2014-06-15 14:41:11 -04:00
commit e5ba207711

View file

@ -41,7 +41,7 @@
<% if authenticated? && controller_name == "maps" && action_name == "show" %> <% if authenticated? && controller_name == "maps" && action_name == "show" %>
<div id="csCreatingTopics"> <div id="csCreatingTopics">
<p class="sectionTitle">Creating Topics</p> <p class="sectionTitle">Creating Topics</p>
<div class="csItem"><span class="csTitle">Double-click on canvas:</span> Bring up the metacode spinner on the canvas.</div> <div class="csItem"><span class="csTitle">Double-click on canvas:</span> Bring up the metacode spinner</div>
<div class="csItem indented"><span class="csTitle">Scroll:</span> change metacode spinner selection</div> <div class="csItem indented"><span class="csTitle">Scroll:</span> change metacode spinner selection</div>
<div class="csItem indented"><span class="csTitle">Tab:</span> rotate spinner counter-clockwise</div> <div class="csItem indented"><span class="csTitle">Tab:</span> rotate spinner counter-clockwise</div>
<div class="csItem indented"><span class="csTitle">Shift + tab:</span> rotate spinner clockwise</div> <div class="csItem indented"><span class="csTitle">Shift + tab:</span> rotate spinner clockwise</div>
@ -100,7 +100,7 @@
<% if authenticated? && (controller_name == "maps" || controller_name == "topics" ) && action_name == "show" %> <% if authenticated? && (controller_name == "maps" || controller_name == "topics" ) && action_name == "show" %>
<div id="csEditingSynapses"> <div id="csEditingSynapses">
<p class="sectionTitle">Editing Synapses</p> <p class="sectionTitle">Editing Synapses</p>
<div class="csItem"><span class="csTitle">Double-click on synapse:</span> open synapse card</div> <div class="csItem"><span class="csTitle">Open synapse card:</span>double-click on synapse </div>
<div class="csItem indented"><span class="csTitle">Edit synapse description:</span> click on current description text</div> <div class="csItem indented"><span class="csTitle">Edit synapse description:</span> click on current description text</div>
<div class="csItem indented"><span class="csTitle">Save synapse description:</span> hit enter</div> <div class="csItem indented"><span class="csTitle">Save synapse description:</span> hit enter</div>
<div class="csItem indented"><span class="csTitle">Edit directionality:</span> select appropriate arrow boxes</div> <div class="csItem indented"><span class="csTitle">Edit directionality:</span> select appropriate arrow boxes</div>