fixed up some styling. extended rgraph radius. added show/hide labels

Gemfile

@@ -5,6 +5,7 @@ gem 'rails', '3.2.11'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
+gem 'devise'
 gem 'redis'
 gem 'pg'
 gem 'authlogic'

Gemfile.lock

@@ -32,6 +32,7 @@ GEM
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
+    bcrypt-ruby (3.0.1-x86-mingw32)
     best_in_place (2.0.2)
       jquery-rails
       rails (~> 3.1)
@@ -44,6 +45,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    devise (2.2.3)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -66,6 +72,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.19)
     multi_json (1.5.0)
+    orm_adapter (0.4.0)
     pg (0.12.2)
     pg (0.12.2-x86-mingw32)
     polyglot (0.3.3)
@@ -116,6 +123,8 @@ GEM
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.1)
+      rack (>= 1.0)
 
 PLATFORMS
   ruby
@@ -126,6 +135,7 @@ DEPENDENCIES
   best_in_place
   cancan
   coffee-rails (~> 3.2.1)
+  devise
   formtastic
   formula
   jbuilder

app/assets/javascripts/Jit/graphsettings.js

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

app/assets/javascripts/Jit/jit2.0.0.js

@@ -2602,12 +2602,6 @@ Extras.Classes.Navigation = new Class({
 		 this.canvas.scale(ans, ans);
 	   }
 	}
-	if (this.canvas.scaleOffsetX < 0.5) {
-		this.canvas.viz.labels.hideLabels(true);
-	}
-	else if (this.canvas.scaleOffsetX > 0.5) {
-		this.canvas.viz.labels.hideLabels(false);
-	}
     // END METAMAPS CODE
     // ORIGINAL CODE this.canvas.scale(ans, ans);
   },
