aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdmund von der Burg <evdb@mysociety.org>2011-04-01 16:17:41 +0100
committerEdmund von der Burg <evdb@mysociety.org>2011-04-01 16:17:41 +0100
commitde30e7bf9a3e8a09ff6f8d23381ae2abbc932d85 (patch)
tree36f2587c3037d0ee7f45c69c9d0f853f6527f51c
parent22b4d5c4d19f882e07f45d083a64ae3fa4e2dc69 (diff)
deal with some FIXMEs
-rw-r--r--notes/catalyst-master-merge-todos.txt5
-rw-r--r--templates/web/default/about/about.html2
-rw-r--r--templates/web/default/auth/token.html2
-rw-r--r--templates/web/default/my/my.html2
4 files changed, 6 insertions, 5 deletions
diff --git a/notes/catalyst-master-merge-todos.txt b/notes/catalyst-master-merge-todos.txt
index 03627cd38..2a8fd0c81 100644
--- a/notes/catalyst-master-merge-todos.txt
+++ b/notes/catalyst-master-merge-todos.txt
@@ -1,5 +1,3 @@
-scan through code for all fixmes
-
make email sending respect STAGING
convert templates for new micro sites (or switch old code to use new headers and footers)
@@ -8,3 +6,6 @@ should we ditch flickr import? (does not seem to be getting huge usage and those
add 'remember me on this computer' to auth login. What should default session lifetime be?
+rss links
+
+tracking code
diff --git a/templates/web/default/about/about.html b/templates/web/default/about/about.html
index dee9fe94c..7219f6320 100644
--- a/templates/web/default/about/about.html
+++ b/templates/web/default/about/about.html
@@ -4,6 +4,6 @@
<h2>FixMyStreet.com</h2>
-<p>FIXME - put in blurb here</p>
+[%# FIXME - put in blurb here %]
[% INCLUDE 'footer.html' %] \ No newline at end of file
diff --git a/templates/web/default/auth/token.html b/templates/web/default/auth/token.html
index ecbf94b83..16dfbb11c 100644
--- a/templates/web/default/auth/token.html
+++ b/templates/web/default/auth/token.html
@@ -9,7 +9,7 @@
<ul>
<li>Link too old or already used</li>
<li>URL not copied correctly</li>
- <li>FIXME - reasons here</li>
+ [%# FIXME - add more reasons here %]
</ul>
[% ELSE %]
diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html
index 1501c2d26..03b180a3a 100644
--- a/templates/web/default/my/my.html
+++ b/templates/web/default/my/my.html
@@ -11,7 +11,7 @@
[% END %]
-<p>FIXME - put in blurb here</p>
+[%# FIXME - put in blurb here %]
<a href="/auth/change_password">change password</a>