diff --git a/app/assets/images/home_bg.png b/app/assets/images/home_bg.png new file mode 100644 index 00000000..5fce9a00 Binary files /dev/null and b/app/assets/images/home_bg.png differ diff --git a/app/assets/images/home_bg_2.png b/app/assets/images/home_bg_2.png new file mode 100644 index 00000000..d0c6c82a Binary files /dev/null and b/app/assets/images/home_bg_2.png differ diff --git a/app/assets/javascripts/Jit/onCreateLabelHandler.js b/app/assets/javascripts/Jit/onCreateLabelHandler.js index 7284fa80..3370b402 100644 --- a/app/assets/javascripts/Jit/onCreateLabelHandler.js +++ b/app/assets/javascripts/Jit/onCreateLabelHandler.js @@ -283,7 +283,7 @@ function bindCallbacks(showCard, nameContainer, node) { $('.name').css('display','block'); $('.name.topic_' + node.id).css('display','none'); $('.showcard.topic_' + node.id).fadeIn('fast'); - //selectNodeOnClickHandler(node,e); + $('.showcard.topic_' + node.id).find('.scroll').mCustomScrollbar("update"); node.setData('dim', 1, 'current'); Mconsole.plot(); }); @@ -312,10 +312,9 @@ function bindCallbacks(showCard, nameContainer, node) { $(nameContainer).find('.label').html(name); }); - //available if you want it :) - //$(showCard).find('.best_in_place_desc').bind("ajax:success", function() { - // var desc = $(this).html(); - //}); + $(showCard).find('.best_in_place_desc').bind("ajax:success", function() { + $(showCard).find('.scroll').mCustomScrollbar("update"); + }); $(showCard).find('.best_in_place_link').bind("ajax:success", function() { var link = $(this).html(); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5def847a..22336cd2 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,7 +25,7 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null, $(document).ready(function() { - $('#new_topic, #new_synapse').bind('contextmenu', function(e){ + $('#new_topic, #new_synapse').bind('contextmenu', function(e){ return false; }); @@ -33,7 +33,7 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null, $('#topic_name').bind('railsAutocomplete.select', function(event, data){ if (data.item.id != undefined) { $('#topic_grabTopic').val(data.item.id); - $('.new_topic').submit(); + $('.new_topic').submit(); } }); @@ -41,7 +41,6 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null, event.preventDefault(); }); - //$("#cards").mCustomScrollbar(); $(".scroll").mCustomScrollbar(); //$('.nodemargin').css('padding-top',$('.focus').css('height')); @@ -86,6 +85,13 @@ var labelType, useGradients, nativeTextSupport, animate, json, Mconsole = null, $(this).parents('.CardOnGraph').find('img.icon').attr('alt', metacode); $(this).parents('.CardOnGraph').find('img.icon').attr('src', imgArray[metacode].src); }); + $('.best_in_place_desc').bind("ajax:success", function() { + $(this).parents('.CardOnGraph').find('.scroll').mCustomScrollbar("update"); + }); + $('.best_in_place_link').bind("ajax:success", function() { + var link = $(this).html(); + $(this).parents('.CardOnGraph').find('.go-link').attr('href', link); + }); // this is to save the layout of maps when you're on a map page $("#saveLayout").click(function(event) { diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c139866a..9ed5830c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -64,7 +64,7 @@ h1 { h2 { display:block; text-align:center; - font-family: "vinyl",sans-serif; + font-family: "katarine-web",sans-serif; background: url('black_bg.png'); font-size:24px; line-height:35px; @@ -108,6 +108,11 @@ a { width: 845px; } +.requestInvite { + display:block; + margin:-720px auto 0; +} + .new_session, .new_user, .new_map, @@ -651,6 +656,31 @@ input[type="submit"] { display:block; } +.home_bg { + background: url('home_bg.png') no-repeat; + overflow-y:scroll; + display:block; + height:100%; +} + +.home_content { + width: 830px; + margin:0 auto; +} + +span.blue { + color: #36bbe8; +} + +.home_desc { +font-style: oblique; +text-transform: uppercase; +font-family: 'vinyl'; +font-size: 40px; +margin: 20px; +text-align:center; +} + .contact { text-align: center; margin: 1em 0 1em 0; diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 4d8c2c0a..9817c8f0 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -73,9 +73,28 @@ } .best_in_place_name { - max-width:130px; + width:150px; float:left; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } +.best_in_place_name:hover { + width:150px; + float:left; + text-overflow: none; + white-space: normal; + overflow: visible; + position: absolute; + background: #ddd; + border-radius: 10px; + padding: 5px; + opacity: 0.98; + box-shadow: 4px 4px 5px #888888; + border: 1px solid #AAA; + z-index: 5; +} + .best_in_place_name input{ max-width:130px; diff --git a/app/assets/stylesheets/maps.css.scss b/app/assets/stylesheets/maps.css.scss index a4e11a01..129a14bb 100644 --- a/app/assets/stylesheets/maps.css.scss +++ b/app/assets/stylesheets/maps.css.scss @@ -34,7 +34,7 @@ padding: 0; cursor:pointer; } -.map .scroll { display:block; height:283px; } +.map .scroll { display:block; height:250px; } .map .type {position: absolute; color: white; @@ -46,7 +46,7 @@ line-height: 24px;} .map .icon { position:absolute; top:135px; left:-25px; } -.map .title { font-size:22px; line-height:25px; display:block; border-bottom:2px solid #000; padding-bottom:5px; } +.map .title { font-size:22px; line-height:27px; display:block; border-bottom:2px solid #000; padding-bottom:5px; } .map .desc { font-size:15px; font-family:Arial, Helvetica, sans-serif; } .map .desc h3 { font-style:normal; margin-top:5px; } diff --git a/app/assets/stylesheets/topics.css.scss b/app/assets/stylesheets/topics.css.scss index 67eaec5e..7b42ffa9 100644 --- a/app/assets/stylesheets/topics.css.scss +++ b/app/assets/stylesheets/topics.css.scss @@ -71,7 +71,7 @@ line-height: 24px;} .topic .icon { position:absolute; top:135px; left:-25px; } -.topic .title { font-size:22px; line-height:25px; display:block; border-bottom:2px solid #000; padding-bottom:5px; } +.topic .title { font-size:22px; line-height:27px; display:block; border-bottom:2px solid #000; padding-bottom:5px; } .topic .desc { font-size:15px; font-family:Arial, Helvetica, sans-serif; } .topic .desc h3 { font-style:normal; margin-top:5px; } @@ -79,6 +79,7 @@ line-height: 24px;} .topic-go-arrow { width: 25px; height: 25px; + padding-bottom: 2px; float: right; } diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 624fad22..19b4252f 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -6,14 +6,10 @@ class MainController < ApplicationController respond_to :html, :js, :json def home - @topics = Topic.visibleToUser(@current, nil).sort! { |a,b| b.created_at <=> a.created_at } - @topics = @topics.slice(0,3) - @synapses = Synapse.visibleToUser(@current, nil).sort! { |a,b| b.created_at <=> a.created_at } - @synapses = @synapses.slice(0,3) @maps = Map.visibleToUser(@current, nil).sort! { |a,b| b.created_at <=> a.created_at } @maps = @maps.slice(0,3) - respond_with(@topics, @synapses, @maps) + respond_with(@maps) end def console @@ -50,6 +46,11 @@ class MainController < ApplicationController end end + + def requestinvite + + end + def invite @user = current_user diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d7a42fde..d6ac3a09 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -46,22 +46,22 @@