Index: templates/header.tt
===================================================================
--- templates/header.tt	(revision 1177)
+++ templates/header.tt	(working copy)
@@ -55,6 +55,9 @@
   [% IF deter_robots %]
     <meta name="robots" content="noindex,nofollow" />
   [% END %]
+  [% UNLESS not_editable %]
+	<link rel="alternate" type="application/wiki" title="Edit this page!" href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit">
+[% END %]
   [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %]
     <script src="http://maps.google.com/maps?file=api&amp;v=2&amp;key=[% gmaps_api_key %]" type="text/javascript"></script>
   [% END %]
Index: t/85_universal_edit.t
===================================================================
--- t/85_universal_edit.t	(revision 0)
+++ t/85_universal_edit.t	(revision 0)
@@ -0,0 +1,61 @@
+use strict;
+use OpenGuides;
+use OpenGuides::Test;
+use Test::More;
+use Wiki::Toolkit::Setup::SQLite;
+
+eval { require DBD::SQLite; };
+if ( $@ ) {
+    plan skip_all => "DBD::SQLite not installed - no database to test with";
+    exit 0;
+}
+
+
+plan tests => 2;
+
+# test that an editable page gets the universal edit <link> and that a non-editable one doesnt.
+
+my ( $config, $guide, $wiki, $cookie, $output );
+
+# Clear out the database from any previous runs.
+unlink "t/node.db";
+unlink <t/indexes/*>;
+Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
+
+# Make a guide.
+$config = OpenGuides::Test->make_basic_config;
+$guide = OpenGuides->new( config => $config );
+my $wiki = $guide->wiki;
+
+# Write a node.
+OpenGuides::Test->write_data(
+                              guide => $guide,
+                              node  => "Red Lion",
+                            );
+
+$output = $guide->display_node(
+				 id => "Red Lion",
+                                return_output => 1,
+                              );
+like( $output, qr|<link rel="alternate" type="application/wiki" title="Edit this page!"|ms,
+	"universal edit link present");
+
+
+unlike ( get_output($wiki, $config), qr|<link rel="alternate" type="application/wiki" title="Edit this page!"|ms,
+        "universal edit link not present");
+
+
+sub get_output {
+    my ($wiki, $config) = @_;
+
+    return OpenGuides::Template->output(
+        wiki         => $wiki,
+        config       => $config,
+        template     => "preferences.tt",
+        noheaders    => 1,
+        vars         => {
+                          not_editable => 1,
+                          show_form    => 1
+                        },
+    );
+}