diff --git a/.gitignore b/.gitignore index cf3d59bc..cd683d45 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ db/*.sqlite3 # Ignore all logfiles and tempfiles. log/*.log tmp + +.DS_Store \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8eaea083..f7a3ba5a 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -2050,20 +2050,65 @@ float: left; } #cheatSheet .csItem { margin: 5px 0; - font-size: 15px; + font-size: 14px; line-height: 18px; + font-family: 'din-regular'; } + +#cheatSheet .csItem a { + color: #c04f4f; +} + #cheatSheet .csItem img { display: inline-block; - margin: 0 2px; + margin-bottom: 10px; } #cheatSheet .csTitle { + font-weight: bold; + } #cheatSheet .indented { margin-left: 15px; } +#zoomIn { + background: #424242 url(zoom_sprite.png) no-repeat; + width: 22px; + height: 22px; + display: inline-block; + background-position: -37px -5px; + border-radius: 2px; + margin: 0 4px; + position: relative; + top: 3px; +} + +#zoomOut { + background: #424242 url(zoom_sprite.png) no-repeat; + width: 22px; + height: 22px; + display: inline-block; + background-position: -37px -37px; + border-radius: 2px; + margin: 0 4px; + position: relative; + top: 3px; +} + +#centerMap { + background: #424242 url(extents_sprite.png) no-repeat; + width: 22px; + height: 22px; + display: inline-block; + background-position: -5px -5px; + border-radius: 2px; + margin: 0 4px; + position: relative; + top: 3px; + +} + #helpWrapper { background: none; border: none; @@ -2096,7 +2141,17 @@ float: left; } #quickReference ul { width: 150px; + text-transform: uppercase; + font-size: 14px; + line-height: 14px; + font-family: din-medium; + } + +#quickReference ul li { + padding-bottom: 16px; +} + #quickReference li.ui-state-active a { color: #00BCD4; } diff --git a/app/views/shared/_cheatsheet.html.erb b/app/views/shared/_cheatsheet.html.erb index 628e4c6b..b28bd146 100644 --- a/app/views/shared/_cheatsheet.html.erb +++ b/app/views/shared/_cheatsheet.html.erb @@ -14,7 +14,6 @@
-
Alt + click on topic icon: recenter topics around chosen topic
-
Right-click + 'center this topic': recenter topics around chosen topic
+
Recenter Topics around chosen Topic: Alt + click on the topic OR Right-click + 'center this topic'
+
@@ -37,83 +38,89 @@
Esc: Hides auto-suggestion results
Enter: create a new topic
Gear Icon: open up metacode settings
+

Learn More
- Open topic card: double-click on topic icon + Open 'Topic' card: Double-click on topic icon
- Move topic card: click + drag on topic card metacode + Move 'Topic' card: Click and drag on topic card metacode
- Change/edit metacode: mouse over metacode icon, then click on solid colored bar + Change/edit metacode: Mouse over metacode icon, then click on solid colored bar
- Edit topic title, description, link: click on text in respective area + Edit Topic title, description, link: Click on text in respective area
- Save topic title, description, link: hit enter + Save Topic title, description, link: Hit enter
- Change topic permission: click on 'permission' icon (only for topic creator) + Change Topic permission: Click on 'Permission' icon (only for topic creator)
- Open topic view: click on icon within topic card bar + Open Topic view: Click on icon within topic card bar
- Close topic card: click on canvas + Close 'Topic' card: Click on canvas
- Open context menu: right-click on topic icon + Open 'Context Menu': Right-click on topic icon
*Hide/Remove/Delete topic within context menu
+

Learn More
+
-
Right-click & drag from one topic to another: open create synapse prompt
+
Open 'Create Synapse' prompt: Right-click & drag from one topic to another
Enter: Create synapse
*You do not have to add a description
-
Right-click + drag from topic to open canvas: create new topic with synapse
+
Create new Topic with Synapse: Right-click + drag from topic to open canvas
Enter: Create topic
Enter: Create synapse
+

Learn More
+
-
Open synapse card:double-click on synapse
-
Edit synapse description: click on current description text
-
Save synapse description: hit enter
-
Edit directionality: select appropriate arrow boxes
-
Change synapse permission: click on 'permission' icon (only for synapse creator)
-
Right-click on synapse: open context menu
+
Open 'Synapse' card: Double-click on Synapse
+
Edit Synapse description: Click on current description text
+
Save Synapse description: Hit enter
+
Edit directionality: Select appropriate arrow boxes
+
Change synapse permission: Click on 'permission' icon (only for synapse creator)
+
Open 'Context Menu': Right-click on Synapse
*Hide/Remove/Delete synapse within context menu
+

Learn More
+
-
Click + drag: move around canvas
-
Scroll: zoom in/out
-
Refresh page: center map
+
Move around Canvas: Click and drag
+
Zoom in/out: Scroll OR click on
&
+
Center Map: Click
OR Refresh page
+

Learn More
+
-
Click on topic icon: select/deselect topic
-
Click on synapse: select/deselect synapse
-
Shift + click: select multiple topics / synapses
-
Shift + click + drag on canvas: make selection box, select multiple topics
-
Click + drag on selected topic(s): move all selected topics & synapses
-
Right-click on selected topic(s): open context menu
+
Select/Deselect Topic: Click on topic icon
+
Select/Deselect Synapse: Click on synapse
+
Select multiple Topics/Synapses: Shift + click
+
Make Selection box, select multiple Topics: Shift + click + drag on Canvas
+
Move all selected Topics & Synapses: Click + drag on selected Topic(s)
+
Open 'Context Menu': Right-click on selected topic(s)
*Hide/Remove/Delete/Change permissions of multiple topics & synapses within context menu
-
Click on background: deselect all topics & synapses
-
Esc: deselect all topics & synapses
+
Deselect all topics & Synapses: Click on background or Esc
-
Ctrl + /: open search prompt
-
Esc: close search prompt
-
Type into the search prompt: search for topics, maps, & mappers
-
Click on search result: open in new tab
+
Open 'Search' prompt: Ctrl + /
+
Close 'Search' prompt: Esc
<% if controller_name == "maps" && action_name == "show" %> -
Click "+" on a topic result: add to current map
+
Add to current Map: Click "+" on a topic result
<% end %>
Search by metacode: type "[name of metacode]:", then your search query. i.e. idea:create...
Search for map: type "map:", then your search query. i.e. map:exploring...