@@ -3162,7 +3156,7 @@ var Canvas;
       this.viz = viz;
       this.config = $.merge({
         idSuffix: '-bkcanvas',
-        levelDistance: 200,
+        levelDistance: 400,
         numberOfCircles: 4,
         CanvasStyles: {},
         offset: 0

app/assets/javascripts/application.js

@@ -301,6 +301,17 @@ function MconsoleReset() {
 	
 }
 
+function hideLabels() {
+  if (Mconsole.labels.labelsHidden) {
+    Mconsole.labels.hideLabels();
+    $('.hidelabels').addClass('checked');
+  }
+  else if (!Mconsole.labels.labelsHidden) {
+    Mconsole.labels.hideLabels(true);
+    $('.hidelabels').removeClass('checked');
+  }
+}
+
 $('*').keypress(function(e) {
   switch(e.which) {
     case 13: enterKeyHandler(); break;

app/assets/stylesheets/Fonts/Lato-Lig-webfont.svg

@@ -0,0 +1,147 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright   : Copyright c 20102011 by tyPoland Lukasz Dziedzic with Reserved Font Name Lato Licensed under the SIL Open Font License Version 11 
+Designer    : Lukasz Dziedzic
+Foundry     : Lukasz Dziedzic
+Foundry URL : httpwwwtypolandcom
+</metadata>
+<defs>
+<font id="LatoLight" horiz-adv-x="1187" >
+<font-face units-per-em="2048" ascent="1649" descent="-399" />
+<missing-glyph horiz-adv-x="395" />
+<glyph unicode=" "  horiz-adv-x="395" />
+<glyph unicode="&#x09;" horiz-adv-x="395" />
+<glyph unicode="&#xa0;" horiz-adv-x="395" />
+<glyph unicode="!" horiz-adv-x="660" d="M236 79q0 19 7 36.5t19.5 30.5t29.5 20.5t38 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67 27t-27 67zM286 863v586h95v-586q0 -46 -1 -87t-2.5 -83.5t-4.5 -89.5t-6 -104h-67q-3 57 -6 104t-4.5 89.5 t-2.5 83.5t-1 87z" />
+<glyph unicode="&#x22;" horiz-adv-x="751" d="M184 1150v299h85v-299l-9 -157q-2 -17 -9 -27t-25 -10q-14 0 -22 10t-10 27zM481 1150v299h85v-299l-9 -157q-2 -17 -9 -27t-25 -10q-14 0 -22 10t-11 27z" />
+<glyph unicode="#" d="M88 484v10q0 5 2 15l3 16h223l84 399h-259l6 39q4 34 46 33h218l89 414q4 19 16.5 29t30.5 10h43l-97 -453h305l97 453h43q32 0 32 -31q0 -8 -1 -12l-89 -410h230l-6 -39q-5 -34 -46 -33h-189l-84 -399h231q31 0 31 -26l-5 -45h-267l-96 -454h-42q-14 0 -23.5 8.5 t-9.5 25.5q0 7 1 11l88 409h-305l-88 -413q-5 -23 -17.5 -32t-29.5 -9h-43l96 454h-187q-14 0 -22.5 6.5t-8.5 23.5zM398 525h305l84 399h-305z" />
+<glyph unicode="$" d="M156 173l27 40q12 15 29 15q9 0 23 -11t33.5 -28t46 -37t62 -38t80.5 -31t102 -16l33 651q-70 22 -136 48.5t-117.5 68t-83.5 102t-32 153.5q0 71 26.5 136.5t78.5 117.5t127.5 83.5t173.5 34.5l9 172q1 14 8.5 23.5t22.5 9.5h37l-12 -206q103 -7 181 -45.5t143 -102.5 l-23 -35q-10 -17 -26 -17q-12 0 -32.5 16.5t-52.5 37t-79.5 39.5t-114.5 24l-30 -585q48 -15 97 -32t93.5 -37.5t82.5 -47t66 -62.5t44 -83t16 -108q0 -88 -30 -166t-85.5 -137t-137 -94.5t-185.5 -40.5l-12 -216q-1 -13 -8.5 -22.5t-20.5 -9.5h-37l12 248q-131 6 -228 56 t-171 132zM314 1098q0 -63 22.5 -108.5t61.5 -77.5t90 -55t108 -43l29 565q-78 -4 -136 -28.5t-97 -63t-58.5 -87.5t-19.5 -102zM625 67q82 5 146 33t107.5 73.5t66 105.5t22.5 129q0 68 -26 114.5t-69 79.5t-98.5 55t-117.5 41z" />
+<glyph unicode="%" horiz-adv-x="1570" d="M89 1101q0 90 23.5 158.5t64.5 114t97 68.5t119 23t118.5 -23t97 -68.5t65.5 -114t24 -158.5q0 -89 -24.5 -157t-66.5 -113.5t-97 -68.5t-117 -23q-63 0 -119 23t-97 68.5t-64.5 113.5t-23.5 157zM168 1101q0 -79 18 -135t48.5 -91.5t71.5 -52.5t87 -17t87.5 17t73 52.5 t49.5 91.5t18 135t-18 135t-49.5 92.5t-73 53.5t-87.5 17t-87 -17t-71.5 -53.5t-48.5 -92.5t-18 -135zM209 0l1039 1431q6 8 15 13t23 5h69l-1041 -1431q-13 -18 -35 -18h-70zM872 344q0 90 24 158.5t64.5 114.5t96.5 69t120 23q63 0 118.5 -23t97 -69t65 -114.5 t23.5 -158.5q0 -89 -24.5 -157t-66 -113t-97 -68t-116.5 -23q-63 0 -119.5 23t-97 68t-64.5 113t-24 157zM950 344q0 -79 18 -134.5t49 -91.5t72 -52.5t88 -16.5q46 0 87.5 16.5t72 52.5t48.5 91.5t18 134.5t-18 136t-48.5 93t-72 53t-87.5 17t-87.5 -17t-72.5 -53t-49 -93 t-18 -136z" />
+<glyph unicode="&#x26;" horiz-adv-x="1416" d="M109 371q0 74 26.5 141t72.5 122.5t109.5 99.5t137.5 72q-73 82 -109.5 159t-36.5 165q0 72 26 133t74.5 106t115.5 70.5t150 25.5q69 0 130 -23.5t106.5 -63.5t73 -92.5t29.5 -109.5q-14 -3 -26 -7q-24 -5 -37 -5q-8 0 -15 6.5t-10 17.5q-7 27 -24.5 61.5t-47.5 65.5 t-74.5 52.5t-104.5 21.5q-61 0 -111.5 -19t-86.5 -53.5t-56 -81.5t-20 -103q0 -84 43 -161t134 -165l456 -451q46 74 73.5 154t35.5 155q2 13 8 20.5t18 7.5h57q-2 -96 -36.5 -198t-97.5 -195l305 -299h-91q-18 0 -30 4t-28 19l-210 205q-46 -53 -101 -98t-119.5 -77.5 t-138 -50.5t-154.5 -18q-77 0 -151.5 25.5t-133.5 75t-95 122t-36 164.5zM208 377q0 -79 30 -137.5t78.5 -98t107 -59t116.5 -19.5q72 0 135.5 16.5t119.5 46t102.5 69t85.5 88.5l-470 461q-6 5 -11 12q-68 -29 -122.5 -69t-92.5 -88.5t-58.5 -105t-20.5 -116.5z" />
+<glyph unicode="'" horiz-adv-x="453" d="M184 1150v299h85v-299l-9 -157q-2 -17 -9 -27t-25 -10q-14 0 -22 10t-10 27z" />
+<glyph unicode="(" horiz-adv-x="614" d="M174 645q0 120 15 233t47.5 225t86.5 225.5t133 234.5l43 -27q13 -7 13 -22q0 -10 -7 -21q-122 -197 -184 -407t-62 -441q0 -229 62 -439.5t185 -406.5q7 -11 7 -21q0 -15 -14 -23l-43 -26q-79 121 -133 234t-86.5 225t-47.5 224.5t-15 232.5z" />
+<glyph unicode=")" horiz-adv-x="614" d="M100 -222q0 10 8 21q123 196 184.5 406.5t61.5 439.5q0 230 -62 440.5t-183 407.5q-7 11 -8 21q0 14 14 22l43 27q78 -121 132 -234.5t87 -225.5t47.5 -225t14.5 -233t-14.5 -232.5t-47.5 -224.5t-87 -225.5t-132 -233.5l-43 26q-15 8 -15 23z" />
+<glyph unicode="*" horiz-adv-x="819" d="M126 1357l27 46l193 -113q16 -10 26 -19.5t24 -27.5q-8 19 -11.5 34t-3.5 33v219h53v-218q0 -18 -2.5 -33t-10.5 -34q12 17 22.5 27t26.5 19l193 112l26 -46l-192 -112q-15 -9 -28.5 -14t-31.5 -7q18 -3 31 -7.5t29 -12.5l193 -112l-25 -47l-195 113q-15 9 -25.5 17.5 t-23.5 25.5q6 -18 9.5 -31.5t3.5 -30.5v-219h-53v218q0 17 2.5 30.5t10.5 30.5q-11 -15 -22 -23.5t-26 -17.5l-192 -111l-26 45l193 112q14 8 27 12.5t32 7.5q-19 3 -32 8t-27 13z" />
+<glyph unicode="+" d="M112 649v75h440v462h80v-462h441v-75h-441v-464h-80v464h-440z" />
+<glyph unicode="," horiz-adv-x="404" d="M113 87q0 36 24.5 61.5t64.5 25.5q44 0 68 -30t24 -79q0 -42 -11 -86t-31.5 -85.5t-49 -80.5t-63.5 -72l-15 15q-8 8 -8 18q0 5 3 10t7 9q10 10 26 30t32 47.5t28.5 60t16.5 69.5q-6 -2 -13.5 -3t-16.5 -1q-38 0 -62 25.5t-24 65.5z" />
+<glyph unicode="-" horiz-adv-x="680" d="M102 566v83h477v-83h-477z" />
+<glyph unicode="." horiz-adv-x="404" d="M108 79q0 19 7 36.5t19.5 30.5t29.5 20.5t38 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67 27t-27 67z" />
+<glyph unicode="/" horiz-adv-x="730" d="M-5 -86l637 1538q15 38 55 38h42l-636 -1536q-8 -20 -24.5 -30t-33.5 -10h-40z" />
+<glyph unicode="0" d="M75 725q0 190 40.5 329.5t111 230.5t164.5 135.5t202 44.5t202.5 -44.5t165 -135.5t111.5 -230.5t41 -329.5t-41 -329.5t-111.5 -230.5t-165.5 -135.5t-202 -44.5q-108 0 -202 44.5t-164.5 135.5t-111 230.5t-40.5 329.5zM175 725q0 -177 34 -301.5t91 -204t133 -115.5 t160 -36t160 36t133 115.5t91 204t34 301.5q0 176 -34 301t-91 204.5t-133 116t-160 36.5t-160 -36.5t-133 -116t-91 -204.5t-34 -301z" />
+<glyph unicode="1" d="M252 1085l419 370h75v-1379h317v-76h-747v76h333v1175q0 35 3 74l-319 -284q-10 -9 -25 -9q-17 0 -26 12z" />
+<glyph unicode="2" d="M132 0v35q0 11 5.5 23t14.5 20l494 501q61 62 113.5 120.5t91 118t60.5 121.5t22 133q0 80 -26.5 139t-71 97t-102.5 56t-122 18q-69 0 -126.5 -21t-102 -58t-73.5 -89t-41 -113q-10 -36 -41 -36q-2 0 -5 0.5t-5 0.5l-49 8q12 93 50.5 166t97 123t135 76t165.5 26 q83 0 158.5 -24t133 -72.5t91 -121.5t33.5 -172q0 -82 -25 -152t-68 -134.5t-100 -125.5t-119 -124l-454 -463q33 8 68.5 12t71.5 4h625q16 0 26 -9.5t10 -25.5v-57h-935z" />
+<glyph unicode="3" d="M132 354l39 17q12 5 24 5q11 0 21 -5t15 -20l8 -20q6 -18 17 -45.5t29 -56.5t44.5 -58.5t65 -52.5t90.5 -37t119 -14q92 0 161.5 30.5t116 78t69.5 106.5t23 114q0 67 -21 124.5t-70 98.5t-129.5 65.5t-198.5 24.5v70q94 2 166 25t120 63t72.5 95.5t24.5 121.5 q0 77 -25.5 133.5t-68.5 93.5t-100.5 54t-119.5 17q-69 0 -126.5 -20.5t-101.5 -57t-73.5 -88.5t-43.5 -115q-8 -36 -38 -36q-7 0 -12 1l-50 8q13 93 51 166t96.5 123t135.5 76t166 26q83 0 156.5 -23t129.5 -69t88 -114.5t32 -158.5q0 -71 -22 -128t-60.5 -100t-90.5 -72 t-113 -44q160 -30 241.5 -123.5t81.5 -234.5q0 -89 -36 -165t-98.5 -131.5t-147 -86.5t-184.5 -31q-124 0 -206.5 33t-135.5 86.5t-83 119t-48 131.5z" />
+<glyph unicode="4" d="M65 488l728 963h87v-957h265v-54q0 -11 -6.5 -17.5t-21.5 -6.5h-237v-416h-88v416h-683q-15 0 -23.5 6.5t-11.5 17.5zM171 494h621v758q0 17 1 37t4 40z" />
+<glyph unicode="5" d="M152 113l28 40q10 15 30 15q13 0 38 -15.5t64.5 -34t93.5 -33.5t125 -15q84 0 157 27t126.5 78t84 126.5t30.5 170.5q0 78 -23 143.5t-69.5 112t-118 72.5t-167.5 26q-58 0 -124 -9t-139 -30l-64 20l114 642h651v-42q0 -20 -13.5 -34t-43.5 -14h-524l-87 -483 q69 17 130 24.5t117 7.5q113 0 199 -32t144 -90t87.5 -138t29.5 -174q0 -115 -40 -205.5t-108 -154t-159 -97t-194 -33.5q-60 0 -114.5 10.5t-102.5 28.5t-87.5 41.5t-70.5 48.5z" />
+<glyph unicode="6" d="M139 461q0 85 43 192t142 240l395 532q17 24 52 24h86l-432 -564q-32 -42 -58.5 -79t-48.5 -73q60 62 143.5 97.5t181.5 35.5q93 0 172 -30.5t136 -86.5t89 -135t32 -178q0 -98 -35.5 -181t-98 -143.5t-151 -94t-193.5 -33.5q-101 0 -185 32.5t-144 94t-93 150t-33 200.5 zM234 437q0 -81 25.5 -149.5t71.5 -118t112.5 -77t149.5 -27.5q88 0 158.5 27.5t120.5 76t76.5 115.5t26.5 146q0 83 -26 150t-74 113.5t-113.5 72t-145.5 25.5q-90 0 -161 -31.5t-120 -81t-75 -113t-26 -128.5z" />
+<glyph unicode="7" d="M133 1386v63h964v-44q0 -17 -3.5 -30t-9.5 -22l-664 -1316q-8 -16 -22 -26.5t-37 -10.5h-66l669 1311q13 27 31 48h-835q-11 0 -19 8t-8 19z" />
+<glyph unicode="8" d="M123 383q0 80 23 142.5t65 108.5t100 76.5t127 46.5q-63 18 -112.5 50t-82.5 76t-50.5 97.5t-17.5 115.5q0 77 29 144.5t83.5 117.5t132 78.5t174.5 28.5q96 0 173.5 -28.5t132 -78.5t84 -118t29.5 -144q0 -61 -17.5 -115t-51.5 -98t-83 -76t-112 -50q70 -15 127.5 -46 t99.5 -77t65.5 -108.5t23.5 -142.5q0 -92 -35 -166t-97 -126t-148.5 -79.5t-190.5 -27.5t-191 27.5t-148.5 79.5t-96.5 126t-35 166zM223 384q0 -73 26.5 -132t75.5 -101.5t117.5 -66t151.5 -23.5t151 23.5t117 66t76 101.5t27 132q0 95 -35 158.5t-89.5 101.5t-120 54 t-126.5 16t-127 -16t-120 -54t-89 -101.5t-35 -158.5zM270 1095q0 -58 19 -112.5t59 -97t101 -67.5t145 -25q83 0 144 25t101 67.5t58.5 96.5t18.5 113q0 62 -21.5 116t-62.5 94t-101 62.5t-137 22.5t-137.5 -22.5t-102 -62.5t-63 -94t-21.5 -116z" />
+<glyph unicode="9" d="M176 1030q0 93 34.5 172.5t96 138t146 91.5t184.5 33q96 0 176.5 -32.5t138.5 -92.5t90 -143.5t32 -185.5q0 -56 -11.5 -107.5t-34.5 -102.5t-56 -105t-75 -115l-380 -557q-15 -24 -50 -24h-88l428 598q31 43 57 81.5t47 74.5q-59 -66 -143.5 -102t-180.5 -36 q-89 0 -164.5 29.5t-130 83.5t-85.5 130.5t-31 170.5zM273 1036q0 -80 25 -144t69.5 -108.5t107.5 -68t139 -23.5q87 0 155.5 30t115.5 78t71 108t24 121q0 79 -25.5 144.5t-71.5 112t-109 72.5t-138 26q-80 0 -147 -25.5t-114.5 -71.5t-74.5 -110t-27 -141z" />
+<glyph unicode=":" horiz-adv-x="486" d="M148 79q0 19 7.5 36.5t20 30.5t29.5 20.5t38 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67.5 27t-27.5 67zM148 895q0 19 7.5 36.5t20 30.5t29.5 20.5t38 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5 t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67.5 27t-27.5 67z" />
+<glyph unicode=";" horiz-adv-x="486" d="M148 895q0 19 7.5 36.5t20 30.5t29.5 20.5t38 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67.5 27t-27.5 67zM154 87q0 36 24.5 61.5t64.5 25.5q44 0 68 -30t24 -79q0 -42 -11 -86t-31.5 -85.5t-49 -80.5 t-63.5 -72l-15 15q-8 8 -8 18q0 5 3 10t7 9q10 10 26 30t32 47.5t28.5 60t16.5 69.5q-6 -2 -13.5 -3t-16.5 -1q-38 0 -62 25.5t-24 65.5z" />
+<glyph unicode="&#x3c;" d="M164 667v42l768 394v-67q0 -11 -6 -19t-22 -17l-566 -286q-34 -17 -74 -27q43 -9 74 -25l566 -288q15 -8 21.5 -16.5t6.5 -19.5v-67z" />
+<glyph unicode="=" d="M170 494v75h847v-75h-847zM170 814v76h847v-76h-847z" />
+<glyph unicode="&#x3e;" d="M257 271v67q0 11 6 20t21 16l567 288q32 16 73 25q-20 5 -38 12t-35 15l-567 286q-27 14 -27 36v67l768 -394v-42z" />
+<glyph unicode="?" horiz-adv-x="758" d="M34 1323q28 28 62.5 53.5t76 45.5t90.5 31.5t107 11.5q72 0 135 -21.5t111 -61.5t76 -97.5t28 -129.5q0 -78 -24 -134t-61 -98.5t-80 -75t-80.5 -60.5t-63.5 -57t-28 -63l-12 -168h-67l-5 175v5q0 42 24.5 73.5t61 61.5t79 60.5t79 69t61 88.5t24.5 119q0 55 -21.5 98.5 t-58.5 74t-85 46t-101 15.5q-68 0 -117 -17.5t-83 -39.5t-53.5 -40t-26.5 -18q-15 0 -23 12zM241 79q0 19 7 36.5t20 30.5t29.5 20.5t37.5 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67 27t-27 67z" />
+<glyph unicode="@" horiz-adv-x="1682" d="M111 562q0 171 60 317.5t164.5 254t244 168.5t298.5 61q137 0 263 -42.5t222.5 -127t154.5 -209.5t58 -290q0 -112 -29.5 -204t-81.5 -158t-121.5 -102.5t-148.5 -36.5q-90 0 -135.5 47.5t-47.5 136.5q-57 -95 -129.5 -137.5t-156.5 -42.5q-57 0 -99 20t-70 54.5 t-41.5 81.5t-13.5 102q0 87 33 174.5t97 157.5t157.5 114t211.5 44q54 0 102 -9t86 -27l-93 -355q-12 -47 -18 -84.5t-6 -67.5q0 -45 11.5 -73t30.5 -44.5t43.5 -22t50.5 -5.5q58 0 111.5 30.5t94.5 87.5t65 138t24 181q0 152 -49.5 265t-135 188t-199 111.5t-241.5 36.5 q-140 0 -266 -54t-220.5 -151.5t-150.5 -232t-56 -295.5q0 -181 58 -319t157.5 -230.5t232 -140t281.5 -47.5q152 0 277.5 35t227.5 101q7 5 18 5q14 0 20 -14l16 -38q-115 -76 -253 -117t-306 -41q-169 0 -315 54t-254.5 157t-171 252.5t-62.5 342.5zM582 457 q0 -41 10 -76.5t30.5 -61t50.5 -40.5t71 -15q37 0 76.5 12.5t76 44.5t68 87t53.5 140l82 317q-25 7 -51 11t-61 4q-92 0 -167.5 -37.5t-128 -98t-81.5 -135.5t-29 -152z" />
+<glyph unicode="A" horiz-adv-x="1319" d="M15 0l593 1449h105l593 -1449h-81q-14 0 -23.5 7.5t-14.5 20.5l-171 421h-712l-170 -421q-4 -11 -14 -19.5t-25 -8.5h-80zM336 526h649l-296 732q-7 17 -14 39.5t-15 47.5q-7 -25 -14 -47t-14 -41z" />
+<glyph unicode="B" horiz-adv-x="1312" d="M215 0v1449h417q124 0 214.5 -24.5t150 -72t88.5 -116.5t29 -156q0 -57 -20 -110.5t-58 -98.5t-92.5 -78t-125.5 -51q171 -26 263.5 -113.5t92.5 -232.5q0 -92 -33 -165.5t-95.5 -125t-153.5 -78.5t-207 -27h-470zM319 84h364q191 0 288.5 82.5t97.5 231.5q0 69 -26 124 t-75 93t-121 58.5t-163 20.5h-365v-610zM319 771h315q100 0 171.5 25.5t117 67.5t67 95.5t21.5 109.5q0 146 -93 221.5t-286 75.5h-313v-595z" />
+<glyph unicode="C" horiz-adv-x="1440" d="M127 725q0 165 51.5 301t145.5 234t224.5 151.5t288.5 53.5q79 0 144.5 -11.5t122 -33.5t107 -55t98.5 -76l-32 -46q-8 -12 -26 -12q-9 0 -23.5 10.5t-36.5 26.5t-53 35t-74 35t-99.5 26.5t-127.5 10.5q-132 0 -243 -45.5t-190.5 -130t-124.5 -205t-45 -269.5 q0 -154 44.5 -274.5t122 -204t183.5 -128t230 -44.5q78 0 139 10t112 30.5t95 50.5t87 69q5 4 10 7t11 3q10 0 17 -7l41 -44q-45 -48 -98 -86.5t-116 -66t-138.5 -42t-165.5 -14.5q-151 0 -276 52.5t-215 149.5t-140 234t-50 305z" />
+<glyph unicode="D" horiz-adv-x="1556" d="M215 0v1449h528q155 0 282 -50t218 -144.5t141.5 -228.5t50.5 -301q0 -168 -50.5 -302t-141.5 -228.5t-218 -144.5t-282 -50h-528zM321 85h422q131 0 239 43t184 125t118 200.5t42 271.5q0 152 -42 270.5t-118 200.5t-184 125t-239 43h-422v-1279z" />
+<glyph unicode="E" horiz-adv-x="1210" d="M215 0v1449h868v-87h-762v-586h634v-85h-634v-604h762v-87h-868z" />
+<glyph unicode="F" horiz-adv-x="1171" d="M215 0v1449h868v-87h-762v-609h660v-87h-660v-666h-106z" />
+<glyph unicode="G" horiz-adv-x="1532" d="M127 725q0 168 51 304.5t145.5 233.5t229 149.5t301.5 52.5q83 0 153 -11t130.5 -33t113 -54.5t100.5 -74.5l-28 -45q-9 -15 -26 -15q-9 0 -17 4q-15 6 -44.5 28.5t-79 47t-124.5 44t-181 19.5q-141 0 -255 -45t-194 -129t-124 -204.5t-44 -271.5q0 -154 44.5 -275.5 t123.5 -206t190 -129.5t246 -45q75 0 136 7.5t114 23t100.5 37.5t95.5 49v391h-278q-11 0 -19 7t-8 16v57h400v-515q-54 -38 -112.5 -67.5t-125 -49.5t-143 -30.5t-168.5 -10.5q-157 0 -286 52.5t-222 149.5t-144 234t-51 305z" />
+<glyph unicode="H" horiz-adv-x="1548" d="M215 0v1449h106v-676h907v676h105v-1449h-105v694h-907v-694h-106z" />
+<glyph unicode="I" horiz-adv-x="612" d="M253 0v1449h105v-1449h-105z" />
+<glyph unicode="J" horiz-adv-x="929" d="M91 13q2 14 3.5 28.5t2.5 29.5q2 9 8 16t20 7q9 0 22 -3.5t31 -7.5t41 -7.5t53 -3.5q78 0 140.5 24.5t106.5 75t67 128t23 181.5v968h106v-966q0 -122 -30.5 -215t-86 -156.5t-136 -95.5t-180.5 -32q-46 0 -93.5 7t-97.5 22z" />
+<glyph unicode="K" horiz-adv-x="1351" d="M246 0v1451h104v-671h86q19 0 33.5 1.5t26.5 6.5t22 12t22 18l584 601q16 16 30 23t35 7h85l-633 -650q-19 -20 -34 -31.5t-34 -18.5q22 -6 39 -19t34 -34l668 -696h-85q-27 0 -38 7.5t-24 20.5l-613 626q-11 11 -20.5 19.5t-21 14t-28 8t-41.5 2.5h-93v-698h-104z" />
+<glyph unicode="L" horiz-adv-x="1047" d="M215 0v1449h104v-1360h688v-89h-792z" />
+<glyph unicode="M" horiz-adv-x="1861" d="M215 0v1449h72q14 0 22.5 -3t17.5 -16l584 -1008q15 -29 27 -62q6 16 12.5 32.5t15.5 30.5l569 1007q8 13 16.5 16t22.5 3h73v-1449h-93v1235q0 27 4 56l-571 -1012q-14 -27 -41 -27h-16q-26 0 -41 27l-586 1013q3 -30 3 -57v-1235h-91z" />
+<glyph unicode="N" horiz-adv-x="1548" d="M215 0v1449h51q14 0 22.5 -3.5t17.5 -15.5l938 -1256q-3 31 -3 59v1216h92v-1449h-50q-24 0 -38 20l-942 1258q3 -31 3 -58v-1220h-91z" />
+<glyph unicode="O" horiz-adv-x="1633" d="M126 725q0 167 50.5 303.5t142 233.5t218.5 150t279 53q155 0 282 -52.5t218 -150t141 -234t50 -303.5q0 -168 -50 -304.5t-141 -233.5t-218 -149.5t-282 -52.5q-153 0 -279.5 52.5t-218 149.5t-142 233.5t-50.5 304.5zM233 725q0 -153 42.5 -273t120 -204t184.5 -128 t236 -44q131 0 238.5 44t184 128t118.5 204t42 273q0 152 -42 272.5t-118.5 204.5t-184 128.5t-238.5 44.5q-129 0 -236 -44.5t-184.5 -128.5t-120 -204.5t-42.5 -272.5z" />
+<glyph unicode="P" horiz-adv-x="1215" d="M246 0v1449h374q255 0 384.5 -111.5t129.5 -318.5q0 -95 -35.5 -175t-102 -138t-162 -90t-214.5 -32h-270v-584h-104zM350 668h270q96 0 171.5 26.5t128.5 73.5t81 111t28 140q0 167 -103 257t-306 90h-270v-698z" />
+<glyph unicode="Q" horiz-adv-x="1633" d="M126 725q0 167 50.5 303.5t142 233.5t218.5 150t279 53q155 0 282 -52.5t218 -150t141 -234t50 -303.5q0 -110 -22 -206.5t-63 -178t-99.5 -146t-132.5 -110.5l377 -403h-88q-20 0 -37 5.5t-29 19.5l-309 334q-65 -27 -136.5 -41t-151.5 -14q-153 0 -279.5 52.5 t-218 149.5t-142 233.5t-50.5 304.5zM233 725q0 -153 42.5 -273t120 -204t184.5 -128t236 -44q131 0 238.5 44t184 128t118.5 204t42 273q0 152 -42 272.5t-118.5 204.5t-184 128.5t-238.5 44.5q-129 0 -236 -44.5t-184.5 -128.5t-120 -204.5t-42.5 -272.5z" />
+<glyph unicode="R" horiz-adv-x="1292" d="M246 0v1449h369q251 0 375 -97t124 -284q0 -83 -28.5 -151.5t-82.5 -120.5t-129.5 -85t-171.5 -43q25 -15 44 -41l499 -627h-91q-16 0 -28 6t-23 21l-464 587q-17 23 -37 32t-62 9h-190v-655h-104zM350 733h252q96 0 172.5 23t129 66t80.5 103.5t28 136.5 q0 155 -101.5 229.5t-295.5 74.5h-265v-633z" />
+<glyph unicode="S" horiz-adv-x="1070" d="M89 173l29 45q12 15 28 15q9 0 23.5 -12t35 -30t49.5 -39t66.5 -39t87 -30t111.5 -12q86 0 153.5 26t114.5 71t71.5 107t24.5 133q0 77 -31.5 126.5t-82.5 82.5t-116 55.5t-133.5 44t-133.5 48.5t-116.5 68t-82.5 103t-31 156q0 73 27.5 140t80.5 119t131.5 83t178.5 31 q113 0 202.5 -35.5t163.5 -109.5l-25 -47q-9 -17 -26 -18q-13 0 -34 19t-57 42t-90 42.5t-133 19.5t-138.5 -22.5t-100 -61.5t-61.5 -90t-21 -107q0 -74 31 -122t82.5 -82t116.5 -57t133.5 -45.5t133.5 -49.5t116.5 -68t82.5 -101t31 -149q0 -91 -31 -171.5t-90.5 -140 t-145.5 -93.5t-197 -34q-143 0 -246.5 50.5t-181.5 138.5z" />
+<glyph unicode="T" horiz-adv-x="1197" d="M36 1360v89h1125v-89h-509v-1360h-104v1360h-512z" />
+<glyph unicode="U" horiz-adv-x="1502" d="M202 553v896h105v-895q0 -101 30.5 -188.5t87 -152.5t139 -101.5t187.5 -36.5q104 0 186.5 36t140 100.5t87.5 152.5t30 189v896h104v-896q0 -120 -37.5 -224t-109 -181t-173 -121t-228.5 -44t-229 44t-173 121t-109 181t-38 224z" />
+<glyph unicode="V" horiz-adv-x="1319" d="M15 1449h83q14 0 23.5 -7.5t14.5 -20.5l494 -1202q19 -47 32 -100q11 55 29 100l493 1202q5 11 14.5 19.5t24.5 8.5h82l-598 -1449h-94z" />
+<glyph unicode="W" horiz-adv-x="2021" d="M17 1449h87q30 0 38 -28l366 -1191q6 -20 10.5 -43.5t9.5 -49.5q5 26 10.5 49.5t12.5 43.5l410 1191q4 11 14 19.5t24 8.5h29q14 0 23.5 -7.5t14.5 -20.5l410 -1191q7 -20 12.5 -42.5t10.5 -48.5q5 25 9 48t11 43l365 1191q3 11 14 19.5t25 8.5h80l-456 -1449h-94 l-428 1257q-8 25 -14 53q-6 -28 -15 -53l-429 -1257h-93z" />
+<glyph unicode="X" horiz-adv-x="1227" d="M17 0l524 743l-500 706h103q14 0 21 -6t12 -15l440 -634q3 8 7 15.5t9 15.5l425 602q6 8 13 15t18 7h100l-501 -700l521 -749h-103q-14 0 -22.5 8.5t-13.5 17.5l-457 667q-4 -15 -14 -29l-448 -638q-7 -9 -16.5 -17.5t-21.5 -8.5h-96z" />
+<glyph unicode="Y" horiz-adv-x="1227" d="M26 1449h91q14 0 22.5 -6.5t17.5 -19.5l414 -665q14 -24 24.5 -46t18.5 -44q8 23 18.5 44.5t24.5 45.5l414 665q6 11 15.5 18.5t23.5 7.5h92l-535 -851v-598h-106v598z" />
+<glyph unicode="Z" horiz-adv-x="1296" d="M118 0v38q0 19 12 37l922 1287h-908v87h1047v-36q0 -22 -14 -42l-920 -1284h926v-87h-1065z" />
+<glyph unicode="[" horiz-adv-x="614" d="M179 -270v1823h326v-36q0 -13 -9 -21.5t-23 -8.5h-211v-1691h211q14 0 23 -8t9 -21v-37h-326z" />
+<glyph unicode="\" horiz-adv-x="732" d="M-8 1490h42q40 0 55 -38l637 -1538h-40q-17 0 -33.5 9.5t-24.5 30.5z" />
+<glyph unicode="]" horiz-adv-x="614" d="M110 -233q0 13 8 21t22 8h211v1691h-211q-14 0 -22 8t-8 22v36h324v-1823h-324v37z" />
+<glyph unicode="^" d="M208 819l349 630h61l350 -630h-70q-11 0 -20 7t-14 17l-247 446q-9 17 -16 32.5t-12 32.5q-5 -16 -12 -32t-16 -33l-246 -446q-5 -8 -13 -16t-21 -8h-73z" />
+<glyph unicode="_" horiz-adv-x="806" d="M0 -210h807v-70h-807v70z" />
+<glyph unicode="`" horiz-adv-x="599" d="M88 1465h94q25 0 37 -7t24 -25l160 -244h-55q-12 0 -21 3.5t-17 13.5z" />
+<glyph unicode="a" horiz-adv-x="996" d="M110 247q0 65 36.5 120t115 96t202 65.5t296.5 28.5v107q0 141 -61 217t-181 76q-74 0 -125.5 -20.5t-87.5 -45t-58.5 -45t-37.5 -20.5q-20 0 -31 19l-17 29q80 80 168 121t199 41q82 0 143.5 -26t102 -74.5t61 -117.5t20.5 -154v-664h-39q-31 0 -38 29l-14 130 q-42 -41 -83.5 -74t-86.5 -55.5t-97.5 -34t-114.5 -11.5q-52 0 -101.5 15t-87 47t-60.5 81.5t-23 119.5zM204 251q0 -51 17 -88.5t44.5 -61.5t64.5 -35.5t77 -11.5q59 0 108.5 13t92 36t79.5 54.5t73 68.5v266q-145 -4 -250.5 -22t-173.5 -49t-100 -73.5t-32 -96.5z" />
+<glyph unicode="b" horiz-adv-x="1118" d="M176 0v1490h98v-649q68 90 157 142t201 52q187 0 292 -129.5t105 -389.5q0 -112 -29 -208.5t-86 -167.5t-139.5 -112t-189.5 -41q-106 0 -183 41.5t-133 122.5l-6 -125q-3 -26 -27 -26h-60zM274 222q58 -88 129 -123.5t163 -35.5q90 0 158 33t113.5 93t68.5 143.5 t23 183.5q0 227 -84 334t-241 107q-101 0 -183 -52t-147 -145v-538z" />
+<glyph unicode="c" horiz-adv-x="931" d="M90 510q0 117 31 213t89.5 165.5t144 108t196.5 38.5q99 0 176.5 -31.5t134.5 -85.5l-25 -35q-5 -5 -10 -9t-13 -4q-10 0 -28 14t-47.5 30.5t-74 30t-108.5 13.5q-88 0 -156 -31t-114.5 -89.5t-71.5 -141.5t-25 -186q0 -108 25.5 -190.5t71.5 -139.5t111.5 -87t145.5 -30 q74 0 123.5 17.5t81.5 38t51 38t30 17.5q13 0 21 -10l27 -33q-24 -31 -60 -57.5t-81 -46t-97.5 -30t-110.5 -10.5q-97 0 -177.5 35t-138 102t-90 164.5t-32.5 221.5z" />
+<glyph unicode="d" horiz-adv-x="1118" d="M89 507q0 112 29 208.5t86 167.5t139.5 112t190.5 41q103 0 178.5 -38.5t131.5 -111.5v604h98v-1490h-54q-26 0 -30 27l-10 160q-68 -92 -158.5 -146t-203.5 -54q-187 0 -292 130t-105 390zM189 507q0 -227 84 -334t241 -107q101 0 183 52t147 145v538 q-59 87 -130.5 122.5t-161.5 35.5t-157.5 -32.5t-113 -92.5t-69 -143.5t-23.5 -183.5z" />
+<glyph unicode="e" horiz-adv-x="1046" d="M90 530q0 110 31.5 202.5t90 159.5t144 105t194.5 38q86 0 159 -29.5t127 -86.5t84 -140t30 -190q0 -23 -6.5 -31t-20.5 -8h-737v-20q0 -115 27 -201.5t76 -145.5t118.5 -88.5t155.5 -29.5q77 0 133.5 16.5t94.5 37.5t60.5 38t33.5 17q13 0 20 -10l27 -33 q-25 -31 -65.5 -57.5t-90 -45.5t-106.5 -30t-114 -11q-104 0 -190 36t-147.5 106t-95 170.5t-33.5 230.5zM190 612h672q0 82 -22.5 147t-63.5 110t-98 69.5t-127 24.5q-79 0 -141.5 -25t-108 -71t-74 -110.5t-37.5 -144.5z" />
+<glyph unicode="f" horiz-adv-x="659" d="M31 947v40h173v129q0 87 22.5 153t63.5 110t98.5 66t127.5 22q32 0 64 -5.5t57 -15.5l-3 -47q-1 -14 -20 -15q-12 0 -33 3.5t-52 3.5q-50 0 -92.5 -15t-73 -48t-47.5 -85.5t-17 -129.5v-126h331v-73h-329v-914h-97v912l-144 10q-29 1 -29 25z" />
+<glyph unicode="g" horiz-adv-x="1033" d="M77 -108q0 81 53 139.5t146 90.5q-51 17 -81 50t-30 91q0 22 8 45.5t24.5 46.5t39.5 43.5t54 36.5q-73 42 -113.5 111.5t-40.5 163.5q0 74 26 133.5t74 102.5t115.5 66.5t149.5 23.5q67 0 123.5 -16t101.5 -46h261v-34q0 -26 -29 -28l-154 -11q29 -39 44 -87.5t15 -103.5 q0 -74 -26.5 -134t-74 -102.5t-114 -66t-147.5 -23.5q-88 0 -160 27q-43 -25 -67.5 -59t-24.5 -65q0 -44 30.5 -67.5t81.5 -34.5t116 -14t132 -6.5t132 -13t115.5 -32.5t81.5 -64.5t31 -109.5q0 -63 -32 -122t-92 -104t-145 -72t-190 -27q-108 0 -188.5 22t-135.5 59.5 t-82.5 86.5t-27.5 104zM164 -96q0 -45 23 -83.5t67.5 -66.5t109 -44.5t148.5 -16.5q78 0 145 17.5t116.5 49t78 75.5t28.5 96q0 48 -25.5 77.5t-67.5 46t-96.5 23t-114.5 9.5t-120.5 6t-112.5 12q-39 -15 -72 -35t-57 -45t-37 -55t-13 -66zM227 708q0 -57 18.5 -104.5 t54 -81.5t86.5 -52.5t116 -18.5q66 0 117 18.5t85.5 52.5t52.5 81t18 105q0 57 -18.5 104.5t-53.5 81.5t-86 52.5t-115 18.5q-65 0 -116 -18.5t-86.5 -52.5t-54 -81.5t-18.5 -104.5z" />
+<glyph unicode="h" horiz-adv-x="1107" d="M166 0v1490h97v-645q71 87 161.5 138.5t203.5 51.5q84 0 148 -26.5t106 -76.5t63.5 -121t21.5 -160v-651h-98v651q0 143 -65.5 224.5t-200.5 81.5q-100 0 -186 -51.5t-154 -141.5v-764h-97z" />
+<glyph unicode="i" horiz-adv-x="486" d="M154 1370q0 18 7 35t19.5 29.5t28.5 19.5t35 7q18 0 34.5 -7t28.5 -19.5t20 -29t8 -35.5q0 -18 -8 -34t-20 -28.5t-28.5 -19.5t-34.5 -7t-34.5 7t-29 19.5t-19.5 28.5t-7 34zM195 0v1019h97v-1019h-97z" />
+<glyph unicode="j" horiz-adv-x="482" d="M-51 -356l5 49q1 12 14 12q8 0 23 -4t41 -4q83 0 123 45t40 128v1149h97v-1149q0 -53 -15.5 -98t-45.5 -78.5t-75.5 -52.5t-107.5 -19q-30 0 -53 5.5t-46 16.5zM154 1370q0 18 7 35t19.5 29.5t28.5 19.5t35 7q18 0 34.5 -7t28.5 -19.5t20 -29t8 -35.5q0 -18 -8 -34 t-20 -28.5t-28.5 -19.5t-34.5 -7t-34.5 7t-29 19.5t-19.5 28.5t-7 34z" />
+<glyph unicode="k" horiz-adv-x="1007" d="M176 0v1490h98v-908h48q14 0 26.5 4t28.5 19l408 388q11 11 23 18.5t31 7.5h86l-450 -427q-10 -10 -19.5 -19t-20.5 -15q16 -8 27.5 -19.5t23.5 -24.5l472 -514h-85q-14 0 -25 5.5t-23 18.5l-428 458q-17 18 -31.5 25t-44.5 7h-47v-514h-98z" />
+<glyph unicode="l" horiz-adv-x="486" d="M195 0v1490h97v-1490h-97z" />
+<glyph unicode="m" horiz-adv-x="1629" d="M166 0v1019h53q27 0 31 -26l9 -147q30 42 63.5 76.5t72 60t82 39t91.5 13.5q112 0 178.5 -65t90.5 -180q18 63 51.5 109t76.5 76.5t93.5 45t103.5 14.5q76 0 136.5 -25t103 -74t65 -121t22.5 -164v-651h-98v651q0 150 -64.5 228t-184.5 78q-53 0 -102 -19t-86.5 -57.5 t-59.5 -96t-22 -133.5v-651h-97v651q0 148 -59.5 227t-172.5 79q-83 0 -154 -49.5t-126 -137.5v-770h-97z" />
+<glyph unicode="n" horiz-adv-x="1107" d="M166 0v1019h53q27 0 31 -26l9 -153q70 88 162.5 141.5t206.5 53.5q84 0 148 -26.5t106 -76.5t63.5 -121t21.5 -160v-651h-98v651q0 143 -65.5 224.5t-200.5 81.5q-100 0 -186 -51.5t-154 -141.5v-764h-97z" />
+<glyph unicode="o" horiz-adv-x="1107" d="M89 510q0 120 31.5 216.5t91 165.5t146 106t196.5 37t196.5 -37t145.5 -106t90.5 -165.5t31.5 -216.5t-31.5 -216t-90.5 -165t-145.5 -105.5t-196.5 -36.5t-196.5 36.5t-146 105.5t-91 165t-31.5 216zM189 510q0 -102 23.5 -184.5t69 -141t113.5 -90t159 -31.5t159 31.5 t113.5 90t68.5 141t23 184.5q0 101 -23 184t-68.5 142t-113.5 90.5t-159 31.5t-159 -31.5t-113.5 -90.5t-69 -142t-23.5 -184z" />
+<glyph unicode="p" horiz-adv-x="1095" d="M166 -360v1379h53q13 0 21.5 -5.5t9.5 -20.5l9 -157q68 92 158.5 146t203.5 54q188 0 292.5 -130t104.5 -390q0 -112 -29.5 -208.5t-85.5 -167.5t-138.5 -112t-190.5 -41q-104 0 -180 37.5t-131 112.5v-497h-97zM263 223q58 -88 129.5 -124t162.5 -36q90 0 157.5 33 t113 93t69 143.5t23.5 183.5q0 227 -83.5 334t-241.5 107q-101 0 -183.5 -52.5t-146.5 -146.5v-535z" />
+<glyph unicode="q" horiz-adv-x="1118" d="M89 507q0 112 29 208.5t86 167.5t139.5 112t190.5 41q105 0 182.5 -40t132.5 -117l9 114q1 26 30 26h54v-1379h-98v541q-68 -90 -157.5 -142t-200.5 -52q-187 0 -292 130t-105 390zM189 507q0 -227 84 -334t241 -107q101 0 183 52t147 145v539q-55 84 -128 120.5 t-164 36.5q-90 0 -157.5 -32.5t-113 -92.5t-69 -143.5t-23.5 -183.5z" />
+<glyph unicode="r" horiz-adv-x="813" d="M166 0v1019h51q17 0 25 -7t9 -25l8 -215q49 124 131 194t202 70q46 0 85 -9.5t74 -28.5l-14 -67q-3 -16 -20 -17q-6 0 -17.5 4.5t-28.5 9.5t-41.5 9t-56.5 4q-116 0 -190 -71.5t-120 -206.5v-663h-97z" />
+<glyph unicode="s" horiz-adv-x="880" d="M91 108l24 34q5 8 11 12.5t17 4.5q13 0 33 -16.5t51 -35.5t77.5 -35.5t115.5 -16.5q65 0 114 18t81.5 49t49.5 72.5t17 87.5q0 51 -24.5 84.5t-64.5 57t-90.5 40t-104.5 33t-104.5 36t-90.5 49t-64.5 72t-24.5 106.5q0 54 23.5 104t67 88t106 60.5t140.5 22.5 q93 0 165 -26.5t133 -81.5l-22 -34q-7 -14 -22 -14q-11 0 -29.5 12.5t-47.5 28.5t-71.5 29t-103.5 13q-55 0 -101 -16t-78 -42.5t-50 -62t-18 -74.5q0 -48 24.5 -80t64.5 -54.5t90.5 -38.5t104 -32.5t104 -36.5t90.5 -50t64.5 -73t24.5 -104q0 -67 -24 -124t-69.5 -99 t-112 -66.5t-151.5 -24.5q-108 0 -186 34.5t-139 89.5z" />
+<glyph unicode="t" horiz-adv-x="730" d="M53 938v38l174 12l25 365q1 9 7.5 16t18.5 7h46v-389h320v-73h-320v-691q0 -42 10.5 -72t29.5 -49.5t44.5 -29t55.5 -9.5q37 0 63.5 11t46 24t31.5 23.5t20 10.5t16 -10l27 -43q-39 -43 -99 -69t-125 -26q-103 0 -161 57t-58 177v696h-146q-11 0 -18.5 6.5t-7.5 17.5z " />
+<glyph unicode="u" horiz-adv-x="1107" d="M140 368v651h99v-651q0 -143 65.5 -225t199.5 -82q99 0 185 51t155 141v766h98v-1019h-54q-29 0 -30 27l-9 151q-71 -88 -163.5 -141t-206.5 -53q-85 0 -148.5 26.5t-105.5 76.5t-63.5 121t-21.5 160z" />
+<glyph unicode="v" horiz-adv-x="997" d="M26 1019h76q14 0 23 -7.5t13 -17.5l336 -804q10 -24 15 -45l11 -43q5 22 10.5 44t14.5 44l338 804q5 11 14 18t21 7h74l-430 -1019h-86z" />
+<glyph unicode="w" horiz-adv-x="1509" d="M23 1019h74q14 0 23.5 -7.5t12.5 -17.5l257 -804q7 -24 11 -45l9 -43q5 22 11 43.5t14 44.5l274 811q7 23 28 23h40q23 0 30 -23l269 -811q15 -46 25 -89q4 22 8.5 44t12.5 45l258 804q8 25 35 25h72l-341 -1019h-72q-16 0 -23 22l-280 827q-5 15 -9 30.5t-7 30.5 q-3 -15 -7 -30.5t-9 -30.5l-282 -827q-6 -22 -25 -22h-68z" />
+<glyph unicode="x" horiz-adv-x="943" d="M36 0l368 521l-354 498h93q14 0 21 -6t12 -15l299 -432q4 17 18 37l279 394q5 9 13 15.5t18 6.5h90l-356 -493l370 -526h-93q-14 0 -22.5 8.5t-13.5 17.5l-309 450q-5 -20 -15 -35l-297 -417q-7 -9 -15 -16.5t-19 -7.5h-87z" />
+<glyph unicode="y" horiz-adv-x="997" d="M23 1019h80q15 0 24 -7.5t13 -17.5l343 -792q6 -15 11 -31t9 -33q5 16 10.5 32t11.5 32l339 792q5 11 14.5 18t20.5 7h75l-586 -1347q-6 -14 -16 -23t-28 -9h-70l180 398z" />
+<glyph unicode="z" horiz-adv-x="925" d="M76 0v39q0 17 15 38l640 865h-621v77h736v-41q0 -22 -15 -39l-637 -862h626v-77h-744z" />
+<glyph unicode="{" horiz-adv-x="614" d="M65 610v63q36 0 65.5 11t50.5 32t32 49.5t11 61.5q0 56 -9.5 109.5t-21 107t-21 107t-9.5 111.5q0 62 19.5 115.5t56 92.5t90.5 61t122 22h56v-43q0 -11 -9 -17t-17 -6h-34q-44 0 -80 -15.5t-62 -44t-41 -69.5t-15 -91q0 -58 9 -113.5t20.5 -109.5t20.5 -107.5t9 -108.5 q0 -38 -12.5 -69.5t-33.5 -55t-48.5 -39.5t-56.5 -23q30 -6 57 -22t48 -40t33.5 -55t12.5 -69q0 -54 -9 -108t-20.5 -108.5t-20.5 -109.5t-9 -113q0 -50 15 -91t41 -69.5t62 -44t80 -15.5h34q8 0 17 -6t9 -17v-43h-56q-68 0 -122 22t-90.5 61.5t-56 92.5t-19.5 116 q0 57 9.5 110.5t21 107t21 106.5t9.5 110q0 34 -11 62t-32 49t-50.5 32t-65.5 11z" />
+<glyph unicode="|" horiz-adv-x="614" d="M268 -360v1913h77v-1913h-77z" />
+<glyph unicode="}" horiz-adv-x="614" d="M108 -227q0 11 8 17t17 6h34q44 0 80.5 15.5t62.5 44t41 69.5t15 91q0 57 -9.5 112.5t-20.5 110t-20.5 108t-9.5 108.5q0 38 12.5 69t33.5 55t48 40t57 22q-30 7 -57 23t-48 39.5t-33.5 55.5t-12.5 69q0 54 9.5 108t20.5 108t20.5 109t9.5 114q0 50 -15 91t-41 69.5 t-62.5 44t-80.5 15.5h-34q-9 0 -17 6t-8 17v43h56q68 0 121.5 -22t90.5 -61t56.5 -92.5t19.5 -115.5q0 -57 -10 -111t-21 -107.5t-21 -106.5t-10 -110q0 -34 11.5 -62t32.5 -49t50 -32t65 -11v-63q-36 0 -65 -11t-50 -32t-32.5 -49.5t-11.5 -61.5q0 -56 10 -109.5t21 -107 t21 -107t10 -110.5q0 -62 -19.5 -115.5t-56.5 -93t-91 -61.5t-121 -22h-56v43z" />
+<glyph unicode="~" d="M143 444q0 56 16.5 104.5t47.5 84.5t75.5 56.5t101.5 20.5q53 0 108 -20t108 -44.5t103.5 -44.5t94.5 -20q38 0 69 13.5t52.5 38t33.5 58.5t12 74h79q0 -56 -16 -104.5t-47 -84t-76 -56t-102 -20.5q-52 0 -107 20t-108.5 44.5t-104 44.5t-94.5 20q-39 0 -69 -14 t-51.5 -38.5t-33.5 -58.5t-13 -74h-79z" />
+<glyph unicode="&#xa2;" d="M163 510q0 115 32.5 210.5t95.5 164.5t155 108.5t209 41.5l11 210q1 13 8.5 23t21.5 10h37l-12 -246q89 -8 158 -37.5t123 -76.5l-24 -34q-5 -5 -9.5 -9t-13.5 -4t-26 12t-45 27t-69 28.5t-98 18.5l-44 -895q77 2 129 19.5t86.5 37.5t54.5 36.5t31 16.5q8 0 12 -2t8 -7 l25 -32q-24 -30 -59 -55t-80 -44t-98.5 -30.5t-112.5 -13.5l-11 -215q-1 -13 -8.5 -22.5t-21.5 -9.5h-37l12 248q-98 6 -179 44t-139.5 104.5t-90 160t-31.5 212.5zM259 510q0 -100 24 -179.5t69.5 -136.5t109.5 -89.5t144 -39.5l45 893q-94 -3 -167 -35t-123 -90t-76 -140 t-26 -183z" />
+<glyph unicode="&#xa3;" d="M69 647v33q0 15 9.5 25.5t26.5 10.5h169v301q0 95 27 177t79.5 142t132 94t183.5 34q78 0 137.5 -19t104 -51.5t76.5 -76.5t54 -93l-39 -23q-9 -5 -22 -5q-17 0 -31 17q-20 32 -43.5 62.5t-55 54t-75.5 37t-106 13.5q-80 0 -139.5 -26.5t-100.5 -74t-61.5 -114.5 t-20.5 -148v-301h490v-40q0 -11 -8.5 -20t-21.5 -9h-460v-311q0 -91 -37 -153t-101 -106q23 4 44.5 6t45.5 2h806v-41q0 -15 -12.5 -29.5t-33.5 -14.5h-993v67q35 13 68 33.5t58.5 50t40 69.5t14.5 93v334h-205z" />
+<glyph unicode="&#xa5;" d="M87 1449h81q27 0 40 -26l354 -681q8 -20 15 -38t12 -35q9 34 26 73l354 681q5 11 14.5 18.5t24.5 7.5h82l-434 -818h356v-60h-375v-120h375v-60h-375v-391h-97v391h-375v60h375v120h-375v60h354z" />
+<glyph unicode="&#xa9;" horiz-adv-x="1651" d="M87 725q0 101 26.5 196t74.5 177t115.5 149.5t149.5 115.5t176 74.5t196 26.5t196.5 -26.5t177 -74.5t150 -115.5t115 -149.5t74.5 -177t27 -196q0 -102 -27 -196.5t-74.5 -176.5t-115 -149.5t-150 -115.5t-176.5 -74.5t-197 -26.5q-101 0 -195.5 26.5t-176.5 74.5 t-149.5 115.5t-115.5 149.5t-74.5 176.5t-26.5 196.5zM147 725q0 -142 53 -266.5t145 -217.5t215.5 -146t264.5 -53t265.5 53t217 146t145.5 217.5t53 266.5t-53 266.5t-145.5 218t-216.5 147t-266 53.5q-141 0 -264.5 -53.5t-215.5 -147t-145 -218t-53 -266.5zM387 726 q0 102 34.5 187t96 146t146.5 95t186 34q53 0 97.5 -8t82.5 -22.5t71 -35.5t64 -49l-24 -34q-7 -11 -21 -11q-10 0 -27 13.5t-46.5 29t-76 29t-116.5 13.5q-85 0 -154.5 -27t-119.5 -77.5t-77 -122t-27 -160.5q0 -92 27 -164t75.5 -121.5t114.5 -75.5t145 -26q87 0 150 21 t118 64q12 10 23 10q5 0 9.5 -2t6.5 -4l32 -32q-60 -60 -142.5 -96t-200.5 -36q-98 0 -181 33.5t-141.5 94t-91.5 145.5t-33 189z" />
+<glyph unicode="&#xad;" horiz-adv-x="680" d="M102 566v83h477v-83h-477z" />
+<glyph unicode="&#xae;" horiz-adv-x="1651" d="M87 725q0 101 26.5 196t74.5 177t115.5 149.5t149.5 115.5t176 74.5t196 26.5t196.5 -26.5t177 -74.5t150 -115.5t115 -149.5t74.5 -177t27 -196q0 -102 -27 -196.5t-74.5 -176.5t-115 -149.5t-150 -115.5t-176.5 -74.5t-197 -26.5q-101 0 -195.5 26.5t-176.5 74.5 t-149.5 115.5t-115.5 149.5t-74.5 176.5t-26.5 196.5zM147 725q0 -142 53 -266.5t145 -217.5t215.5 -146t264.5 -53t265.5 53t217 146t145.5 217.5t53 266.5t-53 266.5t-145.5 218t-216.5 147t-266 53.5q-141 0 -264.5 -53.5t-215.5 -147t-145 -218t-53 -266.5zM552 272v907 h253q157 0 237 -59t80 -180q0 -102 -66 -167.5t-186 -82.5q12 -7 22 -16.5t19 -24.5l292 -377h-82q-10 0 -17.5 3.5t-13.5 13.5l-277 359q-8 11 -21 18t-40 7h-113v-401h-87zM639 738h152q124 0 184.5 50t60.5 143q0 94 -55 137t-176 43h-166v-373z" />
+<glyph unicode="&#xb4;" horiz-adv-x="599" d="M212 1189l161 244q11 18 23.5 25t36.5 7h96l-221 -259q-8 -10 -16.5 -13.5t-21.5 -3.5h-58z" />
+<glyph unicode="&#x2000;" horiz-adv-x="833" />
+<glyph unicode="&#x2001;" horiz-adv-x="1667" />
+<glyph unicode="&#x2002;" horiz-adv-x="833" />
+<glyph unicode="&#x2003;" horiz-adv-x="1667" />
+<glyph unicode="&#x2004;" horiz-adv-x="555" />
+<glyph unicode="&#x2005;" horiz-adv-x="416" />
+<glyph unicode="&#x2006;" horiz-adv-x="277" />
+<glyph unicode="&#x2007;" horiz-adv-x="277" />
+<glyph unicode="&#x2008;" horiz-adv-x="207" />
+<glyph unicode="&#x2009;" horiz-adv-x="332" />
+<glyph unicode="&#x200a;" horiz-adv-x="92" />
+<glyph unicode="&#x2010;" horiz-adv-x="680" d="M102 566v83h477v-83h-477z" />
+<glyph unicode="&#x2011;" horiz-adv-x="680" d="M102 566v83h477v-83h-477z" />
+<glyph unicode="&#x2012;" horiz-adv-x="680" d="M102 566v83h477v-83h-477z" />
+<glyph unicode="&#x2013;" horiz-adv-x="1107" d="M151 556v73h805v-73h-805z" />
+<glyph unicode="&#x2014;" horiz-adv-x="1629" d="M151 556v73h1328v-73h-1328z" />
+<glyph unicode="&#x2018;" horiz-adv-x="404" d="M133 1237q0 80 39 153.5t101 134.5l28 -19q8 -6 8 -14q0 -7 -6 -13q-39 -52 -64.5 -103.5t-25.5 -106.5q0 -60 36 -123q5 -8 5 -17q0 -14 -15 -20l-64 -27q-22 39 -32 77.5t-10 77.5z" />
+<glyph unicode="&#x2019;" horiz-adv-x="404" d="M113 1103q0 8 6 14q39 51 64.5 103t25.5 107q0 59 -36 122q-5 8 -5 16q0 14 15 21l63 26q23 -39 33 -77t10 -77q0 -80 -39 -154t-102 -134l-28 19q-7 6 -7 14z" />
+<glyph unicode="&#x201c;" horiz-adv-x="680" d="M133 1237q0 80 39 153.5t101 134.5l28 -19q8 -6 8 -14q0 -7 -6 -13q-39 -52 -64.5 -103.5t-25.5 -106.5q0 -60 36 -123q5 -8 5 -17q0 -14 -15 -20l-64 -27q-22 39 -32 77.5t-10 77.5zM409 1237q0 80 38.5 153.5t101.5 134.5l28 -19q8 -6 8 -14q0 -7 -6 -13 q-39 -52 -65 -103.5t-26 -106.5q0 -60 36 -123q5 -8 5 -17q0 -14 -15 -20l-63 -27q-22 39 -32 77.5t-10 77.5z" />
+<glyph unicode="&#x201d;" horiz-adv-x="680" d="M113 1103q0 8 6 14q39 51 64.5 103t25.5 107q0 59 -36 122q-5 8 -5 16q0 14 15 21l63 26q23 -39 33 -77t10 -77q0 -80 -39 -154t-102 -134l-28 19q-7 6 -7 14zM388 1103q0 8 6 14q39 51 64.5 103t25.5 107q0 59 -35 122q-5 8 -6 16q0 14 16 21l62 26q23 -39 33 -77 t10 -77q0 -80 -39 -154t-101 -134l-29 19q-7 6 -7 14z" />
+<glyph unicode="&#x2022;" d="M293 610q0 62 23.5 117.5t64.5 97t95 65t116 23.5t117.5 -23.5t96.5 -65t64.5 -96.5t23.5 -118q0 -61 -23.5 -115t-64.5 -95t-96.5 -64.5t-117.5 -23.5q-61 0 -115.5 23.5t-95.5 64.5t-64.5 95t-23.5 115z" />
+<glyph unicode="&#x2026;" horiz-adv-x="1409" d="M108 79q0 19 7 36.5t19.5 30.5t29.5 20.5t38 7.5q19 0 36.5 -7.5t30.5 -20.5t20.5 -30.5t7.5 -36.5q0 -20 -7.5 -37t-20.5 -30t-30.5 -20t-36.5 -7q-40 0 -67 27t-27 67zM609 79q0 19 7.5 36.5t20 30.5t29.5 20.5t37 7.5q19 0 37 -7.5t30.5 -20.5t20.5 -30.5t8 -36.5 q0 -20 -8 -37t-20.5 -30t-30 -20t-37.5 -7q-40 0 -67 27t-27 67zM1112 79q0 19 7 36.5t20 30.5t30 20.5t37 7.5q19 0 37 -7.5t30.5 -20.5t20.5 -30.5t8 -36.5q0 -20 -8 -37t-20.5 -30t-30 -20t-37.5 -7q-40 0 -67 27t-27 67z" />
+<glyph unicode="&#x202f;" horiz-adv-x="332" />
+<glyph unicode="&#x205f;" horiz-adv-x="416" />
+<glyph unicode="&#x20ac;" d="M32 583v60h161l-2 40t-1 42q0 50 4 99h-162v60h168q16 135 62 242.5t117 182t164 114.5t206 40q66 0 121.5 -11.5t103 -34t89 -56t79.5 -77.5l-32 -36q-4 -5 -9 -8.5t-14 -3.5q-8 0 -19 10.5t-28.5 26t-42.5 34.5t-59.5 34.5t-80 26t-104.5 10.5q-92 0 -169 -32 t-135 -94.5t-96 -154.5t-53 -213h616v-31q0 -11 -7.5 -20t-24.5 -9h-590q-3 -48 -3 -99q0 -22 0.5 -41.5t1.5 -40.5h529v-31q0 -12 -8 -20.5t-23 -8.5h-493q13 -127 50 -223.5t94.5 -161t134 -97t168.5 -32.5q63 0 112 12t86 31t63.5 41t45 41t31.5 31.5t22 12.5 q10 0 19 -10l38 -35q-37 -47 -80 -85.5t-95 -66t-113.5 -42t-133.5 -14.5q-116 0 -210 40t-163 116.5t-112 187.5t-57 254h-166z" />
+<glyph unicode="&#x2122;" horiz-adv-x="1461" d="M74 1389v60h482v-60h-204v-529h-72v529h-206zM684 860v589h58q10 0 15 -2t12 -10l222 -373l11 -30q5 16 14 30l218 373q5 8 9.5 10t14.5 2h59v-589h-64v454l5 45l-224 -389q-8 -16 -25 -17h-12q-17 0 -25 17l-229 387l6 -43v-454h-65z" />
+<glyph unicode="&#xe000;" horiz-adv-x="1020" d="M0 1020h1020v-1020h-1020v1020z" />
+</font>
+</defs></svg> 

app/assets/stylesheets/application.css

@@ -17,6 +17,18 @@
  *= require jquery-ui
 */
 
+@font-face {
+    font-family: 'LatoLight';
+    src: url('/assets/Fonts/Lato-Lig-webfont.eot');
+    src: url('/assets/Fonts/Lato-Lig-webfont.eot?#iefix') format('embedded-opentype'),
+         url('/assets/Fonts/Lato-Lig-webfont.woff') format('woff'),
+         url('/assets/Fonts/Lato-Lig-webfont.ttf') format('truetype'),
+         url('/assets/Fonts/Lato-Lig-webfont.svg#LatoLight') format('svg');
+    font-weight: normal;
+    font-style: normal;
+
+}
+
 /* clear styles */
 html, body, div, h1, h2, h3, h4, h5, h6, 
 ul, ol, dl, li, dt, dd, p, blockquote,
@@ -47,7 +59,8 @@ html {
 
 body {
   background:#031924 url(background2-for-repeating.jpg) repeat 0 0;
-  font-family: 'katarine-web', sans-serif;
+  /* font-family: 'katarine-web', sans-serif; */
+  font-family: 'LatoLight', sans-serif;
   background-attachment:fixed;
   color:#FFF;
 }
@@ -261,25 +274,46 @@ input[type="submit"] {
   top:0;
   right:0;
   z-index:10;
-  width:auto;
+  width:218px;
-  border-radius:15px;
+  border-radius:10px;
-  margin:10px;
+  margin: 10px 0px 10px 10px;
+  background:#FFF;
+  padding:5px 10px;
+  border:1px solid #000;
+  box-shadow: 6px 6px 8px rgba(0,0,0,0.4);
 }
 
 .headertop button, .headertop input {
-  float:left;
+  float:right;
   height: 30px;
-  border-radius: 12px;
+  border-radius: 3px;
-  background: url('black_bg.png');
+  background: #FFF;
-  color: #FFF;
+  color: #111;
   font-family: 'katarine-web';
   font-size: 18px;
   border: 1px solid #000;
   cursor: pointer;	
+  margin:3px 0;
+  clear:both;
 }
 
 .headertop button:hover, .headertop input:hover {
-  background: #000;	
+  background: #EEE;	
+}
+
+.hidelabels {
+width: 80px;
+height: 25px;
+float: right;
+background: url('labelCheckbox.png') no-repeat 0px -36px;
+display: block;
+padding-left: 34px;
+padding-top:6px;
+cursor:pointer;
+color:#111;
+}
+.hidelabels.checked {
+background: url('labelCheckbox.png') no-repeat 0px 0px;
 }
 
 .wrapper {
@@ -427,7 +461,7 @@ input[type="submit"] {
   left:0px;
   display:block;
   height:32px;
-  background: url('bg.png') repeat 0 0;
+  background: #FFF;
   padding:0 0 0 15px;
   border-bottom-right-radius:10px;
   border-top-right-radius:10px;
@@ -435,6 +469,7 @@ input[type="submit"] {
   border:1px solid #000;
   overflow:hidden;
   cursor:pointer;
+  box-shadow: 6px 6px 8px rgba(0,0,0,0.4);
 }
 
 #sideOptionFind {
@@ -586,6 +621,7 @@ input[type="submit"] {
   border-bottom-right-radius: 15px;
   border-top-right-radius: 15px;
   z-index: 15000;
+  border:1px solid #000;
 }
 
 .logo {
@@ -623,7 +659,7 @@ input[type="submit"] {
   display:block;
   position:absolute;
   border:none;
-  bottom:40px;
+  bottom:42px;
   left:10px;
   height:0px;
   z-index:12;
@@ -643,6 +679,8 @@ input[type="submit"] {
   -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: url('black_bg.png') repeat 0 0;
+  border-left:1px solid #000;
+  border-right:1px solid #000;
 }
 
 .footer ul li {

app/assets/stylesheets/base.css

@@ -40,10 +40,12 @@
   width:175px;
   height:300px;
   padding:10px 5px 10px 35px;
-  background: url('bg.png');
+  background: #FFF;
-  border-radius:15px;
+  border-radius:10px;
   color:#000;
   z-index: 25;
+  border:1px solid #000;
+  box-shadow: 6px 6px 8px rgba(0,0,0,0.4);
 }
 
 .CardOnGraph .scroll {

app/assets/stylesheets/maps.css.scss

@@ -11,14 +11,6 @@
   font-style: italic;
 }
 
-.saveMapLayout { 
-  float:left;
-}
-
-.saveMapLayout input {
- margin-top:0px;
-}
-
 #MapRealtime { 
   display:none;
 }

app/views/layouts/application.html.erb

@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Metamaps</title>
+  <title><%=h yield(:title) %></title>
   <% if authenticated? %>
     <script type="text/javascript">
       var userid = <%= user.id %>;

app/views/main/console.html.erb

@@ -5,7 +5,11 @@
   # so it's kind of like a workspace. You can then save to map, etc.
   # Emphasis is on pulling in and creating data.
   #%>
+  
+<% content_for :title, "Console | Metamaps" %>  
+  
   <div class="headertop">
+    <div class="hidelabels checked" onclick="hideLabels()">Show Labels</div>
     <button onclick="hideSelectedEdges();hideSelectedNodes();">Hide Selected</button>
     <button onclick="enterKeyHandler();">Keep Selected</button>
     <% if authenticated? %>

app/views/main/home.html.erb

@@ -3,6 +3,9 @@
   # Located at /
   # Shows 3 most recently created topics, synapses, and maps.
   #%>
+  
+<% content_for :title, "Home | Metamaps" %>   
+  
 <div class="home_bg">
 <p class="contact">
   To get in touch, follow or tweet at us! <a target="_blank" href="https://twitter.com/metamapps">@metamapps</a>.

app/views/main/invite.html.erb

@@ -3,6 +3,9 @@
   # TODO: Where is this file located?
   # Page allowing users to invite others to Metamaps.
   #%>
+  
+<% content_for :title, "Invite | Metamaps" %>   
+  
 <div class="invite">
   <h3>Invite Others</h3>
   <p>You can invite others to the Metamaps platform. Just send them the link to</p><p><strong>http://metamaps.cc/users/new</strong></p><p>and give them the access code shown below.</p>

app/views/main/requestinvite.html.erb

@@ -4,6 +4,8 @@
   # Shows a form where people can request an invite
   #%>
 
+<% content_for :title, "Request Invite | Metamaps" %>   
+  
 <iframe class="requestInvite" src="https://docs.google.com/forms/d/1lWoKPFHErsDfV5l7-SvcHxwX3vDi9nNNVW0rFMgJwgg/viewform?embedded=true" width="760" height="720" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>
 
 <script>

app/views/maps/edit.html.erb

@@ -3,6 +3,9 @@
   # Form for editing a map
   # Located at addresses /maps/:id/edit. In use.
   #%>
+  
+<% content_for :title, "Edit " + @map.name + " | Metamaps" %>   
+  
 <%= form_for @map, url: map_url(@map) do |form| %>
   <h3>Edit Map</h3>
   <label for="map_name">Name</label>

app/views/maps/embed.html.erb

@@ -4,6 +4,8 @@
   # /maps/:id
   #%>
 
+<% content_for :title, @map.name + " | Metamaps" %>   
+  
 <div class="headertop">
     <% if authenticated? %>
       <% if (@map.permission == "commons" && authenticated?) || @map.user == user %>

app/views/maps/index.html.erb

@@ -3,6 +3,13 @@
   # Shows a list of all maps, or just a user's maps.
   # TODO: What url is this accessible at?
   #%>
+  
+<% if @user %>  
+  <% content_for :title, @user.name + "'s Maps | Metamaps" %> 
+<% else %>
+  <% content_for :title, "All Maps | Metamaps" %>
+<% end %>
+  
 <h1 class="index"><% if @user %><%= @user.name %>'s<% end %> Maps</h1>
 
 <div class="maps" id="cards">

app/views/maps/new.html.erb

@@ -3,6 +3,9 @@
   # Form to create a new map.
   # Accessible from /maps/new. Still in use.
   #%>
+  
+<% content_for :title, "New Map | Metamaps" %>  
+  
 <div class="nothidden">
 <%= form_for @map || Map.new, url: maps_url do |form|%>
   <h3>Add Map</h3>

app/views/maps/show.html.erb

@@ -4,7 +4,10 @@
   # /maps/:id
   #%>
   
+<% content_for :title, @map.name + " | Metamaps" %>
+
 <div class="headertop">
+    <div class="hidelabels checked" onclick="hideLabels()">Show Labels</div>
     <button onclick="if (!goRealtime) { this.innerHTML = 'Stop Realtime'; } else if (goRealtime) { this.innerHTML = 'Start Realtime'; } goRealtime = !goRealtime;">Start Realtime</button>
     <button onclick="hideSelectedEdges();hideSelectedNodes();">Hide Selected</button>
     <button onclick="enterKeyHandler();">Keep Selected</button>

app/views/sessions/new.html.erb

@@ -3,6 +3,9 @@
   # Located at /sessions/new
   # Form to log in
   #%>
+  
+<% content_for :title, "Login | Metamaps" %>   
+  
 <%= form_for @session || Session.new, url: session_path do |form| %>
   <h3>Login</h3>
   <label for="session_email">Email</label>

app/views/topics/index.html.erb

@@ -5,6 +5,12 @@
   # TODO: What URL accesses this view?
   #%>
 
+<% if @user %><%= @user.name %>'s <% end %>
+  <% content_for :title, @user.name + "'s Topics | Metamaps" %>
+<% else %>
+  <% content_for :title, "Topics | Metamaps" %>
+<% end %> 
+  
 <h1 class="index"><% if @user %><%= @user.name %>'s <% end %>Topics</h1>
 
 <div class="topics" id="cards">

app/views/topics/show.html.erb

@@ -14,7 +14,10 @@
   #
   #%>
 
+<% content_for :title, @topic.name + " | Metamaps" %>  
+  
 <div class="headertop">
+  <div class="hidelabels checked" onclick="hideLabels()">Show Labels</div>
   <button onclick="enterKeyPressed();">Keep Selected</button>
   <% if authenticated? %>
     <button onclick="saveToMap();">Save to Map</button>

app/views/users/edit.html.erb

@@ -3,6 +3,9 @@
   # /users/:id/edit
   # User edit form
   #%>
+  
+<% content_for :title, @user.name + "'s Settings | Metamaps" %>  
+  
 <%= formula_form_for @user, url: user_url do |form| %>
   <h3>Choose Active Metacodes</h3>
   <div class="allMetacodes"><span id="showAll">Show All</span><span id="hideAll">Hide All</span></div>

app/views/users/new.html.erb

@@ -3,6 +3,9 @@
   # Located at /users/new
   # New user form
   #%>
+  
+<% content_for :title, "Create Account | Metamaps" %>  
+  
 <%= formula_form_for @user, url: users_url do |form| %>
   <h3>Create Account</h3>
   <%= form.input :name, label: "Name", class: "name" %>

app/views/users/show.html.erb

@@ -4,24 +4,8 @@
   # TODO: What URL?
   # TODO: Is this code used?
   #%>
-<!--<div class="focus">
+
-	<div class="focusleft">
+<% content_for :title, @user.name + "'s Profile | Metamaps" %>
-		<p># of Topics: <%= @user.topics.count %></p>
-		<p># of Synapses: <%= @user.synapses.count %></p>
-		<p># of Maps: <%= @user.maps.count %></p>
-	</div>
-	<div class="focusmiddle">
-		<h1 class="title"><%= @user.name %></h1>
-		<div class="desc">
-			<p><%= link_to "View their topics", user_topics_path(@user)%></p>
-			<p><%= link_to "View their synapses", user_synapses_path(@user)%></p>
-			<p><%= link_to "View their maps", user_maps_path(@user) %></p>
-		</div>
-	</div>
-	<div class="focusright">
-	</div>
-</div>
-<div class="clearfloat nodemargin"></div>-->
 
 <div class="profile">