Change server_settings to smtp_settings to avoid deprecation warning.

[rails.git] / app / views / layouts / site.rhtml
diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml

index ebdcf8d19cb6e2261e83396bd97c54829ac1cc85..fb0bc57eb140d3668565bad6f93fa2c5ebf3f14d 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -7,7 +7,7 @@
      <%= javascript_include_tag 'site.js' %>
  
      <link rel="stylesheet" type="text/css" href="/stylesheets/site.css" />
-    <title>OpenStreetMap</title>
+    <title>OpenStreetMap<%= ' | '+@title if @title %></title>
    </head>
    <body>
  
@@ -78,7 +78,7 @@
  
        <div id="left_menu">
      <div id="sotminfo">
-Come the the first OpenStreetMap Conference - <a href="http://www.stateofthemap.org">The State of the Map</a> 14th-15th July, 2007, Manchester, UK.
+Come to the first OpenStreetMap Conference, <a href="http://www.stateofthemap.org">The State of the Map</a>: 14th-15th July 2007, Manchester, UK.
  </div>
        </div>