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

merge develop typekit changes

Browse source
This commit is contained in:
Connor Turland 2014-10-27 17:47:57 -04:00
parent 662f11f689 33202b5243
commit 21ebc41a02
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/layouts/application.html.erb
View file

@ -15,14 +15,8 @@
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<% if Rails.env.production? %>
<!-- for metamaps.thevalueweb.org -->
<script src="//use.typekit.net/jcy0yfj.js"></script>
<% elsif Rails.env.development? %>
<!-- for localhost development -->
<script type="text/javascript" src="//use.typekit.net/tki2nyo.js"></script>
<% end %>
<!-- to initialize all typekits -->
<!-- typekit for vinyl font -->
<script type="text/javascript" src="//use.typekit.net/tki2nyo.js"></script>
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
<!-- app code -->

29
app/views/shared/_cheatsheet.html.erb
View file

@ -22,7 +22,7 @@
<li><a href="#csSelection">Selection</a></li>
<li><a href="#csSearch">Search</a></li>
<li><a href="#csTopicView">Topic View</a></li>
<li><a href="#csKeyboardShortcuts">Keyboard Shortcuts</a></li>
</ul>
<div id="csTopicView">
@ -67,7 +67,7 @@
<span class="csTitle">Close 'Topic' card:</span> Click on canvas
</div>
<div class="csItem">
<span class="csTitle">Open 'Context Menu':</span> Right-click on topic icon
<span class="csTitle">Open 'Context Menu':</span> Right-click/alt+click on topic icon or synapse
</div>
<div class="csItem indented">*Hide/Remove/Delete topic within context menu</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425787-creating-and-editing-topics" target= "_blank">Learn More</a></div>
@ -91,7 +91,8 @@
<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">Change synapse permission:</span> Click on 'permission' icon (only for synapse creator)</div>
<div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click on Synapse</div>
<div class="csItem indented"><span class="csTitle">Browse synapses / change visible synapse</span> click on arrow icon and select desired synapse</div>
<div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click/alt-click on Synapse</div>
<div class="csItem indented">*Hide/Remove/Delete synapse within context menu</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425790-creating-and-editing-synapses" target= "_blank">Learn More</a></div>
@ -100,7 +101,7 @@
<div id="csNavigation">
<div class="csItem"><span class="csTitle">Move around Canvas:</span> Click and drag</div>
<div class="csItem"><span class="csTitle">Zoom in/out:</span> Scroll OR click on <div id="zoomIn"> </div> & <div id="zoomOut"> </div></div>
<div class="csItem"><span class="csTitle">Center Map:</span> Click <div id="centerMap"></div> OR Refresh page</div>
<div class="csItem"><span class="csTitle">Zoom to see all:</span> Click <div id="centerMap"></div> OR Ctrl + E</div>
<div class="csItem"><br><a href="http://support.metamaps.cc/knowledgebase/articles/425784-viewing-existing-maps" target= "_blank">Learn More</a></div>
</div>
@ -109,10 +110,11 @@
<div class="csItem"><span class="csTitle">Select/Deselect Topic:</span> Click on topic icon</div>
<div class="csItem"><span class="csTitle">Select/Deselect Synapse:</span> Click on synapse</div>
<div class="csItem"><span class="csTitle">Select multiple Topics/Synapses:</span> Shift + click</div>
<div class="csItem"><span class="csTitle">Make Selection box, select multiple Topics:</span> Shift + click + drag on Canvas</div>
<div class="csItem"><span class="csTitle">Move all selected Topics & Synapses:</span> Click + drag on selected Topic(s)</div>
<div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click on selected topic(s)</div>
<div class="csItem"><span class="csTitle">Make Selection box, select multiple Topics/Synapses:</span> Right-click/Shift-click + drag on Canvas</div>
<div class="csItem"><span class="csTitle">Move all selected Topics & Synapses:</span> Click + drag on selected topic(s)/synapse(s)</div>
<div class="csItem"><span class="csTitle">Open 'Context Menu':</span> Right-click/Alt-click on selected topic(s)</div>
<div class="csItem indented">*Hide/Remove/Delete/Change permissions of multiple topics & synapses within context menu</div>
<div class="csItem"><span class="csTitle">Zoom to selection box</span> Ctrl-click + drag</div>
<div class="csItem"><span class="csTitle">Deselect all topics & Synapses:</span> Click on background or Esc</div>
</div>
@ -126,6 +128,17 @@
<div class="csItem"><span class="csTitle">Search for map:</span> type "map:", then your search query. i.e. map:exploring...</div>
<div class="csItem"><span class="csTitle">Search for mapper:</span> type "mapper:", then your search query. i.e. mapper:Robert</div>
</div>
<div id="csKeyboardShortcuts">
<div class="csItem"><span class="csTitle">Ctrl + /:</span> Open 'Search' prompt</div>
<div class="csItem"><span class="csTitle">Ctrl + H:</span> Hide selection on map</div>
<div class="csItem"><span class="csTitle">Ctrl + M:</span> Remove selection from map</div>
<div class="csItem"><span class="csTitle">Ctrl + D:</span> Delete selection</div>
<div class="csItem"><span class="csTitle">Ctrl + A:</span> Select all topics</div>
<div class="csItem"><span class="csTitle">Ctrl + E:</span> See all on map (zoom to extents)</div>
<div class="csItem"><span class="csTitle">Esc (while in search):</span> Close search</div>
<div class="csItem"><span class="csTitle">Esc (with selection):</span> Deselect all</div>
</div>
</div>
<div id="tutorials">
@ -180,4 +193,4 @@
</div>
</div>
</div>