From bfdf706f1534a7fd10be18b19057dc028acb0801 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 9 Feb 2014 10:05:32 -0500 Subject: [PATCH] cheatsheet and menu and upper right menu --- app/assets/images/MMCCicon_filter2.png | Bin 0 -> 5950 bytes app/assets/javascripts/application.js | 3 +- app/assets/stylesheets/application.css | 173 +++++++++++++------------ app/views/layouts/_cheatsheet.html.erb | 40 ++++++ app/views/layouts/_lightboxes.html.erb | 23 +--- app/views/layouts/application.html.erb | 11 +- app/views/maps/show.html.erb | 24 ++-- app/views/topics/show.html.erb | 11 +- 8 files changed, 150 insertions(+), 135 deletions(-) create mode 100644 app/assets/images/MMCCicon_filter2.png create mode 100644 app/views/layouts/_cheatsheet.html.erb diff --git a/app/assets/images/MMCCicon_filter2.png b/app/assets/images/MMCCicon_filter2.png new file mode 100644 index 0000000000000000000000000000000000000000..5b50ffdd3f4edec3fb0415ff941faee1201d024b GIT binary patch literal 5950 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 div.FAQ { @@ -1917,20 +1957,14 @@ background-size: 22px 20px; left:-1px; height:124px; z-index:12; - width:151px; + width:121px; color: white; white-space: nowrap; text-align: center; font-size: 16px; overflow: hidden; - padding: 0; + padding: 0 0 0 30px; margin: 0; - /*border-radius: 6px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - box-shadow: 0 2px rgba(0, 0, 0, 0.05), 0 -2px rgba(0, 0, 0, 0.05) inset; - -webkit-box-shadow: 0 2px rgba(0, 0, 0, 0.05), 0 -2px rgba(0, 0, 0, 0.05) inset; - -moz-box-shadow: 0 2px rgba(0, 0, 0, 0.05), 0 -2px rgba(0, 0, 0, 0.05) inset;*/ background: #0F1519;/*url('black_bg.png'); */ border-left:1px solid #000; border-right:1px solid #000; @@ -1944,53 +1978,22 @@ background-size: 22px 20px; display:block; padding:0; text-align:center; -} - -li.beta { -border-top: 1px solid black; -border-bottom: 1px solid black; -position: relative; -height: 30px; -} -.inBeta { - background: rgba(0,0,0,0.6); -display: inline-block; -color: white; -height: 30px; -padding: 0 5px; -font-family: 'LatoLight'; -font-size: 30px; -position: absolute; -top: 0; -left: 0; -line-height: 30px; -} - -li.beta button { -position: absolute; -top: 0; -right: 0; -width: 84px; -border-radius: 0; -font-size: 12px; -margin: 0; -cursor:pointer; -} -li.beta button:hover { - background: #6FA9AA; -} - -li.meta, li.tutorial, li.exploreMaps { + font-family:'vinyl'; + font-style:italic; height:30px; - line-height:30px; - font-size:20px; + line-height:34px; + font-size:17px; + cursor:pointer; +} +.footer ul li:hover { + background:black; } li.meta a, li.tutorial a, li.exploreMaps a { display:block; } -li.tutorial, li.exploreMaps { +li.meta, li.tutorial, li.exploreMaps { border-top:1px solid white; } diff --git a/app/views/layouts/_cheatsheet.html.erb b/app/views/layouts/_cheatsheet.html.erb new file mode 100644 index 00000000..b7e1f18e --- /dev/null +++ b/app/views/layouts/_cheatsheet.html.erb @@ -0,0 +1,40 @@ +<%# + # @file + # The inner HTML of the cheatsheet + #%> + +

Quick Reference Guide

+ +
+

Topics

+
Add New Topic: Double-click on canvas
+
Select Metacode: Scroll on spinner, or Tab / Shift+Tab
+
Creating New Topic: Hit Enter after typing topic name
+
Get Existing Topic: Click on (or use Up/Down->Enter) to pick from auto-suggestions
+
Open Topic Card: Double-click on topic icon
+
Edit Topic Type: Click on metacode in open topic card
+
Open Topic View: Click on 'leave page' icon in topic card (opens in new tab)
+

Navigation

+
Move (Pan) Across Canvas: Click on canvas and drag
+
Zoom In/Out Scroll mouse on canvas
+
Back to Center: Refresh page
+
+ + +
+

Synapses

+
Create Synapse: Right-click/Alt+Click on topic and drag to other topic, enter synapse name or choose suggested
+
Create Topic with Synapse: Right-click/Alt+Click on topic and drag to empty part of canvas
+
View Synapse Description: Hover over synapse
+
Open Synapse Card: Double-click synapse
+
Edit Synapse Description: Click synapse description in synapse card
+
Change Synapse Direction: Check/Uncheck directional arrow boxes
+

Selection

+
Select Topic or Synapse: Click on one
+
Select Multiple: Shift+Click on canvas and drag around topics, or use Shift+Click to add/remove individually
+
Move Multiple: Select desired, Click and drag on a selected topic
+
Hide/Remove/Delete: Right-click/Alt+Click on selection
+
Deselect All: Hit Esc, or click any topic
+
+ +
\ No newline at end of file diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index d916d4b7..bcb8c549 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -43,32 +43,13 @@
-

Quick Reference Guide

- -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+ <%= render :partial => 'layouts/cheatsheet' %>
<% if authenticated? %>

Send Invites

-

You can invite others to the Metamaps platform.
Just send them the link to

+

You can invite others to the Metamaps platform. Send them this link

http://metamaps.cc/users/sign_up

and give them the access code shown below.

<% mapper = current_user %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 30116436..65cad0eb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -65,13 +65,12 @@
diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb index 67f1635a..6563d976 100644 --- a/app/views/maps/show.html.erb +++ b/app/views/maps/show.html.erb @@ -7,17 +7,15 @@ <% content_for :title, @map.name + " | Metamaps" %> <% if authenticated? %> -
-
-
-
    - <% if @map.permission == "commons" || @map.user == user %> -
  • Save Layout
    • - <% end %> -
  • Save To New Map
    • - -
-
+ <% if @map.permission == "commons" || @map.user == user %> +
+
+
+
+ <% end %> +
+
+
@@ -251,11 +249,11 @@ initialize("chaotic", true); }); } - window.realtime.socket = io.connect('http://gentle-savannah-1303.herokuapp.com'); + /*window.realtime.socket = io.connect('http://gentle-savannah-1303.herokuapp.com'); window.realtime.socket.on('connect', function() { subscribeToRooms(); console.log('socket connected'); - }); + });*/ function subscribeToRooms() { window.realtime.socket.on('maps-' + mapid, function(data) { //as long as you weren't the origin of the changes, update your map diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index b6f8c00a..959d815f 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -17,14 +17,9 @@ <% content_for :title, @topic.name + " | Metamaps" %> <% if authenticated? %> -
-
-
-
    -
  • Save As Map
    • - -
-
+
+
+
<% end %>