Remove cities references.

15 files changed, 0 insertions, 120 deletions

diff --git a/conf/cobrands/.gitignore b/conf/cobrands/.gitignore
deleted file mode 100644
index 911c95650..000000000
--- a/conf/cobrands/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cities
\ No newline at end of file
diff --git a/conf/crontab.ugly b/conf/crontab.ugly
index 3b0077fb3..ac3b6fd0a 100644
--- a/conf/crontab.ugly
+++ b/conf/crontab.ugly
@@ -18,11 +18,6 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org
 2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-alerts || echo "stalled?"
 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-questionnaires || echo "stalled?"
 
-!!(* } elsif ($vhost eq 'cities.fixmystreet.com') { *)!!
-2,7,12,17,22,27,32,37,42,47,52,57 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?"
-33 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-alerts || echo "stalled?"
-5,35 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-questionnaires || echo "stalled?"
-
 !!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'matthew.fixmystreet.com')) { *)!!
 5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?"
 0 0-8,10,11,13,14,16,17,19-23 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?"
diff --git a/conf/general-example b/conf/general-example
index a61f2b0b9..0c1e25982 100644
--- a/conf/general-example
+++ b/conf/general-example
@@ -33,7 +33,6 @@ define('OPTION_COUNTRY', 'GB');
 define('OPTION_EMAIL_DOMAIN', 'example.org');
 define('OPTION_CONTACT_EMAIL', 'team@'.OPTION_EMAIL_DOMAIN);
 define('OPTION_TEST_EMAIL_PREFIX', null);
-define('OPTION_EMAIL_VHOST_CITIES', 'www.example.com');
 define('OPTION_EMAIL_VHOST', 'www.example.com');
 define('OPTION_EMAIL_VHOST_EMPTYHOMES', 'www.example.com');
 
diff --git a/perllib/Cobrands/.gitignore b/perllib/Cobrands/.gitignore
deleted file mode 100644
index 77650dd46..000000000
--- a/perllib/Cobrands/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Cities
\ No newline at end of file
diff --git a/perllib/FixMyStreet/Cobrand/.gitignore b/perllib/FixMyStreet/Cobrand/.gitignore
deleted file mode 100644
index 6247c81bc..000000000
--- a/perllib/FixMyStreet/Cobrand/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Cities.pm
diff --git a/t/Cobrands/.gitignore b/t/Cobrands/.gitignore
deleted file mode 100644
index 77650dd46..000000000
--- a/t/Cobrands/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Cities
\ No newline at end of file
diff --git a/t/app/uri_for.t b/t/app/uri_for.t
index 2362e6976..51a6e8a0e 100644
--- a/t/app/uri_for.t
+++ b/t/app/uri_for.t
@@ -105,30 +105,4 @@ like(
     'retains language'
 );
 
-## Should really test the cities but we'd need to fake up too much of the
-# request. Following code starts to do this but is not complete. Instead better
-# to test that the cities produces the correct urls by looking at the html
-# produced.
-#
-# # cities
-# my $cities_c = FixMyStreet::App->new(
-#     {
-#         request => Catalyst::Request->new(
-#             {
-#                 base => URI->new('http://cities.fixmystreet.com/'),
-#                 uri  => URI->new(
-#                     'http://cities.fixmystreet.com/test_namespace?city=cardiff'
-#                 ),
-#                 params => { city => 'cardiff', },
-#             }
-#         ),
-#         namespace => 'test_namespace',
-#     }
-# )->setup_request;
-# is(
-#     $cities_c->uri_for( '/foo', { bar => 'baz' } ) . "",
-#     '{microapp-href:http://cities.fixmystreet.com/foo?bar=baz&city=cardiff}',
-#     'Cities url'
-# );
-
 done_testing();
diff --git a/templates/emails/.gitignore b/templates/emails/.gitignore
deleted file mode 100644
index 911c95650..000000000
--- a/templates/emails/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cities
\ No newline at end of file
diff --git a/templates/web/.gitignore b/templates/web/.gitignore
deleted file mode 100644
index 7ebcec4c1..000000000
--- a/templates/web/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cities
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index 5408b4642..2da32fc19 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -139,13 +139,6 @@ unless we are obliged to by law. Your name will not be published anywhere unless
 problem you’ve reported, and send you a questionnaire email four weeks
 after you submit a problem, asking for a status update; we’ll only ever
 send you emails in relation to your problem.</dd>
