diff options
| -rwxr-xr-x | bin/kasabi | 2 | ||||
| -rw-r--r-- | conf/crontab.ugly | 12 | ||||
| -rw-r--r-- | conf/packages | 1 | ||||
| -rw-r--r-- | notes/INSTALL.pod | 2 | ||||
| -rw-r--r-- | notes/code_structure.txt | 2 | ||||
| -rw-r--r-- | notes/states.txt | 6 | ||||
| -rw-r--r-- | templates/web/default/static/fun.html | 35 | ||||
| -rw-r--r-- | templates/web/fixmystreet/auth/change_password.html | 39 | ||||
| -rw-r--r-- | templates/web/fixmystreet/auth/sign_out.html | 8 | ||||
| -rw-r--r-- | templates/web/fixmystreet/auth/token.html | 27 |
10 files changed, 10 insertions, 124 deletions
diff --git a/bin/kasabi b/bin/kasabi index 47186e64b..5b99ba4ff 100755 --- a/bin/kasabi +++ b/bin/kasabi @@ -47,7 +47,7 @@ def main(): if len(sys.argv) > 1 and sys.argv[1].isdigit(): cursor.execute("%s AND id=%%s" % query, (sys.argv[1],)) else: - cursor.execute("%s AND lastupdate > %%s" % query, (max_lastUpdate,)) + cursor.execute("%s AND lastupdate > %%s ORDER BY lastupdate" % query, (str(max_lastUpdate),)) for report in cursor: changeset = FixMyStreetChangeSet(dataset) diff --git a/conf/crontab.ugly b/conf/crontab.ugly index ec3776179..2d4467aab 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -36,13 +36,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! -# Commented out as there was an error with the code -# -# File "/data/vhost/www.fixmystreet.com/fixmystreet/bin/kasabi", line 50, in main -# cursor.execute("%s AND lastupdate > %%s" % query, (max_lastUpdate,)) -# psycopg2.ProgrammingError: can't adapt type 'Literal' -# -# !!(* if ($vhost eq 'www.fixmystreet.com') { *)!! -# 10 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet-virtualenv/bin/python /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/kasabi -# !!(* } *)!! +!!(* if ($vhost eq 'www.fixmystreet.com') { *)!! +10 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet-virtualenv/bin/python /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/kasabi +!!(* } *)!! diff --git a/conf/packages b/conf/packages index 21ee0a862..0f0c48df2 100644 --- a/conf/packages +++ b/conf/packages @@ -32,6 +32,7 @@ libyaml-perl liblist-moreutils-perl ruby-compass | libhaml-ruby libtemplate-perl +postgresql-8.4 postgresql-server-dev-8.4 gnuplot ttf-bitstream-vera diff --git a/notes/INSTALL.pod b/notes/INSTALL.pod index b795a0043..ea549bd7e 100644 --- a/notes/INSTALL.pod +++ b/notes/INSTALL.pod @@ -105,7 +105,7 @@ C<bin/install_perl_modules> script, so run that now. This will install them into a directory called local. It uses cpanminus and Carton under the hood but should install these -of they are missing. You may need to install some source packages to +if they are missing. You may need to install some source packages to allow some of the included modules to be built, including: =over diff --git a/notes/code_structure.txt b/notes/code_structure.txt index 8c01fba8b..c90db1784 100644 --- a/notes/code_structure.txt +++ b/notes/code_structure.txt @@ -3,7 +3,7 @@ The code is broken down into the following sections: website: code to display the website and handle user submissions backend: send alerts to the councils, work out who should get the alert, various -confirmtaion emails +confirmation emails mobile apps: currently for iPhone and Android - two separate apps diff --git a/notes/states.txt b/notes/states.txt index b885b252b..70515c41b 100644 --- a/notes/states.txt +++ b/notes/states.txt @@ -2,13 +2,13 @@ Problems exist in four broad state categories: unconfirmed - the report has been made but the user hasn't clicked the confirmation link. open - the report has been confirmed - fixed - exactly what it says + fixed - any user has marked this problem as fixed closed - a registered user from a council has marked the problem as closed When a problem is created it will be unconfirmed, The problem becomes confirmed when the user clicks on the link sent to them in -the confirmation email. At this point the problem is confirmed. +the confirmation email. If a problem is uploaded from a mobile app then it is initally created with a state of partial. @@ -17,7 +17,7 @@ If a user is logged in then any problem they create is confirmed automatically. If a council user is logged in then they can change the state of the -problem to one of the following provifing they are from the council that +problem to one of the following, providing they are from the council that the problem has been reported to: Open ( a synonym for confirmed ) Investigating diff --git a/templates/web/default/static/fun.html b/templates/web/default/static/fun.html deleted file mode 100644 index 00976f3ec..000000000 --- a/templates/web/default/static/fun.html +++ /dev/null @@ -1,35 +0,0 @@ -[% INCLUDE header.html - title = 'Weird and Wonderful reports' -%] - -<h1>Weird and Wonderful reports</h1> - -<p>Here are some of the best or strangest reports we’ve seen on FixMyStreet. -They’ve all been fixed, and in one case could have saved lives! -Do let us know if you find any more.</p> - -<ul style='list-style-type: none; margin:0; padding:0'> - -<li><img src='http://www.fixmystreet.com/photo/9468.jpeg' align='right' hspace=8> - <h2>Dumped Piano (right)</h2> - <p>The reporter of this problem summed it up with their report, - which consisted solely of the one character “!”. — - <a href='http://www.fixmystreet.com/report/9468'>Problem report</a> - -<li><h2>Mad Seagull</h2> - <p>“A seagull is attacking various cars within this road. He starts at around 05:45 every morning and continues until around 19:30. This causes a lot of noisy banging and wakes up children.” — - <a href='http://www.fixmystreet.com/report/2722'>Problem report</a> - -<li><img src='http://www.fixmystreet.com/photo/6553.jpeg' align='right' hspace=8> - <h2>Boxes full of cheese dumped (right)</h2> - <p>“About a dozen boxes full of mozzarella cheese have been dumped opposite 3 rufford street. if it warms up we could have nasty road topping problem (seriously there is a lot of cheese)” — - <a href='http://www.fixmystreet.com/report/6553'>Problem report</a> - -<li><h2>Dangerous Nivea Billboard</h2> - <p>“The Nivea 'Oxygen is a wonderful thing' billboard here has a device on it releasing bubbles and foam. This is blowing into the road which is both distracting and dangerous to drivers. A large ball of foam hit my windscreen unexpectedly and nearly caused me to have an accident” — - <a href='http://www.fixmystreet.com/report/7552'>Problem report</a> - -</ul> - -[% INCLUDE footer.html %] - diff --git a/templates/web/fixmystreet/auth/change_password.html b/templates/web/fixmystreet/auth/change_password.html deleted file mode 100644 index c10560c3e..000000000 --- a/templates/web/fixmystreet/auth/change_password.html +++ /dev/null @@ -1,39 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Change Password') %] - -<h1>[% loc('Change Password') %]</h1> - -[% IF password_changed %] - <p id="fixed">[% loc('Your password has been changed') %]</p> -[% END %] - - -<form action="[% c.uri_for('change_password') %]" method="post" name="change_password" class="fieldset"> - - [% IF password_error; - - errors = { - missing => loc('Please enter a password'), - mismatch => loc('The passwords do not match'), - other => loc('Please check the passwords and try again'), - }; - - loc_password_error = errors.$password_error || errors.other; %] - <div class="form-error">[% loc_password_error %]</div> - [% END %] - - <div class="form-field"> - <label for="new_password">[% loc('Password:') %]</label> - <input type="password" name="new_password" value="[% new_password | html %]"> - </div> - <div class="form-field"> - <label for="confirm">[% loc('Again:') %]</label> - <input type="password" name="confirm" value="[% confirm | html %]"> - </div> - <div class="checkbox"> - <input type="submit" value="[% loc('Change Password') %]"> - </div> - -</form> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/auth/sign_out.html b/templates/web/fixmystreet/auth/sign_out.html deleted file mode 100644 index 3d8df60e4..000000000 --- a/templates/web/fixmystreet/auth/sign_out.html +++ /dev/null @@ -1,8 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Sign out') %] - -<h1>[% loc('You have been signed out') %]</h1> - -<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>.</p> - - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/auth/token.html b/templates/web/fixmystreet/auth/token.html deleted file mode 100644 index 0f44d1074..000000000 --- a/templates/web/fixmystreet/auth/token.html +++ /dev/null @@ -1,27 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Confirm account') %] - -[% IF token_not_found %] - -<h1>[% loc('Error') %]</h1> - -<p>We have not been able to confirm your account - sorry. This may be because:</p> - -<ul> - <li>Link too old or already used</li> - <li>URL not copied correctly</li> - [%# FIXME - add more reasons here %] -</ul> - -[% ELSE %] - -<h1>[% loc('Please check your email') %]</h1> - -<p>[% loc("We have sent you an email containing a link to confirm your account.") %]</p> - -<p>[% loc("The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient.") %]</p> - -<p>[% loc("If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.") %]</p> - -[% END %] - -[% INCLUDE 'footer.html' %] |