diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 5e70e7d0b..ef6f410d2 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -8,6 +8,7 @@ class HomeController < ApplicationController if current_user redirect_to aspects_path else + @landing_page = true render :show end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index fd28b64f2..904909947 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -28,11 +28,12 @@ = javascript_include_tag "//ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" - = javascript_include_tag "vendor/jquery144.min" :javascript - !window.jQuery && document.write(unescape('%3Cscript src="js/libs/jquery-1.4.4.js"%3E%3C/script%3E')) - = include_javascripts :main + !window.jQuery && document.write(unescape('%3Cscript src="/javascripts/vendor/jquery144.min.js"%3E%3C/script%3E')) + + - unless @landing_page + = include_javascripts :main - if current_user = include_javascripts :flash_socket unless modern_browser? @@ -60,10 +61,11 @@ %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.real_name}"} %body - #notification + -unless @landing_page + #notification - - flash.each do |name, msg| - = content_tag :div, msg, :id => "flash_#{name}" + - flash.each do |name, msg| + = content_tag :div, msg, :id => "flash_#{name}" %header{:class=>('landing' unless current_user)} = render 'layouts/header' @@ -82,18 +84,19 @@ %li= link_to 'github', "https://github.com/diaspora/diaspora" %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com" - :javascript - var is_ssl = ("https:" == document.location.protocol); - var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/"; - document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E")); + -unless @landing_page + :javascript + var is_ssl = ("https:" == document.location.protocol); + var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/"; + document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E")); - :javascript - var feedback_widget_options = {}; + :javascript + var feedback_widget_options = {}; - feedback_widget_options.display = "overlay"; - feedback_widget_options.company = "diaspora"; - feedback_widget_options.placement = "right"; - feedback_widget_options.color = "#222"; - feedback_widget_options.style = "idea"; - var feedback_widget = new GSFN.feedback_widget(feedback_widget_options); - + feedback_widget_options.display = "overlay"; + feedback_widget_options.company = "diaspora"; + feedback_widget_options.placement = "right"; + feedback_widget_options.color = "#222"; + feedback_widget_options.style = "idea"; + var feedback_widget = new GSFN.feedback_widget(feedback_widget_options); +