Make spam scoring work with new rich text system

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 19835489c65b4e4b059d336b090e2f3666d481cb..33e95f6a2ff3d6b82bf456db13b5e8721042c1ef 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -73,13 +73,13 @@
           <%= t 'layouts.intro_1' %>
         </p>
         <p>
           <%= t 'layouts.intro_1' %>
         </p>
         <p>

-        <%= raw(t 'layouts.intro_2',
+        <%= t 'layouts.intro_2_html',

                 :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"),
                 :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')),
                 :license => link_to(t('layouts.intro_2_license'),
                                    url_for({:controller => 'site', :action => 'copyright'})),
                 :create_account => link_to(t('layouts.intro_2_create_account'),
                 :download => link_to(t('layouts.intro_2_download'), "http://planet.openstreetmap.org/"),
                 :use => link_to(t('layouts.intro_2_use'), t('layouts.intro_2_use_url')),
                 :license => link_to(t('layouts.intro_2_license'),
                                    url_for({:controller => 'site', :action => 'copyright'})),
                 :create_account => link_to(t('layouts.intro_2_create_account'),

-                                   url_for({:controller => 'user', :action => 'new'})))
+                                   url_for({:controller => 'user', :action => 'new'}))

         %>
         </p>
       </div>
         %>
         </p>
       </div>


@@ -131,19 +131,21 @@
         <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
       </div>
       <div class='sidebar-copy'>
         <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
       </div>
       <div class='sidebar-copy'>

-          <p><%= raw(t 'layouts.partners',
+          <p><%= t 'layouts.partners_html',

               :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
               :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
               :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),
               :ucl => link_to(t('layouts.partners_ucl'), "http://www.vr.ucl.ac.uk"),
               :ic => link_to(t('layouts.partners_ic'), "http://www.imperial.ac.uk/"),
               :bytemark => link_to(t('layouts.partners_bytemark'), "http://www.bytemark.co.uk"),

-              :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url'))) %>
+              :partners => link_to(t('layouts.partners_partners'), t('layouts.partners_url')) %>

           </p>
       </div>
           </p>
       </div>

+    </div>

 
     <script type="text/javascript">
     $(document).ready(function () {
       var auth_token = $("meta[name=csrf-token]").attr("content");
 
     <script type="text/javascript">
     $(document).ready(function () {
       var auth_token = $("meta[name=csrf-token]").attr("content");

-

       $("form input[name=authenticity_token]").val(auth_token);
       $("form input[name=authenticity_token]").val(auth_token);

+
+      $("textarea").autoGrow();

     });
     </script>
 
     });
     </script>