diff --git a/Gemfile b/Gemfile
index 115bd656..f003f081 100644
--- a/Gemfile
+++ b/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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3da3749f..ed88ddf9 100644
--- a/Gemfile.lock
+++ b/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
diff --git a/public/assets/delete-7ac5d3a05903d72d77df086d021613fc.png b/app/assets/images/labelCheckbox.png
similarity index 61%
rename from public/assets/delete-7ac5d3a05903d72d77df086d021613fc.png
rename to app/assets/images/labelCheckbox.png
index 9e290c1f..8f6a6e5e 100644
Binary files a/public/assets/delete-7ac5d3a05903d72d77df086d021613fc.png and b/app/assets/images/labelCheckbox.png differ
diff --git a/public/assets/minus-f4a2131951232ddd339080a1181fe219.png b/app/assets/images/menuicon.png
similarity index 80%
rename from public/assets/minus-f4a2131951232ddd339080a1181fe219.png
rename to app/assets/images/menuicon.png
index 802a9fc4..a72fd312 100644
Binary files a/public/assets/minus-f4a2131951232ddd339080a1181fe219.png and b/app/assets/images/menuicon.png differ
diff --git a/app/assets/javascripts/Jit/graphsettings.js b/app/assets/javascripts/Jit/graphsettings.js
index 9f6d953d..f1208b3e 100644
--- a/app/assets/javascripts/Jit/graphsettings.js
+++ b/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
diff --git a/app/assets/javascripts/Jit/jit2.0.0.js b/app/assets/javascripts/Jit/jit2.0.0.js
index 3a7d69e2..61520b7a 100644
--- a/app/assets/javascripts/Jit/jit2.0.0.js
+++ b/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
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 35ef4a3a..fef406f2 100644
--- a/app/assets/javascripts/application.js
+++ b/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;
diff --git a/app/assets/stylesheets/Fonts/Lato-Lig-webfont.eot b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.eot
new file mode 100644
index 00000000..42265967
Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.eot differ
diff --git a/app/assets/stylesheets/Fonts/Lato-Lig-webfont.svg b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.svg
new file mode 100644
index 00000000..e89a231a
--- /dev/null
+++ b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.svg
@@ -0,0 +1,147 @@
+
+
+
\ No newline at end of file
diff --git a/app/assets/stylesheets/Fonts/Lato-Lig-webfont.ttf b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.ttf
new file mode 100644
index 00000000..86b4e957
Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.ttf differ
diff --git a/app/assets/stylesheets/Fonts/Lato-Lig-webfont.woff b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.woff
new file mode 100644
index 00000000..0c337a6a
Binary files /dev/null and b/app/assets/stylesheets/Fonts/Lato-Lig-webfont.woff differ
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 8bbb6f6f..154e7f0d 100644
--- a/app/assets/stylesheets/application.css
+++ b/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;
- border-radius:15px;
- margin:10px;
+ width:218px;
+ border-radius: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;
- background: url('black_bg.png');
- color: #FFF;
+ border-radius: 3px;
+ background: #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 {
diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index a9bd8a59..0a9a10a5 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -40,10 +40,12 @@
width:175px;
height:300px;
padding:10px 5px 10px 35px;
- background: url('bg.png');
- border-radius:15px;
+ background: #FFF;
+ 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 {
diff --git a/app/assets/stylesheets/maps.css.scss b/app/assets/stylesheets/maps.css.scss
index c1b3557e..54e84a54 100644
--- a/app/assets/stylesheets/maps.css.scss
+++ b/app/assets/stylesheets/maps.css.scss
@@ -11,14 +11,6 @@
font-style: italic;
}
-.saveMapLayout {
- float:left;
-}
-
-.saveMapLayout input {
- margin-top:0px;
-}
-
#MapRealtime {
display:none;
}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 3ffc097d..e461f3ae 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -8,7 +8,7 @@
- Metamaps
+ <%=h yield(:title) %>
<% if authenticated? %>