From a4eecfaa65736a16325eff698be2b43d3ec04dc9 Mon Sep 17 00:00:00 2001
From: Dan Helfman <dan@luminotes.com>
Date: Thu, 8 May 2008 03:37:24 +0000
Subject: [PATCH] No longer showing "settings" link unless you're viewing your
 wiki. In account settings note, now showing link to upgrade/downgrade/cancel.

---
 NEWS              | 4 ++++
 static/js/Wiki.js | 6 ++++++
 view/Header.py    | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 50f09ab..3172481 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.3.18: May 7, 2008
+ * No longer showing "settings" link unless you're viewing your wiki.
+ * In account settings note, now showing link to upgrade/downgrade/cancel.
+
 1.3.17: May 7, 2008
  * Implemented basic user account settings. Now you can change your email
    address.
diff --git a/static/js/Wiki.js b/static/js/Wiki.js
index 4b5cf2c..8c9844a 100644
--- a/static/js/Wiki.js
+++ b/static/js/Wiki.js
@@ -1611,6 +1611,12 @@ Wiki.prototype.display_settings = function () {
         createDOM( "a", { "href": "/privacy", "target": "_new" }, "never be shared" ),
         ". It will only be used for password resets, contacting you about account problems, and the from address in any invite emails you send."
       )
+    ),
+    createDOM( "p", {},
+      createDOM(
+        "a", { "href": "/pricing", "target": "_top" },
+        "Upgrade, downgrade, or cancel your account."
+      )
     )
   );
 
diff --git a/view/Header.py b/view/Header.py
index 7c78d92..bbc553b 100644
--- a/view/Header.py
+++ b/view/Header.py
@@ -32,7 +32,7 @@ class Header( Div ):
             ),
             u" | ",
           ) or None,
-          user.username and Span(
+          user.username and note_title == u"wiki" and Span(
             A(
               u"settings",
               href = u"#",