-        <dt>What's this about the Guardian?</dt>
-        <dd>mySociety and the Guardian are working together to provide local versions of 
-FixMyStreet in Leeds, Edinburgh and Cardiff as part of the Guardian Local project. If you submit a problem or 
-provide an update in one of those cities, administrators from both mySociety and the Guardian will be able to see your
-details. They will never use them for anything other than to help administer FixMyStreet, in accordance with this privacy
-policy, and the Guardian's <a href="http://users.guardian.co.uk/help/article/0,,933905,00.html">privacy policy</a>.     
-        </dd> 
     </dl>
     <h2>Organisation Questions</h2>
     <dl>
diff --git a/templates/web/default/report/new/notes.html b/templates/web/default/report/new/notes.html
index 44d1b5d83..38c8bfb7b 100644
--- a/templates/web/default/report/new/notes.html
+++ b/templates/web/default/report/new/notes.html
@@ -8,8 +8,4 @@
     <li>[% loc("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.") %]</li>
     <li>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
 
-    [% IF c.config.COUNTRY == 'GB' %]
-    <li>[% loc("FixMyStreet and the Guardian are providing this service in partnership in <a href=\"/faq#privacy\">certain cities</a>. In those cities, both have access to any information submitted, including names and email addresses, and will use it only to ensure the smooth running of the service, in accordance with their privacy policies.") %]</li>
-    [% END %]
-
 </ul>
diff --git a/templates/website/cobrands/.gitignore b/templates/website/cobrands/.gitignore
deleted file mode 100644
index 911c95650..000000000
--- a/templates/website/cobrands/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cities
\ No newline at end of file
diff --git a/templates/website/report-form b/templates/website/report-form
deleted file mode 100644
index fd6fc631d..000000000
--- a/templates/website/report-form
+++ /dev/null
@@ -1,68 +0,0 @@
-{{ $form_start }}
-{{ $page_heading }}
-
-{{ $text_located }}
-
-{{ $text_help }}
-
-{{ $errors }}
-
-<div id="problem_form">
-{{ $form_heading }}
-<div id="fieldset">
-
-
-{{ if ( $field_errors{category}) {
-    "<div class='form-error'>$field_errors{category}</div>";
-} }}
-
-<div class="form-field">{{ $category }}</div>
-
-{{ if ( $field_errors{title}) {
-    "<div class='form-error'>$field_errors{title}</div>";
-} }}
-<div class="form-field">
-<label for="form_title">{{ $subject_label }}</label>
-<input type="text" value="{{ $input_h{title} }}" name="title" id="form_title" size="25"></div>
-{{ if ( $field_errors{detail}) {
-    "<div class='form-error'>$field_errors{detail}</div>";
-} }}
-<div class="form-field">
-<label for="form_detail">{{ $detail_label }}</label>
-
-<textarea name="detail" id="form_detail" rows="7" cols="26">{{ $input_h{detail} }}</textarea></div>
-
-{{ $partial_field }}
-
-{{ if ( $field_errors{photo}) {
-    "<div class='form-error'>$field_errors{photo}</div>";
-} }}
-{{ $photo_field }}
-
-{{ if ( $field_errors{name}) {
-    "<div class='form-error'>$field_errors{name}</div>";
-} }}
-<div class='form-field'>
-<label for="form_name">{{ $name_label }}</label>
-<input type="text" value="{{ $input_h{name} }}" name="name" id="form_name" size="25"></div>
-<div class="checkbox"><input type="checkbox" name="anonymous" id="form_anonymous" value="1"{{ $anon }}>
-<label for="form_anonymous">{{ $anonymous }}</label>
-<small>{{ $anonymous2 }}</small></div>
-{{ if ( $field_errors{email}) {
-    "<div class='form-error'>$field_errors{email}</div>";
-} }}
-<div class="form-field">
-<label for="form_email">{{ $email_label }}</label>
-<input type="text" value="{{ $input_h{email} }}" name="email" id="form_email" size="25"></div>
-<div><label for="form_phone">{{ $phone_label }}</label>
-<input type="text" value="{{ $input_h{phone} }}" name="phone" id="form_phone" size="15">
-<small>{{ $optional }}</small></div>
-
-{{ $text_notes }}
-
-<p id="problem_submit"><input type="submit" name="submit_problem" value="{{ $submit_button }}"></p>
-</div>
-</div>
-
-{{ $map_end }}
-
diff --git a/web/cobrands/.gitignore b/web/cobrands/.gitignore
deleted file mode 100644
index 911c95650..000000000
--- a/web/cobrands/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cities
\ No newline at end of file
diff --git a/web/css/cobrands/.gitignore b/web/css/cobrands/.gitignore
deleted file mode 100644
index 911c95650..000000000
--- a/web/css/cobrands/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/cities
\ No newline at end of file