diff options
275 files changed, 15978 insertions, 6776 deletions
diff --git a/.gitignore b/.gitignore index 6aeaef6f7..7640e3002 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ tags /web/css/core.css /web/css/main.css /web/cobrands/fixmystreet/*.css +/web/cobrands/bromley/*.css /local /web/cobrands/fixmystreet/compass_app_log.txt diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..b279f97a8 --- /dev/null +++ b/.mailmap @@ -0,0 +1,33 @@ +Anders Einar Hilden <hildenae@gmail.com> +Andrew Perry <me@andrewperry.com.au> +Anna Powell-Smith <annapowellsmith@gmail.com> <anna> +Anna Powell-Smith <annapowellsmith@gmail.com> <annapowellsmith@gmail.com> +bci-cities <bci-cities> +Chris Lightfoot <chris@ex-parrot.com> <chris> +Dave Whiteland <dave@mysociety.org> <dave@balti.ukcod.org.uk> +Dave Whiteland <dave@mysociety.org> <dave@fury.ukcod.org.uk> +Duncan Parkes <duncan@mysociety.org> <duncan@fury.ukcod.org.uk> +Edmund von der Burg <evdb@mysociety.org> <evdb@ecclestoad.co.uk> +Francis Irving <francis@mysociety.org> <francis> +Guillaume Rischard <fixmystreet@stereo.lu> <fixmystreet@stereo.lu> +Guillaume Rischard <fixmystreet@stereo.lu> <git@stereo.lu> +Josh Angell <josh@supercooldesign.co.uk> <jbangell@gmail.com> +Kagee <hildenae@gmail.com> +Keith Garrett <keith@mysociety.org> <keith> +Kevin Brubeck Unhammer <unhammer@fsfe.org> +Louise Crow <louise@mysociety.org> <louise.crow@gmail.com> +Louise Crow <louise@mysociety.org> <louise@peas.ukcod.org.uk> +Louise Crow <louise@mysociety.org> <louise> +Mark Longair <mark@mysociety.org> <mhl@pobox.com> +Matthew Somerville <matthew@mysociety.org> <matthew> +Matthew Somerville <matthew@mysociety.org> <matthew@balti.ukcod.org.uk> +Matthew Somerville <matthew@mysociety.org> <matthew@cake.ukcod.org.uk> +Matthew Somerville <matthew@mysociety.org> <matthew@dracos.co.uk> +Matthew Somerville <matthew@mysociety.org> <matthew@fury.ukcod.org.uk> +Matthew Somerville <matthew@mysociety.org> <matthew-github@dracos.co.uk> +Matthew Somerville <matthew@mysociety.org> <matthew@mysociety.org> +Matthew Somerville <matthew@mysociety.org> <matthew@rocket.ukcod.org.uk> +Struan Donald <struan@mysociety.org> <struan@exo.org.uk> +Struan Donald <struan@mysociety.org><struan@fury.ukcod.org.uk> +Tim Morley <t_morley@argonet.co.uk> <timsk> +Tony Bowden <tony@tmtm.com> diff --git a/bin/kasabi b/bin/kasabi index 843531d51..5b99ba4ff 100755 --- a/bin/kasabi +++ b/bin/kasabi @@ -1,5 +1,6 @@ #!/usr/bin/env python +import sys import datetime import json import os.path @@ -11,6 +12,7 @@ import pytassium import psycopg2 import psycopg2.extras from rdfchangesets import BatchChangeSet +from rdflib.namespace import XSD # Set up data access config = yaml.load(open(os.path.abspath(os.path.join(os.path.dirname(__file__), '../conf/general.yml')))) @@ -25,20 +27,27 @@ cursor = db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) report_cursor = db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) def main(): - # Fetch reports that have changed recently - #response, data = dataset.select('select (max(?lastupdate) as ?max) where { ?report <http://data.kasabi.com/dataset/fixmystreet/def/lastUpdate> ?lastupdate }') - #max_lastUpdate = data[1][0]['max'] - last_hour = datetime.datetime.now().replace(minute=0, second=0, microsecond=0) - datetime.timedelta(hours=1) - cursor.execute(""" + + # Check the status of our dataset + response, status = dataset.status() + if response.status not in range(200, 300) or status['storageMode'] == 'read-only': + # We can't import anything, so let's not bother + sys.exit() + + # Fetch reports that have changed since last update in dataset + response, data = dataset.select('select (max(?lastupdate) as ?max) where { ?report <http://data.kasabi.com/dataset/fixmystreet/def/lastUpdate> ?lastupdate }') + max_lastUpdate = data[1][0]['max'] + query = """ SELECT id, latitude, longitude, used_map, council, category, title, detail, (photo IS NOT NULL) as photo, confirmed, lastupdate, whensent, state FROM problem WHERE state not in ('unconfirmed', 'partial') - AND date_trunc('hour', lastupdate) = %s - """, (last_hour,)) -# AND lastupdate > %s -# """, (max_lastUpdate,)) + """ + 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 ORDER BY lastupdate" % query, (str(max_lastUpdate),)) for report in cursor: changeset = FixMyStreetChangeSet(dataset) @@ -50,8 +59,8 @@ def main(): # Canonicalise some values report['latitude'] = round(report['latitude'], 6) # <10cm report['longitude'] = round(report['longitude'], 6) - report['title'] = report['title'].replace('"', r'\"') # Escape double quotes - report['detail'] = report['detail'].replace('"', r'\"') + report['title'] = tidy_string(report['title']) + report['detail'] = tidy_string(report['detail']) report['confirmed'] = report['confirmed'].replace(microsecond=0).isoformat() # Don't want microseconds report['lastupdate'] = report['lastupdate'].replace(microsecond=0).isoformat() report['council'] = sorted(re.sub('\|.*', '', report['council']).split(',')) # Remove missing councils @@ -77,7 +86,10 @@ def main(): changeset.remove_report(report) changeset.add_report(report, states) changeset.apply() - print '{id} change applied'.format(id=report['id']) + +# Escape double quotes and backslashes, remove carriage returns +def tidy_string(s): + return s.replace('\r', '').replace('\\', '\\\\').replace('"', r'\"') class FixMyStreetChangeSet(object): """Something that hosts either or both of a BatchChangeSet and a Turtle @@ -107,27 +119,30 @@ class FixMyStreetChangeSet(object): def apply(self): if len(self.changeset.changesets): - response, data = self.dataset.apply_changeset(self.changeset) - if response.status in range(200, 300): - print 'Change accepted:', data - else: + #response, data = self.dataset.apply_changeset(self.changeset) + # XXX Do everything the above call does, but additionally escape carriage returns to prevent 409 error + api = self.dataset.get_api('update') + g = self.changeset.getGraph() + data = g.serialize(format='xml') + data = data.replace('\r', ' ') + response, data = api.client.request(api.uri, "POST", body=data, headers={"accept" : "*/*", 'content-type':'application/vnd.talis.changeset+xml', 'X_KASABI_APIKEY':api.apikey}) + if response.status not in range(200, 300): print 'Error:', response.status, response.reason, data if self.data: response, data = self.dataset.store_data(self.data, media_type='text/turtle') - if response.status in range(200, 300): - print 'New data accepted:', data - else: + if response.status not in range(200, 300): print 'Error:', response.status, response.reason, data def remove_report(self, report): uri = 'http://data.kasabi.com/dataset/fixmystreet/report/{id}'.format(**report) response, data = self.dataset.select('select ?p ?o where {{ <{0}> ?p ?o }}'.format(uri)) for row in data[1]: - # XXX This throws an error + # Need to set the datatype correctly for the lastUpdate if str(row['p']) == 'http://data.kasabi.com/dataset/fixmystreet/def/lastUpdate': - continue - if re.match('http://data.kasabi.com/dataset/fixmystreet/report/\d+/status/\d+$', str(row['o'])): - uri2 = str(row['o']) + row['o'].datatype = XSD.dateTime + # Delete the referenced statuses + if re.match('http://data.kasabi.com/dataset/fixmystreet/report/\d+/status/\d+$', unicode(row['o'])): + uri2 = unicode(row['o']) response2, data2 = self.dataset.select('select ?p ?o where {{ <{0}> ?p ?o }}'.format(uri2)) for row2 in data2[1]: self.changeset.remove(uri2, row2['p'], row2['o']) diff --git a/bin/make_css b/bin/make_css index 70625b2f4..27cbec1b5 100755 --- a/bin/make_css +++ b/bin/make_css @@ -15,9 +15,10 @@ DIRECTORY=$(cd `dirname $0`/../web && pwd) # FixMyStreet uses compass compass compile --output-style compressed $DIRECTORY/cobrands/fixmystreet +compass compile --output-style compressed $DIRECTORY/cobrands/bromley # The rest are plain sass -for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v cobrands/fixmystreet` +for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "cobrands/\(fixmystreet\|bromley\)"` do sass --scss --update --style compressed $scss done diff --git a/bin/populate_bing_cache b/bin/populate_bing_cache index a3bef6759..17c8911d0 100755 --- a/bin/populate_bing_cache +++ b/bin/populate_bing_cache @@ -9,6 +9,8 @@ use Data::Dumper; use FixMyStreet::App; use FixMyStreet::Geocode::Bing; +my $bing_culture = 'en-GB'; + my $reports = FixMyStreet::App->model('DB::Problem')->search( { geocode => undef, @@ -46,7 +48,7 @@ while ( my $report = $reports->next ) { next if $report->geocode; my $j = FixMyStreet::Geocode::Bing::reverse( $report->latitude, - $report->longitude ); + $report->longitude, $bing_culture ); $report->geocode($j); $report->update; diff --git a/bin/problem-creation-graph b/bin/problem-creation-graph index 4bba1cdb8..6692ae724 100755 --- a/bin/problem-creation-graph +++ b/bin/problem-creation-graph @@ -104,6 +104,6 @@ END #echo "gpscript $GPSCRIPT" export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera -gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-creation$EXTENSION +gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-creation$EXTENSION 2>/dev/null diff --git a/bin/problems-filed-graph b/bin/problems-filed-graph index dbac35639..8addacd62 100755 --- a/bin/problems-filed-graph +++ b/bin/problems-filed-graph @@ -57,5 +57,5 @@ END #echo "gpscript $GPSCRIPT" export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera -gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-line$EXTENSION +gnuplot < $GPSCRIPT > fixmystreet/web/bci-live-line$EXTENSION 2>/dev/null diff --git a/bin/send-reports b/bin/send-reports index 22bd12732..5f3a508b7 100755 --- a/bin/send-reports +++ b/bin/send-reports @@ -22,6 +22,7 @@ use CronFns; use FixMyStreet::App; use EastHantsWSDL; +use BarnetInterfaces::service::ZLBB_SERVICE_ORDER; use Utils; use mySociety::Config; use mySociety::EmailUtil; @@ -30,6 +31,22 @@ use mySociety::Web qw(ent); use Open311; +# maximum number of webservice attempts to send before not trying any more (XXX may be better in config?) +use constant SEND_FAIL_RETRIES_CUTOFF => 3; + +# specific council numbers +use constant COUNCIL_ID_BARNET => 2489; +use constant COUNCIL_ID_EAST_HANTS => 2330; + +use constant MAX_LINE_LENGTH => 132; + +# send_method config values found in by-area config data, for selecting to appropriate method +use constant SEND_METHOD_EMAIL => 'email'; +use constant SEND_METHOD_OPEN311 => 'open311'; +use constant SEND_METHOD_BARNET => 'barnet'; +use constant SEND_METHOD_EAST_HANTS => 'easthants'; +use constant SEND_METHOD_LONDON => 'london'; + # Set up site, language etc. my ($verbose, $nomail) = CronFns::options(); my $base_url = mySociety::Config::get('BASE_URL'); @@ -40,6 +57,9 @@ my $unsent = FixMyStreet::App->model("DB::Problem")->search( { whensent => undef, council => { '!=', undef }, } ); + +my %sending_skipped_by_method = (); + my (%notgot, %note); while (my $row = $unsent->next) { @@ -56,8 +76,10 @@ while (my $row = $unsent->next) { next; } - my $send_email = 0; - my $send_web = 0; + # Due to multiple councils, it's possible to want to send both by email *and* another method + # NB: might need to revist this if multiple councils have custom send methods + my $send_email = 0; + my $send_method = 0; # Template variables for the email my $email_base_url = $cobrand->base_url_for_emails($row->cobrand_data); @@ -118,6 +140,7 @@ while (my $row = $unsent->next) { push @to, [ $council_email, $name ]; @recips = ($council_email); + $send_method = 0; $send_email = 1; $template = Utils::read_file("$FindBin::Bin/../templates/email/emptyhomes/" . $row->lang . "/submit.txt"); @@ -133,15 +156,37 @@ while (my $row = $unsent->next) { foreach my $council (@councils) { my $name = $areas_info->{$council}->{name}; push @dear, $name; - if ($council == 2330) { # E. Hants have a web service - $send_web = 'easthants'; + + # look in the DB to determine if there is a special handler for this council (e.g., open311, or custom) + my $council_config = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council} )->first; + $send_method = $council_config->send_method if ($council_config and $council_config->send_method); + if ($council == COUNCIL_ID_EAST_HANTS) { # E. Hants have a web service + $send_method = SEND_METHOD_EAST_HANTS; # TODO: delete? should be in the db $h{category} = 'Customer Services' if $h{category} eq 'Other'; - } elsif ($areas_info->{$council}->{type} eq 'LBO') { # London - $send_web = 'london'; - } elsif ( my $endpoint = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council, endpoint => { '!=', '' } } )->first ) { - push @open311_councils, $endpoint; - $send_web = 'open311'; - } else { + } + + # if council lookup provided no explicit send_method, maybe there's some other criterion for setting it: + if (! $send_method) { + if ($areas_info->{$council}->{type} eq 'LBO') { # London + $send_method = SEND_METHOD_LONDON; + } + } + $send_email = 1 unless $send_method; # default to email if nothing explicit was provided + + # currently: open311 or Barnet without an endpoint is useless, so check the endpoint is set + if ($send_method eq SEND_METHOD_OPEN311 or $send_method eq SEND_METHOD_BARNET) { + if ($council_config->endpoint) { + if ($send_method eq SEND_METHOD_OPEN311) { + push @open311_councils, $council_config; + } + } else { + print "Warning: no endpoint specified in config data for council=$council (will try email instead)\n"; + $send_method = 0; + $send_email = 1; + } + } + + if ($send_email) { my $contact = FixMyStreet::App->model("DB::Contact")->find( { deleted => 0, area_id => $council, @@ -160,7 +205,6 @@ while (my $row = $unsent->next) { } push @to, [ $council_email, $name ]; $recips{$council_email} = 1; - $send_email = 1; } } @recips = keys %recips; @@ -199,15 +243,19 @@ while (my $row = $unsent->next) { } - unless ($send_email || $send_web) { + unless ($send_email || $send_method) { die 'Report not going anywhere for ID ' . $row->id . '!'; } if (mySociety::Config::get('STAGING_SITE')) { # on a staging server send emails to ourselves rather than the councils - @recips = ( mySociety::Config::get('CONTACT_EMAIL') ); - $send_web = 0; - $send_email = 1; + # ...webservice calls will only go through if explictly allowed here: + my @testing_councils = (COUNCIL_ID_BARNET); + unless (grep {$row->council eq $_} @testing_councils) { + @recips = ( mySociety::Config::get('CONTACT_EMAIL') ); + $send_method = 0; + $send_email = 1; + } } elsif ($site eq 'emptyhomes') { my $council = $row->council; my $country = $areas_info->{$council}->{country}; @@ -243,17 +291,28 @@ while (my $row = $unsent->next) { ); } - if ($send_web eq 'easthants') { + if ($send_method eq SEND_METHOD_EAST_HANTS) { $h{message} = construct_easthants_message(%h); if (!$nomail) { $result *= post_easthants_message(%h); } - } elsif ($send_web eq 'london') { + } elsif ($send_method eq SEND_METHOD_BARNET) { + $h{message} = construct_barnet_message(%h); + if (!$nomail) { + if (my $cutoff_msg = does_exceed_cutoff_limit($row, "barnet")) { + print "$cutoff_msg\n" if $verbose; + } else { + my ($barnet_result, $err_msg) = post_barnet_message( $row, %h ); + update_send_fail_data($row, $err_msg) if $barnet_result; + $result *= $barnet_result; + } + } + } elsif ($send_method eq SEND_METHOD_LONDON) { $h{message} = construct_london_message(%h); if (!$nomail) { $result *= post_london_report( $row, %h ); } - } elsif ($send_web eq 'open311') { + } elsif ($send_method eq SEND_METHOD_OPEN311) { foreach my $conf ( @open311_councils ) { print 'posting to end point for ' . $conf->area_id . "\n" if $verbose; @@ -316,6 +375,16 @@ if ($verbose) { } } +if ($verbose and keys %sending_skipped_by_method) { + my $c = 0; + print "\nProblem reports that send-reports did not attempt to send because retries >= " . SEND_FAIL_RETRIES_CUTOFF . ":\n"; + foreach my $send_method (sort keys %sending_skipped_by_method) { + printf " %-24s %4d\n", "$send_method:", $sending_skipped_by_method{$send_method}; + $c+=$sending_skipped_by_method{$send_method}; + } + printf " %-24s %4d\n", "Total:", $c; +} + sub _get_district_for_contact { my ( $lat, $lon ) = @_; my $district = @@ -358,6 +427,8 @@ sub construct_easthants_message { $message .= <<EOF; Subject: $h{title} +Category: $h{category} + Details: $h{detail} $h{fuzzy}, or to provide an update on the problem, please visit the following link: @@ -390,6 +461,126 @@ sub post_easthants_message { return $return; } +# currently just blind copy of construct_easthants_message +sub construct_barnet_message { + my %h = @_; + my $message = <<EOF; +Subject: $h{title} + +Details: $h{detail} + +$h{fuzzy}, or to provide an update on the problem, please visit the following link: + +$h{url} + +$h{closest_address} +EOF +} + +sub post_barnet_message { + my ( $problem, %h ) = @_; + my $return = 1; + my $err_msg = ""; + + my $default_kbid = 14; # This is the default, "Street Scene" + my $kbid = sprintf( "%050d", Utils::barnet_categories()->{$h{category}} || $default_kbid); + + my $geo_code = "$h{easting} $h{northing}"; + + my $interface = BarnetInterfaces::service::ZLBB_SERVICE_ORDER->new(); + + my ($nearest_postcode, $nearest_street) = ('', ''); + for ($h{closest_address}) { + $nearest_postcode = sprintf("%-10s", $1) if /Nearest postcode [^:]+: ((\w{1,4}\s?\w+|\w+))/; + # use partial postcode or comma as delimiter, strip leading number (possible letter 221B) off too + # "99 Foo Street, London N11 1XX" becomes Foo Street + # "99 Foo Street N11 1XX" becomes Foo Street + $nearest_street = $1 if /Nearest road [^:]+: (?:\d+\w? )?(.*?)(\b[A-Z]+\d|,|$)/m; + } + my $postcode = mySociety::PostcodeUtil::is_valid_postcode($h{query}) + ? $h{query} : $nearest_postcode; # use given postcode if available + + # note: endpoint can be of form 'https://username:password@url' + my $council_config = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => COUNCIL_ID_BARNET} )->first; + if ($council_config and $council_config->endpoint) { + $interface->set_proxy($council_config->endpoint); + # Barnet web service doesn't like namespaces in the elements so use a prefix + $interface->set_prefix('urn'); + } else { + die "Barnet webservice FAIL: looks like you're missing some config data: no endpoint (URL) found for area_id=" . COUNCIL_ID_BARNET; + } + + eval { + my $result = $interface->Z_CRM_SERVICE_ORDER_CREATE( { + ET_RETURN => { # ignored by server + item => { + TYPE => "", ID => "", NUMBER => "", MESSAGE => "", LOG_NO => "", LOG_MSG_NO => "", + MESSAGE_V1 => "", MESSAGE_V2 => "", MESSAGE_V3 => "", MESSAGE_V4 => "", PARAMETER => "", + ROW => "", FIELD => "", SYSTEM => "", + }, + }, + IT_PROBLEM_DESC => { # MyTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT + item => [ # MyTypes::CRMT_SERVICE_REQUEST_TEXT + map { { TEXT_LINE => $_ } } split_text_with_entities(ent(encode_utf8($h{message})), 132) # char132 + ], + }, + IV_CUST_EMAIL => truncate_string_with_entities(ent(encode_utf8($h{email})), 241), # char241 + IV_CUST_NAME => truncate_string_with_entities(ent(encode_utf8($h{name})), 50), # char50 + IV_KBID => $kbid, # char50 + IV_PROBLEM_ID => $h{id}, # char35 + IV_PROBLEM_LOC => { # MyTypes::BAPI_TTET_ADDRESS_COM + COUNTRY2 => 'GB', # char2 + REGION => "", # char3 + COUNTY => "", # char30 + CITY => "", # char30 + POSTALCODE => $postcode, # char10 + STREET => truncate_string_with_entities(ent(encode_utf8($nearest_street)), 30), # char30 + STREETNUMBER => "", # char5 + GEOCODE => $geo_code, # char32 + }, + IV_PROBLEM_SUB => truncate_string_with_entities(ent(encode_utf8($h{title})), 40), # char40 + }, + ); + if ($result) { + # currently not using this: get_EV_ORDER_GUID (maybe that's the customer number in the CRM) + if (my $barnet_id = $result->get_EV_ORDER_NO()) { + $problem->external_id( $barnet_id ); + $problem->external_body( 'Barnet Borough Council' ); # better to use $problem->body()? + $problem->send_method_used('barnet'); + $return = 0; + } else { + my @returned_items = split /<item[^>]*>/, $result->get_ET_RETURN; + my @messages = (); + foreach my $item (@returned_items) { + if ($item=~/<MESSAGE [^>]*>\s*(\S.*?)<\/MESSAGE>/) { # if there's a non-null MESSAGE in there, grab it + push @messages, $1; # best stab at extracting useful error message back from convoluted response + } + } + push @messages, "service returned no external id" unless @messages; + $err_msg = "Failed (problem id $h{id}): " . join(" \n ", @messages); + } + } else { + my %fault = ( + 'code' => $result->get_faultcode(), + 'actor' => $result->get_faultactor(), + 'string' => $result->get_faultstring(), + 'detail' => $result->get_detail(), # possibly only contains debug info + ); + $fault{$_}=~s/^\s*|\s*$//g foreach keys %fault; + $fault{actor}&&=" (actor: $fault{actor})"; + $fault{'detail'} &&= "\n" . $fault{'detail'}; + $err_msg = "Failed (problem id $h{id}): Fault $fault{code}$fault{actor}\n$fault{string}$fault{detail}"; + } + + }; + print "$err_msg\n" if $err_msg; + if ($@) { + my $e = shift; + print "Caught an error: $@\n"; + } + return ($return, $err_msg); +} + # London sub construct_london_message { @@ -489,3 +680,80 @@ sub london_lookup { return $str; } +# for barnet webservice: max-length fields require truncate and split + +# truncate_string_with_entities +# args: text to truncate +# max number of chars +# returns: string truncated +# Note: must not partially truncate an entity (e.g., &) +sub truncate_string_with_entities { + my ($str, $max_len) = @_; + my $retVal = ""; + foreach my $chunk (split /(\&(?:\#\d+|\w+);)/, $str) { + if ($chunk=~/^\&(\#\d+|\w+);$/){ + my $next = $retVal.$chunk; + last if length $next > $max_len; + $retVal=$next + } else { + $retVal.=$chunk; + if (length $retVal > $max_len) { + $retVal = substr($retVal, 0, $max_len); + last + } + } + } + return $retVal +} + +# split_text_with_entities into lines +# args: text to be broken into lines +# max length (option: uses constant MAX_LINE_LENGTH) +# returns: array of lines +# Must not to split an entity (e.g., &) +# Not worrying about hyphenating here, since a word is only ever split if +# it's longer than the whole line, which is uncommon in genuine problem reports +sub split_text_with_entities { + my ($text, $max_line_length) = @_; + $max_line_length ||= MAX_LINE_LENGTH; + my @lines; + foreach my $line (split "\n", $text) { + while (length $line > $max_line_length) { + if (! ($line =~ s/^(.{1,$max_line_length})\s// # break on a space + or $line =~ s/^(.{1,$max_line_length})(\&(\#\d+|\w+);)/$2/ # break before an entity + or $line =~ s/(.{$max_line_length})//)) { # break the word ruthlessly + $line =~ s/(.*)//; # otherwise gobble whole line (which is now shorter than max length) + } + push @lines, $1; + } + push @lines, $line; + } + return @lines; +} + +# tests send_fail_count agains cutoff limit +# args: problem (row from problem db) +# returns false if there is no cutoff, otherwise error message +sub does_exceed_cutoff_limit { + my ($problem, $council_name) = @_; + my $err_msg = ""; + if ($problem->send_fail_count >= SEND_FAIL_RETRIES_CUTOFF) { + $sending_skipped_by_method{$council_name || '?'}++; + $council_name &&= " to $council_name"; + $err_msg = "skipped: problem id=" . $problem->id . " send$council_name has failed " + . $problem->send_fail_count . " times, cutoff is " . SEND_FAIL_RETRIES_CUTOFF; + } + return $err_msg; +} + +# update_send_fail_data records the failure (of a webservice send) +# args: problem (row from problem db) +# returns: no return value (updates record) +sub update_send_fail_data { + my ($problem, $err_msg) = @_; + $problem->update( { + send_fail_count => $problem->send_fail_count + 1, + send_fail_timestamp => \'ms_current_timestamp()', + send_fail_reason => $err_msg + } ); +} diff --git a/carton.lock b/carton.lock index bbee10724..cd7b0e70b 100644 --- a/carton.lock +++ b/carton.lock @@ -1,7 +1,7 @@ { "modules" : { "App::cpanminus" : { - "dist" : "App-cpanminus-1.5006", + "dist" : "App-cpanminus-1.5007", "module" : "App::cpanminus", "mymeta" : { "abstract" : "Get, unpack, build and install modules from CPAN.", @@ -44,17 +44,17 @@ } }, "release_status" : "stable", - "version" : "1.5006" + "version" : "1.5007" }, "name" : "App::cpanminus", - "pathname" : "M/MI/MIYAGAWA/App-cpanminus-1.5006.tar.gz", + "pathname" : "M/MI/MIYAGAWA/App-cpanminus-1.5007.tar.gz", "provides" : { "App::cpanminus" : { "file" : "App/cpanminus.pm", - "version" : "1.5006" + "version" : "1.5007" } }, - "version" : "1.5006" + "version" : "1.5007" }, "AppConfig" : { "dist" : "AppConfig-1.66", @@ -3336,6 +3336,114 @@ }, "version" : "1.4" }, + "Class::Std" : { + "dist" : "Class-Std-0.011", + "module" : "Class::Std", + "mymeta" : { + "abstract" : "Support for creating standard \"inside-out\" classes", + "author" : [ + "Damian Conway <DCONWAY@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Class-Std", + "prereqs" : { + "runtime" : { + "requires" : { + "Data::Dumper" : 0, + "Scalar::Util" : 0, + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "version" : "0.011" + }, + "name" : "Class::Std", + "pathname" : "D/DC/DCONWAY/Class-Std-0.011.tar.gz", + "provides" : { + "Class::Std" : { + "file" : "Class/Std.pm", + "version" : "0.011" + }, + "Class::Std::SCR" : { + "file" : "Class/Std.pm" + } + }, + "version" : "0.011" + }, + "Class::Std::Fast" : { + "dist" : "Class-Std-Fast-v0.0.8", + "module" : "Class::Std::Fast::Storable", + "mymeta" : { + "abstract" : "faster but less secure than Class::Std", + "author" : [ + "Andreas 'ac0v' Specht - ACID@cpan.org" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Class-Std-Fast", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : 0 + } + }, + "runtime" : { + "requires" : { + "Class::Std" : "v0.0.8", + "Data::Dumper" : 0, + "Scalar::Util" : 0, + "version" : 0 + } + } + }, + "provides" : { + "Class::Std::Fast" : { + "file" : "lib/Class/Std/Fast.pm", + "version" : "v0.0.8" + }, + "Class::Std::Fast::Storable" : { + "file" : "lib/Class/Std/Fast/Storable.pm", + "version" : "v0.0.8" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "v0.0.8" + }, + "name" : "Class::Std::Fast", + "pathname" : "A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz", + "provides" : { + "Class::Std::Fast" : { + "file" : "Class/Std/Fast.pm", + "version" : "v0.0.8" + }, + "Class::Std::Fast::Storable" : { + "file" : "Class/Std/Fast/Storable.pm", + "version" : "v0.0.8" + } + }, + "version" : "v0.0.8" + }, "Class::Unload" : { "dist" : "Class-Unload-0.07", "module" : "Class::Unload", @@ -3552,6 +3660,110 @@ }, "version" : "2.09" }, + "Compress::Raw::Bzip2" : { + "dist" : "Compress-Raw-Bzip2-2.048", + "module" : "Compress::Raw::Bzip2", + "mymeta" : { + "abstract" : "Low-Level Interface to bzip2 compression library", + "author" : [ + "Paul Marquess <pmqs@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Compress-Raw-Bzip2", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "2.048" + }, + "name" : "Compress::Raw::Bzip2", + "pathname" : "P/PM/PMQS/Compress-Raw-Bzip2-2.048.tar.gz", + "provides" : { + "Compress::Raw::Bzip2" : { + "file" : "Compress/Raw/Bzip2.pm", + "version" : "2.048" + } + }, + "version" : "2.048" + }, + "Compress::Raw::Zlib" : { + "dist" : "Compress-Raw-Zlib-2.048", + "module" : "Compress::Raw::Zlib", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Compress-Raw-Zlib", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "2.048" + }, + "name" : "Compress::Raw::Zlib", + "pathname" : "P/PM/PMQS/Compress-Raw-Zlib-2.048.tar.gz", + "provides" : { + "Compress::Raw::Zlib" : { + "file" : "Compress/Raw/Zlib.pm", + "version" : "2.048" + } + }, + "version" : "2.048" + }, "Config::Any" : { "dist" : "Config-Any-0.20", "module" : "Config::Any", @@ -4911,6 +5123,311 @@ }, "version" : "0.00011" }, + "DBIx::Class::IntrospectableM2M" : { + "dist" : "DBIx-Class-IntrospectableM2M-0.001001", + "module" : "DBIx::Class::IntrospectableM2M", + "mymeta" : { + "abstract" : "Introspect many-to-many relationships", + "author" : [ + "Guillermo Roditi (groditi) <groditi@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 0.76, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "DBIx-Class-IntrospectableM2M", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "DBIx::Class" : 0, + "ExtUtils::MakeMaker" : "6.62", + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "0.001001" + }, + "name" : "DBIx::Class::IntrospectableM2M", + "pathname" : "G/GR/GRODITI/DBIx-Class-IntrospectableM2M-0.001001.tar.gz", + "provides" : { + "DBIx::Class::IntrospectableM2M" : { + "file" : "DBIx/Class/IntrospectableM2M.pm", + "version" : "0.001001" + } + }, + "version" : "0.001001" + }, + "DBIx::Class::Schema::Loader" : { + "dist" : "DBIx-Class-Schema-Loader-0.07017", + "module" : "DBIx::Class::Schema::Loader", + "mymeta" : { + "abstract" : "Create a DBIx::Class::Schema based on a database", + "author" : [ + "blblack: Brandon Black <blblack@gmail.com>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "DBIx-Class-Schema-Loader", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "DBD::SQLite" : "1.29", + "DBI" : "1.56", + "DBIx::Class::IntrospectableM2M" : 0, + "ExtUtils::MakeMaker" : "6.62", + "File::Copy" : 0, + "File::Path" : "2.07", + "File::Temp" : "0.16", + "IPC::Open3" : 0, + "Test::Exception" : 0, + "Test::More" : "0.94", + "Test::Warn" : "0.21" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62" + } + }, + "runtime" : { + "requires" : { + "Carp::Clan" : 0, + "Class::Accessor::Grouped" : "0.10002", + "Class::C3::Componentised" : "1.0008", + "Class::Inspector" : 0, + "Class::Unload" : 0, + "DBD::SQLite" : "1.29", + "DBI" : "1.56", + "DBIx::Class" : "0.08127", + "DBIx::Class::IntrospectableM2M" : 0, + "Data::Dump" : "1.06", + "Digest::MD5" : "2.36", + "Exporter" : "5.63", + "File::Copy" : 0, + "File::Path" : "2.07", + "File::Spec" : 0, + "File::Temp" : "0.16", + "IPC::Open3" : 0, + "Lingua::EN::Inflect::Number" : "1.1", + "Lingua::EN::Inflect::Phrase" : "0.02", + "Lingua::EN::Tagger" : 0, + "List::MoreUtils" : 0, + "MRO::Compat" : "0.09", + "Scalar::Util" : 0, + "Scope::Guard" : 0, + "String::CamelCase" : "0.02", + "String::ToIdentifier::EN" : "0.05", + "Sub::Name" : 0, + "Task::Weaken" : 0, + "Test::Exception" : 0, + "Test::More" : "0.94", + "Test::Warn" : "0.21", + "Try::Tiny" : 0, + "namespace::clean" : "0.20", + "perl" : "5.008001" + } + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://git.shadowcat.co.uk/dbsrgits/DBIx-Class-Schema-Loader.git" + }, + "x_IRC" : "irc://irc.perl.org/#dbix-class", + "x_MailingList" : "http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class" + }, + "version" : "0.07017" + }, + "name" : "DBIx::Class::Schema::Loader", + "pathname" : "R/RK/RKITOVER/DBIx-Class-Schema-Loader-0.07017.tar.gz", + "provides" : { + "DBIx::Class::Schema::Loader" : { + "file" : "DBIx/Class/Schema/Loader.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::Base" : { + "file" : "DBIx/Class/Schema/Loader/Base.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI" : { + "file" : "DBIx/Class/Schema/Loader/DBI.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ADO" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ADO.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ADO::MS_Jet" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ADO/MS_Jet.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ADO::Microsoft_SQL_Server" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ADO/Microsoft_SQL_Server.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Component::QuotedDefault" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Component/QuotedDefault.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::DB2" : { + "file" : "DBIx/Class/Schema/Loader/DBI/DB2.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Firebird" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Firebird.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Informix" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Informix.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::InterBase" : { + "file" : "DBIx/Class/Schema/Loader/DBI/InterBase.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::MSSQL" : { + "file" : "DBIx/Class/Schema/Loader/DBI/MSSQL.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::ACCESS" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/ACCESS.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::Firebird" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/Firebird.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::Microsoft_SQL_Server" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/Microsoft_SQL_Server.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::ODBC::SQL_Anywhere" : { + "file" : "DBIx/Class/Schema/Loader/DBI/ODBC/SQL_Anywhere.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Oracle" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Oracle.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Pg" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Pg.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::SQLAnywhere" : { + "file" : "DBIx/Class/Schema/Loader/DBI/SQLAnywhere.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::SQLite" : { + "file" : "DBIx/Class/Schema/Loader/DBI/SQLite.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Sybase" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Sybase.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Sybase::Common" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Sybase/Common.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Sybase::Microsoft_SQL_Server" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Sybase/Microsoft_SQL_Server.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::Writing" : { + "file" : "DBIx/Class/Schema/Loader/DBI/Writing.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBI::mysql" : { + "file" : "DBIx/Class/Schema/Loader/DBI/mysql.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::DBObject" : { + "file" : "DBIx/Class/Schema/Loader/DBObject.pm" + }, + "DBIx::Class::Schema::Loader::DBObject::Informix" : { + "file" : "DBIx/Class/Schema/Loader/DBObject/Informix.pm" + }, + "DBIx::Class::Schema::Loader::DBObject::Sybase" : { + "file" : "DBIx/Class/Schema/Loader/DBObject/Sybase.pm" + }, + "DBIx::Class::Schema::Loader::Optional::Dependencies" : { + "file" : "DBIx/Class/Schema/Loader/Optional/Dependencies.pm" + }, + "DBIx::Class::Schema::Loader::RelBuilder" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_040" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_040.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_05" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_05.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_06" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_06.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::RelBuilder::Compat::v0_07" : { + "file" : "DBIx/Class/Schema/Loader/RelBuilder/Compat/v0_07.pm", + "version" : "0.07017" + }, + "DBIx::Class::Schema::Loader::Table" : { + "file" : "DBIx/Class/Schema/Loader/Table.pm" + }, + "DBIx::Class::Schema::Loader::Table::Informix" : { + "file" : "DBIx/Class/Schema/Loader/Table/Informix.pm" + }, + "DBIx::Class::Schema::Loader::Table::Sybase" : { + "file" : "DBIx/Class/Schema/Loader/Table/Sybase.pm" + } + }, + "version" : "0.07017" + }, "Data::Compare" : { "dist" : "Data-Compare-1.22", "module" : "Data::Compare", @@ -11305,6 +11822,70 @@ }, "version" : "1.27" }, + "Digest::HMAC" : { + "dist" : "Digest-HMAC-1.03", + "module" : "Digest::HMAC_MD5", + "mymeta" : { + "abstract" : "Keyed-Hashing for Message Authentication", + "author" : [ + "Gisle Aas <gisle@activestate.com>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.57_05, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Digest-HMAC", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Digest::MD5" : "2", + "Digest::SHA" : "1", + "perl" : "5.004" + } + } + }, + "release_status" : "stable", + "version" : "1.03" + }, + "name" : "Digest::HMAC", + "pathname" : "G/GA/GAAS/Digest-HMAC-1.03.tar.gz", + "provides" : { + "Digest::HMAC" : { + "file" : "Digest/HMAC.pm", + "version" : "1.03" + }, + "Digest::HMAC_MD5" : { + "file" : "Digest/HMAC_MD5.pm", + "version" : "1.01" + }, + "Digest::HMAC_SHA1" : { + "file" : "Digest/HMAC_SHA1.pm", + "version" : "1.03" + } + }, + "version" : "1.01" + }, "Digest::SHA1" : { "dist" : "Digest-SHA1-2.13", "module" : "Digest::SHA1", @@ -12000,6 +12581,7 @@ "runtime" : { "requires" : { "Mail::Address" : 0, + "Net::DNS" : 0, "Test::More" : 0, "perl" : "5.006" } @@ -12441,6 +13023,287 @@ }, "version" : "1.32" }, + "ExtUtils::CBuilder" : { + "dist" : "ExtUtils-CBuilder-0.280202", + "module" : "ExtUtils::CBuilder", + "mymeta" : { + "abstract" : "Compile and link C code for Perl modules", + "author" : [ + "Ken Williams <kwilliams@cpan.org>", + "The Perl 5 Porters" + ], + "dynamic_config" : 0, + "generated_by" : "Dist::Zilla version 4.200001, CPAN::Meta::Converter version 2.102400, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "ExtUtils-CBuilder", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.47" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.31" + } + }, + "runtime" : { + "requires" : { + "Cwd" : 0, + "File::Basename" : 0, + "File::Spec" : "3.13", + "File::Temp" : 0, + "IO::File" : 0, + "IPC::Cmd" : 0, + "Text::ParseWords" : 0 + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "http://rt.perl.org/rt3/" + }, + "homepage" : "http://search.cpan.org/dist/ExtUtils-CBuilder", + "repository" : { + "type" : "git", + "url" : "git://github.com/dagolden/extutils-cbuilder.git" + } + }, + "version" : "0.280202", + "x_Dist_Zilla" : { + "plugins" : [ + { + "class" : "Dist::Zilla::Plugin::VersionFromModule", + "name" : "VersionFromModule", + "version" : "0.08" + }, + { + "class" : "Dist::Zilla::Plugin::CheckExtraTests", + "name" : "CheckExtraTests", + "version" : "0.004" + }, + { + "class" : "Dist::Zilla::Plugin::CheckChangesHasContent", + "name" : "CheckChangesHasContent", + "version" : "0.003" + }, + { + "class" : "Dist::Zilla::Plugin::GatherDir", + "name" : "@Filter/GatherDir", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::PruneCruft", + "name" : "@Filter/PruneCruft", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::ManifestSkip", + "name" : "@Filter/ManifestSkip", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::MetaYAML", + "name" : "@Filter/MetaYAML", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::License", + "name" : "@Filter/License", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::Readme", + "name" : "@Filter/Readme", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::ExecDir", + "name" : "@Filter/ExecDir", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::ShareDir", + "name" : "@Filter/ShareDir", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::MakeMaker", + "name" : "@Filter/MakeMaker", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::Manifest", + "name" : "@Filter/Manifest", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::TestRelease", + "name" : "@Filter/TestRelease", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::ConfirmRelease", + "name" : "@Filter/ConfirmRelease", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::UploadToCPAN", + "name" : "@Filter/UploadToCPAN", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::PruneFiles", + "name" : "PruneFiles", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::DualLife", + "name" : "DualLife", + "version" : "0.01" + }, + { + "class" : "Dist::Zilla::Plugin::MetaConfig", + "name" : "MetaConfig", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::MetaJSON", + "name" : "MetaJSON", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::PodSyntaxTests", + "name" : "PodSyntaxTests", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::EOLTests", + "name" : "EOLTests", + "version" : "0.02" + }, + { + "class" : "Dist::Zilla::Plugin::Prereqs", + "config" : { + "Dist::Zilla::Plugin::Prereqs" : { + "phase" : "runtime", + "type" : "requires" + } + }, + "name" : "Prereqs", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::Prereqs", + "config" : { + "Dist::Zilla::Plugin::Prereqs" : { + "phase" : "test", + "type" : "requires" + } + }, + "name" : "TestRequires", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::MetaResources", + "name" : "MetaResources", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":InstallModules", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":TestFiles", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":ExecFiles", + "version" : "4.200001" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : ":ShareFiles", + "version" : "4.200001" + } + ], + "zilla" : { + "class" : "Dist::Zilla::Dist::Builder", + "config" : { + "is_trial" : 0 + }, + "version" : "4.200001" + } + } + }, + "name" : "ExtUtils::CBuilder", + "pathname" : "D/DA/DAGOLDEN/ExtUtils-CBuilder-0.280202.tar.gz", + "provides" : { + "ExtUtils::CBuilder" : { + "file" : "ExtUtils/CBuilder.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Base" : { + "file" : "ExtUtils/CBuilder/Base.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::Unix" : { + "file" : "ExtUtils/CBuilder/Platform/Unix.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::VMS" : { + "file" : "ExtUtils/CBuilder/Platform/VMS.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::Windows" : { + "file" : "ExtUtils/CBuilder/Platform/Windows.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::Windows::BCC" : { + "file" : "ExtUtils/CBuilder/Platform/Windows/BCC.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::Windows::GCC" : { + "file" : "ExtUtils/CBuilder/Platform/Windows/GCC.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::Windows::MSVC" : { + "file" : "ExtUtils/CBuilder/Platform/Windows/MSVC.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::aix" : { + "file" : "ExtUtils/CBuilder/Platform/aix.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::cygwin" : { + "file" : "ExtUtils/CBuilder/Platform/cygwin.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::darwin" : { + "file" : "ExtUtils/CBuilder/Platform/darwin.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::dec_osf" : { + "file" : "ExtUtils/CBuilder/Platform/dec_osf.pm", + "version" : "0.280202" + }, + "ExtUtils::CBuilder::Platform::os2" : { + "file" : "ExtUtils/CBuilder/Platform/os2.pm", + "version" : "0.280202" + } + }, + "version" : "0.280202" + }, "ExtUtils::MakeMaker" : { "dist" : "ExtUtils-MakeMaker-6.62", "module" : "ExtUtils::MakeMaker", @@ -12509,6 +13372,38 @@ "name" : "ExtUtils::MakeMaker", "pathname" : "M/MS/MSCHWERN/ExtUtils-MakeMaker-6.62.tar.gz", "provides" : { + "CPAN::Meta" : { + "file" : "CPAN/Meta.pm", + "version" : "2.112150" + }, + "CPAN::Meta::Converter" : { + "file" : "CPAN/Meta/Converter.pm", + "version" : "2.112150" + }, + "CPAN::Meta::Feature" : { + "file" : "CPAN/Meta/Feature.pm", + "version" : "2.112150" + }, + "CPAN::Meta::History" : { + "file" : "CPAN/Meta/History.pm", + "version" : "2.112150" + }, + "CPAN::Meta::Prereqs" : { + "file" : "CPAN/Meta/Prereqs.pm", + "version" : "2.112150" + }, + "CPAN::Meta::Spec" : { + "file" : "CPAN/Meta/Spec.pm", + "version" : "2.112150" + }, + "CPAN::Meta::Validator" : { + "file" : "CPAN/Meta/Validator.pm", + "version" : "2.112150" + }, + "CPAN::Meta::YAML" : { + "file" : "CPAN/Meta/YAML.pm", + "version" : "0.003" + }, "DynaLoader" : { "file" : "ExtUtils/Mkbootstrap.pm" }, @@ -12604,6 +13499,10 @@ "file" : "ExtUtils/MakeMaker/Config.pm", "version" : "6.62" }, + "ExtUtils::Manifest" : { + "file" : "ExtUtils/Manifest.pm", + "version" : "1.58" + }, "ExtUtils::Mkbootstrap" : { "file" : "ExtUtils/Mkbootstrap.pm", "version" : "6.62" @@ -12616,15 +13515,156 @@ "file" : "ExtUtils/testlib.pm", "version" : "6.62" }, + "JSON::PP" : { + "file" : "JSON/PP.pm", + "version" : "2.27104" + }, + "JSON::PP::Boolean" : { + "file" : "JSON/PP.pm" + }, + "JSON::PP::Compat5006" : { + "file" : "JSON/PP/Compat5006.pm", + "version" : "1.09" + }, + "JSON::PP::IncrParser" : { + "file" : "JSON/PP.pm", + "version" : "1.01" + }, "MM" : { "file" : "ExtUtils/MM.pm" }, "MY" : { "file" : "ExtUtils/MakeMaker.pm" + }, + "Parse::CPAN::Meta" : { + "file" : "Parse/CPAN/Meta.pm", + "version" : "1.4401" + }, + "Version::Requirements" : { + "file" : "Version/Requirements.pm", + "version" : "0.101020" + }, + "charstar" : { + "file" : "version/vpp.pm" + }, + "version" : { + "file" : "version.pm", + "version" : "0.88" + }, + "version::vpp" : { + "file" : "version/vpp.pm", + "version" : "0.88" + }, + "warnings" : { + "file" : "version/vpp.pm" } }, "version" : "6.62" }, + "ExtUtils::ParseXS" : { + "dist" : "ExtUtils-ParseXS-3.15", + "module" : "ExtUtils::ParseXS", + "mymeta" : { + "abstract" : "converts Perl XS code into C code", + "author" : [ + "Ken Williams <ken@mathforum.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "ExtUtils-ParseXS", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.46" + } + }, + "runtime" : { + "requires" : { + "Carp" : 0, + "Cwd" : 0, + "DynaLoader" : 0, + "Exporter" : 0, + "ExtUtils::CBuilder" : 0, + "ExtUtils::MakeMaker" : "6.46", + "File::Basename" : 0, + "File::Spec" : 0, + "Symbol" : 0, + "Test::More" : "0.47" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "http://rt.perl.org/rt3/" + }, + "repository" : { + "type" : "git", + "url" : "git://perl5.git.perl.org/gitroot/perl.git" + } + }, + "version" : "3.15" + }, + "name" : "ExtUtils::ParseXS", + "pathname" : "S/SM/SMUELLER/ExtUtils-ParseXS-3.15.tar.gz", + "provides" : { + "ExtUtils::ParseXS" : { + "file" : "ExtUtils/ParseXS.pm", + "version" : "3.15" + }, + "ExtUtils::ParseXS::Constants" : { + "file" : "ExtUtils/ParseXS/Constants.pm", + "version" : "3.15" + }, + "ExtUtils::ParseXS::CountLines" : { + "file" : "ExtUtils/ParseXS/CountLines.pm", + "version" : "3.15" + }, + "ExtUtils::ParseXS::Utilities" : { + "file" : "ExtUtils/ParseXS/Utilities.pm", + "version" : "3.15" + }, + "ExtUtils::Typemaps" : { + "file" : "ExtUtils/Typemaps.pm", + "version" : "3.15" + }, + "ExtUtils::Typemaps::Cmd" : { + "file" : "ExtUtils/Typemaps/Cmd.pm", + "version" : "3.15" + }, + "ExtUtils::Typemaps::InputMap" : { + "file" : "ExtUtils/Typemaps/InputMap.pm", + "version" : "3.15" + }, + "ExtUtils::Typemaps::OutputMap" : { + "file" : "ExtUtils/Typemaps/OutputMap.pm", + "version" : "3.15" + }, + "ExtUtils::Typemaps::Type" : { + "file" : "ExtUtils/Typemaps/Type.pm", + "version" : "3.15" + } + }, + "version" : "3.15" + }, "FCGI" : { "dist" : "FCGI-0.74", "module" : "FCGI", @@ -14449,6 +15489,175 @@ }, "version" : "0.24" }, + "IO::Compress" : { + "dist" : "IO-Compress-2.048", + "module" : "IO::Compress::Bzip2", + "mymeta" : { + "abstract" : "IO Interface to compressed data files/buffers", + "author" : [ + "Paul Marquess <pmqs@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "IO-Compress", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Compress::Raw::Bzip2" : "2.048", + "Compress::Raw::Zlib" : "2.048", + "Scalar::Util" : 0 + } + } + }, + "release_status" : "stable", + "version" : "2.048" + }, + "name" : "IO::Compress", + "pathname" : "P/PM/PMQS/IO-Compress-2.048.tar.gz", + "provides" : { + "Compress::Zlib" : { + "file" : "Compress/Zlib.pm", + "version" : "2.048" + }, + "File::GlobMapper" : { + "file" : "File/GlobMapper.pm", + "version" : "1.000" + }, + "IO::Compress::Adapter::Bzip2" : { + "file" : "IO/Compress/Adapter/Bzip2.pm", + "version" : "2.048" + }, + "IO::Compress::Adapter::Deflate" : { + "file" : "IO/Compress/Adapter/Deflate.pm", + "version" : "2.048" + }, + "IO::Compress::Adapter::Identity" : { + "file" : "IO/Compress/Adapter/Identity.pm", + "version" : "2.048" + }, + "IO::Compress::Base" : { + "file" : "IO/Compress/Base.pm", + "version" : "2.048" + }, + "IO::Compress::Base::Common" : { + "file" : "IO/Compress/Base/Common.pm", + "version" : "2.048" + }, + "IO::Compress::Bzip2" : { + "file" : "IO/Compress/Bzip2.pm", + "version" : "2.048" + }, + "IO::Compress::Deflate" : { + "file" : "IO/Compress/Deflate.pm", + "version" : "2.048" + }, + "IO::Compress::Gzip" : { + "file" : "IO/Compress/Gzip.pm", + "version" : "2.048" + }, + "IO::Compress::Gzip::Constants" : { + "file" : "IO/Compress/Gzip/Constants.pm", + "version" : "2.048" + }, + "IO::Compress::RawDeflate" : { + "file" : "IO/Compress/RawDeflate.pm", + "version" : "2.048" + }, + "IO::Compress::Zip" : { + "file" : "IO/Compress/Zip.pm", + "version" : "2.048" + }, + "IO::Compress::Zip::Constants" : { + "file" : "IO/Compress/Zip/Constants.pm", + "version" : "2.048" + }, + "IO::Compress::Zlib::Constants" : { + "file" : "IO/Compress/Zlib/Constants.pm", + "version" : "2.048" + }, + "IO::Compress::Zlib::Extra" : { + "file" : "IO/Compress/Zlib/Extra.pm", + "version" : "2.048" + }, + "IO::Uncompress::Adapter::Bunzip2" : { + "file" : "IO/Uncompress/Adapter/Bunzip2.pm", + "version" : "2.048" + }, + "IO::Uncompress::Adapter::Identity" : { + "file" : "IO/Uncompress/Adapter/Identity.pm", + "version" : "2.048" + }, + "IO::Uncompress::Adapter::Inflate" : { + "file" : "IO/Uncompress/Adapter/Inflate.pm", + "version" : "2.048" + }, + "IO::Uncompress::AnyInflate" : { + "file" : "IO/Uncompress/AnyInflate.pm", + "version" : "2.048" + }, + "IO::Uncompress::AnyUncompress" : { + "file" : "IO/Uncompress/AnyUncompress.pm", + "version" : "2.048" + }, + "IO::Uncompress::Base" : { + "file" : "IO/Uncompress/Base.pm", + "version" : "2.048" + }, + "IO::Uncompress::Bunzip2" : { + "file" : "IO/Uncompress/Bunzip2.pm", + "version" : "2.048" + }, + "IO::Uncompress::Gunzip" : { + "file" : "IO/Uncompress/Gunzip.pm", + "version" : "2.048" + }, + "IO::Uncompress::Inflate" : { + "file" : "IO/Uncompress/Inflate.pm", + "version" : "2.048" + }, + "IO::Uncompress::RawInflate" : { + "file" : "IO/Uncompress/RawInflate.pm", + "version" : "2.048" + }, + "IO::Uncompress::Unzip" : { + "file" : "IO/Uncompress/Unzip.pm", + "version" : "2.048" + }, + "U64" : { + "file" : "IO/Compress/Base/Common.pm" + }, + "Zlib::OldDeflate" : { + "file" : "Compress/Zlib.pm" + }, + "Zlib::OldInflate" : { + "file" : "Compress/Zlib.pm" + } + }, + "version" : "2.048" + }, "IO::String" : { "dist" : "IO-String-1.08", "module" : "IO::String", @@ -14740,6 +15949,90 @@ }, "version" : "3.230" }, + "JSON" : { + "dist" : "JSON-2.53", + "module" : "JSON", + "mymeta" : { + "abstract" : "JSON (JavaScript Object Notation) encoder/decoder", + "author" : [ + "Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "JSON", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "http://github.com/makamaka/JSON" + } + }, + "version" : "2.53" + }, + "name" : "JSON", + "pathname" : "M/MA/MAKAMAKA/JSON-2.53.tar.gz", + "provides" : { + "JSON" : { + "file" : "JSON.pm", + "version" : "2.53" + }, + "JSON::Backend::PP" : { + "file" : "JSON.pm" + }, + "JSON::Boolean" : { + "file" : "JSON.pm" + }, + "JSON::PP" : { + "file" : "JSON/backportPP.pm", + "version" : "2.27200" + }, + "JSON::PP5005" : { + "file" : "JSON/backportPP/Compat5005.pm", + "version" : "1.10" + }, + "JSON::PP56" : { + "file" : "JSON/backportPP/Compat5006.pm", + "version" : "1.08" + }, + "JSON::PP::IncrParser" : { + "file" : "JSON/backportPP.pm", + "version" : "1.01" + }, + "JSON::backportPP::Boolean" : { + "file" : "JSON/backportPP.pm" + } + }, + "version" : "2.53" + }, "LWP" : { "dist" : "libwww-perl-6.03", "module" : "LWP", @@ -14969,6 +16262,725 @@ }, "version" : "6.01" }, + "Lingua::EN::Inflect" : { + "dist" : "Lingua-EN-Inflect-1.893", + "module" : "Lingua::EN::Inflect", + "mymeta" : { + "abstract" : "Convert singular to plural. Select \"a\" or \"an\".", + "author" : [ + "Damian Conway <DCONWAY@CPAN.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-EN-Inflect", + "prereqs" : { + "runtime" : { + "requires" : { + "Test::More" : 0, + "version" : 0 + } + } + }, + "release_status" : "stable", + "version" : "1.893" + }, + "name" : "Lingua::EN::Inflect", + "pathname" : "D/DC/DCONWAY/Lingua-EN-Inflect-1.893.tar.gz", + "provides" : { + "Lingua::EN::Inflect" : { + "file" : "Lingua/EN/Inflect.pm", + "version" : "1.893" + } + }, + "version" : "1.893" + }, + "Lingua::EN::Inflect::Number" : { + "dist" : "Lingua-EN-Inflect-Number-1.1", + "module" : "Lingua::EN::Inflect::Number", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-EN-Inflect-Number", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Lingua::EN::Inflect" : 0 + } + } + }, + "release_status" : "stable", + "version" : "1.1" + }, + "name" : "Lingua::EN::Inflect::Number", + "pathname" : "S/SI/SIMON/Lingua-EN-Inflect-Number-1.1.tar.gz", + "provides" : { + "Lingua::EN::Inflect::Number" : { + "file" : "Lingua/EN/Inflect/Number.pm", + "version" : "1.1" + } + }, + "version" : "1.1" + }, + "Lingua::EN::Inflect::Phrase" : { + "dist" : "Lingua-EN-Inflect-Phrase-0.12", + "module" : "Lingua::EN::Inflect::Phrase", + "mymeta" : { + "abstract" : "Inflect short English Phrases", + "author" : [ + "Rafael Kitover <rkitover@cpan.org>", + "Rafael Kitover <rkitover@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-EN-Inflect-Phrase", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.36", + "Test::More" : "0.94" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.36" + } + }, + "runtime" : { + "requires" : { + "Exporter" : "5.63", + "Lingua::EN::Inflect" : "1.891", + "Lingua::EN::Inflect::Number" : "1.1", + "Lingua::EN::Tagger" : "0.15", + "Test::More" : "0.94" + } + } + }, + "provides" : { + "Lingua::EN::Inflect::Phrase" : { + "file" : "lib/Lingua/EN/Inflect/Phrase.pm", + "version" : "0.12" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/rkitover/lingua-en-inflect-phrase.git" + } + }, + "version" : "0.12" + }, + "name" : "Lingua::EN::Inflect::Phrase", + "pathname" : "R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.12.tar.gz", + "provides" : { + "Lingua::EN::Inflect::Phrase" : { + "file" : "Lingua/EN/Inflect/Phrase.pm", + "version" : "0.12" + } + }, + "version" : "0.12" + }, + "Lingua::EN::Tagger" : { + "dist" : "Lingua-EN-Tagger-0.16", + "module" : "Lingua::EN::Tagger", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "Maciej Ceglowski and Aaron Coburn <maciej@ceglowski.com>, <aaron@coburncuadrado.com>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-EN-Tagger", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "File::Spec" : "0.84", + "HTML::Parser" : "3.45", + "Lingua::Stem" : "0.81", + "Memoize" : "1.01", + "Memoize::ExpireLRU" : "0.55", + "Storable" : "2.10" + } + } + }, + "release_status" : "stable", + "version" : "0.16" + }, + "name" : "Lingua::EN::Tagger", + "pathname" : "A/AC/ACOBURN/Lingua-EN-Tagger-0.16.tar.gz", + "provides" : { + "Lingua::EN::Tagger" : { + "file" : "Lingua/EN/Tagger.pm", + "version" : "0.16" + } + }, + "version" : "0.16" + }, + "Lingua::PT::Stemmer" : { + "dist" : "Lingua-PT-Stemmer-0.01", + "module" : "Lingua::PT::Stemmer", + "mymeta" : { + "abstract" : "Portuguese language stemming", + "author" : [ + "xern <xern@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-PT-Stemmer", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.01" + }, + "name" : "Lingua::PT::Stemmer", + "pathname" : "X/XE/XERN/Lingua-PT-Stemmer-0.01.tar.gz", + "provides" : { + "Lingua::GL::Stemmer" : { + "file" : "Lingua/GL/Stemmer.pm", + "version" : "0.01" + }, + "Lingua::PT::Stemmer" : { + "file" : "Lingua/PT/Stemmer.pm", + "version" : "0.01" + } + }, + "version" : "0.01" + }, + "Lingua::Stem" : { + "dist" : "Lingua-Stem-0.84", + "module" : "Lingua::Stem", + "mymeta" : { + "abstract" : "Stemming of words in various languages", + "author" : [ + "Benjamin Franz <snowhare@nihongo.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-Stem", + "prereqs" : { + "runtime" : { + "requires" : { + "Carp" : 0, + "Lingua::GL::Stemmer" : 0, + "Lingua::PT::Stemmer" : 0, + "Lingua::Stem::Fr" : "0.02", + "Lingua::Stem::It" : 0, + "Lingua::Stem::Ru" : 0, + "Lingua::Stem::Snowball::Da" : "1.01", + "Lingua::Stem::Snowball::No" : "1.00", + "Lingua::Stem::Snowball::Se" : "1.01", + "Text::German" : 0 + } + } + }, + "provides" : { + "Lingua::Stem" : { + "file" : "lib/Lingua/Stem.pm", + "version" : "0.84" + }, + "Lingua::Stem::AutoLoader" : { + "file" : "lib/Lingua/Stem/AutoLoader.pm", + "version" : "1.02" + }, + "Lingua::Stem::Da" : { + "file" : "lib/Lingua/Stem/Da.pm", + "version" : "1.01" + }, + "Lingua::Stem::De" : { + "file" : "lib/Lingua/Stem/De.pm", + "version" : "1.01" + }, + "Lingua::Stem::En" : { + "file" : "lib/Lingua/Stem/En.pm", + "version" : "2.16" + }, + "Lingua::Stem::EnBroken" : { + "file" : "lib/Lingua/Stem/EnBroken.pm", + "version" : "2.13" + }, + "Lingua::Stem::Gl" : { + "file" : "lib/Lingua/Stem/Gl.pm", + "version" : "1.02" + }, + "Lingua::Stem::No" : { + "file" : "lib/Lingua/Stem/No.pm", + "version" : "1.01" + }, + "Lingua::Stem::Pt" : { + "file" : "lib/Lingua/Stem/Pt.pm", + "version" : "1.01" + }, + "Lingua::Stem::Sv" : { + "file" : "lib/Lingua/Stem/Sv.pm", + "version" : "1.01" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "0.84" + }, + "name" : "Lingua::Stem", + "pathname" : "S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz", + "provides" : { + "Lingua::Stem" : { + "file" : "Lingua/Stem.pm", + "version" : "0.84" + }, + "Lingua::Stem::AutoLoader" : { + "file" : "Lingua/Stem/AutoLoader.pm", + "version" : "1.02" + }, + "Lingua::Stem::Da" : { + "file" : "Lingua/Stem/Da.pm", + "version" : "1.01" + }, + "Lingua::Stem::De" : { + "file" : "Lingua/Stem/De.pm", + "version" : "1.01" + }, + "Lingua::Stem::En" : { + "file" : "Lingua/Stem/En.pm", + "version" : "2.16" + }, + "Lingua::Stem::EnBroken" : { + "file" : "Lingua/Stem/EnBroken.pm", + "version" : "2.13" + }, + "Lingua::Stem::Gl" : { + "file" : "Lingua/Stem/Gl.pm", + "version" : "1.02" + }, + "Lingua::Stem::No" : { + "file" : "Lingua/Stem/No.pm", + "version" : "1.01" + }, + "Lingua::Stem::Pt" : { + "file" : "Lingua/Stem/Pt.pm", + "version" : "1.01" + }, + "Lingua::Stem::Sv" : { + "file" : "Lingua/Stem/Sv.pm", + "version" : "1.01" + } + }, + "version" : "0.84" + }, + "Lingua::Stem::Fr" : { + "dist" : "Lingua-Stem-Fr-0.02", + "module" : "Lingua::Stem::Fr", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-Stem-Fr", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.02" + }, + "name" : "Lingua::Stem::Fr", + "pathname" : "S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz", + "provides" : { + "Lingua::Stem::Fr" : { + "file" : "Lingua/Stem/Fr.pm", + "version" : "0.02" + } + }, + "version" : "0.02" + }, + "Lingua::Stem::It" : { + "dist" : "Lingua-Stem-It-0.02", + "module" : "Lingua::Stem::It", + "mymeta" : { + "abstract" : "Porter's stemming algorithm for Italian", + "author" : [ + "Aldo Calpini <dada@perl.it>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-Stem-It", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.02" + }, + "name" : "Lingua::Stem::It", + "pathname" : "A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz", + "provides" : { + "Lingua::Stem::It" : { + "file" : "Lingua/Stem/It.pm", + "version" : "0.02" + } + }, + "version" : "0.02" + }, + "Lingua::Stem::Ru" : { + "dist" : "Lingua-Stem-Ru-0.01", + "module" : "Lingua::Stem::Ru", + "mymeta" : { + "abstract" : "Porter's stemming algorithm for Russian", + "author" : [ + "Aleksandr Guidrevitch <pillgrim@mail.ru>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-Stem-Ru", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.01" + }, + "name" : "Lingua::Stem::Ru", + "pathname" : "A/AL/ALGDR/Lingua-Stem-Ru-0.01.tar.gz", + "provides" : { + "Lingua::Stem::Ru" : { + "file" : "Lingua/Stem/Ru.pm", + "version" : "0.01" + } + }, + "version" : "0.01" + }, + "Lingua::Stem::Snowball::Da" : { + "dist" : "Lingua-Stem-Snowball-Da-1.01", + "module" : "Lingua::Stem::Snowball::Da", + "mymeta" : { + "abstract" : "Porters stemming algorithm for Denmark", + "author" : [ + "Dennis Haney <davh@davh.dk>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Lingua-Stem-Snowball-Da", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "1.01" + }, + "name" : "Lingua::Stem::Snowball::Da", + "pathname" : "C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz", + "provides" : { + "Lingua::Stem::Snowball::Da" : { + "file" : "Lingua/Stem/Snowball/Da.pm", + "version" : "1.01" + } + }, + "version" : "1.01" + }, + "Lingua::Stem::Snowball::No" : { + "dist" : "Snowball-Norwegian-1.2", + "module" : "Lingua::Stem::Snowball::No", + "mymeta" : { + "abstract" : "Porters stemming algorithm for norwegian.", + "author" : [ + "Ask Solem <ASKSH@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Snowball-Norwegian", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.42" + } + } + }, + "provides" : { + "Lingua::Stem::Snowball::No" : { + "file" : "lib/Lingua/Stem/Snowball/No.pm", + "version" : "1.2" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "1.2" + }, + "name" : "Lingua::Stem::Snowball::No", + "pathname" : "A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz", + "provides" : { + "Lingua::Stem::Snowball::No" : { + "file" : "Lingua/Stem/Snowball/No.pm", + "version" : "1.2" + } + }, + "version" : "1.2" + }, + "Lingua::Stem::Snowball::Se" : { + "dist" : "Snowball-Swedish-1.2", + "module" : "Lingua::Stem::Snowball::Se", + "mymeta" : { + "abstract" : "Porters stemming algorithm for swedish.", + "author" : [ + "Ask Solem <ASKSH@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Snowball-Swedish", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.42" + } + } + }, + "provides" : { + "Lingua::Stem::Snowball::Se" : { + "file" : "lib/Lingua/Stem/Snowball/Se.pm", + "version" : "1.2" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ] + }, + "version" : "1.2" + }, + "name" : "Lingua::Stem::Snowball::Se", + "pathname" : "A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz", + "provides" : { + "Lingua::Stem::Snowball::Se" : { + "file" : "Lingua/Stem/Snowball/Se.pm", + "version" : "1.2" + } + }, + "version" : "1.2" + }, "List::MoreUtils" : { "dist" : "List-MoreUtils-0.33", "module" : "List::MoreUtils", @@ -15499,24 +17511,24 @@ }, "version" : "2.08" }, - "Math::BigInt" : { - "dist" : "Math-BigInt-1.997", - "module" : "Math::BigInt", + "Math::Round" : { + "dist" : "Math-Round-0.06", + "module" : "Math::Round", "mymeta" : { - "abstract" : "Arbitrary size integer/float math package", + "abstract" : "unknown", "author" : [ - "Original code by Mark Biggar, overloaded interface by Ilya Zakharevich., Tels <nospam-abuse@bloodgate.com>" + "unknown" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", "license" : [ - "perl_5" + "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Math-BigInt", + "name" : "Math-Round", "no_index" : { "directory" : [ "t", @@ -15526,8 +17538,7 @@ "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : "6.42", - "Test::More" : "0.62" + "ExtUtils::MakeMaker" : 0 } }, "configure" : { @@ -15536,54 +17547,40 @@ } }, "runtime" : { - "requires" : { - "perl" : "5.006002" - } + "requires" : {} } }, "release_status" : "stable", - "version" : "1.997" + "version" : "0.06" }, - "name" : "Math::BigInt", - "pathname" : "P/PJ/PJACKLAM/Math-BigInt-1.997.tar.gz", + "name" : "Math::Round", + "pathname" : "G/GR/GROMMEL/Math-Round-0.06.tar.gz", "provides" : { - "Math::BigFloat" : { - "file" : "Math/BigFloat.pm", - "version" : "1.997" - }, - "Math::BigInt" : { - "file" : "Math/BigInt.pm", - "version" : "1.997" - }, - "Math::BigInt::Calc" : { - "file" : "Math/BigInt/Calc.pm", - "version" : "1.997" - }, - "Math::BigInt::CalcEmu" : { - "file" : "Math/BigInt/CalcEmu.pm", - "version" : "1.997" + "Math::Round" : { + "file" : "Math/Round.pm", + "version" : "0.06" } }, - "version" : "1.997" + "version" : "0.06" }, - "Math::BigInt::GMP" : { - "dist" : "Math-BigInt-GMP-1.37", - "module" : "Math::BigInt::GMP", + "Memoize::ExpireLRU" : { + "dist" : "Memoize-ExpireLRU-0.55", + "module" : "Memoize::ExpireLRU", "mymeta" : { - "abstract" : "Use the GMP library for Math::BigInt routines", + "abstract" : "unknown", "author" : [ - "Tels" + "unknown" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.59, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", "license" : [ - "perl_5" + "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Math-BigInt-GMP", + "name" : "Memoize-ExpireLRU", "no_index" : { "directory" : [ "t", @@ -15603,75 +17600,329 @@ }, "runtime" : { "requires" : { - "Math::BigInt" : "1.997", - "XSLoader" : "0.02" + "Memoize" : "0.52" } } }, "release_status" : "stable", - "version" : "1.37" + "version" : "0.55" }, - "name" : "Math::BigInt::GMP", - "pathname" : "P/PJ/PJACKLAM/Math-BigInt-GMP-1.37.tar.gz", + "name" : "Memoize::ExpireLRU", + "pathname" : "B/BP/BPOWERS/Memoize-ExpireLRU-0.55.tar.gz", "provides" : { - "Math::BigInt::GMP" : { - "file" : "Math/BigInt/GMP.pm", - "version" : "1.37" + "Memoize::ExpireLRU" : { + "file" : "Memoize/ExpireLRU.pm", + "version" : "0.55" } }, - "version" : "1.37" + "version" : "0.55" }, - "Math::Round" : { - "dist" : "Math-Round-0.06", - "module" : "Math::Round", + "Module::Build" : { + "dist" : "Module-Build-0.3800", + "module" : "Module::Build", "mymeta" : { - "abstract" : "unknown", + "abstract" : "Build and install Perl modules", "author" : [ - "unknown" + "Ken Williams <kwilliams@cpan.org>", + "Development questions, bug reports, and patches should be sent to the\nModule-Build mailing list at <module-build@perl.org>." ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", "license" : [ - "unknown" + "perl_5" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "Math-Round", - "no_index" : { - "directory" : [ - "t", - "inc" - ] - }, + "name" : "Module-Build", "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "File::Temp" : "0.15", + "Parse::CPAN::Meta" : "1.4401", + "Test::Harness" : "3.16", + "Test::More" : "0.49" } }, - "configure" : { + "runtime" : { + "recommends" : { + "ExtUtils::Install" : "0.3", + "ExtUtils::Manifest" : "1.54" + }, "requires" : { - "ExtUtils::MakeMaker" : 0 + "CPAN::Meta" : "2.110420", + "Cwd" : 0, + "Data::Dumper" : 0, + "ExtUtils::CBuilder" : "0.27", + "ExtUtils::Install" : 0, + "ExtUtils::Manifest" : 0, + "ExtUtils::Mkbootstrap" : 0, + "ExtUtils::ParseXS" : "2.21", + "File::Basename" : 0, + "File::Compare" : 0, + "File::Copy" : 0, + "File::Find" : 0, + "File::Path" : 0, + "File::Spec" : "0.82", + "Getopt::Long" : 0, + "IO::File" : 0, + "Module::Metadata" : "1.000002", + "Perl::OSType" : "1", + "Test::Harness" : 0, + "Text::Abbrev" : 0, + "Text::ParseWords" : 0, + "perl" : "5.006001", + "version" : "0.87" } + } + }, + "provides" : { + "Module::Build" : { + "file" : "lib/Module/Build.pm", + "version" : "0.3800" }, - "runtime" : { - "requires" : {} + "Module::Build::Base" : { + "file" : "lib/Module/Build/Base.pm", + "version" : "0.3800" + }, + "Module::Build::Compat" : { + "file" : "lib/Module/Build/Compat.pm", + "version" : "0.3800" + }, + "Module::Build::Config" : { + "file" : "lib/Module/Build/Config.pm", + "version" : "0.3800" + }, + "Module::Build::Cookbook" : { + "file" : "lib/Module/Build/Cookbook.pm", + "version" : "0.3800" + }, + "Module::Build::Dumper" : { + "file" : "lib/Module/Build/Dumper.pm", + "version" : "0.3800" + }, + "Module::Build::ModuleInfo" : { + "file" : "lib/Module/Build/ModuleInfo.pm", + "version" : "0.3800" + }, + "Module::Build::Notes" : { + "file" : "lib/Module/Build/Notes.pm", + "version" : "0.3800" + }, + "Module::Build::PPMMaker" : { + "file" : "lib/Module/Build/PPMMaker.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Amiga" : { + "file" : "lib/Module/Build/Platform/Amiga.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Default" : { + "file" : "lib/Module/Build/Platform/Default.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::EBCDIC" : { + "file" : "lib/Module/Build/Platform/EBCDIC.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::MPEiX" : { + "file" : "lib/Module/Build/Platform/MPEiX.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::MacOS" : { + "file" : "lib/Module/Build/Platform/MacOS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::RiscOS" : { + "file" : "lib/Module/Build/Platform/RiscOS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Unix" : { + "file" : "lib/Module/Build/Platform/Unix.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::VMS" : { + "file" : "lib/Module/Build/Platform/VMS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::VOS" : { + "file" : "lib/Module/Build/Platform/VOS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Windows" : { + "file" : "lib/Module/Build/Platform/Windows.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::aix" : { + "file" : "lib/Module/Build/Platform/aix.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::cygwin" : { + "file" : "lib/Module/Build/Platform/cygwin.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::darwin" : { + "file" : "lib/Module/Build/Platform/darwin.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::os2" : { + "file" : "lib/Module/Build/Platform/os2.pm", + "version" : "0.3800" + }, + "Module::Build::PodParser" : { + "file" : "lib/Module/Build/PodParser.pm", + "version" : "0.3800" + }, + "Module::Build::Version" : { + "file" : "lib/Module/Build/Version.pm", + "version" : "0.87" + }, + "Module::Build::YAML" : { + "file" : "lib/Module/Build/YAML.pm", + "version" : "1.41" + }, + "inc::latest" : { + "file" : "lib/inc/latest.pm", + "version" : "0.3800" + }, + "inc::latest::private" : { + "file" : "lib/inc/latest/private.pm", + "version" : "0.3800" } }, "release_status" : "stable", - "version" : "0.06" + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "url" : "http://github.com/dagolden/module-build/" + }, + "x_MailingList" : "mailto:module-build@perl.org" + }, + "version" : "0.3800" }, - "name" : "Math::Round", - "pathname" : "G/GR/GROMMEL/Math-Round-0.06.tar.gz", + "name" : "Module::Build", + "pathname" : "D/DA/DAGOLDEN/Module-Build-0.3800.tar.gz", "provides" : { - "Math::Round" : { - "file" : "Math/Round.pm", - "version" : "0.06" + "Module::Build" : { + "file" : "Module/Build.pm", + "version" : "0.3800" + }, + "Module::Build::Base" : { + "file" : "Module/Build/Base.pm", + "version" : "0.3800" + }, + "Module::Build::Compat" : { + "file" : "Module/Build/Compat.pm", + "version" : "0.3800" + }, + "Module::Build::Config" : { + "file" : "Module/Build/Config.pm", + "version" : "0.3800" + }, + "Module::Build::ConfigData" : { + "file" : "Module/Build/ConfigData.pm" + }, + "Module::Build::Cookbook" : { + "file" : "Module/Build/Cookbook.pm", + "version" : "0.3800" + }, + "Module::Build::Dumper" : { + "file" : "Module/Build/Dumper.pm", + "version" : "0.3800" + }, + "Module::Build::ModuleInfo" : { + "file" : "Module/Build/ModuleInfo.pm", + "version" : "0.3800" + }, + "Module::Build::Notes" : { + "file" : "Module/Build/Notes.pm", + "version" : "0.3800" + }, + "Module::Build::PPMMaker" : { + "file" : "Module/Build/PPMMaker.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Amiga" : { + "file" : "Module/Build/Platform/Amiga.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Default" : { + "file" : "Module/Build/Platform/Default.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::EBCDIC" : { + "file" : "Module/Build/Platform/EBCDIC.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::MPEiX" : { + "file" : "Module/Build/Platform/MPEiX.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::MacOS" : { + "file" : "Module/Build/Platform/MacOS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::RiscOS" : { + "file" : "Module/Build/Platform/RiscOS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Unix" : { + "file" : "Module/Build/Platform/Unix.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::VMS" : { + "file" : "Module/Build/Platform/VMS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::VOS" : { + "file" : "Module/Build/Platform/VOS.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::Windows" : { + "file" : "Module/Build/Platform/Windows.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::aix" : { + "file" : "Module/Build/Platform/aix.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::cygwin" : { + "file" : "Module/Build/Platform/cygwin.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::darwin" : { + "file" : "Module/Build/Platform/darwin.pm", + "version" : "0.3800" + }, + "Module::Build::Platform::os2" : { + "file" : "Module/Build/Platform/os2.pm", + "version" : "0.3800" + }, + "Module::Build::PodParser" : { + "file" : "Module/Build/PodParser.pm", + "version" : "0.3800" + }, + "Module::Build::Version" : { + "file" : "Module/Build/Version.pm", + "version" : "0.87" + }, + "Module::Build::YAML" : { + "file" : "Module/Build/YAML.pm", + "version" : "1.41" + }, + "inc::latest" : { + "file" : "inc/latest.pm", + "version" : "0.3800" + }, + "inc::latest::private" : { + "file" : "inc/latest/private.pm", + "version" : "0.3800" } }, - "version" : "0.06" + "version" : "0.3800" }, "Module::Extract::Namespaces" : { "dist" : "Module-Extract-Namespaces-0.14", @@ -15908,6 +18159,67 @@ }, "version" : "0.10" }, + "Module::Metadata" : { + "dist" : "Module-Metadata-1.000009", + "module" : "Module::Metadata", + "mymeta" : { + "abstract" : "Gather package and POD information from perl module files", + "author" : [ + "Ken Williams <kwilliams@cpan.org>, Randy W. Sims <RandyS@ThePierianSpring.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112621, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Module-Metadata", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Carp" : 0, + "File::Find" : 0, + "File::Spec" : 0, + "IO::File" : 0, + "strict" : 0, + "vars" : 0, + "version" : "0.87", + "warnings" : 0 + } + } + }, + "release_status" : "stable", + "version" : "1.000009" + }, + "name" : "Module::Metadata", + "pathname" : "D/DA/DAGOLDEN/Module-Metadata-1.000009.tar.gz", + "provides" : { + "Module::Metadata" : { + "file" : "Module/Metadata.pm", + "version" : "1.000009" + } + }, + "version" : "1.000009" + }, "Module::Runtime" : { "dist" : "Module-Runtime-0.011", "module" : "Module::Runtime", @@ -18161,6 +20473,301 @@ }, "version" : "1.28" }, + "Net::DNS" : { + "dist" : "Net-DNS-0.68", + "module" : "Net::DNS", + "mymeta" : { + "abstract" : "Perl DNS resolver module", + "author" : [ + "Olaf Kolkman <olaf@net-dns.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Net-DNS", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Digest::HMAC_MD5" : "1", + "Digest::MD5" : "2.12", + "Digest::SHA" : "5.23", + "IO::Socket" : 0, + "MIME::Base64" : "2.11", + "Test::More" : "0.18" + } + } + }, + "release_status" : "stable", + "version" : "0.68" + }, + "name" : "Net::DNS", + "pathname" : "O/OL/OLAF/Net-DNS-0.68.tar.gz", + "provides" : { + "Net::DNS" : { + "file" : "Net/DNS.pm", + "version" : "0.68" + }, + "Net::DNS::Domain" : { + "file" : "Net/DNS/Domain.pm", + "version" : "964" + }, + "Net::DNS::DomainName" : { + "file" : "Net/DNS/DomainName.pm", + "version" : "964" + }, + "Net::DNS::DomainName1035" : { + "file" : "Net/DNS/DomainName.pm" + }, + "Net::DNS::DomainName2535" : { + "file" : "Net/DNS/DomainName.pm" + }, + "Net::DNS::Header" : { + "file" : "Net/DNS/Header.pm", + "version" : "968" + }, + "Net::DNS::Mailbox" : { + "file" : "Net/DNS/Mailbox.pm", + "version" : "970" + }, + "Net::DNS::Mailbox1035" : { + "file" : "Net/DNS/Mailbox.pm" + }, + "Net::DNS::Mailbox2535" : { + "file" : "Net/DNS/Mailbox.pm" + }, + "Net::DNS::Nameserver" : { + "file" : "Net/DNS/Nameserver.pm", + "version" : "970" + }, + "Net::DNS::Packet" : { + "file" : "Net/DNS/Packet.pm", + "version" : "969" + }, + "Net::DNS::Question" : { + "file" : "Net/DNS/Question.pm", + "version" : "971" + }, + "Net::DNS::RR" : { + "file" : "Net/DNS/RR.pm", + "version" : "969" + }, + "Net::DNS::RR::A" : { + "file" : "Net/DNS/RR/A.pm", + "version" : "932" + }, + "Net::DNS::RR::AAAA" : { + "file" : "Net/DNS/RR/AAAA.pm", + "version" : "932" + }, + "Net::DNS::RR::AFSDB" : { + "file" : "Net/DNS/RR/AFSDB.pm", + "version" : "932" + }, + "Net::DNS::RR::APL" : { + "file" : "Net/DNS/RR/APL.pm", + "version" : "684" + }, + "Net::DNS::RR::APL::ApItem" : { + "file" : "Net/DNS/RR/APL/ApItem.pm", + "version" : "684" + }, + "Net::DNS::RR::CERT" : { + "file" : "Net/DNS/RR/CERT.pm", + "version" : "932" + }, + "Net::DNS::RR::CNAME" : { + "file" : "Net/DNS/RR/CNAME.pm", + "version" : "932" + }, + "Net::DNS::RR::DHCID" : { + "file" : "Net/DNS/RR/DHCID.pm", + "version" : "718" + }, + "Net::DNS::RR::DNAME" : { + "file" : "Net/DNS/RR/DNAME.pm", + "version" : "932" + }, + "Net::DNS::RR::EID" : { + "file" : "Net/DNS/RR/EID.pm", + "version" : "932" + }, + "Net::DNS::RR::HINFO" : { + "file" : "Net/DNS/RR/HINFO.pm", + "version" : "932" + }, + "Net::DNS::RR::HIP" : { + "file" : "Net/DNS/RR/HIP.pm", + "version" : "718" + }, + "Net::DNS::RR::IPSECKEY" : { + "file" : "Net/DNS/RR/IPSECKEY.pm", + "version" : "932" + }, + "Net::DNS::RR::ISDN" : { + "file" : "Net/DNS/RR/ISDN.pm", + "version" : "932" + }, + "Net::DNS::RR::KX" : { + "file" : "Net/DNS/RR/KX.pm", + "version" : "684" + }, + "Net::DNS::RR::LOC" : { + "file" : "Net/DNS/RR/LOC.pm", + "version" : "932" + }, + "Net::DNS::RR::MB" : { + "file" : "Net/DNS/RR/MB.pm", + "version" : "932" + }, + "Net::DNS::RR::MG" : { + "file" : "Net/DNS/RR/MG.pm", + "version" : "932" + }, + "Net::DNS::RR::MINFO" : { + "file" : "Net/DNS/RR/MINFO.pm", + "version" : "932" + }, + "Net::DNS::RR::MR" : { + "file" : "Net/DNS/RR/MR.pm", + "version" : "932" + }, + "Net::DNS::RR::MX" : { + "file" : "Net/DNS/RR/MX.pm", + "version" : "932" + }, + "Net::DNS::RR::NAPTR" : { + "file" : "Net/DNS/RR/NAPTR.pm", + "version" : "932" + }, + "Net::DNS::RR::NIMLOC" : { + "file" : "Net/DNS/RR/NIMLOC.pm", + "version" : "932" + }, + "Net::DNS::RR::NS" : { + "file" : "Net/DNS/RR/NS.pm", + "version" : "932" + }, + "Net::DNS::RR::NSAP" : { + "file" : "Net/DNS/RR/NSAP.pm", + "version" : "932" + }, + "Net::DNS::RR::NULL" : { + "file" : "Net/DNS/RR/NULL.pm", + "version" : "932" + }, + "Net::DNS::RR::OPT" : { + "file" : "Net/DNS/RR/OPT.pm", + "version" : "932" + }, + "Net::DNS::RR::PTR" : { + "file" : "Net/DNS/RR/PTR.pm", + "version" : "966" + }, + "Net::DNS::RR::PX" : { + "file" : "Net/DNS/RR/PX.pm", + "version" : "932" + }, + "Net::DNS::RR::RP" : { + "file" : "Net/DNS/RR/RP.pm", + "version" : "932" + }, + "Net::DNS::RR::RT" : { + "file" : "Net/DNS/RR/RT.pm", + "version" : "932" + }, + "Net::DNS::RR::SOA" : { + "file" : "Net/DNS/RR/SOA.pm", + "version" : "932" + }, + "Net::DNS::RR::SPF" : { + "file" : "Net/DNS/RR/SPF.pm", + "version" : "932" + }, + "Net::DNS::RR::SRV" : { + "file" : "Net/DNS/RR/SRV.pm", + "version" : "932" + }, + "Net::DNS::RR::SSHFP" : { + "file" : "Net/DNS/RR/SSHFP.pm", + "version" : "932" + }, + "Net::DNS::RR::TKEY" : { + "file" : "Net/DNS/RR/TKEY.pm", + "version" : "932" + }, + "Net::DNS::RR::TSIG" : { + "file" : "Net/DNS/RR/TSIG.pm", + "version" : "932" + }, + "Net::DNS::RR::TXT" : { + "file" : "Net/DNS/RR/TXT.pm", + "version" : "932" + }, + "Net::DNS::RR::Unknown" : { + "file" : "Net/DNS/RR/Unknown.pm", + "version" : "932" + }, + "Net::DNS::RR::X25" : { + "file" : "Net/DNS/RR/X25.pm", + "version" : "932" + }, + "Net::DNS::Resolver" : { + "file" : "Net/DNS/Resolver.pm", + "version" : "955" + }, + "Net::DNS::Resolver::Base" : { + "file" : "Net/DNS/Resolver/Base.pm", + "version" : "932" + }, + "Net::DNS::Resolver::Cygwin" : { + "file" : "Net/DNS/Resolver/Cygwin.pm", + "version" : "932" + }, + "Net::DNS::Resolver::Recurse" : { + "file" : "Net/DNS/Resolver/Recurse.pm", + "version" : "932" + }, + "Net::DNS::Resolver::UNIX" : { + "file" : "Net/DNS/Resolver/UNIX.pm", + "version" : "932" + }, + "Net::DNS::Resolver::Win32" : { + "file" : "Net/DNS/Resolver/Win32.pm", + "version" : "932" + }, + "Net::DNS::Text" : { + "file" : "Net/DNS/Text.pm", + "version" : "965" + }, + "Net::DNS::Update" : { + "file" : "Net/DNS/Update.pm", + "version" : "970" + } + }, + "version" : "0.68" + }, "Net::Domain::TLD" : { "dist" : "Net-Domain-TLD-1.68", "module" : "Net::Domain::TLD", @@ -19835,6 +22442,81 @@ }, "version" : "0.24" }, + "Perl::OSType" : { + "dist" : "Perl-OSType-1.002", + "module" : "Perl::OSType", + "mymeta" : { + "abstract" : "Map Perl operating system names to generic types", + "author" : [ + "David Golden <dagolden@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Dist::Zilla version 4.102341, CPAN::Meta::Converter version 2.102400, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Perl-OSType", + "no_index" : { + "directory" : [ + "t", + "xt", + "examples", + "corpus" + ], + "package" : [ + "DB" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "File::Find" : 0, + "File::Temp" : 0, + "Test::More" : "0.88", + "constant" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.31" + } + }, + "runtime" : { + "requires" : { + "Exporter" : 0 + } + } + }, + "provides" : { + "Perl::OSType" : { + "file" : "lib/Perl/OSType.pm", + "version" : "1.002" + } + }, + "release_status" : "stable", + "resources" : { + "homepage" : "http://github.com/dagolden/perl-ostype/tree", + "repository" : { + "type" : "git", + "url" : "git://github.com/dagolden/perl-ostype.git" + } + }, + "version" : "1.002" + }, + "name" : "Perl::OSType", + "pathname" : "D/DA/DAGOLDEN/Perl-OSType-1.002.tar.gz", + "provides" : { + "Perl::OSType" : { + "file" : "Perl/OSType.pm", + "version" : "1.002" + } + }, + "version" : "1.002" + }, "Probe::Perl" : { "dist" : "Probe-Perl-0.01", "module" : "Probe::Perl", @@ -20197,6 +22879,1040 @@ }, "version" : "1.666001" }, + "SOAP::WSDL" : { + "dist" : "SOAP-WSDL-2.00.10", + "module" : "SOAP::WSDL::Client::Base", + "mymeta" : { + "abstract" : "SOAP with WSDL support", + "author" : [ + "Martin Kutter <martin.kutter@fen-net.de>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "license" : [ + "artistic_1" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "SOAP-WSDL", + "no_index" : { + "directory" : [ + "lib/SOAP/WSDL/Generator/Template/XSD/" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "Class::Std::Fast" : "v0.0.5", + "Cwd" : 0, + "Date::Format" : 0, + "Date::Parse" : 0, + "File::Basename" : 0, + "File::Path" : 0, + "File::Spec" : 0, + "Getopt::Long" : 0, + "LWP::UserAgent" : 0, + "List::Util" : 0, + "Module::Build" : 0, + "Storable" : 0, + "Template" : "2.18", + "Test::More" : 0, + "XML::Parser::Expat" : 0 + } + }, + "runtime" : { + "requires" : { + "Class::Std::Fast" : "v0.0.5", + "Data::Dumper" : 0, + "Date::Format" : 0, + "Date::Parse" : 0, + "File::Basename" : 0, + "File::Path" : 0, + "Getopt::Long" : 0, + "LWP::UserAgent" : 0, + "List::Util" : 0, + "Template" : "2.18", + "Term::ReadKey" : 0, + "URI" : 0, + "XML::Parser::Expat" : 0, + "perl" : "v5.8.0" + } + } + }, + "provides" : { + "SOAP::WSDL" : { + "file" : "lib/SOAP/WSDL.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Base" : { + "file" : "lib/SOAP/WSDL/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Binding" : { + "file" : "lib/SOAP/WSDL/Binding.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client" : { + "file" : "lib/SOAP/WSDL/Client.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client::Base" : { + "file" : "lib/SOAP/WSDL/Client/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Definitions" : { + "file" : "lib/SOAP/WSDL/Definitions.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::Hash" : { + "file" : "lib/SOAP/WSDL/Deserializer/Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::SOM" : { + "file" : "lib/SOAP/WSDL/Deserializer/SOM.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::XSD" : { + "file" : "lib/SOAP/WSDL/Deserializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Base" : { + "file" : "lib/SOAP/WSDL/Expat/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Message2Hash" : { + "file" : "lib/SOAP/WSDL/Expat/Message2Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageParser" : { + "file" : "lib/SOAP/WSDL/Expat/MessageParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageStreamParser" : { + "file" : "lib/SOAP/WSDL/Expat/MessageStreamParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::WSDLParser" : { + "file" : "lib/SOAP/WSDL/Expat/WSDLParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Deserializer" : { + "file" : "lib/SOAP/WSDL/Factory/Deserializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Generator" : { + "file" : "lib/SOAP/WSDL/Factory/Generator.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Serializer" : { + "file" : "lib/SOAP/WSDL/Factory/Serializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Transport" : { + "file" : "lib/SOAP/WSDL/Factory/Transport.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Iterator::WSDL11" : { + "file" : "lib/SOAP/WSDL/Generator/Iterator/WSDL11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::PrefixResolver" : { + "file" : "lib/SOAP/WSDL/Generator/PrefixResolver.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template" : { + "file" : "lib/SOAP/WSDL/Generator/Template.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::Plugin::XSD" : { + "file" : "lib/SOAP/WSDL/Generator/Template/Plugin/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::XSD" : { + "file" : "lib/SOAP/WSDL/Generator/Template/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor" : { + "file" : "lib/SOAP/WSDL/Generator/Visitor.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor::Typemap" : { + "file" : "lib/SOAP/WSDL/Generator/Visitor/Typemap.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Message" : { + "file" : "lib/SOAP/WSDL/Message.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::OpMessage" : { + "file" : "lib/SOAP/WSDL/OpMessage.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Operation" : { + "file" : "lib/SOAP/WSDL/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Part" : { + "file" : "lib/SOAP/WSDL/Part.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Port" : { + "file" : "lib/SOAP/WSDL/Port.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::PortType" : { + "file" : "lib/SOAP/WSDL/PortType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Address" : { + "file" : "lib/SOAP/WSDL/SOAP/Address.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Body" : { + "file" : "lib/SOAP/WSDL/SOAP/Body.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Header" : { + "file" : "lib/SOAP/WSDL/SOAP/Header.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::HeaderFault" : { + "file" : "lib/SOAP/WSDL/SOAP/HeaderFault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Operation" : { + "file" : "lib/SOAP/WSDL/SOAP/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault" : { + "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11" : { + "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11Detail" : { + "file" : "lib/SOAP/WSDL/SOAP/Typelib/Fault11.pm", + "version" : 0 + }, + "SOAP::WSDL::Serializer::XSD" : { + "file" : "lib/SOAP/WSDL/Serializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server" : { + "file" : "lib/SOAP/WSDL/Server.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::CGI" : { + "file" : "lib/SOAP/WSDL/Server/CGI.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Mod_Perl2" : { + "file" : "lib/SOAP/WSDL/Server/Mod_Perl2.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Simple" : { + "file" : "lib/SOAP/WSDL/Server/Simple.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Service" : { + "file" : "lib/SOAP/WSDL/Service.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::HTTP" : { + "file" : "lib/SOAP/WSDL/Transport/HTTP.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Loopback" : { + "file" : "lib/SOAP/WSDL/Transport/Loopback.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Test" : { + "file" : "lib/SOAP/WSDL/Transport/Test.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::TypeLookup" : { + "file" : "lib/SOAP/WSDL/TypeLookup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Types" : { + "file" : "lib/SOAP/WSDL/Types.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Annotation" : { + "file" : "lib/SOAP/WSDL/XSD/Annotation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Attribute" : { + "file" : "lib/SOAP/WSDL/XSD/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::AttributeGroup" : { + "file" : "lib/SOAP/WSDL/XSD/AttributeGroup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Builtin" : { + "file" : "lib/SOAP/WSDL/XSD/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::ComplexType" : { + "file" : "lib/SOAP/WSDL/XSD/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Element" : { + "file" : "lib/SOAP/WSDL/XSD/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Enumeration" : { + "file" : "lib/SOAP/WSDL/XSD/Enumeration.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::FractionDigits" : { + "file" : "lib/SOAP/WSDL/XSD/FractionDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Group" : { + "file" : "lib/SOAP/WSDL/XSD/Group.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Length" : { + "file" : "lib/SOAP/WSDL/XSD/Length.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxExclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MaxExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxInclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MaxInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxLength" : { + "file" : "lib/SOAP/WSDL/XSD/MaxLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinExclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MinExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinInclusive" : { + "file" : "lib/SOAP/WSDL/XSD/MinInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinLength" : { + "file" : "lib/SOAP/WSDL/XSD/MinLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Pattern" : { + "file" : "lib/SOAP/WSDL/XSD/Pattern.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema" : { + "file" : "lib/SOAP/WSDL/XSD/Schema.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema::Builtin" : { + "file" : "lib/SOAP/WSDL/XSD/Schema/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::SimpleType" : { + "file" : "lib/SOAP/WSDL/XSD/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::TotalDigits" : { + "file" : "lib/SOAP/WSDL/XSD/TotalDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Attribute" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::AttributeSet" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/AttributeSet.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ENTITY" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ID" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/ID.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREF" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREFS" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NCName" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NOTATION" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::Name" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/Name.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::QName" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/QName.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyURI" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::base64Binary" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::boolean" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::byte" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/byte.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::date" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/date.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::dateTime" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::decimal" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::double" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/double.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::duration" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/duration.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::float" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/float.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gDay" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonth" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYear" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::hexBinary" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::int" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/int.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::integer" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/integer.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::language" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/language.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::list" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/list.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::long" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/long.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::normalizedString" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::short" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/short.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::string" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/string.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::time" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/time.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::token" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/token.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm", + "version" : 0 + }, + "SOAP::WSDL::XSD::Typelib::ComplexType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Element" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType::restriction" : { + "file" : "lib/SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::WhiteSpace" : { + "file" : "lib/SOAP/WSDL/XSD/WhiteSpace.pm", + "version" : "v2.0.10" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://opensource.org/licenses/artistic-license.php" + ] + }, + "version" : "2.00.10" + }, + "name" : "SOAP::WSDL", + "pathname" : "M/MK/MKUTTER/SOAP-WSDL-2.00.10.tar.gz", + "provides" : { + "SOAP::WSDL" : { + "file" : "SOAP/WSDL.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Base" : { + "file" : "SOAP/WSDL/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Binding" : { + "file" : "SOAP/WSDL/Binding.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client" : { + "file" : "SOAP/WSDL/Client.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Client::Base" : { + "file" : "SOAP/WSDL/Client/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Definitions" : { + "file" : "SOAP/WSDL/Definitions.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::Hash" : { + "file" : "SOAP/WSDL/Deserializer/Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::SOM" : { + "file" : "SOAP/WSDL/Deserializer/SOM.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Deserializer::XSD" : { + "file" : "SOAP/WSDL/Deserializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Base" : { + "file" : "SOAP/WSDL/Expat/Base.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::Message2Hash" : { + "file" : "SOAP/WSDL/Expat/Message2Hash.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageParser" : { + "file" : "SOAP/WSDL/Expat/MessageParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::MessageStreamParser" : { + "file" : "SOAP/WSDL/Expat/MessageStreamParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Expat::WSDLParser" : { + "file" : "SOAP/WSDL/Expat/WSDLParser.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Deserializer" : { + "file" : "SOAP/WSDL/Factory/Deserializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Generator" : { + "file" : "SOAP/WSDL/Factory/Generator.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Serializer" : { + "file" : "SOAP/WSDL/Factory/Serializer.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Factory::Transport" : { + "file" : "SOAP/WSDL/Factory/Transport.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Iterator::WSDL11" : { + "file" : "SOAP/WSDL/Generator/Iterator/WSDL11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::PrefixResolver" : { + "file" : "SOAP/WSDL/Generator/PrefixResolver.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template" : { + "file" : "SOAP/WSDL/Generator/Template.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::Plugin::XSD" : { + "file" : "SOAP/WSDL/Generator/Template/Plugin/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Template::XSD" : { + "file" : "SOAP/WSDL/Generator/Template/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor" : { + "file" : "SOAP/WSDL/Generator/Visitor.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Generator::Visitor::Typemap" : { + "file" : "SOAP/WSDL/Generator/Visitor/Typemap.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Message" : { + "file" : "SOAP/WSDL/Message.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::OpMessage" : { + "file" : "SOAP/WSDL/OpMessage.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Operation" : { + "file" : "SOAP/WSDL/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Part" : { + "file" : "SOAP/WSDL/Part.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Port" : { + "file" : "SOAP/WSDL/Port.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::PortType" : { + "file" : "SOAP/WSDL/PortType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Address" : { + "file" : "SOAP/WSDL/SOAP/Address.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Body" : { + "file" : "SOAP/WSDL/SOAP/Body.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Header" : { + "file" : "SOAP/WSDL/SOAP/Header.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::HeaderFault" : { + "file" : "SOAP/WSDL/SOAP/HeaderFault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Operation" : { + "file" : "SOAP/WSDL/SOAP/Operation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault" : { + "file" : "SOAP/WSDL/SOAP/Typelib/Fault.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11" : { + "file" : "SOAP/WSDL/SOAP/Typelib/Fault11.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::SOAP::Typelib::Fault11Detail" : { + "file" : "SOAP/WSDL/SOAP/Typelib/Fault11.pm" + }, + "SOAP::WSDL::Serializer::XSD" : { + "file" : "SOAP/WSDL/Serializer/XSD.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server" : { + "file" : "SOAP/WSDL/Server.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::CGI" : { + "file" : "SOAP/WSDL/Server/CGI.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Mod_Perl2" : { + "file" : "SOAP/WSDL/Server/Mod_Perl2.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Server::Simple" : { + "file" : "SOAP/WSDL/Server/Simple.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Service" : { + "file" : "SOAP/WSDL/Service.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::HTTP" : { + "file" : "SOAP/WSDL/Transport/HTTP.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Loopback" : { + "file" : "SOAP/WSDL/Transport/Loopback.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Transport::Test" : { + "file" : "SOAP/WSDL/Transport/Test.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::TypeLookup" : { + "file" : "SOAP/WSDL/TypeLookup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::Types" : { + "file" : "SOAP/WSDL/Types.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Annotation" : { + "file" : "SOAP/WSDL/XSD/Annotation.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Attribute" : { + "file" : "SOAP/WSDL/XSD/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::AttributeGroup" : { + "file" : "SOAP/WSDL/XSD/AttributeGroup.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Builtin" : { + "file" : "SOAP/WSDL/XSD/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::ComplexType" : { + "file" : "SOAP/WSDL/XSD/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Element" : { + "file" : "SOAP/WSDL/XSD/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Enumeration" : { + "file" : "SOAP/WSDL/XSD/Enumeration.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::FractionDigits" : { + "file" : "SOAP/WSDL/XSD/FractionDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Group" : { + "file" : "SOAP/WSDL/XSD/Group.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Length" : { + "file" : "SOAP/WSDL/XSD/Length.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxExclusive" : { + "file" : "SOAP/WSDL/XSD/MaxExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxInclusive" : { + "file" : "SOAP/WSDL/XSD/MaxInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MaxLength" : { + "file" : "SOAP/WSDL/XSD/MaxLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinExclusive" : { + "file" : "SOAP/WSDL/XSD/MinExclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinInclusive" : { + "file" : "SOAP/WSDL/XSD/MinInclusive.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::MinLength" : { + "file" : "SOAP/WSDL/XSD/MinLength.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Pattern" : { + "file" : "SOAP/WSDL/XSD/Pattern.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema" : { + "file" : "SOAP/WSDL/XSD/Schema.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Schema::Builtin" : { + "file" : "SOAP/WSDL/XSD/Schema/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::SimpleType" : { + "file" : "SOAP/WSDL/XSD/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::TotalDigits" : { + "file" : "SOAP/WSDL/XSD/TotalDigits.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Attribute" : { + "file" : "SOAP/WSDL/XSD/Typelib/Attribute.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::AttributeSet" : { + "file" : "SOAP/WSDL/XSD/Typelib/AttributeSet.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ENTITY" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/ENTITY.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::ID" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/ID.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREF" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/IDREF.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::IDREFS" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/IDREFS.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NCName" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NCName.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKEN" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NMTOKEN.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NMTOKENS" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NMTOKENS.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::NOTATION" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/NOTATION.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::Name" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/Name.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::QName" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/QName.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anySimpleType.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyType" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anyType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::anyURI" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/anyURI.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::base64Binary" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/base64Binary.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::boolean" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/boolean.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::byte" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/byte.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::date" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/date.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::dateTime" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/dateTime.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::decimal" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/decimal.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::double" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/double.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::duration" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/duration.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::float" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/float.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gDay" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gDay.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonth" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gMonth.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gMonthDay" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gMonthDay.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYear" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gYear.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::gYearMonth" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/gYearMonth.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::hexBinary" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/hexBinary.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::int" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/int.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::integer" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/integer.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::language" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/language.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::list" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/list.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::long" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/long.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::negativeInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/negativeInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/nonNegativeInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::nonPositiveInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/nonPositiveInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::normalizedString" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/normalizedString.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::positiveInteger" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/positiveInteger.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::short" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/short.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::string" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/string.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::time" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/time.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::token" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/token.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedByte" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedByte.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedInt.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedLong" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedLong.pm" + }, + "SOAP::WSDL::XSD::Typelib::Builtin::unsignedShort" : { + "file" : "SOAP/WSDL/XSD/Typelib/Builtin/unsignedShort.pm" + }, + "SOAP::WSDL::XSD::Typelib::ComplexType" : { + "file" : "SOAP/WSDL/XSD/Typelib/ComplexType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::Element" : { + "file" : "SOAP/WSDL/XSD/Typelib/Element.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType" : { + "file" : "SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::Typelib::SimpleType::restriction" : { + "file" : "SOAP/WSDL/XSD/Typelib/SimpleType.pm", + "version" : "v2.0.10" + }, + "SOAP::WSDL::XSD::WhiteSpace" : { + "file" : "SOAP/WSDL/XSD/WhiteSpace.pm", + "version" : "v2.0.10" + } + }, + "version" : "v2.0.10" + }, "SQL::Abstract" : { "dist" : "SQL-Abstract-1.72", "module" : "SQL::Abstract", @@ -20558,6 +24274,57 @@ }, "version" : "1.4" }, + "String::CamelCase" : { + "dist" : "String-CamelCase-0.02", + "module" : "String::CamelCase", + "mymeta" : { + "abstract" : "camelcase, de-camelcase", + "author" : [ + "YAMASHINA Hio <hio@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MY_Metafile version 0.09, EUMM-6.17., CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "String-CamelCase", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Test::More" : 0 + } + } + }, + "release_status" : "stable", + "version" : "0.02", + "x_installdirs" : "site", + "x_version_from" : "lib/String/CamelCase.pm" + }, + "name" : "String::CamelCase", + "pathname" : "H/HI/HIO/String-CamelCase-0.02.tar.gz", + "provides" : { + "String::CamelCase" : { + "file" : "String/CamelCase.pm", + "version" : "0.02" + } + }, + "version" : "0.02" + }, "String::RewritePrefix" : { "dist" : "String-RewritePrefix-0.006", "module" : "String::RewritePrefix", @@ -20790,6 +24557,89 @@ }, "version" : "0.006" }, + "String::ToIdentifier::EN" : { + "dist" : "String-ToIdentifier-EN-0.07", + "module" : "String::ToIdentifier::EN", + "mymeta" : { + "abstract" : "Convert Strings to English Program Identifiers", + "author" : [ + "Rafael Kitover, C<< <rkitover@cpan.org> >>", + "Rafael Kitover <rkitover@cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.04, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "String-ToIdentifier-EN", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62", + "Test::More" : "0.92" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62" + } + }, + "runtime" : { + "requires" : { + "Exporter" : "5.57", + "Lingua::EN::Inflect::Phrase" : "0.07", + "Test::More" : "0.92", + "Text::Unidecode" : "0.04", + "namespace::clean" : "0.20", + "perl" : "5.008001" + } + } + }, + "provides" : { + "String::ToIdentifier::EN" : { + "file" : "lib/String/ToIdentifier/EN.pm", + "version" : "0.07" + }, + "String::ToIdentifier::EN::Unicode" : { + "file" : "lib/String/ToIdentifier/EN/Unicode.pm", + "version" : 0 + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/rkitover/string-toidentifier-en.git" + } + }, + "version" : "0.07" + }, + "name" : "String::ToIdentifier::EN", + "pathname" : "R/RK/RKITOVER/String-ToIdentifier-EN-0.07.tar.gz", + "provides" : { + "String::ToIdentifier::EN" : { + "file" : "String/ToIdentifier/EN.pm", + "version" : "0.07" + }, + "String::ToIdentifier::EN::Unicode" : { + "file" : "String/ToIdentifier/EN/Unicode.pm" + } + }, + "version" : "0.07" + }, "Sub::Exporter" : { "dist" : "Sub-Exporter-0.982", "module" : "Sub::Exporter", @@ -21520,6 +25370,58 @@ }, "version" : "1.00" }, + "Term::ReadKey" : { + "dist" : "TermReadKey-2.30", + "module" : "Term::ReadKey", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "TermReadKey", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "2.30" + }, + "name" : "Term::ReadKey", + "pathname" : "J/JS/JSTOWE/TermReadKey-2.30.tar.gz", + "provides" : { + "Term::ReadKey" : { + "file" : "Term/ReadKey.pm", + "version" : "2.30" + } + }, + "version" : "2.30" + }, "Test::Base" : { "dist" : "Test-Base-0.60", "module" : "Test::Base", @@ -23056,6 +26958,82 @@ }, "version" : "0.02" }, + "Text::German" : { + "dist" : "Text-German-0.06", + "module" : "Text::German", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Text-German", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.06" + }, + "name" : "Text::German", + "pathname" : "U/UL/ULPFR/Text-German-0.06.tar.gz", + "provides" : { + "Text::German" : { + "file" : "Text/German.pm", + "version" : "0.06" + }, + "Text::German::Adjektiv" : { + "file" : "Text/German/Adjektiv.pm" + }, + "Text::German::Ausnahme" : { + "file" : "Text/German/Ausnahme.pm" + }, + "Text::German::Cache" : { + "file" : "Text/German/Cache.pm" + }, + "Text::German::Endung" : { + "file" : "Text/German/Endung.pm" + }, + "Text::German::Regel" : { + "file" : "Text/German/Regel.pm" + }, + "Text::German::Util" : { + "file" : "Text/German/Util.pm" + }, + "Text::German::Verb" : { + "file" : "Text/German/Verb.pm" + }, + "Text::German::Vorsilbe" : { + "file" : "Text/German/Vorsilbe.pm" + } + }, + "version" : "0.06" + }, "Text::Glob" : { "dist" : "Text-Glob-0.09", "module" : "Text::Glob", @@ -23219,6 +27197,58 @@ }, "version" : "1.45" }, + "Text::Unidecode" : { + "dist" : "Text-Unidecode-0.04", + "module" : "Text::Unidecode", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Text-Unidecode", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "version" : "0.04" + }, + "name" : "Text::Unidecode", + "pathname" : "S/SB/SBURKE/Text-Unidecode-0.04.tar.gz", + "provides" : { + "Text::Unidecode" : { + "file" : "Text/Unidecode.pm", + "version" : "0.04" + } + }, + "version" : "0.04" + }, "Tie::IxHash" : { "dist" : "Tie-IxHash-1.22", "module" : "Tie::IxHash", @@ -24473,16 +28503,16 @@ }, "version" : "0.36" }, - "XML::Parser" : { - "dist" : "XML-Parser-2.41", - "module" : "XML::Parser", + "XML::NamespaceSupport" : { + "dist" : "XML-NamespaceSupport-1.11", + "module" : "XML::NamespaceSupport", "mymeta" : { - "abstract" : "A perl module for parsing XML documents", + "abstract" : "a simple generic namespace support class", "author" : [ - "Clark Cooper (coopercc@netheaven.com)" + "Robin Berjon, robin@knowscape.com, with lots of it having been done" ], "dynamic_config" : 0, - "generated_by" : "ExtUtils::MakeMaker version 6.56, CPAN::Meta::Converter version 2.112150", + "generated_by" : "Module::Install version 0.95, CPAN::Meta::Converter version 2.112150", "license" : [ "perl_5" ], @@ -24490,7 +28520,69 @@ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "XML-Parser", + "name" : "XML-NamespaceSupport", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.42", + "Test::More" : "0.47" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.42" + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/perigrin/xml-namespacesupport.git" + } + }, + "version" : "1.11" + }, + "name" : "XML::NamespaceSupport", + "pathname" : "P/PE/PERIGRIN/XML-NamespaceSupport-1.11.tar.gz", + "provides" : { + "XML::NamespaceSupport" : { + "file" : "XML/NamespaceSupport.pm", + "version" : "1.11" + } + }, + "version" : "1.11" + }, + "XML::SAX" : { + "dist" : "XML-SAX-0.99", + "module" : "XML::SAX", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.55_02, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "XML-SAX", "no_index" : { "directory" : [ "t", @@ -24510,71 +28602,67 @@ }, "runtime" : { "requires" : { - "LWP" : 0, - "perl" : "5.00405" + "File::Temp" : 0, + "XML::NamespaceSupport" : "0.03", + "XML::SAX::Base" : "1.05" } } }, "release_status" : "stable", - "resources" : { - "repository" : { - "url" : "http://github.com/chorny/XML-Parser" - } - }, - "version" : "2.41" + "version" : "0.99" }, - "name" : "XML::Parser", - "pathname" : "T/TO/TODDR/XML-Parser-2.41.tar.gz", + "name" : "XML::SAX", + "pathname" : "G/GR/GRANTM/XML-SAX-0.99.tar.gz", "provides" : { - "XML::Parser" : { - "file" : "XML/Parser.pm", - "version" : "2.41" + "XML::SAX" : { + "file" : "XML/SAX.pm", + "version" : "0.99" + }, + "XML::SAX::DocumentLocator" : { + "file" : "XML/SAX/DocumentLocator.pm" }, - "XML::Parser::Expat" : { - "file" : "XML/Parser/Expat.pm", - "version" : "2.41" + "XML::SAX::ParserFactory" : { + "file" : "XML/SAX/ParserFactory.pm", + "version" : "1.01" + }, + "XML::SAX::PurePerl" : { + "file" : "XML/SAX/PurePerl.pm", + "version" : "0.99" }, - "XML::Parser::Style::Debug" : { - "file" : "XML/Parser/Style/Debug.pm" + "XML::SAX::PurePerl::DebugHandler" : { + "file" : "XML/SAX/PurePerl/DebugHandler.pm" }, - "XML::Parser::Style::Objects" : { - "file" : "XML/Parser/Style/Objects.pm" + "XML::SAX::PurePerl::Exception" : { + "file" : "XML/SAX/PurePerl/Exception.pm" }, - "XML::Parser::Style::Stream" : { - "file" : "XML/Parser/Style/Stream.pm" + "XML::SAX::PurePerl::Productions" : { + "file" : "XML/SAX/PurePerl/Productions.pm" }, - "XML::Parser::Style::Subs" : { - "file" : "XML/Parser/Style/Subs.pm" + "XML::SAX::PurePerl::Reader" : { + "file" : "XML/SAX/PurePerl/Reader.pm" }, - "XML::Parser::Style::Tree" : { - "file" : "XML/Parser/Style/Tree.pm" + "XML::SAX::PurePerl::Reader::Stream" : { + "file" : "XML/SAX/PurePerl/Reader/Stream.pm" + }, + "XML::SAX::PurePerl::Reader::String" : { + "file" : "XML/SAX/PurePerl/Reader/String.pm" + }, + "XML::SAX::PurePerl::Reader::URI" : { + "file" : "XML/SAX/PurePerl/Reader/URI.pm" } }, - "version" : "2.41" + "version" : "0.99" }, - "XML::RSS" : { - "dist" : "XML-RSS-1.49", - "module" : "XML::RSS", + "XML::SAX::Base" : { + "dist" : "XML-SAX-Base-1.08", + "module" : "XML::SAX::Base", "mymeta" : { - "abstract" : "creates and updates RSS files", + "abstract" : "Base class for SAX Drivers and Filters", "author" : [ - "Shlomi Fish <shlomif@cpan.org>" + "Grant McLean <grantm@cpan.org>" ], "dynamic_config" : 0, - "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", - "keywords" : [ - "feed", - "feeds", - "generate", - "generating", - "parse", - "parsing", - "rss", - "RSS", - "web-feed", - "web-feeds", - "xml" - ], + "generated_by" : "Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.101670, CPAN::Meta::Converter version 2.112150", "license" : [ "perl_5" ], @@ -24582,106 +28670,48 @@ "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", "version" : "2" }, - "name" : "XML-RSS", + "name" : "XML-SAX-Base", "prereqs" : { "build" : { "requires" : { - "Test::Manifest" : "0.9", - "Test::More" : 0 + "Test::More" : "0.88" } }, "configure" : { "requires" : { - "Module::Build" : "0.36" + "ExtUtils::MakeMaker" : "6.31" } }, "runtime" : { - "requires" : { - "DateTime" : 0, - "DateTime::Format::Mail" : 0, - "DateTime::Format::W3CDTF" : 0, - "HTML::Entities" : 0, - "XML::Parser" : "2.23", - "perl" : "5.008" - } - } - }, - "provides" : { - "XML::RSS" : { - "file" : "lib/XML/RSS.pm", - "version" : "1.49" - }, - "XML::RSS::Private::Output::Base" : { - "file" : "lib/XML/RSS/Private/Output/Base.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::Roles::ImageDims" : { - "file" : "lib/XML/RSS/Private/Output/Roles/ImageDims.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::Roles::ModulesElems" : { - "file" : "lib/XML/RSS/Private/Output/Roles/ModulesElems.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V0_9" : { - "file" : "lib/XML/RSS/Private/Output/V0_9.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V0_91" : { - "file" : "lib/XML/RSS/Private/Output/V0_91.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V1_0" : { - "file" : "lib/XML/RSS/Private/Output/V1_0.pm", - "version" : 0 - }, - "XML::RSS::Private::Output::V2_0" : { - "file" : "lib/XML/RSS/Private/Output/V2_0.pm", - "version" : 0 + "requires" : {} } }, "release_status" : "stable", "resources" : { - "homepage" : "http://perl-rss.sourceforge.net/", - "license" : [ - "http://dev.perl.org/licenses/" - ], "repository" : { - "url" : "https://svn.perl.org/modules/XML-RSS/trunk" + "type" : "git", + "url" : "git://github.com/grantm/XML-SAX-Base.git" } }, - "version" : "1.49" + "version" : "1.08" }, - "name" : "XML::RSS", - "pathname" : "S/SH/SHLOMIF/XML-RSS-1.49.tar.gz", + "name" : "XML::SAX::Base", + "pathname" : "G/GR/GRANTM/XML-SAX-Base-1.08.tar.gz", "provides" : { - "XML::RSS" : { - "file" : "XML/RSS.pm", - "version" : "1.49" - }, - "XML::RSS::Private::Output::Base" : { - "file" : "XML/RSS/Private/Output/Base.pm" - }, - "XML::RSS::Private::Output::Roles::ImageDims" : { - "file" : "XML/RSS/Private/Output/Roles/ImageDims.pm" - }, - "XML::RSS::Private::Output::Roles::ModulesElems" : { - "file" : "XML/RSS/Private/Output/Roles/ModulesElems.pm" - }, - "XML::RSS::Private::Output::V0_9" : { - "file" : "XML/RSS/Private/Output/V0_9.pm" - }, - "XML::RSS::Private::Output::V0_91" : { - "file" : "XML/RSS/Private/Output/V0_91.pm" + "XML::SAX::Base" : { + "file" : "XML/SAX/Base.pm", + "version" : "1.08" }, - "XML::RSS::Private::Output::V1_0" : { - "file" : "XML/RSS/Private/Output/V1_0.pm" + "XML::SAX::Base::NoHandler" : { + "file" : "XML/SAX/Base.pm", + "version" : "1.08" }, - "XML::RSS::Private::Output::V2_0" : { - "file" : "XML/RSS/Private/Output/V2_0.pm" + "XML::SAX::Exception" : { + "file" : "XML/SAX/Exception.pm", + "version" : "1.08" } }, - "version" : "1.49" + "version" : "1.08" }, "XML::Simple" : { "dist" : "XML-Simple-2.18", @@ -24721,7 +28751,8 @@ "runtime" : { "requires" : { "Test::Simple" : "0.41", - "XML::Parser" : 0 + "XML::NamespaceSupport" : "1.04", + "XML::SAX" : 0 } } }, @@ -25013,6 +29044,130 @@ }, "version" : "0.30" }, + "carton" : { + "dist" : "carton-v0.9.3", + "module" : "Carton", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "Tatsuhiko Miyagawa" + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.03, CPAN::Meta::Converter version 2.112150", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "carton", + "no_index" : { + "directory" : [ + "inc", + "t", + "xt" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.62", + "Test::More" : "0.88", + "Test::Requires" : 0, + "version" : "0.77" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.59", + "version" : "0.77" + } + }, + "runtime" : { + "requires" : { + "App::cpanminus" : "1.5", + "CPAN::Meta" : "2.112", + "Exception::Class" : "1.32", + "ExtUtils::MakeMaker" : "6.59", + "JSON" : "2.53", + "Module::Build" : "0.38", + "Module::Metadata" : "1.000003", + "Term::ANSIColor" : "1.12", + "Try::Tiny" : "0.09", + "local::lib" : "1.008", + "parent" : "0.223", + "perl" : "5.008001" + } + } + }, + "provides" : { + "Carton" : { + "file" : "lib/Carton.pm", + "version" : "v0.9.3" + }, + "Carton::CLI" : { + "file" : "lib/Carton/CLI.pm", + "version" : 0 + }, + "Carton::Error" : { + "file" : "lib/Carton/Error.pm", + "version" : 0 + }, + "Carton::Tree" : { + "file" : "lib/Carton/Tree.pm", + "version" : 0 + }, + "Carton::TreeNode" : { + "file" : "lib/Carton/Tree.pm", + "version" : 0 + }, + "Carton::Util" : { + "file" : "lib/Carton/Util.pm", + "version" : 0 + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "https://github.com/miyagawa/carton/issues" + }, + "homepage" : "https://github.com/miyagawa/carton", + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/miyagawa/carton.git" + } + }, + "version" : "v0.9.3" + }, + "name" : "carton", + "pathname" : "M/MI/MIYAGAWA/carton-v0.9.3.tar.gz", + "provides" : { + "Carton" : { + "file" : "Carton.pm", + "version" : "v0.9.3" + }, + "Carton::CLI" : { + "file" : "Carton/CLI.pm" + }, + "Carton::Error" : { + "file" : "Carton/Error.pm" + }, + "Carton::Tree" : { + "file" : "Carton/Tree.pm" + }, + "Carton::TreeNode" : { + "file" : "Carton/Tree.pm" + }, + "Carton::Util" : { + "file" : "Carton/Util.pm" + } + }, + "version" : "v0.9.3" + }, "local::lib" : { "dist" : "local-lib-1.008004", "module" : "local::lib", @@ -25372,6 +29527,60 @@ } }, "version" : "0.21" + }, + "parent" : { + "dist" : "parent-0.225", + "module" : "parent", + "mymeta" : { + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.50, CPAN::Meta::Converter version 2.112150", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "parent", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Test::More" : "0.4" + } + } + }, + "release_status" : "stable", + "version" : "0.225" + }, + "name" : "parent", + "pathname" : "C/CO/CORION/parent-0.225.tar.gz", + "provides" : { + "parent" : { + "file" : "parent.pm", + "version" : "0.225" + } + }, + "version" : "0.225" } }, "version" : "0.9" diff --git a/commonlib b/commonlib -Subproject 4c2e8e4d8b27aa043d5aa120622a659b56f494d +Subproject f81ec03692fac90792fc102f88f0afbf3d2f73b diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 9118d66f7..1a4e82cee 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -7,7 +7,11 @@ # $Id: crontab.ugly,v 1.23 2010-01-07 10:32:24 louise Exp $ PATH=/usr/local/bin:/usr/bin:/bin +!!(* if ($vhost eq 'www.fixmystreet.com' || $vhost eq 'reportemptyhomes.com') { *)!! MAILTO=cron-!!(*= $site *)!!@mysociety.org +!!(* } else { *)!! +MAILTO=!!(*= $user *)!!@mysociety.org +!!(* } *)!! # On only one server !!(* if ($vhost eq 'reportemptyhomes.com') { *)!! @@ -18,7 +22,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org #2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-alerts" || echo "stalled?" 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-questionnaires" || echo "stalled?" -!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'matthew.fixmystreet.com')) { *)!! +!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'matthew.fixmystreet.com') || ($vhost eq 'integration-staging.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/cron-wrapper 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/cron-wrapper send-reports" || echo "stalled?" 0 9,12,15,18 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports --verbose" || echo "stalled?" @@ -35,6 +39,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! + !!(* 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/general.yml-example b/conf/general.yml-example index 06af11a55..ec77e6ba8 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -61,3 +61,5 @@ RSS_LIMIT: '20' # Should problem reports link to the council summary pages? AREA_LINKS_FROM_PROBLEMS: '0' + + diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example index c1b6d96c2..e7900161e 100644 --- a/conf/httpd.conf-example +++ b/conf/httpd.conf-example @@ -67,6 +67,7 @@ ExpiresByType text/css "access plus 10 years" ExpiresByType application/javascript "access plus 10 years" <Location /js/> AddOutputFilter DEFLATE js + Header append Cache-Control "no-transform" </Location> # Don't want jslib being passed to Catalyst diff --git a/conf/packages b/conf/packages index 21ee0a862..b5287718b 100644..120000 --- a/conf/packages +++ b/conf/packages @@ -1,37 +1 @@ -jhead -libdatetime-format-w3cdtf-perl -libcache-memcached-perl -libdbd-pg-perl -libdbi-perl -libdigest-sha1-perl -liberror-perl -libfcgi-perl -libfile-slurp-perl -libgeography-nationalgrid-perl -libhtml-parser-perl -libio-string-perl -liblingua-en-inflect-perl -liblocale-gettext-perl -libsoap-lite-perl -libstatistics-distributions-perl -liburi-perl -libwww-perl -libxml-rss-perl -memcached -perl -perl-base -perl-modules -perlmagick -libjson-perl -libimage-size-perl -libmath-bigint-gmp-perl -gettext -libtest-exception-perl -libipc-run3-perl -libyaml-perl -liblist-moreutils-perl -ruby-compass | libhaml-ruby -libtemplate-perl -postgresql-server-dev-8.4 -gnuplot -ttf-bitstream-vera +packages.debian-squeeze+testing
\ No newline at end of file diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze new file mode 100644 index 000000000..cb494157d --- /dev/null +++ b/conf/packages.debian-squeeze @@ -0,0 +1,38 @@ +jhead +libdatetime-format-w3cdtf-perl +libcache-memcached-perl +libdbd-pg-perl +libdbi-perl +libdigest-sha1-perl +liberror-perl +libfcgi-perl +libfile-slurp-perl +libgeography-nationalgrid-perl +libhtml-parser-perl +libio-string-perl +liblingua-en-inflect-perl +liblocale-gettext-perl +libsoap-lite-perl +libstatistics-distributions-perl +liburi-perl +libwww-perl +libxml-rss-perl +memcached +perl +perl-base +perl-modules +perlmagick +libjson-perl +libimage-size-perl +libmath-bigint-gmp-perl +gettext +libtest-exception-perl +libipc-run3-perl +libyaml-perl +liblist-moreutils-perl +libhaml-ruby +libtemplate-perl +postgresql-8.4 +postgresql-server-dev-8.4 +gnuplot +ttf-bitstream-vera diff --git a/conf/packages.debian-squeeze+testing b/conf/packages.debian-squeeze+testing new file mode 100644 index 000000000..cec3a2624 --- /dev/null +++ b/conf/packages.debian-squeeze+testing @@ -0,0 +1,38 @@ +jhead +libdatetime-format-w3cdtf-perl +libcache-memcached-perl +libdbd-pg-perl +libdbi-perl +libdigest-sha1-perl +liberror-perl +libfcgi-perl +libfile-slurp-perl +libgeography-nationalgrid-perl +libhtml-parser-perl +libio-string-perl +liblingua-en-inflect-perl +liblocale-gettext-perl +libsoap-lite-perl +libstatistics-distributions-perl +liburi-perl +libwww-perl +libxml-rss-perl +memcached +perl +perl-base +perl-modules +perlmagick +libjson-perl +libimage-size-perl +libmath-bigint-gmp-perl +gettext +libtest-exception-perl +libipc-run3-perl +libyaml-perl +liblist-moreutils-perl +ruby-compass +libtemplate-perl +postgresql-8.4 +postgresql-server-dev-8.4 +gnuplot +ttf-bitstream-vera diff --git a/db/schema.sql b/db/schema.sql index 395d1c07b..e1205099d 100644 --- a/db/schema.sql +++ b/db/schema.sql @@ -189,7 +189,15 @@ create table problem ( send_questionnaire boolean not null default 't', extra text, -- extra fields required for open311 flagged boolean not null default 'f', - geocode bytea + geocode bytea, + + -- logging sending failures (used by webservices) + send_fail_count integer not null default 0, + send_fail_reason text, + send_fail_timestamp timestamp, + + -- record send_method used, which can be used to infer usefulness of external_id + send_method_used text ); create index problem_state_latitude_longitude_idx on problem(state, latitude, longitude); create index problem_user_id_idx on problem ( user_id ); @@ -419,5 +427,6 @@ create table open311conf ( area_id integer not null unique, endpoint text not null, jurisdiction text, - api_key text + api_key text, + send_method text ); diff --git a/db/schema_0013-add_send_method_column_to_open311conf.sql b/db/schema_0013-add_send_method_column_to_open311conf.sql new file mode 100644 index 000000000..516fdd698 --- /dev/null +++ b/db/schema_0013-add_send_method_column_to_open311conf.sql @@ -0,0 +1,7 @@ + +begin; + +ALTER table open311conf + ADD column send_method TEXT; + +commit; diff --git a/db/schema_0014-add_send_fail_columns_to_problem.sql b/db/schema_0014-add_send_fail_columns_to_problem.sql new file mode 100644 index 000000000..369c4118d --- /dev/null +++ b/db/schema_0014-add_send_fail_columns_to_problem.sql @@ -0,0 +1,10 @@ +begin; + +ALTER table problem + ADD column send_fail_count integer not null default 0; +ALTER table problem + ADD column send_fail_reason text; +ALTER table problem + ADD column send_fail_timestamp timestamp; + +commit; diff --git a/db/schema_0015-add_send_method_used_column_to_problem.sql b/db/schema_0015-add_send_method_used_column_to_problem.sql new file mode 100644 index 000000000..0c6e0851d --- /dev/null +++ b/db/schema_0015-add_send_method_used_column_to_problem.sql @@ -0,0 +1,6 @@ +begin; + +ALTER table problem + ADD column send_method_used text; + +commit; diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index b08ce69da..fabc9ec80 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-10-21 15:56+0100\n" +"POT-Creation-Date: 2012-03-28 19:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 msgid " and " msgstr "" @@ -25,7 +25,7 @@ msgstr "" msgid " and <strong>we will now send it to the council</strong>" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:17 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/all_councils_text.html:2 +#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:17 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/councils_text_all.html:2 templates/web/fixmystreet/report/new/councils_text_all.html:10 templates/web/fixmystreet/report/new/councils_text_all.html:3 templates/web/fixmystreet/report/new/councils_text_none.html:12 templates/web/fixmystreet/report/new/councils_text_none.html:15 templates/web/fixmystreet/report/new/councils_text_some.html:20 templates/web/fixmystreet/report/new/councils_text_some.html:23 templates/web/fixmystreet/report/new/councils_text_some.html:5 msgid " or " msgstr "" @@ -85,23 +85,23 @@ msgstr "" msgid "%d weeks" msgstr "" -#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:14 +#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:14 templates/web/emptyhomes/reports/council.html:11 templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:844 perllib/FixMyStreet/Cobrand/Default.pm:858 +#: perllib/FixMyStreet/Cobrand/Default.pm:792 perllib/FixMyStreet/Cobrand/Default.pm:806 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:466 +#: perllib/FixMyStreet/DB/Result/Problem.pm:480 msgid "%s, reported anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:468 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "%s, reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:875 perllib/FixMyStreet/Cobrand/Default.pm:889 +#: perllib/FixMyStreet/Cobrand/Default.pm:823 perllib/FixMyStreet/Cobrand/Default.pm:837 msgid "%s, within %s ward" msgstr "" @@ -117,23 +117,23 @@ msgstr "" msgid "(Email in abuse table)" msgstr "" -#: templates/web/default/alert/list.html:53 +#: templates/web/default/alert/list.html:51 templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "" -#: templates/web/default/alert/list.html:58 +#: templates/web/default/alert/list.html:56 templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "" -#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 +#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/default/reports/council.html:134 templates/web/fixmystreet/around/around_map_list_items.html:12 templates/web/fixmystreet/around/on_map_list_items.html:9 msgid "(fixed)" msgstr "" -#: templates/web/default/index.html:12 templates/web/default/index.html:8 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 templates/web/fixmystreet/index.html:30 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/default/reports/council.html:133 +#: templates/web/default/reports/council.html:131 templates/web/default/reports/council.html:152 msgid "(not sent to council)" msgstr "" @@ -141,7 +141,7 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:130 templates/web/default/reports/council.html:150 msgid "(sent to both)" msgstr "" @@ -149,19 +149,19 @@ msgstr "" msgid "(we never show your email address or phone number)" msgstr "" -#: templates/web/default/report/display.html:217 +#: templates/web/default/report/display.html:214 msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:281 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 perllib/FixMyStreet/App/Controller/Report/New.pm:566 perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 perllib/FixMyStreet/App/Controller/Report/New.pm:581 perllib/FixMyStreet/DB/Result/Problem.pm:337 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 perllib/FixMyStreet/DB/Result/Problem.pm:343 msgid "-- Pick a property type --" msgstr "" @@ -169,10 +169,6 @@ msgstr "" msgid ". You can <a href=\"%s\">view the problem on this site</a>." msgstr "" -#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 -msgid "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=\"logoie\"></span></a>" -msgstr "" - #: templates/web/default/questionnaire/completed.html:25 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" msgstr "" @@ -186,7 +182,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/default/questionnaire/index.html:37 +#: templates/web/default/questionnaire/index.html:35 msgid "" "<p>Getting empty homes back into use can be difficult, but by now a good council\n" "will have made a lot of progress and reported what they have done on the\n" @@ -199,7 +195,7 @@ msgid "" "href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" -#: templates/web/default/questionnaire/index.html:28 +#: templates/web/default/questionnaire/index.html:26 msgid "" "<p>Getting empty homes back into use can be difficult. You shouldn’t expect\n" "the property to be back into use yet. But a good council will have started work\n" @@ -217,7 +213,7 @@ msgid "" "site and leave an update.</p>" msgstr "" -#: templates/web/default/around/display_location.html:71 templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:70 templates/web/default/around/display_location.html:72 templates/web/emptyhomes/around/display_location.html:36 templates/web/emptyhomes/around/display_location.html:38 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -225,6 +221,18 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "" + +#: templates/web/fixmystreet/report/display.html:153 +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "" + +#: templates/web/fixmystreet/auth/general.html:46 +msgid "<strong>No</strong> let me sign in by email" +msgstr "" + #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" @@ -233,27 +241,27 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" -#: templates/web/default/report/display.html:170 +#: templates/web/default/report/display.html:169 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:148 templates/web/default/report/new/fill_in_details_form.html:140 -msgid "<strong>Yes</strong>, I have a password:" +#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:147 templates/web/default/report/new/fill_in_details_form.html:140 templates/web/fixmystreet/auth/general.html:32 templates/web/fixmystreet/auth/general.html:34 templates/web/fixmystreet/report/display.html:136 templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/default/static/about.html:1 templates/web/default/static/about.html:3 templates/web/emptyhomes/header.html:31 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 +#: templates/web/default/static/about.html:1 templates/web/default/static/about.html:3 templates/web/emptyhomes/header.html:29 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/council_contacts.html:62 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 msgid "Added %s" msgstr "" -#: templates/web/default/auth/change_password.html:29 +#: templates/web/default/auth/change_password.html:29 templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "" @@ -265,7 +273,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:222 +#: templates/web/default/report/display.html:219 templates/web/fixmystreet/report/display.html:193 msgid "Alert me to future updates" msgstr "" @@ -273,31 +281,35 @@ msgstr "" msgid "All" msgstr "" +#: templates/web/default/reports/index.html:3 +msgid "All Reports" +msgstr "" + #: templates/web/default/admin/council_list.html:44 msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 +#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmystreet/footer.html:49 templates/web/reading/footer.html:8 msgid "All reports" msgstr "" -#: templates/web/default/report/new/councils_text_some.html:2 +#: templates/web/default/report/new/councils_text_some.html:2 templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_all.html:5 templates/web/fixmystreet/report/new/councils_text_all.html:3 templates/web/fixmystreet/report/new/councils_text_all.html:5 msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system." msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:12 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:12 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/councils_text_all.html:10 templates/web/fixmystreet/report/new/councils_text_all.html:12 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 templates/web/emptyhomes/report/new/all_councils_text.html:4 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 templates/web/emptyhomes/report/new/councils_text_all.html:4 msgid "All the information you provide here will be sent to <strong>%s</strong>. On the site, we will show the subject and details of the problem, plus your name if you give us permission." msgstr "" -#: templates/web/default/questionnaire/index.html:62 +#: templates/web/default/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "" @@ -305,16 +317,20 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/default/admin/update_edit.html:14 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/update_edit.html:14 msgid "Anonymous:" msgstr "" -#: templates/web/default/footer.html:29 -msgid "Are you a developer? Would you like to contribute to FixMyStreet?" +#: templates/web/default/footer.html:26 +msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/default/footer.html:26 -msgid "Are you from a council? Would you like better integration with FixMyStreet?" +#: templates/web/fixmystreet/footer.html:18 +msgid "Are you a developer?" +msgstr "" + +#: templates/web/fixmystreet/footer.html:22 +msgid "Are you from a council?" msgstr "" #: templates/web/default/open311/index.html:17 @@ -329,11 +345,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" -msgstr "" - -#: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/footer.html:16 templates/web/fiksgatami/nn/footer.html:16 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" msgstr "" @@ -341,7 +353,11 @@ msgstr "" msgid "By Date" msgstr "" -#: templates/web/default/admin/council_contacts.html:26 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 +#: templates/web/fixmystreet/around/display_location.html:75 templates/web/fixmystreet/around/display_location.html:77 +msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:31 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:72 msgid "Category" msgstr "" @@ -349,27 +365,31 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 perllib/FixMyStreet/App/Controller/Report/New.pm:567 templates/web/default/admin/council_contacts.html:63 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:29 templates/web/default/report/new/fill_in_details_form.html:67 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 perllib/FixMyStreet/App/Controller/Report/New.pm:582 templates/web/default/admin/council_contacts.html:68 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:25 templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "" -#: bin/send-reports:180 +#: bin/send-reports:181 msgid "Category: %s" msgstr "" -#: templates/web/default/auth/change_password.html:1 templates/web/default/auth/change_password.html:3 templates/web/default/auth/change_password.html:33 +#: templates/web/default/auth/change_password.html:1 templates/web/default/auth/change_password.html:3 templates/web/default/auth/change_password.html:33 templates/web/fixmystreet/auth/change_password.html:1 templates/web/fixmystreet/auth/change_password.html:3 templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:24 templates/web/default/report/display.html:85 templates/web/default/report/display.html:87 +#: templates/web/fixmystreet/around/display_location.html:72 +msgid "Click map to report a problem" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/report/display.html:84 templates/web/default/report/display.html:86 templates/web/fixmystreet/report/display.html:79 templates/web/fixmystreet/report/display.html:81 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:641 msgid "Closed by council" msgstr "" -#: templates/web/default/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 msgid "Closed reports" msgstr "" @@ -377,7 +397,7 @@ msgstr "" msgid "Closed:" msgstr "" -#: templates/web/default/around/display_location.html:102 templates/web/default/around/display_location.html:104 +#: templates/web/default/around/display_location.html:101 templates/web/default/around/display_location.html:103 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -397,27 +417,27 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 msgid "Configuration updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:361 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_contacts.html:119 +#: templates/web/default/admin/council_contacts.html:124 msgid "Configure Open311" msgstr "" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:101 msgid "Configure Open311 integration" msgstr "" -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:38 msgid "Confirm" msgstr "" -#: templates/web/default/auth/token.html:1 +#: templates/web/default/auth/token.html:1 templates/web/fixmystreet/auth/token.html:1 msgid "Confirm account" msgstr "" @@ -425,7 +445,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/default/admin/council_contacts.html:28 templates/web/default/admin/council_contacts.html:73 templates/web/default/admin/council_edit.html:28 templates/web/default/admin/council_edit.html:43 templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_contacts.html:33 templates/web/default/admin/council_contacts.html:78 templates/web/default/admin/council_edit.html:28 templates/web/default/admin/council_edit.html:43 templates/web/default/admin/stats.html:5 msgid "Confirmed" msgstr "" @@ -433,23 +453,23 @@ msgstr "" msgid "Confirmed:" msgstr "" -#: templates/web/fiksgatami/footer.html:10 +#: templates/web/fiksgatami/footer.html:10 templates/web/fiksgatami/nn/footer.html:10 msgid "Contact" msgstr "" -#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 +#: templates/web/default/footer.html:24 msgid "Contact FixMyStreet" msgstr "" -#: templates/web/default/contact/index.html:1 templates/web/default/contact/index.html:2 templates/web/default/contact/submit.html:1 +#: templates/web/default/contact/index.html:1 templates/web/default/contact/index.html:2 templates/web/default/contact/submit.html:1 templates/web/fixmystreet/contact/index.html:1 templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "" -#: templates/web/default/contact/index.html:6 templates/web/default/contact/submit.html:3 +#: templates/web/default/contact/index.html:6 templates/web/default/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Could not find user" msgstr "" @@ -457,7 +477,7 @@ msgstr "" msgid "Council" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:977 templates/web/default/admin/council_list.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "" @@ -481,7 +501,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/default/admin/council_contacts.html:87 +#: templates/web/default/admin/council_contacts.html:92 msgid "Create category" msgstr "" @@ -501,10 +521,14 @@ msgstr "" msgid "Currently has 1+ deleted" msgstr "" -#: templates/web/default/admin/council_contacts.html:29 templates/web/default/admin/council_contacts.html:76 templates/web/default/admin/council_edit.html:29 templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_contacts.html:34 templates/web/default/admin/council_contacts.html:81 templates/web/default/admin/council_edit.html:29 templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +msgid "Details" +msgstr "" + #: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details_form.html:61 msgid "Details:" msgstr "" @@ -513,11 +537,11 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/default/auth/general.html:32 +#: templates/web/default/auth/general.html:32 templates/web/fixmystreet/auth/general.html:29 templates/web/fixmystreet/report/display.html:133 templates/web/fixmystreet/report/new/fill_in_details_form.html:147 msgid "Do you have a FixMyStreet password?" msgstr "" -#: templates/web/default/questionnaire/index.html:72 +#: templates/web/default/questionnaire/index.html:70 templates/web/fixmystreet/questionnaire/index.html:64 msgid "Don’t know" msgstr "" @@ -541,19 +565,19 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:27 templates/web/default/admin/council_edit.html:42 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_abuse.html:11 templates/web/default/admin/search_reports.html:15 templates/web/default/admin/search_users.html:13 +#: templates/web/default/admin/council_contacts.html:32 templates/web/default/admin/council_edit.html:42 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_abuse.html:11 templates/web/default/admin/search_reports.html:15 templates/web/default/admin/search_users.html:13 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/display.html:125 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 msgid "Email already in abuse list" msgstr "" -#: templates/web/default/around/display_location.html:84 +#: templates/web/default/around/display_location.html:83 msgid "Email me new local problems" msgstr "" @@ -561,19 +585,19 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/council_contacts.html:68 templates/web/default/admin/council_edit.html:26 templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:24 templates/web/default/admin/user_edit.html:11 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:39 +#: templates/web/default/admin/council_contacts.html:73 templates/web/default/admin/council_edit.html:26 templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:24 templates/web/default/admin/user_edit.html:11 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:39 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 msgid "Empty office or other commercial" msgstr "" @@ -581,11 +605,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -601,7 +625,7 @@ msgstr "" msgid "End month:" msgstr "" -#: templates/web/default/around/around_index.html:10 templates/web/default/around/around_index.html:13 templates/web/default/index.html:24 templates/web/default/index.html:27 +#: templates/web/default/around/around_index.html:10 templates/web/default/around/around_index.html:13 templates/web/default/index.html:24 templates/web/default/index.html:27 templates/web/emptyhomes/index.html:40 templates/web/emptyhomes/index.html:43 templates/web/fixmystreet/around/around_index.html:10 templates/web/fixmystreet/around/around_index.html:13 templates/web/fixmystreet/index.html:32 templates/web/fixmystreet/index.html:35 msgid "Enter a nearby GB postcode, or street name and area" msgstr "" @@ -609,19 +633,23 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/default/auth/general.html:64 templates/web/default/report/display.html:177 templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/auth/general.html:64 templates/web/default/report/display.html:176 templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "" -#: templates/web/default/index.html:45 +#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/report/display.html:165 templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +msgid "Enter a password" +msgstr "" + +#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 templates/web/fixmystreet/index.html:55 msgid "Enter details of the problem" msgstr "" -#: templates/web/default/auth/token.html:5 templates/web/default/errors/generic.html:1 templates/web/default/errors/generic.html:3 templates/web/default/tokens/abuse.html:1 templates/web/default/tokens/abuse.html:3 templates/web/default/tokens/error.html:1 templates/web/default/tokens/error.html:3 +#: templates/web/default/auth/token.html:5 templates/web/default/errors/generic.html:1 templates/web/default/errors/generic.html:3 templates/web/default/tokens/abuse.html:1 templates/web/default/tokens/abuse.html:3 templates/web/default/tokens/error.html:1 templates/web/default/tokens/error.html:3 templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "" -#: templates/web/default/admin/council_contacts.html:9 templates/web/default/admin/council_edit.html:18 +#: templates/web/default/admin/council_contacts.html:11 templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -633,18 +661,18 @@ msgstr "" msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." msgstr "" -#: templates/web/default/footer.html:27 -msgid "Find out about FixMyStreet for councils" -msgstr "" - -#: templates/web/default/questionnaire/index.html:81 +#: templates/web/default/questionnaire/index.html:79 templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" msgstr "" -#: templates/web/default/header.html:29 templates/web/fiksgatami/header.html:16 templates/web/reading/header.html:31 +#: templates/web/fiksgatami/header.html:16 templates/web/fiksgatami/nn/header.html:16 msgid "Fix<span id=\"my\">My</span>Street" msgstr "" +#: templates/web/default/header.html:24 +msgid "FixMyStreet" +msgstr "" + #: templates/web/default/admin/header.html:13 msgid "FixMyStreet admin:" msgstr "" @@ -653,14 +681,18 @@ msgstr "" msgid "FixMyStreet administration" msgstr "" -#: templates/web/default/alert/index.html:6 +#: templates/web/fixmystreet/static/for_councils.html:1 +msgid "FixMyStreet for Councils" +msgstr "" + +#: templates/web/default/alert/index.html:6 templates/web/fixmystreet/alert/index.html:6 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -#: templates/web/default/alert/list.html:100 +#: templates/web/default/alert/list.html:98 templates/web/fixmystreet/alert/_list.html:69 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -670,19 +702,19 @@ msgid "" "for the county council." msgstr "" -#: templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:24 templates/web/default/report/display.html:85 templates/web/default/report/display.html:87 +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/report/display.html:84 templates/web/default/report/display.html:86 templates/web/fixmystreet/report/display.html:79 templates/web/fixmystreet/report/display.html:81 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 msgid "Fixed - User" msgstr "" -#: templates/web/default/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 msgid "Fixed reports" msgstr "" @@ -702,7 +734,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:24 templates/web/default/reports/council.html:87 templates/web/emptyhomes/reports/council.html:19 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -710,7 +742,7 @@ msgstr "" msgid "For council(s):" msgstr "" -#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 +#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -722,11 +754,19 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/default/alert/list.html:112 +#: templates/web/fixmystreet/report/display.html:28 +msgid "Get updates" +msgstr "" + +#: templates/web/default/reports/council.html:72 +msgid "Get updates of problems in this %s" +msgstr "" + +#: templates/web/default/alert/list.html:110 templates/web/fixmystreet/alert/_list.html:78 msgid "Give me an RSS feed" msgstr "" -#: templates/web/default/alert/index.html:24 templates/web/default/around/around_index.html:17 templates/web/default/index.html:33 +#: templates/web/default/alert/index.html:24 templates/web/default/around/around_index.html:17 templates/web/default/index.html:33 templates/web/emptyhomes/index.html:49 templates/web/fixmystreet/alert/index.html:25 templates/web/fixmystreet/around/around_index.html:20 templates/web/fixmystreet/index.html:42 msgid "Go" msgstr "" @@ -738,47 +778,51 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/default/reports/index.html:5 templates/web/emptyhomes/reports/index.html:5 +#: templates/web/default/reports/index.html:8 templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "" -#: templates/web/default/questionnaire/index.html:63 +#: templates/web/default/questionnaire/index.html:61 templates/web/fixmystreet/questionnaire/index.html:55 msgid "Has this problem been fixed?" msgstr "" -#: templates/web/default/questionnaire/index.html:76 +#: templates/web/default/questionnaire/index.html:74 templates/web/fixmystreet/questionnaire/index.html:68 msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/default/footer.html:10 templates/web/emptyhomes/header.html:30 templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 +#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmystreet/footer.html:53 templates/web/reading/footer.html:10 msgid "Help" msgstr "" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/list.html:37 templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:19 +#: templates/web/bromley/header.html:46 templates/web/fixmystreet/header.html:46 +msgid "Hi %s" +msgstr "" + +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:19 msgid "Hidden" msgstr "" -#: templates/web/default/around/display_location.html:54 -msgid "Hide pins" +#: templates/web/default/around/display_location.html:58 templates/web/fixmystreet/around/display_location.html:58 +msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:59 -msgid "Hide stale reports" +#: templates/web/default/around/display_location.html:53 templates/web/fixmystreet/around/display_location.html:54 +msgid "Hide pins" msgstr "" #: templates/web/default/admin/council_edit.html:38 msgid "History" msgstr "" -#: templates/web/default/index.html:40 +#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 templates/web/fixmystreet/index.html:50 msgid "How to report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:587 +#: perllib/FixMyStreet/App/Controller/Admin.pm:592 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -798,19 +842,19 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:12 templates/web/fixmystreet/report/new/councils_text_none.html:10 templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" -#: templates/web/emptyhomes/report/new/no_councils_text.html:9 +#: templates/web/emptyhomes/report/new/councils_text_none.html:9 msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:24 +#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:24 templates/web/fixmystreet/auth/token.html:23 msgid "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." msgstr "" -#: templates/web/default/questionnaire/index.html:85 +#: templates/web/default/questionnaire/index.html:83 templates/web/fixmystreet/questionnaire/index.html:77 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council). For example, what was\n" @@ -821,11 +865,11 @@ msgstr "" msgid "Illegal ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:102 +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:24 templates/web/default/report/display.html:85 templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:20 templates/web/default/report/display.html:84 templates/web/default/report/display.html:86 templates/web/fixmystreet/report/display.html:79 templates/web/fixmystreet/report/display.html:81 msgid "In Progress" msgstr "" @@ -833,8 +877,8 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/default/around/display_location.html:61 -msgid "Include stale reports" +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +msgid "In progress" msgstr "" #: templates/web/default/admin/stats.html:76 @@ -849,7 +893,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:897 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Invalid end date" msgstr "" @@ -857,11 +901,11 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:887 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Invalid start date" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:23 templates/web/default/report/display.html:85 templates/web/default/report/display.html:86 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/report/display.html:84 templates/web/default/report/display.html:85 templates/web/fixmystreet/report/display.html:79 templates/web/fixmystreet/report/display.html:80 msgid "Investigating" msgstr "" @@ -869,11 +913,11 @@ msgstr "" msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step." msgstr "" -#: templates/web/default/auth/general.html:44 templates/web/default/report/display.html:157 templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/default/auth/general.html:44 templates/web/default/report/display.html:156 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/report/display.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/default/admin/council_contacts.html:30 +#: templates/web/default/admin/council_contacts.html:35 msgid "Last editor" msgstr "" @@ -885,31 +929,31 @@ msgstr "" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:985 msgid "List Flagged" msgstr "" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 msgid "List all reported problems" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/default/report/new/fill_in_details_form.html:68 templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." msgstr "" -#: templates/web/default/alert/choose.html:1 templates/web/default/alert/choose.html:3 templates/web/default/alert/index.html:1 templates/web/default/alert/index.html:3 templates/web/default/alert/list.html:1 templates/web/default/alert/list.html:5 templates/web/default/alert/updates.html:1 templates/web/default/tokens/confirm_alert.html:1 templates/web/default/tokens/confirm_alert.html:3 +#: templates/web/default/alert/choose.html:1 templates/web/default/alert/choose.html:3 templates/web/default/alert/index.html:1 templates/web/default/alert/index.html:3 templates/web/default/alert/list.html:1 templates/web/default/alert/list.html:5 templates/web/default/alert/updates.html:1 templates/web/default/tokens/confirm_alert.html:1 templates/web/default/tokens/confirm_alert.html:3 templates/web/emptyhomes/alert/index.html:1 templates/web/emptyhomes/alert/index.html:3 templates/web/fixmystreet/alert/choose.html:1 templates/web/fixmystreet/alert/choose.html:3 templates/web/fixmystreet/alert/index.html:1 templates/web/fixmystreet/alert/index.html:3 templates/web/fixmystreet/alert/list.html:1 templates/web/fixmystreet/alert/list.html:5 templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/default/alert/list.html:1 templates/web/default/alert/list.html:12 templates/web/default/alert/list.html:14 templates/web/default/alert/list.html:3 +#: templates/web/default/alert/list.html:1 templates/web/default/alert/list.html:12 templates/web/default/alert/list.html:14 templates/web/default/alert/list.html:3 templates/web/fixmystreet/alert/list.html:1 templates/web/fixmystreet/alert/list.html:12 templates/web/fixmystreet/alert/list.html:14 templates/web/fixmystreet/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 +#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 templates/web/fiksgatami/nn/footer.html:8 templates/web/fixmystreet/footer.html:51 templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "" -#: templates/web/default/index.html:44 +#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 templates/web/fixmystreet/index.html:54 msgid "Locate the problem on a map of the area" msgstr "" @@ -917,6 +961,10 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" +#: templates/web/fixmystreet/contact/index.html:86 +msgid "Message" +msgstr "" + #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "" @@ -933,7 +981,7 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:10 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/reports/index.html:9 +#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmystreet/auth/general.html:52 templates/web/fixmystreet/report/display.html:181 templates/web/fixmystreet/report/new/fill_in_details_form.html:114 templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "Name" msgstr "" @@ -941,7 +989,7 @@ msgstr "" msgid "Name:" msgstr "" -#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 templates/web/reading/footer.html:4 +#: templates/web/fiksgatami/footer.html:3 templates/web/fiksgatami/nn/footer.html:3 templates/web/reading/footer.html:4 msgid "Navigation" msgstr "" @@ -949,19 +997,29 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:564 +#: perllib/FixMyStreet/Cobrand/Default.pm:480 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:553 perllib/FixMyStreet/Cobrand/Default.pm:588 +#: perllib/FixMyStreet/Cobrand/Default.pm:469 perllib/FixMyStreet/Cobrand/Default.pm:520 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" +"\n" +msgstr "" + #: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: templates/web/default/reports/index.html:16 +msgid "New <br>problems" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 msgid "New category contact added" msgstr "" @@ -973,7 +1031,7 @@ msgstr "" msgid "New local reports on reportemptyhomes.com" msgstr "" -#: templates/web/default/reports/council.html:92 templates/web/default/reports/council.html:93 templates/web/default/reports/index.html:11 templates/web/emptyhomes/reports/index.html:11 templates/web/fiksgatami/reports/index.html:10 +#: templates/web/emptyhomes/reports/index.html:11 templates/web/fiksgatami/nn/reports/index.html:10 templates/web/fiksgatami/reports/index.html:10 msgid "New problems" msgstr "" @@ -1021,11 +1079,11 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/default/front/news.html:8 templates/web/fiksgatami/front/news.html:9 +#: templates/web/fiksgatami/front/news.html:9 templates/web/fiksgatami/nn/front/news.html:9 templates/web/fixmystreet/front/news.html:8 msgid "New!" msgstr "" -#: templates/web/default/admin/council_contacts.html:39 templates/web/default/admin/council_contacts.html:40 templates/web/default/admin/council_edit.html:4 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:40 templates/web/default/admin/update_edit.html:16 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:70 +#: templates/web/default/admin/council_contacts.html:44 templates/web/default/admin/council_contacts.html:45 templates/web/default/admin/council_edit.html:4 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:28 templates/web/default/admin/report_edit.html:40 templates/web/default/admin/update_edit.html:16 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "" @@ -1033,7 +1091,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:297 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "No council selected" msgstr "" @@ -1053,11 +1111,11 @@ msgstr "" msgid "No info at all" msgstr "" -#: templates/web/default/around/around_map_list_items.html:15 +#: templates/web/default/around/around_map_list_items.html:15 templates/web/fixmystreet/around/around_map_list_items.html:24 msgid "No problems found." msgstr "" -#: templates/web/default/around/on_map_list_items.html:12 +#: templates/web/default/around/on_map_list_items.html:12 templates/web/fixmystreet/around/on_map_list_items.html:21 msgid "No problems have been reported yet." msgstr "" @@ -1069,11 +1127,11 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/default/report/_main.html:9 +#: templates/web/default/report/_main.html:9 templates/web/emptyhomes/report/display.html:24 templates/web/fixmystreet/report/_main.html:11 msgid "Not reported to council" msgstr "" -#: templates/web/default/admin/council_contacts.html:31 templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:36 templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "" @@ -1081,7 +1139,7 @@ msgstr "" msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:80 templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:85 templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "" @@ -1089,27 +1147,31 @@ msgstr "" msgid "Note: <strong>%s</strong>" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +msgid "Now to submit your report…" +msgstr "" + #: templates/web/default/report/new/fill_in_details_form.html:131 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" -#: templates/web/default/report/display.html:139 -msgid "Now to submit your update… do you have a FixMyStreet password?" +#: templates/web/fixmystreet/report/display.html:132 +msgid "Now to submit your update…" msgstr "" -#: templates/web/default/report/display.html:26 templates/web/default/report/updates.html:23 -msgid "Offensive? Unsuitable? Tell us" +#: templates/web/default/report/display.html:138 +msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" -#: templates/web/default/reports/council.html:115 templates/web/default/reports/council.html:116 -msgid "Old fixed" +#: templates/web/default/report/display.html:26 templates/web/default/report/update.html:16 +msgid "Offensive? Unsuitable? Tell us" msgstr "" -#: templates/web/default/reports/council.html:109 templates/web/default/reports/council.html:110 -msgid "Old problems, state unknown" +#: templates/web/default/reports/index.html:18 +msgid "Old / unknown <br>problems" msgstr "" -#: templates/web/default/reports/index.html:13 templates/web/fiksgatami/reports/index.html:12 +#: templates/web/fiksgatami/nn/reports/index.html:12 templates/web/fiksgatami/reports/index.html:12 msgid "Old problems,<br>state unknown" msgstr "" @@ -1117,19 +1179,27 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:14 templates/web/fiksgatami/reports/index.html:14 +#: templates/web/default/reports/index.html:20 +msgid "Older <br>fixed" +msgstr "" + +#: templates/web/default/reports/index.html:17 +msgid "Older <br>problems" +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:14 templates/web/fiksgatami/nn/reports/index.html:14 templates/web/fiksgatami/reports/index.html:14 msgid "Older fixed" msgstr "" -#: templates/web/default/reports/council.html:101 templates/web/default/reports/council.html:105 templates/web/default/reports/council.html:106 templates/web/default/reports/council.html:99 templates/web/default/reports/index.html:12 templates/web/emptyhomes/reports/index.html:12 templates/web/fiksgatami/reports/index.html:11 +#: templates/web/emptyhomes/reports/index.html:12 templates/web/fiksgatami/nn/reports/index.html:11 templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:19 templates/web/default/report/display.html:85 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:19 templates/web/default/report/display.html:84 templates/web/fixmystreet/report/display.html:79 msgid "Open" msgstr "" -#: templates/web/default/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 msgid "Open reports" msgstr "" @@ -1145,19 +1215,19 @@ msgstr "" msgid "Open311 specification" msgstr "" -#: templates/web/default/alert/list.html:87 +#: templates/web/default/alert/list.html:85 templates/web/fixmystreet/alert/_list.html:56 msgid "Or problems reported to:" msgstr "" -#: templates/web/default/alert/list.html:63 +#: templates/web/default/alert/list.html:61 templates/web/fixmystreet/alert/_list.html:33 msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: bin/send-reports:175 bin/send-reports:184 perllib/FixMyStreet/App/Controller/Report/New.pm:553 perllib/FixMyStreet/App/Controller/Report/New.pm:566 perllib/FixMyStreet/App/Controller/Report/New.pm:969 perllib/FixMyStreet/DB/Result/Problem.pm:475 perllib/FixMyStreet/DB/Result/Problem.pm:485 perllib/FixMyStreet/DB/Result/Problem.pm:495 perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: bin/send-reports:176 bin/send-reports:185 perllib/FixMyStreet/App/Controller/Report/New.pm:568 perllib/FixMyStreet/App/Controller/Report/New.pm:581 perllib/FixMyStreet/App/Controller/Report/New.pm:990 perllib/FixMyStreet/DB/Result/Problem.pm:489 perllib/FixMyStreet/DB/Result/Problem.pm:499 perllib/FixMyStreet/DB/Result/Problem.pm:509 perllib/FixMyStreet/DB/Result/Problem.pm:521 msgid "Other" msgstr "" -#: templates/web/default/footer.html:30 +#: templates/web/default/footer.html:27 msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." msgstr "" @@ -1169,51 +1239,67 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 msgid "Partial" msgstr "" -#: templates/web/default/auth/change_password.html:25 +#: templates/web/fixmystreet/auth/general.html:55 templates/web/fixmystreet/report/display.html:162 templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +msgid "Password (optional)" +msgstr "" + +#: templates/web/default/auth/change_password.html:25 templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "" -#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 templates/web/default/report/new/fill_in_details_form.html:215 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +msgid "Phone number (optional)" +msgstr "" + +#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "" -#: templates/web/default/questionnaire/index.html:97 templates/web/default/report/display.html:115 templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/fixmystreet/report/display.html:108 templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +msgid "Photo" +msgstr "" + +#: templates/web/default/questionnaire/index.html:95 templates/web/default/report/display.html:114 templates/web/default/report/new/fill_in_details_form.html:102 templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "" -#: templates/web/default/alert/list.html:29 +#: templates/web/default/alert/list.html:27 templates/web/fixmystreet/alert/list.html:27 msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:23 templates/web/default/report/display.html:85 templates/web/default/report/display.html:86 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:19 templates/web/default/report/display.html:84 templates/web/default/report/display.html:85 templates/web/fixmystreet/report/display.html:79 templates/web/fixmystreet/report/display.html:80 msgid "Planned" msgstr "" -#: templates/web/default/report/new/notes.html:6 +#: templates/web/fixmystreet/questionnaire/index.html:44 +msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." +msgstr "" + +#: templates/web/default/report/new/notes.html:6 templates/web/fixmystreet/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" -#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:17 +#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:17 templates/web/fixmystreet/auth/change_password.html:12 templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "" -#: templates/web/default/auth/token.html:17 +#: templates/web/default/auth/token.html:17 templates/web/fixmystreet/auth/token.html:17 msgid "Please check your email" msgstr "" -#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 +#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 perllib/FixMyStreet/App/Controller/Report/New.pm:741 perllib/FixMyStreet/App/Controller/Report/New.pm:778 perllib/FixMyStreet/DB/Result/Problem.pm:316 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 perllib/FixMyStreet/App/Controller/Report/New.pm:758 perllib/FixMyStreet/App/Controller/Report/New.pm:795 perllib/FixMyStreet/DB/Result/Problem.pm:339 templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "Please choose a property type" msgstr "" @@ -1224,43 +1310,47 @@ msgid "" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -#: templates/web/default/report/new/notes.html:7 +#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: perllib/FixMyStreet/DB/Result/Comment.pm:113 templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "" -#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:15 +#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:15 templates/web/fixmystreet/auth/change_password.html:12 templates/web/fixmystreet/auth/change_password.html:15 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:291 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:314 templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/DB/Result/User.pm:96 +#: perllib/FixMyStreet/DB/Result/User.pm:96 templates/web/default/js/validation_strings.html:12 templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:345 perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Alert.pm:342 perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:294 +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:93 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:93 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/validation_strings.html:11 templates/web/default/js/validation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 -msgid "Please enter your full name, councils need this information - if you do not wish your name to be shown on the site, untick the box" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +msgid "Please enter your email address" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:332 templates/web/default/js/validation_strings.html:7 +msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:110 perllib/FixMyStreet/DB/Result/Problem.pm:302 perllib/FixMyStreet/DB/Result/User.pm:89 +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:110 perllib/FixMyStreet/DB/Result/Problem.pm:325 perllib/FixMyStreet/DB/Result/User.pm:89 templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1274,7 +1364,7 @@ msgid "" "to read, as does a lack of punctuation." msgstr "" -#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:11 templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "" @@ -1286,55 +1376,59 @@ msgid "" "photo of the problem if you have one), etc." msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +msgid "Please fill in details of the problem." +msgstr "" + +#: templates/web/default/report/new/fill_in_details_form.html:27 templates/web/fixmystreet/report/new/fill_in_details_form.html:34 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/default/report/display.html:62 +#: templates/web/default/report/display.html:61 templates/web/fixmystreet/report/display.html:59 msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/default/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" -#: templates/web/default/report/new/notes.html:1 +#: templates/web/default/report/new/notes.html:1 templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:82 +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:120 +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: templates/web/default/questionnaire/index.html:52 +#: templates/web/default/questionnaire/index.html:50 msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 msgid "Please upload a JPEG image only" msgstr "" @@ -1342,23 +1436,27 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/default/contact/index.html:93 templates/web/default/report/display.html:125 templates/web/default/report/display.html:162 templates/web/default/report/display.html:184 +#: templates/web/fixmystreet/report/display.html:74 +msgid "Please write your update here" +msgstr "" + +#: templates/web/default/contact/index.html:93 templates/web/default/report/display.html:124 templates/web/default/report/display.html:161 templates/web/default/report/display.html:183 templates/web/fixmystreet/contact/index.html:93 templates/web/fixmystreet/report/display.html:120 templates/web/fixmystreet/report/display.html:144 templates/web/fixmystreet/report/display.html:166 msgid "Post" msgstr "" -#: templates/web/default/report/updates.html:8 +#: templates/web/default/report/updates.html:14 msgid "Posted anonymously at %s" msgstr "" -#: templates/web/default/report/updates.html:11 +#: templates/web/default/report/updates.html:17 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:19 msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/maps/openlayers.html:89 +#: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "" @@ -1378,7 +1476,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:774 +#: perllib/FixMyStreet/App/Controller/Admin.pm:776 msgid "Problem marked as open." msgstr "" @@ -1390,31 +1488,39 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/default/around/display_location.html:80 +#: templates/web/default/around/display_location.html:79 msgid "Problems in this area" msgstr "" +#: templates/web/fixmystreet/around/display_location.html:93 templates/web/fixmystreet/report/display.html:29 +msgid "Problems nearby" +msgstr "" + +#: templates/web/fixmystreet/around/display_location.html:92 +msgid "Problems on the map" +msgstr "" + #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" msgstr "" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/list.html:50 templates/web/fixmystreet/alert/_list.html:21 msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:800 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 +#: perllib/FixMyStreet/Cobrand/Default.pm:748 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:809 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Problems within %s ward" msgstr "" -#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:16 +#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:17 msgid "Problems within %s, FixMyStreet" msgstr "" -#: templates/web/default/alert/list.html:69 +#: templates/web/default/alert/list.html:67 templates/web/fixmystreet/alert/_list.html:38 msgid "Problems within the boundary of:" msgstr "" @@ -1422,19 +1528,23 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 msgid "Property type:" msgstr "" -#: templates/web/default/report/display.html:57 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +msgid "Provide a title" +msgstr "" + +#: templates/web/default/report/display.html:56 templates/web/fixmystreet/report/display.html:55 msgid "Provide an update" msgstr "" -#: templates/web/default/report/display.html:181 templates/web/default/report/new/fill_in_details_form.html:173 +#: templates/web/default/report/display.html:180 templates/web/default/report/new/fill_in_details_form.html:173 templates/web/fixmystreet/report/display.html:159 templates/web/fixmystreet/report/new/fill_in_details_form.html:185 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/default/questionnaire/completed.html:1 templates/web/default/questionnaire/completed.html:2 templates/web/default/questionnaire/index.html:0 templates/web/default/questionnaire/index.html:14 templates/web/default/questionnaire/index.html:4 +#: templates/web/default/questionnaire/completed.html:1 templates/web/default/questionnaire/completed.html:2 templates/web/default/questionnaire/index.html:0 templates/web/default/questionnaire/index.html:14 templates/web/default/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:15 templates/web/fixmystreet/questionnaire/index.html:3 templates/web/fixmystreet/questionnaire/index.html:32 msgid "Questionnaire" msgstr "" @@ -1450,67 +1560,75 @@ msgstr "" msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/default/alert/list.html:54 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:48 templates/web/default/reports/council.html:61 +#: templates/web/fixmystreet/static/for_councils_faq.html:1 +msgid "Questions and Answers :: FixMyStreet for Councils" +msgstr "" + +#: templates/web/default/alert/list.html:52 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:47 templates/web/default/reports/council.html:79 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/around/display_location.html:1 templates/web/fixmystreet/around/display_location.html:3 templates/web/fixmystreet/report/display.html:35 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 perllib/FixMyStreet/Cobrand/Default.pm:800 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:845 perllib/FixMyStreet/Cobrand/Default.pm:859 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 perllib/FixMyStreet/Cobrand/Default.pm:807 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:868 perllib/FixMyStreet/Cobrand/Default.pm:882 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 +#: perllib/FixMyStreet/Cobrand/Default.pm:816 perllib/FixMyStreet/Cobrand/Default.pm:830 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:874 perllib/FixMyStreet/Cobrand/Default.pm:888 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 perllib/FixMyStreet/Cobrand/Default.pm:836 msgid "RSS feed of %s, within %s ward" msgstr "" -#: templates/web/default/alert/list.html:54 +#: templates/web/default/alert/list.html:52 templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/default/reports/council.html:61 +#: templates/web/default/reports/council.html:79 msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:801 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 +#: perllib/FixMyStreet/Cobrand/Default.pm:749 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:808 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:4 +#: templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:4 templates/web/fixmystreet/around/display_location.html:1 templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/default/report/display.html:48 +#: templates/web/default/report/display.html:47 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:35 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:38 +#: templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:38 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:37 msgid "Receive email when updates are left on this problem." msgstr "" -#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:34 +#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:34 templates/web/fixmystreet/around/display_location.html:0 templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "" -#: templates/web/default/reports/council.html:87 templates/web/default/reports/council.html:88 templates/web/default/reports/index.html:14 templates/web/emptyhomes/reports/index.html:13 templates/web/fiksgatami/reports/index.html:13 +#: templates/web/default/reports/index.html:19 +msgid "Recently <br>fixed" +msgstr "" + +#: templates/web/emptyhomes/reports/index.html:13 templates/web/fiksgatami/nn/reports/index.html:13 templates/web/fiksgatami/reports/index.html:13 msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:62 +#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 msgid "Recently reported problems" msgstr "" -#: templates/web/default/report/new/notes.html:9 +#: templates/web/default/report/new/notes.html:9 templates/web/fixmystreet/report/new/notes.html:8 msgid "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." msgstr "" @@ -1518,7 +1636,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:47 templates/web/default/admin/update_edit.html:48 +#: templates/web/default/admin/report_edit.html:52 templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -1526,67 +1644,75 @@ msgstr "" msgid "Report Empty Homes" msgstr "" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 +#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmystreet/footer.html:45 templates/web/reading/footer.html:6 msgid "Report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:274 +#: templates/web/fixmystreet/report/display.html:27 +msgid "Report abuse" +msgstr "" + +#: templates/web/emptyhomes/index.html:37 +msgid "Report empty properties" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:281 msgid "Report on %s" msgstr "" -#: templates/web/default/index.html:15 +#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 msgid "Report, view, or discuss local problems" msgstr "" -#: templates/web/default/my/my.html:74 +#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 msgid "Reported %s" msgstr "" -#: templates/web/default/my/my.html:72 +#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 templates/web/default/contact/index.html:45 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/default/admin/questionnaire.html:5 templates/web/default/questionnaire/index.html:79 +#: templates/web/default/admin/questionnaire.html:5 templates/web/default/questionnaire/index.html:77 templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:513 templates/web/default/contact/index.html:47 +#: perllib/FixMyStreet/DB/Result/Problem.pm:527 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:478 +#: perllib/FixMyStreet/DB/Result/Problem.pm:492 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:486 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported in the %s category by %s at %s" msgstr "" -#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 +#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:1 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "" -#: templates/web/default/around/display_location.html:94 +#: templates/web/default/around/display_location.html:93 msgid "Reports on and around the map" msgstr "" @@ -1606,7 +1732,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 msgid "Search Abuse" msgstr "" @@ -1614,11 +1740,11 @@ msgstr "" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 templates/web/default/admin/search_users.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "" @@ -1626,11 +1752,11 @@ msgstr "" msgid "Search:" msgstr "" -#: templates/web/default/alert/list.html:41 +#: templates/web/default/alert/list.html:39 templates/web/fixmystreet/alert/_list.html:10 msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Sent to %s %s later" msgstr "" @@ -1659,15 +1785,19 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:216 templates/web/default/report/new/fill_in_details_form.html:210 +#: templates/web/default/report/display.html:213 templates/web/default/report/new/fill_in_details_form.html:210 templates/web/fixmystreet/report/display.html:189 templates/web/fixmystreet/report/new/fill_in_details_form.html:123 templates/web/fixmystreet/report/new/fill_in_details_form.html:180 msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:52 +#: templates/web/default/around/display_location.html:60 templates/web/fixmystreet/around/display_location.html:60 +msgid "Show old" +msgstr "" + +#: templates/web/default/around/display_location.html:51 templates/web/fixmystreet/around/display_location.html:52 msgid "Show pins" msgstr "" -#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 +#: templates/web/bromley/header.html:50 templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:38 templates/web/fixmystreet/auth/general.html:58 templates/web/fixmystreet/header.html:50 msgid "Sign in" msgstr "" @@ -1675,23 +1805,23 @@ msgstr "" msgid "Sign in by email" msgstr "" -#: templates/web/default/auth/general.html:1 +#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:35 templates/web/emptyhomes/header.html:43 templates/web/fiksgatami/header.html:22 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:37 +#: templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/fixmystreet/auth/sign_out.html:1 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 msgid "Sign out" msgstr "" -#: templates/web/default/header.html:34 templates/web/emptyhomes/header.html:42 templates/web/fiksgatami/header.html:21 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:36 +#: templates/web/default/header.html:29 templates/web/emptyhomes/header.html:40 templates/web/fiksgatami/header.html:21 templates/web/fiksgatami/nn/header.html:21 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:32 msgid "Signed in as %s" msgstr "" -#: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/default/alert/index.html:31 +#: templates/web/default/alert/index.html:30 templates/web/fixmystreet/alert/index.html:33 msgid "Some photos of recent reports" msgstr "" @@ -1703,7 +1833,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:517 +#: perllib/FixMyStreet/Cobrand/Default.pm:428 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -1711,15 +1841,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 perllib/FixMyStreet/Geocode/Google.pm:68 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:45 perllib/FixMyStreet/Geocode/Google.pm:60 +#: perllib/FixMyStreet/Geocode/Bing.pm:46 perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/footer.html:16 templates/web/fiksgatami/nn/footer.html:16 msgid "Source code" msgstr "" @@ -1735,51 +1865,59 @@ msgstr "" msgid "Start month:" msgstr "" -#: templates/web/default/admin/list_flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/search_reports.html:21 +#: templates/web/default/admin/list_flagged.html:18 templates/web/default/admin/list_updates.html:6 templates/web/default/admin/search_reports.html:21 templates/web/fixmystreet/report/display.html:77 msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:18 templates/web/default/report/display.html:83 +#: templates/web/default/admin/report_edit.html:17 templates/web/default/admin/update_edit.html:18 templates/web/default/report/display.html:82 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:986 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" +#: templates/web/default/report/updates.html:9 +msgid "Still open, via questionnaire, %s" +msgstr "" + +#: templates/web/fixmystreet/contact/index.html:79 templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +msgid "Subject" +msgstr "" + #: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details_form.html:52 msgid "Subject:" msgstr "" -#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 +#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:134 templates/web/fixmystreet/report/new/fill_in_details_form.html:159 templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:50 templates/web/default/admin/update_edit.html:51 templates/web/default/admin/user_edit.html:20 +#: templates/web/default/admin/report_edit.html:55 templates/web/default/admin/update_edit.html:51 templates/web/default/admin/user_edit.html:20 msgid "Submit changes" msgstr "" -#: templates/web/default/questionnaire/index.html:114 +#: templates/web/default/questionnaire/index.html:112 templates/web/fixmystreet/questionnaire/index.html:105 msgid "Submit questionnaire" msgstr "" -#: templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:43 +#: templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:43 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:42 msgid "Subscribe" msgstr "" -#: templates/web/default/alert/list.html:128 +#: templates/web/default/alert/list.html:126 templates/web/fixmystreet/alert/_list.html:88 msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:976 templates/web/default/admin/index.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 templates/web/default/admin/index.html:1 msgid "Summary" msgstr "" -#: templates/web/default/reports/index.html:1 templates/web/emptyhomes/reports/index.html:1 templates/web/fiksgatami/reports/index.html:1 +#: templates/web/default/reports/index.html:1 templates/web/emptyhomes/reports/index.html:1 templates/web/fiksgatami/nn/reports/index.html:1 templates/web/fiksgatami/reports/index.html:1 msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 templates/web/default/admin/questionnaire.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -1787,7 +1925,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:12 +#: templates/web/default/admin/council_contacts.html:14 msgid "Text only version" msgstr "" @@ -1819,7 +1957,7 @@ msgstr "" msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK’s empty homes crisis." msgstr "" -#: templates/web/default/around/around_index.html:44 +#: templates/web/default/around/around_index.html:43 templates/web/fixmystreet/around/around_index.html:46 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box below :" msgstr "" @@ -1831,11 +1969,11 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: templates/web/default/alert/index.html:12 +#: templates/web/default/alert/index.html:12 templates/web/fixmystreet/alert/index.html:12 msgid "That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific." msgstr "" @@ -1843,11 +1981,11 @@ msgstr "" msgid "That location does not appear to be in Britain; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:510 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 +#: perllib/FixMyStreet/Cobrand/Default.pm:421 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:558 +#: perllib/FixMyStreet/App/Controller/Admin.pm:560 msgid "That problem will now be resent." msgstr "" @@ -1855,7 +1993,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/default/around/around_index.html:27 +#: templates/web/default/around/around_index.html:26 templates/web/fixmystreet/around/around_index.html:29 msgid "That spot does not appear to be covered by a council. If you have tried to report an issue past the shoreline, for example, please specify the closest point on land." msgstr "" @@ -1878,15 +2016,27 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:22 +#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:22 templates/web/fixmystreet/auth/token.html:21 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/default/questionnaire/index.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +msgid "" +"The council won’t be able to help unless you leave as much\n" +"detail as you can. Please describe the exact location of the problem (e.g. on a\n" +"wall), what it is, how long it has been there, a description (and a photo of\n" +"the problem if you have one), etc." +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:43 +msgid "The details of your problem are available from the other tab above." +msgstr "" + +#: templates/web/default/questionnaire/index.html:49 msgid "The details of your problem are available on the right hand side of this page." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:46 perllib/FixMyStreet/App/Controller/Reports.pm:73 +#: perllib/FixMyStreet/App/Controller/Reports.pm:44 perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "The error was: %s" msgstr "" @@ -1942,7 +2092,7 @@ msgstr "" msgid "The latest reports within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:16 +#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:16 templates/web/fixmystreet/auth/change_password.html:12 templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "" @@ -1950,35 +2100,35 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 perllib/FixMyStreet/App/Controller/Admin.pm:1179 perllib/FixMyStreet/App/Controller/Admin.pm:538 perllib/FixMyStreet/App/Controller/Admin.pm:701 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 perllib/FixMyStreet/App/Controller/Admin.pm:1206 perllib/FixMyStreet/App/Controller/Admin.pm:540 perllib/FixMyStreet/App/Controller/Admin.pm:703 msgid "The requested URL was not found on this server." msgstr "" -#: templates/web/default/alert/list.html:47 +#: templates/web/default/alert/list.html:45 templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 +#: templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/councils_text_all.html:18 templates/web/fixmystreet/report/new/councils_text_some.html:10 templates/web/fixmystreet/report/new/councils_text_some.html:11 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: bin/send-reports:78 +#: bin/send-reports:79 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:70 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 perllib/FixMyStreet/App/Controller/Report/Update.pm:125 templates/web/default/auth/general.html:23 -msgid "There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one." +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 perllib/FixMyStreet/App/Controller/Report/Update.pm:125 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 +msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:354 +#: perllib/FixMyStreet/App/Controller/Alert.pm:351 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 msgid "There was a problem with your update. Please try again." msgstr "" @@ -1986,7 +2136,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:242 msgid "There were problems with your update. Please see below." msgstr "" @@ -1994,15 +2144,15 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: bin/send-reports:185 +#: bin/send-reports:186 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: bin/send-reports:188 +#: bin/send-reports:189 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:761 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 msgid "This information is required" msgstr "" @@ -2010,55 +2160,55 @@ msgstr "" msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" -#: templates/web/default/reports/council.html:65 +#: templates/web/emptyhomes/reports/council.html:58 msgid "This is a summary of all reports for one %s." msgstr "" -#: templates/web/default/reports/council.html:67 +#: templates/web/emptyhomes/reports/council.html:60 msgid "This is a summary of all reports for this %s." msgstr "" -#: templates/web/default/reports/index.html:4 templates/web/emptyhomes/reports/index.html:4 templates/web/fiksgatami/reports/index.html:4 +#: templates/web/default/reports/index.html:7 templates/web/emptyhomes/reports/index.html:4 templates/web/fiksgatami/nn/reports/index.html:4 templates/web/fiksgatami/reports/index.html:4 msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 msgid "This problem has been closed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:922 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:101 +#: perllib/FixMyStreet/Cobrand/Default.pm:870 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:100 templates/web/fixmystreet/report/display.html:95 msgid "This problem has been fixed" msgstr "" -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:95 templates/web/fixmystreet/report/display.html:89 msgid "This problem has not been fixed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#: perllib/FixMyStreet/Cobrand/Default.pm:879 msgid "This problem is in progress" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:918 +#: perllib/FixMyStreet/Cobrand/Default.pm:866 msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as open." msgstr "" -#: bin/send-reports:71 +#: bin/send-reports:72 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2066,17 +2216,27 @@ msgstr "" msgid "Title" msgstr "" -#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:69 +msgid "To <strong>report a problem</strong>, click on the map at the correct location." +msgstr "" + +#: templates/web/emptyhomes/around/display_location.html:35 msgid "To <strong>report a problem</strong>, simply click on the map at the correct location." msgstr "" +#: templates/web/fixmystreet/alert/index.html:19 +msgid "" +"To find out what local alerts we have for you, please enter your GB\n" +" postcode or street name and area" +msgstr "" + #: templates/web/default/alert/index.html:21 msgid "" "To find out what local alerts we have for you, please enter your GB\n" "postcode or street name and area:" msgstr "" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "To view a map of the precise location of this issue" msgstr "" @@ -2084,15 +2244,19 @@ msgstr "" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:45 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:163 +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +msgid "Unknown" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:164 msgid "Unknown alert type" msgstr "" @@ -2100,15 +2264,19 @@ msgstr "" msgid "Unknown problem ID" msgstr "" +#: templates/web/fixmystreet/report/display.html:70 +msgid "Update" +msgstr "" + #: templates/web/default/admin/timeline.html:35 msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/default/contact/index.html:21 +#: templates/web/default/contact/index.html:21 templates/web/fixmystreet/contact/index.html:22 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/default/contact/index.html:23 +#: templates/web/default/contact/index.html:23 templates/web/fixmystreet/contact/index.html:24 msgid "Update below added by %s at %s" msgstr "" @@ -2132,19 +2300,19 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:58 msgid "Update statuses" msgstr "" -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/display.html:76 msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:647 perllib/FixMyStreet/App/Controller/Admin.pm:764 perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:649 perllib/FixMyStreet/App/Controller/Admin.pm:766 perllib/FixMyStreet/App/Controller/Admin.pm:846 msgid "Updated!" msgstr "" -#: templates/web/default/admin/list_updates.html:1 templates/web/default/report/updates.html:4 +#: templates/web/default/admin/list_updates.html:1 templates/web/default/report/update.html:3 templates/web/fixmystreet/report/update.html:3 msgid "Updates" msgstr "" @@ -2152,15 +2320,15 @@ msgstr "" msgid "Updates on {{title}}" msgstr "" -#: templates/web/default/report/display.html:0 templates/web/default/report/display.html:7 +#: templates/web/default/report/display.html:0 templates/web/default/report/display.html:7 templates/web/fixmystreet/report/display.html:0 templates/web/fixmystreet/report/display.html:7 msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 msgid "User flagged" msgstr "" @@ -2168,7 +2336,7 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:304 perllib/FixMyStreet/App/Controller/Admin.pm:334 +#: perllib/FixMyStreet/App/Controller/Admin.pm:306 perllib/FixMyStreet/App/Controller/Admin.pm:336 msgid "Values updated" msgstr "" @@ -2180,27 +2348,27 @@ msgstr "" msgid "View your report" msgstr "" -#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:33 +#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:33 templates/web/emptyhomes/around/display_location.html:0 templates/web/emptyhomes/around/display_location.html:16 templates/web/fixmystreet/around/display_location.html:0 templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "" -#: templates/web/default/report/display.html:0 +#: templates/web/default/report/display.html:0 templates/web/emptyhomes/report/display.html:1 templates/web/emptyhomes/report/display.html:2 templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "" -#: templates/web/default/reports/council.html:22 +#: templates/web/default/reports/council.html:23 templates/web/default/reports/council.html:74 templates/web/default/reports/council.html:86 templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:521 perllib/FixMyStreet/Geocode/Bing.pm:47 perllib/FixMyStreet/Geocode/Google.pm:63 +#: perllib/FixMyStreet/Cobrand/Default.pm:432 perllib/FixMyStreet/Geocode/Bing.pm:48 perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "" -#: templates/web/default/alert/choose.html:6 templates/web/default/around/around_index.html:33 +#: templates/web/default/alert/choose.html:6 templates/web/default/around/around_index.html:32 templates/web/fixmystreet/alert/choose.html:6 templates/web/fixmystreet/around/around_index.html:35 msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." msgstr "" -#: templates/web/default/auth/token.html:19 +#: templates/web/default/auth/token.html:19 templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -2208,15 +2376,23 @@ msgstr "" msgid "We may contact you periodically to ask if anything has changed with the property you reported." msgstr "" -#: bin/send-reports:195 +#: templates/web/fixmystreet/report/display.html:158 +msgid "We never show your email" +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +msgid "We never show your email address or phone number." +msgstr "" + +#: bin/send-reports:196 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:46 +#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 templates/web/fixmystreet/index.html:56 msgid "We send it to the council on your behalf" msgstr "" -#: templates/web/default/report/new/notes.html:5 +#: templates/web/default/report/new/notes.html:5 templates/web/fixmystreet/report/new/notes.html:4 msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>" msgstr "" @@ -2228,7 +2404,7 @@ msgstr "" msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" msgstr "" -#: templates/web/default/admin/council_contacts.html:32 templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:37 templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "" @@ -2236,7 +2412,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 msgid "Whole block of empty flats" msgstr "" @@ -2244,11 +2420,19 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/default/questionnaire/index.html:104 +#: templates/web/fixmystreet/footer.html:23 +msgid "Would you like better integration with FixMyStreet? <a href=\"/for-councils\">Find out about FixMyStreet for councils</a>." +msgstr "" + +#: templates/web/fixmystreet/footer.html:19 +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "" + +#: templates/web/default/questionnaire/index.html:102 templates/web/fixmystreet/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" -#: templates/web/default/report/new/notes.html:8 +#: templates/web/default/report/new/notes.html:8 templates/web/fixmystreet/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" @@ -2256,27 +2440,31 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:39 templates/web/default/admin/council_contacts.html:40 templates/web/default/admin/council_edit.html:5 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:40 templates/web/default/admin/search_users.html:23 templates/web/default/admin/update_edit.html:15 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 +#: templates/web/default/admin/council_contacts.html:44 templates/web/default/admin/council_contacts.html:45 templates/web/default/admin/council_edit.html:5 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:27 templates/web/default/admin/report_edit.html:40 templates/web/default/admin/search_users.html:23 templates/web/default/admin/update_edit.html:15 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:105 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "" -#: templates/web/default/contact/index.html:37 +#: templates/web/fixmystreet/report/display.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +msgid "Yes I have a password" +msgstr "" + +#: templates/web/default/contact/index.html:37 templates/web/fixmystreet/contact/index.html:38 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/default/contact/index.html:15 +#: templates/web/default/contact/index.html:15 templates/web/fixmystreet/contact/index.html:16 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/default/reports/council.html:71 +#: templates/web/emptyhomes/reports/council.html:64 msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/default/reports/council.html:73 +#: templates/web/emptyhomes/reports/council.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:16 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:16 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 templates/web/fixmystreet/report/new/councils_text_none.html:12 templates/web/fixmystreet/report/new/councils_text_none.html:14 templates/web/fixmystreet/report/new/councils_text_some.html:20 templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" @@ -2284,20 +2472,20 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/default/questionnaire/index.html:94 templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/default/questionnaire/index.html:92 templates/web/default/report/new/fill_in_details_form.html:93 templates/web/fixmystreet/questionnaire/index.html:87 templates/web/fixmystreet/report/new/fill_in_details_form.html:101 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" -#: templates/web/default/report/display.html:112 +#: templates/web/default/report/display.html:111 templates/web/fixmystreet/report/display.html:105 msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/default/auth/sign_out.html:3 +#: templates/web/default/auth/sign_out.html:3 templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:7 -msgid "You have located the problem at the point marked with a purple pin on the map. If this is not the correct location, simply click on the map again. " +#: templates/web/default/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" #: templates/web/default/tokens/confirm_alert.html:7 @@ -2320,7 +2508,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 perllib/FixMyStreet/App/Controller/Report/Update.pm:131 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/App/Controller/Report/Update.pm:131 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2332,31 +2520,55 @@ msgstr "" msgid "You really want to resend?" msgstr "" -#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 templates/web/default/my/my.html:3 +#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0 templates/web/fixmystreet/my/my.html:14 templates/web/fixmystreet/my/my.html:3 msgid "Your Reports" msgstr "" +#: templates/web/fixmystreet/alert/_list.html:85 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:39 templates/web/fixmystreet/report/display.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +msgid "Your email" +msgstr "" + +#: templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/display.html:129 +msgid "Your email address" +msgstr "" + #: templates/web/default/auth/general.html:27 msgid "Your email address:" msgstr "" -#: templates/web/default/alert/list.html:122 templates/web/default/report/display.html:134 templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/default/alert/list.html:120 templates/web/default/report/display.html:133 templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "" -#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/display.html:210 templates/web/default/report/new/fill_in_details_form.html:203 +#: templates/web/fixmystreet/auth/general.html:53 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/display.html:185 templates/web/fixmystreet/report/new/fill_in_details_form.html:118 templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +msgid "Your name" +msgstr "" + +#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/display.html:207 templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "" -#: templates/web/default/auth/change_password.html:6 +#: templates/web/fixmystreet/auth/general.html:37 templates/web/fixmystreet/report/display.html:143 templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +msgid "Your password" +msgstr "" + +#: templates/web/default/auth/change_password.html:6 templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "" -#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 templates/web/reading/footer.html:7 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "Your phone number" +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +msgid "Your report" +msgstr "" + +#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 templates/web/fiksgatami/nn/footer.html:6 templates/web/fixmystreet/footer.html:47 templates/web/reading/footer.html:7 msgid "Your reports" msgstr "" -#: templates/web/default/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 msgid "Your updates" msgstr "" @@ -2368,7 +2580,7 @@ msgstr "" msgid "by %s" msgstr "" -#: templates/web/default/reports/council.html:6 templates/web/default/reports/council.html:7 +#: templates/web/default/reports/council.html:6 templates/web/default/reports/council.html:7 templates/web/emptyhomes/reports/council.html:6 templates/web/emptyhomes/reports/council.html:7 msgid "council" msgstr "" @@ -2376,6 +2588,10 @@ msgstr "" msgid "didn't use map" msgstr "" +#: templates/web/fixmystreet/alert/index.html:24 templates/web/fixmystreet/index.html:41 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + #: templates/web/default/admin/index.html:15 msgid "from %d different users" msgstr "" @@ -2384,11 +2600,11 @@ msgstr "" msgid "less than a minute" msgstr "" -#: templates/web/default/report/updates.html:18 +#: templates/web/default/report/updates.html:24 msgid "marked as %s" msgstr "" -#: templates/web/default/report/updates.html:16 +#: templates/web/default/report/updates.html:22 msgid "marked as fixed" msgstr "" @@ -2396,7 +2612,7 @@ msgstr "" msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:116 +#: templates/web/default/alert/list.html:114 templates/web/fixmystreet/alert/_list.html:81 msgid "or" msgstr "" @@ -2408,19 +2624,23 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:23 msgid "reopened" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/bromley/header.html:47 templates/web/fixmystreet/header.html:47 +msgid "sign out" +msgstr "" + +#: templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "the map was not used so pin location may be inaccurate" msgstr "" -#: bin/send-reports:176 +#: bin/send-reports:177 msgid "this type of local problem" msgstr "" @@ -2440,7 +2660,7 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:3 +#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:3 templates/web/emptyhomes/reports/council.html:0 templates/web/emptyhomes/reports/council.html:3 msgid "ward" msgstr "" @@ -2468,21 +2688,21 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -2503,7 +2723,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/default/report/new/councils_text_some.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:14 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 0e6f7ecac..a021bf46c 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,16 +10,17 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-10-21 15:56+0100\n" +"POT-Creation-Date: 2012-03-28 19:23+0100\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 msgid " and " msgstr "" @@ -35,7 +36,14 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:15 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:23 +#: templates/web/fixmystreet/report/new/councils_text_some.html:5 #, fuzzy msgid " or " msgstr "neu" @@ -108,24 +116,26 @@ msgstr "wythnos" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:14 +#: templates/web/emptyhomes/reports/council.html:11 +#: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/Cobrand/Default.pm:844 -#: perllib/FixMyStreet/Cobrand/Default.pm:858 +#: perllib/FixMyStreet/Cobrand/Default.pm:792 +#: perllib/FixMyStreet/Cobrand/Default.pm:806 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:466 +#: perllib/FixMyStreet/DB/Result/Problem.pm:480 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:468 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:875 -#: perllib/FixMyStreet/Cobrand/Default.pm:889 +#: perllib/FixMyStreet/Cobrand/Default.pm:823 +#: perllib/FixMyStreet/Cobrand/Default.pm:837 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -143,24 +153,31 @@ msgstr "" msgid "(Email in abuse table)" msgstr "" -#: templates/web/default/alert/list.html:53 +#: templates/web/default/alert/list.html:51 +#: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(pellter rhagosodedig sy'n cynnwys tua 200,000 o bobl)" -#: templates/web/default/alert/list.html:58 +#: templates/web/default/alert/list.html:56 +#: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 +#: templates/web/default/reports/council.html:134 +#: templates/web/fixmystreet/around/around_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:9 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 +#: templates/web/fixmystreet/index.html:30 msgid " " msgstr " " -#: templates/web/default/reports/council.html:133 +#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:152 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -169,7 +186,8 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:130 +#: templates/web/default/reports/council.html:150 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -178,24 +196,24 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "(we never show your email address or phone number)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: templates/web/default/report/display.html:217 +#: templates/web/default/report/display.html:214 #, fuzzy msgid "(we never show your email)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:281 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:337 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:343 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -204,16 +222,6 @@ msgstr "-- Dewiswch fath o eiddo --" msgid ". You can <a href=\"%s\">view the empty property on this site</a>." msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." -#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 -msgid "" -"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" -"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" -"\"logoie\"></span></a>" -msgstr "" -"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" -"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" -"\"logoie\"></span></a>" - #: templates/web/default/questionnaire/completed.html:25 #, fuzzy msgid "" @@ -245,7 +253,7 @@ msgstr "" "chyhoeddi</a>?\n" "</p>\n" -#: templates/web/default/questionnaire/index.html:37 +#: templates/web/default/questionnaire/index.html:35 #, fuzzy msgid "" "<p>Getting empty homes back into use can be difficult, but by now a good " @@ -281,7 +289,7 @@ msgstr "" "href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www." "emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" -#: templates/web/default/questionnaire/index.html:28 +#: templates/web/default/questionnaire/index.html:26 #, fuzzy msgid "" "<p>Getting empty homes back into use can be difficult. You shouldn’t " @@ -323,8 +331,10 @@ msgstr "" "mwy o wybodaeth am statws eich eiddo gwag, dewch yn ôl i'r safle\n" "a rhowch ddiweddariad yno.</p>\n" -#: templates/web/default/around/display_location.html:71 -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:72 +#: templates/web/emptyhomes/around/display_location.html:36 +#: templates/web/emptyhomes/around/display_location.html:38 #, fuzzy msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " @@ -338,6 +348,21 @@ msgstr "" msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: templates/web/fixmystreet/report/display.html:153 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: templates/web/fixmystreet/auth/general.html:46 +#, fuzzy +msgid "<strong>No</strong> let me sign in by email" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" @@ -347,35 +372,40 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/report/display.html:170 +#: templates/web/default/report/display.html:169 #, fuzzy msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:148 +#: templates/web/default/report/display.html:147 #: templates/web/default/report/new/fill_in_details_form.html:140 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:34 +#: templates/web/fixmystreet/report/display.html:136 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 #, fuzzy -msgid "<strong>Yes</strong>, I have a password:" +msgid "<strong>Yes</strong> I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:31 +#: templates/web/emptyhomes/header.html:29 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/council_contacts.html:62 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 msgid "Added %s" msgstr "" #: templates/web/default/auth/change_password.html:29 +#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "" @@ -387,7 +417,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:222 +#: templates/web/default/report/display.html:219 +#: templates/web/fixmystreet/report/display.html:193 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" @@ -395,29 +426,40 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" msgid "All" msgstr "" +#: templates/web/default/reports/index.html:3 +#, fuzzy +msgid "All Reports" +msgstr "Adroddiadau" + #: templates/web/default/admin/council_list.html:44 msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 -#: templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 +#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/fiksgatami/footer.html:7 +#: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmystreet/footer.html:49 +#: templates/web/reading/footer.html:8 msgid "Reports" msgstr "Adroddiadau" #: templates/web/default/report/new/councils_text_some.html:2 +#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "" #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_all.html:5 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " "system." msgstr "" -"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>%" -"s</strong>.\n" +"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>" +"%s</strong>.\n" "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." @@ -425,24 +467,29 @@ msgstr "" #: templates/web/default/report/new/councils_text_all.html:12 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:12 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 -#: templates/web/emptyhomes/report/new/all_councils_text.html:4 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:4 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong>. On " "the site, we will show the subject and details of the empty property, plus " "your name if you give us permission." msgstr "" -"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>%" -"s</strong>.\n" +"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>" +"%s</strong>.\n" "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." -#: templates/web/default/questionnaire/index.html:62 +#: templates/web/default/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this empty property as returned to use." msgstr "" "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " @@ -454,23 +501,27 @@ msgstr "" msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:14 #, fuzzy msgid "Anonymous:" msgstr "Di-enw" -#: templates/web/default/footer.html:29 -msgid "" -"Are you a developer? Would you like to contribute to reportemptyhomes.com?" -msgstr "" - #: templates/web/default/footer.html:26 msgid "" -"Are you from a council? Would you like better integration with " +"Are you a <strong>developer</strong>? Would you like to contribute to " "reportemptyhomes.com?" msgstr "" +#: templates/web/fixmystreet/footer.html:18 +msgid "Are you a developer?" +msgstr "" + +#: templates/web/fixmystreet/footer.html:22 +#, fuzzy +msgid "Are you from a council?" +msgstr "Ni roddwyd gwybod i'r cyngor am hyn" + #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " @@ -487,11 +538,8 @@ msgstr "" msgid "Ban email address" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" -msgstr "" - #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>" @@ -501,10 +549,19 @@ msgstr "" msgid "By Date" msgstr "" -#: templates/web/default/admin/council_contacts.html:26 +#: templates/web/fixmystreet/around/display_location.html:75 +#: templates/web/fixmystreet/around/display_location.html:77 +#, fuzzy +msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" +msgstr "" +"<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n" +" i'r cam hwn</a>.</small>" + +#: templates/web/default/admin/council_contacts.html:31 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 #, fuzzy msgid "Category" msgstr "Categori:" @@ -513,16 +570,16 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:567 -#: templates/web/default/admin/council_contacts.html:63 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 +#: templates/web/default/admin/council_contacts.html:68 #: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Categori:" -#: bin/send-reports:180 +#: bin/send-reports:181 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -530,22 +587,33 @@ msgstr "Categori:" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 +#: templates/web/fixmystreet/auth/change_password.html:1 +#: templates/web/fixmystreet/auth/change_password.html:3 +#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/fixmystreet/around/display_location.html:72 +#, fuzzy +msgid "Click map to report an empty property" +msgstr "Sut i roi gwybod am eiddo gwag" + +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:641 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 #, fuzzy msgid "Closed reports" msgstr "Cuddio hen adroddiadau " @@ -554,8 +622,8 @@ msgstr "Cuddio hen adroddiadau " msgid "Closed:" msgstr "" -#: templates/web/default/around/display_location.html:102 -#: templates/web/default/around/display_location.html:104 +#: templates/web/default/around/display_location.html:101 +#: templates/web/default/around/display_location.html:103 msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" @@ -579,29 +647,30 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 #, fuzzy msgid "Configuration updated" msgstr "Cadarnhau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:361 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_contacts.html:119 +#: templates/web/default/admin/council_contacts.html:124 msgid "Configure Open311" msgstr "" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:101 msgid "Configure Open311 integration" msgstr "" -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:38 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" #: templates/web/default/auth/token.html:1 +#: templates/web/fixmystreet/auth/token.html:1 #, fuzzy msgid "Confirm account" msgstr "Cadarnhau" @@ -616,8 +685,8 @@ msgstr "Cadarnhau" msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:28 -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -632,10 +701,11 @@ msgid "Confirmed:" msgstr "Cadarnhau" #: templates/web/fiksgatami/footer.html:10 +#: templates/web/fiksgatami/nn/footer.html:10 msgid "Contact" msgstr "Cysylltu" -#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 +#: templates/web/default/footer.html:24 #, fuzzy msgid "Contact reportemptyhomes.com" msgstr "Adroddiadau newydd ar reportemptyhomes.com" @@ -643,16 +713,19 @@ msgstr "Adroddiadau newydd ar reportemptyhomes.com" #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Cysylltwch â Ni" #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 +#: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Could not find user" msgstr "" @@ -664,7 +737,7 @@ msgstr "" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -697,7 +770,7 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:87 +#: templates/web/default/admin/council_contacts.html:92 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -721,13 +794,18 @@ msgstr "" msgid "Currently has 1+ deleted" msgstr "" -#: templates/web/default/admin/council_contacts.html:29 -#: templates/web/default/admin/council_contacts.html:76 +#: templates/web/default/admin/council_contacts.html:34 +#: templates/web/default/admin/council_contacts.html:81 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#, fuzzy +msgid "Details" +msgstr "Manylion:" + #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 msgid "Details:" @@ -738,11 +816,15 @@ msgid "Diligency prize league table" msgstr "" #: templates/web/default/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:29 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 #, fuzzy msgid "Do you have a reportemptyhomes.com password?" msgstr "Diweddariadau i reportemptyhomes.com" -#: templates/web/default/questionnaire/index.html:72 +#: templates/web/default/questionnaire/index.html:70 +#: templates/web/fixmystreet/questionnaire/index.html:64 msgid "Don’t know" msgstr "Ddim yn gwybod" @@ -771,7 +853,7 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:27 +#: templates/web/default/admin/council_contacts.html:32 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -779,19 +861,21 @@ msgstr "" #: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 +#: templates/web/fixmystreet/auth/general.html:20 +#: templates/web/fixmystreet/report/display.html:125 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 msgid "Email already in abuse list" msgstr "" -#: templates/web/default/around/display_location.html:84 +#: templates/web/default/around/display_location.html:83 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -799,7 +883,7 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:73 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -809,15 +893,15 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -825,11 +909,11 @@ msgstr "Swyddfa wag neu fan masnachol gwag arall" msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -849,6 +933,12 @@ msgstr "" #: templates/web/default/around/around_index.html:10 #: templates/web/default/around/around_index.html:13 #: templates/web/default/index.html:24 templates/web/default/index.html:27 +#: templates/web/emptyhomes/index.html:40 +#: templates/web/emptyhomes/index.html:43 +#: templates/web/fixmystreet/around/around_index.html:10 +#: templates/web/fixmystreet/around/around_index.html:13 +#: templates/web/fixmystreet/index.html:32 +#: templates/web/fixmystreet/index.html:35 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" @@ -858,13 +948,21 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:177 +#: templates/web/default/report/display.html:176 #: templates/web/default/report/new/fill_in_details_form.html:169 #, fuzzy msgid "Enter a new password:" msgstr "Ychwanegwch neges" -#: templates/web/default/index.html:45 +#: templates/web/fixmystreet/auth/general.html:57 +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#, fuzzy +msgid "Enter a password" +msgstr "Ychwanegwch neges" + +#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 +#: templates/web/fixmystreet/index.html:55 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" @@ -875,10 +973,11 @@ msgstr "Rhowch fanylion yr eiddo gwag" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 +#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Gwall" -#: templates/web/default/admin/council_contacts.html:9 +#: templates/web/default/admin/council_contacts.html:11 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -896,21 +995,21 @@ msgstr "" "Rhowch gynnig eto'n ddiweddarach, neu <a href=\"mailto:%s\">anfonwch neges e-" "bost atom</a>i roi gwybod inni." -#: templates/web/default/footer.html:27 -#, fuzzy -msgid "Find out about reportemptyhomes.com for councils" -msgstr "Adroddiadau newydd ar reportemptyhomes.com" - -#: templates/web/default/questionnaire/index.html:81 +#: templates/web/default/questionnaire/index.html:79 +#: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" msgstr "Y tro cyntaf" -#: templates/web/default/header.html:29 #: templates/web/fiksgatami/header.html:16 -#: templates/web/reading/header.html:31 +#: templates/web/fiksgatami/nn/header.html:16 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Trwsio<span id=\"my\">Fy</span>Stryd" +#: templates/web/default/header.html:24 +#, fuzzy +msgid "reportemptyhomes.com" +msgstr "reportemptyhomes.com" + #: templates/web/default/admin/header.html:13 #, fuzzy msgid "reportemptyhomes.com admin:" @@ -921,7 +1020,13 @@ msgstr "reportemptyhomes.com" msgid "reportemptyhomes.com administration" msgstr "Diweddariadau i reportemptyhomes.com" +#: templates/web/fixmystreet/static/for_councils.html:1 +#, fuzzy +msgid "reportemptyhomes.com for Councils" +msgstr "Adroddiadau newydd ar reportemptyhomes.com" + #: templates/web/default/alert/index.html:6 +#: templates/web/fixmystreet/alert/index.html:6 msgid "" "reportemptyhomes.com has a variety of RSS feeds and email alerts for local " "empty properties, including\n" @@ -935,7 +1040,8 @@ msgstr "" "bob eiddo gwag\n" "o fewn pellter penodol o leoliad penodol." -#: templates/web/default/alert/list.html:100 +#: templates/web/default/alert/list.html:98 +#: templates/web/fixmystreet/alert/_list.html:69 msgid "" "reportemptyhomes.com sends different categories of empty property\n" "to the appropriate council, so empty properties within the boundary of a " @@ -958,27 +1064,30 @@ msgstr "" "rhanbarth a'r cyngor, ond dim ond yn yr hysbysiad \"O fewn y ffin\" \n" "y bydd yn ymddangos yn achos y cyngor sir." +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #, fuzzy msgid "Fixed - Council" msgstr "cyngor" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #, fuzzy msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " -#: templates/web/default/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 #, fuzzy msgid "Fixed reports" msgstr "Cuddio hen adroddiadau " @@ -1000,7 +1109,9 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:24 +#: templates/web/default/reports/council.html:87 +#: templates/web/emptyhomes/reports/council.html:19 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1013,6 +1124,8 @@ msgstr "cyngor" #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 +#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmystreet/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" @@ -1024,13 +1137,27 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/default/alert/list.html:112 +#: templates/web/fixmystreet/report/display.html:28 +#, fuzzy +msgid "Get updates" +msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" + +#: templates/web/default/reports/council.html:72 +#, fuzzy +msgid "Get updates of empty properties in this %s" +msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" + +#: templates/web/default/alert/list.html:110 +#: templates/web/fixmystreet/alert/_list.html:78 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:33 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:49 +#: templates/web/fixmystreet/alert/index.html:25 +#: templates/web/fixmystreet/around/around_index.html:20 +#: templates/web/fixmystreet/index.html:42 msgid "Go" msgstr "Ewch" @@ -1043,16 +1170,18 @@ msgstr "Anfon yr holiadur" msgid "Graph of empty property creation by status over time" msgstr "" -#: templates/web/default/reports/index.html:5 +#: templates/web/default/reports/index.html:8 #: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "Mae'r llinellau mewn llwyd yn gynghorau nad ydynt yn bodoli mwyach." -#: templates/web/default/questionnaire/index.html:63 +#: templates/web/default/questionnaire/index.html:61 +#: templates/web/fixmystreet/questionnaire/index.html:55 msgid "Has this empty property been returned to use?" msgstr "A yw'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio?" -#: templates/web/default/questionnaire/index.html:76 +#: templates/web/default/questionnaire/index.html:74 +#: templates/web/fixmystreet/questionnaire/index.html:68 msgid "" "Have you ever reported an empty property to a council before, or is this " "your first time?" @@ -1060,41 +1189,53 @@ msgstr "" "Ydych chi wedi rhoi gwybod i gyngor am eiddo gwag erioed o'r blaen, neu ai " "dyma'ch tro cyntaf?" -#: templates/web/default/footer.html:10 -#: templates/web/emptyhomes/header.html:30 -#: templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 +#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/emptyhomes/header.html:28 +#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmystreet/footer.html:53 +#: templates/web/reading/footer.html:10 msgid "FAQs" msgstr "Cwestiynau Cyffredin" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/list.html:37 +#: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local empty property alerts for ‘%s’." msgstr "" "Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer ‘%s’." -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/bromley/header.html:46 +#: templates/web/fixmystreet/header.html:46 +msgid "Hi %s" +msgstr "" + +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 #, fuzzy msgid "Hidden" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 +#: templates/web/fixmystreet/around/display_location.html:58 +msgid "Hide old" +msgstr "" + +#: templates/web/default/around/display_location.html:53 +#: templates/web/fixmystreet/around/display_location.html:54 msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:59 -msgid "Hide stale reports" -msgstr "Cuddio hen adroddiadau " - #: templates/web/default/admin/council_edit.html:38 msgid "History" msgstr "" -#: templates/web/default/index.html:40 +#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 +#: templates/web/fixmystreet/index.html:50 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:587 +#: perllib/FixMyStreet/App/Controller/Admin.pm:592 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1128,13 +1269,15 @@ msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:10 +#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit an empty property here the subject and details of the empty " "property will be public, but the empty property will <strong>not</strong> be " "reported to the council." msgstr "" -#: templates/web/emptyhomes/report/new/no_councils_text.html:9 +#: templates/web/emptyhomes/report/new/councils_text_none.html:9 #, fuzzy msgid "" "If you submit a report here it will be left on the site, but not reported to " @@ -1150,13 +1293,15 @@ msgstr "" #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 +#: templates/web/fixmystreet/auth/token.html:23 msgid "" "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." msgstr "" -#: templates/web/default/questionnaire/index.html:85 +#: templates/web/default/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:77 msgid "" "If you wish to leave a public update on the empty property, please enter it " "here\n" @@ -1173,14 +1318,16 @@ msgstr "" msgid "Illegal ID" msgstr "ID Anghyfreithlon" -#: perllib/FixMyStreet/App/Controller/Alert.pm:102 +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "In Progress" msgstr "" @@ -1192,9 +1339,9 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/default/around/display_location.html:61 -msgid "Include stale reports" -msgstr "Cynnwys hen adroddiadau" +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +msgid "In progress" +msgstr "" #: templates/web/default/admin/stats.html:76 #, fuzzy @@ -1209,7 +1356,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:897 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1218,14 +1365,16 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:887 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Invalid start date" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 #, fuzzy msgid "Investigating" msgstr "Mordwyo " @@ -1255,12 +1404,15 @@ msgstr "" "fel y gallwch weld beth sy'n digwydd." #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:157 +#: templates/web/default/report/display.html:156 #: templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/default/admin/council_contacts.html:30 +#: templates/web/default/admin/council_contacts.html:35 msgid "Last editor" msgstr "" @@ -1273,16 +1425,17 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:985 msgid "List Flagged" msgstr "" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #, fuzzy msgid "List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." msgstr "" @@ -1295,6 +1448,15 @@ msgstr "" #: templates/web/default/alert/updates.html:1 #: templates/web/default/tokens/confirm_alert.html:1 #: templates/web/default/tokens/confirm_alert.html:3 +#: templates/web/emptyhomes/alert/index.html:1 +#: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmystreet/alert/choose.html:1 +#: templates/web/fixmystreet/alert/choose.html:3 +#: templates/web/fixmystreet/alert/index.html:1 +#: templates/web/fixmystreet/alert/index.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:5 +#: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" @@ -1302,16 +1464,24 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:12 +#: templates/web/fixmystreet/alert/list.html:14 +#: templates/web/fixmystreet/alert/list.html:3 #, fuzzy msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 -#: templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 +#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/fiksgatami/footer.html:8 +#: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmystreet/footer.html:51 +#: templates/web/reading/footer.html:9 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:44 +#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:54 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" @@ -1322,6 +1492,11 @@ msgid "" "licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" +#: templates/web/fixmystreet/contact/index.html:86 +#, fuzzy +msgid "Message" +msgstr "Neges:" + #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "Neges:" @@ -1344,9 +1519,14 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 #: templates/web/default/admin/search_users.html:12 -#: templates/web/default/reports/index.html:10 +#: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 +#: templates/web/fixmystreet/auth/general.html:52 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "Name" msgstr "Enw" @@ -1356,7 +1536,8 @@ msgstr "Enw" msgid "Name:" msgstr "Enw:" -#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/nn/footer.html:3 #: templates/web/reading/footer.html:4 msgid "Navigation" msgstr "Mordwyo " @@ -1367,24 +1548,36 @@ msgid "" "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:564 +#: perllib/FixMyStreet/Cobrand/Default.pm:480 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:553 -#: perllib/FixMyStreet/Cobrand/Default.pm:588 +#: perllib/FixMyStreet/Cobrand/Default.pm:469 +#: perllib/FixMyStreet/Cobrand/Default.pm:520 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" msgstr "" +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing " +"Maps): %s\n" +"\n" +msgstr "" + #: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: templates/web/default/reports/index.html:16 +#, fuzzy +msgid "New <br>empty properties" +msgstr "Adroddiadau newydd am eiddo gwag" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 msgid "New category contact added" msgstr "" @@ -1397,10 +1590,8 @@ msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" msgid "New local reports on reportemptyhomes.com" msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com" -#: templates/web/default/reports/council.html:92 -#: templates/web/default/reports/council.html:93 -#: templates/web/default/reports/index.html:11 #: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New empty property reports" msgstr "Adroddiadau newydd am eiddo gwag" @@ -1463,24 +1654,27 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "" -#: templates/web/default/front/news.html:8 #: templates/web/fiksgatami/front/news.html:9 +#: templates/web/fiksgatami/nn/front/news.html:9 +#: templates/web/fixmystreet/front/news.html:8 msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 -#: templates/web/default/questionnaire/index.html:109 -#: templates/web/default/questionnaire/index.html:70 +#: templates/web/default/questionnaire/index.html:107 +#: templates/web/default/questionnaire/index.html:68 +#: templates/web/fixmystreet/questionnaire/index.html:101 +#: templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "Nac ydw" @@ -1490,7 +1684,7 @@ msgstr "Nac ydw" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:297 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1512,10 +1706,12 @@ msgid "No info at all" msgstr "" #: templates/web/default/around/around_map_list_items.html:15 +#: templates/web/fixmystreet/around/around_map_list_items.html:24 msgid "No empty properties found." msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." #: templates/web/default/around/on_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:21 msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." @@ -1531,10 +1727,12 @@ msgid "Not reported before" msgstr "Wedi adrodd o'r blaen" #: templates/web/default/report/_main.html:9 +#: templates/web/emptyhomes/report/display.html:24 +#: templates/web/fixmystreet/report/_main.html:11 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:31 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:46 #, fuzzy msgid "Note" @@ -1547,7 +1745,7 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:31 #, fuzzy msgid "Note:" @@ -1557,34 +1755,37 @@ msgstr "Nac ydw" msgid "Note: <strong>%s</strong>" msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +msgid "Now to submit your report…" +msgstr "" + #: templates/web/default/report/new/fill_in_details_form.html:131 msgid "" "Now to submit your report… do you have a reportemptyhomes.com " "password?" msgstr "" -#: templates/web/default/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:132 +msgid "Now to submit your update…" +msgstr "" + +#: templates/web/default/report/display.html:138 msgid "" "Now to submit your update… do you have a reportemptyhomes.com " "password?" msgstr "" #: templates/web/default/report/display.html:26 -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" -#: templates/web/default/reports/council.html:115 -#: templates/web/default/reports/council.html:116 -msgid "Old returned to use" -msgstr "Hen wedi'i adfer i'w ddefnyddio" - -#: templates/web/default/reports/council.html:109 -#: templates/web/default/reports/council.html:110 -msgid "Old empty properties, state unknown" -msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys" +#: templates/web/default/reports/index.html:18 +#, fuzzy +msgid "Old / unknown <br>empty properties" +msgstr "ID eiddo gwag anhysbys" -#: templates/web/default/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:12 #: templates/web/fiksgatami/reports/index.html:12 msgid "Old empty properties,<br>state unknown" msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" @@ -1593,29 +1794,36 @@ msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" msgid "Old state" msgstr "" -#: templates/web/default/reports/index.html:15 +#: templates/web/default/reports/index.html:20 +#, fuzzy +msgid "Older <br>returned to use" +msgstr "Wedi'u hadfer i'w defnyddio ers amser" + +#: templates/web/default/reports/index.html:17 +#, fuzzy +msgid "Older <br>empty properties" +msgstr "Adroddiadau hŷn o eiddo gwag" + #: templates/web/emptyhomes/reports/index.html:14 +#: templates/web/fiksgatami/nn/reports/index.html:14 #: templates/web/fiksgatami/reports/index.html:14 msgid "Older returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" -#: templates/web/default/reports/council.html:101 -#: templates/web/default/reports/council.html:105 -#: templates/web/default/reports/council.html:106 -#: templates/web/default/reports/council.html:99 -#: templates/web/default/reports/index.html:12 #: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:79 msgid "Open" msgstr "" -#: templates/web/default/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 #, fuzzy msgid "Open reports" msgstr "Cuddio hen adroddiadau " @@ -1633,11 +1841,13 @@ msgstr "" msgid "Open311 specification" msgstr "" -#: templates/web/default/alert/list.html:87 +#: templates/web/default/alert/list.html:85 +#: templates/web/fixmystreet/alert/_list.html:56 msgid "Or empty properties reported to:" msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" -#: templates/web/default/alert/list.html:63 +#: templates/web/default/alert/list.html:61 +#: templates/web/fixmystreet/alert/_list.html:33 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" @@ -1645,18 +1855,18 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: bin/send-reports:175 bin/send-reports:184 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:553 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:969 -#: perllib/FixMyStreet/DB/Result/Problem.pm:475 -#: perllib/FixMyStreet/DB/Result/Problem.pm:485 -#: perllib/FixMyStreet/DB/Result/Problem.pm:495 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: bin/send-reports:176 bin/send-reports:185 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 +#: perllib/FixMyStreet/DB/Result/Problem.pm:489 +#: perllib/FixMyStreet/DB/Result/Problem.pm:499 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 msgid "Other" msgstr "Arall" -#: templates/web/default/footer.html:30 +#: templates/web/default/footer.html:27 msgid "" "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet" "\">available on GitHub</a>." @@ -1672,65 +1882,103 @@ msgstr "Arall" msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Partial" msgstr "" +#: templates/web/fixmystreet/auth/general.html:55 +#: templates/web/fixmystreet/report/display.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#, fuzzy +msgid "Password (optional)" +msgstr "(dewisol)" + #: templates/web/default/auth/change_password.html:25 +#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "" -#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Phone number (optional)" +msgstr "(dewisol)" + +#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Rhif ffôn:" -#: templates/web/default/questionnaire/index.html:97 -#: templates/web/default/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#, fuzzy +msgid "Photo" +msgstr "Ffotograff:" + +#: templates/web/default/questionnaire/index.html:95 +#: templates/web/default/report/display.html:114 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Ffotograff:" -#: templates/web/default/alert/list.html:29 +#: templates/web/default/alert/list.html:27 +#: templates/web/fixmystreet/alert/list.html:27 msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 msgid "Planned" msgstr "" +#: templates/web/fixmystreet/questionnaire/index.html:44 +#, fuzzy +msgid "" +"Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates " +"that have been left." +msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." + #: templates/web/default/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:17 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "" #: templates/web/default/auth/token.html:17 +#: templates/web/fixmystreet/auth/token.html:17 #, fuzzy msgid "Please check your email" msgstr "Rhowch eich cyfeiriad e-bost" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/fixmystreet/auth/general.html:9 #, fuzzy msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 -#: perllib/FixMyStreet/DB/Result/Problem.pm:316 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -1750,36 +1998,44 @@ msgstr "" "dilynwch y cyfarwyddiadau." #: templates/web/default/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." msgstr "" #: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Ychwanegwch neges" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:15 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:15 #, fuzzy msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:291 +#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" #: perllib/FixMyStreet/DB/Result/User.pm:96 +#: templates/web/default/js/validation_strings.html:12 +#: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Alert.pm:345 +#: perllib/FixMyStreet/App/Controller/Alert.pm:342 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:294 +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" @@ -1787,21 +2043,33 @@ msgstr "Cofnodwch fanylion" #: perllib/FixMyStreet/DB/Result/User.pm:93 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 +#: templates/web/default/js/validation_strings.html:11 +#: templates/web/default/js/validation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:14 +#: templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#, fuzzy +msgid "Please enter your email address" +msgstr "Cofnodwch eich cyfeiriad e-bost" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:7 +#, fuzzy msgid "" -"Please enter your full name - if you do not wish your name to be shown on " -"the site, untick the box" +"Please enter your full name, councils need this information – if you do not " +"wish your name to be shown on the site, untick the box below" msgstr "" "Cofnodwch eich enw llawn - os nad ydych yn dymuno bod eich enw'n cael ei " "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:302 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: perllib/FixMyStreet/DB/Result/User.pm:89 +#: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Cofnodwch eich enw" @@ -1827,6 +2095,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the empty property below." msgstr "Llenwch fanylion yr eiddo gwag isod." @@ -1842,7 +2112,13 @@ msgid "" "photo of the empty property if you have one), etc." msgstr "" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#, fuzzy +msgid "Please fill in details of the empty property." +msgstr "Llenwch fanylion yr eiddo gwag isod." + #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -1851,11 +2127,12 @@ msgstr "" "Llenwch y ffurflen isod gyda manylion yr eiddo gwag,\n" "a disgrifiwch y lleoliad mor fanwl ag y bo modd yn y blwch manylion." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" -#: templates/web/default/report/display.html:62 +#: templates/web/default/report/display.html:61 +#: templates/web/fixmystreet/report/display.html:59 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -1863,25 +2140,27 @@ msgid "" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." msgstr "" #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported an empty property to your council " "before" @@ -1889,24 +2168,24 @@ msgstr "" "Rhowch wybod a ydych chi wedi rhoi gwybod i'ch cyngor am eiddo gwag erioed " "o'r blaen" -#: perllib/FixMyStreet/App/Controller/Alert.pm:82 +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Alert.pm:120 +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 msgid "Please state whether or not the empty property has been returned to use" msgstr "" "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio" -#: templates/web/default/questionnaire/index.html:52 +#: templates/web/default/questionnaire/index.html:50 msgid "Please take a look at the updates that have been left." msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -1914,27 +2193,36 @@ msgstr "Dim ond llun JPEG y dylech lwytho i fyny." msgid "Please write a message" msgstr "Ysgrifennwch neges" +#: templates/web/fixmystreet/report/display.html:74 +#, fuzzy +msgid "Please write your update here" +msgstr "Rhowch eich enw" + #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:125 -#: templates/web/default/report/display.html:162 -#: templates/web/default/report/display.html:184 +#: templates/web/default/report/display.html:124 +#: templates/web/default/report/display.html:161 +#: templates/web/default/report/display.html:183 +#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/display.html:166 msgid "Post" msgstr "Postio" -#: templates/web/default/report/updates.html:8 +#: templates/web/default/report/updates.html:14 msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" -#: templates/web/default/report/updates.html:11 +#: templates/web/default/report/updates.html:17 #, fuzzy msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:19 msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/maps/openlayers.html:89 +#: templates/web/default/maps/openlayers.html:85 msgid "Empty property" msgstr "Eiddo gwag" @@ -1958,7 +2246,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:774 +#: perllib/FixMyStreet/App/Controller/Admin.pm:776 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -1972,10 +2260,21 @@ msgstr "" msgid "Empty properties" msgstr "Eiddo gwag" -#: templates/web/default/around/display_location.html:80 +#: templates/web/default/around/display_location.html:79 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" +#: templates/web/fixmystreet/around/display_location.html:93 +#: templates/web/fixmystreet/report/display.html:29 +#, fuzzy +msgid "Empty properties nearby" +msgstr "Mwy o eiddo gwag cyfagos" + +#: templates/web/fixmystreet/around/display_location.html:92 +#, fuzzy +msgid "Empty properties on the map" +msgstr "Eiddo gwag yn yr ardal hon" + #: db/alert_types.pl:14 #, fuzzy msgid "" @@ -1984,28 +2283,30 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/list.html:50 +#: templates/web/fixmystreet/alert/_list.html:21 #, fuzzy msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/Default.pm:748 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:809 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:16 +#: templates/web/default/reports/council.html:17 msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" -#: templates/web/default/alert/list.html:69 +#: templates/web/default/alert/list.html:67 +#: templates/web/fixmystreet/alert/_list.html:38 msgid "Empty properties within the boundary of:" msgstr "Eiddo gwag o fewn ffiniau:" @@ -2015,16 +2316,24 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 msgid "Property type:" msgstr "Math o eiddo:" -#: templates/web/default/report/display.html:57 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#, fuzzy +msgid "Provide a title" +msgstr "Rhowch ddiweddariad" + +#: templates/web/default/report/display.html:56 +#: templates/web/fixmystreet/report/display.html:55 msgid "Provide an update" msgstr "Rhowch ddiweddariad" -#: templates/web/default/report/display.html:181 +#: templates/web/default/report/display.html:180 #: templates/web/default/report/new/fill_in_details_form.html:173 +#: templates/web/fixmystreet/report/display.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report empty properties, leave updates and manage your reports." @@ -2035,6 +2344,10 @@ msgstr "" #: templates/web/default/questionnaire/index.html:0 #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:32 msgid "Questionnaire" msgstr "Holiadur" @@ -2052,28 +2365,38 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" -#: templates/web/default/alert/list.html:54 +#: templates/web/fixmystreet/static/for_councils_faq.html:1 +#, fuzzy +msgid "Questions and Answers :: reportemptyhomes.com for Councils" +msgstr "Adroddiadau newydd ar reportemptyhomes.com" + +#: templates/web/default/alert/list.html:52 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:48 -#: templates/web/default/reports/council.html:61 +#: templates/web/default/report/display.html:47 +#: templates/web/default/reports/council.html:79 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:3 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:845 -#: perllib/FixMyStreet/Cobrand/Default.pm:859 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 +#: perllib/FixMyStreet/Cobrand/Default.pm:807 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:868 -#: perllib/FixMyStreet/Cobrand/Default.pm:882 +#: perllib/FixMyStreet/Cobrand/Default.pm:816 +#: perllib/FixMyStreet/Cobrand/Default.pm:830 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 @@ -2081,28 +2404,29 @@ msgstr "Porthiant RSS %s" msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:874 -#: perllib/FixMyStreet/Cobrand/Default.pm:888 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" -#: templates/web/default/alert/list.html:54 +#: templates/web/default/alert/list.html:52 +#: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby empty properties" msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" -#: templates/web/default/reports/council.html:61 +#: templates/web/default/reports/council.html:79 msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:801 +#: perllib/FixMyStreet/Cobrand/Default.pm:749 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 #, fuzzy msgid "RSS feed of empty properties within %s ward" @@ -2110,15 +2434,21 @@ msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local empty properties" msgstr "Porthiant RSS o eiddo gwag lleol diweddar" -#: templates/web/default/report/display.html:48 +#: templates/web/default/report/display.html:47 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:38 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:37 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2126,22 +2456,28 @@ msgstr "" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local empty properties, reportemptyhomes.com" msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" -#: templates/web/default/reports/council.html:87 -#: templates/web/default/reports/council.html:88 -#: templates/web/default/reports/index.html:14 +#: templates/web/default/reports/index.html:19 +#, fuzzy +msgid "Recently <br>returned to use" +msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" + #: templates/web/emptyhomes/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:13 #: templates/web/fiksgatami/reports/index.html:13 msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:62 +#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/default/report/new/notes.html:9 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Remember that reportemptyhomes.com is primarily for reporting physical empty " "properties that can be returned to use. If your empty property is not " @@ -2153,7 +2489,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2162,66 +2498,83 @@ msgstr "" msgid "Report Empty Homes" msgstr "Adrodd am Eiddo Gwag" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 -#: templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 +#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 +#: templates/web/emptyhomes/header.html:27 +#: templates/web/fiksgatami/footer.html:5 +#: templates/web/fiksgatami/nn/footer.html:5 +#: templates/web/fixmystreet/footer.html:45 +#: templates/web/reading/footer.html:6 msgid "Report a property" msgstr "Rhoi gwybod am eiddo" -#: perllib/FixMyStreet/App/Controller/Rss.pm:274 +#: templates/web/fixmystreet/report/display.html:27 +#, fuzzy +msgid "Report abuse" +msgstr "Adroddiadau" + +#: templates/web/emptyhomes/index.html:37 +#, fuzzy +msgid "Report empty properties" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:281 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" -#: templates/web/default/index.html:15 +#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/my/my.html:74 +#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 #, fuzzy msgid "Reported %s" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:72 +#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 #, fuzzy msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 #: templates/web/default/contact/index.html:45 +#: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" #: templates/web/default/admin/questionnaire.html:5 -#: templates/web/default/questionnaire/index.html:79 +#: templates/web/default/questionnaire/index.html:77 +#: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:513 +#: perllib/FixMyStreet/DB/Result/Problem.pm:527 #: templates/web/default/contact/index.html:47 +#: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:478 +#: perllib/FixMyStreet/DB/Result/Problem.pm:492 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:486 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2229,10 +2582,14 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details.html:0 +#: templates/web/fixmystreet/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: templates/web/default/around/display_location.html:94 +#: templates/web/default/around/display_location.html:93 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -2255,7 +2612,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 #, fuzzy msgid "Search Abuse" msgstr "Adroddiadau cryno" @@ -2264,14 +2621,14 @@ msgstr "Adroddiadau cryno" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 #: templates/web/default/admin/search_users.html:1 #, fuzzy msgid "Search Users" @@ -2283,7 +2640,8 @@ msgstr "Adroddiadau cryno" msgid "Search:" msgstr "" -#: templates/web/default/alert/list.html:41 +#: templates/web/default/alert/list.html:39 +#: templates/web/fixmystreet/alert/_list.html:10 #, fuzzy msgid "" "Select which type of alert you'd like and click the button for an RSS feed, " @@ -2293,7 +2651,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -2346,17 +2704,31 @@ msgstr "" "cat=20'>Gwybodaeth\n" "bellach am ein gwaith ar gartrefi gwag</a>.\n" -#: templates/web/default/report/display.html:216 +#: templates/web/default/report/display.html:213 #: templates/web/default/report/new/fill_in_details_form.html:210 +#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:52 +#: templates/web/default/around/display_location.html:60 +#: templates/web/fixmystreet/around/display_location.html:60 +msgid "Show old" +msgstr "" + +#: templates/web/default/around/display_location.html:51 +#: templates/web/fixmystreet/around/display_location.html:52 msgid "Show pins" msgstr "Dangos pinnau" +#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:3 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/header.html:50 msgid "Sign in" msgstr "" @@ -2365,31 +2737,37 @@ msgid "Sign in by email" msgstr "" #: templates/web/default/auth/general.html:1 +#: templates/web/fixmystreet/auth/general.html:1 msgid "Sign in or create an account" msgstr "" #: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:35 -#: templates/web/emptyhomes/header.html:43 +#: templates/web/default/header.html:30 +#: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 +#: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:37 +#: templates/web/reading/header.html:33 msgid "Sign out" msgstr "" -#: templates/web/default/header.html:34 -#: templates/web/emptyhomes/header.html:42 +#: templates/web/default/header.html:29 +#: templates/web/emptyhomes/header.html:40 #: templates/web/fiksgatami/header.html:21 +#: templates/web/fiksgatami/nn/header.html:21 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:36 +#: templates/web/reading/header.html:32 msgid "Signed in as %s" msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/default/alert/index.html:31 +#: templates/web/default/alert/index.html:30 +#: templates/web/fixmystreet/alert/index.html:33 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -2402,7 +2780,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:517 +#: perllib/FixMyStreet/Cobrand/Default.pm:428 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2411,18 +2789,20 @@ msgstr "" msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 #: perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." -#: perllib/FixMyStreet/Geocode/Bing.pm:45 +#: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "Source code" msgstr "" @@ -2443,23 +2823,35 @@ msgstr "" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 +#: templates/web/fixmystreet/report/display.html:77 #, fuzzy msgid "State" msgstr "Diweddariad:" -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:83 +#: templates/web/default/report/display.html:82 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:986 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" msgstr "Diweddariad:" +#: templates/web/default/report/updates.html:9 +#, fuzzy +msgid "Still open, via questionnaire, %s" +msgstr "Anfon yr holiadur" + +#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#, fuzzy +msgid "Subject" +msgstr "Pwnc:" + #: templates/web/default/admin/report_edit.html:13 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 @@ -2470,30 +2862,37 @@ msgstr "Pwnc:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:55 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 #, fuzzy msgid "Submit changes" msgstr "Anfon" -#: templates/web/default/questionnaire/index.html:114 +#: templates/web/default/questionnaire/index.html:112 +#: templates/web/fixmystreet/questionnaire/index.html:105 msgid "Submit questionnaire" msgstr "Anfon yr holiadur" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:43 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:42 msgid "Subscribe" msgstr "Tanysgrifio" -#: templates/web/default/alert/list.html:128 +#: templates/web/default/alert/list.html:126 +#: templates/web/fixmystreet/alert/_list.html:88 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:976 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -2501,11 +2900,12 @@ msgstr "Adroddiadau cryno" #: templates/web/default/reports/index.html:1 #: templates/web/emptyhomes/reports/index.html:1 +#: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2514,7 +2914,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:12 +#: templates/web/default/admin/council_contacts.html:14 msgid "Text only version" msgstr "" @@ -2582,7 +2982,8 @@ msgstr "" "helpu i \n" "ddatrys argyfwng tai gwag y DU." -#: templates/web/default/around/around_index.html:44 +#: templates/web/default/around/around_index.html:43 +#: templates/web/fixmystreet/around/around_index.html:46 msgid "" "Thanks for uploading your photo. We now need to locate your empty property, " "so please enter a nearby street name or postcode in the box below :" @@ -2604,7 +3005,7 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2612,6 +3013,7 @@ msgstr "" "rhowch gynnig arni eto." #: templates/web/default/alert/index.html:12 +#: templates/web/fixmystreet/alert/index.html:12 msgid "" "That location does not appear to be covered by a council, perhaps it is " "offshore - please try somewhere more specific." @@ -2625,12 +3027,12 @@ msgstr "" "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall " "arni." -#: perllib/FixMyStreet/Cobrand/Default.pm:510 +#: perllib/FixMyStreet/Cobrand/Default.pm:421 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:558 +#: perllib/FixMyStreet/App/Controller/Admin.pm:560 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -2639,7 +3041,8 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" -#: templates/web/default/around/around_index.html:27 +#: templates/web/default/around/around_index.html:26 +#: templates/web/fixmystreet/around/around_index.html:29 #, fuzzy msgid "" "That spot does not appear to be covered by a council. If you have tried to " @@ -2694,19 +3097,37 @@ msgstr "" #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 +#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." msgstr "" -#: templates/web/default/questionnaire/index.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +msgid "" +"The council won’t be able to help unless you leave as much\n" +"detail as you can. Please describe the exact location of the empty property " +"(e.g. on a\n" +"wall), what it is, how long it has been there, a description (and a photo " +"of\n" +"the empty property if you have one), etc." +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:43 +#, fuzzy +msgid "" +"The details of your empty property are available from the other tab above." +msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." + +#: templates/web/default/questionnaire/index.html:49 msgid "" "The details of your empty property are available on the right hand side of " "this page." msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." -#: perllib/FixMyStreet/App/Controller/Reports.pm:46 -#: perllib/FixMyStreet/App/Controller/Reports.pm:73 +#: perllib/FixMyStreet/App/Controller/Reports.pm:44 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -2796,6 +3217,8 @@ msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:16 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "" @@ -2804,14 +3227,15 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1179 -#: perllib/FixMyStreet/App/Controller/Admin.pm:538 -#: perllib/FixMyStreet/App/Controller/Admin.pm:701 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:540 +#: perllib/FixMyStreet/App/Controller/Admin.pm:703 msgid "The requested URL was not found on this server." msgstr "" -#: templates/web/default/alert/list.html:47 +#: templates/web/default/alert/list.html:45 +#: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" @@ -2819,12 +3243,16 @@ msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 +#: templates/web/fixmystreet/report/new/councils_text_all.html:18 +#: templates/web/fixmystreet/report/new/councils_text_some.html:10 +#: templates/web/fixmystreet/report/new/councils_text_some.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the empty property will be public, plus your name " "if you give us permission." msgstr "" -#: bin/send-reports:78 +#: bin/send-reports:79 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -2832,29 +3260,29 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:70 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 #: templates/web/default/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:24 msgid "" -"There was an empty property with your email/password combination. Passwords " -"and user accounts are a brand <strong>new</strong> service, so you probably " -"do not have one yet – please fill in the right hand side of this form " -"to get one." +"There was an empty property with your email/password combination. If you " +"cannot remember your password, or do not have one, please fill in the ‘" +"sign in by email’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:354 +#: perllib/FixMyStreet/App/Controller/Alert.pm:351 msgid "" "There was an empty property with your email/password combination. Please try " "again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 #, fuzzy msgid "There was an empty property with your update. Please try again." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -2863,7 +3291,7 @@ msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" msgid "There were problems with your report. Please see below." msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:242 msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -2873,7 +3301,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: bin/send-reports:185 +#: bin/send-reports:186 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -2881,14 +3309,14 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: bin/send-reports:188 +#: bin/send-reports:189 msgid "" "This email has been sent to several councils covering the location of the " "empty property, as the category selected is provided for all of them; please " "ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:761 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 msgid "This information is required" msgstr "" @@ -2899,16 +3327,17 @@ msgid "" "will be periodically deleted." msgstr "Safle datblygwr yw hwn; gallai pethau dorri unrhyw bryd." -#: templates/web/default/reports/council.html:65 +#: templates/web/emptyhomes/reports/council.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s." -#: templates/web/default/reports/council.html:67 +#: templates/web/emptyhomes/reports/council.html:60 msgid "This is a summary of all reports for this %s." msgstr "" -#: templates/web/default/reports/index.html:4 +#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +#: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "" "This is a summary of all reports on this site; select a particular council " @@ -2917,46 +3346,48 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." -#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 #, fuzzy msgid "This empty property has been closed" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:922 +#: perllib/FixMyStreet/Cobrand/Default.pm:870 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:101 +#: templates/web/default/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:95 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:95 +#: templates/web/fixmystreet/report/display.html:89 #, fuzzy msgid "This empty property has not been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#: perllib/FixMyStreet/Cobrand/Default.pm:879 #, fuzzy msgid "This empty property is in progress" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:918 +#: perllib/FixMyStreet/Cobrand/Default.pm:866 msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 #, fuzzy msgid "This report is currently marked as closed." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 #, fuzzy msgid "This report is currently marked as returned to use." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as open." msgstr "" -#: bin/send-reports:71 +#: bin/send-reports:72 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -2964,7 +3395,7 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2974,7 +3405,16 @@ msgstr "" msgid "Title" msgstr "" -#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:69 +#, fuzzy +msgid "" +"To <strong>report an empty property</strong>, click on the map at the " +"correct location." +msgstr "" +"Er mwyn rhoi gwybod am eiddo gwag\n" +" <strong>cliciwch ar y map</strong> wrth y lleoliad cywir." + +#: templates/web/emptyhomes/around/display_location.html:35 #, fuzzy msgid "" "To <strong>report an empty property</strong>, simply click on the map at the " @@ -2983,6 +3423,17 @@ msgstr "" "Er mwyn rhoi gwybod am eiddo gwag\n" " <strong>cliciwch ar y map</strong> wrth y lleoliad cywir." +#: templates/web/fixmystreet/alert/index.html:19 +#, fuzzy +msgid "" +"To find out what local alerts we have in your area, council or ward, please " +"enter your GB\n" +" postcode or street name and area" +msgstr "" +"I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu " +"ward chi,\n" +"cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" + #: templates/web/default/alert/index.html:21 msgid "" "To find out what local alerts we have in your area, council or ward, please " @@ -2993,7 +3444,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3004,17 +3455,21 @@ msgstr "Gweld map o union leoliad y broblem hon" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:45 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:163 +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +msgid "Unknown" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:164 #, fuzzy msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" @@ -3023,16 +3478,23 @@ msgstr "ID eiddo gwag anhysbys" msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" +#: templates/web/fixmystreet/report/display.html:70 +#, fuzzy +msgid "Update" +msgstr "Diweddariad:" + #: templates/web/default/admin/timeline.html:35 msgid "Update %s created for empty property %d; by %s" msgstr "" #: templates/web/default/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:22 #, fuzzy msgid "Update below added anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" #: templates/web/default/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:24 #, fuzzy msgid "Update below added by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" @@ -3064,24 +3526,25 @@ msgstr "" msgid "Update reopened empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:58 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/display.html:76 msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:647 -#: perllib/FixMyStreet/App/Controller/Admin.pm:764 -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:649 +#: perllib/FixMyStreet/App/Controller/Admin.pm:766 +#: perllib/FixMyStreet/App/Controller/Admin.pm:846 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" #: templates/web/default/admin/list_updates.html:1 -#: templates/web/default/report/updates.html:4 +#: templates/web/default/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:3 msgid "Updates" msgstr "Diweddariadau" @@ -3091,14 +3554,16 @@ msgstr "Diweddariadau am {{title}}" #: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:7 msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 msgid "User flagged" msgstr "" @@ -3106,8 +3571,8 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:304 -#: perllib/FixMyStreet/App/Controller/Admin.pm:334 +#: perllib/FixMyStreet/App/Controller/Admin.pm:306 +#: perllib/FixMyStreet/App/Controller/Admin.pm:336 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -3124,25 +3589,37 @@ msgstr "Gweld eich adroddiad" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:33 +#: templates/web/emptyhomes/around/display_location.html:0 +#: templates/web/emptyhomes/around/display_location.html:16 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Gweld lleoliad" #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 +#: templates/web/emptyhomes/report/display.html:2 +#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing an empty property" msgstr "Gweld eiddo gwag" -#: templates/web/default/reports/council.html:22 +#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:74 +#: templates/web/default/reports/council.html:86 +#: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:521 -#: perllib/FixMyStreet/Geocode/Bing.pm:47 +#: perllib/FixMyStreet/Cobrand/Default.pm:432 +#: perllib/FixMyStreet/Geocode/Bing.pm:48 #: perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "" #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:33 +#: templates/web/default/around/around_index.html:32 +#: templates/web/fixmystreet/alert/choose.html:6 +#: templates/web/fixmystreet/around/around_index.html:35 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." @@ -3152,6 +3629,7 @@ msgstr "" "lleoliad chi yno." #: templates/web/default/auth/token.html:19 +#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -3162,14 +3640,26 @@ msgid "" "property you reported." msgstr "" -#: bin/send-reports:195 +#: templates/web/fixmystreet/report/display.html:158 +#, fuzzy +msgid "We never show your email" +msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#, fuzzy +msgid "We never show your email address or phone number." +msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" + +#: bin/send-reports:196 msgid "" "We realise this empty property might be the responsibility of %s; however, " "we don't currently have any contact details for them. If you know of an " "appropriate contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:46 +#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 +#: templates/web/fixmystreet/index.html:56 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -3178,6 +3668,7 @@ msgstr "" "lleol er mwyn iddynt weithredu" #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3203,7 +3694,7 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "" @@ -3213,7 +3704,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -3224,13 +3715,28 @@ msgid "" "term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/default/questionnaire/index.html:104 +#: templates/web/fixmystreet/footer.html:23 +msgid "" +"Would you like better integration with reportemptyhomes.com? <a href=\"/for-" +"councils\">Find out about reportemptyhomes.com for councils</a>." +msgstr "" + +#: templates/web/fixmystreet/footer.html:19 +msgid "" +"Would you like to contribute to reportemptyhomes.com? Our code is open " +"source and <a href=\"http://github.com/mysociety/fixmystreet\">available on " +"GitHub</a>." +msgstr "" + +#: templates/web/default/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:96 msgid "" "Would you like to receive another questionnaire in 4 weeks, reminding you to " "check the status?" msgstr "" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -3240,24 +3746,33 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:27 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 -#: templates/web/default/questionnaire/index.html:107 -#: templates/web/default/questionnaire/index.html:68 +#: templates/web/default/questionnaire/index.html:105 +#: templates/web/default/questionnaire/index.html:66 +#: templates/web/fixmystreet/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "Ydw" +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#, fuzzy +msgid "Yes I have a password" +msgstr "Adrodd am eiddo gwag a gweld y rhain" + #: templates/web/default/contact/index.html:37 +#: templates/web/fixmystreet/contact/index.html:38 msgid "" "You are reporting the following empty property report for being abusive, " "containing personal information, or similar:" @@ -3266,12 +3781,13 @@ msgstr "" "sarhaus, neu'n cynnwys gwybodaeth bersonol, neu debyg:" #: templates/web/default/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:16 msgid "" "You are reporting the following update for being abusive, containing " "personal information, or similar:" msgstr "" -#: templates/web/default/reports/council.html:71 +#: templates/web/emptyhomes/reports/council.html:64 #, fuzzy msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" @@ -3280,7 +3796,7 @@ msgstr "" "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." -#: templates/web/default/reports/council.html:73 +#: templates/web/emptyhomes/reports/council.html:66 #, fuzzy msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." @@ -3289,6 +3805,10 @@ msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local empty " "properties for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3300,30 +3820,36 @@ msgid "" "<a href='%s'>get in touch</a>, or <a href='%s'>view your empty property</" "a>.\n" msgstr "" -"Rydych eisoes wedi ateb yr holiadur hwn. Os oes gennych gwestiwn, <a href='%" -"s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</a>.\n" +"Rydych eisoes wedi ateb yr holiadur hwn. Os oes gennych gwestiwn, <a " +"href='%s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</" +"a>.\n" -#: templates/web/default/questionnaire/index.html:94 +#: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/fixmystreet/questionnaire/index.html:87 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" -#: templates/web/default/report/display.html:112 +#: templates/web/default/report/display.html:111 +#: templates/web/fixmystreet/report/display.html:105 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." msgstr "" #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 #, fuzzy msgid "" -"You have located the empty property at the point marked with a purple pin on " +"You have located the empty property at the point marked with a green pin on " "the map. If this is not the correct location, simply click on the map again. " msgstr "" "Rydych wedi gosod lleoliad yr eiddo gwag wrth y pwynt sy'n cael ei ddangos " @@ -3357,7 +3883,7 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 #, fuzzy msgid "" @@ -3376,40 +3902,89 @@ msgid "You really want to resend?" msgstr "" #: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 -#: templates/web/default/my/my.html:3 +#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:14 +#: templates/web/fixmystreet/my/my.html:3 #, fuzzy msgid "Your Reports" msgstr "Adroddiadau" +#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/fixmystreet/alert/updates.html:19 +#: templates/web/fixmystreet/alert/updates.html:22 +#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/report/display.html:39 +#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#, fuzzy +msgid "Your email" +msgstr "Eich cyfeiriad e-bost:" + +#: templates/web/fixmystreet/auth/general.html:26 +#: templates/web/fixmystreet/report/display.html:129 +#, fuzzy +msgid "Your email address" +msgstr "Eich cyfeiriad e-bost:" + #: templates/web/default/auth/general.html:27 #, fuzzy msgid "Your email address:" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/alert/list.html:122 -#: templates/web/default/report/display.html:134 +#: templates/web/default/alert/list.html:120 +#: templates/web/default/report/display.html:133 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#, fuzzy +msgid "Your name" +msgstr "Eich enw:" + #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:210 +#: templates/web/default/report/display.html:207 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Eich enw:" +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/report/display.html:143 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#, fuzzy +msgid "Your password" +msgstr "Adroddiadau" + #: templates/web/default/auth/change_password.html:6 +#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "" -#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "Your phone number" +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +#, fuzzy +msgid "Your report" +msgstr "Adroddiadau" + +#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/fiksgatami/footer.html:6 +#: templates/web/fiksgatami/nn/footer.html:6 +#: templates/web/fixmystreet/footer.html:47 #: templates/web/reading/footer.html:7 #, fuzzy msgid "Your reports" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 #, fuzzy msgid "Your updates" msgstr "Adroddiadau" @@ -3424,6 +3999,8 @@ msgstr "" #: templates/web/default/reports/council.html:6 #: templates/web/default/reports/council.html:7 +#: templates/web/emptyhomes/reports/council.html:6 +#: templates/web/emptyhomes/reports/council.html:7 msgid "council" msgstr "cyngor" @@ -3431,6 +4008,11 @@ msgstr "cyngor" msgid "didn't use map" msgstr "" +#: templates/web/fixmystreet/alert/index.html:24 +#: templates/web/fixmystreet/index.html:41 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + #: templates/web/default/admin/index.html:15 msgid "from %d different users" msgstr "" @@ -3439,11 +4021,11 @@ msgstr "" msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:18 +#: templates/web/default/report/updates.html:24 msgid "marked as %s" msgstr "" -#: templates/web/default/report/updates.html:16 +#: templates/web/default/report/updates.html:22 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" @@ -3453,7 +4035,8 @@ msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:116 +#: templates/web/default/alert/list.html:114 +#: templates/web/fixmystreet/alert/_list.html:81 msgid "or" msgstr "neu" @@ -3465,22 +4048,29 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:23 msgid "reopened" msgstr "wedi'i ailagor" +#: templates/web/bromley/header.html:47 +#: templates/web/fixmystreet/header.html:47 +msgid "sign out" +msgstr "" + #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 #, fuzzy msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "the map was not used so pin location may be inaccurate" msgstr "" "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: bin/send-reports:176 +#: bin/send-reports:177 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -3504,6 +4094,8 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:3 +#: templates/web/emptyhomes/reports/council.html:0 +#: templates/web/emptyhomes/reports/council.html:3 msgid "ward" msgstr "" @@ -3540,14 +4132,14 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "your update will not be posted" msgstr "ni fydd eich diweddariad yn cael ei bostio" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "" @@ -3555,7 +4147,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -3576,7 +4168,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" -#: templates/web/default/report/new/councils_text_some.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -3587,6 +4179,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#, fuzzy +#~ msgid "<strong>Yes</strong>, I have a password" +#~ msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#, fuzzy +#~ msgid "<strong>Yes</strong>, I have a password:" +#~ msgstr "Adrodd am eiddo gwag a gweld y rhain" + +#~ msgid "" +#~ "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +#~ "height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org" +#~ "\"><span id=\"logoie\"></span></a>" +#~ msgstr "" +#~ "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +#~ "height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org" +#~ "\"><span id=\"logoie\"></span></a>" + +#~ msgid "Hide stale reports" +#~ msgstr "Cuddio hen adroddiadau " + +#~ msgid "Include stale reports" +#~ msgstr "Cynnwys hen adroddiadau" + +#~ msgid "Old returned to use" +#~ msgstr "Hen wedi'i adfer i'w ddefnyddio" + +#~ msgid "Old empty properties, state unknown" +#~ msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys" + #~ msgid "reportemptyhomes.com updates" #~ msgstr "Diweddariadau i reportemptyhomes.com" @@ -3707,9 +4328,6 @@ msgstr[1] "" #~ msgid "We could not validate that alert." #~ msgstr "Ni allem ddilysu'r hysbysiad hwnnw." -#~ msgid "Please give your name" -#~ msgstr "Rhowch eich enw" - #~ msgid "Please give a subject" #~ msgstr "Rhowch destun" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index ee61ebdae..8b55f62c6 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,17 +9,18 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-10-21 15:56+0100\n" +"POT-Creation-Date: 2012-03-28 19:23+0100\n" "PO-Revision-Date: 2011-08-29 10:26MET\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 msgid " and " msgstr " og " @@ -35,7 +36,14 @@ msgstr " og <strong>vi sender det nå til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:15 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:23 +#: templates/web/fixmystreet/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " @@ -97,24 +105,26 @@ msgstr "%d uker" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:14 +#: templates/web/emptyhomes/reports/council.html:11 +#: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:844 -#: perllib/FixMyStreet/Cobrand/Default.pm:858 +#: perllib/FixMyStreet/Cobrand/Default.pm:792 +#: perllib/FixMyStreet/Cobrand/Default.pm:806 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:466 +#: perllib/FixMyStreet/DB/Result/Problem.pm:480 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:468 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:875 -#: perllib/FixMyStreet/Cobrand/Default.pm:889 +#: perllib/FixMyStreet/Cobrand/Default.pm:823 +#: perllib/FixMyStreet/Cobrand/Default.pm:837 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -130,24 +140,31 @@ msgstr "(Ingen grunn til bekymring — %s)" msgid "(Email in abuse table)" msgstr "(Epost i misbrukstabellen)" -#: templates/web/default/alert/list.html:53 +#: templates/web/default/alert/list.html:51 +#: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(en standardavstand som dekker en befolkning på omtrent 200 000)" -#: templates/web/default/alert/list.html:58 +#: templates/web/default/alert/list.html:56 +#: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 +#: templates/web/default/reports/council.html:134 +#: templates/web/fixmystreet/around/around_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:9 msgid "(fixed)" msgstr "(løst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 +#: templates/web/fixmystreet/index.html:30 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" -#: templates/web/default/reports/council.html:133 +#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:152 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -156,7 +173,8 @@ msgid "(optional)" msgstr "(valgfritt)" # Denne teksten er lite forklarende -#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:130 +#: templates/web/default/reports/council.html:150 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -164,22 +182,22 @@ msgstr "(sendt til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" -#: templates/web/default/report/display.html:217 +#: templates/web/default/report/display.html:214 msgid "(we never show your email)" msgstr "(vi viser aldri din e-postadresse)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:281 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:337 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:343 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -189,15 +207,6 @@ msgstr "-- Velg en eiendomsstype --" msgid ". You can <a href=\"%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lese om problemet på portalen </a>." -#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 -msgid "" -"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" -"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" -"\"logoie\"></span></a>" -msgstr "" -"<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/\">Foreningen " -"NUUG</a></div>" - #: templates/web/default/questionnaire/completed.html:25 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -224,7 +233,7 @@ msgstr "" "av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." "pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" -#: templates/web/default/questionnaire/index.html:37 +#: templates/web/default/questionnaire/index.html:35 msgid "" "<p>Getting empty homes back into use can be difficult, but by now a good " "council\n" @@ -243,7 +252,7 @@ msgid "" "emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" -#: templates/web/default/questionnaire/index.html:28 +#: templates/web/default/questionnaire/index.html:26 msgid "" "<p>Getting empty homes back into use can be difficult. You shouldn’t " "expect\n" @@ -271,8 +280,10 @@ msgstr "" "hit til\n" "nettstedet og legg igjen en oppdatering.</p>" -#: templates/web/default/around/display_location.html:71 -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:72 +#: templates/web/emptyhomes/around/display_location.html:36 +#: templates/web/emptyhomes/around/display_location.html:38 msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " "step</a>.</small>" @@ -284,6 +295,21 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problemer" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" + +#: templates/web/fixmystreet/report/display.html:153 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" + +#: templates/web/fixmystreet/auth/general.html:46 +#, fuzzy +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" + #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" @@ -292,33 +318,39 @@ msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" -#: templates/web/default/report/display.html:170 +#: templates/web/default/report/display.html:169 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:148 +#: templates/web/default/report/display.html:147 #: templates/web/default/report/new/fill_in_details_form.html:140 -msgid "<strong>Yes</strong>, I have a password:" +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:34 +#: templates/web/fixmystreet/report/display.html:136 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#, fuzzy +msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har et passord:" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:31 +#: templates/web/emptyhomes/header.html:29 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/council_contacts.html:62 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 msgid "Added %s" msgstr "La til %s" #: templates/web/default/auth/change_password.html:29 +#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "Gjenta:" @@ -330,7 +362,8 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet ut (opprettet %s)" -#: templates/web/default/report/display.html:222 +#: templates/web/default/report/display.html:219 +#: templates/web/fixmystreet/report/display.html:193 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -338,21 +371,32 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" msgid "All" msgstr "Alle" +#: templates/web/default/reports/index.html:3 +#, fuzzy +msgid "All Reports" +msgstr "Alle rapporter" + #: templates/web/default/admin/council_list.html:44 msgid "All confirmed" msgstr "Alle bekreftet" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 -#: templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 +#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/fiksgatami/footer.html:7 +#: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmystreet/footer.html:49 +#: templates/web/reading/footer.html:8 msgid "All reports" msgstr "Alle rapporter" #: templates/web/default/report/new/councils_text_some.html:2 +#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil bli sendt til" #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_all.html:5 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -366,13 +410,17 @@ msgstr "" #: templates/web/default/report/new/councils_text_all.html:12 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:12 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" "All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 -#: templates/web/emptyhomes/report/new/all_councils_text.html:4 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:4 msgid "" "All the information you provide here will be sent to <strong>%s</strong>. On " "the site, we will show the subject and details of the problem, plus your " @@ -383,7 +431,8 @@ msgstr "" "ditt navn\n" "dersom du gir oss lov." -#: templates/web/default/questionnaire/index.html:62 +#: templates/web/default/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "En oppdatering markerte dette problemet som fikset." @@ -393,21 +442,26 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:14 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/default/footer.html:29 -msgid "Are you a developer? Would you like to contribute to FixMyStreet?" -msgstr "Er du en utvikler? Kunne du tenke deg å bidra til FiksGataMi?" - #: templates/web/default/footer.html:26 +#, fuzzy msgid "" -"Are you from a council? Would you like better integration with FixMyStreet?" +"Are you a <strong>developer</strong>? Would you like to contribute to " +"FixMyStreet?" +msgstr "Er du en utvikler? Kunne du tenke deg å bidra til FiksGataMi?" + +#: templates/web/fixmystreet/footer.html:18 +msgid "Are you a developer?" msgstr "" -"Er du fra det offentlige? Kunne du tenke deg bedre integrasjon med " -"FiksGataMi?" + +#: templates/web/fixmystreet/footer.html:22 +#, fuzzy +msgid "Are you from a council?" +msgstr "den lokale administrasjonen" #: templates/web/default/open311/index.html:17 msgid "" @@ -427,11 +481,8 @@ msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungere msgid "Ban email address" msgstr "Bannlys epostadresse" -#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" -msgstr "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a>" - #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>" @@ -443,10 +494,19 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/default/admin/council_contacts.html:26 +#: templates/web/fixmystreet/around/display_location.html:75 +#: templates/web/fixmystreet/around/display_location.html:77 +#, fuzzy +msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" +msgstr "" +"<small>Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over " +"dette steget</a>.</small>" + +#: templates/web/default/admin/council_contacts.html:31 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 msgid "Category" msgstr "Kategori" @@ -454,37 +514,48 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:567 -#: templates/web/default/admin/council_contacts.html:63 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 +#: templates/web/default/admin/council_contacts.html:68 #: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: bin/send-reports:180 +#: bin/send-reports:181 msgid "Category: %s" msgstr "Kategori: %s" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 +#: templates/web/fixmystreet/auth/change_password.html:1 +#: templates/web/fixmystreet/auth/change_password.html:3 +#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "Bytt passord" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/fixmystreet/around/display_location.html:72 +#, fuzzy +msgid "Click map to report a problem" +msgstr "Hvordan rapportere et problem" + +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:641 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/default/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 msgid "Closed reports" msgstr "Fiksede rapporter" @@ -492,8 +563,8 @@ msgstr "Fiksede rapporter" msgid "Closed:" msgstr "Lukket:" -#: templates/web/default/around/display_location.html:102 -#: templates/web/default/around/display_location.html:104 +#: templates/web/default/around/display_location.html:101 +#: templates/web/default/around/display_location.html:103 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" @@ -517,27 +588,28 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:361 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" -#: templates/web/default/admin/council_contacts.html:119 +#: templates/web/default/admin/council_contacts.html:124 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:101 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:38 msgid "Confirm" msgstr "Bekreft" #: templates/web/default/auth/token.html:1 +#: templates/web/fixmystreet/auth/token.html:1 msgid "Confirm account" msgstr "Bekreft konto" @@ -551,8 +623,8 @@ msgstr "Bekreft konto" msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/default/admin/council_contacts.html:28 -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -565,26 +637,30 @@ msgid "Confirmed:" msgstr "Bekreftet:" #: templates/web/fiksgatami/footer.html:10 +#: templates/web/fiksgatami/nn/footer.html:10 msgid "Contact" msgstr "Kontakt" -#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 +#: templates/web/default/footer.html:24 msgid "Contact FixMyStreet" msgstr "Kontakt FiksGataMi" #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakt oss" #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 +#: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -595,7 +671,7 @@ msgstr "Kunne ikke finne bruker" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -623,7 +699,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/default/admin/council_contacts.html:87 +#: templates/web/default/admin/council_contacts.html:92 msgid "Create category" msgstr "Lag kategori" @@ -646,13 +722,18 @@ msgstr "Gjeldende tilstand" msgid "Currently has 1+ deleted" msgstr "For tiden har 1+ slettet" -#: templates/web/default/admin/council_contacts.html:29 -#: templates/web/default/admin/council_contacts.html:76 +#: templates/web/default/admin/council_contacts.html:34 +#: templates/web/default/admin/council_contacts.html:81 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "Slettet" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#, fuzzy +msgid "Details" +msgstr "Detaljer:" + #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 msgid "Details:" @@ -663,10 +744,14 @@ msgid "Diligency prize league table" msgstr "Arbeidshester" #: templates/web/default/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:29 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 msgid "Do you have a FixMyStreet password?" msgstr "Har du et FiksGataMi-passord?" -#: templates/web/default/questionnaire/index.html:72 +#: templates/web/default/questionnaire/index.html:70 +#: templates/web/fixmystreet/questionnaire/index.html:64 msgid "Don’t know" msgstr "Vet ikke" @@ -692,7 +777,7 @@ msgstr "Redigerer bruker %d" msgid "Editor" msgstr "Oppdatert av" -#: templates/web/default/admin/council_contacts.html:27 +#: templates/web/default/admin/council_contacts.html:32 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -700,18 +785,20 @@ msgstr "Oppdatert av" #: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 +#: templates/web/fixmystreet/auth/general.html:20 +#: templates/web/fixmystreet/report/display.html:125 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: templates/web/default/around/display_location.html:84 +#: templates/web/default/around/display_location.html:83 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problemer" @@ -719,7 +806,7 @@ msgstr "Send meg e-post om lokale problemer" msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:73 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -729,15 +816,15 @@ msgstr "Send meg oppdateringer" msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -745,11 +832,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." @@ -768,6 +855,12 @@ msgstr "Sluttmåned:" #: templates/web/default/around/around_index.html:10 #: templates/web/default/around/around_index.html:13 #: templates/web/default/index.html:24 templates/web/default/index.html:27 +#: templates/web/emptyhomes/index.html:40 +#: templates/web/emptyhomes/index.html:43 +#: templates/web/fixmystreet/around/around_index.html:10 +#: templates/web/fixmystreet/around/around_index.html:13 +#: templates/web/fixmystreet/index.html:32 +#: templates/web/fixmystreet/index.html:35 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted" @@ -776,12 +869,20 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:177 +#: templates/web/default/report/display.html:176 #: templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "Skriv inn et nytt passord:" -#: templates/web/default/index.html:45 +#: templates/web/fixmystreet/auth/general.html:57 +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#, fuzzy +msgid "Enter a password" +msgstr "Skriv inn et nytt passord:" + +#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 +#: templates/web/fixmystreet/index.html:55 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -792,10 +893,11 @@ msgstr "Legg inn detaljer om problemet" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 +#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:9 +#: templates/web/default/admin/council_contacts.html:11 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" @@ -812,20 +914,21 @@ msgstr "" "Klarte ikke å sende melding. Vennligst prøv igjen senere eller <a href=" "\"mailto:%s\">send oss en e-post</a>." -#: templates/web/default/footer.html:27 -msgid "Find out about FixMyStreet for councils" -msgstr "Finn ut om FiksGataMi for det offentlige" - -#: templates/web/default/questionnaire/index.html:81 +#: templates/web/default/questionnaire/index.html:79 +#: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" msgstr "Første gang" -#: templates/web/default/header.html:29 #: templates/web/fiksgatami/header.html:16 -#: templates/web/reading/header.html:31 +#: templates/web/fiksgatami/nn/header.html:16 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Fiks<span id=\"my\">Gata</span>Mi" +#: templates/web/default/header.html:24 +#, fuzzy +msgid "FixMyStreet" +msgstr "FiksGataMi-administrator:" + #: templates/web/default/admin/header.html:13 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" @@ -834,7 +937,13 @@ msgstr "FiksGataMi-administrator:" msgid "FixMyStreet administration" msgstr "Fiksgatami-administrasjon" +#: templates/web/fixmystreet/static/for_councils.html:1 +#, fuzzy +msgid "FixMyStreet for Councils" +msgstr "Finn ut om FiksGataMi for det offentlige" + #: templates/web/default/alert/index.html:6 +#: templates/web/fixmystreet/alert/index.html:6 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " "including\n" @@ -847,7 +956,8 @@ msgstr "" "eller et område med problemer\n" "innen en angitt distanse fra en bestemt posisjon." -#: templates/web/default/alert/list.html:100 +#: templates/web/default/alert/list.html:98 +#: templates/web/fixmystreet/alert/_list.html:69 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular " @@ -864,25 +974,28 @@ msgstr "" "administrasjoner, problemer som gjelder flere administrasjoner blir sendt " "til alle de det gjelder." +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Fixed" msgstr "Løst" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Fixed - User" msgstr "Løst - Bruker" -#: templates/web/default/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 msgid "Fixed reports" msgstr "Fiksede rapporter" @@ -903,7 +1016,9 @@ msgstr "Flagget:" msgid "Flagged:" msgstr "Flagget:" -#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:24 +#: templates/web/default/reports/council.html:87 +#: templates/web/emptyhomes/reports/council.html:19 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." @@ -915,6 +1030,8 @@ msgstr "For administrasjon(ene):" #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 +#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmystreet/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" @@ -926,13 +1043,27 @@ msgstr "Mer informasjon om vårt arbeid med tomme hjem" msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" -#: templates/web/default/alert/list.html:112 +#: templates/web/fixmystreet/report/display.html:28 +#, fuzzy +msgid "Get updates" +msgstr "Siste oppdatering:" + +#: templates/web/default/reports/council.html:72 +#, fuzzy +msgid "Get updates of problems in this %s" +msgstr "RSS-strøm for problemer i denne %s" + +#: templates/web/default/alert/list.html:110 +#: templates/web/fixmystreet/alert/_list.html:78 msgid "Give me an RSS feed" msgstr "Gi meg en RSS-strøm" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:33 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:49 +#: templates/web/fixmystreet/alert/index.html:25 +#: templates/web/fixmystreet/around/around_index.html:20 +#: templates/web/fixmystreet/index.html:42 msgid "Go" msgstr "Fortsett" @@ -944,17 +1075,19 @@ msgstr "Skal det sendes spørreskjema?" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" -#: templates/web/default/reports/index.html:5 +#: templates/web/default/reports/index.html:8 #: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "" "Linjer med grå bakgrunn er administrasjoner som ikke lenger eksisterer." -#: templates/web/default/questionnaire/index.html:63 +#: templates/web/default/questionnaire/index.html:61 +#: templates/web/fixmystreet/questionnaire/index.html:55 msgid "Has this problem been fixed?" msgstr "Har dette problemet blitt løst?" -#: templates/web/default/questionnaire/index.html:76 +#: templates/web/default/questionnaire/index.html:74 +#: templates/web/fixmystreet/questionnaire/index.html:68 msgid "" "Have you ever reported a problem to a council before, or is this your first " "time?" @@ -962,40 +1095,52 @@ msgstr "" "Har du rapportert et problem til en administrasjon før, eller er dette " "første gangen?" -#: templates/web/default/footer.html:10 -#: templates/web/emptyhomes/header.html:30 -#: templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 +#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/emptyhomes/header.html:28 +#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmystreet/footer.html:53 +#: templates/web/reading/footer.html:10 msgid "Help" msgstr "Hjelp" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/list.html:37 +#: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" "Her er de forskjellige typene lokale problemvarsler for ‘%s’." -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/bromley/header.html:46 +#: templates/web/fixmystreet/header.html:46 +msgid "Hi %s" +msgstr "" + +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 msgid "Hidden" msgstr "Skjul" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 +#: templates/web/fixmystreet/around/display_location.html:58 +msgid "Hide old" +msgstr "" + +#: templates/web/default/around/display_location.html:53 +#: templates/web/fixmystreet/around/display_location.html:54 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/around/display_location.html:59 -msgid "Hide stale reports" -msgstr "Skjul utdaterte rapporter" - #: templates/web/default/admin/council_edit.html:38 msgid "History" msgstr "Historie" -#: templates/web/default/index.html:40 +#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 +#: templates/web/fixmystreet/index.html:50 msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:587 +#: perllib/FixMyStreet/App/Controller/Admin.pm:592 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1027,6 +1172,8 @@ msgstr "ID" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:10 +#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -1035,7 +1182,7 @@ msgstr "" "være offentlig, men problemet vil <strong>ikke</strong> bli rapportert til " "administrasjonen." -#: templates/web/emptyhomes/report/new/no_councils_text.html:9 +#: templates/web/emptyhomes/report/new/councils_text_none.html:9 msgid "" "If you submit a report here it will be left on the site, but not reported to " "the council – please still leave your report, so that we can show to " @@ -1048,6 +1195,7 @@ msgstr "" #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 +#: templates/web/fixmystreet/auth/token.html:23 msgid "" "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 " @@ -1056,7 +1204,8 @@ msgstr "" "Hvis du bruker web-basert e-post eller har filtre for søppel-e-post på din e-" "postkonto, kan du i noen tilfellet måtte se etter våre meldinger der." -#: templates/web/default/questionnaire/index.html:85 +#: templates/web/default/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:77 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council). For example, what was\n" @@ -1071,14 +1220,16 @@ msgstr "" msgid "Illegal ID" msgstr "Ugyldig ID" -#: perllib/FixMyStreet/App/Controller/Alert.pm:102 +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "In Progress" msgstr "Under arbeid" @@ -1094,9 +1245,10 @@ msgstr "" "del av description), interface_used, comment_count, requestor_name (kun " "tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: templates/web/default/around/display_location.html:61 -msgid "Include stale reports" -msgstr "Inkluder utdaterte problemer" +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +#, fuzzy +msgid "In progress" +msgstr "Under arbeid" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" @@ -1110,7 +1262,7 @@ msgstr "Feil has_photo-verdi \"%s\"" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:897 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1118,14 +1270,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:887 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Invalid start date" msgstr "Ugyldig startdato" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 msgid "Investigating" msgstr "Undersøkes" @@ -1143,12 +1297,15 @@ msgid "" msgstr "" #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:157 +#: templates/web/default/report/display.html:156 #: templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" -#: templates/web/default/admin/council_contacts.html:30 +#: templates/web/default/admin/council_contacts.html:35 msgid "Last editor" msgstr "Sist redigert av" @@ -1160,15 +1317,16 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:985 msgid "List Flagged" msgstr "List flagget" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 msgid "List all reported problems" msgstr "List alle rapporterte problemer" #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." msgstr "Laster..." @@ -1181,6 +1339,15 @@ msgstr "Laster..." #: templates/web/default/alert/updates.html:1 #: templates/web/default/tokens/confirm_alert.html:1 #: templates/web/default/tokens/confirm_alert.html:3 +#: templates/web/emptyhomes/alert/index.html:1 +#: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmystreet/alert/choose.html:1 +#: templates/web/fixmystreet/alert/choose.html:3 +#: templates/web/fixmystreet/alert/index.html:1 +#: templates/web/fixmystreet/alert/index.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:5 +#: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-strøm og e-postvarsel" @@ -1188,15 +1355,23 @@ msgstr "Lokal RSS-strøm og e-postvarsel" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:12 +#: templates/web/fixmystreet/alert/list.html:14 +#: templates/web/fixmystreet/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 -#: templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 +#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/fiksgatami/footer.html:8 +#: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmystreet/footer.html:51 +#: templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/default/index.html:44 +#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:54 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1210,6 +1385,11 @@ msgstr "" "\">OpenStreetMap</a> og bidragsytere, <a href=\"http://creativecommons.org/" "licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/fixmystreet/contact/index.html:86 +#, fuzzy +msgid "Message" +msgstr "Melding:" + #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "Melding:" @@ -1231,9 +1411,14 @@ msgstr "Flere problemer i nærheten" #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 #: templates/web/default/admin/search_users.html:12 -#: templates/web/default/reports/index.html:10 +#: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 +#: templates/web/fixmystreet/auth/general.html:52 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "Name" msgstr "Navn" @@ -1243,7 +1428,8 @@ msgstr "Navn" msgid "Name:" msgstr "Navn:" -#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/nn/footer.html:3 #: templates/web/reading/footer.html:4 msgid "Navigation" msgstr "Navigasjon" @@ -1256,16 +1442,16 @@ msgstr "" "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/Default.pm:564 +#: perllib/FixMyStreet/Cobrand/Default.pm:480 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -"Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s (%" -"sm unna)" +"Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s " +"(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:553 -#: perllib/FixMyStreet/Cobrand/Default.pm:588 +#: perllib/FixMyStreet/Cobrand/Default.pm:469 +#: perllib/FixMyStreet/Cobrand/Default.pm:520 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1273,11 +1459,26 @@ msgstr "" "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av " "Bing Maps): %s" +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +#, fuzzy +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing " +"Maps): %s\n" +"\n" +msgstr "" +"Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av " +"Bing Maps): %s" + #: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: templates/web/default/reports/index.html:16 +#, fuzzy +msgid "New <br>problems" +msgstr "Nye problemer" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1289,10 +1490,8 @@ msgstr "Nye lokale problemer på FiksGataMi" msgid "New local reports on reportemptyhomes.com" msgstr "Nye lokale rapporter på reportemptyhomes.com" -#: templates/web/default/reports/council.html:92 -#: templates/web/default/reports/council.html:93 -#: templates/web/default/reports/index.html:11 #: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" msgstr "Nye problemer" @@ -1343,24 +1542,27 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/default/front/news.html:8 #: templates/web/fiksgatami/front/news.html:9 +#: templates/web/fiksgatami/nn/front/news.html:9 +#: templates/web/fixmystreet/front/news.html:8 msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 -#: templates/web/default/questionnaire/index.html:109 -#: templates/web/default/questionnaire/index.html:70 +#: templates/web/default/questionnaire/index.html:107 +#: templates/web/default/questionnaire/index.html:68 +#: templates/web/fixmystreet/questionnaire/index.html:101 +#: templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "Nei" @@ -1369,7 +1571,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:297 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1390,10 +1592,12 @@ msgid "No info at all" msgstr "Helt uten informasjon" #: templates/web/default/around/around_map_list_items.html:15 +#: templates/web/fixmystreet/around/around_map_list_items.html:24 msgid "No problems found." msgstr "Ingen problemer ble funnet." #: templates/web/default/around/on_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:21 msgid "No problems have been reported yet." msgstr "Ingen problemer er rapportert" @@ -1407,10 +1611,12 @@ msgid "Not reported before" msgstr "Ikke rapportert tidligere" #: templates/web/default/report/_main.html:9 +#: templates/web/emptyhomes/report/display.html:24 +#: templates/web/fixmystreet/report/_main.html:11 msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:31 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "Merk" @@ -1425,7 +1631,7 @@ msgstr "" "opprettet, hvilket ikke trenger være den samme måneden som rapporten var " "bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "Merk:" @@ -1434,31 +1640,37 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#, fuzzy +msgid "Now to submit your report…" +msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" + #: templates/web/default/report/new/fill_in_details_form.html:131 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" -#: templates/web/default/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:132 +#, fuzzy +msgid "Now to submit your update…" +msgstr "" +"På tide å registrere din oppdatering… har du et FiksGataMi-passord?" + +#: templates/web/default/report/display.html:138 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" "På tide å registrere din oppdatering… har du et FiksGataMi-passord?" #: templates/web/default/report/display.html:26 -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Støtende? Upassende? Gi oss beskjed" -#: templates/web/default/reports/council.html:115 -#: templates/web/default/reports/council.html:116 -msgid "Old fixed" -msgstr "Eldre problemer som er løst" - -#: templates/web/default/reports/council.html:109 -#: templates/web/default/reports/council.html:110 -msgid "Old problems, state unknown" -msgstr "Eldre problemer med ukjent status" +#: templates/web/default/reports/index.html:18 +#, fuzzy +msgid "Old / unknown <br>problems" +msgstr "Ukjent problem-Id" -#: templates/web/default/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:12 #: templates/web/fiksgatami/reports/index.html:12 msgid "Old problems,<br>state unknown" msgstr "Eldre problemer med<br>ukjent status" @@ -1467,29 +1679,36 @@ msgstr "Eldre problemer med<br>ukjent status" msgid "Old state" msgstr "Gammel tilstand" -#: templates/web/default/reports/index.html:15 +#: templates/web/default/reports/index.html:20 +#, fuzzy +msgid "Older <br>fixed" +msgstr "Eldre løste" + +#: templates/web/default/reports/index.html:17 +#, fuzzy +msgid "Older <br>problems" +msgstr "Eldre problemer" + #: templates/web/emptyhomes/reports/index.html:14 +#: templates/web/fiksgatami/nn/reports/index.html:14 #: templates/web/fiksgatami/reports/index.html:14 msgid "Older fixed" msgstr "Eldre løste" -#: templates/web/default/reports/council.html:101 -#: templates/web/default/reports/council.html:105 -#: templates/web/default/reports/council.html:106 -#: templates/web/default/reports/council.html:99 -#: templates/web/default/reports/index.html:12 #: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Eldre problemer" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:79 msgid "Open" msgstr "Åpen" -#: templates/web/default/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 msgid "Open reports" msgstr "Åpne rapporter" @@ -1505,11 +1724,13 @@ msgstr "Open311-initiativets nettside" msgid "Open311 specification" msgstr "Open311-spesifikasjon" -#: templates/web/default/alert/list.html:87 +#: templates/web/default/alert/list.html:85 +#: templates/web/fixmystreet/alert/_list.html:56 msgid "Or problems reported to:" msgstr "Eller problemer meldt til:" -#: templates/web/default/alert/list.html:63 +#: templates/web/default/alert/list.html:61 +#: templates/web/fixmystreet/alert/_list.html:33 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" @@ -1517,18 +1738,18 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: bin/send-reports:175 bin/send-reports:184 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:553 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:969 -#: perllib/FixMyStreet/DB/Result/Problem.pm:475 -#: perllib/FixMyStreet/DB/Result/Problem.pm:485 -#: perllib/FixMyStreet/DB/Result/Problem.pm:495 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: bin/send-reports:176 bin/send-reports:185 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 +#: perllib/FixMyStreet/DB/Result/Problem.pm:489 +#: perllib/FixMyStreet/DB/Result/Problem.pm:499 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 msgid "Other" msgstr "Annet" -#: templates/web/default/footer.html:30 +#: templates/web/default/footer.html:27 msgid "" "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet" "\">available on GitHub</a>." @@ -1545,63 +1766,101 @@ msgstr "Eier" msgid "Page Not Found" msgstr "Fant ikke siden" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Partial" msgstr "Delvis" +#: templates/web/fixmystreet/auth/general.html:55 +#: templates/web/fixmystreet/report/display.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#, fuzzy +msgid "Password (optional)" +msgstr "(valgfritt)" + #: templates/web/default/auth/change_password.html:25 +#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "Passord:" -#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Phone number (optional)" +msgstr "(valgfritt)" + +#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Telefon:" -#: templates/web/default/questionnaire/index.html:97 -#: templates/web/default/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#, fuzzy +msgid "Photo" +msgstr "Bilde:" + +#: templates/web/default/questionnaire/index.html:95 +#: templates/web/default/report/display.html:114 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Bilde:" -#: templates/web/default/alert/list.html:29 +#: templates/web/default/alert/list.html:27 +#: templates/web/fixmystreet/alert/list.html:27 msgid "Photos of recent nearby reports" msgstr "Bilder av nye problemer i nærheten" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 msgid "Planned" msgstr "Planlagt" +#: templates/web/fixmystreet/questionnaire/index.html:44 +#, fuzzy +msgid "" +"Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates " +"that have been left." +msgstr "Vennligst se over oppdateringene som har blitt lagt inn." + #: templates/web/default/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Vær høflig, poengtert og kortfattet." #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:17 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" #: templates/web/default/auth/token.html:17 +#: templates/web/fixmystreet/auth/token.html:17 msgid "Please check your email" msgstr "Vennligst sjekk e-posten du oppgav" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/fixmystreet/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 -#: perllib/FixMyStreet/DB/Result/Problem.pm:316 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -1619,6 +1878,7 @@ msgstr "" "vennligst <a href=\"/\">gå til forsiden</a> og følg instruksjonene." #: templates/web/default/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." @@ -1627,29 +1887,36 @@ msgstr "" "tjenesten for alle brukerne." #: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:15 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:15 msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:291 +#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" #: perllib/FixMyStreet/DB/Result/User.pm:96 +#: templates/web/default/js/validation_strings.html:12 +#: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" -#: perllib/FixMyStreet/App/Controller/Alert.pm:345 +#: perllib/FixMyStreet/App/Controller/Alert.pm:342 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:294 +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" @@ -1657,21 +1924,33 @@ msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/DB/Result/User.pm:93 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 +#: templates/web/default/js/validation_strings.html:11 +#: templates/web/default/js/validation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:14 +#: templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#, fuzzy +msgid "Please enter your email address" +msgstr "Legg inn din e-post" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:7 +#, fuzzy msgid "" -"Please enter your full name, councils need this information - if you do not " -"wish your name to be shown on the site, untick the box" +"Please enter your full name, councils need this information – if you do not " +"wish your name to be shown on the site, untick the box below" msgstr "" "Legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger " "dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:302 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: perllib/FixMyStreet/DB/Result/User.pm:89 +#: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -1690,6 +1969,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" @@ -1710,7 +1991,13 @@ msgstr "" "det har\n" "vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#, fuzzy +msgid "Please fill in details of the problem." +msgstr "Vennligst fyll ut detaljer om problemet under" + #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -1718,11 +2005,12 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv plasseringen så nøyaktig som mulig i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" -#: templates/web/default/report/display.html:62 +#: templates/web/default/report/display.html:61 +#: templates/web/fixmystreet/report/display.html:59 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -1734,6 +2022,7 @@ msgstr "" "\">personvernpolicy</a>" #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -1742,44 +2031,45 @@ msgstr "" "legg til mer informasjon under før du sender inn." #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" "Vennligst bidra med en forklaring for hvorfor du gjenåpner denne " "problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tilegg til et bilde" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported a problem to your council before" msgstr "" "Vennligst opplys om du har rapportert et problem til din administrasjon " "tidligere" -#: perllib/FixMyStreet/App/Controller/Alert.pm:82 +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" msgstr "Velg den kilden du ønsker" -#: perllib/FixMyStreet/App/Controller/Alert.pm:120 +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" -#: templates/web/default/questionnaire/index.html:52 +#: templates/web/default/questionnaire/index.html:50 msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" @@ -1787,26 +2077,35 @@ msgstr "Vennligst last opp kun JPEG-bilder" msgid "Please write a message" msgstr "Skriv inn en melding" +#: templates/web/fixmystreet/report/display.html:74 +#, fuzzy +msgid "Please write your update here" +msgstr "Skriv inn en melding" + #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:125 -#: templates/web/default/report/display.html:162 -#: templates/web/default/report/display.html:184 +#: templates/web/default/report/display.html:124 +#: templates/web/default/report/display.html:161 +#: templates/web/default/report/display.html:183 +#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/display.html:166 msgid "Post" msgstr "Send inn" -#: templates/web/default/report/updates.html:8 +#: templates/web/default/report/updates.html:14 msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/default/report/updates.html:11 +#: templates/web/default/report/updates.html:17 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:19 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: templates/web/default/maps/openlayers.html:89 +#: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -1826,7 +2125,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:774 +#: perllib/FixMyStreet/App/Controller/Admin.pm:776 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -1838,35 +2137,48 @@ msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/default/around/display_location.html:80 +#: templates/web/default/around/display_location.html:79 msgid "Problems in this area" msgstr "Problemer i dette området" +#: templates/web/fixmystreet/around/display_location.html:93 +#: templates/web/fixmystreet/report/display.html:29 +#, fuzzy +msgid "Problems nearby" +msgstr "Flere problemer i nærheten" + +#: templates/web/fixmystreet/around/display_location.html:92 +#, fuzzy +msgid "Problems on the map" +msgstr "Problemer i dette området" + #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problemer nylig rapportert fikset på FiksGataMi" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/list.html:50 +#: templates/web/fixmystreet/alert/_list.html:21 msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/Default.pm:748 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:809 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:16 +#: templates/web/default/reports/council.html:17 msgid "Problems within %s, FixMyStreet" msgstr "Problemer innenfor %s, Fiksgatami" -#: templates/web/default/alert/list.html:69 +#: templates/web/default/alert/list.html:67 +#: templates/web/fixmystreet/alert/_list.html:38 msgid "Problems within the boundary of:" msgstr "Problemer innenfor grensene av:" @@ -1875,16 +2187,24 @@ msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 msgid "Property type:" msgstr "Type egenskap:" -#: templates/web/default/report/display.html:57 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#, fuzzy +msgid "Provide a title" +msgstr "Bidra med en oppdatering" + +#: templates/web/default/report/display.html:56 +#: templates/web/fixmystreet/report/display.html:55 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/default/report/display.html:181 +#: templates/web/default/report/display.html:180 #: templates/web/default/report/new/fill_in_details_form.html:173 +#: templates/web/fixmystreet/report/display.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -1898,6 +2218,10 @@ msgstr "" #: templates/web/default/questionnaire/index.html:0 #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:32 msgid "Questionnaire" msgstr "Spørreskjema" @@ -1913,26 +2237,36 @@ msgstr "Spørreskjema %d sendt for problem %d" msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" -#: templates/web/default/alert/list.html:54 +#: templates/web/fixmystreet/static/for_councils_faq.html:1 +#, fuzzy +msgid "Questions and Answers :: FixMyStreet for Councils" +msgstr "Finn ut om FiksGataMi for det offentlige" + +#: templates/web/default/alert/list.html:52 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:48 -#: templates/web/default/reports/council.html:61 +#: templates/web/default/report/display.html:47 +#: templates/web/default/reports/council.html:79 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:3 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:845 -#: perllib/FixMyStreet/Cobrand/Default.pm:859 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 +#: perllib/FixMyStreet/Cobrand/Default.pm:807 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:868 -#: perllib/FixMyStreet/Cobrand/Default.pm:882 +#: perllib/FixMyStreet/Cobrand/Default.pm:816 +#: perllib/FixMyStreet/Cobrand/Default.pm:830 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 @@ -1940,62 +2274,75 @@ msgstr "RSS-strøm for %s bydel, %s" msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:874 -#: perllib/FixMyStreet/Cobrand/Default.pm:888 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" -#: templates/web/default/alert/list.html:54 +#: templates/web/default/alert/list.html:52 +#: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: templates/web/default/reports/council.html:61 +#: templates/web/default/reports/council.html:79 msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:801 +#: perllib/FixMyStreet/Cobrand/Default.pm:749 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" -#: templates/web/default/report/display.html:48 +#: templates/web/default/report/display.html:47 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:38 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:37 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nylige lokale problemer, FiksGataMi." -#: templates/web/default/reports/council.html:87 -#: templates/web/default/reports/council.html:88 -#: templates/web/default/reports/index.html:14 +#: templates/web/default/reports/index.html:19 +#, fuzzy +msgid "Recently <br>fixed" +msgstr "Nylig løste problemer" + #: templates/web/emptyhomes/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:13 #: templates/web/fiksgatami/reports/index.html:13 msgid "Recently fixed" msgstr "Nylig løste problemer" -#: templates/web/default/index.html:62 +#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 msgid "Recently reported problems" msgstr "Nylig meldte problemer" #: templates/web/default/report/new/notes.html:9 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "Remember that FixMyStreet is primarily for reporting physical problems that " "can be fixed. If your problem is not appropriate for submission via this " @@ -2011,7 +2358,7 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" @@ -2020,63 +2367,80 @@ msgstr "Fjern bilde (kan ikke gjøres om!)" msgid "Report Empty Homes" msgstr "Rapporter tomme hjem" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 -#: templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 +#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 +#: templates/web/emptyhomes/header.html:27 +#: templates/web/fiksgatami/footer.html:5 +#: templates/web/fiksgatami/nn/footer.html:5 +#: templates/web/fixmystreet/footer.html:45 +#: templates/web/reading/footer.html:6 msgid "Report a problem" msgstr "Rapporter et problem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:274 +#: templates/web/fixmystreet/report/display.html:27 +#, fuzzy +msgid "Report abuse" +msgstr "Rapporter et problem" + +#: templates/web/emptyhomes/index.html:37 +#, fuzzy +msgid "Report empty properties" +msgstr "Rapporter tomme hjem" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:281 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:15 +#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: templates/web/default/my/my.html:74 +#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 msgid "Reported %s" msgstr "Rapportert %s" -#: templates/web/default/my/my.html:72 +#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 #: templates/web/default/contact/index.html:45 +#: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" #: templates/web/default/admin/questionnaire.html:5 -#: templates/web/default/questionnaire/index.html:79 +#: templates/web/default/questionnaire/index.html:77 +#: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:513 +#: perllib/FixMyStreet/DB/Result/Problem.pm:527 #: templates/web/default/contact/index.html:47 +#: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:478 +#: perllib/FixMyStreet/DB/Result/Problem.pm:492 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:486 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2084,10 +2448,14 @@ msgstr "Rapportert i kategorien %s av %s %s" #: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details.html:0 +#: templates/web/fixmystreet/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "Legger til et problem" -#: templates/web/default/around/display_location.html:94 +#: templates/web/default/around/display_location.html:93 msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" @@ -2111,7 +2479,7 @@ msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -2119,13 +2487,13 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbrukstabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukere" @@ -2136,7 +2504,8 @@ msgstr "Søk i brukere" msgid "Search:" msgstr "Søk:" -#: templates/web/default/alert/list.html:41 +#: templates/web/default/alert/list.html:39 +#: templates/web/fixmystreet/alert/_list.html:10 msgid "" "Select which type of alert you'd like and click the button for an RSS feed, " "or enter your email address to subscribe to an email alert." @@ -2144,7 +2513,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2177,17 +2546,31 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:216 +#: templates/web/default/report/display.html:213 #: templates/web/default/report/new/fill_in_details_form.html:210 +#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/default/around/display_location.html:52 +#: templates/web/default/around/display_location.html:60 +#: templates/web/fixmystreet/around/display_location.html:60 +msgid "Show old" +msgstr "" + +#: templates/web/default/around/display_location.html:51 +#: templates/web/fixmystreet/around/display_location.html:52 msgid "Show pins" msgstr "Vis nåler" +#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:3 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/header.html:50 msgid "Sign in" msgstr "Logg inn" @@ -2196,31 +2579,37 @@ msgid "Sign in by email" msgstr "Logg inn via epost" #: templates/web/default/auth/general.html:1 +#: templates/web/fixmystreet/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" #: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:35 -#: templates/web/emptyhomes/header.html:43 +#: templates/web/default/header.html:30 +#: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 +#: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:37 +#: templates/web/reading/header.html:33 msgid "Sign out" msgstr "Logg ut" -#: templates/web/default/header.html:34 -#: templates/web/emptyhomes/header.html:42 +#: templates/web/default/header.html:29 +#: templates/web/emptyhomes/header.html:40 #: templates/web/fiksgatami/header.html:21 +#: templates/web/fiksgatami/nn/header.html:21 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:36 +#: templates/web/reading/header.html:32 msgid "Signed in as %s" msgstr "Logget inn som %s" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Noen kategorier krever kanskje mer informasjon" -#: templates/web/default/alert/index.html:31 +#: templates/web/default/alert/index.html:30 +#: templates/web/fixmystreet/alert/index.html:33 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -2233,7 +2622,7 @@ msgstr "Noe tekst å oversette" msgid "Some unconfirmeds" msgstr "Noen ubekreftede" -#: perllib/FixMyStreet/Cobrand/Default.pm:517 +#: perllib/FixMyStreet/Cobrand/Default.pm:428 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2246,17 +2635,19 @@ msgstr "" "Beklager, men det oppsto et problem når vi forsøkte å bekrefte " "problemrapporten din" -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 #: perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: perllib/FixMyStreet/Geocode/Bing.pm:45 +#: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "Source code" msgstr "Kildekode" @@ -2275,20 +2666,32 @@ msgstr "Startmåned:" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 +#: templates/web/fixmystreet/report/display.html:77 msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:83 +#: templates/web/default/report/display.html:82 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:986 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" +#: templates/web/default/report/updates.html:9 +#, fuzzy +msgid "Still open, via questionnaire, %s" +msgstr "Skal det sendes spørreskjema?" + +#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#, fuzzy +msgid "Subject" +msgstr "Emne:" + #: templates/web/default/admin/report_edit.html:13 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 @@ -2299,40 +2702,48 @@ msgstr "Emne:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:55 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" msgstr "Send inn endringer" -#: templates/web/default/questionnaire/index.html:114 +#: templates/web/default/questionnaire/index.html:112 +#: templates/web/fixmystreet/questionnaire/index.html:105 msgid "Submit questionnaire" msgstr "Send inn spørreskjema" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:43 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:42 msgid "Subscribe" msgstr "Abonner" -#: templates/web/default/alert/list.html:128 +#: templates/web/default/alert/list.html:126 +#: templates/web/fixmystreet/alert/_list.html:88 msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:976 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" #: templates/web/default/reports/index.html:1 #: templates/web/emptyhomes/reports/index.html:1 +#: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" @@ -2341,7 +2752,7 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:12 +#: templates/web/default/admin/council_contacts.html:14 msgid "Text only version" msgstr "Tekst-versjon" @@ -2397,7 +2808,8 @@ msgstr "" "Takk for at du bruker ReportEmptyHomes.com. Ditt bidrag bidrar allerede for " "å løse UKs tomme hjem-krise." -#: templates/web/default/around/around_index.html:44 +#: templates/web/default/around/around_index.html:43 +#: templates/web/fixmystreet/around/around_index.html:46 msgid "" "Thanks for uploading your photo. We now need to locate your problem, so " "please enter a nearby street name or postcode in the box below :" @@ -2418,12 +2830,13 @@ msgstr "" "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du " "har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." #: templates/web/default/alert/index.html:12 +#: templates/web/fixmystreet/alert/index.html:12 msgid "" "That location does not appear to be covered by a council, perhaps it is " "offshore - please try somewhere more specific." @@ -2436,12 +2849,12 @@ msgstr "" msgid "That location does not appear to be in Britain; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." -#: perllib/FixMyStreet/Cobrand/Default.pm:510 +#: perllib/FixMyStreet/Cobrand/Default.pm:421 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:558 +#: perllib/FixMyStreet/App/Controller/Admin.pm:560 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -2449,7 +2862,8 @@ msgstr "Det problemet vil nå bli sendt på nytt." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: templates/web/default/around/around_index.html:27 +#: templates/web/default/around/around_index.html:26 +#: templates/web/fixmystreet/around/around_index.html:29 msgid "" "That spot does not appear to be covered by a council. If you have tried to " "report an issue past the shoreline, for example, please specify the closest " @@ -2491,6 +2905,7 @@ msgstr "" #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 +#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -2498,15 +2913,39 @@ msgstr "" "Bekreftelsese-posten <strong>kan</strong> bruke noen minutter før den kommer " "frem — så vær tålmodig." -#: templates/web/default/questionnaire/index.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +#, fuzzy +msgid "" +"The council won’t be able to help unless you leave as much\n" +"detail as you can. Please describe the exact location of the problem (e.g. " +"on a\n" +"wall), what it is, how long it has been there, a description (and a photo " +"of\n" +"the problem if you have one), etc." +msgstr "" +"Vennligst fyll inn detaljene om problemet under. Administrasjonen vil ikke " +"være i stand\n" +"til å hjelpe med mindre du legger inn så mange detaljer som du kan. Beskriv\n" +"eksakt plassering for problemet (f.eks. på en vegg), hva det er, hvor lenge " +"det har\n" +"vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." + +#: templates/web/fixmystreet/questionnaire/index.html:43 +#, fuzzy +msgid "The details of your problem are available from the other tab above." +msgstr "" +"Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." + +#: templates/web/default/questionnaire/index.html:49 msgid "" "The details of your problem are available on the right hand side of this " "page." msgstr "" "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." -#: perllib/FixMyStreet/App/Controller/Reports.pm:46 -#: perllib/FixMyStreet/App/Controller/Reports.pm:73 +#: perllib/FixMyStreet/App/Controller/Reports.pm:44 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -2583,6 +3022,8 @@ msgstr "De siste rapporter innenfor grensen til {{NAME}} rapportert av brukere" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:16 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "Passordene er ikke like" @@ -2591,14 +3032,15 @@ msgstr "Passordene er ikke like" msgid "The requested URL '%s' was not found on this server" msgstr "Den forespurte URL '%s' ble ikke funnet på denne tjeneren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1179 -#: perllib/FixMyStreet/App/Controller/Admin.pm:538 -#: perllib/FixMyStreet/App/Controller/Admin.pm:701 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:540 +#: perllib/FixMyStreet/App/Controller/Admin.pm:703 msgid "The requested URL was not found on this server." msgstr "Den forespurte URL-en ble ikke funnet på denne tjeneren" -#: templates/web/default/alert/list.html:47 +#: templates/web/default/alert/list.html:45 +#: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Den enkleste meldingen er vår geografiske:" @@ -2606,6 +3048,10 @@ msgstr "Den enkleste meldingen er vår geografiske:" #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 +#: templates/web/fixmystreet/report/new/councils_text_all.html:18 +#: templates/web/fixmystreet/report/new/councils_text_some.html:10 +#: templates/web/fixmystreet/report/new/councils_text_some.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -2613,7 +3059,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: bin/send-reports:78 +#: bin/send-reports:79 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -2621,45 +3067,44 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:70 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen " "senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 #: templates/web/default/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:24 +#, fuzzy msgid "" -"There was a problem with your email/password combination. Passwords and user " -"accounts are a brand <strong>new</strong> service, so you probably do not " -"have one yet – please fill in the right hand side of this form to get " -"one." +"There was a problem with your email/password combination. If you cannot " +"remember your password, or do not have one, please fill in the ‘sign " +"in by email’ section of the form." msgstr "" "Det var problemer med din epost/passord-kombinasjon. Passord og " "brukerkontoer er en helt <strong>ny</strong> tjeneste, så du har antagelig " "ikke en konto ennå. – vær så snill å fyll inn høyresiden av dette " "skjemaet for å skaffe deg en." -#: perllib/FixMyStreet/App/Controller/Alert.pm:354 +#: perllib/FixMyStreet/App/Controller/Alert.pm:351 msgid "" "There was a problem with your email/password combination. Please try again." msgstr "" "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøk " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 msgid "There was a problem with your update. Please try again." -msgstr "" -"Det var problemer med din oppdatering. Vær så snill å forsøk " -"igjen." +msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen." #: perllib/FixMyStreet/App/Controller/Contact.pm:117 msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:242 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -2671,7 +3116,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " "endre seg uten advarsel i fremtiden." -#: bin/send-reports:185 +#: bin/send-reports:186 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -2684,7 +3129,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: bin/send-reports:188 +#: bin/send-reports:189 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -2695,7 +3140,7 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:761 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -2707,16 +3152,17 @@ msgstr "" "Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil " "bli periodisk slettet." -#: templates/web/default/reports/council.html:65 +#: templates/web/emptyhomes/reports/council.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dette er en oppsummering av alle rapporter for en %s." -#: templates/web/default/reports/council.html:67 +#: templates/web/emptyhomes/reports/council.html:60 msgid "This is a summary of all reports for this %s." msgstr "Dette er en oppsummering for alle rapporter for denne %s." -#: templates/web/default/reports/index.html:4 +#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +#: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "" "This is a summary of all reports on this site; select a particular council " @@ -2725,47 +3171,49 @@ msgstr "" "Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt " "administrasjon for å se problemer som er sendt dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 msgid "This problem has been closed" msgstr "Dette problemet er lukket" -#: perllib/FixMyStreet/Cobrand/Default.pm:922 +#: perllib/FixMyStreet/Cobrand/Default.pm:870 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:101 +#: templates/web/default/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:95 msgid "This problem has been fixed" msgstr "Dette problemet er løst" -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:95 +#: templates/web/fixmystreet/report/display.html:89 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" -#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#: perllib/FixMyStreet/Cobrand/Default.pm:879 msgid "This problem is in progress" msgstr "Dette problemet er under arbeid" -#: perllib/FixMyStreet/Cobrand/Default.pm:918 +#: perllib/FixMyStreet/Cobrand/Default.pm:866 msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: bin/send-reports:71 +#: bin/send-reports:72 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -2775,13 +3223,29 @@ msgstr "Tidslinje" msgid "Title" msgstr "Tittel" -#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:69 +#, fuzzy +msgid "" +"To <strong>report a problem</strong>, click on the map at the correct " +"location." +msgstr "" +"For å <strong>rapportere et problem</strong>, klikk på kartet på riktig sted." + +#: templates/web/emptyhomes/around/display_location.html:35 msgid "" "To <strong>report a problem</strong>, simply click on the map at the correct " "location." msgstr "" "For å <strong>rapportere et problem</strong>, klikk på kartet på riktig sted." +#: templates/web/fixmystreet/alert/index.html:19 +#, fuzzy +msgid "" +"To find out what local alerts we have for you, please enter your GB\n" +" postcode or street name and area" +msgstr "" +"Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted:" + #: templates/web/default/alert/index.html:21 msgid "" "To find out what local alerts we have for you, please enter your GB\n" @@ -2789,7 +3253,7 @@ msgid "" msgstr "" "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted:" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -2800,17 +3264,22 @@ msgstr "For å se en kart med en mer presis plassering for dette problemet." msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:45 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "Ubekreftet" -#: perllib/FixMyStreet/App/Controller/Rss.pm:163 +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +#, fuzzy +msgid "Unknown" +msgstr "*ukjent*" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:164 msgid "Unknown alert type" msgstr "Ukjent varsel-type" @@ -2818,15 +3287,22 @@ msgstr "Ukjent varsel-type" msgid "Unknown problem ID" msgstr "Ukjent problem-Id" +#: templates/web/fixmystreet/report/display.html:70 +#, fuzzy +msgid "Update" +msgstr "Oppdatering:" + #: templates/web/default/admin/timeline.html:35 msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s opprettet for problem %d, av %s" #: templates/web/default/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:22 msgid "Update below added anonymously at %s" msgstr "Oppdateringen under lagt inn anonymt %s" #: templates/web/default/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:24 msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" @@ -2850,22 +3326,23 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:58 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/display.html:76 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:647 -#: perllib/FixMyStreet/App/Controller/Admin.pm:764 -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:649 +#: perllib/FixMyStreet/App/Controller/Admin.pm:766 +#: perllib/FixMyStreet/App/Controller/Admin.pm:846 msgid "Updated!" msgstr "Oppdatert!" #: templates/web/default/admin/list_updates.html:1 -#: templates/web/default/report/updates.html:4 +#: templates/web/default/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:3 msgid "Updates" msgstr "Oppdateringer" @@ -2875,14 +3352,16 @@ msgstr "Oppdateringer av {{title}}" #: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:7 msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 msgid "User flagged" msgstr "Bruker flagget" @@ -2890,8 +3369,8 @@ msgstr "Bruker flagget" msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:304 -#: perllib/FixMyStreet/App/Controller/Admin.pm:334 +#: perllib/FixMyStreet/App/Controller/Admin.pm:306 +#: perllib/FixMyStreet/App/Controller/Admin.pm:336 msgid "Values updated" msgstr "Verdier oppdatert" @@ -2906,25 +3385,37 @@ msgstr "Vis din rapport" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:33 +#: templates/web/emptyhomes/around/display_location.html:0 +#: templates/web/emptyhomes/around/display_location.html:16 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på et sted" #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 +#: templates/web/emptyhomes/report/display.html:2 +#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på et problem" -#: templates/web/default/reports/council.html:22 +#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:74 +#: templates/web/default/reports/council.html:86 +#: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "Bydeler innenfor denne administrasjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:521 -#: perllib/FixMyStreet/Geocode/Bing.pm:47 +#: perllib/FixMyStreet/Cobrand/Default.pm:432 +#: perllib/FixMyStreet/Geocode/Bing.pm:48 #: perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "Vi dekker desverre ikke Nord-Irland." #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:33 +#: templates/web/default/around/around_index.html:32 +#: templates/web/fixmystreet/alert/choose.html:6 +#: templates/web/fixmystreet/around/around_index.html:35 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." @@ -2933,6 +3424,7 @@ msgstr "" "forsøk et annet søk hvis din plass ikke er her." #: templates/web/default/auth/token.html:19 +#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg en epost som inneholder link for å bekrefte din konto." @@ -2946,7 +3438,18 @@ msgstr "" "Det kan hende vi periodisk tar kontakt med deg for å spørre om noe har " "endret seg med eiedommen du rapporterte." -#: bin/send-reports:195 +#: templates/web/fixmystreet/report/display.html:158 +#, fuzzy +msgid "We never show your email" +msgstr "(vi viser aldri din e-postadresse)" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#, fuzzy +msgid "We never show your email address or phone number." +msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" + +#: bin/send-reports:196 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -2956,11 +3459,13 @@ msgstr "" "tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:46 +#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 +#: templates/web/fixmystreet/index.html:56 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -2987,7 +3492,7 @@ msgstr "" "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare " "fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "Når redigert" @@ -2997,7 +3502,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -3012,7 +3517,23 @@ msgstr "" "enkelt adminstrasjon. Søktetermen er administrasjons-IDen som oppgitt av <a " "href=\"%s\">MaPit</a>." -#: templates/web/default/questionnaire/index.html:104 +#: templates/web/fixmystreet/footer.html:23 +msgid "" +"Would you like better integration with FixMyStreet? <a href=\"/for-councils" +"\">Find out about FixMyStreet for councils</a>." +msgstr "" + +#: templates/web/fixmystreet/footer.html:19 +#, fuzzy +msgid "" +"Would you like to contribute to FixMyStreet? Our code is open source and <a " +"href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "" +"Vår kildekode er fri programvare og <a href=\"http://github.com/mysociety/" +"fixmystreet\">tilgjengelig på GitHub</a>." + +#: templates/web/default/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:96 msgid "" "Would you like to receive another questionnaire in 4 weeks, reminding you to " "check the status?" @@ -3021,6 +3542,7 @@ msgstr "" "sjekke status?" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." @@ -3032,24 +3554,33 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:27 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 -#: templates/web/default/questionnaire/index.html:107 -#: templates/web/default/questionnaire/index.html:68 +#: templates/web/default/questionnaire/index.html:105 +#: templates/web/default/questionnaire/index.html:66 +#: templates/web/fixmystreet/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#, fuzzy +msgid "Yes I have a password" +msgstr "<strong>Ja</strong>, jeg har et passord:" + #: templates/web/default/contact/index.html:37 +#: templates/web/fixmystreet/contact/index.html:38 msgid "" "You are reporting the following problem report for being abusive, containing " "personal information, or similar:" @@ -3058,6 +3589,7 @@ msgstr "" "informasjon eller lignende:" #: templates/web/default/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:16 msgid "" "You are reporting the following update for being abusive, containing " "personal information, or similar:" @@ -3065,7 +3597,7 @@ msgstr "" "Du rapporterer at følgende oppdatering er støtende, inneholder personlig " "informasjon, eller lignende:" -#: templates/web/default/reports/council.html:71 +#: templates/web/emptyhomes/reports/council.html:64 msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" "reports\">show all councils</a>." @@ -3073,7 +3605,7 @@ msgstr "" "Du kan <a href=\"%s\">se alle rapporter for administrasjonen</a> eller <a " "href=\"/reports\">se alle administrasjonene</a>." -#: templates/web/default/reports/council.html:73 +#: templates/web/emptyhomes/reports/council.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." @@ -3081,6 +3613,10 @@ msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local problems for %s " "and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3097,8 +3633,10 @@ msgstr "" "vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se på ditt " "problem</a>.\n" -#: templates/web/default/questionnaire/index.html:94 +#: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/fixmystreet/questionnaire/index.html:87 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3106,7 +3644,8 @@ msgstr "" "Du har allerede lagt ved et bilde til dette problemet. Å legge ved et annet " "vil bytte ut dette." -#: templates/web/default/report/display.html:112 +#: templates/web/default/report/display.html:111 +#: templates/web/fixmystreet/report/display.html:105 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3115,12 +3654,15 @@ msgstr "" "annet vil bytte ut dette." #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allerede logget ut" #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#, fuzzy msgid "" -"You have located the problem at the point marked with a purple pin on the " +"You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " msgstr "" "Du har plassert problemet ved punktet i kartet som er markert med en lilla " @@ -3153,7 +3695,7 @@ msgstr "Du har lykkes med å opprette ditt varsel." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3175,37 +3717,86 @@ msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" #: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 -#: templates/web/default/my/my.html:3 +#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:14 +#: templates/web/fixmystreet/my/my.html:3 msgid "Your Reports" msgstr "Dine rapporter" +#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/fixmystreet/alert/updates.html:19 +#: templates/web/fixmystreet/alert/updates.html:22 +#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/report/display.html:39 +#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#, fuzzy +msgid "Your email" +msgstr "Din e-post" + +#: templates/web/fixmystreet/auth/general.html:26 +#: templates/web/fixmystreet/report/display.html:129 +#, fuzzy +msgid "Your email address" +msgstr "Din e-postadresse:" + #: templates/web/default/auth/general.html:27 msgid "Your email address:" msgstr "Din e-postadresse:" -#: templates/web/default/alert/list.html:122 -#: templates/web/default/report/display.html:134 +#: templates/web/default/alert/list.html:120 +#: templates/web/default/report/display.html:133 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Din e-post" +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#, fuzzy +msgid "Your name" +msgstr "Ditt navn:" + #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:210 +#: templates/web/default/report/display.html:207 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Ditt navn:" +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/report/display.html:143 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#, fuzzy +msgid "Your password" +msgstr "Dine rapporter" + #: templates/web/default/auth/change_password.html:6 +#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "Ditt passord har blitt endret" -#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "Your phone number" +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +#, fuzzy +msgid "Your report" +msgstr "Dine oppdateringer" + +#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/fiksgatami/footer.html:6 +#: templates/web/fiksgatami/nn/footer.html:6 +#: templates/web/fixmystreet/footer.html:47 #: templates/web/reading/footer.html:7 msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/default/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3219,6 +3810,8 @@ msgstr "av %s" #: templates/web/default/reports/council.html:6 #: templates/web/default/reports/council.html:7 +#: templates/web/emptyhomes/reports/council.html:6 +#: templates/web/emptyhomes/reports/council.html:7 msgid "council" msgstr "administrasjon" @@ -3226,6 +3819,11 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikke kart" +#: templates/web/fixmystreet/alert/index.html:24 +#: templates/web/fixmystreet/index.html:41 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + #: templates/web/default/admin/index.html:15 msgid "from %d different users" msgstr "fra %d forskjellige brukere" @@ -3234,11 +3832,11 @@ msgstr "fra %d forskjellige brukere" msgid "less than a minute" msgstr "mindre enn et minutt" -#: templates/web/default/report/updates.html:18 +#: templates/web/default/report/updates.html:24 msgid "marked as %s" msgstr "markert som %s" -#: templates/web/default/report/updates.html:16 +#: templates/web/default/report/updates.html:22 msgid "marked as fixed" msgstr "markert som fikset" @@ -3248,7 +3846,8 @@ msgstr "markert som fikset" msgid "n/a" msgstr "n/a" -#: templates/web/default/alert/list.html:116 +#: templates/web/default/alert/list.html:114 +#: templates/web/fixmystreet/alert/_list.html:81 msgid "or" msgstr "eller" @@ -3260,20 +3859,28 @@ msgstr "søkte etter" msgid "other areas:" msgstr "andre områder:" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:23 msgid "reopened" msgstr "åpnet på nytt" +#: templates/web/bromley/header.html:47 +#: templates/web/fixmystreet/header.html:47 +#, fuzzy +msgid "sign out" +msgstr "Logg ut" + #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "the map was not used so pin location may be inaccurate" msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" -#: bin/send-reports:176 +#: bin/send-reports:177 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -3295,6 +3902,8 @@ msgstr "bruker er eier av problemet" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:3 +#: templates/web/emptyhomes/reports/council.html:0 +#: templates/web/emptyhomes/reports/council.html:3 msgid "ward" msgstr "bydel" @@ -3328,14 +3937,14 @@ msgstr "vil ditt problem ikke bli publisert" msgid "your update will not be posted" msgstr "din oppdatering vil ikke bli publisert" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapportert<br>nylig" msgstr[1] "<big>%s</big> rapportert<br>nylig" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "" @@ -3345,7 +3954,7 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -3366,7 +3975,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapport-<br>oppdatering" msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" -#: templates/web/default/report/new/councils_text_some.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -3381,6 +3990,43 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." +#, fuzzy +#~ msgid "<strong>Yes</strong>, I have a password" +#~ msgstr "<strong>Ja</strong>, jeg har et passord:" + +#~ msgid "<strong>Yes</strong>, I have a password:" +#~ msgstr "<strong>Ja</strong>, jeg har et passord:" + +#~ msgid "" +#~ "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +#~ "height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org" +#~ "\"><span id=\"logoie\"></span></a>" +#~ msgstr "" +#~ "<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/" +#~ "\">Foreningen NUUG</a></div>" + +#~ msgid "" +#~ "Are you from a council? Would you like better integration with " +#~ "FixMyStreet?" +#~ msgstr "" +#~ "Er du fra det offentlige? Kunne du tenke deg bedre integrasjon med " +#~ "FiksGataMi?" + +#~ msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" +#~ msgstr "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a>" + +#~ msgid "Hide stale reports" +#~ msgstr "Skjul utdaterte rapporter" + +#~ msgid "Include stale reports" +#~ msgstr "Inkluder utdaterte problemer" + +#~ msgid "Old fixed" +#~ msgstr "Eldre problemer som er løst" + +#~ msgid "Old problems, state unknown" +#~ msgstr "Eldre problemer med ukjent status" + #~ msgid "FixMyStreet updates" #~ msgstr "Fiksgatami-oppdateringer" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index b4ec194a8..c05ddfaa6 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,16 +11,17 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-10-21 15:56+0100\n" +"POT-Creation-Date: 2012-03-28 19:23+0100\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" -"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" +"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 msgid " and " msgstr " og " @@ -36,7 +37,14 @@ msgstr " og <strong>vi sender det no til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:15 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:23 +#: templates/web/fixmystreet/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " @@ -96,26 +104,28 @@ msgstr "%d veke" msgid "%d weeks" msgstr "%d veker" -#: templates/web/default/reports/council.html +#: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:14 +#: templates/web/emptyhomes/reports/council.html:11 +#: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/Cobrand/Default.pm:844 -#: perllib/FixMyStreet/Cobrand/Default.pm:858 +#: perllib/FixMyStreet/Cobrand/Default.pm:792 +#: perllib/FixMyStreet/Cobrand/Default.pm:806 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:466 +#: perllib/FixMyStreet/DB/Result/Problem.pm:480 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:468 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:875 -#: perllib/FixMyStreet/Cobrand/Default.pm:889 +#: perllib/FixMyStreet/Cobrand/Default.pm:823 +#: perllib/FixMyStreet/Cobrand/Default.pm:837 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -131,24 +141,31 @@ msgstr "(Ingen grunn til å uroa seg — %s)" msgid "(Email in abuse table)" msgstr "(Epost i misbruktabellen)" -#: templates/web/default/alert/list.html:53 +#: templates/web/default/alert/list.html:51 +#: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)" -#: templates/web/default/alert/list.html:58 +#: templates/web/default/alert/list.html:56 +#: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 +#: templates/web/default/reports/council.html:134 +#: templates/web/fixmystreet/around/around_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:9 msgid "(fixed)" msgstr "(løyst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 +#: templates/web/fixmystreet/index.html:30 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" -#: templates/web/default/reports/council.html:133 +#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:152 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" @@ -156,7 +173,8 @@ msgstr "(ikkje rapportert til administrasjonen)" msgid "(optional)" msgstr "(valfritt)" -#: templates/web/default/reports/council.html:131 +#: templates/web/default/reports/council.html:130 +#: templates/web/default/reports/council.html:150 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -164,22 +182,22 @@ msgstr "(sendt til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: templates/web/default/report/display.html:217 +#: templates/web/default/report/display.html:214 msgid "(we never show your email)" msgstr "(vi viser aldri e-postadressa di)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:281 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:337 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:343 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -188,18 +206,13 @@ msgstr "-- Vel ein eigedomstype --" msgid ". You can <a href=\"%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lesa om problemet på portalen</a>." -#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 -msgid "" -"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " -"height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span " -"id=\"logoie\"></span></a>" -msgstr "<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/\">Foreininga NUUG</a></div>" - #: templates/web/default/questionnaire/completed.html:25 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " "questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Tusen takk for at du fylte ut spørjeskjemaet vårt. Vi er glade for å høyra at problemet ditt er løyst.</p>" +msgstr "" +"<p style=\"font-size:150%\">Tusen takk for at du fylte ut spørjeskjemaet " +"vårt. Vi er glade for å høyra at problemet ditt er løyst.</p>" #: templates/web/default/questionnaire/completed.html:15 msgid "" @@ -212,11 +225,14 @@ msgid "" "pledge</a>?\n" "</p>" msgstr "" -"<p style=\"font-size:150%%\">Det var trist å høyra dette. Vi har to forslag: kva med å freista\n" -"<a href=\"%s\">å skriva direkte til representantane dine</a>, eller viss det er eit problem som kan fiksast\n" -"av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www.pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" +"<p style=\"font-size:150%%\">Det var trist å høyra dette. Vi har to forslag: " +"kva med å freista\n" +"<a href=\"%s\">å skriva direkte til representantane dine</a>, eller viss det " +"er eit problem som kan fiksast\n" +"av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." +"pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" -#: templates/web/default/questionnaire/index.html:37 +#: templates/web/default/questionnaire/index.html:35 msgid "" "<p>Getting empty homes back into use can be difficult, but by now a good " "council\n" @@ -235,7 +251,7 @@ msgid "" "emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" -#: templates/web/default/questionnaire/index.html:28 +#: templates/web/default/questionnaire/index.html:26 msgid "" "<p>Getting empty homes back into use can be difficult. You shouldn’t " "expect\n" @@ -262,17 +278,36 @@ msgstr "" "informasjon om status for problemet ditt, ver så snill og kom tilbake\n" "til nettstaden og legg igjen ei oppdatering.</p>" -#: templates/web/default/around/display_location.html:71 -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:72 +#: templates/web/emptyhomes/around/display_location.html:36 +#: templates/web/emptyhomes/around/display_location.html:38 msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " "step</a>.</small>" -msgstr "<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>.</small>" +msgstr "" +"<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over " +"dette steget</a>.</small>" #: templates/web/default/admin/index.html:14 msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problem" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" + +#: templates/web/fixmystreet/report/display.html:153 +#, fuzzy +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" + +#: templates/web/fixmystreet/auth/general.html:46 +#, fuzzy +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" + #: templates/web/default/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" @@ -281,33 +316,39 @@ msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#: templates/web/default/report/display.html:170 +#: templates/web/default/report/display.html:169 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:148 +#: templates/web/default/report/display.html:147 #: templates/web/default/report/new/fill_in_details_form.html:140 -msgid "<strong>Yes</strong>, I have a password:" +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:34 +#: templates/web/fixmystreet/report/display.html:136 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#, fuzzy +msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:31 +#: templates/web/emptyhomes/header.html:29 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:57 +#: templates/web/default/admin/council_contacts.html:62 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 msgid "Added %s" msgstr "La til %s" #: templates/web/default/auth/change_password.html:29 +#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "Gjenta:" @@ -319,7 +360,8 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" -#: templates/web/default/report/display.html:222 +#: templates/web/default/report/display.html:219 +#: templates/web/fixmystreet/report/display.html:193 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -327,22 +369,33 @@ msgstr "Send meg varsel ved framtidige oppdateringar" msgid "All" msgstr "Alle" +#: templates/web/default/reports/index.html:3 +#, fuzzy +msgid "All Reports" +msgstr "Alle rapportar" + #: templates/web/default/admin/council_list.html:44 msgid "All confirmed" msgstr "Alle stadfesta" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 -#: templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 +#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/fiksgatami/footer.html:7 +#: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmystreet/footer.html:49 +#: templates/web/reading/footer.html:8 msgid "All reports" msgstr "Alle rapportar" #: templates/web/default/report/new/councils_text_some.html:2 +#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil sendast til" # TfL? skal ikkje det omsetjast? --KBU #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 +#: templates/web/fixmystreet/report/new/councils_text_all.html:3 +#: templates/web/fixmystreet/report/new/councils_text_all.html:5 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -356,13 +409,17 @@ msgstr "" #: templates/web/default/report/new/councils_text_all.html:12 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 +#: templates/web/fixmystreet/report/new/councils_text_all.html:10 +#: templates/web/fixmystreet/report/new/councils_text_all.html:12 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." -#: templates/web/emptyhomes/report/new/all_councils_text.html:2 -#: templates/web/emptyhomes/report/new/all_councils_text.html:4 +#: templates/web/emptyhomes/report/new/councils_text_all.html:2 +#: templates/web/emptyhomes/report/new/councils_text_all.html:4 msgid "" "All the information you provide here will be sent to <strong>%s</strong>. On " "the site, we will show the subject and details of the problem, plus your " @@ -372,7 +429,8 @@ msgstr "" "På dette nettestedet vil vi visa emne og detaljar om problemet,\n" "inkludert namnet ditt dersom du gjev oss lov." -#: templates/web/default/questionnaire/index.html:62 +#: templates/web/default/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:54 msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." @@ -382,26 +440,36 @@ msgstr "Ei oppdatering markerte dette problemet som løyst." msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:14 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/default/footer.html:29 -msgid "Are you a developer? Would you like to contribute to FixMyStreet?" -msgstr "Er du ein utviklar? Kunne du tenkja deg å bidra til FiksGataMi?" - #: templates/web/default/footer.html:26 +#, fuzzy msgid "" -"Are you from a council? Would you like better integration with FixMyStreet?" -msgstr "Er du frå det offentlege? Kunne du tenkja deg betre integrasjon med FiksGataMi?" +"Are you a <strong>developer</strong>? Would you like to contribute to " +"FixMyStreet?" +msgstr "Er du ein utviklar? Kunne du tenkja deg å bidra til FiksGataMi?" + +#: templates/web/fixmystreet/footer.html:18 +msgid "Are you a developer?" +msgstr "" + +#: templates/web/fixmystreet/footer.html:22 +#, fuzzy +msgid "Are you from a council?" +msgstr "den lokale administrasjonen" #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " "ordered by requested_datetime, so to get all requests, do several searches " "with rolling start_date and end_date." -msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei returnerte førespurnadene vert sorterte på requested_datetime, så ein må gjera fleire søk med rullerande start_date og end_date for å få tak i alle førespurnadene." +msgstr "" +"På det meste vert %d førespurnader returnert i kvar spørring. Dei returnerte " +"førespurnadene vert sorterte på requested_datetime, så ein må gjera fleire " +"søk med rullerande start_date og end_date for å få tak i alle førespurnadene." #: templates/web/default/open311/index.html:9 msgid "At the moment only searching for and looking at reports work." @@ -411,24 +479,32 @@ msgstr "For augneblunken går det berre an å søkja etter og å sjå på rappor msgid "Ban email address" msgstr "Bannlys e-postadresse" -#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" -msgstr "Bygd av <a href=\"http://www.mysociety.org/\">mySociety</a>" - #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>" -msgstr "Bygd av <a href=\"http://www.mysociety.org/\">mySociety</a> og vedlikeheldt av <a href=\"http://www.nuug.no/\">NUUG</a>" +msgstr "" +"Bygd av <a href=\"http://www.mysociety.org/\">mySociety</a> og vedlikeheldt " +"av <a href=\"http://www.nuug.no/\">NUUG</a>" #: templates/web/default/admin/stats.html:80 msgid "By Date" msgstr "På dato" -#: templates/web/default/admin/council_contacts.html:26 +#: templates/web/fixmystreet/around/display_location.html:75 +#: templates/web/fixmystreet/around/display_location.html:77 +#, fuzzy +msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" +msgstr "" +"<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over " +"dette steget</a>.</small>" + +#: templates/web/default/admin/council_contacts.html:31 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 msgid "Category" msgstr "Kategori" @@ -436,38 +512,49 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:567 -#: templates/web/default/admin/council_contacts.html:63 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 +#: templates/web/default/admin/council_contacts.html:68 #: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:29 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: bin/send-reports:180 +#: bin/send-reports:181 msgid "Category: %s" msgstr "Kategori: %s" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 +#: templates/web/fixmystreet/auth/change_password.html:1 +#: templates/web/fixmystreet/auth/change_password.html:3 +#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "Byt passord" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/fixmystreet/around/display_location.html:72 +#, fuzzy +msgid "Click map to report a problem" +msgstr "Korleis rapportera eit problem" + +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:641 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/default/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 msgid "Closed reports" msgstr "Lukka rapportar" @@ -475,8 +562,8 @@ msgstr "Lukka rapportar" msgid "Closed:" msgstr "Lukka:" -#: templates/web/default/around/display_location.html:102 -#: templates/web/default/around/display_location.html:104 +#: templates/web/default/around/display_location.html:101 +#: templates/web/default/around/display_location.html:103 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" @@ -500,27 +587,28 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:351 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:361 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" -#: templates/web/default/admin/council_contacts.html:119 +#: templates/web/default/admin/council_contacts.html:124 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:101 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:38 msgid "Confirm" msgstr "Stadfest" #: templates/web/default/auth/token.html:1 +#: templates/web/fixmystreet/auth/token.html:1 msgid "Confirm account" msgstr "Stadfest konto" @@ -534,8 +622,8 @@ msgstr "Stadfest konto" msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/default/admin/council_contacts.html:28 -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -548,26 +636,30 @@ msgid "Confirmed:" msgstr "Stadfesta:" #: templates/web/fiksgatami/footer.html:10 +#: templates/web/fiksgatami/nn/footer.html:10 msgid "Contact" msgstr "Kontakt" -#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 +#: templates/web/default/footer.html:24 msgid "Contact FixMyStreet" msgstr "Kontakt FiksGataMi" #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakt oss" #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 +#: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -578,7 +670,7 @@ msgstr "Kunne ikkje finna brukaren" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontaktar" @@ -606,7 +698,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/default/admin/council_contacts.html:87 +#: templates/web/default/admin/council_contacts.html:92 msgid "Create category" msgstr "Lag kategori" @@ -629,13 +721,18 @@ msgstr "Gjeldande tilstand" msgid "Currently has 1+ deleted" msgstr "For tida har 1+ sletta" -#: templates/web/default/admin/council_contacts.html:29 -#: templates/web/default/admin/council_contacts.html:76 +#: templates/web/default/admin/council_contacts.html:34 +#: templates/web/default/admin/council_contacts.html:81 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "Sletta" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#, fuzzy +msgid "Details" +msgstr "Detaljar:" + #: templates/web/default/admin/report_edit.html:14 #: templates/web/default/report/new/fill_in_details_form.html:61 msgid "Details:" @@ -646,10 +743,14 @@ msgid "Diligency prize league table" msgstr "Arbeidshestar" #: templates/web/default/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:29 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 msgid "Do you have a FixMyStreet password?" msgstr "Har du eit FiksGataMi-passord?" -#: templates/web/default/questionnaire/index.html:72 +#: templates/web/default/questionnaire/index.html:70 +#: templates/web/fixmystreet/questionnaire/index.html:64 msgid "Don’t know" msgstr "Veit ikkje" @@ -675,7 +776,7 @@ msgstr "Redigerer brukar %d" msgid "Editor" msgstr "Oppdatert av" -#: templates/web/default/admin/council_contacts.html:27 +#: templates/web/default/admin/council_contacts.html:32 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -683,18 +784,20 @@ msgstr "Oppdatert av" #: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 +#: templates/web/fixmystreet/auth/general.html:20 +#: templates/web/fixmystreet/report/display.html:125 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" -#: templates/web/default/around/display_location.html:84 +#: templates/web/default/around/display_location.html:83 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problem" @@ -702,7 +805,7 @@ msgstr "Send meg e-post om lokale problem" msgid "Email me updates" msgstr "Send meg oppdateringar" -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:73 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -712,15 +815,15 @@ msgstr "Send meg oppdateringar" msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -728,11 +831,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eigedom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -752,6 +855,12 @@ msgstr "Sluttmånad:" #: templates/web/default/around/around_index.html:10 #: templates/web/default/around/around_index.html:13 #: templates/web/default/index.html:24 templates/web/default/index.html:27 +#: templates/web/emptyhomes/index.html:40 +#: templates/web/emptyhomes/index.html:43 +#: templates/web/fixmystreet/around/around_index.html:10 +#: templates/web/fixmystreet/around/around_index.html:13 +#: templates/web/fixmystreet/index.html:32 +#: templates/web/fixmystreet/index.html:35 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Skriv inn GB-postnummer i nærleiken, eller vegnamn og stad" @@ -760,12 +869,20 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:177 +#: templates/web/default/report/display.html:176 #: templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "Skriv inn eit nytt passord:" -#: templates/web/default/index.html:45 +#: templates/web/fixmystreet/auth/general.html:57 +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#, fuzzy +msgid "Enter a password" +msgstr "Skriv inn eit nytt passord:" + +#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 +#: templates/web/fixmystreet/index.html:55 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -776,10 +893,11 @@ msgstr "Legg inn detaljar om problemet" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 +#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:9 +#: templates/web/default/admin/council_contacts.html:11 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "Postnummerdøme %s" @@ -792,21 +910,25 @@ msgstr "Døme:" msgid "" "Failed to send message. Please try again, or <a href=\"mailto:%s\">email " "us</a>." -msgstr "Klarte ikkje å senda meldinga. Ver venleg og prøv igjen seinare eller <a href=\"mailto:%s\">send oss ein e-post</a>." - -#: templates/web/default/footer.html:27 -msgid "Find out about FixMyStreet for councils" -msgstr "Finn ut om FiksGataMi for det offentlege" +msgstr "" +"Klarte ikkje å senda meldinga. Ver venleg og prøv igjen seinare eller <a " +"href=\"mailto:%s\">send oss ein e-post</a>." -#: templates/web/default/questionnaire/index.html:81 +#: templates/web/default/questionnaire/index.html:79 +#: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" msgstr "Første gong" -#: templates/web/default/header.html:29 -#: templates/web/fiksgatami/header.html:16 templates/web/reading/header.html:31 +#: templates/web/fiksgatami/header.html:16 +#: templates/web/fiksgatami/nn/header.html:16 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Fiks<span id=\"my\">Gata</span>Mi" +#: templates/web/default/header.html:24 +#, fuzzy +msgid "FixMyStreet" +msgstr "FiksGataMi-administrator:" + #: templates/web/default/admin/header.html:13 msgid "FixMyStreet admin:" msgstr "FiksGataMi-administrator:" @@ -815,7 +937,13 @@ msgstr "FiksGataMi-administrator:" msgid "FixMyStreet administration" msgstr "Fiksgatami-administrasjon" +#: templates/web/fixmystreet/static/for_councils.html:1 +#, fuzzy +msgid "FixMyStreet for Councils" +msgstr "Finn ut om FiksGataMi for det offentlege" + #: templates/web/default/alert/index.html:6 +#: templates/web/fixmystreet/alert/index.html:6 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " "including\n" @@ -823,11 +951,14 @@ msgid "" "problems\n" "within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-straumar og e-postlister om lokale problem, dette inkluderer problem meldt innanfor ein viss bydel eller administrasjon, eller eit område med problem\n" +"Fiksgatami har ulike RSS-straumar og e-postlister om lokale problem, dette " +"inkluderer problem meldt innanfor ein viss bydel eller administrasjon, eller " +"eit område med problem\n" "innan ein gitt distanse frå ein viss posisjon." # var bokmålen tilstrekkeleg her? --KBU -#: templates/web/default/alert/list.html:100 +#: templates/web/default/alert/list.html:98 +#: templates/web/fixmystreet/alert/_list.html:69 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular " @@ -843,25 +974,28 @@ msgstr "" "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, " "problem som gjeld fleire administrasjonar vert send til alle dei det gjeld." +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "Fixed" msgstr "Løyst" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Fixed - User" msgstr "Løyst – Brukar" -#: templates/web/default/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 msgid "Fixed reports" msgstr "Løyste rapportar" @@ -882,7 +1016,9 @@ msgstr "Flagga:" msgid "Flagged:" msgstr "Flagga:" -#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:24 +#: templates/web/default/reports/council.html:87 +#: templates/web/emptyhomes/reports/council.html:19 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." @@ -894,6 +1030,8 @@ msgstr "For administrasjon(ane):" #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 +#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmystreet/faq/faq-en-gb.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" @@ -905,13 +1043,27 @@ msgstr "Meir informasjon om arbeidet vårt med tomme heimar." msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" -#: templates/web/default/alert/list.html:112 +#: templates/web/fixmystreet/report/display.html:28 +#, fuzzy +msgid "Get updates" +msgstr "Siste oppdatering:" + +#: templates/web/default/reports/council.html:72 +#, fuzzy +msgid "Get updates of problems in this %s" +msgstr "RSS-straum for problem i denne %s-en" + +#: templates/web/default/alert/list.html:110 +#: templates/web/fixmystreet/alert/_list.html:78 msgid "Give me an RSS feed" msgstr "Gje meg ein RSS-straum" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:33 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:49 +#: templates/web/fixmystreet/alert/index.html:25 +#: templates/web/fixmystreet/around/around_index.html:20 +#: templates/web/fixmystreet/index.html:42 msgid "Go" msgstr "Hald fram" @@ -923,17 +1075,19 @@ msgstr "Skal spørjeskjemaet sendast?" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" -#: templates/web/default/reports/index.html:5 +#: templates/web/default/reports/index.html:8 #: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." msgstr "" "Linjer med grå bakgrunn er administrasjonar som ikkje lenger eksisterer." -#: templates/web/default/questionnaire/index.html:63 +#: templates/web/default/questionnaire/index.html:61 +#: templates/web/fixmystreet/questionnaire/index.html:55 msgid "Has this problem been fixed?" msgstr "Har dette problemet vorte løyst?" -#: templates/web/default/questionnaire/index.html:76 +#: templates/web/default/questionnaire/index.html:74 +#: templates/web/fixmystreet/questionnaire/index.html:68 msgid "" "Have you ever reported a problem to a council before, or is this your first " "time?" @@ -941,39 +1095,51 @@ msgstr "" "Har du rapportert eit problem til ein administrasjon før, eller er dette " "første gongen?" -#: templates/web/default/footer.html:10 -#: templates/web/emptyhomes/header.html:30 -#: templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 +#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/emptyhomes/header.html:28 +#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmystreet/footer.html:53 +#: templates/web/reading/footer.html:10 msgid "Help" msgstr "Hjelp" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/list.html:37 +#: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/bromley/header.html:46 +#: templates/web/fixmystreet/header.html:46 +msgid "Hi %s" +msgstr "" + +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 msgid "Hidden" msgstr "Skjult" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 +#: templates/web/fixmystreet/around/display_location.html:58 +msgid "Hide old" +msgstr "" + +#: templates/web/default/around/display_location.html:53 +#: templates/web/fixmystreet/around/display_location.html:54 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/around/display_location.html:59 -msgid "Hide stale reports" -msgstr "Skjul utdaterte rapportar" - #: templates/web/default/admin/council_edit.html:38 msgid "History" msgstr "Historie" -#: templates/web/default/index.html:40 +#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 +#: templates/web/fixmystreet/index.html:50 msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:587 +#: perllib/FixMyStreet/App/Controller/Admin.pm:592 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -993,7 +1159,9 @@ msgstr "" msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" -msgstr "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n" +msgstr "" +"Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte " +"nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n" #: templates/web/default/admin/list_flagged.html:9 #: templates/web/default/admin/list_updates.html:5 @@ -1003,33 +1171,47 @@ msgstr "ID" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:10 +#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." -msgstr "Viss du sender inn eit problem hit, så vil emnet og detaljar for problemet vera offentlege, men problemet vil <strong>ikkje</strong> rapporterast til administrasjonen." +msgstr "" +"Viss du sender inn eit problem hit, så vil emnet og detaljar for problemet " +"vera offentlege, men problemet vil <strong>ikkje</strong> rapporterast til " +"administrasjonen." -#: templates/web/emptyhomes/report/new/no_councils_text.html:9 +#: templates/web/emptyhomes/report/new/councils_text_none.html:9 msgid "" "If you submit a report here it will be left on the site, but not reported to " "the council – please still leave your report, so that we can show to " "the council the activity in their area." -msgstr "Viss du sender inn ein rapport her så vil han verta tilgjengeleg her, men ikkje rapporterast til administrasjonen. — det er fint om du likevel sender inn rapporten din, slik at vi kan visa administrasjonen aktiviteten i området ditt." +msgstr "" +"Viss du sender inn ein rapport her så vil han verta tilgjengeleg her, men " +"ikkje rapporterast til administrasjonen. — det er fint om du likevel " +"sender inn rapporten din, slik at vi kan visa administrasjonen aktiviteten i " +"området ditt." #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 +#: templates/web/fixmystreet/auth/token.html:23 msgid "" "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." -msgstr "Viss du brukar vevbasert e-post eller har filter for søppel-e-post på e-postkontoen din, kan du i visse tilfelle måtta sjå etter meldingane våre der." +msgstr "" +"Viss du brukar vevbasert e-post eller har filter for søppel-e-post på e-" +"postkontoen din, kan du i visse tilfelle måtta sjå etter meldingane våre der." -#: templates/web/default/questionnaire/index.html:85 +#: templates/web/default/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:77 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council). For example, what was\n" "your experience of getting the problem fixed?" msgstr "" -"Viss du ynskjer å leggja til ein offentleg kommentar på problemet, legg han til her\n" +"Viss du ynskjer å leggja til ein offentleg kommentar på problemet, legg han " +"til her\n" "(denne vert ikkje send til administrasjonen). Du kan til dømes\n" "dela røynsla di med korleis problemet ditt vart løyst." @@ -1037,14 +1219,16 @@ msgstr "" msgid "Illegal ID" msgstr "Ugyldig ID" -#: perllib/FixMyStreet/App/Controller/Alert.pm:102 +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 msgid "Illegal feed selection" msgstr "Ugyldig val av straum" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:24 -#: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:87 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:81 msgid "In Progress" msgstr "Under arbeid" @@ -1054,11 +1238,16 @@ msgid "" "specification are returned: agency_sent_datetime, title (also returned as " "part of description), interface_used, comment_count, requestor_name (only " "present if requestor allowed the name to be shown on this site)." -msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." - -#: templates/web/default/around/display_location.html:61 -msgid "Include stale reports" -msgstr "Inkluder utdaterte problem" +msgstr "" +"I tillegg er følgjande attributt som ikkje er del av Open311 v2-" +"spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del " +"av description), interface_used, comment_count, requestor_name (berre " +"tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." + +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +#, fuzzy +msgid "In progress" +msgstr "Under arbeid" #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" @@ -1072,7 +1261,7 @@ msgstr "Feil has_photo-verdi «%s»" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:897 +#: perllib/FixMyStreet/App/Controller/Admin.pm:899 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1080,14 +1269,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:887 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Invalid start date" msgstr "Ugyldig startdato" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 msgid "Investigating" msgstr "Undersøkjer" @@ -1105,12 +1296,15 @@ msgid "" msgstr "" #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:157 +#: templates/web/default/report/display.html:156 #: templates/web/default/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" -#: templates/web/default/admin/council_contacts.html:30 +#: templates/web/default/admin/council_contacts.html:35 msgid "Last editor" msgstr "Sist redigert av" @@ -1122,15 +1316,16 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:985 msgid "List Flagged" msgstr "Vis flagga" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" #: templates/web/default/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." msgstr "Lastar …" @@ -1143,6 +1338,15 @@ msgstr "Lastar …" #: templates/web/default/alert/updates.html:1 #: templates/web/default/tokens/confirm_alert.html:1 #: templates/web/default/tokens/confirm_alert.html:3 +#: templates/web/emptyhomes/alert/index.html:1 +#: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmystreet/alert/choose.html:1 +#: templates/web/fixmystreet/alert/choose.html:3 +#: templates/web/fixmystreet/alert/index.html:1 +#: templates/web/fixmystreet/alert/index.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:5 +#: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-straum og e-postvarsel" @@ -1150,15 +1354,23 @@ msgstr "Lokal RSS-straum og e-postvarsel" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 +#: templates/web/fixmystreet/alert/list.html:1 +#: templates/web/fixmystreet/alert/list.html:12 +#: templates/web/fixmystreet/alert/list.html:14 +#: templates/web/fixmystreet/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-straum og e-postvarsel for «%s»" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 -#: templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 +#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/fiksgatami/footer.html:8 +#: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmystreet/footer.html:51 +#: templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/default/index.html:44 +#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:54 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1172,6 +1384,11 @@ msgstr "" "\">OpenStreetMap</a> og bidragsytarar, <a href=\"http://creativecommons.org/" "licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/fixmystreet/contact/index.html:86 +#, fuzzy +msgid "Message" +msgstr "Melding:" + #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "Melding:" @@ -1193,9 +1410,14 @@ msgstr "Fleire problem i nærleiken" #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 #: templates/web/default/admin/search_users.html:12 -#: templates/web/default/reports/index.html:10 +#: templates/web/default/reports/index.html:15 #: templates/web/emptyhomes/reports/index.html:10 +#: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 +#: templates/web/fixmystreet/auth/general.html:52 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "Name" msgstr "Namn" @@ -1205,7 +1427,8 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" -#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/footer.html:3 +#: templates/web/fiksgatami/nn/footer.html:3 #: templates/web/reading/footer.html:4 msgid "Navigation" msgstr "Navigasjon" @@ -1214,26 +1437,47 @@ msgstr "Navigasjon" msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" -msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s" +msgstr "" +"Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved " +"hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/Default.pm:564 +#: perllib/FixMyStreet/Cobrand/Default.pm:480 msgid "" -"Nearest postcode to the pin placed on the map (automatically generated): %s (" -"%sm away)" -msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)" +"Nearest postcode to the pin placed on the map (automatically generated): %s " +"(%sm away)" +msgstr "" +"Næraste postnummer til nålen plassert på kartet (automatisk generert): %s " +"(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:553 -#: perllib/FixMyStreet/Cobrand/Default.pm:588 +#: perllib/FixMyStreet/Cobrand/Default.pm:469 +#: perllib/FixMyStreet/Cobrand/Default.pm:520 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" -msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s" +msgstr "" +"Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " +"Bing Maps): %s" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +#, fuzzy +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing " +"Maps): %s\n" +"\n" +msgstr "" +"Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " +"Bing Maps): %s" #: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! No må du sjekka e-posten din …" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: templates/web/default/reports/index.html:16 +#, fuzzy +msgid "New <br>problems" +msgstr "Nye problem" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1245,10 +1489,8 @@ msgstr "Nye lokale problem på FiksGataMi" msgid "New local reports on reportemptyhomes.com" msgstr "Nye lokale rapportar på reportemptyhomes.com" -#: templates/web/default/reports/council.html:92 -#: templates/web/default/reports/council.html:93 -#: templates/web/default/reports/index.html:11 #: templates/web/emptyhomes/reports/index.html:11 +#: templates/web/fiksgatami/nn/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:10 msgid "New problems" msgstr "Nye problem" @@ -1299,24 +1541,27 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/default/front/news.html:8 #: templates/web/fiksgatami/front/news.html:9 +#: templates/web/fiksgatami/nn/front/news.html:9 +#: templates/web/fixmystreet/front/news.html:8 msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:28 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 -#: templates/web/default/questionnaire/index.html:109 -#: templates/web/default/questionnaire/index.html:70 +#: templates/web/default/questionnaire/index.html:107 +#: templates/web/default/questionnaire/index.html:68 +#: templates/web/fixmystreet/questionnaire/index.html:101 +#: templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "Nei" @@ -1325,7 +1570,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:297 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1346,10 +1591,12 @@ msgid "No info at all" msgstr "Heilt utan informasjon" #: templates/web/default/around/around_map_list_items.html:15 +#: templates/web/fixmystreet/around/around_map_list_items.html:24 msgid "No problems found." msgstr "Fann ingen problem." #: templates/web/default/around/on_map_list_items.html:12 +#: templates/web/fixmystreet/around/on_map_list_items.html:21 msgid "No problems have been reported yet." msgstr "Ingen problem er rapporterte" @@ -1363,10 +1610,12 @@ msgid "Not reported before" msgstr "Ikkje rapportert tidlegare" #: templates/web/default/report/_main.html:9 +#: templates/web/emptyhomes/report/display.html:24 +#: templates/web/fixmystreet/report/_main.html:11 msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:31 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "Merk" @@ -1376,9 +1625,12 @@ msgid "" "Note that when including unconfirmed reports we use the date the report was " "created which may not be in the same month the report was confirmed so the " "numbers may jump about a little" -msgstr "Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rapporten var oppretta. Det treng vera den same månaden som rapporten var stadfesta, så tala kan hoppa litt opp og ned." +msgstr "" +"Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rapporten " +"var oppretta. Det treng vera den same månaden som rapporten var stadfesta, " +"så tala kan hoppa litt opp og ned." -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "Merk:" @@ -1387,30 +1639,35 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#, fuzzy +msgid "Now to submit your report…" +msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" + #: templates/web/default/report/new/fill_in_details_form.html:131 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" -#: templates/web/default/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:132 +#, fuzzy +msgid "Now to submit your update…" +msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" + +#: templates/web/default/report/display.html:138 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" #: templates/web/default/report/display.html:26 -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Støytande? Upassende? Sei frå" -#: templates/web/default/reports/council.html:115 -#: templates/web/default/reports/council.html:116 -msgid "Old fixed" -msgstr "Eldre problem som er løyste" - -#: templates/web/default/reports/council.html:109 -#: templates/web/default/reports/council.html:110 -msgid "Old problems, state unknown" -msgstr "Eldre problem med ukjend status" +#: templates/web/default/reports/index.html:18 +#, fuzzy +msgid "Old / unknown <br>problems" +msgstr "Ukjend problem-ID" -#: templates/web/default/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:12 #: templates/web/fiksgatami/reports/index.html:12 msgid "Old problems,<br>state unknown" msgstr "Eldre problem, med<br>ukjend status" @@ -1419,29 +1676,36 @@ msgstr "Eldre problem, med<br>ukjend status" msgid "Old state" msgstr "Gammal tilstand" -#: templates/web/default/reports/index.html:15 +#: templates/web/default/reports/index.html:20 +#, fuzzy +msgid "Older <br>fixed" +msgstr "Eldre løyste" + +#: templates/web/default/reports/index.html:17 +#, fuzzy +msgid "Older <br>problems" +msgstr "Eldre problem" + #: templates/web/emptyhomes/reports/index.html:14 +#: templates/web/fiksgatami/nn/reports/index.html:14 #: templates/web/fiksgatami/reports/index.html:14 msgid "Older fixed" msgstr "Eldre løyste" -#: templates/web/default/reports/council.html:101 -#: templates/web/default/reports/council.html:105 -#: templates/web/default/reports/council.html:106 -#: templates/web/default/reports/council.html:99 -#: templates/web/default/reports/index.html:12 #: templates/web/emptyhomes/reports/index.html:12 +#: templates/web/fiksgatami/nn/reports/index.html:11 #: templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "Eldre problem" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:79 msgid "Open" msgstr "Opne" -#: templates/web/default/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 msgid "Open reports" msgstr "Opne rapportar" @@ -1457,31 +1721,35 @@ msgstr "Nettsida til Open311-initiativet" msgid "Open311 specification" msgstr "Open311-spesifikasjon" -#: templates/web/default/alert/list.html:87 +#: templates/web/default/alert/list.html:85 +#: templates/web/fixmystreet/alert/_list.html:56 msgid "Or problems reported to:" msgstr "Eller problem meldt til:" -#: templates/web/default/alert/list.html:63 +#: templates/web/default/alert/list.html:61 +#: templates/web/fixmystreet/alert/_list.html:33 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" -msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:" - -#: bin/send-reports:175 bin/send-reports:184 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:553 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:969 -#: perllib/FixMyStreet/DB/Result/Problem.pm:475 -#: perllib/FixMyStreet/DB/Result/Problem.pm:485 -#: perllib/FixMyStreet/DB/Result/Problem.pm:495 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +msgstr "" +"Eller du kan abonnera på varsel basert på bydel eller administrasjon du " +"høyrer til under:" + +#: bin/send-reports:176 bin/send-reports:185 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 +#: perllib/FixMyStreet/DB/Result/Problem.pm:489 +#: perllib/FixMyStreet/DB/Result/Problem.pm:499 +#: perllib/FixMyStreet/DB/Result/Problem.pm:509 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 msgid "Other" msgstr "Anna" -#: templates/web/default/footer.html:30 +#: templates/web/default/footer.html:27 msgid "" -"Our code is open source and <a href=\"http://github.com/mysociety/" -"fixmystreet\">available on GitHub</a>." +"Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet" +"\">available on GitHub</a>." msgstr "" "Kjeldekoda vår er fri programvare og <a href=\"http://github.com/mysociety/" "fixmystreet\">tilgjengeleg på GitHub</a>." @@ -1495,63 +1763,101 @@ msgstr "Eigar" msgid "Page Not Found" msgstr "Fann ikkje sida" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 msgid "Partial" msgstr "Delvis" +#: templates/web/fixmystreet/auth/general.html:55 +#: templates/web/fixmystreet/report/display.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#, fuzzy +msgid "Password (optional)" +msgstr "(valfritt)" + #: templates/web/default/auth/change_password.html:25 +#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "Passord:" -#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Phone number (optional)" +msgstr "(valfritt)" + +#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Telefon:" -#: templates/web/default/questionnaire/index.html:97 -#: templates/web/default/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#, fuzzy +msgid "Photo" +msgstr "Bilete:" + +#: templates/web/default/questionnaire/index.html:95 +#: templates/web/default/report/display.html:114 #: templates/web/default/report/new/fill_in_details_form.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Bilete:" -#: templates/web/default/alert/list.html:29 +#: templates/web/default/alert/list.html:27 +#: templates/web/fixmystreet/alert/list.html:27 msgid "Photos of recent nearby reports" msgstr "Bilete av nye problem i nærleiken" -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/report/display.html:84 #: templates/web/default/report/display.html:85 -#: templates/web/default/report/display.html:86 +#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:80 msgid "Planned" msgstr "Planlagt" +#: templates/web/fixmystreet/questionnaire/index.html:44 +#, fuzzy +msgid "" +"Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates " +"that have been left." +msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." + #: templates/web/default/report/new/notes.html:6 +#: templates/web/fixmystreet/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Ver høfleg, poengtert og kortfatta." #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:17 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" #: templates/web/default/auth/token.html:17 +#: templates/web/fixmystreet/auth/token.html:17 msgid "Please check your email" msgstr "Ver venleg og sjekk e-posten du oppgav" #: templates/web/default/auth/general.html:14 #: templates/web/default/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/fixmystreet/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 -#: perllib/FixMyStreet/DB/Result/Problem.pm:316 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 +#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -1561,38 +1867,52 @@ msgid "" "go to\n" "the team behind FixMyStreet, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." -msgstr "Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida; meldingane går til gruppa som står bak FiksGataMi, og ikkje til ein administrasjon. For å rapportera eit problem, ver venleg og <a href=\"/\">gå til forsida</a> og følg instruksjonane." +msgstr "" +"Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida; " +"meldingane går til gruppa som står bak FiksGataMi, og ikkje til ein " +"administrasjon. For å rapportera eit problem, ver venleg og <a href=\"/\">gå " +"til forsida</a> og følg instruksjonane." #: templates/web/default/report/new/notes.html:7 +#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." -msgstr "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av tenesta for alle brukarane." +msgstr "" +"Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " +"tenesta for alle brukarane." #: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:15 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:15 msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:291 +#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" #: perllib/FixMyStreet/DB/Result/User.pm:96 +#: templates/web/default/js/validation_strings.html:12 +#: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" -#: perllib/FixMyStreet/App/Controller/Alert.pm:345 +#: perllib/FixMyStreet/App/Controller/Alert.pm:342 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:294 +#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -1600,19 +1920,34 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/DB/Result/User.pm:93 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 +#: templates/web/default/js/validation_strings.html:11 +#: templates/web/default/js/validation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:14 +#: templates/web/fixmystreet/auth/general.html:9 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#, fuzzy +msgid "Please enter your email address" +msgstr "Ver venleg og legg inn e-posten din" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:7 +#, fuzzy msgid "" -"Please enter your full name, councils need this information - if you do not " -"wish your name to be shown on the site, untick the box" -msgstr "Skriv inn det fulle namnet ditt. Administrasjonar som mottek problemet ditt treng dette. Fjern haka under viss du ikkje ynskjer at namnet ditt skal visast." +"Please enter your full name, councils need this information – if you do not " +"wish your name to be shown on the site, untick the box below" +msgstr "" +"Skriv inn det fulle namnet ditt. Administrasjonar som mottek problemet ditt " +"treng dette. Fjern haka under viss du ikkje ynskjer at namnet ditt skal " +"visast." #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:302 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: perllib/FixMyStreet/DB/Result/User.pm:89 +#: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" @@ -1620,8 +1955,8 @@ msgstr "Ver venleg og legg inn namnet ditt" msgid "" "Please fill in details of the empty property below, saying what type of\n" "property it is e.g. an empty home, block of flats, office etc. Tell us\n" -"something about its condition and any other information you feel is relevant." -"\n" +"something about its condition and any other information you feel is " +"relevant.\n" "There is no need for you to give the exact address. Please be polite, " "concise\n" "and to the point; writing your message entirely in block capitals makes it " @@ -1631,6 +1966,8 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." @@ -1650,7 +1987,13 @@ msgstr "" "(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" "skildring (og eit bilete av problemet viss du har eit), osb." +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#, fuzzy +msgid "Please fill in details of the problem." +msgstr "Ver venleg og fyll ut detaljar om problemet under." + #: templates/web/default/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -1658,11 +2001,12 @@ msgstr "" "Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n" "og skildra plasseringa så nøyaktig som mogleg i boksen for detaljar." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" -#: templates/web/default/report/display.html:62 +#: templates/web/default/report/display.html:61 +#: templates/web/fixmystreet/report/display.html:59 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -1670,49 +2014,58 @@ msgid "" msgstr "" "Merk at oppdateringar ikkje vert sende til administrasjonen. Viss du\n" "legg igjen namnet ditt så vil det vera offentleg tilgjengeleg.\n" -"Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy\">personvernpolicyen vår</a>" +"Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy" +"\">personvernpolicyen vår</a>" #: templates/web/default/report/new/fill_in_details_form.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." -msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." +msgstr "" +"Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori " +"og legg til meir informasjon under før du sender inn." #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please provide some explanation as to why you're reopening this report" -msgstr "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten" +msgstr "" +"Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne " +"problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please provide some text as well as a photo" msgstr "Ver venleg og bidra med litt tekst i tillegg til eit bilete" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported a problem to your council before" -msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" +msgstr "" +"Ver venleg og opplys om du har rapportert eit problem til administrasjonen " +"din tidlegare" -#: perllib/FixMyStreet/App/Controller/Alert.pm:82 +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" msgstr "Vel den kjelda du ynskjer" -#: perllib/FixMyStreet/App/Controller/Alert.pm:120 +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 msgid "Please select the type of alert you want" msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" -#: templates/web/default/questionnaire/index.html:52 +#: templates/web/default/questionnaire/index.html:50 msgid "Please take a look at the updates that have been left." msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" @@ -1720,26 +2073,35 @@ msgstr "Ver venleg og berre last opp JPEG-bilete" msgid "Please write a message" msgstr "Skriv inn ei melding" +#: templates/web/fixmystreet/report/display.html:74 +#, fuzzy +msgid "Please write your update here" +msgstr "Skriv inn ei melding" + #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:125 -#: templates/web/default/report/display.html:162 -#: templates/web/default/report/display.html:184 +#: templates/web/default/report/display.html:124 +#: templates/web/default/report/display.html:161 +#: templates/web/default/report/display.html:183 +#: templates/web/fixmystreet/contact/index.html:93 +#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/display.html:166 msgid "Post" msgstr "Send inn" -#: templates/web/default/report/updates.html:8 +#: templates/web/default/report/updates.html:14 msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/default/report/updates.html:11 +#: templates/web/default/report/updates.html:17 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:19 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: templates/web/default/maps/openlayers.html:89 +#: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -1759,7 +2121,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:774 +#: perllib/FixMyStreet/App/Controller/Admin.pm:776 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -1771,35 +2133,48 @@ msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/default/around/display_location.html:80 +#: templates/web/default/around/display_location.html:79 msgid "Problems in this area" msgstr "Problem i dette området" +#: templates/web/fixmystreet/around/display_location.html:93 +#: templates/web/fixmystreet/report/display.html:29 +#, fuzzy +msgid "Problems nearby" +msgstr "Fleire problem i nærleiken" + +#: templates/web/fixmystreet/around/display_location.html:92 +#, fuzzy +msgid "Problems on the map" +msgstr "Problem i dette området" + #: db/alert_types.pl:14 msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problem nyleg rapportert fiksa på FiksGataMi" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/list.html:50 +#: templates/web/fixmystreet/alert/_list.html:21 msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/Default.pm:748 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Problems within %s" msgstr "Problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:809 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" -#: templates/web/default/reports/council.html -#: templates/web/default/reports/council.html:16 +#: templates/web/default/reports/council.html:0 +#: templates/web/default/reports/council.html:17 msgid "Problems within %s, FixMyStreet" msgstr "Problem innanfor %s, FiksGataMi" -#: templates/web/default/alert/list.html:69 +#: templates/web/default/alert/list.html:67 +#: templates/web/fixmystreet/alert/_list.html:38 msgid "Problems within the boundary of:" msgstr "Problem innanfor grensene av:" @@ -1807,16 +2182,24 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 msgid "Property type:" msgstr "Type eigenskap:" -#: templates/web/default/report/display.html:57 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#, fuzzy +msgid "Provide a title" +msgstr "Bidra med ei oppdatering" + +#: templates/web/default/report/display.html:56 +#: templates/web/fixmystreet/report/display.html:55 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/default/report/display.html:181 +#: templates/web/default/report/display.html:180 #: templates/web/default/report/new/fill_in_details_form.html:173 +#: templates/web/fixmystreet/report/display.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -1827,9 +2210,13 @@ msgstr "" #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 -#: templates/web/default/questionnaire/index.html +#: templates/web/default/questionnaire/index.html:0 #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:32 msgid "Questionnaire" msgstr "Spørjeskjema" @@ -1845,26 +2232,36 @@ msgstr "Spørjeskjema %d sendt for problem %d" msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" -#: templates/web/default/alert/list.html:54 +#: templates/web/fixmystreet/static/for_councils_faq.html:1 +#, fuzzy +msgid "Questions and Answers :: FixMyStreet for Councils" +msgstr "Finn ut om FiksGataMi for det offentlege" + +#: templates/web/default/alert/list.html:52 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:48 -#: templates/web/default/reports/council.html:61 +#: templates/web/default/report/display.html:47 +#: templates/web/default/reports/council.html:79 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:3 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:845 -#: perllib/FixMyStreet/Cobrand/Default.pm:859 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 +#: perllib/FixMyStreet/Cobrand/Default.pm:807 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:868 -#: perllib/FixMyStreet/Cobrand/Default.pm:882 +#: perllib/FixMyStreet/Cobrand/Default.pm:816 +#: perllib/FixMyStreet/Cobrand/Default.pm:830 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 @@ -1872,74 +2269,91 @@ msgstr "RSS-straum for %s bydel, %s" msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:874 -#: perllib/FixMyStreet/Cobrand/Default.pm:888 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" -#: templates/web/default/alert/list.html:54 +#: templates/web/default/alert/list.html:52 +#: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: templates/web/default/reports/council.html:61 +#: templates/web/default/reports/council.html:79 msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:801 +#: perllib/FixMyStreet/Cobrand/Default.pm:749 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 +#: templates/web/fixmystreet/around/display_location.html:1 +#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" -#: templates/web/default/report/display.html:48 +#: templates/web/default/report/display.html:47 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:35 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:38 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:37 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" -#: templates/web/default/around/display_location.html +#: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nye lokale problem, FiksGataMi." -#: templates/web/default/reports/council.html:87 -#: templates/web/default/reports/council.html:88 -#: templates/web/default/reports/index.html:14 +#: templates/web/default/reports/index.html:19 +#, fuzzy +msgid "Recently <br>fixed" +msgstr "Nyleg løyste problem" + #: templates/web/emptyhomes/reports/index.html:13 +#: templates/web/fiksgatami/nn/reports/index.html:13 #: templates/web/fiksgatami/reports/index.html:13 msgid "Recently fixed" msgstr "Nyleg løyste problem" -#: templates/web/default/index.html:62 +#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 msgid "Recently reported problems" msgstr "Nyleg melde problem" #: templates/web/default/report/new/notes.html:9 +#: templates/web/fixmystreet/report/new/notes.html:8 msgid "" "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." -msgstr "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som kan fiksast. Viss problemet ditt ikkje er eigna for å senda inn via denne tenesta, hugs at du kan kontakta administrasjonen direkte via deira eiga nettside." +msgstr "" +"Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som kan " +"fiksast. Viss problemet ditt ikkje er eigna for å senda inn via denne " +"tenesta, hugs at du kan kontakta administrasjonen direkte via deira eiga " +"nettside." #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/report_edit.html:52 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" @@ -1948,74 +2362,95 @@ msgstr "Fjern bilete (kan ikkje gjerast om!)" msgid "Report Empty Homes" msgstr "Rapporter tomme heimar" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 -#: templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 +#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 +#: templates/web/emptyhomes/header.html:27 +#: templates/web/fiksgatami/footer.html:5 +#: templates/web/fiksgatami/nn/footer.html:5 +#: templates/web/fixmystreet/footer.html:45 +#: templates/web/reading/footer.html:6 msgid "Report a problem" msgstr "Rapporter eit problem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:274 +#: templates/web/fixmystreet/report/display.html:27 +#, fuzzy +msgid "Report abuse" +msgstr "Rapporter eit problem" + +#: templates/web/emptyhomes/index.html:37 +#, fuzzy +msgid "Report empty properties" +msgstr "Rapporter tomme heimar" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:281 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:15 +#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: templates/web/default/my/my.html:74 +#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 msgid "Reported %s" msgstr "Rapportert %s" -#: templates/web/default/my/my.html:72 +#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 #: templates/web/default/contact/index.html:45 +#: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" #: templates/web/default/admin/questionnaire.html:5 -#: templates/web/default/questionnaire/index.html:79 +#: templates/web/default/questionnaire/index.html:77 +#: templates/web/fixmystreet/questionnaire/index.html:71 msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:513 +#: perllib/FixMyStreet/DB/Result/Problem.pm:527 #: templates/web/default/contact/index.html:47 +#: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:518 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:478 +#: perllib/FixMyStreet/DB/Result/Problem.pm:492 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:498 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:486 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:522 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" #: templates/web/default/around/around_index.html:1 -#: templates/web/default/report/new/fill_in_details.html +#: templates/web/default/report/new/fill_in_details.html:0 #: templates/web/default/report/new/fill_in_details.html:3 #: templates/web/default/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details.html:0 +#: templates/web/fixmystreet/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "Legger til eit problem" -#: templates/web/default/around/display_location.html:94 +#: templates/web/default/around/display_location.html:93 msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" @@ -2027,7 +2462,9 @@ msgstr "Send rapport på nytt" msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" -msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og type): %s" +msgstr "" +"Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og " +"type): %s" #: perllib/FixMyStreet/Geocode/OSM.pm:104 msgid "Road operator for this named road (from OpenStreetMap): %s" @@ -2037,7 +2474,7 @@ msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" msgid "Save changes" msgstr "Lagra endringar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -2045,13 +2482,13 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbruktabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukarar" @@ -2062,13 +2499,16 @@ msgstr "Søk i brukarar" msgid "Search:" msgstr "Søk:" -#: templates/web/default/alert/list.html:41 +#: templates/web/default/alert/list.html:39 +#: templates/web/fixmystreet/alert/_list.html:10 msgid "" "Select which type of alert you'd like and click the button for an RSS feed, " "or enter your email address to subscribe to an email alert." -msgstr "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." +msgstr "" +"Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" +"kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2101,17 +2541,31 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:216 +#: templates/web/default/report/display.html:213 #: templates/web/default/report/new/fill_in_details_form.html:210 +#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/default/around/display_location.html:52 +#: templates/web/default/around/display_location.html:60 +#: templates/web/fixmystreet/around/display_location.html:60 +msgid "Show old" +msgstr "" + +#: templates/web/default/around/display_location.html:51 +#: templates/web/fixmystreet/around/display_location.html:52 msgid "Show pins" msgstr "Vis nåler" +#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:3 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/header.html:50 msgid "Sign in" msgstr "Logg inn" @@ -2120,31 +2574,37 @@ msgid "Sign in by email" msgstr "Logg inn via epost" #: templates/web/default/auth/general.html:1 +#: templates/web/fixmystreet/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" #: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:35 -#: templates/web/emptyhomes/header.html:43 +#: templates/web/default/header.html:30 +#: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 +#: templates/web/fiksgatami/nn/header.html:22 +#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:37 +#: templates/web/reading/header.html:33 msgid "Sign out" msgstr "Logg ut" -#: templates/web/default/header.html:34 -#: templates/web/emptyhomes/header.html:42 +#: templates/web/default/header.html:29 +#: templates/web/emptyhomes/header.html:40 #: templates/web/fiksgatami/header.html:21 +#: templates/web/fiksgatami/nn/header.html:21 #: templates/web/lichfielddc/header.html:177 -#: templates/web/reading/header.html:36 +#: templates/web/reading/header.html:32 msgid "Signed in as %s" msgstr "Logga inn som %s" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Somme kategoriar krev kanskje meir informasjon" -#: templates/web/default/alert/index.html:31 +#: templates/web/default/alert/index.html:30 +#: templates/web/fixmystreet/alert/index.html:33 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -2157,26 +2617,33 @@ msgstr "Noko tekst å omsetja" msgid "Some unconfirmeds" msgstr "Nokre ustadfesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:517 +#: perllib/FixMyStreet/Cobrand/Default.pm:428 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." -msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer." +msgstr "" +"Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje " +"dekkjer." #: templates/web/default/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." -msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" +msgstr "" +"Orsak, men det oppstod eit problem når vi freista å stadfesta " +"problemrapporten din" -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 #: perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: perllib/FixMyStreet/Geocode/Bing.pm:45 +#: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." -msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." +msgstr "" +"Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." #: templates/web/fiksgatami/footer.html:16 +#: templates/web/fiksgatami/nn/footer.html:16 msgid "Source code" msgstr "Kjeldekode" @@ -2195,20 +2662,32 @@ msgstr "Startmånad:" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 +#: templates/web/fixmystreet/report/display.html:77 msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:83 +#: templates/web/default/report/display.html:82 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:986 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" +#: templates/web/default/report/updates.html:9 +#, fuzzy +msgid "Still open, via questionnaire, %s" +msgstr "Skal spørjeskjemaet sendast?" + +#: templates/web/fixmystreet/contact/index.html:79 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#, fuzzy +msgid "Subject" +msgstr "Emne:" + #: templates/web/default/admin/report_edit.html:13 #: templates/web/default/contact/index.html:83 #: templates/web/default/report/new/fill_in_details_form.html:52 @@ -2219,40 +2698,48 @@ msgstr "Emne:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/report_edit.html:55 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" msgstr "Send inn endringar" -#: templates/web/default/questionnaire/index.html:114 +#: templates/web/default/questionnaire/index.html:112 +#: templates/web/fixmystreet/questionnaire/index.html:105 msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:43 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:42 msgid "Subscribe" msgstr "Abonner" -#: templates/web/default/alert/list.html:128 +#: templates/web/default/alert/list.html:126 +#: templates/web/fixmystreet/alert/_list.html:88 msgid "Subscribe me to an email alert" msgstr "Eg ynskjer å abonnera på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:976 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" #: templates/web/default/reports/index.html:1 #: templates/web/emptyhomes/reports/index.html:1 +#: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" @@ -2261,7 +2748,7 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:12 +#: templates/web/default/admin/council_contacts.html:14 msgid "Text only version" msgstr "Tekst-utgåve" @@ -2317,7 +2804,8 @@ msgstr "" "Takk for at du brukar ReportEmptyHomes.com. Handlinga di bidreg\n" "allereie til å løyse Storbritannias krise med tomme heimar." -#: templates/web/default/around/around_index.html:44 +#: templates/web/default/around/around_index.html:43 +#: templates/web/fixmystreet/around/around_index.html:46 msgid "" "Thanks for uploading your photo. We now need to locate your problem, so " "please enter a nearby street name or postcode in the box below :" @@ -2328,20 +2816,25 @@ msgstr "" #: templates/web/default/contact/submit.html:8 msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Takk for innspillet ditt. Vi gjev deg ei tilbakemelding så snart vi kan." +msgstr "" +"Takk for innspillet ditt. Vi gjev deg ei tilbakemelding så snart vi kan." #: templates/web/default/questionnaire/creator_fixed.html:9 msgid "" "Thanks, glad to hear it's been fixed! Could we just ask if you have ever " "reported a problem to a council before?" -msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" +msgstr "" +"Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du " +"har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." -msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." +msgstr "" +"Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." #: templates/web/default/alert/index.html:12 +#: templates/web/fixmystreet/alert/index.html:12 msgid "" "That location does not appear to be covered by a council, perhaps it is " "offshore - please try somewhere more specific." @@ -2351,14 +2844,15 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Location.pm:107 msgid "That location does not appear to be in Britain; please try again." -msgstr "Den staden synest ikkje å vera i Storbritannia. Ver venleg og prøv igjen." +msgstr "" +"Den staden synest ikkje å vera i Storbritannia. Ver venleg og prøv igjen." -#: perllib/FixMyStreet/Cobrand/Default.pm:510 +#: perllib/FixMyStreet/Cobrand/Default.pm:421 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:558 +#: perllib/FixMyStreet/App/Controller/Admin.pm:560 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -2366,7 +2860,8 @@ msgstr "Det problemet vil no sendast på nytt." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: templates/web/default/around/around_index.html:27 +#: templates/web/default/around/around_index.html:26 +#: templates/web/fixmystreet/around/around_index.html:29 msgid "" "That spot does not appear to be covered by a council. If you have tried to " "report an issue past the shoreline, for example, please specify the closest " @@ -2401,23 +2896,53 @@ msgid "" "The Open311 v2 attribute agency_responsible is used to list the " "administrations that received the problem report, which is not quite the way " "the attribute is defined in the Open311 v2 specification." -msgstr "Open311 v2-attributten agency_responsible vert brukt for å lista opp administrasjonane som mottok problemrapporten, noko som ikkje heilt passar med korleis attributten er definert i Open311 v2-spesifikasjonen." +msgstr "" +"Open311 v2-attributten agency_responsible vert brukt for å lista opp " +"administrasjonane som mottok problemrapporten, noko som ikkje heilt passar " +"med korleis attributten er definert i Open311 v2-spesifikasjonen." #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 +#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." -msgstr "Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kjem fram — så ver tålmodig." +msgstr "" +"Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kjem " +"fram — så ver tålmodig." -#: templates/web/default/questionnaire/index.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +#, fuzzy +msgid "" +"The council won’t be able to help unless you leave as much\n" +"detail as you can. Please describe the exact location of the problem (e.g. " +"on a\n" +"wall), what it is, how long it has been there, a description (and a photo " +"of\n" +"the problem if you have one), etc." +msgstr "" +"Ver venlg og fyll inn detaljane om problemet under. Administrasjonen\n" +"vil ikkje vera i stand til å hjelpa med mindre du legg inn så mange\n" +"detaljar som du kan. Forklar den eksakte plasseringa for problemet\n" +"(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" +"skildring (og eit bilete av problemet viss du har eit), osb." + +#: templates/web/fixmystreet/questionnaire/index.html:43 +#, fuzzy +msgid "The details of your problem are available from the other tab above." +msgstr "" +"Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." + +#: templates/web/default/questionnaire/index.html:49 msgid "" "The details of your problem are available on the right hand side of this " "page." -msgstr "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." +msgstr "" +"Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." -#: perllib/FixMyStreet/App/Controller/Reports.pm:46 -#: perllib/FixMyStreet/App/Controller/Reports.pm:73 +#: perllib/FixMyStreet/App/Controller/Reports.pm:44 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -2426,7 +2951,10 @@ msgid "" "The following Open311 v2 attributes are returned for each request: " "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code and service_name." -msgstr "Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." +msgstr "" +"Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: " +"service_request_id, description, lat, long, media_url, status, " +"requested_datetime, updated_datetime, service_code og service_name." #: perllib/FixMyStreet/Geocode/OSM.pm:99 msgid "" @@ -2481,7 +3009,9 @@ msgstr "Dei siste rapportane for {{COUNCIL}} rapportert av brukarar" #: db/alert_types_eha.pl:24 msgid "" "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -msgstr "Dei siste rapportane for {{COUNCIL}} innanfor {{WARD}} bydel rapportert av brukarar" +msgstr "" +"Dei siste rapportane for {{COUNCIL}} innanfor {{WARD}} bydel rapportert av " +"brukarar" #: db/alert_types_eha.pl:28 msgid "The latest reports within {{NAME}}'s boundary reported by users" @@ -2490,6 +3020,8 @@ msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:16 +#: templates/web/fixmystreet/auth/change_password.html:12 +#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "Passorda er ikkje like" @@ -2498,14 +3030,15 @@ msgstr "Passorda er ikkje like" msgid "The requested URL '%s' was not found on this server" msgstr "Fann ikkje URL-en «%s» på denne tenaren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1179 -#: perllib/FixMyStreet/App/Controller/Admin.pm:538 -#: perllib/FixMyStreet/App/Controller/Admin.pm:701 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:540 +#: perllib/FixMyStreet/App/Controller/Admin.pm:703 msgid "The requested URL was not found on this server." msgstr "Fann ikkje URL-ein du spurde etter på denne tenaren" -#: templates/web/default/alert/list.html:47 +#: templates/web/default/alert/list.html:45 +#: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Den enklaste meldinga er den geografiske:" @@ -2513,6 +3046,10 @@ msgstr "Den enklaste meldinga er den geografiske:" #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 +#: templates/web/fixmystreet/report/new/councils_text_all.html:18 +#: templates/web/fixmystreet/report/new/councils_text_some.html:10 +#: templates/web/fixmystreet/report/new/councils_text_some.html:11 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " "give us permission." @@ -2520,33 +3057,44 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: bin/send-reports:78 +#: bin/send-reports:79 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" -msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt staden dei skreiv inn" +msgstr "" +"Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt " +"staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:70 msgid "" "There was a problem showing the All Reports page. Please try again later." -msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv igjen seinare." +msgstr "" +"Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " +"igjen seinare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 #: templates/web/default/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:24 +#, fuzzy msgid "" -"There was a problem with your email/password combination. Passwords and user " -"accounts are a brand <strong>new</strong> service, so you probably do not " -"have one yet – please fill in the right hand side of this form to get " -"one." -msgstr "Det var problem med e-post/passord-kombinasjonen din. Passord og brukarkontoar er ei heilt <strong>ny</strong> teneste, så du har sannsynlegvis ikkje ein konto enno. – ver venleg og fyll inn høgresida av dette skjemaet for å skaffa deg ein." +"There was a problem with your email/password combination. If you cannot " +"remember your password, or do not have one, please fill in the ‘sign " +"in by email’ section of the form." +msgstr "" +"Det var problem med e-post/passord-kombinasjonen din. Passord og " +"brukarkontoar er ei heilt <strong>ny</strong> teneste, så du har " +"sannsynlegvis ikkje ein konto enno. – ver venleg og fyll inn høgresida " +"av dette skjemaet for å skaffa deg ein." -#: perllib/FixMyStreet/App/Controller/Alert.pm:354 +#: perllib/FixMyStreet/App/Controller/Alert.pm:351 msgid "" "There was a problem with your email/password combination. Please try again." -msgstr "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv igjen." +msgstr "" +"Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv " +"igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -2554,7 +3102,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:242 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." @@ -2562,24 +3110,35 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." msgid "" "This API implementation is work in progress and not yet stabilized. It will " "change without warnings in the future." -msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan åtvaring i framtida." +msgstr "" +"Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil " +"endra seg utan åtvaring i framtida." -#: bin/send-reports:185 +#: bin/send-reports:186 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " "the correct council to deal with the issue, or let us know what category of " "problem this is so we can add it to our system." -msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt." +msgstr "" +"Denne e-posten er sendt til begge administrasjonane som dekkjer staden for " +"problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-" +"posten viss de ikkje er korrekt administrasjon for å handtera denne saka, " +"eller gjev oss melding om kva for ein kategori av problem dette er så vi kan " +"leggja det til i systemet vårt." -#: bin/send-reports:188 +#: bin/send-reports:189 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " "it if you're not the correct council to deal with the issue." -msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka." +msgstr "" +"Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for " +"problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg " +"og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera " +"denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:761 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -2587,64 +3146,72 @@ msgstr "Denne informasjonen er påkravd" msgid "" "This is a developer site; things might break at any time, and the database " "will be periodically deleted." -msgstr "Dette er ein utviklarnettstad. Ting kan knekka når som helst og databasen vil verta periodisk sletta." +msgstr "" +"Dette er ein utviklarnettstad. Ting kan knekka når som helst og databasen " +"vil verta periodisk sletta." -#: templates/web/default/reports/council.html:65 +#: templates/web/emptyhomes/reports/council.html:58 msgid "This is a summary of all reports for one %s." msgstr "Dette er ei oppsummering av alle rapportar for ein %s." -#: templates/web/default/reports/council.html:67 +#: templates/web/emptyhomes/reports/council.html:60 msgid "This is a summary of all reports for this %s." msgstr "Dette er ei oppsummering for alle rapportar for denne %s-en." -#: templates/web/default/reports/index.html:4 +#: templates/web/default/reports/index.html:7 #: templates/web/emptyhomes/reports/index.html:4 +#: templates/web/fiksgatami/nn/reports/index.html:4 #: templates/web/fiksgatami/reports/index.html:4 msgid "" "This is a summary of all reports on this site; select a particular council " "to see the reports sent there." -msgstr "Dette er ei opplisting av alle problema i denne tenesta; vel ein viss administrasjon for å sjå problem som er sende dit." +msgstr "" +"Dette er ei opplisting av alle problema i denne tenesta; vel ein viss " +"administrasjon for å sjå problem som er sende dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 msgid "This problem has been closed" msgstr "Dette problemet er lukka" -#: perllib/FixMyStreet/Cobrand/Default.pm:922 +#: perllib/FixMyStreet/Cobrand/Default.pm:870 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:101 +#: templates/web/default/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:95 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:95 +#: templates/web/fixmystreet/report/display.html:89 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" -#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#: perllib/FixMyStreet/Cobrand/Default.pm:879 msgid "This problem is in progress" msgstr "Dette problemet er under arbeid" -#: perllib/FixMyStreet/Cobrand/Default.pm:918 +#: perllib/FixMyStreet/Cobrand/Default.pm:866 msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: bin/send-reports:71 +#: bin/send-reports:72 msgid "" "This web page also contains a photo of the problem, provided by the user." -msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." +msgstr "" +"Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -2654,7 +3221,16 @@ msgstr "Tidslinje" msgid "Title" msgstr "Tittel" -#: templates/web/default/around/display_location.html:70 +#: templates/web/default/around/display_location.html:69 +#, fuzzy +msgid "" +"To <strong>report a problem</strong>, click on the map at the correct " +"location." +msgstr "" +"For å <strong>rapportera eit problem</strong>, klikk på kartet på riktig " +"stad." + +#: templates/web/emptyhomes/around/display_location.html:35 msgid "" "To <strong>report a problem</strong>, simply click on the map at the correct " "location." @@ -2662,13 +3238,22 @@ msgstr "" "For å <strong>rapportera eit problem</strong>, klikk på kartet på riktig " "stad." +#: templates/web/fixmystreet/alert/index.html:19 +#, fuzzy +msgid "" +"To find out what local alerts we have for you, please enter your GB\n" +" postcode or street name and area" +msgstr "" +"Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" + #: templates/web/default/alert/index.html:21 msgid "" "To find out what local alerts we have for you, please enter your GB\n" "postcode or street name and area:" -msgstr "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" +msgstr "" +"Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -2679,17 +3264,23 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:45 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 msgid "Unable to look up areas in MaPit. Please try again later." -msgstr "Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." +msgstr "" +"Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." -#: templates/web/default/admin/report_edit.html:22 -#: templates/web/default/admin/report_edit.html:25 +#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: perllib/FixMyStreet/App/Controller/Rss.pm:163 +#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +#, fuzzy +msgid "Unknown" +msgstr "*ukjent*" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:164 msgid "Unknown alert type" msgstr "Ukjend varsel-type" @@ -2697,15 +3288,22 @@ msgstr "Ukjend varsel-type" msgid "Unknown problem ID" msgstr "Ukjend problem-ID" +#: templates/web/fixmystreet/report/display.html:70 +#, fuzzy +msgid "Update" +msgstr "Oppdatering:" + #: templates/web/default/admin/timeline.html:35 msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s oppretta for problem %d, av %s" #: templates/web/default/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:22 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" #: templates/web/default/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:24 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" @@ -2729,22 +3327,23 @@ msgstr "Ei oppdatering markerte dette problemet som fiksa." msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:58 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:77 +#: templates/web/default/report/display.html:76 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:647 -#: perllib/FixMyStreet/App/Controller/Admin.pm:764 -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:649 +#: perllib/FixMyStreet/App/Controller/Admin.pm:766 +#: perllib/FixMyStreet/App/Controller/Admin.pm:846 msgid "Updated!" msgstr "Oppdatert!" #: templates/web/default/admin/list_updates.html:1 -#: templates/web/default/report/updates.html:4 +#: templates/web/default/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:3 msgid "Updates" msgstr "Oppdateringar" @@ -2752,16 +3351,18 @@ msgstr "Oppdateringar" msgid "Updates on {{title}}" msgstr "Oppdateringar av {{title}}" -#: templates/web/default/report/display.html +#: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:7 msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 msgid "User flagged" msgstr "Brukar flagga" @@ -2769,8 +3370,8 @@ msgstr "Brukar flagga" msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:304 -#: perllib/FixMyStreet/App/Controller/Admin.pm:334 +#: perllib/FixMyStreet/App/Controller/Admin.pm:306 +#: perllib/FixMyStreet/App/Controller/Admin.pm:336 msgid "Values updated" msgstr "Verdi oppdatert" @@ -2783,35 +3384,52 @@ msgstr "Sjå rapport på nettstaden" msgid "View your report" msgstr "Vis rapporten din" -#: templates/web/default/around/display_location.html +#: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:33 +#: templates/web/emptyhomes/around/display_location.html:0 +#: templates/web/emptyhomes/around/display_location.html:16 +#: templates/web/fixmystreet/around/display_location.html:0 +#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på ein stad" -#: templates/web/default/report/display.html +#: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 +#: templates/web/emptyhomes/report/display.html:2 +#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på eit problem" -#: templates/web/default/reports/council.html:22 +#: templates/web/default/reports/council.html:23 +#: templates/web/default/reports/council.html:74 +#: templates/web/default/reports/council.html:86 +#: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "Bydelar innanfor denne administrasjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:521 -#: perllib/FixMyStreet/Geocode/Bing.pm:47 +#: perllib/FixMyStreet/Cobrand/Default.pm:432 +#: perllib/FixMyStreet/Geocode/Bing.pm:48 #: perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "Vi dekkjer diverre ikkje Nord-Irland." #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:33 +#: templates/web/default/around/around_index.html:32 +#: templates/web/fixmystreet/alert/choose.html:6 +#: templates/web/fixmystreet/around/around_index.html:35 msgid "" "We found more than one match for that location. We show up to ten matches, " "please try a different search if yours is not here." -msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så prøv eit anna søk viss staden din ikkje er her." +msgstr "" +"Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så " +"prøv eit anna søk viss staden din ikkje er her." #: templates/web/default/auth/token.html:19 +#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." -msgstr "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen din." +msgstr "" +"Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen " +"din." #: templates/web/emptyhomes/tokens/confirm_problem.html:18 #: templates/web/emptyhomes/tokens/confirm_problem.html:20 @@ -2822,7 +3440,18 @@ msgstr "" "Det kan hende vi periodisk tek kontakt med deg for å spørja om noko har " "endra seg med eiedommen du rapporterte." -#: bin/send-reports:195 +#: templates/web/fixmystreet/report/display.html:158 +#, fuzzy +msgid "We never show your email" +msgstr "(vi viser aldri e-postadressa di)" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#, fuzzy +msgid "We never show your email address or phone number." +msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" + +#: bin/send-reports:196 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -2832,30 +3461,40 @@ msgstr "" "tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:46 +#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 +#: templates/web/fixmystreet/index.html:56 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegner" #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" -msgstr "Vi vil berre bruka personleg informasjon om deg i samsvar med <a href=\"/faq#privacy\">personvernpolicyen</a> vår." +msgstr "" +"Vi vil berre bruka personleg informasjon om deg i samsvar med <a href=\"/" +"faq#privacy\">personvernpolicyen</a> vår." #: templates/web/emptyhomes/contact/blurb.html:2 msgid "" "We’d love to hear what you think about this website. Just fill in the " "form. Please don’t contact us about individual empty homes; use the " "box accessed from <a href=\"/\">the front page</a>." -msgstr "Vi vil gjerne høyra kva du tenkjer om denne nettstaden. Det er berre å fylla inn skjemaet. Ver venleg og ikkje kontakt oss om individuelle tomme heimar. For det bør du i staden bruka boksen som er på <a href=\"/\">forsida</a>." +msgstr "" +"Vi vil gjerne høyra kva du tenkjer om denne nettstaden. Det er berre å " +"fylla inn skjemaet. Ver venleg og ikkje kontakt oss om individuelle tomme " +"heimar. For det bør du i staden bruka boksen som er på <a href=\"/" +"\">forsida</a>." #: templates/web/default/contact/blurb.html:8 msgid "" "We'd love to hear what you think about this site. Just fill in the form, or " "send an email to <a href='mailto:%s'>%s</a>:" -msgstr "Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tenesta. Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" +msgstr "" +"Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tenesta. " +"Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "Når redigert" @@ -2865,7 +3504,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -2874,42 +3513,76 @@ msgid "" "With request searches, it is also possible to search for agency_responsible " "to limit the requests to those sent to a single administration. The search " "term is the administration ID provided by <a href=\"%s\">MaPit</a>." -msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter agency_responsible for å avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a href=\"%s\">MaPit</a>." +msgstr "" +"Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter " +"agency_responsible for å avgrensa det til førespurnader som er sendt til ein " +"einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a " +"href=\"%s\">MaPit</a>." -#: templates/web/default/questionnaire/index.html:104 +#: templates/web/fixmystreet/footer.html:23 +msgid "" +"Would you like better integration with FixMyStreet? <a href=\"/for-councils" +"\">Find out about FixMyStreet for councils</a>." +msgstr "" + +#: templates/web/fixmystreet/footer.html:19 +#, fuzzy +msgid "" +"Would you like to contribute to FixMyStreet? Our code is open source and <a " +"href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "" +"Kjeldekoda vår er fri programvare og <a href=\"http://github.com/mysociety/" +"fixmystreet\">tilgjengeleg på GitHub</a>." + +#: templates/web/default/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:96 msgid "" "Would you like to receive another questionnaire in 4 weeks, reminding you to " "check the status?" -msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner deg om å sjekka status?" +msgstr "" +"Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner deg om " +"å sjekka status?" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " "does a lack of punctuation." -msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. Det same gjeld manglande tegnsetting." +msgstr "" +"Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. " +"Det same gjeld manglande tegnsetting." #: templates/web/default/admin/stats.html:10 msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:39 -#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:45 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:27 #: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 -#: templates/web/default/questionnaire/index.html:107 -#: templates/web/default/questionnaire/index.html:68 +#: templates/web/default/questionnaire/index.html:105 +#: templates/web/default/questionnaire/index.html:66 +#: templates/web/fixmystreet/questionnaire/index.html:60 +#: templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#, fuzzy +msgid "Yes I have a password" +msgstr "<strong>Ja</strong>, eg har eit passord:" + #: templates/web/default/contact/index.html:37 +#: templates/web/fixmystreet/contact/index.html:38 msgid "" "You are reporting the following problem report for being abusive, containing " "personal information, or similar:" @@ -2918,6 +3591,7 @@ msgstr "" "informasjon eller liknande:" #: templates/web/default/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:16 msgid "" "You are reporting the following update for being abusive, containing " "personal information, or similar:" @@ -2925,7 +3599,7 @@ msgstr "" "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg " "informasjon, eller liknande:" -#: templates/web/default/reports/council.html:71 +#: templates/web/emptyhomes/reports/council.html:64 msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" "reports\">show all councils</a>." @@ -2933,7 +3607,7 @@ msgstr "" "Du kan <a href=\"%s\">sjå alle rapportar for administrasjonen</a> eller <a " "href=\"/reports\">sjå alle administrasjonane</a>." -#: templates/web/default/reports/council.html:73 +#: templates/web/emptyhomes/reports/council.html:66 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">sjå alle administrasjonar</a>." @@ -2941,6 +3615,10 @@ msgstr "Du kan <a href=\"/reports/\">sjå alle administrasjonar</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/fixmystreet/report/new/councils_text_none.html:12 +#: templates/web/fixmystreet/report/new/councils_text_none.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:20 +#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local problems for %s " "and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -2952,10 +3630,15 @@ msgstr "" msgid "" "You have already answered this questionnaire. If you have a question, please " "<a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" -msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet ditt</a>.\n" +msgstr "" +"Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver " +"venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet " +"ditt</a>.\n" -#: templates/web/default/questionnaire/index.html:94 +#: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 +#: templates/web/fixmystreet/questionnaire/index.html:87 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -2963,7 +3646,8 @@ msgstr "" "Du har allereie lagt ved eit bilete til dette problemet. Å leggja ved eit " "anna vil byta ut dette." -#: templates/web/default/report/display.html:112 +#: templates/web/default/report/display.html:111 +#: templates/web/fixmystreet/report/display.html:105 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -2972,14 +3656,19 @@ msgstr "" "anna vil byta ut dette." #: templates/web/default/auth/sign_out.html:3 +#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allereie logga ut" #: templates/web/default/report/new/fill_in_details_form.html:7 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#, fuzzy msgid "" -"You have located the problem at the point marked with a purple pin on the " +"You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " -msgstr "Du har plassert problemet ved punktet i kartet som er markert med ein lilla nål. Viss dette ikkje er korrekt plassering, kan du klikka i kartet på nytt." +msgstr "" +"Du har plassert problemet ved punktet i kartet som er markert med ein lilla " +"nål. Viss dette ikkje er korrekt plassering, kan du klikka i kartet på nytt." #: templates/web/default/tokens/confirm_alert.html:7 msgid "You have successfully confirmed your alert." @@ -2993,9 +3682,11 @@ msgstr "Du har no stadfesta problemet ditt" #: templates/web/default/tokens/confirm_update.html:11 #: templates/web/default/tokens/confirm_update.html:12 msgid "" -"You have successfully confirmed your update and you can now <a href=\"" -"%s\">view it on the site</a>." -msgstr "Du har no stadfesta oppdateringa di <a href=\"%s\">og kan sjå ho på denne nettstaden</a>." +"You have successfully confirmed your update and you can now <a href=\"%s" +"\">view it on the site</a>." +msgstr "" +"Du har no stadfesta oppdateringa di <a href=\"%s\">og kan sjå ho på denne " +"nettstaden</a>." #: templates/web/default/tokens/confirm_alert.html:11 msgid "You have successfully created your alert." @@ -3005,12 +3696,14 @@ msgstr "Du har oppretta varselet ditt." msgid "You have successfully deleted your alert." msgstr "Sletting av varselet ditt var vellukka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" -msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:" +msgstr "" +"Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er " +"korrekte:" #: templates/web/default/email_sent.html:26 msgid "" @@ -3024,38 +3717,87 @@ msgstr "" msgid "You really want to resend?" msgstr "Ynskjer du verkeleg å senda på nytt?" -#: templates/web/default/my/my.html templates/web/default/my/my.html:14 -#: templates/web/default/my/my.html:3 +#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 +#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:14 +#: templates/web/fixmystreet/my/my.html:3 msgid "Your Reports" msgstr "Rapportane dine" +#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/fixmystreet/alert/updates.html:19 +#: templates/web/fixmystreet/alert/updates.html:22 +#: templates/web/fixmystreet/contact/index.html:72 +#: templates/web/fixmystreet/report/display.html:39 +#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#, fuzzy +msgid "Your email" +msgstr "E-posten din" + +#: templates/web/fixmystreet/auth/general.html:26 +#: templates/web/fixmystreet/report/display.html:129 +#, fuzzy +msgid "Your email address" +msgstr "e-postadressa di:" + #: templates/web/default/auth/general.html:27 msgid "Your email address:" msgstr "e-postadressa di:" -#: templates/web/default/alert/list.html:122 -#: templates/web/default/report/display.html:134 +#: templates/web/default/alert/list.html:120 +#: templates/web/default/report/display.html:133 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "E-posten din" +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/contact/index.html:65 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#, fuzzy +msgid "Your name" +msgstr "Namnet ditt:" + #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:210 +#: templates/web/default/report/display.html:207 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Namnet ditt:" +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/report/display.html:143 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#, fuzzy +msgid "Your password" +msgstr "Rapportane dine" + #: templates/web/default/auth/change_password.html:6 +#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" -#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "Your phone number" +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +#, fuzzy +msgid "Your report" +msgstr "Oppdateringane dine" + +#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/fiksgatami/footer.html:6 +#: templates/web/fiksgatami/nn/footer.html:6 +#: templates/web/fixmystreet/footer.html:47 #: templates/web/reading/footer.html:7 msgid "Your reports" msgstr "Oppdateringane dine" -#: templates/web/default/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 msgid "Your updates" msgstr "Oppdateringane dine" @@ -3069,6 +3811,8 @@ msgstr "av %s" #: templates/web/default/reports/council.html:6 #: templates/web/default/reports/council.html:7 +#: templates/web/emptyhomes/reports/council.html:6 +#: templates/web/emptyhomes/reports/council.html:7 msgid "council" msgstr "administrasjon" @@ -3076,6 +3820,11 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikkje kart" +#: templates/web/fixmystreet/alert/index.html:24 +#: templates/web/fixmystreet/index.html:41 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + #: templates/web/default/admin/index.html:15 msgid "from %d different users" msgstr "frå %d ulike brukarar" @@ -3084,11 +3833,11 @@ msgstr "frå %d ulike brukarar" msgid "less than a minute" msgstr "mindre enn eitt minutt" -#: templates/web/default/report/updates.html:18 +#: templates/web/default/report/updates.html:24 msgid "marked as %s" msgstr "markert som %s" -#: templates/web/default/report/updates.html:16 +#: templates/web/default/report/updates.html:22 msgid "marked as fixed" msgstr "markert som løyst" @@ -3098,7 +3847,8 @@ msgstr "markert som løyst" msgid "n/a" msgstr "i/t" -#: templates/web/default/alert/list.html:116 +#: templates/web/default/alert/list.html:114 +#: templates/web/fixmystreet/alert/_list.html:81 msgid "or" msgstr "eller" @@ -3110,20 +3860,28 @@ msgstr "søkte etter" msgid "other areas:" msgstr "andre område:" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:23 msgid "reopened" msgstr "opna på nytt" +#: templates/web/bromley/header.html:47 +#: templates/web/fixmystreet/header.html:47 +#, fuzzy +msgid "sign out" +msgstr "Logg ut" + #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "the map was not used so pin location may be inaccurate" msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" -#: bin/send-reports:176 +#: bin/send-reports:177 msgid "this type of local problem" msgstr "denne typen lokalt problem" @@ -3143,8 +3901,10 @@ msgstr "brukaren er frå same administrasjon som problemet – %d" msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" -#: templates/web/default/reports/council.html +#: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:3 +#: templates/web/emptyhomes/reports/council.html:0 +#: templates/web/emptyhomes/reports/council.html:3 msgid "ward" msgstr "bydel" @@ -3178,22 +3938,24 @@ msgstr "vil problemet ditt ikkje publiserast" msgid "your update will not be posted" msgstr "oppdateringa di vil ikkje publiserast" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapport nyleg" msgstr[1] "<big>%s</big> rapportar nyleg" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "" "We do not yet have details for the councils that cover this location." -msgstr[0] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden." -msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." +msgstr[0] "" +"Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden." +msgstr[1] "" +"Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -3214,7 +3976,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapportoppdatering" msgstr[1] "<big>%s</big> rapportoppdateringar" -#: templates/web/default/report/new/councils_text_some.html:14 +#: templates/web/fixmystreet/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -3222,5 +3984,46 @@ msgid "" msgid_plural "" "We do <strong>not</strong> yet have details for the other councils that " "cover this location." -msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden." -msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden." +msgstr[0] "" +"Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen " +"som dekkjer denne staden." +msgstr[1] "" +"Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " +"som dekkjer denne staden." + +#, fuzzy +#~ msgid "<strong>Yes</strong>, I have a password" +#~ msgstr "<strong>Ja</strong>, eg har eit passord:" + +#~ msgid "<strong>Yes</strong>, I have a password:" +#~ msgstr "<strong>Ja</strong>, eg har eit passord:" + +#~ msgid "" +#~ "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" " +#~ "height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org" +#~ "\"><span id=\"logoie\"></span></a>" +#~ msgstr "" +#~ "<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/" +#~ "\">Foreininga NUUG</a></div>" + +#~ msgid "" +#~ "Are you from a council? Would you like better integration with " +#~ "FixMyStreet?" +#~ msgstr "" +#~ "Er du frå det offentlege? Kunne du tenkja deg betre integrasjon med " +#~ "FiksGataMi?" + +#~ msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" +#~ msgstr "Bygd av <a href=\"http://www.mysociety.org/\">mySociety</a>" + +#~ msgid "Hide stale reports" +#~ msgstr "Skjul utdaterte rapportar" + +#~ msgid "Include stale reports" +#~ msgstr "Inkluder utdaterte problem" + +#~ msgid "Old fixed" +#~ msgstr "Eldre problem som er løyste" + +#~ msgid "Old problems, state unknown" +#~ msgstr "Eldre problem med ukjend status" diff --git a/notes/INSTALL.pod b/notes/INSTALL.pod index b795a0043..701112b45 100644 --- a/notes/INSTALL.pod +++ b/notes/INSTALL.pod @@ -13,6 +13,11 @@ following command from inside the fixmystreet directory: git submodule update --init +If you're using git version 1.6.5 or later, you can do those steps in +one go with: + + git clone --recursive https://github.com/mysociety/fixmystreet.git + =head1 REQUIREMENTS On the server you are installing FixMyStreet on you will need the following things: @@ -50,17 +55,24 @@ to CSS convertor. You can get one from L<http://sass-lang.com/> If you're expecting a lot of traffic it's recommended that you install memcached: L<http://memcached.org/> -If you're using a Debian based Linux distribution then the packages to install -some required dependencies (though not all the required Perl modules) are -listed in C<conf/packages>. To install all of them you can run: +If you're using Debian 6.0 ("squeeze") then the packages to install +some required dependencies (though not all the required Perl modules) +are listed in C<conf/packages.debian-squeeze>. To install all of them +you can run: - xargs -a conf/packages apt-get install + sudo xargs -a conf/packages.debian-squeeze apt-get install -Note, you will need to either be logged in as root or to use +A similar list of packages should work for other Debian-based +distributions. (Please let us know if you would like to contribute +such a package list or instructions for other distributions.) - sudo xargs -a conf/packages apt-get install +To generate the CSS for the current design of FixMyStreet you will +also need Compass L<http://compass-style.org/>, but unfortunately +it is not packaged in Debian squeeze (or squeeze-backports). You +will either need to install the package from testing, or you could +install it from the Ruby gem with: -for this to work. + gem install compass =head2 Service dependencies @@ -81,22 +93,70 @@ geolocation services. =head1 DETAILED INSTALLATION INSTRUCTIONS -=head2 Unpacking the Code - -Once you've downloaded the code you should unpack it. The best place to do this -is in the location you want the web server vhost to be. - =head2 Creating the database -The default settings file assumes the database is called fms and the user the same. +The default settings file (C<conf/general.yml>) assumes the database is called fms and the user the same. You can change these if you like. +If you wish to create this new database and database user with +password authentication, the following steps may help. First, create +the fms user: + + $ sudo -u postgres createuser fms + Shall the new role be a superuser? (y/n) n + Shall the new role be allowed to create databases? (y/n) n + Shall the new role be allowed to create more new roles? (y/n) n + +Then create the fms database: + + $ sudo -u postgres createdb fms + +Set the password of the fms user, and change the owner of the fms database to be the fms user: + + $ sudo -u postgres psql + postgres=# ALTER USER fms WITH PASSWORD 'somepassword' + ALTER ROLE + postgres=# ALTER DATABASE fms OWNER to fms; + ALTER DATABASE + postgres=# \q + $ + +Then you need to configure PostgreSQL to allow password-based access +to the fms database as the user fms from using Unix-domain sockets. +Edit the file C</etc/postgresql/8.4/main/pg_hba.conf> and add as the +first line: + + local fms fms md5 + +You will then need to restart PostgreSQL with: + + $ sudo /etc/init.d/postgresql restart + +If you want to access the database from the command line, you can add +the following line to C<~/.pgpass>: + + localhost:*:fms:fms:somepassword + +Then you should be able to access the database with: + + $ psql -U fms fms + =head2 Set up the database -Once you've created the database you can use the sql in C<db/schema.sql> to create the required +Before creating the database schema, you will need to install the +PostgreSQL's SQL procedural language into the database: + + createlang -U fms plpgsql fms + +Now you can use the sql in C<db/schema.sql> to create the required tables, triggers and stored procedures. You will also need to run -C<db/alert_types.sql> which -populates the alert_types table. +C<db/alert_types.sql> which populates the alert_types table. For +example, you might run: + + $ psql -U fms fms < db/schema.sql + ... + $ psql -U fms fms < db/alert_types.sql + ... =head2 Install Perl modules @@ -105,7 +165,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 @@ -130,6 +190,21 @@ the required development tools. =head2 Set up Webserver +For production use of FixMyStreet, we suggest you use Apache and +FastCGI. (See below.) For local development, however, you can use +the Catalyst development server. First, install the Catalyst +development tools with: + + ./bin/cron-wrapper local/bin/carton install Catalyst::Devel + +Then the development server can be run with: + + CATALYST_DEBUG=1 ./bin/cron-wrapper ./script/fixmystreet_app_server.pl -r + +The server will be accessible as L<http://localhost:3000/>. + +=head3 Setting up Apache + It is recommended that you run FixMyStreet using FastCGI. It should also be possible to run it using Plack/PSGI. 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/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE.pm b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE.pm new file mode 100644 index 000000000..2c398ab1b --- /dev/null +++ b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE.pm @@ -0,0 +1,248 @@ + +package BarnetElements::Z_CRM_SERVICE_ORDER_CREATE; +use strict; +use warnings; + +{ # BLOCK to scope variables + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' } + +__PACKAGE__->__set_name('Z_CRM_SERVICE_ORDER_CREATE'); +__PACKAGE__->__set_nillable(); +__PACKAGE__->__set_minOccurs(); +__PACKAGE__->__set_maxOccurs(); +__PACKAGE__->__set_ref(); + +use base qw( + SOAP::WSDL::XSD::Typelib::Element + SOAP::WSDL::XSD::Typelib::ComplexType +); + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %ET_RETURN_of :ATTR(:get<ET_RETURN>); +my %IT_PROBLEM_DESC_of :ATTR(:get<IT_PROBLEM_DESC>); +my %IV_CUST_EMAIL_of :ATTR(:get<IV_CUST_EMAIL>); +my %IV_CUST_NAME_of :ATTR(:get<IV_CUST_NAME>); +my %IV_KBID_of :ATTR(:get<IV_KBID>); +my %IV_PROBLEM_ID_of :ATTR(:get<IV_PROBLEM_ID>); +my %IV_PROBLEM_LOC_of :ATTR(:get<IV_PROBLEM_LOC>); +my %IV_PROBLEM_SUB_of :ATTR(:get<IV_PROBLEM_SUB>); + +__PACKAGE__->_factory( + [ qw( ET_RETURN + IT_PROBLEM_DESC + IV_CUST_EMAIL + IV_CUST_NAME + IV_KBID + IV_PROBLEM_ID + IV_PROBLEM_LOC + IV_PROBLEM_SUB + + ) ], + { + 'ET_RETURN' => \%ET_RETURN_of, + 'IT_PROBLEM_DESC' => \%IT_PROBLEM_DESC_of, + 'IV_CUST_EMAIL' => \%IV_CUST_EMAIL_of, + 'IV_CUST_NAME' => \%IV_CUST_NAME_of, + 'IV_KBID' => \%IV_KBID_of, + 'IV_PROBLEM_ID' => \%IV_PROBLEM_ID_of, + 'IV_PROBLEM_LOC' => \%IV_PROBLEM_LOC_of, + 'IV_PROBLEM_SUB' => \%IV_PROBLEM_SUB_of, + }, + { + 'ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2', + 'IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT', + 'IV_CUST_EMAIL' => 'BarnetTypes::char241', + 'IV_CUST_NAME' => 'BarnetTypes::char50', + 'IV_KBID' => 'BarnetTypes::char50', + 'IV_PROBLEM_ID' => 'BarnetTypes::char35', + 'IV_PROBLEM_LOC' => 'BarnetTypes::BAPI_TTET_ADDRESS_COM', + 'IV_PROBLEM_SUB' => 'BarnetTypes::char40', + }, + { + + 'ET_RETURN' => 'ET_RETURN', + 'IT_PROBLEM_DESC' => 'IT_PROBLEM_DESC', + 'IV_CUST_EMAIL' => 'IV_CUST_EMAIL', + 'IV_CUST_NAME' => 'IV_CUST_NAME', + 'IV_KBID' => 'IV_KBID', + 'IV_PROBLEM_ID' => 'IV_PROBLEM_ID', + 'IV_PROBLEM_LOC' => 'IV_PROBLEM_LOC', + 'IV_PROBLEM_SUB' => 'IV_PROBLEM_SUB', + } +); + +} # end BLOCK + + + + + + +} # end of BLOCK + + + +1; + + +=pod + +=head1 NAME + +BarnetElements::Z_CRM_SERVICE_ORDER_CREATE + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined element +Z_CRM_SERVICE_ORDER_CREATE from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + + +=head1 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * ET_RETURN + + $element->set_ET_RETURN($data); + $element->get_ET_RETURN(); + + + + +=item * IT_PROBLEM_DESC + + $element->set_IT_PROBLEM_DESC($data); + $element->get_IT_PROBLEM_DESC(); + + + + +=item * IV_CUST_EMAIL + + $element->set_IV_CUST_EMAIL($data); + $element->get_IV_CUST_EMAIL(); + + + + +=item * IV_CUST_NAME + + $element->set_IV_CUST_NAME($data); + $element->get_IV_CUST_NAME(); + + + + +=item * IV_KBID + + $element->set_IV_KBID($data); + $element->get_IV_KBID(); + + + + +=item * IV_PROBLEM_ID + + $element->set_IV_PROBLEM_ID($data); + $element->get_IV_PROBLEM_ID(); + + + + +=item * IV_PROBLEM_LOC + + $element->set_IV_PROBLEM_LOC($data); + $element->get_IV_PROBLEM_LOC(); + + + + +=item * IV_PROBLEM_SUB + + $element->set_IV_PROBLEM_SUB($data); + $element->get_IV_PROBLEM_SUB(); + + + + + +=back + + +=head1 METHODS + +=head2 new + + my $element = BarnetElements::Z_CRM_SERVICE_ORDER_CREATE->new($data); + +Constructor. The following data structure may be passed to new(): + + { + ET_RETURN => { # BarnetTypes::TABLE_OF_BAPIRET2 + item => { # BarnetTypes::BAPIRET2 + TYPE => $some_value, # char1 + ID => $some_value, # char20 + NUMBER => $some_value, # numeric3 + MESSAGE => $some_value, # char220 + LOG_NO => $some_value, # char20 + LOG_MSG_NO => $some_value, # numeric6 + MESSAGE_V1 => $some_value, # char50 + MESSAGE_V2 => $some_value, # char50 + MESSAGE_V3 => $some_value, # char50 + MESSAGE_V4 => $some_value, # char50 + PARAMETER => $some_value, # char32 + ROW => $some_value, # int + FIELD => $some_value, # char30 + SYSTEM => $some_value, # char10 + }, + }, + IT_PROBLEM_DESC => { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT + item => { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT + TEXT_LINE => $some_value, # char132 + }, + }, + IV_CUST_EMAIL => $some_value, # char241 + IV_CUST_NAME => $some_value, # char50 + IV_KBID => $some_value, # char50 + IV_PROBLEM_ID => $some_value, # char35 + IV_PROBLEM_LOC => { # BarnetTypes::BAPI_TTET_ADDRESS_COM + COUNTRY2 => $some_value, # char2 + REGION => $some_value, # char3 + COUNTY => $some_value, # char30 + CITY => $some_value, # char30 + POSTALCODE => $some_value, # char10 + STREET => $some_value, # char30 + STREETNUMBER => $some_value, # char5 + GEOCODE => $some_value, # char32 + }, + IV_PROBLEM_SUB => $some_value, # char40 + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE/Exception.pm b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE/Exception.pm new file mode 100644 index 000000000..ae95d3234 --- /dev/null +++ b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATE/Exception.pm @@ -0,0 +1,64 @@ + +package BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception; +use strict; +use warnings; + +{ # BLOCK to scope variables + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' } + +__PACKAGE__->__set_name('Z_CRM_SERVICE_ORDER_CREATE.Exception'); +__PACKAGE__->__set_nillable(); +__PACKAGE__->__set_minOccurs(); +__PACKAGE__->__set_maxOccurs(); +__PACKAGE__->__set_ref(); +use base qw( + SOAP::WSDL::XSD::Typelib::Element + BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException +); + +} + +1; + + +=pod + +=head1 NAME + +BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined element +Z_CRM_SERVICE_ORDER_CREATE.Exception from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + + +=head1 METHODS + +=head2 new + + my $element = BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception->new($data); + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException + Name => $some_value, # Z_CRM_SERVICE_ORDER_CREATE.RfcExceptions + Text => $some_value, # string + Message => { # BarnetTypes::RfcException::Message + ID => $some_value, # string + Number => $some_value, # RfcException.Message.Number + }, + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATEResponse.pm b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATEResponse.pm new file mode 100644 index 000000000..5755d0b49 --- /dev/null +++ b/perllib/BarnetElements/Z_CRM_SERVICE_ORDER_CREATEResponse.pm @@ -0,0 +1,183 @@ + +package BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse; +use strict; +use warnings; + +{ # BLOCK to scope variables + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' } + +__PACKAGE__->__set_name('Z_CRM_SERVICE_ORDER_CREATEResponse'); +__PACKAGE__->__set_nillable(); +__PACKAGE__->__set_minOccurs(); +__PACKAGE__->__set_maxOccurs(); +__PACKAGE__->__set_ref(); + +use base qw( + SOAP::WSDL::XSD::Typelib::Element + SOAP::WSDL::XSD::Typelib::ComplexType +); + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %ET_RETURN_of :ATTR(:get<ET_RETURN>); +my %EV_ORDER_GUID_of :ATTR(:get<EV_ORDER_GUID>); +my %EV_ORDER_NO_of :ATTR(:get<EV_ORDER_NO>); +my %IT_PROBLEM_DESC_of :ATTR(:get<IT_PROBLEM_DESC>); + +__PACKAGE__->_factory( + [ qw( ET_RETURN + EV_ORDER_GUID + EV_ORDER_NO + IT_PROBLEM_DESC + + ) ], + { + 'ET_RETURN' => \%ET_RETURN_of, + 'EV_ORDER_GUID' => \%EV_ORDER_GUID_of, + 'EV_ORDER_NO' => \%EV_ORDER_NO_of, + 'IT_PROBLEM_DESC' => \%IT_PROBLEM_DESC_of, + }, + { + 'ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2', + 'EV_ORDER_GUID' => 'BarnetTypes::char32', + 'EV_ORDER_NO' => 'BarnetTypes::char10', + 'IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT', + }, + { + + 'ET_RETURN' => 'ET_RETURN', + 'EV_ORDER_GUID' => 'EV_ORDER_GUID', + 'EV_ORDER_NO' => 'EV_ORDER_NO', + 'IT_PROBLEM_DESC' => 'IT_PROBLEM_DESC', + } +); + +} # end BLOCK + + + + + + +} # end of BLOCK + + + +1; + + +=pod + +=head1 NAME + +BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined element +Z_CRM_SERVICE_ORDER_CREATEResponse from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + + +=head1 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * ET_RETURN + + $element->set_ET_RETURN($data); + $element->get_ET_RETURN(); + + + + +=item * EV_ORDER_GUID + + $element->set_EV_ORDER_GUID($data); + $element->get_EV_ORDER_GUID(); + + + + +=item * EV_ORDER_NO + + $element->set_EV_ORDER_NO($data); + $element->get_EV_ORDER_NO(); + + + + +=item * IT_PROBLEM_DESC + + $element->set_IT_PROBLEM_DESC($data); + $element->get_IT_PROBLEM_DESC(); + + + + + +=back + + +=head1 METHODS + +=head2 new + + my $element = BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse->new($data); + +Constructor. The following data structure may be passed to new(): + + { + ET_RETURN => { # BarnetTypes::TABLE_OF_BAPIRET2 + item => { # BarnetTypes::BAPIRET2 + TYPE => $some_value, # char1 + ID => $some_value, # char20 + NUMBER => $some_value, # numeric3 + MESSAGE => $some_value, # char220 + LOG_NO => $some_value, # char20 + LOG_MSG_NO => $some_value, # numeric6 + MESSAGE_V1 => $some_value, # char50 + MESSAGE_V2 => $some_value, # char50 + MESSAGE_V3 => $some_value, # char50 + MESSAGE_V4 => $some_value, # char50 + PARAMETER => $some_value, # char32 + ROW => $some_value, # int + FIELD => $some_value, # char30 + SYSTEM => $some_value, # char10 + }, + }, + EV_ORDER_GUID => $some_value, # char32 + EV_ORDER_NO => $some_value, # char10 + IT_PROBLEM_DESC => { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT + item => { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT + TEXT_LINE => $some_value, # char132 + }, + }, + }, + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetInterfaces/service/ZLBB_SERVICE_ORDER.pm b/perllib/BarnetInterfaces/service/ZLBB_SERVICE_ORDER.pm new file mode 100644 index 000000000..94e0cd4db --- /dev/null +++ b/perllib/BarnetInterfaces/service/ZLBB_SERVICE_ORDER.pm @@ -0,0 +1,166 @@ +package BarnetInterfaces::service::ZLBB_SERVICE_ORDER; +use strict; +use warnings; +use Class::Std::Fast::Storable; +use Scalar::Util qw(blessed); +use base qw(SOAP::WSDL::Client::Base); + +# only load if it hasn't been loaded before +require BarnetTypemaps::service + if not BarnetTypemaps::service->can('get_class'); + +sub START { + $_[0]->set_proxy('http://lbbcrmdev.barnet.gov.uk:8000/sap/bc/srt/rfc/sap/zlbb_service_order/200/zlbb_service_order/zlbb_service_order') if not $_[2]->{proxy}; + $_[0]->set_class_resolver('BarnetTypemaps::service') + if not $_[2]->{class_resolver}; + + $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix}; +} + +sub Z_CRM_SERVICE_ORDER_CREATE { + my ($self, $body, $header) = @_; + die "Z_CRM_SERVICE_ORDER_CREATE must be called as object method (\$self is <$self>)" if not blessed($self); + return $self->SUPER::call({ + operation => 'Z_CRM_SERVICE_ORDER_CREATE', + soap_action => '', + style => 'document', + body => { + + + 'use' => 'literal', + namespace => 'http://schemas.xmlsoap.org/wsdl/soap/', + encodingStyle => '', + parts => [qw( BarnetElements::Z_CRM_SERVICE_ORDER_CREATE )], + }, + header => { + + }, + headerfault => { + + } + }, $body, $header); +} + + + + +1; + + + +__END__ + +=pod + +=head1 NAME + +BarnetInterfaces::service::ZLBB_SERVICE_ORDER - SOAP Interface for the service Web Service + +=head1 SYNOPSIS + + use BarnetInterfaces::service::ZLBB_SERVICE_ORDER; + my $interface = BarnetInterfaces::service::ZLBB_SERVICE_ORDER->new(); + + my $response; + $response = $interface->Z_CRM_SERVICE_ORDER_CREATE(); + + + +=head1 DESCRIPTION + +SOAP Interface for the service web service +located at http://lbbcrmdev.barnet.gov.uk:8000/sap/bc/srt/rfc/sap/zlbb_service_order/200/zlbb_service_order/zlbb_service_order. + +=head1 SERVICE service + + + +=head2 Port ZLBB_SERVICE_ORDER + + + +=head1 METHODS + +=head2 General methods + +=head3 new + +Constructor. + +All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>. + +=head2 SOAP Service methods + +Method synopsis is displayed with hash refs as parameters. + +The commented class names in the method's parameters denote that objects +of the corresponding class can be passed instead of the marked hash ref. + +You may pass any combination of objects, hash and list refs to these +methods, as long as you meet the structure. + +List items (i.e. multiple occurences) are not displayed in the synopsis. +You may generally pass a list ref of hash refs (or objects) instead of a hash +ref - this may result in invalid XML if used improperly, though. Note that +SOAP::WSDL always expects list references at maximum depth position. + +XML attributes are not displayed in this synopsis and cannot be set using +hash refs. See the respective class' documentation for additional information. + + + +=head3 Z_CRM_SERVICE_ORDER_CREATE + + + +Returns a L<BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse|BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse> object. + + $response = $interface->Z_CRM_SERVICE_ORDER_CREATE( { + ET_RETURN => { # BarnetTypes::TABLE_OF_BAPIRET2 + item => { # BarnetTypes::BAPIRET2 + TYPE => $some_value, # char1 + ID => $some_value, # char20 + NUMBER => $some_value, # numeric3 + MESSAGE => $some_value, # char220 + LOG_NO => $some_value, # char20 + LOG_MSG_NO => $some_value, # numeric6 + MESSAGE_V1 => $some_value, # char50 + MESSAGE_V2 => $some_value, # char50 + MESSAGE_V3 => $some_value, # char50 + MESSAGE_V4 => $some_value, # char50 + PARAMETER => $some_value, # char32 + ROW => $some_value, # int + FIELD => $some_value, # char30 + SYSTEM => $some_value, # char10 + }, + }, + IT_PROBLEM_DESC => { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT + item => { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT + TEXT_LINE => $some_value, # char132 + }, + }, + IV_CUST_EMAIL => $some_value, # char241 + IV_CUST_NAME => $some_value, # char50 + IV_KBID => $some_value, # char50 + IV_PROBLEM_ID => $some_value, # char35 + IV_PROBLEM_LOC => { # BarnetTypes::BAPI_TTET_ADDRESS_COM + COUNTRY2 => $some_value, # char2 + REGION => $some_value, # char3 + COUNTY => $some_value, # char30 + CITY => $some_value, # char30 + POSTALCODE => $some_value, # char10 + STREET => $some_value, # char30 + STREETNUMBER => $some_value, # char5 + GEOCODE => $some_value, # char32 + }, + IV_PROBLEM_SUB => $some_value, # char40 + },, + ); + + + +=head1 AUTHOR + +Generated by SOAP::WSDL on Fri Apr 8 10:23:03 2011 + +=cut diff --git a/perllib/BarnetTypemaps/service.pm b/perllib/BarnetTypemaps/service.pm new file mode 100644 index 000000000..dd9f98162 --- /dev/null +++ b/perllib/BarnetTypemaps/service.pm @@ -0,0 +1,103 @@ + +package BarnetTypemaps::service; +use strict; +use warnings; + +our $typemap_1 = { + 'Z_CRM_SERVICE_ORDER_CREATEResponse/EV_ORDER_NO' => 'BarnetTypes::char10', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/GEOCODE' => 'BarnetTypes::char32', + 'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/COUNTRY2' => 'BarnetTypes::char2', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/NUMBER' => 'BarnetTypes::numeric3', + 'Z_CRM_SERVICE_ORDER_CREATE/IT_PROBLEM_DESC/item' => 'BarnetTypes::CRMT_SERVICE_REQUEST_TEXT', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V1' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/POSTALCODE' => 'BarnetTypes::char10', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/LOG_NO' => 'BarnetTypes::char20', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V2' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V3' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_SUB' => 'BarnetTypes::char40', + 'Z_CRM_SERVICE_ORDER_CREATE/IT_PROBLEM_DESC/item/TEXT_LINE' => 'BarnetTypes::char132', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/LOG_NO' => 'BarnetTypes::char20', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/ROW' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/IT_PROBLEM_DESC/item' => 'BarnetTypes::CRMT_SERVICE_REQUEST_TEXT', + 'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/PARAMETER' => 'BarnetTypes::char32', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item' => 'BarnetTypes::BAPIRET2', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_CUST_NAME' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V2' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/ROW' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Z_CRM_SERVICE_ORDER_CREATE.Exception/Message/ID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/NUMBER' => 'BarnetTypes::numeric3', + 'Z_CRM_SERVICE_ORDER_CREATEResponse' => 'BarnetElements::Z_CRM_SERVICE_ORDER_CREATEResponse', + 'Z_CRM_SERVICE_ORDER_CREATE.Exception/Text' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V1' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/PARAMETER' => 'BarnetTypes::char32', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE' => 'BarnetTypes::char220', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/TYPE' => 'BarnetTypes::char1', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE' => 'BarnetTypes::char220', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC' => 'BarnetTypes::BAPI_TTET_ADDRESS_COM', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/TYPE' => 'BarnetTypes::char1', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_CUST_EMAIL' => 'BarnetTypes::char241', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/FIELD' => 'BarnetTypes::char30', + 'Z_CRM_SERVICE_ORDER_CREATE.Exception/Name' => 'BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcExceptions', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/IT_PROBLEM_DESC/item/TEXT_LINE' => 'BarnetTypes::char132', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/ID' => 'BarnetTypes::char20', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/EV_ORDER_GUID' => 'BarnetTypes::char32', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/SYSTEM' => 'BarnetTypes::char10', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN' => 'BarnetTypes::TABLE_OF_BAPIRET2', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_ID' => 'BarnetTypes::char35', + 'Z_CRM_SERVICE_ORDER_CREATE' => 'BarnetElements::Z_CRM_SERVICE_ORDER_CREATE', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/REGION' => 'BarnetTypes::char3', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/LOG_MSG_NO' => 'BarnetTypes::numeric6', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/MESSAGE_V4' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/FIELD' => 'BarnetTypes::char30', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/SYSTEM' => 'BarnetTypes::char10', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/COUNTY' => 'BarnetTypes::char30', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item/LOG_MSG_NO' => 'BarnetTypes::numeric6', + 'Z_CRM_SERVICE_ORDER_CREATE.Exception/Message' => 'BarnetTypes::RfcException::Message', + 'Z_CRM_SERVICE_ORDER_CREATE/IT_PROBLEM_DESC' => 'BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT', + 'Z_CRM_SERVICE_ORDER_CREATE/ET_RETURN/item' => 'BarnetTypes::BAPIRET2', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/CITY' => 'BarnetTypes::char30', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V4' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATE.Exception' => 'BarnetElements::Z_CRM_SERVICE_ORDER_CREATE::Exception', + 'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/STREETNUMBER' => 'BarnetTypes::char5', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/ID' => 'BarnetTypes::char20', + 'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_PROBLEM_LOC/STREET' => 'BarnetTypes::char30', + 'Z_CRM_SERVICE_ORDER_CREATE.Exception/Message/Number' => 'BarnetTypes::RfcException::Message::Number', + 'Z_CRM_SERVICE_ORDER_CREATE/IV_KBID' => 'BarnetTypes::char50', + 'Z_CRM_SERVICE_ORDER_CREATEResponse/ET_RETURN/item/MESSAGE_V3' => 'BarnetTypes::char50' + }; +; + +sub get_class { + my $name = join '/', @{ $_[1] }; + return $typemap_1->{ $name }; +} + +sub get_typemap { + return $typemap_1; +} + +1; + +__END__ + +__END__ + +=pod + +=head1 NAME + +BarnetTypemaps::service - typemap for service + +=head1 DESCRIPTION + +Typemap created by SOAP::WSDL for map-based SOAP message parsers. + +=cut + diff --git a/perllib/BarnetTypes/BAPIRET2.pm b/perllib/BarnetTypes/BAPIRET2.pm new file mode 100644 index 000000000..2ca20894c --- /dev/null +++ b/perllib/BarnetTypes/BAPIRET2.pm @@ -0,0 +1,219 @@ +package BarnetTypes::BAPIRET2; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %TYPE_of :ATTR(:get<TYPE>); +my %ID_of :ATTR(:get<ID>); +my %NUMBER_of :ATTR(:get<NUMBER>); +my %MESSAGE_of :ATTR(:get<MESSAGE>); +my %LOG_NO_of :ATTR(:get<LOG_NO>); +my %LOG_MSG_NO_of :ATTR(:get<LOG_MSG_NO>); +my %MESSAGE_V1_of :ATTR(:get<MESSAGE_V1>); +my %MESSAGE_V2_of :ATTR(:get<MESSAGE_V2>); +my %MESSAGE_V3_of :ATTR(:get<MESSAGE_V3>); +my %MESSAGE_V4_of :ATTR(:get<MESSAGE_V4>); +my %PARAMETER_of :ATTR(:get<PARAMETER>); +my %ROW_of :ATTR(:get<ROW>); +my %FIELD_of :ATTR(:get<FIELD>); +my %SYSTEM_of :ATTR(:get<SYSTEM>); + +__PACKAGE__->_factory( + [ qw( TYPE + ID + NUMBER + MESSAGE + LOG_NO + LOG_MSG_NO + MESSAGE_V1 + MESSAGE_V2 + MESSAGE_V3 + MESSAGE_V4 + PARAMETER + ROW + FIELD + SYSTEM + + ) ], + { + 'TYPE' => \%TYPE_of, + 'ID' => \%ID_of, + 'NUMBER' => \%NUMBER_of, + 'MESSAGE' => \%MESSAGE_of, + 'LOG_NO' => \%LOG_NO_of, + 'LOG_MSG_NO' => \%LOG_MSG_NO_of, + 'MESSAGE_V1' => \%MESSAGE_V1_of, + 'MESSAGE_V2' => \%MESSAGE_V2_of, + 'MESSAGE_V3' => \%MESSAGE_V3_of, + 'MESSAGE_V4' => \%MESSAGE_V4_of, + 'PARAMETER' => \%PARAMETER_of, + 'ROW' => \%ROW_of, + 'FIELD' => \%FIELD_of, + 'SYSTEM' => \%SYSTEM_of, + }, + { + 'TYPE' => 'BarnetTypes::char1', + 'ID' => 'BarnetTypes::char20', + 'NUMBER' => 'BarnetTypes::numeric3', + 'MESSAGE' => 'BarnetTypes::char220', + 'LOG_NO' => 'BarnetTypes::char20', + 'LOG_MSG_NO' => 'BarnetTypes::numeric6', + 'MESSAGE_V1' => 'BarnetTypes::char50', + 'MESSAGE_V2' => 'BarnetTypes::char50', + 'MESSAGE_V3' => 'BarnetTypes::char50', + 'MESSAGE_V4' => 'BarnetTypes::char50', + 'PARAMETER' => 'BarnetTypes::char32', + 'ROW' => 'SOAP::WSDL::XSD::Typelib::Builtin::int', + 'FIELD' => 'BarnetTypes::char30', + 'SYSTEM' => 'BarnetTypes::char10', + }, + { + + 'TYPE' => 'TYPE', + 'ID' => 'ID', + 'NUMBER' => 'NUMBER', + 'MESSAGE' => 'MESSAGE', + 'LOG_NO' => 'LOG_NO', + 'LOG_MSG_NO' => 'LOG_MSG_NO', + 'MESSAGE_V1' => 'MESSAGE_V1', + 'MESSAGE_V2' => 'MESSAGE_V2', + 'MESSAGE_V3' => 'MESSAGE_V3', + 'MESSAGE_V4' => 'MESSAGE_V4', + 'PARAMETER' => 'PARAMETER', + 'ROW' => 'ROW', + 'FIELD' => 'FIELD', + 'SYSTEM' => 'SYSTEM', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::BAPIRET2 + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +BAPIRET2 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * TYPE + + +=item * ID + + +=item * NUMBER + + +=item * MESSAGE + + +=item * LOG_NO + + +=item * LOG_MSG_NO + + +=item * MESSAGE_V1 + + +=item * MESSAGE_V2 + + +=item * MESSAGE_V3 + + +=item * MESSAGE_V4 + + +=item * PARAMETER + + +=item * ROW + + +=item * FIELD + + +=item * SYSTEM + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::BAPIRET2 + TYPE => $some_value, # char1 + ID => $some_value, # char20 + NUMBER => $some_value, # numeric3 + MESSAGE => $some_value, # char220 + LOG_NO => $some_value, # char20 + LOG_MSG_NO => $some_value, # numeric6 + MESSAGE_V1 => $some_value, # char50 + MESSAGE_V2 => $some_value, # char50 + MESSAGE_V3 => $some_value, # char50 + MESSAGE_V4 => $some_value, # char50 + PARAMETER => $some_value, # char32 + ROW => $some_value, # int + FIELD => $some_value, # char30 + SYSTEM => $some_value, # char10 + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/BAPI_TTET_ADDRESS_COM.pm b/perllib/BarnetTypes/BAPI_TTET_ADDRESS_COM.pm new file mode 100644 index 000000000..b4a8b00ca --- /dev/null +++ b/perllib/BarnetTypes/BAPI_TTET_ADDRESS_COM.pm @@ -0,0 +1,165 @@ +package BarnetTypes::BAPI_TTET_ADDRESS_COM; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %COUNTRY2_of :ATTR(:get<COUNTRY2>); +my %REGION_of :ATTR(:get<REGION>); +my %COUNTY_of :ATTR(:get<COUNTY>); +my %CITY_of :ATTR(:get<CITY>); +my %POSTALCODE_of :ATTR(:get<POSTALCODE>); +my %STREET_of :ATTR(:get<STREET>); +my %STREETNUMBER_of :ATTR(:get<STREETNUMBER>); +my %GEOCODE_of :ATTR(:get<GEOCODE>); + +__PACKAGE__->_factory( + [ qw( COUNTRY2 + REGION + COUNTY + CITY + POSTALCODE + STREET + STREETNUMBER + GEOCODE + + ) ], + { + 'COUNTRY2' => \%COUNTRY2_of, + 'REGION' => \%REGION_of, + 'COUNTY' => \%COUNTY_of, + 'CITY' => \%CITY_of, + 'POSTALCODE' => \%POSTALCODE_of, + 'STREET' => \%STREET_of, + 'STREETNUMBER' => \%STREETNUMBER_of, + 'GEOCODE' => \%GEOCODE_of, + }, + { + 'COUNTRY2' => 'BarnetTypes::char2', + 'REGION' => 'BarnetTypes::char3', + 'COUNTY' => 'BarnetTypes::char30', + 'CITY' => 'BarnetTypes::char30', + 'POSTALCODE' => 'BarnetTypes::char10', + 'STREET' => 'BarnetTypes::char30', + 'STREETNUMBER' => 'BarnetTypes::char5', + 'GEOCODE' => 'BarnetTypes::char32', + }, + { + + 'COUNTRY2' => 'COUNTRY2', + 'REGION' => 'REGION', + 'COUNTY' => 'COUNTY', + 'CITY' => 'CITY', + 'POSTALCODE' => 'POSTALCODE', + 'STREET' => 'STREET', + 'STREETNUMBER' => 'STREETNUMBER', + 'GEOCODE' => 'GEOCODE', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::BAPI_TTET_ADDRESS_COM + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +BAPI_TTET_ADDRESS_COM from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * COUNTRY2 + + +=item * REGION + + +=item * COUNTY + + +=item * CITY + + +=item * POSTALCODE + + +=item * STREET + + +=item * STREETNUMBER + + +=item * GEOCODE + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::BAPI_TTET_ADDRESS_COM + COUNTRY2 => $some_value, # char2 + REGION => $some_value, # char3 + COUNTY => $some_value, # char30 + CITY => $some_value, # char30 + POSTALCODE => $some_value, # char10 + STREET => $some_value, # char30 + STREETNUMBER => $some_value, # char5 + GEOCODE => $some_value, # char32 + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/CRMT_SERVICE_REQUEST_TEXT.pm b/perllib/BarnetTypes/CRMT_SERVICE_REQUEST_TEXT.pm new file mode 100644 index 000000000..39e2ad1ce --- /dev/null +++ b/perllib/BarnetTypes/CRMT_SERVICE_REQUEST_TEXT.pm @@ -0,0 +1,102 @@ +package BarnetTypes::CRMT_SERVICE_REQUEST_TEXT; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %TEXT_LINE_of :ATTR(:get<TEXT_LINE>); + +__PACKAGE__->_factory( + [ qw( TEXT_LINE + + ) ], + { + 'TEXT_LINE' => \%TEXT_LINE_of, + }, + { + 'TEXT_LINE' => 'BarnetTypes::char132', + }, + { + + 'TEXT_LINE' => 'TEXT_LINE', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::CRMT_SERVICE_REQUEST_TEXT + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +CRMT_SERVICE_REQUEST_TEXT from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * TEXT_LINE + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT + TEXT_LINE => $some_value, # char132 + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/RfcException/Message.pm b/perllib/BarnetTypes/RfcException/Message.pm new file mode 100644 index 000000000..71b94bf7c --- /dev/null +++ b/perllib/BarnetTypes/RfcException/Message.pm @@ -0,0 +1,111 @@ +package BarnetTypes::RfcException::Message; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %ID_of :ATTR(:get<ID>); +my %Number_of :ATTR(:get<Number>); + +__PACKAGE__->_factory( + [ qw( ID + Number + + ) ], + { + 'ID' => \%ID_of, + 'Number' => \%Number_of, + }, + { + 'ID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Number' => 'BarnetTypes::RfcException::Message::Number', + }, + { + + 'ID' => 'ID', + 'Number' => 'Number', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::RfcException::Message + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +RfcException.Message from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * ID + + +=item * Number + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::RfcException::Message + ID => $some_value, # string + Number => $some_value, # RfcException.Message.Number + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/RfcException/Message/Number.pm b/perllib/BarnetTypes/RfcException/Message/Number.pm new file mode 100644 index 000000000..9353df454 --- /dev/null +++ b/perllib/BarnetTypes/RfcException/Message/Number.pm @@ -0,0 +1,65 @@ +package BarnetTypes::RfcException::Message::Number; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +RfcException.Message.Number from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/TABLE_OF_BAPIRET2.pm b/perllib/BarnetTypes/TABLE_OF_BAPIRET2.pm new file mode 100644 index 000000000..c248bc907 --- /dev/null +++ b/perllib/BarnetTypes/TABLE_OF_BAPIRET2.pm @@ -0,0 +1,117 @@ +package BarnetTypes::TABLE_OF_BAPIRET2; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %item_of :ATTR(:get<item>); + +__PACKAGE__->_factory( + [ qw( item + + ) ], + { + 'item' => \%item_of, + }, + { + 'item' => 'BarnetTypes::BAPIRET2', + }, + { + + 'item' => 'item', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::TABLE_OF_BAPIRET2 + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +TABLE_OF_BAPIRET2 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * item + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::TABLE_OF_BAPIRET2 + item => { # BarnetTypes::BAPIRET2 + TYPE => $some_value, # char1 + ID => $some_value, # char20 + NUMBER => $some_value, # numeric3 + MESSAGE => $some_value, # char220 + LOG_NO => $some_value, # char20 + LOG_MSG_NO => $some_value, # numeric6 + MESSAGE_V1 => $some_value, # char50 + MESSAGE_V2 => $some_value, # char50 + MESSAGE_V3 => $some_value, # char50 + MESSAGE_V4 => $some_value, # char50 + PARAMETER => $some_value, # char32 + ROW => $some_value, # int + FIELD => $some_value, # char30 + SYSTEM => $some_value, # char10 + }, + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/TABLE_OF_CRMT_SERVICE_REQUEST_TEXT.pm b/perllib/BarnetTypes/TABLE_OF_CRMT_SERVICE_REQUEST_TEXT.pm new file mode 100644 index 000000000..62eb7b774 --- /dev/null +++ b/perllib/BarnetTypes/TABLE_OF_CRMT_SERVICE_REQUEST_TEXT.pm @@ -0,0 +1,104 @@ +package BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %item_of :ATTR(:get<item>); + +__PACKAGE__->_factory( + [ qw( item + + ) ], + { + 'item' => \%item_of, + }, + { + 'item' => 'BarnetTypes::CRMT_SERVICE_REQUEST_TEXT', + }, + { + + 'item' => 'item', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +TABLE_OF_CRMT_SERVICE_REQUEST_TEXT from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * item + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::TABLE_OF_CRMT_SERVICE_REQUEST_TEXT + item => { # BarnetTypes::CRMT_SERVICE_REQUEST_TEXT + TEXT_LINE => $some_value, # char132 + }, + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcException.pm b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcException.pm new file mode 100644 index 000000000..8d04adf53 --- /dev/null +++ b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcException.pm @@ -0,0 +1,123 @@ +package BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException; +use strict; +use warnings; + + +__PACKAGE__->_set_element_form_qualified(0); + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions' }; + +our $XML_ATTRIBUTE_CLASS; +undef $XML_ATTRIBUTE_CLASS; + +sub __get_attr_class { + return $XML_ATTRIBUTE_CLASS; +} + +use Class::Std::Fast::Storable constructor => 'none'; +use base qw(SOAP::WSDL::XSD::Typelib::ComplexType); + +Class::Std::initialize(); + +{ # BLOCK to scope variables + +my %Name_of :ATTR(:get<Name>); +my %Text_of :ATTR(:get<Text>); +my %Message_of :ATTR(:get<Message>); + +__PACKAGE__->_factory( + [ qw( Name + Text + Message + + ) ], + { + 'Name' => \%Name_of, + 'Text' => \%Text_of, + 'Message' => \%Message_of, + }, + { + 'Name' => 'BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcExceptions', + 'Text' => 'SOAP::WSDL::XSD::Typelib::Builtin::string', + 'Message' => 'BarnetTypes::RfcException::Message', + }, + { + + 'Name' => 'Name', + 'Text' => 'Text', + 'Message' => 'Message', + } +); + +} # end BLOCK + + + + + + + +1; + + +=pod + +=head1 NAME + +BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined complexType +Z_CRM_SERVICE_ORDER_CREATE.RfcException from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + + +=head2 PROPERTIES + +The following properties may be accessed using get_PROPERTY / set_PROPERTY +methods: + +=over + +=item * Name + + +=item * Text + + +=item * Message + + + + +=back + + +=head1 METHODS + +=head2 new + +Constructor. The following data structure may be passed to new(): + + { # BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcException + Name => $some_value, # Z_CRM_SERVICE_ORDER_CREATE.RfcExceptions + Text => $some_value, # string + Message => { # BarnetTypes::RfcException::Message + ID => $some_value, # string + Number => $some_value, # RfcException.Message.Number + }, + }, + + + + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcExceptions.pm b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcExceptions.pm new file mode 100644 index 000000000..ffc2237bc --- /dev/null +++ b/perllib/BarnetTypes/Z_CRM_SERVICE_ORDER_CREATE/RfcExceptions.pm @@ -0,0 +1,65 @@ +package BarnetTypes::Z_CRM_SERVICE_ORDER_CREATE::RfcExceptions; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +Z_CRM_SERVICE_ORDER_CREATE.RfcExceptions from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char1.pm b/perllib/BarnetTypes/char1.pm new file mode 100644 index 000000000..d0bab8e5e --- /dev/null +++ b/perllib/BarnetTypes/char1.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char1; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char1 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char10.pm b/perllib/BarnetTypes/char10.pm new file mode 100644 index 000000000..6ff454e4b --- /dev/null +++ b/perllib/BarnetTypes/char10.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char10; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char10 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char132.pm b/perllib/BarnetTypes/char132.pm new file mode 100644 index 000000000..46a41077b --- /dev/null +++ b/perllib/BarnetTypes/char132.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char132; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char132 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char2.pm b/perllib/BarnetTypes/char2.pm new file mode 100644 index 000000000..35c476fbe --- /dev/null +++ b/perllib/BarnetTypes/char2.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char2; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char2 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char20.pm b/perllib/BarnetTypes/char20.pm new file mode 100644 index 000000000..1c2df092a --- /dev/null +++ b/perllib/BarnetTypes/char20.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char20; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char20 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char220.pm b/perllib/BarnetTypes/char220.pm new file mode 100644 index 000000000..7ccde81f8 --- /dev/null +++ b/perllib/BarnetTypes/char220.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char220; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char220 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char241.pm b/perllib/BarnetTypes/char241.pm new file mode 100644 index 000000000..e6567554f --- /dev/null +++ b/perllib/BarnetTypes/char241.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char241; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char241 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char3.pm b/perllib/BarnetTypes/char3.pm new file mode 100644 index 000000000..f9d001cda --- /dev/null +++ b/perllib/BarnetTypes/char3.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char3; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char3 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char30.pm b/perllib/BarnetTypes/char30.pm new file mode 100644 index 000000000..91d98eb30 --- /dev/null +++ b/perllib/BarnetTypes/char30.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char30; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char30 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char32.pm b/perllib/BarnetTypes/char32.pm new file mode 100644 index 000000000..c5efdaabd --- /dev/null +++ b/perllib/BarnetTypes/char32.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char32; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char32 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char35.pm b/perllib/BarnetTypes/char35.pm new file mode 100644 index 000000000..40aef3d7a --- /dev/null +++ b/perllib/BarnetTypes/char35.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char35; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char35 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char40.pm b/perllib/BarnetTypes/char40.pm new file mode 100644 index 000000000..4402875c1 --- /dev/null +++ b/perllib/BarnetTypes/char40.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char40; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char40 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char5.pm b/perllib/BarnetTypes/char5.pm new file mode 100644 index 000000000..fed108437 --- /dev/null +++ b/perllib/BarnetTypes/char5.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char5; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char5 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/char50.pm b/perllib/BarnetTypes/char50.pm new file mode 100644 index 000000000..34e5720d1 --- /dev/null +++ b/perllib/BarnetTypes/char50.pm @@ -0,0 +1,65 @@ +package BarnetTypes::char50; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +char50 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/numeric3.pm b/perllib/BarnetTypes/numeric3.pm new file mode 100644 index 000000000..c473d2866 --- /dev/null +++ b/perllib/BarnetTypes/numeric3.pm @@ -0,0 +1,65 @@ +package BarnetTypes::numeric3; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +numeric3 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/BarnetTypes/numeric6.pm b/perllib/BarnetTypes/numeric6.pm new file mode 100644 index 000000000..b5438c1aa --- /dev/null +++ b/perllib/BarnetTypes/numeric6.pm @@ -0,0 +1,65 @@ +package BarnetTypes::numeric6; +use strict; +use warnings; + +sub get_xmlns { 'urn:sap-com:document:sap:rfc:functions'}; + +# derivation by restriction +use base qw( + SOAP::WSDL::XSD::Typelib::Builtin::string); + + + +1; + +__END__ + +=pod + +=head1 NAME + + + +=head1 DESCRIPTION + +Perl data type class for the XML Schema defined simpleType +numeric6 from the namespace urn:sap-com:document:sap:rfc:functions. + + + + + +This clase is derived from + SOAP::WSDL::XSD::Typelib::Builtin::string +. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly +like it's base type. + +# Description of restrictions not implemented yet. + + +=head1 METHODS + +=head2 new + +Constructor. + +=head2 get_value / set_value + +Getter and setter for the simpleType's value. + +=head1 OVERLOADING + +Depending on the simple type's base type, the following operations are overloaded + + Stringification + Numerification + Boolification + +Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information. + +=head1 AUTHOR + +Generated by SOAP::WSDL + +=cut + diff --git a/perllib/Catalyst/Plugin/Session/State/Cookie.pm b/perllib/Catalyst/Plugin/Session/State/Cookie.pm index c4b61123b..e0a651ed9 100644 --- a/perllib/Catalyst/Plugin/Session/State/Cookie.pm +++ b/perllib/Catalyst/Plugin/Session/State/Cookie.pm @@ -50,6 +50,10 @@ sub update_session_cookie { sub cookie_is_rejecting { my ( $c, $cookie ) = @_; + # Don't output cookie for JS or JPEG files. mySociety addition + return 1 if substr($c->request->path, -3) eq '.js' + || substr($c->request->path, -5) eq '.jpeg'; + if ( $cookie->{path} ) { return 1 if index '/'.$c->request->path, $cookie->{path}; } diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 83f77f401..198acade6 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -6,6 +6,7 @@ BEGIN { extends 'Catalyst::Controller'; } use POSIX qw(strftime strcoll); use Digest::MD5 qw(md5_hex); +use mySociety::EmailUtil qw(is_valid_email); =head1 NAME @@ -473,17 +474,33 @@ sub search_reports : Path('search_reports') { $c->model('DB')->schema->storage->sql_maker->quote_char( '"' ); $c->model('DB')->schema->storage->sql_maker->name_sep( '.' ); + my $query; + if (is_valid_email($search)) { + $query = [ + 'user.email' => { ilike => $like_search }, + ]; + } elsif ($search =~ /^id:(\d+)$/) { + $query = [ + 'me.id' => int($1), + ]; + } elsif ($search =~ /^area:(\d+)$/) { + $query = [ + 'me.areas' => { like => "%,$1,%" } + ]; + } else { + $query = [ + 'me.id' => $search_n, + 'user.email' => { ilike => $like_search }, + 'me.name' => { ilike => $like_search }, + title => { ilike => $like_search }, + detail => { ilike => $like_search }, + council => { like => $like_search }, + cobrand_data => { like => $like_search }, + ]; + } my $problems = $c->cobrand->problems->search( { - -or => [ - 'me.id' => $search_n, - 'user.email' => { ilike => $like_search }, - 'me.name' => { ilike => $like_search }, - title => { ilike => $like_search }, - detail => { ilike => $like_search }, - council => { like => $like_search }, - cobrand_data => { like => $like_search }, - ] + -or => $query, }, { prefetch => 'user', @@ -499,26 +516,44 @@ sub search_reports : Path('search_reports') { $c->stash->{edit_council_contacts} = 1 if ( grep {$_ eq 'councilcontacts'} keys %{$c->stash->{allowed_pages}}); - my $updates = $c->model('DB::Comment')->search( - { - -or => [ - 'me.id' => $search_n, - 'problem.id' => $search_n, - 'user.email' => { ilike => $like_search }, - 'me.name' => { ilike => $like_search }, - text => { ilike => $like_search }, - 'me.cobrand_data' => { ilike => $like_search }, - %{ $site_restriction }, - ] - }, - { - -select => [ 'me.*', qw/problem.council problem.state/ ], - prefetch => [qw/user problem/], - order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] - } - ); + if (is_valid_email($search)) { + $query = [ + 'user.email' => { ilike => $like_search }, + %{ $site_restriction }, + ]; + } elsif ($search =~ /^id:(\d+)$/) { + $query = [ + 'me.id' => int($1), + 'problem.id' => int($1), + %{ $site_restriction }, + ]; + } elsif ($search =~ /^area:(\d+)$/) { + $query = []; + } else { + $query = [ + 'me.id' => $search_n, + 'problem.id' => $search_n, + 'user.email' => { ilike => $like_search }, + 'me.name' => { ilike => $like_search }, + text => { ilike => $like_search }, + 'me.cobrand_data' => { ilike => $like_search }, + %{ $site_restriction }, + ]; + } - $c->stash->{updates} = [ $updates->all ]; + if (@$query) { + my $updates = $c->model('DB::Comment')->search( + { + -or => $query, + }, + { + -select => [ 'me.*', qw/problem.council problem.state/ ], + prefetch => [qw/user problem/], + order_by => [\"(me.state='hidden')",\"(problem.state='hidden')",'me.created'] + } + ); + $c->stash->{updates} = [ $updates->all ]; + } # Switch quoting back off. See above for explanation of this. $c->model('DB')->schema->storage->sql_maker->quote_char( '' ); diff --git a/perllib/FixMyStreet/App/Controller/JS.pm b/perllib/FixMyStreet/App/Controller/JS.pm new file mode 100755 index 000000000..ae2f06605 --- /dev/null +++ b/perllib/FixMyStreet/App/Controller/JS.pm @@ -0,0 +1,30 @@ +package FixMyStreet::App::Controller::JS; +use Moose; +use namespace::autoclean; + +BEGIN { extends 'Catalyst::Controller'; } + +=head1 NAME + +FixMyStreet::App::Controller::JS - Catalyst Controller + +=head1 DESCRIPTION + +JS Catalyst Controller. To return a language-dependent list +of validation strings. + +=head1 METHODS + +=cut + +sub validation_strings : LocalRegex('^validation_strings\.(.*?)\.js$') : Args(0) { + my ( $self, $c ) = @_; + my $lang = $c->req->captures->[0]; + $c->cobrand->set_lang_and_domain( $lang, 1 ); + $c->res->content_type( 'application/javascript' ); +} + +__PACKAGE__->meta->make_immutable; + +1; + diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm index 60e9dd09f..3de83b265 100644 --- a/perllib/FixMyStreet/App/Controller/My.pm +++ b/perllib/FixMyStreet/App/Controller/My.pm @@ -30,9 +30,16 @@ sub my : Path : Args(0) { my $pins = []; my $problems = {}; - my $rs = $c->user->problems->search( { + + my $params = { state => [ FixMyStreet::DB::Result::Problem->visible_states() ], - }, { + }; + $params = { + %{ $c->cobrand->problems_clause }, + %$params + } if $c->cobrand->problems_clause; + + my $rs = $c->user->problems->search( $params, { order_by => { -desc => 'confirmed' }, rows => 50 } )->page( $p_page ); diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index 8711b19e9..a84c538cc 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -5,6 +5,7 @@ use namespace::autoclean; BEGIN {extends 'Catalyst::Controller'; } use DateTime::Format::HTTP; +use Digest::SHA1 qw(sha1_hex); use Path::Class; =head1 NAME @@ -36,7 +37,7 @@ sub during :LocalRegex('^([0-9a-f]{40})\.temp\.jpeg$') { if ( $c->cobrand->default_photo_resize ) { $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); } else { - $photo = _shrink( $photo, 'x250' ); + $photo = _shrink( $photo, '250x250' ); } $c->forward( 'output', [ $photo ] ); @@ -85,7 +86,7 @@ sub index :LocalRegex('^(c/)?(\d+)(?:\.(full|tn|fp))?\.jpeg$') { } elsif ( $c->cobrand->default_photo_resize ) { $photo = _shrink( $photo, $c->cobrand->default_photo_resize ); } else { - $photo = _shrink( $photo, 'x250' ); + $photo = _shrink( $photo, '250x250' ); } $c->forward( 'output', [ $photo ] ); @@ -114,6 +115,7 @@ sub _shrink { $image->BlobToImage($photo); my $err = $image->Scale(geometry => "$size>"); throw Error::Simple("resize failed: $err") if "$err"; + $image->Strip(); my @blobs = $image->ImageToBlob(); undef $image; return $blobs[0]; @@ -129,11 +131,101 @@ sub _crop { throw Error::Simple("resize failed: $err") if "$err"; $err = $image->Extent( geometry => '90x60', gravity => 'Center' ); throw Error::Simple("resize failed: $err") if "$err"; + $image->Strip(); my @blobs = $image->ImageToBlob(); undef $image; return $blobs[0]; } +=head2 process_photo + +Handle the photo - either checking and storing it after an upload or retrieving +it from the cache. + +Store any error message onto 'photo_error' in stash. +=cut + +sub process_photo : Private { + my ( $self, $c ) = @_; + + return + $c->forward('process_photo_upload') + || $c->forward('process_photo_cache') + || 1; # always return true +} + +sub process_photo_upload : Private { + my ( $self, $c ) = @_; + + # check for upload or return + my $upload = $c->req->upload('photo') + || return; + + # check that the photo is a jpeg + my $ct = $upload->type; + $ct =~ s/x-citrix-//; # Thanks, Citrix + # Had a report of a JPEG from an Android 2.1 coming through as a byte stream + unless ( $ct eq 'image/jpeg' || $ct eq 'image/pjpeg' || $ct eq 'application/octet-stream' ) { + $c->stash->{photo_error} = _('Please upload a JPEG image only'); + return; + } + + # get the photo into a variable + my $photo_blob = eval { + my $filename = $upload->tempname; + my $out = `jhead -se -autorot $filename 2>&1`; + die _("Please upload a JPEG image only"."\n") if $out =~ /Not JPEG:/; + my $photo = $upload->slurp; + return $photo; + }; + if ( my $error = $@ ) { + my $format = _( +"That image doesn't appear to have uploaded correctly (%s), please try again." + ); + $c->stash->{photo_error} = sprintf( $format, $error ); + return; + } + + # we have an image we can use - save it to the upload dir for storage + my $cache_dir = dir( $c->config->{UPLOAD_DIR} ); + $cache_dir->mkpath; + unless ( -d $cache_dir && -w $cache_dir ) { + warn "Can't find/write to photo cache directory '$cache_dir'"; + return; + } + + my $fileid = sha1_hex($photo_blob); + $upload->copy_to( file($cache_dir, $fileid . '.jpeg') ); + + # stick the hash on the stash, so don't have to reupload in case of error + $c->stash->{upload_fileid} = $fileid; + + return 1; +} + +=head2 process_photo_cache + +Look for the upload_fileid parameter and check it matches a file on disk. If it +does return true and put fileid on stash, otherwise false. + +=cut + +sub process_photo_cache : Private { + my ( $self, $c ) = @_; + + # get the fileid and make sure it is just a hex number + my $fileid = $c->req->param('upload_fileid') || ''; + $fileid =~ s{[^0-9a-f]}{}gi; + return unless $fileid; + + my $file = file( $c->config->{UPLOAD_DIR}, "$fileid.jpeg" ); + return unless -e $file; + + $c->stash->{upload_fileid} = $fileid; + return 1; +} + + =head1 AUTHOR Struan Donald diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index 6ed7ddd9d..fe71f3fbb 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -244,7 +244,7 @@ sub process_questionnaire : Private { push @errors, _('Please provide some explanation as to why you\'re reopening this report') if $c->stash->{been_fixed} eq 'No' && $c->stash->{problem}->is_fixed() && !$c->stash->{update}; - $c->forward('/report/new/process_photo'); + $c->forward('/photo/process_photo'); push @errors, $c->stash->{photo_error} if $c->stash->{photo_error}; diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 59e3a4410..afe180c29 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -51,7 +51,7 @@ sub display : Path('') : Args(1) { return $c->res->redirect( $c->uri_for($1), 301 ); } - $c->forward('load_problem_or_display_error', [ $id ] ); + $c->forward( 'load_problem_or_display_error', [ $id ] ); $c->forward( 'load_updates' ); $c->forward( 'format_problem_for_display' ); } @@ -88,7 +88,24 @@ sub load_updates : Private { { order_by => 'confirmed' } ); - $c->stash->{updates} = $updates; + my $questionnaires = $c->model('DB::Questionnaire')->search( + { + problem_id => $c->stash->{problem}->id, + whenanswered => { '!=', undef }, + old_state => 'confirmed', new_state => 'confirmed', + }, + { order_by => 'whenanswered' } + ); + + my @combined; + while (my $update = $updates->next) { + push @combined, [ $update->confirmed, $update ]; + } + while (my $update = $questionnaires->next) { + push @combined, [ $update->whenanswered, $update ]; + } + @combined = map { $_->[1] } sort { $a->[0] <=> $b->[0] } @combined; + $c->stash->{updates} = \@combined; return 1; } diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index 70dee63c6..70f937eed 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -5,7 +5,6 @@ use namespace::autoclean; BEGIN { extends 'Catalyst::Controller'; } use FixMyStreet::Geocode; -use Digest::SHA1 qw(sha1_hex); use Encode; use Image::Magick; use List::MoreUtils qw(uniq); @@ -78,6 +77,8 @@ partial =cut +use constant COUNCIL_ID_BARNET => 2489; + sub report_new : Path : Args(0) { my ( $self, $c ) = @_; @@ -97,7 +98,7 @@ sub report_new : Path : Args(0) { return unless $c->forward('check_form_submitted'); $c->forward('process_user'); $c->forward('process_report'); - $c->forward('process_photo'); + $c->forward('/photo/process_photo'); return unless $c->forward('check_for_errors'); $c->forward('save_user_and_report'); $c->forward('redirect_or_confirm_creation'); @@ -171,9 +172,14 @@ sub report_form_ajax : Path('ajax') : Args(0) { $c->forward('initialize_report'); # work out the location for this report and do some checks - # XXX We don't want to do this here if this actually happens! - return $c->forward('redirect_to_around') - unless $c->forward('determine_location'); + if ( ! $c->forward('determine_location') ) { + my $body = JSON->new->utf8(1)->encode( { + error => $c->stash->{location_error}, + } ); + $c->res->content_type('application/json; charset=utf-8'); + $c->res->body($body); + return; + } $c->forward('setup_categories_and_councils'); @@ -266,7 +272,7 @@ sub report_import : Path('/import') { } # handle the photo upload - $c->forward( 'process_photo_upload' ); + $c->forward( '/photo/process_photo_upload' ); my $fileid = $c->stash->{upload_fileid}; if ( my $error = $c->stash->{photo_error} ) { push @errors, $error; @@ -602,9 +608,15 @@ sub setup_categories_and_councils : Private { } elsif ($first_council->{type} eq 'LBO') { $area_ids_to_list{ $first_council->{id} } = 1; + my @local_categories; + if ($first_council->{id} == COUNCIL_ID_BARNET) { + @local_categories = sort(keys %{ Utils::barnet_categories() }); # removed 'Other' option + } else { + @local_categories = sort keys %{ Utils::london_categories() } + } @category_options = ( _('-- Pick a category --'), - sort keys %{ Utils::london_categories() } + @local_categories ); $category_label = _('Category:'); @@ -791,8 +803,15 @@ sub process_report : Private { $councils = join( ',', @{ $c->stash->{area_ids_to_list} } ) || -1; $report->council( $councils ); - } elsif ( $first_council->{type} eq 'LBO') { + } elsif ( $first_council->{id} == COUNCIL_ID_BARNET ) { + unless ( exists Utils::barnet_categories()->{ $report->category } or $report->category eq 'Other') { + $c->stash->{field_errors}->{category} = _('Please choose a category'); + } + $report->council( $first_council->{id} ); + + } elsif ( $first_council->{type} eq 'LBO') { + unless ( Utils::london_categories()->{ $report->category } ) { $c->stash->{field_errors}->{category} = _('Please choose a category'); } @@ -871,91 +890,6 @@ sub process_report : Private { return 1; } -=head2 process_photo - -Handle the photo - either checking and storing it after an upload or retrieving -it from the cache. - -Store any error message onto 'photo_error' in stash. -=cut - -sub process_photo : Private { - my ( $self, $c ) = @_; - - return - $c->forward('process_photo_upload') - || $c->forward('process_photo_cache') - || 1; # always return true -} - -sub process_photo_upload : Private { - my ( $self, $c ) = @_; - - # check for upload or return - my $upload = $c->req->upload('photo') - || return; - - # check that the photo is a jpeg - my $ct = $upload->type; - unless ( $ct eq 'image/jpeg' || $ct eq 'image/pjpeg' ) { - $c->stash->{photo_error} = _('Please upload a JPEG image only'); - return; - } - - # get the photo into a variable - my $photo_blob = eval { - my $filename = $upload->tempname; - my $out = `jhead -se -autorot $filename`; - my $photo = $upload->slurp; - return $photo; - }; - if ( my $error = $@ ) { - my $format = _( -"That image doesn't appear to have uploaded correctly (%s), please try again." - ); - $c->stash->{photo_error} = sprintf( $format, $error ); - return; - } - - # we have an image we can use - save it to the upload dir for storage - my $cache_dir = dir( $c->config->{UPLOAD_DIR} ); - $cache_dir->mkpath; - unless ( -d $cache_dir && -w $cache_dir ) { - warn "Can't find/write to photo cache directory '$cache_dir'"; - return; - } - - my $fileid = sha1_hex($photo_blob); - $upload->copy_to( file($cache_dir, $fileid . '.jpeg') ); - - # stick the hash on the stash, so don't have to reupload in case of error - $c->stash->{upload_fileid} = $fileid; - - return 1; -} - -=head2 process_photo_cache - -Look for the upload_fileid parameter and check it matches a file on disk. If it -does return true and put fileid on stash, otherwise false. - -=cut - -sub process_photo_cache : Private { - my ( $self, $c ) = @_; - - # get the fileid and make sure it is just a hex number - my $fileid = $c->req->param('upload_fileid') || ''; - $fileid =~ s{[^0-9a-f]}{}gi; - return unless $fileid; - - my $file = file( $c->config->{UPLOAD_DIR}, "$fileid.jpeg" ); - return unless -e $file; - - $c->stash->{upload_fileid} = $fileid; - return 1; -} - =head2 check_for_errors Examine the user and the report for errors. If found put them on stash and diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 15444f556..8a87fe7a2 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -23,7 +23,7 @@ sub report_update : Path : Args(0) { $c->forward( '/report/load_problem_or_display_error', [ $c->req->param('id') ] ); $c->forward('process_update'); $c->forward('process_user'); - $c->forward('/report/new/process_photo'); + $c->forward('/photo/process_photo'); $c->forward('check_for_errors') or $c->go( '/report/display', [ $c->req->param('id') ] ); diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index e7620f755..9fb72121e 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -341,9 +341,11 @@ sub load_and_group_problems : Private { { columns => [ 'id', 'council', 'state', 'areas', 'latitude', 'longitude', 'title', 'cobrand', - { duration => { extract => "epoch from current_timestamp-lastupdate" } }, - { age => { extract => "epoch from current_timestamp-confirmed" } }, - { confirmed => { extract => 'epoch from confirmed' } }, + #{ duration => { extract => "epoch from current_timestamp-lastupdate" } }, + #{ age => { extract => "epoch from current_timestamp-confirmed" } }, + { confirmed => { extract => 'epoch from confirmed' } }, + { whensent => { extract => 'epoch from whensent' } }, + { lastupdate => { extract => 'epoch from lastupdate' } }, { photo => 'photo is not null' }, ], order_by => { -desc => 'lastupdate' }, @@ -355,9 +357,10 @@ sub load_and_group_problems : Private { my ( %problems, @pins ); my $re_councils = join('|', keys %{$c->stash->{areas_info}}); - my @cols = ( 'id', 'council', 'state', 'areas', 'latitude', 'longitude', 'title', 'cobrand', 'duration', 'age', 'confirmed', 'photo' ); + my @cols = ( 'id', 'council', 'state', 'areas', 'latitude', 'longitude', 'title', 'cobrand', 'confirmed', 'whensent', 'lastupdate', 'photo' ); while ( my @problem = $problems->next ) { my %problem = zip @cols, @problem; + $problem{is_fixed} = FixMyStreet::DB::Result::Problem->fixed_states()->{$problem{state}}; $c->log->debug( $problem{'cobrand'} . ', cobrand is ' . $c->cobrand->moniker ); if ( !$problem{council} ) { # Problem was not sent to any council, add to possible councils diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm index 9cdf0b523..7f7d7f5fd 100644 --- a/perllib/FixMyStreet/App/Controller/Root.pm +++ b/perllib/FixMyStreet/App/Controller/Root.pm @@ -68,7 +68,7 @@ Forward to the standard 404 error page sub default : Path { my ( $self, $c ) = @_; - $c->detach('/page_error_404_not_found'); + $c->detach('/page_error_404_not_found', []); } =head2 page_error_404_not_found, page_error_410_gone diff --git a/perllib/FixMyStreet/App/Controller/Static.pm b/perllib/FixMyStreet/App/Controller/Static.pm index 52b230c27..d4b7a1b83 100755 --- a/perllib/FixMyStreet/App/Controller/Static.pm +++ b/perllib/FixMyStreet/App/Controller/Static.pm @@ -29,6 +29,10 @@ sub for_councils_faq : Path('/for-councils/faq') : Args(0) { my ( $self, $c ) = @_; } +sub privacy : Global : Args(0) { + my ( $self, $c ) = @_; +} + sub faq : Global : Args(0) { my ( $self, $c ) = @_; diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index 755f1e405..092e362f9 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -75,6 +75,7 @@ sprintf (different name to avoid clash) sub tprintf { my ( $self, $c, $format, @args ) = @_; + @args = @{$args[0]} if ref $args[0] eq 'ARRAY'; return sprintf $format, @args; } diff --git a/perllib/FixMyStreet/Cobrand/Barnet.pm b/perllib/FixMyStreet/Cobrand/Barnet.pm index 9791b071a..6f115ec63 100644 --- a/perllib/FixMyStreet/Cobrand/Barnet.pm +++ b/perllib/FixMyStreet/Cobrand/Barnet.pm @@ -10,7 +10,9 @@ sub council_name { return 'Barnet Council'; } sub council_url { return 'barnet'; } sub disambiguate_location { + my $self = shift; return { + %{ $self->SUPER::disambiguate_location() }, centre => '51.612832,-0.218169', span => '0.0563,0.09', bounds => [ '51.584682,-0.263169', '51.640982,-0.173169' ], diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm new file mode 100644 index 000000000..75174b638 --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -0,0 +1,35 @@ +package FixMyStreet::Cobrand::Bromley; +use base 'FixMyStreet::Cobrand::UKCouncils'; + +use strict; +use warnings; + +sub council_id { return 2482; } +sub council_area { return 'Bromley'; } +sub council_name { return 'Bromley Council'; } +sub council_url { return 'bromley'; } + +sub path_to_web_templates { + my $self = shift; + return [ + FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify, + FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify + ]; +} + +sub disambiguate_location { + my $self = shift; + return { + %{ $self->SUPER::disambiguate_location() }, + centre => '51.366836,0.040623', + span => '0.154963,0.24347', + bounds => [ '51.289355,-0.081112', '51.444318,0.162358' ], + }; +} + +sub example_places { + return ( 'BR1 3UH', 'Glebe Rd, Bromley' ); +} + +1; + diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index aacfb5e2b..c45c36b0b 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -239,6 +239,8 @@ Returns disambiguating information available sub disambiguate_location { return { country => 'uk', + bing_culture => 'en-GB', + bing_country => 'United Kingdom' }; } @@ -457,7 +459,7 @@ sub find_closest { my ( $self, $latitude, $longitude, $problem ) = @_; my $str = ''; - if ( my $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude ) ) { + if ( my $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude, disambiguate_location()->{bing_culture} ) ) { # cache the bing results for use in alerts if ( $problem ) { $problem->geocode( $j ); @@ -504,7 +506,7 @@ sub find_closest_address_for_rss { # if we've not cached it then we don't want to look it up in order to avoid # hammering the bing api # if ( !$j ) { - # $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude, 1 ); + # $j = FixMyStreet::Geocode::Bing::reverse( $latitude, $longitude, disambiguate_location()->{bing_culture}, 1 ); # $problem->geocode( $j ); # $problem->update; @@ -914,5 +916,9 @@ Get stats to display on the council reports page sub get_report_stats { return 0; } +sub example_places { + return [ 'B2 4QA', 'Tib St, Manchester' ]; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/LichfieldDC.pm b/perllib/FixMyStreet/Cobrand/LichfieldDC.pm index 91c5e10ec..4d93aaf76 100644 --- a/perllib/FixMyStreet/Cobrand/LichfieldDC.pm +++ b/perllib/FixMyStreet/Cobrand/LichfieldDC.pm @@ -21,7 +21,9 @@ sub problems_clause { # FIXME - need to double check this is all correct sub disambiguate_location { + my $self = shift; return { + %{ $self->SUPER::disambiguate_location() }, centre => '52.688198,-1.804966', span => '0.1196,0.218675', bounds => [ '52.807793,-1.586291', '52.584891,-1.963232' ], diff --git a/perllib/FixMyStreet/Cobrand/Reading.pm b/perllib/FixMyStreet/Cobrand/Reading.pm index afc2b6ac6..c8591924e 100644 --- a/perllib/FixMyStreet/Cobrand/Reading.pm +++ b/perllib/FixMyStreet/Cobrand/Reading.pm @@ -12,11 +12,13 @@ sub council_name { return 'Reading City Council'; } sub council_url { return 'reading'; } sub disambiguate_location { + my $self = shift; return { + %{ $self->SUPER::disambiguate_location() }, town => 'Reading', - centre => '51.452983169803964,-0.98382678731985973', - span => '0.0833543573028663,0.124500468843446', - bounds => [ '51.409779668156361,-1.0529948144525243', '51.493134025459227,-0.92849434560907829' ], + centre => '51.452983,-0.983827', + span => '0.083355,0.1245', + bounds => [ '51.409779,-1.052994', '51.493134,-0.928494' ], }; } diff --git a/perllib/FixMyStreet/Cobrand/Southampton.pm b/perllib/FixMyStreet/Cobrand/Southampton.pm index 5bb7df3b6..b57091bef 100644 --- a/perllib/FixMyStreet/Cobrand/Southampton.pm +++ b/perllib/FixMyStreet/Cobrand/Southampton.pm @@ -10,7 +10,9 @@ sub council_name { return 'Southampton City Council'; } sub council_url { return 'southampton'; } sub disambiguate_location { + my $self = shift; return { + %{ $self->SUPER::disambiguate_location() }, town => 'Southampton', centre => '50.913822,-1.400493', span => '0.084628,0.15701', diff --git a/perllib/FixMyStreet/DB.pm b/perllib/FixMyStreet/DB.pm index 18c8cc2ca..a1767abe9 100644 --- a/perllib/FixMyStreet/DB.pm +++ b/perllib/FixMyStreet/DB.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB; # Created by DBIx::Class::Schema::Loader @@ -10,8 +11,9 @@ use base 'DBIx::Class::Schema'; __PACKAGE__->load_namespaces; -# Created by DBIx::Class::Schema::Loader v0.07009 @ 2011-03-01 15:43:43 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tJZ+CpaAfZVPrctDXTZTuQ + +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CjFpUvon7KggFM7OF7VK/w # You can replace this text with custom code or comments, and it will be preserved on regeneration 1; diff --git a/perllib/FixMyStreet/DB/Result/Abuse.pm b/perllib/FixMyStreet/DB/Result/Abuse.pm index b1cf9c1ed..e8e554afa 100644 --- a/perllib/FixMyStreet/DB/Result/Abuse.pm +++ b/perllib/FixMyStreet/DB/Result/Abuse.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Abuse; # Created by DBIx::Class::Schema::Loader @@ -7,15 +8,14 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("abuse"); __PACKAGE__->add_columns("email", { data_type => "text", is_nullable => 0 }); __PACKAGE__->set_primary_key("email"); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IuTLiJSDZGLF/WX8q3iKIQ +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:PnQhGMx+ktK++3gWOMJBpQ # You can replace this text with custom code or comments, and it will be preserved on regeneration 1; diff --git a/perllib/FixMyStreet/DB/Result/AdminLog.pm b/perllib/FixMyStreet/DB/Result/AdminLog.pm index da97950a0..ede786871 100644 --- a/perllib/FixMyStreet/DB/Result/AdminLog.pm +++ b/perllib/FixMyStreet/DB/Result/AdminLog.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::AdminLog; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("admin_log"); __PACKAGE__->add_columns( @@ -36,8 +36,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:7427CuN3/6IL2GxiQDoWUA +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+NlSH8U+beRjBZl8CpqK9A # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm index eddd98f37..ca9ad45c2 100644 --- a/perllib/FixMyStreet/DB/Result/Alert.pm +++ b/perllib/FixMyStreet/DB/Result/Alert.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Alert; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("alert"); __PACKAGE__->add_columns( @@ -24,6 +24,8 @@ __PACKAGE__->add_columns( { data_type => "text", is_nullable => 1 }, "parameter2", { data_type => "text", is_nullable => 1 }, + "user_id", + { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, "confirmed", { data_type => "integer", default_value => 0, is_nullable => 0 }, "lang", @@ -40,8 +42,6 @@ __PACKAGE__->add_columns( }, "whendisabled", { data_type => "timestamp", is_nullable => 1 }, - "user_id", - { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to( @@ -50,22 +50,22 @@ __PACKAGE__->belongs_to( { ref => "alert_type" }, { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, ); +__PACKAGE__->has_many( + "alerts_sent", + "FixMyStreet::DB::Result::AlertSent", + { "foreign.alert_id" => "self.id" }, + { cascade_copy => 0, cascade_delete => 0 }, +); __PACKAGE__->belongs_to( "user", "FixMyStreet::DB::Result::User", { id => "user_id" }, { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, ); -__PACKAGE__->has_many( - "alert_sents", - "FixMyStreet::DB::Result::AlertSent", - { "foreign.alert_id" => "self.id" }, - { cascade_copy => 0, cascade_delete => 0 }, -); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:d2TrE9UIZdXu3eXYJH0Zmw +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:vump36YxUO4FQi5Do6DwvA # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/AlertSent.pm b/perllib/FixMyStreet/DB/Result/AlertSent.pm index a901c2fde..a537c95cd 100644 --- a/perllib/FixMyStreet/DB/Result/AlertSent.pm +++ b/perllib/FixMyStreet/DB/Result/AlertSent.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::AlertSent; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("alert_sent"); __PACKAGE__->add_columns( @@ -30,8 +30,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:fTiWIoriQUvHpWc9PpFLvA +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oN+36hDWJuc0hqkCW9BHOw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/AlertType.pm b/perllib/FixMyStreet/DB/Result/AlertType.pm index d23a2983d..3aa9677e0 100644 --- a/perllib/FixMyStreet/DB/Result/AlertType.pm +++ b/perllib/FixMyStreet/DB/Result/AlertType.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::AlertType; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("alert_type"); __PACKAGE__->add_columns( @@ -47,8 +47,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+PKqo7IZ4MlM9ur4V2P9tA +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KDBYzNEAM5lPvZjb9cv22g # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 195fe4019..5b45c63a8 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Comment; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("comment"); __PACKAGE__->add_columns( @@ -20,6 +20,10 @@ __PACKAGE__->add_columns( }, "problem_id", { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, + "user_id", + { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, + "anonymous", + { data_type => "boolean", is_nullable => 0 }, "name", { data_type => "text", is_nullable => 1 }, "website", @@ -48,30 +52,26 @@ __PACKAGE__->add_columns( { data_type => "boolean", is_nullable => 0 }, "mark_open", { data_type => "boolean", default_value => \"false", is_nullable => 0 }, - "user_id", - { data_type => "integer", is_foreign_key => 1, is_nullable => 0 }, - "anonymous", - { data_type => "boolean", is_nullable => 0 }, "problem_state", { data_type => "text", is_nullable => 1 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->belongs_to( - "user", - "FixMyStreet::DB::Result::User", - { id => "user_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, -); -__PACKAGE__->belongs_to( "problem", "FixMyStreet::DB::Result::Problem", { id => "problem_id" }, { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, ); +__PACKAGE__->belongs_to( + "user", + "FixMyStreet::DB::Result::User", + { id => "user_id" }, + { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, +); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-27 10:07:32 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ilLn3dlagg5COdpZDmzrVQ +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:E+96vo/AB0zz1jAEPj/OKw use DateTime::TimeZone; use Image::Size; diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm index 941e4e1bb..c32b75d0c 100644 --- a/perllib/FixMyStreet/DB/Result/Contact.pm +++ b/perllib/FixMyStreet/DB/Result/Contact.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Contact; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("contacts"); __PACKAGE__->add_columns( @@ -40,8 +40,9 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); __PACKAGE__->add_unique_constraint("contacts_area_id_category_idx", ["area_id", "category"]); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-08-01 10:07:59 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4y6yRz4rMN66pBpkzfJJhg + +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hyvU0bMWSFxEPAJT7wqM/Q __PACKAGE__->filter_column( extra => { diff --git a/perllib/FixMyStreet/DB/Result/ContactsHistory.pm b/perllib/FixMyStreet/DB/Result/ContactsHistory.pm index 811a06b44..deb00fb95 100644 --- a/perllib/FixMyStreet/DB/Result/ContactsHistory.pm +++ b/perllib/FixMyStreet/DB/Result/ContactsHistory.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::ContactsHistory; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("contacts_history"); __PACKAGE__->add_columns( @@ -40,8 +40,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("contacts_history_id"); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9APvBwAOebG5g4MGxJuVKQ +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:dN2ueIDoP3d/+Mg1UDqsMw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Open311conf.pm b/perllib/FixMyStreet/DB/Result/Open311conf.pm index 0a5784560..742a12ebd 100644 --- a/perllib/FixMyStreet/DB/Result/Open311conf.pm +++ b/perllib/FixMyStreet/DB/Result/Open311conf.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Open311conf; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("open311conf"); __PACKAGE__->add_columns( @@ -26,13 +26,15 @@ __PACKAGE__->add_columns( { data_type => "text", is_nullable => 1 }, "api_key", { data_type => "text", is_nullable => 1 }, + "send_method", + { data_type => "text", is_nullable => 1 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->add_unique_constraint("open311conf_area_id_key", ["area_id"]); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-07-29 18:09:25 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ryqCpvwjNtQrZm4I3s0hxg +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ClYnPB2gsKapnfHuco5d/w # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index ce7488703..532c209d8 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Problem; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("problem"); __PACKAGE__->add_columns( @@ -84,6 +84,14 @@ __PACKAGE__->add_columns( { data_type => "boolean", default_value => \"false", is_nullable => 0 }, "geocode", { data_type => "bytea", is_nullable => 1 }, + "send_fail_count", + { data_type => "integer", default_value => 0, is_nullable => 0 }, + "send_fail_reason", + { data_type => "text", is_nullable => 1 }, + "send_fail_timestamp", + { data_type => "timestamp", is_nullable => 1 }, + "send_method_used", + { data_type => "text", is_nullable => 1 }, ); __PACKAGE__->set_primary_key("id"); __PACKAGE__->has_many( @@ -92,22 +100,22 @@ __PACKAGE__->has_many( { "foreign.problem_id" => "self.id" }, { cascade_copy => 0, cascade_delete => 0 }, ); -__PACKAGE__->belongs_to( - "user", - "FixMyStreet::DB::Result::User", - { id => "user_id" }, - { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, -); __PACKAGE__->has_many( "questionnaires", "FixMyStreet::DB::Result::Questionnaire", { "foreign.problem_id" => "self.id" }, { cascade_copy => 0, cascade_delete => 0 }, ); +__PACKAGE__->belongs_to( + "user", + "FixMyStreet::DB::Result::User", + { id => "user_id" }, + { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" }, +); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-09-19 14:38:43 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nq8Ufn/SEoDGSrrGlHIxag +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-05-03 16:05:20 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EvwI91Ot7SioQWqwnXRTBQ # Add fake relationship to stored procedure table __PACKAGE__->has_one( @@ -562,7 +570,50 @@ sub body { return $body; } +# returns true if the external id is the council's ref, i.e., useful to publish it +# (by way of an example, the barnet send method returns a useful reference when +# it succeeds, so that is the ref we should show on the problem report page). +# Future: this is installation-dependent so maybe should be using the contact +# data to determine if the external id is public on a council-by-council basis. +# Note: this only makes sense when called on a problem that has been sent! +sub can_display_external_id { + my $self = shift; + if ($self->external_id && $self->send_method_used && $self->send_method_used eq 'barnet') { + return 1; + } + return 0; +} + # TODO Some/much of this could be moved to the template + +# either: +# "sent to council 3 mins later" +# "[Council name] ref: XYZ" +# or +# "sent to council 3 mins later, their ref: XYZ" +# +# Note: some silliness with pronouns and the adjacent comma mean this is +# being presented as a single string rather than two +sub processed_summary_string { + my ( $problem, $c ) = @_; + my ($duration_clause, $external_ref_clause); + if ($problem->whensent) { + $duration_clause = $problem->duration_string($c) + } + if ($problem->can_display_external_id) { + if ($duration_clause) { + $external_ref_clause = sprintf(_('their ref: %s'), $problem->external_id); + } else { + $external_ref_clause = sprintf(_('%s ref: %s'), $problem->external_body, $problem->external_id); + } + } + if ($duration_clause and $external_ref_clause) { + return "$duration_clause, $external_ref_clause" + } else { + return $duration_clause || $external_ref_clause + } +} + sub duration_string { my ( $problem, $c ) = @_; my $body = $problem->body( $c ); diff --git a/perllib/FixMyStreet/DB/Result/Questionnaire.pm b/perllib/FixMyStreet/DB/Result/Questionnaire.pm index cc4ec300b..b6791603a 100644 --- a/perllib/FixMyStreet/DB/Result/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/Result/Questionnaire.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Questionnaire; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("questionnaire"); __PACKAGE__->add_columns( @@ -40,8 +40,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:QNFqqCg6J4SFlg4zwm7TWw +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NGlSRjoBpDoIvK3EueqN6Q use DateTime::TimeZone; diff --git a/perllib/FixMyStreet/DB/Result/Secret.pm b/perllib/FixMyStreet/DB/Result/Secret.pm index 8a1fa671d..449dfec0e 100644 --- a/perllib/FixMyStreet/DB/Result/Secret.pm +++ b/perllib/FixMyStreet/DB/Result/Secret.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Secret; # Created by DBIx::Class::Schema::Loader @@ -7,14 +8,13 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("secret"); __PACKAGE__->add_columns("secret", { data_type => "text", is_nullable => 0 }); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MfqW1K0aFtwpa/1c/UwHjg +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9XiWSKJ1PD3LSYjrSA3drw # You can replace this text with custom code or comments, and it will be preserved on regeneration diff --git a/perllib/FixMyStreet/DB/Result/Session.pm b/perllib/FixMyStreet/DB/Result/Session.pm index 9d5d509dc..4713c99eb 100644 --- a/perllib/FixMyStreet/DB/Result/Session.pm +++ b/perllib/FixMyStreet/DB/Result/Session.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Session; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("sessions"); __PACKAGE__->add_columns( @@ -21,8 +21,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("id"); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:TagSQOXnDttkwfJ7oDH8Yw +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:MVmCn4gLQWXTDIIaDHiVmA # You can replace this text with custom code or comments, and it will be preserved on regeneration 1; diff --git a/perllib/FixMyStreet/DB/Result/Token.pm b/perllib/FixMyStreet/DB/Result/Token.pm index 3a900858d..b223ada3a 100644 --- a/perllib/FixMyStreet/DB/Result/Token.pm +++ b/perllib/FixMyStreet/DB/Result/Token.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::Token; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("token"); __PACKAGE__->add_columns( @@ -27,8 +27,8 @@ __PACKAGE__->add_columns( __PACKAGE__->set_primary_key("scope", "token"); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-23 15:49:48 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:frl+na3HrIzGw9D1t891nA +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:+LLZ8P5GXqPetuGyrra2vw # Trying not to use this # use mySociety::DBHandle qw(dbh); diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index 56d726a8d..e13d88b88 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -1,3 +1,4 @@ +use utf8; package FixMyStreet::DB::Result::User; # Created by DBIx::Class::Schema::Loader @@ -7,7 +8,6 @@ use strict; use warnings; use base 'DBIx::Class::Core'; - __PACKAGE__->load_components("FilterColumn", "InflateColumn::DateTime", "EncodedColumn"); __PACKAGE__->table("users"); __PACKAGE__->add_columns( @@ -53,8 +53,8 @@ __PACKAGE__->has_many( ); -# Created by DBIx::Class::Schema::Loader v0.07010 @ 2011-06-27 10:25:21 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9IHuqRTcHZCqJeBAaiQxzw +# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-08 17:19:55 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tM1LUGrqDeQnF4BDgnYXGQ __PACKAGE__->add_columns( "password" => { diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm index 856d7061e..a24f7c102 100644 --- a/perllib/FixMyStreet/Geocode/Bing.pm +++ b/perllib/FixMyStreet/Geocode/Bing.pm @@ -23,10 +23,11 @@ use Digest::MD5 qw(md5_hex); sub string { my ( $s, $c, $params ) = @_; $s .= '+' . $params->{town} if $params->{town} and $s !~ /$params->{town}/i; - my $url = "http://dev.virtualearth.net/REST/v1/Locations?q=$s&c=en-GB"; # FIXME nb-NO for Norway - $url .= '&mapView=' . $params->{bounds}[0] . ',' . $params->{bounds}[1] + my $url = "http://dev.virtualearth.net/REST/v1/Locations?q=$s"; + $url .= '&userMapView=' . $params->{bounds}[0] . ',' . $params->{bounds}[1] if $params->{bounds}; $url .= '&userLocation=' . $params->{centre} if $params->{centre}; + $url .= '&c=' . $params->{bing_culture} if $params->{bing_culture}; my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'bing/'; my $cache_file = $cache_dir . md5_hex($url); @@ -43,7 +44,7 @@ sub string { if (!$js) { return { error => _('Sorry, we could not parse that location. Please try again.') }; - } elsif ($js =~ /BT\d/) { + } elsif ($js =~ /BT\d/ && $params->{bing_country} eq 'United Kingdom') { return { error => _("We do not currently cover Northern Ireland, I'm afraid.") }; } @@ -54,24 +55,43 @@ sub string { my $results = $js->{resourceSets}->[0]->{resources}; my ( $error, @valid_locations, $latitude, $longitude ); + foreach (@$results) { my $address = $_->{name}; - next unless $_->{address}->{countryRegion} eq 'United Kingdom'; # FIXME This is UK only + next unless $_->{address}->{countryRegion} eq $params->{bing_country}; + + # Getting duplicate, yet different, results from Bing sometimes + next if @valid_locations + && $_->{address}{postalCode} && $valid_locations[-1]{address}{postalCode} eq $_->{address}{postalCode} + && ( $valid_locations[-1]{address}{locality} eq $_->{address}{adminDistrict2} + || $valid_locations[-1]{address}{adminDistrict2} eq $_->{address}{locality} + || $valid_locations[-1]{address}{locality} eq $_->{address}{locality} + ); + ( $latitude, $longitude ) = @{ $_->{point}->{coordinates} }; - push (@$error, { address => $address, latitude => $latitude, longitude => $longitude }); + # These co-ordinates are output as query parameters in a URL, make sure they have a "." + mySociety::Locale::in_gb_locale { + push (@$error, { + address => $address, + latitude => sprintf('%0.6f', $latitude), + longitude => sprintf('%0.6f', $longitude) + }); + }; push (@valid_locations, $_); } + return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1; return { error => $error }; } sub reverse { - my ( $latitude, $longitude, $cache ) = @_; + my ( $latitude, $longitude, $bing_culture, $cache ) = @_; # Get nearest road-type thing from Bing my $key = mySociety::Config::get('BING_MAPS_API_KEY', ''); if ($key) { - my $url = "http://dev.virtualearth.net/REST/v1/Locations/$latitude,$longitude?c=en-GB&key=$key"; + my $url = "http://dev.virtualearth.net/REST/v1/Locations/$latitude,$longitude?key=$key"; + $url .= '&c=' . $bing_culture if $bing_culture; my $j; if ( $cache ) { my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'bing/'; diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm index 83b36dbcd..1ab347066 100644 --- a/perllib/FixMyStreet/Geocode/Google.pm +++ b/perllib/FixMyStreet/Geocode/Google.pm @@ -75,7 +75,14 @@ sub string { my $address = $_->{address}; next unless $c->cobrand->geocoded_string_check( $address ); ( $longitude, $latitude ) = @{ $_->{Point}->{coordinates} }; - push (@$error, { address => $address, latitude => $latitude, longitude => $longitude }); + # These co-ordinates are output as query parameters in a URL, make sure they have a "." + mySociety::Locale::in_gb_locale { + push (@$error, { + address => $address, + latitude => sprintf('%0.6f', $latitude), + longitude => sprintf('%0.6f', $longitude) + }); + }; push (@valid_locations, $_); } return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1; diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm new file mode 100644 index 000000000..9cf6de01f --- /dev/null +++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm @@ -0,0 +1,33 @@ +#!/usr/bin/perl +# +# FixMyStreet:Map::OSM::CycleMap +# OSM CycleMap maps on FixMyStreet. +# +# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. +# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ + +package FixMyStreet::Map::OSM::MapQuest; +use base 'FixMyStreet::Map::OSM'; + +use strict; + +sub map_type { + return 'OpenLayers.Layer.OSM.MapQuestOpen'; +} + +sub map_tiles { + my ($self, $x, $y, $z) = @_; + my $tile_url = $self->base_tile_url(); + return [ + "http://otile1.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png", + "http://otile2.$tile_url/$z/$x/" . ($y - 1) . ".png", + "http://otile3.$tile_url/$z/" . ($x - 1) . "/$y.png", + "http://otile4.$tile_url/$z/$x/$y.png", + ]; +} + +sub base_tile_url { + return 'mqcdn.com/tiles/1.0.0/osm/'; +} + +1; diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index a8cbc98f2..7daf01f56 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -151,7 +151,7 @@ sub delete_user { ok( $p->delete, "delete problem " . $p->title ); } for my $a ( $user->alerts ) { - $a->alert_sents->delete; + $a->alerts_sent->delete; ok( $a->delete, "delete alert " . $a->alert_type ); } ok( $_->delete, "delete comment " . $_->text ) for $user->comments; diff --git a/perllib/SOAP/WSDL/Serializer/XSD.pm b/perllib/SOAP/WSDL/Serializer/XSD.pm new file mode 100644 index 000000000..f233f74e7 --- /dev/null +++ b/perllib/SOAP/WSDL/Serializer/XSD.pm @@ -0,0 +1,148 @@ +#!/usr/bin/perl -w +package SOAP::WSDL::Serializer::XSD; +use strict; +use warnings; +use Class::Std::Fast::Storable; +use Scalar::Util qw(blessed); + +use version; our $VERSION = qv('2.00.10'); + +use SOAP::WSDL::Factory::Serializer; + +my $SOAP_NS = 'http://schemas.xmlsoap.org/soap/envelope/'; +my $XML_INSTANCE_NS = 'http://www.w3.org/2001/XMLSchema-instance'; + +sub serialize { + my ($self, $args_of_ref) = @_; + + my $opt = $args_of_ref->{ options }; + + if (not $opt->{ namespace }->{ $SOAP_NS }) + { + $opt->{ namespace }->{ $SOAP_NS } = 'SOAP-ENV'; + } + + if (not $opt->{ namespace }->{ $XML_INSTANCE_NS }) + { + $opt->{ namespace }->{ $XML_INSTANCE_NS } = 'xsi'; + } + + my $soap_prefix = $opt->{ namespace }->{ $SOAP_NS }; + + # envelope start with namespaces + my $xml = "<$soap_prefix\:Envelope "; + + while (my ($uri, $prefix) = each %{ $opt->{ namespace } }) + { + $xml .= "xmlns:$prefix=\"$uri\" "; + } + # + # add namespace for user-supplied prefix if needed + $xml .= "xmlns:$opt->{prefix}=\"" . $args_of_ref->{ body }->get_xmlns() . "\" " + if $opt->{prefix}; + + # TODO insert encoding + $xml.='>'; + $xml .= $self->serialize_header($args_of_ref->{ method }, $args_of_ref->{ header }, $opt); + $xml .= $self->serialize_body($args_of_ref->{ method }, $args_of_ref->{ body }, $opt); + $xml .= '</' . $soap_prefix .':Envelope>'; + return $xml; +} + +sub serialize_header { + my ($self, $method, $data, $opt) = @_; + + # header is optional. Leave out if there's no header data + return q{} if not $data; + return join ( q{}, + "<$opt->{ namespace }->{ $SOAP_NS }\:Header>", + blessed $data ? $data->serialize_qualified : (), + "</$opt->{ namespace }->{ $SOAP_NS }\:Header>", + ); +} + +sub serialize_body { + my ($self, $method, $data, $opt) = @_; + + # TODO This one wipes out the old class' XML name globally + # Fix in some more appropriate place... + # $data->__set_name("$opt->{prefix}:" . $data->__get_name() ) if $opt->{prefix}; + # fix: -------v from https://rt.cpan.org/Public/Bug/Display.html?id=38035 + if ( $opt->{prefix} ) { + my $body_name = $data->__get_name(); + $body_name =~ s/.+://; + $data->__set_name($opt->{prefix} . ":" . $body_name ); + } + # fix end ----^ + + # Body is NOT optional. Serialize to empty body + # if we have no data. + return join ( q{}, + "<$opt->{ namespace }->{ $SOAP_NS }\:Body>", + defined $data + ? ref $data eq 'ARRAY' + ? join q{}, map { blessed $_ ? $_->serialize_qualified() : () } @{ $data } + : blessed $data + ? $opt->{prefix} + ? $data->serialize() + : $data->serialize_qualified() + : () + : (), + "</$opt->{ namespace }->{ $SOAP_NS }\:Body>", + ); +} + +__END__ + +=pod + +=head1 NAME + +SOAP:WSDL::Serializer::XSD - Serializer for SOAP::WSDL::XSD::Typelib:: objects + +=head1 DESCRIPTION + +This is the default serializer for SOAP::WSDL::Client and Interface classes +generated by SOAP::WSDL + +It may be used as a template for creating custom serializers. + +See L<SOAP::WSDL::Factory::Serializer|SOAP::WSDL::Factory::Serializer> for +details on that. + +=head1 METHODS + +=head2 serialize + +Creates a SOAP envelope based on the body and header arguments passed. + +Sets SOAP namespaces. + +=head2 serialize_body + +Serializes a message body to XML + +=head2 serialize_header + +Serializes a message header to XML + +=head1 LICENSE AND COPYRIGHT + +Copyright (c) 2007 Martin Kutter. All rights reserved. + +This file is part of SOAP-WSDL. You may distribute/modify it under +the same terms as perl itself + +=head1 AUTHOR + +Martin Kutter E<lt>martin.kutter fen-net.deE<gt> + +=head1 REPOSITORY INFORMATION + + $Rev: 851 $ + $LastChangedBy: kutterma $ + $Id: XSD.pm 851 2009-05-15 22:45:18Z kutterma $ + $HeadURL: https://soap-wsdl.svn.sourceforge.net/svnroot/soap-wsdl/SOAP-WSDL/trunk/lib/SOAP/WSDL/Serializer/XSD.pm $ + +=cut + diff --git a/perllib/Utils.pm b/perllib/Utils.pm index 954561a08..6a47fd17d 100644 --- a/perllib/Utils.pm +++ b/perllib/Utils.pm @@ -140,6 +140,47 @@ sub london_categories { }; } +sub barnet_categories { + # The values here are KBIDs from Barnet's system: see bin/send-reports for formatting + if (mySociety::Config::get('STAGING_SITE')) { # note staging site must use different KBIDs + return { + 'Blocked drain' => 255, # Gullies-Blocked + 'Dead animal' => 286, # Animals-Dead-Removal + 'Dog fouling' => 288, # Dog Fouling-Clear + 'Fly tipping' => 347, # Fly tipping-Clear + 'Graffiti' => 292, # Graffiti-Removal + 'Litter, accumulated' => 349, # Accumulated Litter + 'Litter, overflowing bins' => 205, # Litter Bins-Overflowing + 'Pavements' => 195, # Pavements-Damaged/Cracked + 'Pothole' => 204, # Pothole + 'Roads Signs' => 432, # Roads Signs - Maintenance + 'Street Lighting' => 251, # Street Lighting + 'Traffic Lights' => 103, # Traffic Lights + } + } else { + return { + 'Abandoned Vehicle' => 468, + 'Accumulated Litter' => 349, + 'Dog Bin' => 203, + 'Dog Fouling' => 288, + 'Drain or Gully' => 256, + 'Fly Posting' => 465, + 'Fly Tipping' => 449, + 'Graffiti' => 292, + 'Gritting' => 200, + 'Highways' => 186, + 'Litter Bin Overflowing' => 205, + 'Manhole Cover' => 417, + 'Overhanging Foliage' => 421, + 'Pavement Damaged/Cracked' => 195, + 'Pothole' => 204, + 'Road Sign' => 80, + 'Roadworks' => 246, + 'Street Lighting' => 251, + }; + } +} + =head2 trim_text my $text = trim_text( $text_to_trim ); @@ -190,7 +231,7 @@ sub cleanup_text { for ($input) { # shit -> poo - s{\bdog\s*shit\b}{dog poo}ig; + s{\bdog\s*shite*?\b}{dog poo}ig; # 'portakabin' to '[portable cabin]' (and variations) s{\b(porta)\s*([ck]abin|loo)\b}{[$1ble $2]}ig; diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t index 5ea73625a..3a4c2ef81 100644 --- a/t/app/controller/alert_new.t +++ b/t/app/controller/alert_new.t @@ -452,7 +452,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub { $count++ if $_->body =~ /The following updates have been left on this problem:/; $count++ if $_->body =~ /The following new problems have been reported to City of\s*Edinburgh Council:/; $count++ if $_->body =~ /The following nearby problems have been added:/; - $count++ if $_->body =~ / -\s+Testing, EH1 1BB/; + $count++ if $_->body =~ /\s+-\s+Testing,\s+EH1\s+1BB/; } is $count, 5, 'Five emails with the right things in them'; diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 625c7531f..c16befd37 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -6,10 +6,14 @@ use utf8; use FixMyStreet::TestMech; use Web::Scraper; +use Path::Class; my $mech = FixMyStreet::TestMech->new; $mech->get_ok('/report/new'); +my $sample_file = file(__FILE__)->parent->file("sample.jpg")->stringify; +ok -e $sample_file, "sample file $sample_file exists"; + subtest "test that bare requests to /report/new get redirected" => sub { $mech->get_ok('/report/new'); @@ -282,6 +286,69 @@ foreach my $test ( }, errors => [ 'Please enter a subject', 'Please enter some details', ], }, + { + msg => 'non-photo upload gives error', + pc => 'SW1A 1AA', + fields => { + title => 'Title', + detail => 'Detail', + photo => [ [ undef, 'bad.txt', Content => 'This is not a JPEG', Content_Type => 'text/plain' ], 1 ], + name => 'Bob Jones', + may_show_name => '1', + email => 'bob@example.com', + phone => '', + category => 'Street lighting', + password_sign_in => '', + password_register => '', + remember_me => undef, + }, + changes => { + photo => '', + }, + errors => [ "Please upload a JPEG image only" ], + }, + { + msg => 'bad photo upload gives error', + pc => 'SW1A 1AA', + fields => { + title => 'Title', + detail => 'Detail', + photo => [ [ undef, 'fake.jpeg', Content => 'This is not a JPEG', Content_Type => 'image/jpeg' ], 1 ], + name => 'Bob Jones', + may_show_name => '1', + email => 'bob@example.com', + phone => '', + category => 'Street lighting', + password_sign_in => '', + password_register => '', + remember_me => undef, + }, + changes => { + photo => '', + }, + errors => [ "That image doesn't appear to have uploaded correctly (Please upload a JPEG image only ), please try again." ], + }, + { + msg => 'photo with octet-stream gets through okay', + pc => 'SW1A 1AA', + fields => { + title => '', + detail => 'Detail', + photo => [ [ $sample_file, undef, Content_Type => 'application/octet-stream' ], 1 ], + name => 'Bob Jones', + may_show_name => '1', + email => 'bob@example.com', + phone => '', + category => 'Street lighting', + password_sign_in => '', + password_register => '', + remember_me => undef, + }, + changes => { + photo => '', + }, + errors => [ "Please enter a subject" ], + }, ) { subtest "check form errors where $test->{msg}" => sub { diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t index ab129b4e7..67ddc10aa 100644 --- a/t/app/model/alert_type.t +++ b/t/app/model/alert_type.t @@ -202,7 +202,7 @@ for my $test ( (my $title = $report->title) =~ s/ /\\s+/; my $body = $email->body; - like $body, qr#report/$report_id - $title, $pc#, 'email contains expected postcode'; + like $body, qr#report/$report_id\s+-\s+$title,\s+$pc#, 'email contains expected postcode'; }; } @@ -2,7 +2,7 @@ use strict; use warnings; -use Test::More tests => 9; +use Test::More; use FindBin; use lib "$FindBin::Bin/../perllib"; @@ -39,3 +39,26 @@ foreach my $test (@convert_en_to_latlon_tests) { [ $lat, $lon ], # "convert ($e,$n) to ($lat,$lon)"; } + +my @cleanup_tests = ( + [ 'dog shit', 'Dog poo', 'dog poo' ], + [ 'dog shit', 'Dog poo', 'with spaces' ], + [ 'dog shite', 'Dog poo', 'with extra e' ], + [ 'there is dog shit here', 'There is dog poo here', 'with surrounding text' ], + [ 'portacabin', '[portable cabin]', 'cabin' ], + [ 'portaloo', '[portable loo]', 'loo' ], + [ 'porta loo', '[portable loo]', 'with spaces' ], + [ ' this is a report ', 'This is a report', 'leading and trailing spaces' ], + [ 'This is a report ', 'This is a report', 'spaces in the middle' ], + [ 'I AM SHOUTING AT YOU', 'I am shouting at you', 'all shouting' ], + [ 'I am EMPHASISING something', 'I am EMPHASISING something', 'some shouting' ], + [ "This has new\n\n\nlines in it", 'This has new Lines in it', 'no new lines' ], +); + +foreach my $test ( @cleanup_tests ) { + is Utils::cleanup_text( $test->[0]), $test->[1], $test->[2]; +} + +is Utils::cleanup_text( "This has new\n\n\nlines in it", { allow_multiline => 1 } ), "This has new\n\nLines in it", 'new lines allowed'; + +done_testing(); diff --git a/templates/web/barnet/footer.html b/templates/web/barnet/footer.html index 9bbeaa7e9..32c6b5f7b 100644 --- a/templates/web/barnet/footer.html +++ b/templates/web/barnet/footer.html @@ -1,151 +1,51 @@ - </div> - <br class="cl"> - </div><!-- end content --> - </div><!-- end wrap --> - <div id="left-column"> - - - <div id="navigation"> - <h2>Main Menu</h2> - <ul> - <li class="section"><a href="/">FixMyStreet</a> - <ul> - <li class="section">[% c.req.uri.path == '/' ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>' %]</li> - <li class="section">[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' %]</li> - <li class="section">[% c.req.uri.path == '/alert' ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' %]</li> - <li class="section">[% c.req.uri.path == '/faq' ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' %]</li> - <li class="section">[% c.req.uri.path == '/contact' ? '<strong>Contact</strong>' : '<a href="/contact">Contact</a>' %]</li> - </ul> - </ul> - </div> <!-- end navigation --> - - <div id="online-services"> - <h2>Online Services</h2> - <ul> - <li><a href="http://www.barnet.gov.uk/">Barnet Council</a></li> - </ul> - <!-- <p class="browse-aloud">Listen to this site using <br><a href="#">Browser Aloud</a></p> --> - </div> <!-- end online-services --> - -<!-- - <div id="useful-links"> - <h2>Useful Links</h2> - <ul> - <li><a href="http://www.barnet.gov.uk/">Council homepage</a></li> - </ul> - </div> ---> - - <div id="contact"> - <h2>Contact</h2> - <dl> - <dt>Council Address</dt> - <dd> - North London Business Park (NLBP),<br> - Oakleigh Road South,<br> - London.<br> - N11 1NP<br> - <a href="http://maps.google.co.uk/maps?f=q&hl=en&geocode=&q=N11+1NP+&sll=53.800651,-4.064941&sspn=11.823255,39.550781&ie=UTF8&ll=51.624877,-0.152156&spn=0.024244,0.077248&t=h&z=14">View map of Barnet</a> - </dd> - <dt>Phone Number</dt> - <dd>020 8359 2000</dd> - <dt>Text Number (SMS)</dt> - <dd>07781 473279</dd> - <dt>Fax Number</dt> - <dd>020 8359 4156</dd> - <dt>Typetalk</dt> - <dd>18001 020 8359 2040</dd> - <dt>Email</dt> - <dd><a href="mailto:first.contact@barnet.gov.uk">first.contact@barnet.gov.uk</a></dd> - </dl> - </div> <!-- end useful-links --> - - </div><!-- end left-column --> - - -<br class="cl"> - - <div id="pre-footer"> - - <div class="box-left"> - - <dl> - <dt>Council Address</dt> - <dd> - North London Business Park (NLBP),<br> - Oakleigh Road South,<br> - London.<br> - N11 1NP<br> - <a href="http://maps.google.co.uk/maps?f=q&hl=en&geocode=&q=N11+1NP+&sll=53.800651,-4.064941&sspn=11.823255,39.550781&ie=UTF8&ll=51.624877,-0.152156&spn=0.024244,0.077248&t=h&z=14">View map of Barnet</a> - </dd> - </dl> - <dl> - <dt>Phone Number</dt> - <dd>020 8359 2000</dd> - <dt>Text Number (SMS)</dt> - <dd>07781 473279</dd> - <dt>Fax Number</dt> - <dd>020 8359 4156</dd> - </dl> - <dl> - <dt>Typetalk</dt> - <dd>18001 020 8359 2040</dd> - <dt>Email</dt> - <dd><a href="mailto:first.contact@barnet.gov.uk">first.contact@barnet.gov.uk</a></dd> - </dl> - </div> - <div class="box-right"> - <!-- - <div class="social-bookmarking"> - <h2>Add this page to your social bookmarks:</h2> - <ul> - <li class="facebook"><a href="#">Facebook</a></li> - <li class="delicious"><a href="#">delicious</a></li> - <li class="technorati"><a href="#">Technorati</a></li> - <li class="stumbleupon"><a href="#">StumbleUpon</a></li> - <li class="google"><a href="#">Google</a></li> - <li class="digg"><a href="#">Digg</a></li> - </ul> - <p>(<a href="#">What's social bookmarking?</a>)</p> - </div> - --> - </div> - -<br class="cl"> - </div><!-- end pre-footer --> - - - - - <div id="footer"> + </div> + <!-- end of content, start of footer --> + </div> + </div> +<!-- googleoff: index --> + <div id="column_nav"> + <div class="navigation active"> + <h2><a href="/">FixMyStreet</a></h2> <ul> - <li><a href="http://www.barnet.gov.uk/copyright">Copyright</a></li> - <li><a href="http://www.barnet.gov.uk/disclaimer">Disclaimer</a></li> - <li><a href="http://www.barnet.gov.uk/privacy">Privacy Statement</a></li> - <li><a href="http://www.barnet.gov.uk/website-accessibility">Accessibility Statement</a></li> - <li><a href="http://www.barnet.gov.uk/atoz">A-Z</a></li> - <li><a href="http://www.barnet.gov.uk/faq">FAQs</a></li> - <li><a href="http://www.barnet.gov.uk/contact-us">Contact Us</a></li> - <li><a href="http://www.barnet.gov.uk/help">Help</a></li> - <li><a href="http://www.barnet.gov.uk/sitemap">Sitemap</a></li> - <li><a href="http://www.barnet.gov.uk/what%27s_on">What's On</a></li> + <li>[% c.req.uri.path == '/' ? '<strong>Report a problem</strong>' : '<a href="/">Report a problem</a>' %]</li> + <li>[% c.req.uri.path == '/reports/Barnet' ? '<strong>All reports</strong>' : '<a href="/reports/Barnet">All reports</a>' %]</li> + <li>[% c.req.uri.path == '/alert' ? '<strong>Local alerts</strong>' : '<a href="/alert">Local alerts</a>' %]</li> + <li class="lastItem">[% c.req.uri.path == '/faq' ? '<strong>Help</strong>' : '<a href="/faq">Help</a>' %]</li> </ul> - </div><!-- end footer --> - - </div><!-- end iewrap --> - -<!-- Piwik --> -<script type="text/javascript"> -var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.mysociety.org/" : "http://piwik.mysociety.org/"); -document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); -</script><script type="text/javascript"> -try { -var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 12); -piwikTracker.trackPageView(); -piwikTracker.enableLinkTracking(); -} catch( err ) {} -</script><noscript><img width=1 height=1 src="http://piwik.mysociety.org/piwik.php?idsite=12" style="border:0" alt=""></noscript> -<!-- End Piwik Tag --> - - </body> -</html> + </div> + <div class="clear"></div> + </div> + <div class="clear"></div> + <div id="footer"> + <p class="addNav"> + <a href="http://www.barnet.gov.uk/copyright">Copyright</a> | <a href="http://www.barnet.gov.uk/privacy">Privacy notice</a> | <a accesskey="0" href="http://www.barnet.gov.uk/accessibility">Accessibility</a> | <a accesskey="8" href="http://www.barnet.gov.uk/terms">Disclaimer</a> | <a accesskey="3" href="http://www.barnet.gov.uk/site_map">Sitemap</a> | <a href="http://www.barnet.gov.uk/contact">Contact us</a> | <a accesskey="6" href="http://www.barnet.gov.uk/a_to_z">A - Z</a> + </p> + <p class="assocLinks"> + <a id="goto_browsealoud" href="http://www.browsealoud.co.uk" title="BrowseAloud"><span class="hidden">BrowseAloud</span></a> + <a id="goto_directgov" href="http://www.direct.gov.uk" title="DirectGov"><span class="hidden">DirectGov</span></a> + <a class="external_link" id="share_facebook" href="http://www.facebook.com/barnetcouncil" title="London Borough of Barnet on Facebook"><span class="hidden">Facebook</span></a> + <a class="external_link" id="share_twitter" href="http://www.twitter.com/barnetcouncil" title="London Borough of Barnet on Twitter"><span class="hidden">Twitter</span></a> + <a class="external_link" id="share_youtube" href="http://www.youtube.com/Barnetcouncil1" title="London Borough of Barnet on YouTube"><span class="hidden">YouTube</span></a> + <a class="external_link" id="share_flickr" href="http://www.flickr.com/photos/barnetcouncil" title="London Borough of Barnet on Flickr"><span class="hidden">Flickr</span></a> + <a class="external_link" id="share_sharethis" href="http://www.sharethis.com/barnetcouncil" title="London Borough of Barnet on ShareThis"><span class="hidden">ShareThis</span></a> + </p> + <div class="clear"></div> + <p class="hidden"> + <a accesskey="1" href="http://www.barnet.gov.uk">Homepage</a> + <a accesskey="2" href="http://www.barnet.gov.uk/whats_new" rel="nofollow">What's new</a> + <a accesskey="4" href="http://www.barnet.gov.uk/site_search" rel="nofollow">Search facility </a> + <a accesskey="5" href="http://www.barnet.gov.uk/faqs" rel="nofollow">Frequently asked questions</a> + <a accesskey="9" href="http://www.barnet.gov.uk/feedback" rel="nofollow">Feedback</a> + <a accesskey="/" href="#mast" rel="nofollow">Top of the page</a> + <a accesskey="s" href="#content" rel="nofollow">Skip to content</a> + <a accesskey="n" href="#column_nav" rel="nofollow">Skip to main navigation</a> + </p> + <div id="bottomBar"> + </div> + </div> +<!-- googleon: index --> + </div> + </div> + </div> + </body> +</html>
\ No newline at end of file diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 654e3d83c..955473090 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -1,93 +1,60 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]--> -<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]--> - <head> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/basic.css"> - - <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css"> - - <!-- Preferred style sheet enabled when the page is loaded --> - <link rel="stylesheet" title="default" type="text/css" href="/cobrands/barnet/css/light.css"> - - <!-- Alternate style sheets used for the light/relaxed style --> - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/light.css"> - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/relaxed.css"> - - <!-- Alternate style sheets used for the dark style --> - <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/dark.css"> - - <!-- Alternate style sheets used for the dark/relaxed style --> - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/dark.css"> - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/relaxed.css"> - - - <!--[if lte IE 6]> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie.css"> - - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css"> - - <link rel="alternate stylesheet" title="dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css"> - - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-dark.css"> - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-relaxed.css"> - <![endif]--> - - <!--[if IE 7]> - <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/ie-seven.css"> - - <link rel="alternate stylesheet" title="relaxed light" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css"> - - <link rel="alternate stylesheet" title="relaxed dark" type="text/css" href="/cobrands/barnet/css/ie-seven-relaxed.css"> - <![endif]--> - <link rel="stylesheet" media="print" type="text/css" href="/cobrands/barnet/css/print.css"> - - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-1.2.6_common.js') %]"></script> - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/styleswitch.js') %]"></script> - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/jquery-cookie-min.js') %]"></script> - <script type="text/javascript" src="[% version('/cobrands/barnet/javascript/2008-portsurf.js') %]"></script> - - [% INCLUDE 'common_header_tags.html' %] - - </head> - <body> - - <div id="iewrap"> - <img id="print-logo" src="/cobrands/barnet/images/logo-barnet.gif" alt=""> - <div id="header"> - <a href="http://www.barnet.gov.uk/"><img src="/cobrands/barnet/images/logo-barnet.gif" alt="Barnet Logo"></a> - - <a href="#content" class="rm">Skip to Content</a> - <span class="rm">|</span> - <a href="#navigation" class="rm">Skip to Menu</a> - <span class="rm">|</span> - - <form action="http://www.barnet.gov.uk/search"> - <div class="search-input"> - <input type="hidden" name="col" value="lbb"> - <input type="hidden" name="type" value="sitesearch"> - <label for="input-0" class="rm">Search:</label> - <input type="text" value="Please enter your search" name="search" class="search"> - </div> - <div class="search-button"> - <input type="submit" value="Search" class="submit" id="input-0"> - </div> - </form> - - <div id="switcher" style="display:none"> - <p>Site preferences:</p> - <ul> - <li class="default"><a id="s1" class="styleswitch" rel="default" title="Light colours with the default layout">default</a></li> - <li class="relaxed-light"><a id="s2" class="styleswitch" rel="relaxed light" title="Light colours with the relaxed layout" href="#">relaxed light</a></li> - <li class="dark"><a id="s3" class="styleswitch" rel="dark" title="Dark colours with the default layout" href="#">dark</a></li> - <li class="relaxed-dark"><a id="s4" class="styleswitch" rel="relaxed dark" title="Dark colours with the relaxed layout" href="#">relaxed dark</a></li> - </ul> - </div><!-- end switcher --> - </div><!-- end header --> - - <div id="wrap"> - <div id="content"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> + <head> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/standard.css" media="screen" /> +<!--[if lte IE 6]> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-six-print.css" media="print" /> +<![endif]--> +<!--[if IE 7]> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-seven.css" media="screen" /> +<![endif]--> +<!--[if IE 8]> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/ie-eight.css" media="screen" /> +<![endif]--> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/print.css" media="print" /> + <link rel="stylesheet" type="text/css" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/styles/generic/handheld.css" media="handheld" /> + <link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" /> + <link rel="ToC" href="http://www.barnet.gov.uk/site_map" /> + <meta name="Keywords" content="fixmystreet barnet pothole streetlights report street problem" /> + <meta name="Description" content="FixMyStreet Barnet: report problems in Barnet like graffiti, fly tipping, broken paving slabs, or street lighting" /> + + <link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]"> + <link rel="stylesheet" type="text/css" href="/cobrands/barnet/css/layout.css"> + + [% INCLUDE 'common_header_tags.html' %] + + </head> + <body> + <div id="wrapper"> + <div id="ie_wrapper"> +<!-- googleoff: index --> + <div id="mobile_name">London Borough of Barnet</div> + <div id="mast"> + <div class="pseudoH1"> + <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a> + </div> + <ul id="skip" class="hidden"> + <li><a href="#content" rel="nofollow">Skip to content</a></li> + <li><a href="#column_nav" rel="nofollow">Skip to main navigation</a></li> + </ul> + <div class="mast_links"></div> + <span class="clear"></span> + <div id="search"></div> + <div class="clear"></div> + </div> +<!-- googleon: index --> + <div id="page_wrap"> + <div id="page"> + <div id="breadcrumb"> +<!-- googleoff:all --> + <ul> + <li><a href="/">FixMyStreet Home</a></li> + <li class="bc_end"><span>[% c.req.uri.path == '/'? 'Report a problem' : "$title" | html %]</span></li> + </ul> +<!-- googleon:all --> + </div> + <div id="content" class="withWidth fullWidth"> <div id="mysociety"> + <!-- end of header -->
\ No newline at end of file diff --git a/templates/web/bromley/footer.html b/templates/web/bromley/footer.html new file mode 100644 index 000000000..9be0741bf --- /dev/null +++ b/templates/web/bromley/footer.html @@ -0,0 +1,50 @@ + [% IF pagefooter %] + <footer role="content-info"> + <div class="tablewrapper bordered"> + <div id="footer-mobileapps"> + <h4>Mobile apps</h4> + + <ul> + <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> + <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li> + <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> + <li><a class="m-app-iphone-streetreport" href="http://itunes.apple.com/gb/app/streetreport/id371891859">iPhone Street Report</a></li> + </ul> + </div> + + <div id="footer-help"> + </div> + </div> + </footer> + [% END %] + </div><!-- .content role=main --> + </div><!-- .container --> + </div><!-- .table-cell --> + + <div class="nav-wrapper"> + <div class="nav-wrapper-2"> + <div id="main-nav" role="navigation"> + <ul id="mysoc-menu"> + <li><a href="http://www.fixmystreet.com/">Powered by FixMyStreet</a></li> + </ul> + + <ul id="main-menu"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports/Bromley' %]span[% ELSE %]a href="/reports/Bromley"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> + </div> + </div> + </div> + +<!-- [% INCLUDE 'debug_footer.html' %] --> + </div> <!-- .wrapper --> +</body> +</html> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html new file mode 100644 index 000000000..f7beabd8c --- /dev/null +++ b/templates/web/bromley/header.html @@ -0,0 +1,57 @@ +<!doctype html> +<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]--> +<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]--> + <head> + <meta name="viewport" content="initial-scale=1.0"> + + <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"> + <meta name="HandHeldFriendly" content="true"> + <meta name="mobileoptimized" content="0"> + + <link rel="stylesheet" href="[% version('/cobrands/bromley/base.css') %]"> + <!-- <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> --> + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + <!--[if (lt IE 9) & (!IEMobile)]> + <!-- <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> --> + <![endif]--> + + <script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + + [% IF c.req.uri.host == 'osm.fixmystreet.com' %] + <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> + [% END %] + + [% INCLUDE 'tracking_code.html' %] + + </head> + <body class="[% bodyclass | html IF bodyclass %]"> + + <div class="wrapper"> + <div class="table-cell"> + <header id="site-header" role="banner"> + <div class="container"> + <a href="/" id="site-logo">FixMyStreet</a> + <a href="#main-nav" id="nav-link">Main Navigation</a> + </div> + </header> + + <div id="user-meta"> + [% IF c.user_exists %] + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('sign out') %]</a> + </p> + [% ELSE %] + <!-- <a href="/auth">[% loc('Sign in') %]</a> --> + [% END %] + </div> + + <div class="container"> + <div class="content[% " $mainclass" | html IF mainclass %]" role="main"> + + <!-- [% INCLUDE 'debug_header.html' %] --> diff --git a/templates/web/default/admin/council_contacts.html b/templates/web/default/admin/council_contacts.html index acfec3ed4..da7223aa6 100644 --- a/templates/web/default/admin/council_contacts.html +++ b/templates/web/default/admin/council_contacts.html @@ -10,7 +10,11 @@ [% IF example_pc %] <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] +[% IF c.cobrand.moniker == 'emptyhomes' %] +<a href="[% c.uri_for( 'search_reports', search => 'area:' _ area_id ) %]">[% loc('List all reported problems' ) %]</a> +[% ELSE %] <a href="[% c.uri_for_email( '/reports/' _ area_id ) %]">[% loc('List all reported problems' ) %]</a> +[% END %] <a href="[% c.uri_for( 'council_contacts', area_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> diff --git a/templates/web/default/admin/search_users.html b/templates/web/default/admin/search_users.html index b4fa2c2da..18c964dfe 100644 --- a/templates/web/default/admin/search_users.html +++ b/templates/web/default/admin/search_users.html @@ -18,7 +18,7 @@ [%- FOREACH user IN users %] <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> - <td>[% PROCESS value_or_nbsp value=user.email %]</td> + <td><a href="[% c.uri_for( 'search_reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> <td>[% PROCESS value_or_nbsp value=user.from_council %]</td> <td>[% user.flagged ? loc('Yes') : ' ' %]</td> <td><a href="[% c.uri_for( 'user_edit', user.id ) %]">[% loc('Edit') %]</a></td> diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index c2249fa46..f5e2e423f 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -34,7 +34,7 @@ <div id="form_sign_in_yes"> <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value=""> </p> diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html index 95b59d9dd..c87f93994 100644 --- a/templates/web/default/common_header_tags.html +++ b/templates/web/default/common_header_tags.html @@ -1,12 +1,13 @@ -[% INCLUDE 'js_validation_msgs.html' %] - +[% USE date %][% USE Math %] <meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> +<script type="text/javascript" src="/js/validation_strings.[% lang_code %].js?[% Math.int( date.now / 3600 ) %]"></script> + +<script type="text/javascript" src="/jslib/jquery-1.7.2.min.js"></script> <script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> -<script type="text/javascript" src="[% version('/js/fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version(js_override || '/js/fixmystreet.js') %]"></script> [% map_js %] diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html index ed9d53c24..290be5564 100755 --- a/templates/web/default/faq/faq-en-gb.html +++ b/templates/web/default/faq/faq-en-gb.html @@ -61,29 +61,27 @@ by a registered charity, though, so if you want to make a contribution, <a href="https://secure.mysociety.org/donate/">please do</a>.</dd> <dt>Can I use FixMyStreet on my mobile?</dt> - <dd><ul> - <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us - in 2008 and another much more recently by a volunteer, Martin Stephenson. - Both are available for download on the App Store: + <dd> + <p>The FixMyStreet website should work on your mobile phone, adapting to + the size of your screen automatically. We plan to release updated native + apps in the near future. + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>. <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> - <p>We also hope to make the website itself much more mobile friendly in the future.</p> </dd> <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but as we were funded for - FixMyStreet by the Department for Constitutional Affairs (now the Ministry - of Justice), we were covered for Ordnance Survey data (but not OSNI data) - by the Pan-Governmental Agreement. The cost for these maps would be - prohibitively expensive for the small charity that we are – if you know of - any way we could get access to the Ordnance Survey for Northern Ireland's - maps so that we can add them to the site, that'd be great.</dd> + <dd>We would love to cover Northern Ireland, but we have only been able + to locate boundaries for Great Britain (from Ordnance Survey). If you + know of a source for Northern Ireland council boundaries + so that we can add them to the site, that'd be great.</dd> </dl> <h2>Practical Questions</h2> @@ -141,7 +139,8 @@ send you emails in relation to your problem.</dd> <h2>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. + <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety is the project of a registered charity which has grown out of the community of volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible @@ -149,15 +148,11 @@ benefits in the civic and community aspects of their lives. Our first project was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at:<br> -mySociety<br> -483 Green Lanes<br> -London<br> -N13 4BS<br> -UK</dd> +or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was paid for via the Department for -Constitutional Affairs Innovations Fund.</dd> + <dd>FixMyStreet was originally paid for via the Department for + Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial + work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> <dd>Yes, we changed the name mid June 2007. We decided Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/validation_strings.html new file mode 100644 index 000000000..718d10d56 --- /dev/null +++ b/templates/web/default/js/validation_strings.html @@ -0,0 +1,18 @@ + validation_strings = { + update: '[% loc('Please enter a message') | replace("'", "\\'") %]', + title: '[% loc('Please enter a subject') | replace("'", "\\'") %]', + detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', + name: { + required: '[% loc('Please enter your name') | replace("'", "\\'") %]', + validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' + }, + category: '[% loc('Please choose a category') | replace("'", "\\'") %]', + rznvy: { + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' + }, + email: { + required: '[% loc('Please enter your email') | replace("'", "\\'") %]', + email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' + } + }; diff --git a/templates/web/default/js_validation_msgs.html b/templates/web/default/js_validation_msgs.html deleted file mode 100644 index f89ab4bcc..000000000 --- a/templates/web/default/js_validation_msgs.html +++ /dev/null @@ -1,20 +0,0 @@ -<script type="text/javascript"> - validation_strings = { - update: '[% loc('Please enter a message') %]', - title: '[% loc('Please enter a subject') %]', - detail: '[% loc('Please enter some details') %]', - name: { - required: '[% loc('Please enter your name') %]', - validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') %]' - }, - category: '[% loc('Please choose a category') %]', - rznvy: { - required: '[% loc('Please enter your email') %]', - email: '[% loc('Please enter a valid email') %]' - }, - email: { - required: '[% loc('Please enter your email') %]', - email: '[% loc('Please enter a valid email') %]' - } - }; -</script> diff --git a/templates/web/default/questionnaire/creator_fixed.html b/templates/web/default/questionnaire/creator_fixed.html index 0d3181ec1..5b6d1254a 100644 --- a/templates/web/default/questionnaire/creator_fixed.html +++ b/templates/web/default/questionnaire/creator_fixed.html @@ -11,9 +11,9 @@ <p align="center"> <input type="radio" name="reported" id="reported_yes" value="Yes"[% ' checked' IF reported == 'Yes' %]> -<label for="reported_yes">[% loc('Yes') %]</label> +<label class="inline" for="reported_yes">[% loc('Yes') %]</label> <input type="radio" name="reported" id="reported_no" value="No"[% ' checked' IF reported == 'No' %]> -<label for="reported_no">[% loc('No') %]</label> +<label class="inline" for="reported_no">[% loc('No') %]</label> </p> <p><input type="submit" name="submit" value="[% loc('Submit') %]"></p> diff --git a/templates/web/default/report/_main.html b/templates/web/default/report/_main.html index 8cc1efec2..3a9e60e7b 100644 --- a/templates/web/default/report/_main.html +++ b/templates/web/default/report/_main.html @@ -2,9 +2,11 @@ <p><em>[% problem.meta_line(c) | html %] [% IF problem.council %] - [% IF problem.whensent %] - <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> - [% END %] + [% IF problem.whensent || problem.can_display_external_id %] + <small class="council_sent_info"><br> + [% problem.processed_summary_string(c) %] + </small> + [% END %] [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> [% END %] diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html index 999d332d2..fac3ef0b2 100644 --- a/templates/web/default/report/display.html +++ b/templates/web/default/report/display.html @@ -1,7 +1,7 @@ [% PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] @@ -144,7 +144,7 @@ [% END %] <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </p> diff --git a/templates/web/default/report/new/fill_in_details_form.html b/templates/web/default/report/new/fill_in_details_form.html index ed8b07ea1..9c9451914 100644 --- a/templates/web/default/report/new/fill_in_details_form.html +++ b/templates/web/default/report/new/fill_in_details_form.html @@ -4,7 +4,7 @@ [% IF partial_token %] <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> [% END %] -<p>[% loc('You have located the problem at the point marked with a purple pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> +<p>[% loc('You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. ') %]</p> [% END %] [% IF js %] @@ -137,7 +137,7 @@ [% END %] <div class="form-field"> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value="" size="25"> </div> diff --git a/templates/web/default/report/update.html b/templates/web/default/report/update.html new file mode 100644 index 000000000..048968eae --- /dev/null +++ b/templates/web/default/report/update.html @@ -0,0 +1,22 @@ +[% IF loop.first %] +<div id="updates"> + <h2 class="problem-update-list-header">[% loc('Updates') %]</h2> +[% END %] + <div><div class="problem-update"><p><a name="update_[% update.id %]"></a><em> + [% INCLUDE meta_line %] + </em></p></div> +[% IF NOT update.whenanswered %] + <div class="update-text"> + [% add_links( update.text ) | html_para %] + + [% INCLUDE 'report/photo.html' object=update %] + + [% IF c.cobrand.allow_update_reporting %] + <p align="right"> + <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> + </p> + [% END %] + </div> +[% END %] + </div> +[% '</div>' IF loop.last %] diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html index 4fd3c75d4..374a7c570 100644 --- a/templates/web/default/report/updates.html +++ b/templates/web/default/report/updates.html @@ -1,36 +1,26 @@ -[% FOREACH update IN updates.all %] -[% IF loop.first %] -<div id="updates"> - <h2 class="problem-update-list-header">[% loc('Updates') %]</h2> +[% FOREACH update IN updates %] +[% INCLUDE 'report/update.html' %] [% END %] - <div><div class="problem-update"><p><a name="update_[% update.id %]"></a><em> - [% IF update.anonymous || update.name == '' %] - [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSIF update.user.from_council %] - [% user_name = update.user.name | html %] - [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSE %] - [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] - [%- END -%] - [%- c.cobrand.extra_update_meta_text(update) -%] - [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] - [%- ", " _ loc( 'reopened' ) IF update.mark_open %] - [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] - </em></p> - </div> +[% BLOCK meta_line %] - <div class="update-text"> - [% add_links( update.text ) | html_para %] + [% IF update.whenanswered %] + [%# A questionnaire update, currently saying report is still open %] + [% tprintf( loc( 'Still open, via questionnaire, %s' ), prettify_epoch( update.whenanswered_local.epoch ) ) %] + [% RETURN %] + [% END %] - [% INCLUDE 'report/photo.html' object=update %] - - [% IF c.cobrand.allow_update_reporting %] - <p align="right"> - <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> - </p> - [% END %] - </div> - </div> -[% '</div>' IF loop.last %] + [% IF update.anonymous || update.name == '' %] + [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%] + [%- ELSIF update.user.from_council %] + [% user_name = update.user.name | html %] + [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%] + [%- ELSE %] + [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] + [%- END -%] + [%- c.cobrand.extra_update_meta_text(update) -%] + [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] + [%- ", " _ loc( 'reopened' ) IF update.mark_open %] + [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] [% END %] + diff --git a/templates/web/default/reports/cobrand_stats.html b/templates/web/default/reports/cobrand_stats.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/default/reports/cobrand_stats.html +++ /dev/null diff --git a/templates/web/default/reports/council.html b/templates/web/default/reports/council.html index ec9efbdbf..0d3d43d82 100755 --- a/templates/web/default/reports/council.html +++ b/templates/web/default/reports/council.html @@ -13,12 +13,13 @@ INCLUDE 'header.html', title = tprintf(loc('%s - Summary reports'), name) context = 'reports' + bodyclass = 'mappage' rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] %] [% map_html %] -[% IF children.size %] +[% IF c.cobrand.moniker != 'fixmystreet' AND children.size %] <h2 style="clear:right">[% loc('Wards of this council') %]</h2> <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> <ul> @@ -31,8 +32,16 @@ </div> <div id="side"> +<h1 id="reports_heading"> + [% IF ward %] + [% ward.name %]<span>, </span><a href="[% council_url %]">[% council.name %]</a> + [% ELSE %] + [% council.name %] + [% END %] +</h1> + [% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] -<p id="unknown">This council no longer exists. +<p id="unknown" class="alert">This council no longer exists. [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. [% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] @@ -57,60 +66,49 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. [% END %] </p> +[% ELSIF c.cobrand.moniker == 'fixmystreet' %] + <div class="shadow-wrap"> + <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> + <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> + [% IF children.size %] + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a></li> + [% END %] + </ul> + </div> [% ELSE %] -<p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> + <p><a href="[% rss_url %]"><img align="right" src="/i/feed.png" width="16" height="16" title="[% loc('RSS feed') %]" alt="[% tprintf(loc('RSS feed of problems in this %s'), thing) %]" border="0" hspace="4"></a> [% END %] -[% IF c.cobrand.all_councils_report %] - [% tprintf( loc('This is a summary of all reports for one %s.'), thing ) %] -[% ELSE %] - [% tprintf( loc('This is a summary of all reports for this %s.'), thing ) %] +[% TRY %][% INCLUDE 'reports/cobrand_stats.html' %][% CATCH file %][% END %] + +[% IF c.cobrand.moniker == 'fixmystreet' AND children.size %] +<section id="council_wards" class="hidden-js"> + <h2>[% loc('Wards of this council') %]</h2> + <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> + <ul class="issue-list-a full-width"> + [% FOR child IN children.values.sort('name') %] + <li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li> + [% END %] + </ul> +</section> [% END %] -[% IF ward %] -[% tprintf( loc('You can <a href="%s">view all reports for the council</a> or <a href="/reports">show all councils</a>.'), council_url ) %] -[% ELSE %] -[% loc('You can <a href="/reports">show all councils</a>.') %] +[% IF c.cobrand.moniker == 'fixmystreet' %] +<p class="promo"> + FixMyStreet is now available for local council websites. + <a href="/for-councils">Find out more</a>. +</p> [% END %] -<h2>[% name %]</h2> - -[% INCLUDE 'reports/cobrand_stats.html' %] - - [% INCLUDE 'pagination.html', param = 'p' %] - - [% INCLUDE column - title = loc('Recently fixed') - problems = fixed.${council.id}.new - %] +[% INCLUDE 'pagination.html', param = 'p' %] +<section class="full-width"> [% INCLUDE column - title = loc('New problems') - problems = open.${council.id}.new + problems = problems.${council.id} %] +</section> - [%# This doesn't really need a whole separate template %] - [% IF c.cobrand.moniker == 'emptyhomes' %] - [% - INCLUDE column - title = loc('Older problems') - problems = open.${council.id}.older.merge( open.${council.id}.unknown ) - %] - [% ELSE %] - [% INCLUDE column - title = loc('Older problems') - problems = open.${council.id}.older - %] - [% INCLUDE column - title = loc('Old problems, state unknown') - problems = open.${council.id}.unknown - %] - [% END %] - - [% INCLUDE column - title = loc('Old fixed') - problems = fixed.${council.id}.old - %] +[% INCLUDE 'pagination.html', param = 'p' %] </div> [% INCLUDE 'footer.html' %] @@ -118,9 +116,35 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% BLOCK column %] [% IF problems %] -<h3>[% title %]</h3> +<ul class="issue-list-a"> +[% IF c.cobrand.moniker == 'fixmystreet' %] + +[% FOREACH problem IN problems %] + <li> + <a href="[% c.uri_for('/report/' _ problem.id) %]"> + <div class="text"> + <h4>[% problem.title | html %]</h4> + <small>[% prettify_epoch( problem.confirmed, 1 ) %] + [%- IF problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_epoch( problem.lastupdate, 1 ) %] + [%- END %]</small> + [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> + [% ELSIF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> + [% END %] + [% IF problem.is_fixed %] + <small>[% loc('(fixed)') %]</small> + [% END %] + </div> + [% IF problem.photo %] + <div class="img"> + <img height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> + </div> + [% END %] + </a> + </li> +[% END %] + +[% ELSE %] -<ul> [% FOREACH problem IN problems %] <li><a href="[% c.uri_for('/report/' _ problem.id) %]">[% problem.title | html %]</a> [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] @@ -129,6 +153,8 @@ Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a [% END %] </li> [% END %] + +[% END %] </ul> [% END %] diff --git a/templates/web/default/reports/index.html b/templates/web/default/reports/index.html index f14fd079e..283df5285 100755 --- a/templates/web/default/reports/index.html +++ b/templates/web/default/reports/index.html @@ -1,35 +1,41 @@ -[% INCLUDE 'header.html', title = loc('Summary reports') %] +[% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %] +<h1>[% loc('All Reports') %]</h1> + +<div class="intro"> <p> [% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %] [% loc('Greyed-out lines are councils that no longer exist.') %] </p> +</div> -<table cellpadding="3" cellspacing="1" border="0"> +<table cellpadding="3" cellspacing="1" border="0" class="nicetable"> +<thead> <tr> -<th>[% loc('Name') %]</th> -<th>[% loc('New problems') %]</th> -<th>[% loc('Older problems') %]</th> -<th>[% loc('Old problems,<br>state unknown') %]</th> -<th>[% loc('Recently fixed') %]</th> -<th>[% loc('Older fixed') %]</th> +<th class="title">[% loc('Name') %]</th> +<th class="data">[% loc('New <br>problems') %]</th> +<th class="data">[% loc('Older <br>problems') %]</th> +<th class="data">[% loc('Old / unknown <br>problems') %]</th> +<th class="data">[% loc('Recently <br>fixed') %]</th> +<th class="data">[% loc('Older <br>fixed') %]</th> </tr> +</thead> +<tbody> [% FOREACH area IN areas_info_sorted %] <tr align="center" [%- IF area.generation_high == 10 %] class="gone" -[%- ELSIF loop.count % 2 %] class="a" -[%- END -%] -> -<td align="left"><a href="[% area.url %]">[% area.name %]</a></td> -<td>[% open.${area.id}.new or 0 %]</td> -<td>[% open.${area.id}.older or 0 %]</td> -<td>[% open.${area.id}.unknown or 0 %]</td> -<td>[% fixed.${area.id}.new or 0 %]</td> -<td>[% fixed.${area.id}.old or 0 %]</td> +[%- ELSIF ! (loop.count % 2) %] class="a" +[%- END %]> +<td class="title"><a href="[% area.url %]">[% area.name %]</a></td> +<td class="data">[% open.${area.id}.new or 0 %]</td> +<td class="data">[% open.${area.id}.older or 0 %]</td> +<td class="data">[% open.${area.id}.unknown or 0 %]</td> +<td class="data">[% fixed.${area.id}.new or 0 %]</td> +<td class="data">[% fixed.${area.id}.old or 0 %]</td> </tr> [% END %] +</tbody> </table> -[% INCLUDE 'footer.html' %] - +[% INCLUDE 'footer.html', pagefooter = 'yes' %] 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/emptyhomes/report/display.html b/templates/web/emptyhomes/report/display.html index 933a05948..bcce6789d 100644 --- a/templates/web/emptyhomes/report/display.html +++ b/templates/web/emptyhomes/report/display.html @@ -1,5 +1,5 @@ [% - problem_title = loc('Viewing a problem') | html; + problem_title = loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title robots = 'noindex, nofollow' diff --git a/templates/web/fiksgatami/nn/faq/faq-nn.html b/templates/web/fiksgatami/nn/faq/faq-nn.html index 058ce5355..161cfbea5 100644 --- a/templates/web/fiksgatami/nn/faq/faq-nn.html +++ b/templates/web/fiksgatami/nn/faq/faq-nn.html @@ -160,4 +160,4 @@ </dl> -[% *INCLUDE 'footer.html' %] +[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/alert/index.html b/templates/web/fixmystreet/alert/index.html index 7bec66305..8d4459c01 100644 --- a/templates/web/fixmystreet/alert/index.html +++ b/templates/web/fixmystreet/alert/index.html @@ -21,7 +21,7 @@ within a certain distance of a particular location.') %] <form method="get" action="/alert/list" class="full-width"> <fieldset> <div class="form-txt-submit-box"> - <input type="text" name="pc" value="[% pc | html %]" placeholder="[% loc('e.g. ‘B2 4QA’ or ‘Tib St, Manchester’') %]"> + <input type="text" name="pc" value="[% pc | html %]" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> <input class="green-btn" type="submit" value="[% loc('Go') %]"> </div> </fieldset> 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/general.html b/templates/web/fixmystreet/auth/general.html index 585232bc5..6ecbcadc5 100644 --- a/templates/web/fixmystreet/auth/general.html +++ b/templates/web/fixmystreet/auth/general.html @@ -31,7 +31,7 @@ <div id="form_sign_in_yes" class="form-box"> <h5>[% loc('<strong>Yes</strong> I have a password') %]</h5> - <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password') %]</label> + <label class="hidden-js n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <div class="form-txt-submit-box"> <input type="password" name="password_sign_in" id="password_sign_in" value="" placeholder="[% loc('Your password') %]"> 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' %] diff --git a/templates/web/fixmystreet/common_header_tags.html b/templates/web/fixmystreet/common_header_tags.html deleted file mode 100644 index ea952ccdc..000000000 --- a/templates/web/fixmystreet/common_header_tags.html +++ /dev/null @@ -1,38 +0,0 @@ -[% INCLUDE 'js_validation_msgs.html' %] - -<meta http-equiv="content-type" content="text/html; charset=utf-8"> -<script type="text/javascript" src="/jslib/jquery-1.7.0.min.js"></script> - -<script src="[% version('/js/jquery.validate.min.js') %]" type="text/javascript" charset="utf-8"></script> - -<script src="[% version('/js/modernizr.custom.76759.js') %]" type="text/javascript" charset="utf-8"></script> - -<script src="[% version('/js/jquery.placeholder.min.js') %]" type="text/javascript" charset="utf-8"></script> - -<script type="text/javascript" src="[% version('/js/geo.min.js') %]"></script> -<script type="text/javascript" src="[% version('/cobrands/fixmystreet/fixmystreet.js') %]"></script> - -<script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" type="text/javascript" charset="utf-8"></script> - -[% map_js %] - -[% IF category_extras_json && category_extras_json != '{}' %] -<script type="text/javascript"> - category_extras = [% category_extras_json %]; -</script> -[% END %] - -[% IF robots %] - <meta name="robots" content="[% robots %]"> -[% ELSIF c.config.STAGING_SITE %] - <meta name="robots" content="noindex,nofollow"> -[% END %] - -[% IF rss %] - <link rel="alternate" type="application/rss+xml" title="[% rss.0 %]" href="[% rss.1 %]"> -[% END %] - -<title> - [% "$title :: " | html IF title %] - [% c.cobrand.site_title %] -</title> diff --git a/templates/web/fixmystreet/faq/faq-en-gb.html b/templates/web/fixmystreet/faq/faq-en-gb.html index 462c43564..1e676d9f2 100755 --- a/templates/web/fixmystreet/faq/faq-en-gb.html +++ b/templates/web/fixmystreet/faq/faq-en-gb.html @@ -5,8 +5,8 @@ <ul class="plain-list"> <li><a href="#faq">Frequently Asked Questions</a></li> <li><a href="#practical">Practical Questions</a></li> - <li><a href="#privacy">Privacy Questions</a></li> <li><a href="#organisation">Organisation Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> </ul> </aside> </div> @@ -72,29 +72,27 @@ by a registered charity, though, so if you want to make a contribution, <a href="https://secure.mysociety.org/donate/">please do</a>.</dd> <dt>Can I use FixMyStreet on my mobile?</dt> - <dd><ul> - <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us - in 2008 and another much more recently by a volunteer, Martin Stephenson. - Both are available for download on the App Store: + <dd> + <p>The FixMyStreet website should work on your mobile phone, adapting to + the size of your screen automatically. We plan to release updated native + apps in the near future. + <ul> + <li><em>iPhone:</em> Our basic app from 2008 is available for download + on the App Store: <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>, - <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>. <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app available from the <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>. <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the <a href="http://store.ovi.com/content/107557">Ovi Store</a>. </ul> - <p>We also hope to make the website itself much more mobile friendly in the future.</p> </dd> <dt>Why do you only cover the countries of Great Britain?</dt> - <dd>We would love to cover Northern Ireland, but as we were funded for - FixMyStreet by the Department for Constitutional Affairs (now the Ministry - of Justice), we were covered for Ordnance Survey data (but not OSNI data) - by the Pan-Governmental Agreement. The cost for these maps would be - prohibitively expensive for the small charity that we are – if you know of - any way we could get access to the Ordnance Survey for Northern Ireland's - maps so that we can add them to the site, that'd be great.</dd> + <dd>We would love to cover Northern Ireland, but we have only been able + to locate boundaries for Great Britain (from Ordnance Survey). If you + know of a source for Northern Ireland council boundaries + so that we can add them to the site, that'd be great.</dd> </dl> <h2><a name="practical"></a>Practical Questions</h2> @@ -133,26 +131,11 @@ by a user of the site.</dd> to publicise us on the web or in your local area, and why not write to your local paper to let them know about us?</dd> </dl> - <h2><a name="privacy"></a>Privacy Questions</h2> - <dl> - <dt>Who gets to see my email address?</dt> - <dd>If you submit a problem, we pass on your details, and details -of the problem, to the council contact or contacts responsible for the -area where you located the problem. Other than the council, who obviously get your -email address, only people we authorise to view the FixMyStreet administration interface -will be able to see your email address and they will never use it for anything other than -to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, -unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> - <dt>Will you send nasty, brutish spam to my email address?</dt> - <dd>Never. We will email you if someone leaves an update on a -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> - </dl> <h2><a name="organisation"></a>Organisation Questions</h2> <dl> <dt>Who built FixMyStreet?</dt> - <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. + <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, + in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. mySociety is the project of a registered charity which has grown out of the community of volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. mySociety’s primary mission is to build Internet projects which give people simple, tangible @@ -160,15 +143,11 @@ benefits in the civic and community aspects of their lives. Our first project was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, -or by post at:<br> -mySociety<br> -483 Green Lanes<br> -London<br> -N13 4BS<br> -UK</dd> +or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd> <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt> - <dd>FixMyStreet was paid for via the Department for -Constitutional Affairs Innovations Fund.</dd> + <dd>FixMyStreet was originally paid for via the Department for + Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial + work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd> <dt><a name="nfi"></a>Wasn’t this site called Neighbourhood Fix-It?</dt> <dd>Yes, we changed the name mid June 2007. We decided Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd> diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index c73c9eb2c..903d8c73d 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -8,7 +8,6 @@ <li><a class="m-app-iphone" href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">iPhone</a></li> <li><a class="m-app-droid" href="https://market.android.com/details?id=com.android.fixmystreet">Android</a></li> <li><a class="m-app-nokia" href="http://store.ovi.com/content/107557">Nokia</a></li> - <li><a class="m-app-iphone-streetreport" href="http://itunes.apple.com/gb/app/streetreport/id371891859">iPhone Street Report</a></li> </ul> </div> @@ -25,6 +24,7 @@ </ul> </div> </div> + <p><a href="/privacy">Privacy and cookies</a></p> </footer> [% END %] </div><!-- .content role=main --> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index dd1a90c5f..f5d510922 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -13,12 +13,14 @@ <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]" media="(min-width:48em)"> - <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/layout.css') %]"> <![endif]--> - [% INCLUDE 'common_header_tags.html' %] + <script src="[% version('/js/modernizr.custom.76759.js') %]" charset="utf-8"></script> + [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] + [% extra_js %] [% IF c.req.uri.host == 'osm.fixmystreet.com' %] <link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]"> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index 605e428a3..04b23ca7f 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -38,7 +38,7 @@ Modernizr.load({ <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> <label for="pc">[% question %]:</label> <div> - <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="[% loc('e.g. ‘B2 4QA’ or ‘Tib St, Manchester’') %]"> + <input type="text" name="pc" value="" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> <input type="submit" value="[% loc('Go') %]" id="submit"> </div> </form> diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 687c5686e..4793989f8 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -78,9 +78,13 @@ END %] [% END %] </small> </div> + [% IF p.photo %] + <div class="img"> + <img height="60" width="90" src="/photo/[% p.id %].fp.jpeg" alt=""> + </div> + [% END %] </a> </li> [% "</ul>" IF loop.last %] [% END %] - diff --git a/templates/web/fixmystreet/questionnaire/index.html b/templates/web/fixmystreet/questionnaire/index.html index 3b23c81cd..ded95df04 100644 --- a/templates/web/fixmystreet/questionnaire/index.html +++ b/templates/web/fixmystreet/questionnaire/index.html @@ -1,4 +1,5 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; INCLUDE 'header.html', title = loc('Questionnaire'), bodyclass = 'mappage' %] diff --git a/templates/web/fixmystreet/report/_main.html b/templates/web/fixmystreet/report/_main.html index 762aa10f7..7ceb1f6a5 100644 --- a/templates/web/fixmystreet/report/_main.html +++ b/templates/web/fixmystreet/report/_main.html @@ -4,8 +4,10 @@ <p><em> [% problem.meta_line(c) | html %] [% IF problem.council %] - [% IF problem.whensent %] - <small class="council_sent_info"><br>[% problem.duration_string(c) %]</small> + [% IF problem.whensent || problem.can_display_external_id %] + <small class="council_sent_info"><br> + [% problem.processed_summary_string(c) %] + </small> [% END %] [% ELSE %] <br><small>[% loc('Not reported to council') %]</small> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 42b9dbdb0..0bb13fa67 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -1,7 +1,8 @@ [% + PROCESS "report/photo-js.html"; PROCESS "maps/${map.type}.html"; - problem_title = problem.title _ ' - ' _ loc('Viewing a problem') | html; + problem_title = problem.title _ ' - ' _ loc('Viewing a problem'); INCLUDE 'header.html' title = problem_title rss = [ loc('Updates to this problem, FixMyStreet'), "/rss/$problem.id" ] diff --git a/templates/web/fixmystreet/report/new/councils_text_all.html b/templates/web/fixmystreet/report/new/councils_text_all.html index fb10ec4fd..fe2d5be12 100644 --- a/templates/web/fixmystreet/report/new/councils_text_all.html +++ b/templates/web/fixmystreet/report/new/councils_text_all.html @@ -1,5 +1,5 @@ <p> -[% IF all_councils.${area_ids_to_list.0}.type == 'LBO' %] +[% IF area_ids_to_list.0 != 2489 && all_councils.${area_ids_to_list.0}.type == 'LBO' %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system.'), @@ -16,4 +16,4 @@ [% END %] [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] -</p>
\ No newline at end of file +</p> diff --git a/templates/web/fixmystreet/report/photo-js.html b/templates/web/fixmystreet/report/photo-js.html new file mode 100644 index 000000000..df0e2f92d --- /dev/null +++ b/templates/web/fixmystreet/report/photo-js.html @@ -0,0 +1,8 @@ +[% IF c.cobrand.allow_photo_display %] + [% extra_css = BLOCK %] + <link rel="stylesheet" href="[% version('/js/fancybox/jquery.fancybox-1.3.4.css') %]"> + [% END %] + [% extra_js = BLOCK %] + <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% END %] +[% END %] diff --git a/templates/web/fixmystreet/report/update.html b/templates/web/fixmystreet/report/update.html new file mode 100644 index 000000000..0803ac758 --- /dev/null +++ b/templates/web/fixmystreet/report/update.html @@ -0,0 +1,28 @@ +[% IF loop.first %] +<section class="full-width"> + <h4 class="static-with-rule">[% loc('Updates') %]</h4> + <ul class="issue-list"> +[% END %] + <li> + <div class="update-wrap"> + [% IF update.whenanswered %] + <div class="update-text"> + <p class="meta-2"> [% INCLUDE meta_line %] </p> + </div> + [% ELSE %] + <div class="update-text"> + [% add_links( update.text ) | html_para %] + + <p class="meta-2"> + <a name="update_[% update.id %]"></a> + [% INCLUDE meta_line %] + </p> + </div> + [% INCLUDE 'report/photo.html' object=update %] + [% END %] + </div> + </li> +[% IF loop.last %] + </ul> +</section> +[% END %] diff --git a/templates/web/fixmystreet/report/updates.html b/templates/web/fixmystreet/report/updates.html deleted file mode 100644 index 508e2aacc..000000000 --- a/templates/web/fixmystreet/report/updates.html +++ /dev/null @@ -1,36 +0,0 @@ -[% FOREACH update IN updates.all %] -[% IF loop.first %] -<section class="full-width"> - <h4 class="static-with-rule">[% loc('Updates') %]</h4> - <ul class="issue-list"> -[% END %] - <li> - <div class="update-wrap"> - <div class="update-text"> - [% add_links( update.text ) | html_para %] - - <p class="meta-2"> - <a name="update_[% update.id %]"></a> - [% IF update.anonymous || update.name == '' %] - [% tprintf( loc( 'Posted anonymously at %s' ), prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSIF update.user.from_council %] - [% user_name = update.user.name | html %] - [% tprintf( loc( 'Posted by %s (<strong>%s</strong>) at %s' ), user_name, update.user.council, prettify_epoch( update.confirmed_local.epoch ) ) -%] - [%- ELSE %] - [% tprintf( loc( 'Posted by %s at %s' ), update.name, prettify_epoch( update.confirmed_local.epoch ) ) | html -%] - [%- END -%] - [%- c.cobrand.extra_update_meta_text(update) -%] - [%- ", " _ loc( 'marked as fixed' ) IF update.mark_fixed %] - [%- ", " _ loc( 'reopened' ) IF update.mark_open %] - [%- ", " _ tprintf(loc( 'marked as %s' ), update.meta_problem_state) IF update.problem_state %] - </p> - </div> - - [% INCLUDE 'report/photo.html' object=update %] - </div> - </li> -[% IF loop.last %] - </ul> -</section> -[% END %] -[% END %]
\ No newline at end of file diff --git a/templates/web/fixmystreet/reports/cobrand_stats.html b/templates/web/fixmystreet/reports/cobrand_stats.html deleted file mode 100644 index e69de29bb..000000000 --- a/templates/web/fixmystreet/reports/cobrand_stats.html +++ /dev/null diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html deleted file mode 100755 index cf5729fb3..000000000 --- a/templates/web/fixmystreet/reports/council.html +++ /dev/null @@ -1,131 +0,0 @@ -[% IF ward %] - [% name = "$ward.name, $council.name" - thing = loc('ward') - %] -[% ELSE %] - [% name = council.name - thing = loc('council') - %] -[% END %] - -[% - PROCESS "maps/${map.type}.html"; - INCLUDE 'header.html', - title = tprintf(loc('%s - Summary reports'), name) - context = 'reports' - bodyclass = 'mappage' - rss = [ tprintf(loc('Problems within %s, FixMyStreet'), name), rss_url ] -%] - -[% map_html %] -</div> - -<div id="side"> - -<h1 id="reports_heading"> - [% IF ward %] - [% ward.name %]<span>, </span><a href="[% council_url %]">[% council.name %]</a> - [% ELSE %] - [% council.name %] - [% END %] -</h1> - -[% IF council.generation_high == 10 AND c.cobrand.country == 'GB' %] - <p class="alert">This council no longer exists. - [% IF council.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] - Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. - [% ELSIF council.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] - Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. - [% ELSIF council.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] - Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. - [% ELSIF council.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] - Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. - [% ELSIF council.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] - Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. - [% ELSIF council.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] - Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. - [% ELSIF council.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] - Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. - [% ELSIF council.name.match('Mid Bedfordshire|South Bedfordshire') %] - Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. - [% ELSIF council.name.match('Cheshire') %] - Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or - <a href="/reports/Cheshire+East">Cheshire East Council</a>. - [% ELSIF council.name.match('Bedfordshire') %] - Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or - <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. - [% END %] - </p> -[% ELSE %] - <div class="shadow-wrap"> - <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> - <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> - [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a></li> - [% END %] - </ul> - </div> -[% END %] - -[% INCLUDE 'reports/cobrand_stats.html' %] - -[% IF children.size %] -<section id="council_wards" class="hidden-js"> - <h2>[% loc('Wards of this council') %]</h2> - <p>[% loc('Follow a ward link to view only reports within that ward.') %]</p> - <ul class="issue-list-a full-width"> - [% FOR child IN children.values.sort('name') %] - <li><a href="[% child.url %]"><span class="text">[% child.name %]</span></a></li> - [% END %] - </ul> -</section> -[% END %] - -[% IF c.cobrand.moniker == 'fixmystreet' %] -<p class="promo"> - FixMyStreet is now available for local council websites. - <a href="/for-councils">Find out more</a>. -</p> -[% END %] - -[% INCLUDE 'pagination.html', param = 'p' %] - -<section class="full-width"> - [% INCLUDE column - problems = problems.${council.id} - %] -</section> - -[% INCLUDE 'pagination.html', param = 'p' %] - -</div> -[% INCLUDE 'footer.html' %] - -[% BLOCK column %] -[% IF problems %] - -<ul class="issue-list-a"> -[% FOREACH problem IN problems %] - <li> - <a href="[% c.uri_for('/report/' _ problem.id) %]"> - <div class="text"> - <h4>[% problem.title | html %]</h4> - <small>[% prettify_epoch( problem.confirmed, 1 ) %]</small> - [% IF problem.councils > 1 %] <small>[% loc('(sent to both)') %]</small> [% END %] - [% IF c.cobrand.moniker != 'emptyhomes' %] - [% IF problem.councils == 0 %] <small>[% loc('(not sent to council)') %]</small> [% END %] - [% END %] - </div> - [% IF problem.photo %] - <div class="img"> - <img height="60" width="90" src="/photo/[% problem.id %].fp.jpeg" alt=""> - </div> - [% END %] - </a> - </li> -[% END %] -</ul> - -[% END %] -[% END %] - diff --git a/templates/web/fixmystreet/reports/index.html b/templates/web/fixmystreet/reports/index.html deleted file mode 100755 index 96367d4bb..000000000 --- a/templates/web/fixmystreet/reports/index.html +++ /dev/null @@ -1,37 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Summary reports'), bodyclass => 'fullwidthpage' %] - -<h1>[% loc('All Reports') %]</h1> - -<div class="intro"> - <p> - [% loc('This is a summary of all reports on this site; select a particular council to see the reports sent there.') %] - [% loc('Greyed-out lines are councils that no longer exist.') %] - </p> -</div> - -<table cellpadding="3" cellspacing="1" border="0" class="nicetable"> - <thead> - <th class="title">[% loc('Name') %]</th> - <th class="data">[% loc('New <br>problems') %]</th> - <th class="data">[% loc('Older <br>problems') %]</th> - <th class="data">[% loc('Old / unknown <br>problems') %]</th> - <th class="data">[% loc('Recently <br>fixed') %]</th> - <th class="data">[% loc('Older <br>fixed') %]</th> - </thead> - - [% FOREACH area IN areas_info_sorted %] - <tr align="center" - [%- IF area.generation_high == 10 %] class="gone" - [%- ELSIF ! (loop.count % 2) %] class="a" - [%- END %]> - <td class="title"><a href="[% area.url %]">[% area.name %]</a></td> - <td class="data">[% open.${area.id}.new or 0 %]</td> - <td class="data">[% open.${area.id}.older or 0 %]</td> - <td class="data">[% open.${area.id}.unknown or 0 %]</td> - <td class="data">[% fixed.${area.id}.new or 0 %]</td> - <td class="data">[% fixed.${area.id}.old or 0 %]</td> - </tr> - [% END %] -</table> - -[% INCLUDE 'footer.html' pagefooter => 'yes' %] diff --git a/templates/web/fixmystreet/reports/ward.html b/templates/web/fixmystreet/reports/ward.html deleted file mode 100755 index 8b65ffb28..000000000 --- a/templates/web/fixmystreet/reports/ward.html +++ /dev/null @@ -1 +0,0 @@ -[% INCLUDE reports/council.html %] diff --git a/templates/web/fixmystreet/static/for_councils.html b/templates/web/fixmystreet/static/for_councils.html index 2e83c7c6c..1e1789df7 100644 --- a/templates/web/fixmystreet/static/for_councils.html +++ b/templates/web/fixmystreet/static/for_councils.html @@ -38,8 +38,6 @@ forty local authorities in the UK. We understand the challenges that councils face in channel shift, and will bring our passion and expertise to support your journey. -<p><a href="http://www.mysociety.org/wp/wp-content/uploads/2012/02/FixMyStreet_for_councils_2012.pdf">FixMyStreet for Councils brochure</a> - <p>Have questions? Read our <a href="/for-councils/faq">Questions and Answers for Councils</a> or get in touch at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>. diff --git a/templates/web/fixmystreet/static/for_councils_faq.html b/templates/web/fixmystreet/static/for_councils_faq.html index 16c7d5cfe..d45166ed1 100644 --- a/templates/web/fixmystreet/static/for_councils_faq.html +++ b/templates/web/fixmystreet/static/for_councils_faq.html @@ -131,15 +131,22 @@ href="mailto:hello@mysociety.org">let us know</a>. <dd> <ul> -<li>The front end product costs £3,500 in year one, reducing to £1,500 per annum in future years. -<li>The mobile web version costs £3,000 in year one and £1,000 per annum subsequently. -<li>Back-end integration costs depend on the complexity of your systems. Prices start at £3,500 in year one, then £1,500 per annum. +<li>The front end product costs £3,500 in year one, reducing to £2,000 per annum in future years. +<li>Web and mobile-optimised site together cost £5,500 in year one and £3,000 per annum subsequently. +<li>Web, mobile-optimised site, and iPhone and Android apps cost £9,500 in year one, then £4,000 per annum. </ul> +<p>We also offer fixed price for integration with Microsoft, Oracle and +Lagan CRM systems, at £5,500 in year one, then £2,000 per annum +thereafter. Integration with other CRM or back-office systems costs +£6,500 in year one, + +<p>These prices exclude VAT and assume standard FixMyStreet for councils +product - if you need further customisations please get in touch with +us for a quote. + <p>The prices are all-inclusive, covering installation, updates, unlimited -problem reports and user training. There are no hidden fees. Please see <a -href="http://www.mysociety.org/wp/wp-content/uploads/2012/02/FixMyStreet_for_councils_2012.pdf">our -brochure</a> for more detail on what’s included. +problem reports and user training. There are no hidden fees. <p>There’s no commitment beyond the first 12 months, so you won’t be locked into a lengthy contract. diff --git a/templates/web/fixmystreet/static/privacy.html b/templates/web/fixmystreet/static/privacy.html new file mode 100755 index 000000000..933afe1e5 --- /dev/null +++ b/templates/web/fixmystreet/static/privacy.html @@ -0,0 +1,80 @@ +[% INCLUDE 'header.html', title => loc('Frequently Asked Questions'), bodyclass => 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="/faq#faq">Frequently Asked Questions</a></li> + <li><a href="/faq#practical">Practical Questions</a></li> + <li><a href="/faq#organisation">Organisation Questions</a></li> + <li><strong>Privacy and cookies</strong></li> + </ul> + </aside> +</div> + +<h1>Privacy, cookies, and third party services</h1> + +<p><strong>Our use of your data, cookies, and external services: what you should know, and how to opt out if you want to.</strong></p> + +<p>Summary: We care a lot about our users’ privacy. We provide details below, +and we try our hardest to look after the private data that we hold. Like many +other websites, we sometimes use cookies and Google Analytics to help us make +our websites better. These tools are very common and used by many other sites, +but they do have privacy implications, and as a charity concerned with socially +positive uses of the internet, we think it’s important to explain them in full. +If you don’t want to share your browsing activities on mySociety’s sites with +other companies, you can adjust your usage or install opt-out browser plugins. + +<h2>Privacy</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd>If you submit a problem, we pass on your details, and details +of the problem, to the council contact or contacts responsible for the +area where you located the problem. Other than the council, who obviously get your +email address, only people we authorise to view the FixMyStreet administration interface +will be able to see your email address and they will never use it for anything other than +to help administer FixMyStreet. Similarly with email addresses from updates. We will never give or sell your email address to anyone else, +unless we are obliged to by law. Your name will not be published anywhere unless you let us.</dd> + <dt>Will you send nasty, brutish spam to my email address?</dt> + <dd>Never. We will email you if someone leaves an update on a +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> + </dl> + +<h2>Cookies</h2> + +<p>To make our service easier or more useful, we sometimes place small data files on your computer or mobile phone, known as cookies; many websites do this. We use this information to, for example, remember you have logged in so you don't need to do that on every page, or to measure how people use the website so we can improve it and make sure it works properly. Below, we list the cookies and services that this site can use. + +<table cellpadding=5> +<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> +<tr><td>fixmystreet_app_session</td><td nowrap>A random unique identifier</td><td>When browser is closed, or four weeks if “Keep me signed in” is ticked</td></tr> +</table> + +<h3>Measuring website usage (Google Analytics)</h3> + +<p>We use Google Analytics to collect information about how people use this site. We do this to make sure it’s meeting its users’ needs and to understand how we could do it better. Google Analytics stores information such as what pages you visit, how long you are on the site, how you got here, what you click on, and information about your web browser. IP addresses are masked (only a portion is stored) and personal information is only reported in aggregate. We do not allow Google to use or share our analytics data for any purpose besides providing us with analytics information, and we recommend that any user of Google Analytics does the same. + +<p>If you’re unhappy with data about your visit to be used in this way, you can install the <a href="http://tools.google.com/dlpage/gaoptout">official browser plugin for blocking Google Analytics</a>. + +<p>The cookies set by Google Analytics are as follows: + +<table cellpadding=5> +<tr align="left"><th scope="col">Name</th><th scope="col">Typical Content</th><th scope="col">Expires</th></tr> +<tr><td>__utma</td><td>Unique anonymous visitor ID</td><td>2 years</td></tr> +<tr><td>__utmb</td><td>Unique anonymous session ID</td><td>30 minutes</td></tr> +<tr><td>__utmz</td><td>Information on how the site was reached (e.g. direct or via a link/search/advertisement)</td><td>6 months</td></tr> +<tr><td>__utmx</td><td>Which variation of a page you are seeing if we are testing different versions to see which is best</td><td>2 years</td></tr> +</table> + +<h4>Google’s Official Statement about Analytics Data</h4> + +<p>“This website uses Google Analytics, a web analytics service provided by Google, Inc. (“Google”). Google Analytics uses “cookies”, which are text files placed on your computer, to help the website analyze how users use the site. The information generated by the cookie about your use of the website (including your IP address) will be transmitted to and stored by Google on servers in the United States . Google will use this information for the purpose of evaluating your use of the website, compiling reports on website activity for website operators and providing other services relating to website activity and internet usage. Google may also transfer this information to third parties where required to do so by law, or where such third parties process the information on Google’s behalf. Google will not associate your IP address with any other data held by Google. You may refuse the use of cookies by selecting the appropriate settings on your browser, however please note that if you do this you may not be able to use the full functionality of this website. By using this website, you consent to the processing of data about you by Google in the manner and for the purposes set out above.”</p> + +<p><a href="http://www.mysociety.org/privacy-online/">More general information on how third party services work</a></p> + +<h2>Credits</h2> + +<p>Bits of wording taken from the <a href="http://www.gov.uk/help/cookies">gov.uk cookies page</a> (under the Open Government Licence). + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/fixmystreet/tracking_code.html b/templates/web/fixmystreet/tracking_code.html index b506d41c1..52018b312 100644 --- a/templates/web/fixmystreet/tracking_code.html +++ b/templates/web/fixmystreet/tracking_code.html @@ -4,6 +4,7 @@ var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-660910-4']); _gaq.push(['_setDomainName', '.fixmystreet.com']); + _gaq.push (['_gat._anonymizeIp']); _gaq.push(['_trackPageview']); (function() { diff --git a/urls.txt b/urls.txt deleted file mode 100644 index 5c9b25f34..000000000 --- a/urls.txt +++ /dev/null @@ -1,12 +0,0 @@ -This is a list of some of the urls currently served: - -homepage: / -postcode search: /?pc=SW1A+1AA -placename: /?pc=Westminster -street (ambiguous): /?pc=St+Margaret+St -street (exact): /?pc=St+Margaret+St%2c+Westminster%2c+London+SW1A+2 - -all reports: /reports -council reports: /reports/Aberdeen -individual report: /report/173526 - diff --git a/web/cobrands/barnet/css/basic.css b/web/cobrands/barnet/css/basic.css deleted file mode 100644 index c3aa2c784..000000000 --- a/web/cobrands/barnet/css/basic.css +++ /dev/null @@ -1,74 +0,0 @@ -
-/* Basic Styles */
-
-body {
- color: #000;
- margin: 0;
- padding: 0;
- font: 13px Arial, Helvetica, Verdana, sans-serif;
- }
-
-h1, h2, h3, h4, h5, p, ol, ul, li, table, dl, dt, dd {
- line-height: 1.5em
- }
-
-a, a:link {text-decoration: underline; color: #006666}
-a:visited {color:#666}
-a:hover {text-decoration: none}
-
-img {
- border: none;
-}
-
-h1, h2, h3, h4, h5 {margin: 1em 0 0.5em 0;}
-
-h1 {font-size:2.7em; line-height:1.27em}
-h2 {font-size:1.93em;}
-h3 {font-size:1.308em;}
-h4 {font-size:1.077em;}
-h5 {font-size:1em;}
-
-ul {list-style-type: none; padding: 0;}
-
-ul ul, ol ul { padding: 0 0 0 15px; margin-top: 0;}
-
-ul li, ul ul li, ul ul ul li {margin: 0.3em 0 0 0; padding: 0 0 0 15px;}
-
-ul ul ul li {font-style: italic;}
-
-ol {padding: 0 0 0 20px;}
-
-ol ol, ul ol {
- margin-top: 0;
- padding: 0 0 0 30px;
- }
-
-ol li, ol ol li, ol ol ol li {
- margin: 0.3em 0 0 0;
- padding: 0;
- background: none;
- }
-
-ol ol li {list-style-type: lower-latin;}
-
-ol ol ol li {list-style-type: lower-roman;}
-ul ol li {background: none;}
-
-dl {padding: 0;}
-dt {font-weight: bold;}
-dd {margin: 0;}
-
-q {font-size: 120%;}
-
-blockquote {
- font-size: 122%;
- padding: 0;
- margin: 0 10px;
- }
-
-/* FixMyStreet additions */
-
-select, input, textarea {
- font-size: 99%;
-}
-
diff --git a/web/cobrands/barnet/css/dark.css b/web/cobrands/barnet/css/dark.css deleted file mode 100644 index b14780f4b..000000000 --- a/web/cobrands/barnet/css/dark.css +++ /dev/null @@ -1,144 +0,0 @@ -
-/*== DARK COLOR OVERIDES ==*/
-#iewrap, #proposition-image {background:#000; color:#fff}
-
-.online-services h2, .a-z h2 {background-image: url('../images/icon-online-services.png');}
-.a-z h2 {background:none}
-
-.online-services li a {background: url(../images/arrow-red.gif) no-repeat 6px 10px}
-.whats-on div {background-image: url('../images/icon-whats-on.png');}
-.council-meetings div {background-image: url('../images/icon-council-meetings.png');}
-.highlights h2 {background-image: url('../images/icon-highlights.png');}
-.media h2 {background-image: url('../images/icon-media-centre.png');}
-.browse-aloud p {background: url('../images/logo-browse-aloud.gif') no-repeat 10px 0;}
-
-.highlights h2 {border-color:#FFC000;}
-.media h2 {border-color: #591cca;}
-.online-services h2, .a-z h2 {border-color: #cc6666;}
-
-
-
-/*Green borders*/
-#pre-footer .box-right div {border: 1px solid #fff; border-bottom:medium none; border-top:medium none;}
-#main-propostion, #pre-footer {background:#1e3d3f url('../images/dark/main-prop-border.gif') repeat-y 35px 0pt;}
-#col-wrapper, #pre-footer .box-right div, #iewrap #col-wrapper {border-color:#008483}
-
-/*Headings and links*/
-.highlights h2, #col-left .highlights a {color:#f7ff9c;}
-.media h2, #col-left .media a {color:#d2cffc}
-
-#navigation-index h1, #navigation-index li a, #col-left h2, #col-left .link-bar a, #pre-footer a,
-#pre-footer a:link, #col-left .online-services li a, #col-left .online-services li a:link,
-#col-left .whats-on h2 a, #col-left .council-meetings h2 a, #iewrap .media p span, #pre-footer h2 {color:#fff}
-
-.whats-on div, .council-meetings div {background-color:#333}
-.link-bar {background:#333; border-color:#fff;}
-
-.media li {border-bottom:1px solid #323232}
-
-#navigation-index li a {border-color:#1E3D3F }
-
-#col-left .a-z li a {background:#1e3d3f; color:#fff}
-#col-left .a-z li a:hover {background:#1e3d3f; color:#fff}
-
-/*Righ column*/
-#col-right, #col-right div, #iewrap #col-right .useful-links ul {background: url('../images/dark/related-bg.gif');}
-
-/*Dynamic tab*/
-#col-right ul ul, #col-right li a.tab-on {background-color:#000; color:#fff}
-#col-right ul ul, #col-right li a.tab-on {border-color:#693a42}
-#col-right a, #col-right a:link {color:#fbccd2}
-
-/*Feed Icons*/
-#col-left .whats-on h2 .feed {background-image: url('../images/dark/rss-whats-on.gif')}
-#col-left .highlights h2 .feed {background-image: url('../images/dark/rss-highlights.gif')}
-#col-left .media h2 .feed {background-image: url('../images/dark/rss-media.gif')}
-
-/*Social and Useful Links Logos*/
-#col-right li a.leader-listens {background-image: url('../images/dark/link-images/logo-leader-listens.gif')}
-#col-right li a.whereilive {background-image: url('../images/dark/link-images/logo-whereilive.gif')}
-#col-right li a.facebook {background-image: url('../images/dark/link-images/logo-facebook.gif')}
-#col-right li a.twitter {background-image: url('../images/dark/link-images/logo-twitter.gif')}
-#col-right li a.you-tube {background-image: url('../images/dark/link-images/logo-youtube.gif')}
-#col-right li a.flickr {background-image: url('../images/dark/link-images/logo-flickr.gif')}
-#col-right li a.base {background-image: url('../images/dark/link-images/logo-base.gif')}
-#col-right li a.direct-me {background-image: url('../images/dark/link-images/logo-directme.gif')}
-#col-right li a.directgov {background-image: url('../images/dark/link-images/logo-directgov.gif')}
-#col-right li a.support-people {background-image: url('../images/dark/link-images/logo-supporting-people.gif')}
-
-/*Links arrows*/
-#navigation-index li a {background-image: url('../images/dark/arrow-green.gif')}
-.online-services li a {background-image: url('../images/dark/arrow-red.gif')}
-
-/*Navigation*/
-#navigation-index li a.current {background:transparent url(../images/dark/cnr-expanded-tab_nw.png) no-repeat left top;}
-#navigation-index li a.current .ne {background:transparent url(../images/dark/cnr-expanded-tab_ne.gif) no-repeat 0 0;}
-
-
-
-a, a:link {color:#99ffff}
-a, a:visited {color:#9a9a9a}
-strong, #pre-footer .social-bookmarking h2, #content form label {color:#fff;}
-
-/*=== Content Page Layout :: Colours and Customisations===*/
-
-#content{border: 1px solid #1e3e3e; border-width: 0 1px 0 1px}
-#wrap {background: url(../images/dark/wrap-border.gif) repeat-y 35px 0;}
-
-/*=== Content Page Layout Elements :: Colours and Customisations===*/
-
-h1, h2 {border-bottom: 1px solid #008184; color:#fff}
-h3, h4, h5 {color:#fff}
-
-#content a:focus, #content a:active {color:#fff; background: #008184; }
-
-#content blockquote, #content q {
- background: #204343 url('../images/dark/quote.gif') no-repeat 10px 10px;
- border: 1px solid #008184;
- border-width: 1px 0
- }
-#content q {background-image:none}
-
-#content ul li {background: url('../images/dark/arrow-green-small.gif') no-repeat 5px 5px}
-#content ul li ol li {background: none}
-#content ul li ul li, #content ol li ul li {background: url('../images/arrow-hyphen-small.gif') no-repeat 3px 10px}
-
-th {background:#008184; color:#fff}
-tr td {background:#1e3e3e}
-tr.even td {background:#0f1f1f}
-table.data td, table.data th {border-right: 3px solid #000}
-
- /* Navigation colours */
-
-#left-column #navigation, #left-column #online-services, #left-column #useful-links, #left-column #contact {
- background-image: url(../images/dark/main-prop-border.gif);
- background-position: 35px 0;
- background-repeat: repeat-y;
- }
-#left-column #online-services {background-image: url(../images/dark/red-border.gif);}
-#left-column #useful-links, #left-column #contact {background-image: url(../images/dark/grey-border.gif);}
-
-#left-column li a, #left-column li strong {color:#fff}
-
-#left-column #navigation {background-color:#1E3D3F}
-#left-column #online-services {background-color:#442c2c}
-#left-column #useful-links, #left-column #contact {background-color:#343434}
-
-#left-column #navigation h2 {color: #fff; border-color: #008184; background-image: url('../images/dark/icon-welcome.gif')}
-#left-column #online-services h2 {color:#fff; border-color: #cc6666; background-image: url('../images/dark/icon-online-services-small.gif')}
-#left-column #useful-links h2, #left-column #contact h2 {color:#fff; border-color: #999999; background-image: url('../images/dark/icon-useful-links-small.gif')}
-#left-column #contact h2 {background-image: url('../images/dark/icon-contact-small.gif')}
-
-#left-column #navigation li a {background-image: url('../images/dark/arrow-green-small.gif')}
-#left-column #online-services li a {background-image: url('../images/dark/arrow-red-small.gif')}
-#left-column #useful-links li a {background-image: url('../images/dark/arrow-grey-small.gif')}
-
-#left-column div a {color:#fff}
-#left-column li li strong {background-image: url('../images/arrow-current-nav.gif'); background-color: #008184; color:#fff}
-#left-column #navigation li li li li li a {background-image: url('../images/arrow-hyphen-small.gif'); background-position: 50px 14px}
-
- /* Forms colours */
-
-#content input[type|='text'] {border: 1px solid #008184}
-.error {color: #d04747}
-
diff --git a/web/cobrands/barnet/css/ie-dark.css b/web/cobrands/barnet/css/ie-dark.css deleted file mode 100644 index a0a7c3c41..000000000 --- a/web/cobrands/barnet/css/ie-dark.css +++ /dev/null @@ -1,84 +0,0 @@ -/*=========== Styles for IE version 5-6=======*/
-
-
-/*===Basic styles=======*/
-
-body {font-size: 80%;}
-
-#iewrap {width:expression(document.body.clientWidth < 790? "780px": document.body.clientWidth > 1382? "1380px" : "auto" );}
-
-
-#header {height:80px}
-#switcher {margin:-50px 23px 0 0}
-
-#navigation-index, #proposition-image {width:49.9%;}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul {height:1%}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-#header form .search-input input {position:relative; top:1px}
-
-#col-left {width: 66.6%;}
-#col-right {width:33.3%;}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-#navigation-index li a.current .ne {margin-right:-3px;}
-.menu p {padding: 3px 0 7px 0}
-
-#col-right ul {height:1%}
-#col-right ul ul {position: absolute}
-
-.media li {padding-bottom:5px}
-
-.social-links {height:420px}
-
-.highlights li {height: 81px}
-#col-right li li {height: 66px}
-
-#col-left .whats-on h2, #col-left .council-meetings h2 {margin:0 0 0 0;}
-#col-left h2 .feed {right:10px}
-
-.highlights ul {height:280px}
-.media ul {height:285px}
-#col-right .useful-links ul {height:175px}
-
-
-.tab-on {z-index:100}
-#col-right ul ul {z-index:50;}
-
-.link-bar, .online-services li a {height:1%}
-.a-z li {height:25px; width:25px;}
-#col-left .a-z li.numbers a {width:26px}
-.a-z ul {width:97%; margin-left:-6px}
-
-.box-left, .box-right {padding:0 0 9px 0;}
-.media {padding-bottom:0px}
-#pre-footer .box-right div {height:115px;}
-
-
-.browse-aloud p {margin-bottom:15px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-
-.menu {filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/expanded-tab.png', sizingMethod='scale'); background: none;}
-
-#navigation-index li a.current {zoom:1;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/cnr-expanded-tab_nw.png', sizingMethod='crop'); background: none;}
-
-#navigation-index h1 {background-image: url(../images/dark/icon-welcome.gif)}
-.online-services h2 {background-image:url(../images/dark/icon-online-services.gif);}
-.whats-on div {background-image:url(../images/dark/icon-whats-on.gif);}
-.council-meetings div {background-image:url(../images/dark/icon-council-meetings.gif);}
-.highlights h2 {background-image:url(../images/dark/icon-highlights.gif);}
-.media h2 {background-image:url(../images/dark/icon-media-centre.gif);}
-
-
-/*IE RELAXED OVERIDES*/
-
-#navigation-index li a.current {zoom:1;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/dark/cnr-expanded-tab_nw.png', sizingMethod='crop'); background: none;}
-
-
-
-
diff --git a/web/cobrands/barnet/css/ie-relaxed.css b/web/cobrands/barnet/css/ie-relaxed.css deleted file mode 100644 index dfee99e22..000000000 --- a/web/cobrands/barnet/css/ie-relaxed.css +++ /dev/null @@ -1,9 +0,0 @@ -
-/*IE RELAXED OVERIDES*/
-body {font-size: 100%;}
-.highlights ul {height:310px}
-.media ul {height:315px}
-#col-right .useful-links ul {height:405px}
-#pre-footer .box-right div {height:165px;}
-#col-left .a-z li.numbers a {width:30px}
-#col-right li li {height: 73px}
\ No newline at end of file diff --git a/web/cobrands/barnet/css/ie-seven-relaxed.css b/web/cobrands/barnet/css/ie-seven-relaxed.css deleted file mode 100644 index eeaaebf0a..000000000 --- a/web/cobrands/barnet/css/ie-seven-relaxed.css +++ /dev/null @@ -1,2 +0,0 @@ -/*IE7 RELAXED OVERIDES*/
-body {font-size: 100%;}
diff --git a/web/cobrands/barnet/css/ie-seven.css b/web/cobrands/barnet/css/ie-seven.css deleted file mode 100644 index 353e313f5..000000000 --- a/web/cobrands/barnet/css/ie-seven.css +++ /dev/null @@ -1,51 +0,0 @@ -/*===== styles for IE Seven ======*/
-
-body {font-size: 80%;}
-
-#switcher {margin-top:-50px}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul, .link-bar {height:1%}
-#navigation-index, #proposition-image, #navigation-index li, .menu li {width:49.99%;}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-
-#header form .search-input input {position:relative; top:1px}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-
-form .nw {top: 4px; left:0}
-form .ne {top: 4px; right:0}
-form .sw {bottom: 4px; left:0}
-form .se {bottom: 4px; right:0}
-.wide-row .nw, .wide-row .ne, .wide-row .sw, .wide-row .se {display:block}
-
-form .wide-row .nw {top: 3px}
-form .wide-row .ne {top: 3px}
-form .wide-row .sw {bottom: 0px}
-form .wide-row .se {bottom: 0px}
-
-form .submit-row .ne {right:-1px}
-form .submit-row .se {right:-1px}
-.submit-row div {padding: 3px 12px;}
-
-
-.required {vertical-align: top; padding-top: 0;}
-
-h1 {line-height:1.3em}
-#content .coloured, #content .data {border-spacing: expression(cellSpacing=1); /* for IE */}
-
-.menu p {padding: 3px 0 7px 0}
-
-#col-right .useful-links li {}
-
-.highlights li {min-height:81px;}
-.media li {padding-bottom:5px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-.browse-aloud p {margin-bottom:15px}
-.tab-on {margin-bottom:20px}
-
-#pre-footer {margin-top:5px}
diff --git a/web/cobrands/barnet/css/ie.css b/web/cobrands/barnet/css/ie.css deleted file mode 100644 index f3316c98b..000000000 --- a/web/cobrands/barnet/css/ie.css +++ /dev/null @@ -1,86 +0,0 @@ -/*=========== Styles for IE version 5-6=======*/
-
-
-/*===Basic styles=======*/
-
-body {font-size: 80%;}
-
-#iewrap {width:expression(document.body.clientWidth < 790? "780px": document.body.clientWidth > 1382? "1380px" : "auto" );}
-
-
-#header {height:80px}
-#switcher {margin:-50px 23px 0 0}
-
-#navigation-index, #proposition-image {width:49.9%;}
-
-#main-propostion, #col-wrapper, #pre-footer, .info-bar, #col-right ul {height:1%}
-
-#header form .search-button input {padding: 5px 5px 8px 5px;}
-#header form {position:relative; top:-1px}
-#header form .search-button {margin:0; position:relative; left:5px}
-#header form .search-input input {position:relative; top:1px}
-
-#col-left {width: 66.6%;}
-#col-right {width:33.3%;}
-
-h1 {line-height:1.3em}
-
-.box-left, .box-right, #col-right li {width:49.9%;}
-
-#navigation-index li a.current .ne {margin-right:-3px;}
-.menu p {padding: 3px 0 7px 0}
-
-#col-right ul {height:1%}
-#col-right ul ul {position: absolute}
-
-.media li {padding-bottom:5px}
-
-.social-links {height:420px}
-
-.highlights li {height: 81px}
-#col-right li li {height: 66px}
-
-#col-left .whats-on h2, #col-left .council-meetings h2 {margin:0 0 0 0;}
-#col-left h2 .feed {right:10px}
-
-.highlights ul {height:280px}
-.media ul {height:285px}
-#col-right .useful-links ul {height:175px}
-
-
-.tab-on {z-index:100}
-#col-right ul ul {z-index:50;}
-
-.link-bar, .online-services li a {height:1%}
-.a-z li {height:25px; width:25px;}
-#col-left .a-z li.numbers a {width:26px}
-.a-z ul {width:97%; margin-left:-6px}
-
-.box-left, .box-right {padding:0 0 9px 0;}
-.media {padding-bottom:0px}
-#pre-footer .box-right div {height:115px;}
-
-
-.browse-aloud p {margin-bottom:15px}
-#col-right #social-links-tabs {padding:0; margin:0}
-
-#navigation-index h1 {background-image: url(../images/icon-welcome.gif)}
-.online-services h2 {background-image:url(../images/icon-online-services.gif);}
-.whats-on div {background-image:url(../images/icon-whats-on.gif);}
-.council-meetings div {background-image:url(../images/icon-council-meetings.gif);}
-.highlights h2 {background-image:url(../images/icon-highlights.gif);}
-.media h2 {background-image:url(../images/icon-media-centre.gif);}
-
-
-#content blockquote {height: 100px}
-
-#content form, #content fieldset {position:relative}
-#left-column li a, #left-column li strong {height:1%}
-
-#content .coloured, #content .data {border-spacing: expression(cellSpacing=1); /* for IE */}
-
-#left-column {word-wrap: break-word}
-
-
-.required {vertical-align: top; padding-top: 0;}
-
diff --git a/web/cobrands/barnet/css/layout.css b/web/cobrands/barnet/css/layout.css index 1e1bf5d05..cad46b039 100644 --- a/web/cobrands/barnet/css/layout.css +++ b/web/cobrands/barnet/css/layout.css @@ -1,7 +1,8 @@ /* FixMyStreet additions */
/* Smaller map */
-#mysociety #map_box {
+#mysociety #map_box {
width: 380px;
+ margin-bottom: 8px;
}
#mysociety #map, #mysociety #drag {
width: 378px;
@@ -13,6 +14,23 @@ width: auto;
}
+#mysociety textarea {
+ border: 1px solid #999999;
+}
+
+/* fix (for the reports page) */
+#content #mysociety h1 span {
+ display: inline;
+ border: none;
+ padding: 0;
+}
+
+#mysociety #postcodeForm {
+ background-color: #E9E9EA;
+}
+#mysociety #postcodeForm label {
+ width: 100%;
+}
/*=========FROM CUSTOM=========*/
.cl {clear: both;}
@@ -70,61 +88,6 @@ h3, h4, h5, p, ol, ul, table, dl, address, form {margin-right: 5px; margin-left: h1, h2 {padding-left: 5px}
*/
- /* Navigation */
-
-#left-column h2 {
- margin:0 5px 15px 40px;
- padding: 6px 0 0 25px;
- font-size:1.245em;
- line-height:1.1em;
- background-repeat: no-repeat;
- background-position: top left;
- }
-
-#navigation h2 {font-size:1.692em; font-weight:normal; padding: 10px 0 6px 40px}
-
-#left-column div {margin-bottom:5px; padding: 5px 0 15px 0}
-
-#left-column ul, #left-column dl {
- margin:0;
- padding:0 0 0 35px;
- font-size: 1.08em
- }
-
-#left-column dl {padding: 0 5px 5px 40px}
-#left-column dt {margin: 10px 0 0 0}
-#left-column dd {padding:0; line-height:1.3em}
-
-#left-column dl a {
- text-decoration:underline;
- color:#000;
- }
-#left-column dl a:hover {text-decoration: none}
-
-#left-column ul ul {
- padding-left: 0;
- font-size: 1em
- }
-
-#left-column li {padding:0; margin:0}
-
-#left-column li a, #left-column li strong {
- padding: 5px 5px 5px 20px;
- display:block;
- background-repeat: no-repeat;
- background-position: 10px 11px;
- font-style: normal;
- font-weight: normal;
- text-decoration:none;
- color:#000;
- }
-
-#left-column li a:hover {text-decoration:underline}
-
-#left-column li li a, #left-column li li strong {padding-left:30px; background-position: 20px 11px;}
-#left-column li li li a, #left-column li li li strong {padding-left:40px; background-position: 30px 11px;}
-#left-column li li li li a, #left-column li li li li strong {padding-left:50px; background-position: 40px 11px;}
-#left-column li li li li li a, #left-column li li li li li strong {padding-left:60px; background-position: 50px 11px;}
/*=== Quotes =====*/
#content blockquote {margin:10px; min-height: 90px; padding-bottom: 10px}
@@ -170,229 +133,11 @@ legend { font-weight:bold
}
-/*=======form fields and labels=========*/
-
-/*
-#content label, form p, #content input, #content select, #content textarea, form .long-label {
- margin-bottom: 0.25em;
- margin-top: 0.25em;
- }
-#content form label {
- font-weight: bold;
- padding-right: 10px;
- width: 10em;
- float: left;
- text-align: left;
- color: #000;
- margin-top:10px
- }
-
-#content form .radio label, #content form .checkbox label {font-weight:normal; margin-top:0}
-
-form p, form h3 {margin-left:0}
-form p {font-weight: bold}
-*/
/*======= wide rows ======= */
#content textarea {padding: 5px;}
-/*====Required styling====*/
-.required {
- font-size:200%;
- padding:7px 0 0 0;
- line-height:0;
- vertical-align:middle;
- color:#008184
- }
-
-/*=========Header=========*/
-
-#header{
- padding: 0;
- margin: 0;
- min-height: 80px;
- text-align: center
- }
-
-#header {background: #34a3a4 url(../images/header-bg.gif) repeat-x bottom left;}
-#header img {position: absolute; top:8px; left: 37px}
-
-#header form {
- width: 320px;
- text-align: left;
- margin:0 auto;
- padding: 20px 0 0 0;
- }
-
-#header form div {float:left}
-
-#header form .search-input {background: url(../images/form-field_top.gif) no-repeat top left; padding:7px 0 0 0;}
-
-#header form .search-input input {
- width:207px;
- padding: 2px 5px 8px 5px;
- font-size:0.923em;
- color:#666666;
- border:none;
- background: url(../images/form-field_bottom.gif) no-repeat bottom left;
- }
-
-#header form .search-button {
- background: url(../images/search-button-top.gif) no-repeat top right;
- margin:0 0 0 4px;
- border-left: 1px solid #fff;
- }
-#header form .search-button input {
- border: none;
- background: url(../images/search-button-bottom.gif) no-repeat bottom right;
- padding: 3px 7px 8px 7px;
- margin:4px 0 0 0;
- font-weight:bold;
- font-size:0.923em;
- cursor: pointer
- }
-
-/*======== Switcher ========*/
-#switcher {float:right; margin:-20px 47px 0 0; text-align: left; }
-
-#switcher p {
- color: #fff;
- font-weight:bold;
- }
-
-#switcher li a, #switcher li strong {
- background-repeat:no-repeat;
- border:medium none;
- outline-style:none;
- outline-width:medium;
- text-indent:-999em;
- }
-
-#switcher .default a, .default strong {background-image:url(../images/style-switcher_default.gif); }
-#switcher .relaxed-light a, .relaxed-light strong {background-image:url(../images/style-switcher_default-relaxed.gif); }
-#switcher .dark a, .dark strong {background-image:url(../images/style-switcher_dark.gif); }
-#switcher .relaxed-dark a, .relaxed-dark strong {background-image:url(../images/style-switcher_dark-relaxed.gif); }
-
-#switcher li a, #switcher li strong {
- background-repeat:no-repeat;
- border:medium none;
- outline-style:none;
- outline-width:medium;
- text-indent:-999em;
- }
-
-#switcher p {
- font-size:1em;
- margin: 0;
- padding:0;
- width: auto; }
-
-#switcher ul {
- list-style-type:none;
- float:left;
- margin:0;
- padding:0;
- width:auto;
- }
-
-#switcher ul li {
- float:left;
- margin:0;
- padding:0;
- }
-
-#switcher li a, #switcher li strong {
- display:block;
- float:left;
- height:30px;
- margin:0;
- width:44px; }
-
-#switcher strong {background-position:0 -60px; }
-#switcher li a:focus, #switcher li a:active, #switcher a:hover {background-position:0 -30px; }
-/*== Homepage Right Column ==*/
-
-.browse-aloud p, p.browse-aloud {background: url('../images/logo-browse-aloud.gif') no-repeat 10px 0;}
-.browse-aloud p {
- font-size:1.235em;
- padding: 0 9px 0 60px;
- margin:10px 0 0 0;
- line-height:1.3em
- }
-
-p.browse-aloud {
- padding: 10px 0 5px 45px;
- margin: 0 5px -10px 40px;
- background-position: 0 10px;
- border-top: 1px solid #CC6666;
- }
-
-p.browse-aloud a {color:#34020b}
-
-/*====Pre-Footer====*/
-
-#pre-footer {padding: 0 35px;}
-#pre-footer div {padding: 0}
-
-#pre-footer .box-left {width: 66.66%; padding:0; margin:0}
-#pre-footer .box-right {width: 33.33%; padding: 0; margin:0}
-
-#pre-footer dl {margin:0; padding:0; float:left; width:25%; font-size:0.85em}
-#pre-footer dt {margin: 10px 0 0 0}
-
-#pre-footer dt, #pre-footer dd {padding: 0 0 0 10px}
-
-#pre-footer .box-right div {padding: 10px}
-#pre-footer h2 {font-size:1em; border:none; padding:0; margin:0}
-
-#pre-footer .box-right div {
- min-height:115px;
- border-top:none;
- border-bottom:none;
- margin-right:0;
- position:relative;
- overflow:hidden
- }
-
-#pre-footer ul, #pre-footer p, #pre-footer li {margin:0; padding:0}
-#pre-footer ul, #pre-footer h2, #pre-footer p {margin-left:110px}
-#pre-footer img {position:absolute; left:10px; top:10px}
-
-#pre-footer .box-right div.social-bookmarking {padding: 10px 15px}
-#pre-footer .social-bookmarking ul, #pre-footer .social-bookmarking h2, #pre-footer .social-bookmarking p {margin:0;}
-#pre-footer .social-bookmarking ul {margin: 8px 0 3px 0; overflow:hidden; width:100%}
-#pre-footer .social-bookmarking ul li {width: 49%; float:left; margin: 0 0 3px 0}
-#pre-footer .social-bookmarking ul li a {
- padding: 2px 0 2px 21px;
- background-position:0 3px;
- background-repeat: no-repeat;
- }
-
-#pre-footer .social-bookmarking h2 {color:#000}
-#pre-footer .social-bookmarking p {font-size: 0.85em}
-
-#pre-footer .social-bookmarking ul li.facebook a {background-image: url('../images/social-facebook.gif')}
-#pre-footer .social-bookmarking ul li.technorati a {background-image: url('../images/social-technorati.gif')}
-#pre-footer .social-bookmarking ul li.delicious a {background-image: url('../images/social-delicious.gif')}
-#pre-footer .social-bookmarking ul li.stumbleupon a {background-image: url('../images/social-stumbleupon.gif')}
-#pre-footer .social-bookmarking ul li.google a {background-image: url('../images/social-google.gif')}
-#pre-footer .social-bookmarking ul li.digg a {background-image: url('../images/social-digg.gif')}
-
-
-
-/*====Footer====*/
-
-#footer {
- clear: both;
- padding: 5px;
- margin:5px 0 0 0;
- }
-#footer ul {margin: 0 25px}
-#footer li {display:inline}
-/*== Footer colours + customisations ==*/
-#footer {background: #34a3a4 url(../images/header-bg.gif) repeat-x bottom left;}
-#footer a, #footer a:link {color:#fff}
diff --git a/web/cobrands/barnet/css/light.css b/web/cobrands/barnet/css/light.css deleted file mode 100644 index 62dc7e17d..000000000 --- a/web/cobrands/barnet/css/light.css +++ /dev/null @@ -1,142 +0,0 @@ -/*====== Light Colours and Images ======*/
-
-
-/*== Homepage Colours and Custimisations ==*/
-
-.online-services h2, .a-z h2 {
- background-image: url('../images/icon-online-services.png');
- color: #663333;
- border-color: #cc6666;
- }
-.a-z h2 {background:none}
-.online-services li a {background: url(../images/arrow-red.gif) no-repeat 6px 10px}
-#col-left .online-services li a, #col-left .online-services li a:link {color:#000}
-.whats-on div, .council-meetings div {
- background-color: #e5e5e5;
- border-bottom:1px solid #000;
- }
-
-#col-left .whats-on h2 a, #col-left .council-meetings h2 a {color:#000}
-.whats-on div {background-image: url('../images/icon-whats-on.png');}
-.council-meetings div {background-image: url('../images/icon-council-meetings.png');}
-
-.media li {border-bottom:1px solid #e5e5e5}
-.media p span {color:#666;}
-
-/* Homepage Highlights and Media*/
-
-.highlights h2 {
- background-image: url('../images/icon-highlights.png');
- border-color: #ffc000;
- }
-.highlights h2, #col-left .highlights a {color: #996600;}
-
-.media h2 {
- background-image: url('../images/icon-media-centre.png');
- border-color: #591cca;
- }
-.media h2, #col-left .media a {color: #6633cc;}
-
-#col-left .whats-on h2 .feed {background-image: url('../images/rss-whats-on.gif')}
-#col-left .highlights h2 .feed {background-image: url('../images/rss-highlights.gif')}
-#col-left .media h2 .feed {background-image: url('../images/rss-media.gif')}
-
-#col-left .a-z li a {color:#000; background: #d0e7e7}
-#col-left .a-z li a:hover {background: #f3e7e7}
-
-.link-bar {background: #e5e5e5; border-bottom: 1px solid #000}
-#col-left .link-bar a {color:#000}
-
-/*==== Homepage Tabs Colours and Custimisations ====*/
-
-#col-right, #col-right div, #iewrap #col-right .useful-links ul {background: url('../images/related-bg.gif');}
-
-#col-right a, #col-right a:link {color: #330000}
-
-#col-right ul {border-top: 1px solid #cc6666;}
-
-#col-right li a.leader-listens {background-image: url('../images/link-images/logo-leader-listens.gif')}
-#col-right li a.whereilive {background-image: url('../images/link-images/logo-whereilive.gif')}
-#col-right li a.facebook {background-image: url('../images/link-images/logo-facebook.gif')}
-#col-right li a.twitter {background-image: url('../images/link-images/logo-twitter.gif')}
-#col-right li a.you-tube {background-image: url('../images/link-images/logo-youtube.gif')}
-#col-right li a.flickr {background-image: url('../images/link-images/logo-flickr.gif')}
-
-#col-right li a.base {background-image: url('../images/link-images/logo-base.gif')}
-#col-right li a.direct-me {background-image: url('../images/link-images/logo-directme.gif')}
-#col-right li a.directgov {background-image: url('../images/link-images/logo-directgov.gif')}
-#col-right li a.support-people {background-image: url('../images/link-images/logo-supporting-people.gif')}
-
-
-#col-right ul ul {
- border-color: #eed0d0;
- background: #fff;
- }
-
-#col-right li a.tab-on {
- background-color:#fff;
- border-color: #eed0d0;
- }
-
-
-/*=== Content Page Layout :: Colours and Customisations===*/
-
-#content{border: 1px solid #d6eaea; border-width: 0 1px 0 1px}
-#wrap {background: url(../images/wrap-border.gif) repeat-y 35px 0;}
-
-/*=== Content Page Layout Elements :: Colours and Customisations===*/
-
-h1, h2 {border-bottom: 1px solid #008184; color:#003333}
-h3, h4, h5 {color:#003333}
-
-#content a:focus, #content a:active {color:#fff; background: #008184; }
-
-#content blockquote, #content q {
- background: #d8ebeb url('../images/quote.gif') no-repeat 10px 10px;
- border: 1px solid #008184;
- border-width: 1px 0
- }
-#content q {background-image:none}
-
-#content ul li {background: url('../images/arrow-green-small.gif') no-repeat 5px 5px}
-#content ul li ol li {background: none}
-#content ul li ul li, #content ol li ul li {background: url('../images/arrow-hyphen-small.gif') no-repeat 3px 10px}
-
-th {background:#008184; color:#fff}
-tr td {background:#f0f7f7}
-tr.even td {background:#d1e8e8}
-table.data td, table.data th {border-right: 3px solid #fff}
-
- /* Navigation colours */
-
-#left-column #navigation, #left-column #online-services, #left-column #useful-links, #left-column #contact {
- background-image: url(../images/main-prop-border.gif);
- background-position: 35px 0;
- background-repeat: repeat-y;
- }
-
-#left-column #navigation {background-color:#d8ebeb}
-#left-column #online-services {background-color:#f9f3f3}
-#left-column #useful-links, #left-column #contact {background-color:#e6e6e6}
-
-#left-column #navigation h2 {color: #003333; border-color: #008184; background-image: url('../images/icon-welcome.gif')}
-#left-column #online-services h2 {color:#663333; border-color: #cc6666; background-image: url('../images/icon-online-services-small.gif')}
-#left-column #useful-links h2, #left-column #contact h2 {color:#000; border-color: #999999; background-image: url('../images/icon-useful-links-small.gif')}
-#left-column #contact h2 {background-image: url('../images/icon-contact-small.gif')}
-
-#left-column #navigation li a {background-image: url('../images/arrow-green-small.gif')}
-#left-column #online-services li a {background-image: url('../images/arrow-red-small.gif')}
-#left-column #useful-links li a {background-image: url('../images/arrow-grey-small.gif')}
-
-#left-column li li strong {background-image: url('../images/arrow-current-nav.gif'); background-color: #008184; color:#fff}
-#left-column #navigation li li li li li a {background-image: url('../images/arrow-hyphen-small.gif'); background-position: 50px 14px}
-
- /* Forms colours */
-#content input[type|='text'] {border: 1px solid #008184}
-.error {color: #d04747}
-
-/*== Pre-Footer colours + customisations ==*/
-
-#pre-footer {background: #d4e9e9 url(../images/main-prop-border.gif) repeat-y 35px 0;}
-#pre-footer .box-right div {border: 1px solid #fff; border-bottom:medium none; border-top:medium none;}
-#pre-footer a, #pre-footer a:link {color:#000}
diff --git a/web/cobrands/barnet/css/print.css b/web/cobrands/barnet/css/print.css deleted file mode 100644 index aee3a0139..000000000 --- a/web/cobrands/barnet/css/print.css +++ /dev/null @@ -1,15 +0,0 @@ -
-
-* {border-color:#000; color:#000 !important; background: none !important}
-
-#iewrap #print-logo {display:block !important}
-
-#iewrap #header, #iewrap #left-column, #iewrap #footer, #pre-footer .box-right, #iewrap #main-propostion,
-#iewrap #col-right {display:none; }
-
-#iewrap h1, #iewrap h2 {padding-left:0}
-
-#iewrap #col-left, #iewrap #pre-footer .box-left {width:100%;}
-#iewrap #pre-footer dl {width:33%;}
-
-#iewrap #wrap, #iewrap #col-wrapper, #iewrap #content, #pre-footer {margin:0; padding:0; border: none}
\ No newline at end of file diff --git a/web/cobrands/barnet/css/relaxed.css b/web/cobrands/barnet/css/relaxed.css deleted file mode 100644 index 1b8226a56..000000000 --- a/web/cobrands/barnet/css/relaxed.css +++ /dev/null @@ -1,42 +0,0 @@ -/*== RELAXED LAYOUT ==*/
-
-body {font-size:100%}
-#main-propostion #navigation-index {width:66.6%}
-#navigation-index li {margin:0}
-#main-propostion #proposition-image {width:33.3%}
-
-#iewrap #col-left, #iewrap #col-right {width:100%; float:none}
-
-#col-right {clear:both}
-#col-right .cl {display:none}
-
-#col-right .browse-aloud, #col-right .social-links, #col-right .useful-links {
- float:left;
- width:33.3%;
- margin:0;
- }
-
-#col-right .browse-aloud {background:none}
-#col-right {background:none; margin-top:10px;}
-
-.index .box-right h2, .media ul, .council-meetings div, .index .link-bar {margin-right:5px}
-
-#navigation-index li a, .online-services li a {background-position: 6px 10px}
-
-#col-right ul {border-top:none;}
-#iewrap #col-right ul {margin: 0 5px}
-#iewrap #col-right ul ul {margin: -1px 0 0 0}
-
-#iewrap #col-right .tab-on {margin-bottom:0}
-#iewrap #col-right ul .tab-2 ul {margin-left:-101.2%;}
-
-#iewrap #col-right .social-links, #iewrap #col-right .useful-links {min-height:0px; padding-bottom:5px}
-#iewrap #col-right .useful-links {background: none;}
-#iewrap #col-right .useful-links ul {margin: 0 5px 0 0; min-height:384px;}
-
-#iewrap #col-wrapper {border:1px solid #E1E7E7; border-top:none; border-bottom:0}
-#iewrap #pre-footer {margin:0}
-
-#pre-footer .box-right div {min-height:185px}
-
-#content form .sw, #content form .se, #content form .nw, #content form .ne {display:none}
\ No newline at end of file diff --git a/web/cobrands/barnet/images/arrow-current-nav.gif b/web/cobrands/barnet/images/arrow-current-nav.gif Binary files differdeleted file mode 100644 index 5f3db021b..000000000 --- a/web/cobrands/barnet/images/arrow-current-nav.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-down.gif b/web/cobrands/barnet/images/arrow-down.gif Binary files differdeleted file mode 100644 index e8a1aec59..000000000 --- a/web/cobrands/barnet/images/arrow-down.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-green-small.gif b/web/cobrands/barnet/images/arrow-green-small.gif Binary files differdeleted file mode 100644 index 2e7f86ed7..000000000 --- a/web/cobrands/barnet/images/arrow-green-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-green.gif b/web/cobrands/barnet/images/arrow-green.gif Binary files differdeleted file mode 100644 index 040ac271f..000000000 --- a/web/cobrands/barnet/images/arrow-green.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-grey-small.gif b/web/cobrands/barnet/images/arrow-grey-small.gif Binary files differdeleted file mode 100644 index a4caf952d..000000000 --- a/web/cobrands/barnet/images/arrow-grey-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-hyphen-small.gif b/web/cobrands/barnet/images/arrow-hyphen-small.gif Binary files differdeleted file mode 100644 index 2bde8518b..000000000 --- a/web/cobrands/barnet/images/arrow-hyphen-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-hyphen.gif b/web/cobrands/barnet/images/arrow-hyphen.gif Binary files differdeleted file mode 100644 index c14a154ef..000000000 --- a/web/cobrands/barnet/images/arrow-hyphen.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-red-small.gif b/web/cobrands/barnet/images/arrow-red-small.gif Binary files differdeleted file mode 100644 index f51fafc15..000000000 --- a/web/cobrands/barnet/images/arrow-red-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/arrow-red.gif b/web/cobrands/barnet/images/arrow-red.gif Binary files differdeleted file mode 100644 index 611b2020f..000000000 --- a/web/cobrands/barnet/images/arrow-red.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/button-bg.gif b/web/cobrands/barnet/images/button-bg.gif Binary files differdeleted file mode 100644 index f10081020..000000000 --- a/web/cobrands/barnet/images/button-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif b/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif Binary files differdeleted file mode 100644 index c6c914865..000000000 --- a/web/cobrands/barnet/images/cnr-expanded-tab_ne.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif b/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif Binary files differdeleted file mode 100644 index 8bd637634..000000000 --- a/web/cobrands/barnet/images/cnr-expanded-tab_nw.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-expanded-tab_nw.png b/web/cobrands/barnet/images/cnr-expanded-tab_nw.png Binary files differdeleted file mode 100644 index a58028725..000000000 --- a/web/cobrands/barnet/images/cnr-expanded-tab_nw.png +++ /dev/null diff --git a/web/cobrands/barnet/images/cnr-search-button.gif b/web/cobrands/barnet/images/cnr-search-button.gif Binary files differdeleted file mode 100644 index 5dc3da24b..000000000 --- a/web/cobrands/barnet/images/cnr-search-button.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-green-small.gif b/web/cobrands/barnet/images/dark/arrow-green-small.gif Binary files differdeleted file mode 100644 index 5c58d383d..000000000 --- a/web/cobrands/barnet/images/dark/arrow-green-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-green.gif b/web/cobrands/barnet/images/dark/arrow-green.gif Binary files differdeleted file mode 100644 index 4564d3e06..000000000 --- a/web/cobrands/barnet/images/dark/arrow-green.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-grey-small.gif b/web/cobrands/barnet/images/dark/arrow-grey-small.gif Binary files differdeleted file mode 100644 index 1b47cb21d..000000000 --- a/web/cobrands/barnet/images/dark/arrow-grey-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-red-small.gif b/web/cobrands/barnet/images/dark/arrow-red-small.gif Binary files differdeleted file mode 100644 index f9c2e1cf5..000000000 --- a/web/cobrands/barnet/images/dark/arrow-red-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/arrow-red.gif b/web/cobrands/barnet/images/dark/arrow-red.gif Binary files differdeleted file mode 100644 index b0c9d7d5d..000000000 --- a/web/cobrands/barnet/images/dark/arrow-red.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif b/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif Binary files differdeleted file mode 100644 index 7d2ef2d9e..000000000 --- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_ne.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif b/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif Binary files differdeleted file mode 100644 index 03f1e20dd..000000000 --- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png b/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png Binary files differdeleted file mode 100644 index 66d9ec0f5..000000000 --- a/web/cobrands/barnet/images/dark/cnr-expanded-tab_nw.png +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/cnr-search-button.gif b/web/cobrands/barnet/images/dark/cnr-search-button.gif Binary files differdeleted file mode 100644 index 7bdb7ba0c..000000000 --- a/web/cobrands/barnet/images/dark/cnr-search-button.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/grey-border.gif b/web/cobrands/barnet/images/dark/grey-border.gif Binary files differdeleted file mode 100644 index d01106f1a..000000000 --- a/web/cobrands/barnet/images/dark/grey-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-contact-small.gif b/web/cobrands/barnet/images/dark/icon-contact-small.gif Binary files differdeleted file mode 100644 index 36b258e1d..000000000 --- a/web/cobrands/barnet/images/dark/icon-contact-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-council-meetings.gif b/web/cobrands/barnet/images/dark/icon-council-meetings.gif Binary files differdeleted file mode 100644 index 80faa8dda..000000000 --- a/web/cobrands/barnet/images/dark/icon-council-meetings.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-highlights.gif b/web/cobrands/barnet/images/dark/icon-highlights.gif Binary files differdeleted file mode 100644 index 682b66416..000000000 --- a/web/cobrands/barnet/images/dark/icon-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-media-centre.gif b/web/cobrands/barnet/images/dark/icon-media-centre.gif Binary files differdeleted file mode 100644 index 4a0c3269f..000000000 --- a/web/cobrands/barnet/images/dark/icon-media-centre.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-online-services-small.gif b/web/cobrands/barnet/images/dark/icon-online-services-small.gif Binary files differdeleted file mode 100644 index 59c969735..000000000 --- a/web/cobrands/barnet/images/dark/icon-online-services-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-online-services.gif b/web/cobrands/barnet/images/dark/icon-online-services.gif Binary files differdeleted file mode 100644 index ff4bc93fe..000000000 --- a/web/cobrands/barnet/images/dark/icon-online-services.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-useful-links-small.gif b/web/cobrands/barnet/images/dark/icon-useful-links-small.gif Binary files differdeleted file mode 100644 index 589550b80..000000000 --- a/web/cobrands/barnet/images/dark/icon-useful-links-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-welcome.gif b/web/cobrands/barnet/images/dark/icon-welcome.gif Binary files differdeleted file mode 100644 index 85afa6fa8..000000000 --- a/web/cobrands/barnet/images/dark/icon-welcome.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/icon-whats-on.gif b/web/cobrands/barnet/images/dark/icon-whats-on.gif Binary files differdeleted file mode 100644 index e7d028a80..000000000 --- a/web/cobrands/barnet/images/dark/icon-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/main-prop-border.gif b/web/cobrands/barnet/images/dark/main-prop-border.gif Binary files differdeleted file mode 100644 index 192c20d28..000000000 --- a/web/cobrands/barnet/images/dark/main-prop-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/quote.gif b/web/cobrands/barnet/images/dark/quote.gif Binary files differdeleted file mode 100644 index d9a4f7496..000000000 --- a/web/cobrands/barnet/images/dark/quote.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/red-border.gif b/web/cobrands/barnet/images/dark/red-border.gif Binary files differdeleted file mode 100644 index c8b56fa8c..000000000 --- a/web/cobrands/barnet/images/dark/red-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/related-bg.gif b/web/cobrands/barnet/images/dark/related-bg.gif Binary files differdeleted file mode 100644 index 7cd7cef31..000000000 --- a/web/cobrands/barnet/images/dark/related-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/rss-highlights.gif b/web/cobrands/barnet/images/dark/rss-highlights.gif Binary files differdeleted file mode 100644 index dd7b416f0..000000000 --- a/web/cobrands/barnet/images/dark/rss-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/rss-media.gif b/web/cobrands/barnet/images/dark/rss-media.gif Binary files differdeleted file mode 100644 index 273c8c5f9..000000000 --- a/web/cobrands/barnet/images/dark/rss-media.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/rss-whats-on.gif b/web/cobrands/barnet/images/dark/rss-whats-on.gif Binary files differdeleted file mode 100644 index 60b752c8c..000000000 --- a/web/cobrands/barnet/images/dark/rss-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-delicious.gif b/web/cobrands/barnet/images/dark/social-delicious.gif Binary files differdeleted file mode 100644 index 98955d90b..000000000 --- a/web/cobrands/barnet/images/dark/social-delicious.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-digg.gif b/web/cobrands/barnet/images/dark/social-digg.gif Binary files differdeleted file mode 100644 index b33602377..000000000 --- a/web/cobrands/barnet/images/dark/social-digg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-facebook.gif b/web/cobrands/barnet/images/dark/social-facebook.gif Binary files differdeleted file mode 100644 index 072e5ac2d..000000000 --- a/web/cobrands/barnet/images/dark/social-facebook.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-google.gif b/web/cobrands/barnet/images/dark/social-google.gif Binary files differdeleted file mode 100644 index a3a11b3ce..000000000 --- a/web/cobrands/barnet/images/dark/social-google.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-stumbleupon.gif b/web/cobrands/barnet/images/dark/social-stumbleupon.gif Binary files differdeleted file mode 100644 index b9c4a1088..000000000 --- a/web/cobrands/barnet/images/dark/social-stumbleupon.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/social-technorati.gif b/web/cobrands/barnet/images/dark/social-technorati.gif Binary files differdeleted file mode 100644 index 0b7d2e299..000000000 --- a/web/cobrands/barnet/images/dark/social-technorati.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/dark/wrap-border.gif b/web/cobrands/barnet/images/dark/wrap-border.gif Binary files differdeleted file mode 100644 index cf8c3d319..000000000 --- a/web/cobrands/barnet/images/dark/wrap-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/expanded-tab.png b/web/cobrands/barnet/images/expanded-tab.png Binary files differdeleted file mode 100644 index df8dd66b4..000000000 --- a/web/cobrands/barnet/images/expanded-tab.png +++ /dev/null diff --git a/web/cobrands/barnet/images/form-field_bottom.gif b/web/cobrands/barnet/images/form-field_bottom.gif Binary files differdeleted file mode 100644 index 63ec4d121..000000000 --- a/web/cobrands/barnet/images/form-field_bottom.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/form-field_top.gif b/web/cobrands/barnet/images/form-field_top.gif Binary files differdeleted file mode 100644 index a7b7e0d52..000000000 --- a/web/cobrands/barnet/images/form-field_top.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/header-bg.gif b/web/cobrands/barnet/images/header-bg.gif Binary files differdeleted file mode 100644 index 5e6a72ef9..000000000 --- a/web/cobrands/barnet/images/header-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-contact-small.gif b/web/cobrands/barnet/images/icon-contact-small.gif Binary files differdeleted file mode 100644 index efed060d1..000000000 --- a/web/cobrands/barnet/images/icon-contact-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-council-meetings.gif b/web/cobrands/barnet/images/icon-council-meetings.gif Binary files differdeleted file mode 100644 index 1eca7dc68..000000000 --- a/web/cobrands/barnet/images/icon-council-meetings.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-council-meetings.png b/web/cobrands/barnet/images/icon-council-meetings.png Binary files differdeleted file mode 100644 index 28e0aea75..000000000 --- a/web/cobrands/barnet/images/icon-council-meetings.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-highlights.gif b/web/cobrands/barnet/images/icon-highlights.gif Binary files differdeleted file mode 100644 index e9b079445..000000000 --- a/web/cobrands/barnet/images/icon-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-highlights.png b/web/cobrands/barnet/images/icon-highlights.png Binary files differdeleted file mode 100644 index d812a2ad9..000000000 --- a/web/cobrands/barnet/images/icon-highlights.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-media-centre.gif b/web/cobrands/barnet/images/icon-media-centre.gif Binary files differdeleted file mode 100644 index b37eb9606..000000000 --- a/web/cobrands/barnet/images/icon-media-centre.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-media-centre.png b/web/cobrands/barnet/images/icon-media-centre.png Binary files differdeleted file mode 100644 index 5e1741618..000000000 --- a/web/cobrands/barnet/images/icon-media-centre.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-online-services-small.gif b/web/cobrands/barnet/images/icon-online-services-small.gif Binary files differdeleted file mode 100644 index 19f1c7d4e..000000000 --- a/web/cobrands/barnet/images/icon-online-services-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-online-services.gif b/web/cobrands/barnet/images/icon-online-services.gif Binary files differdeleted file mode 100644 index 1d79fb14b..000000000 --- a/web/cobrands/barnet/images/icon-online-services.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-online-services.png b/web/cobrands/barnet/images/icon-online-services.png Binary files differdeleted file mode 100644 index ef0297af7..000000000 --- a/web/cobrands/barnet/images/icon-online-services.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-useful-links-small.gif b/web/cobrands/barnet/images/icon-useful-links-small.gif Binary files differdeleted file mode 100644 index 1c4566127..000000000 --- a/web/cobrands/barnet/images/icon-useful-links-small.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-welcome.gif b/web/cobrands/barnet/images/icon-welcome.gif Binary files differdeleted file mode 100644 index 24c603a4a..000000000 --- a/web/cobrands/barnet/images/icon-welcome.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-welcome.png b/web/cobrands/barnet/images/icon-welcome.png Binary files differdeleted file mode 100644 index e6fb3c46a..000000000 --- a/web/cobrands/barnet/images/icon-welcome.png +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-whats-on.gif b/web/cobrands/barnet/images/icon-whats-on.gif Binary files differdeleted file mode 100644 index df96259a5..000000000 --- a/web/cobrands/barnet/images/icon-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/icon-whats-on.png b/web/cobrands/barnet/images/icon-whats-on.png Binary files differdeleted file mode 100644 index bba974359..000000000 --- a/web/cobrands/barnet/images/icon-whats-on.png +++ /dev/null diff --git a/web/cobrands/barnet/images/logo-barnet.gif b/web/cobrands/barnet/images/logo-barnet.gif Binary files differdeleted file mode 100644 index 5bcb70bb0..000000000 --- a/web/cobrands/barnet/images/logo-barnet.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/logo-browse-aloud.gif b/web/cobrands/barnet/images/logo-browse-aloud.gif Binary files differdeleted file mode 100644 index 16d51b63e..000000000 --- a/web/cobrands/barnet/images/logo-browse-aloud.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/main-prop-border.gif b/web/cobrands/barnet/images/main-prop-border.gif Binary files differdeleted file mode 100644 index 2799b45c6..000000000 --- a/web/cobrands/barnet/images/main-prop-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/navigation-bg.gif b/web/cobrands/barnet/images/navigation-bg.gif Binary files differdeleted file mode 100644 index 4abcb5896..000000000 --- a/web/cobrands/barnet/images/navigation-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/prop-bg.png b/web/cobrands/barnet/images/prop-bg.png Binary files differdeleted file mode 100644 index eee3d4329..000000000 --- a/web/cobrands/barnet/images/prop-bg.png +++ /dev/null diff --git a/web/cobrands/barnet/images/quote.gif b/web/cobrands/barnet/images/quote.gif Binary files differdeleted file mode 100644 index cbcd770f8..000000000 --- a/web/cobrands/barnet/images/quote.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/related-bg.gif b/web/cobrands/barnet/images/related-bg.gif Binary files differdeleted file mode 100644 index 58c9f731a..000000000 --- a/web/cobrands/barnet/images/related-bg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/rss-highlights.gif b/web/cobrands/barnet/images/rss-highlights.gif Binary files differdeleted file mode 100644 index 4a938a86d..000000000 --- a/web/cobrands/barnet/images/rss-highlights.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/rss-media.gif b/web/cobrands/barnet/images/rss-media.gif Binary files differdeleted file mode 100644 index 4e3f55f87..000000000 --- a/web/cobrands/barnet/images/rss-media.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/rss-whats-on.gif b/web/cobrands/barnet/images/rss-whats-on.gif Binary files differdeleted file mode 100644 index d4f44b861..000000000 --- a/web/cobrands/barnet/images/rss-whats-on.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/search-button-bottom.gif b/web/cobrands/barnet/images/search-button-bottom.gif Binary files differdeleted file mode 100644 index ae6404966..000000000 --- a/web/cobrands/barnet/images/search-button-bottom.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/search-button-top.gif b/web/cobrands/barnet/images/search-button-top.gif Binary files differdeleted file mode 100644 index bf4a13e0b..000000000 --- a/web/cobrands/barnet/images/search-button-top.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-delicious.gif b/web/cobrands/barnet/images/social-delicious.gif Binary files differdeleted file mode 100644 index 0f243ea90..000000000 --- a/web/cobrands/barnet/images/social-delicious.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-digg.gif b/web/cobrands/barnet/images/social-digg.gif Binary files differdeleted file mode 100644 index c836d1412..000000000 --- a/web/cobrands/barnet/images/social-digg.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-facebook.gif b/web/cobrands/barnet/images/social-facebook.gif Binary files differdeleted file mode 100644 index 96eef255f..000000000 --- a/web/cobrands/barnet/images/social-facebook.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-google.gif b/web/cobrands/barnet/images/social-google.gif Binary files differdeleted file mode 100644 index 491a23adf..000000000 --- a/web/cobrands/barnet/images/social-google.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-stumbleupon.gif b/web/cobrands/barnet/images/social-stumbleupon.gif Binary files differdeleted file mode 100644 index 8d24d01f4..000000000 --- a/web/cobrands/barnet/images/social-stumbleupon.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/social-technorati.gif b/web/cobrands/barnet/images/social-technorati.gif Binary files differdeleted file mode 100644 index ab83181b9..000000000 --- a/web/cobrands/barnet/images/social-technorati.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif b/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif Binary files differdeleted file mode 100644 index e94c93959..000000000 --- a/web/cobrands/barnet/images/style-switcher_dark-relaxed.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_dark.gif b/web/cobrands/barnet/images/style-switcher_dark.gif Binary files differdeleted file mode 100644 index 094115ecd..000000000 --- a/web/cobrands/barnet/images/style-switcher_dark.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_default-relaxed.gif b/web/cobrands/barnet/images/style-switcher_default-relaxed.gif Binary files differdeleted file mode 100644 index 7bb6f7df9..000000000 --- a/web/cobrands/barnet/images/style-switcher_default-relaxed.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/style-switcher_default.gif b/web/cobrands/barnet/images/style-switcher_default.gif Binary files differdeleted file mode 100644 index 9e932af2f..000000000 --- a/web/cobrands/barnet/images/style-switcher_default.gif +++ /dev/null diff --git a/web/cobrands/barnet/images/wrap-border.gif b/web/cobrands/barnet/images/wrap-border.gif Binary files differdeleted file mode 100644 index eb5ff2330..000000000 --- a/web/cobrands/barnet/images/wrap-border.gif +++ /dev/null diff --git a/web/cobrands/barnet/javascript/2008-portsurf.js b/web/cobrands/barnet/javascript/2008-portsurf.js deleted file mode 100644 index f9253a25a..000000000 --- a/web/cobrands/barnet/javascript/2008-portsurf.js +++ /dev/null @@ -1,93 +0,0 @@ -/**
-* Portsurf Ltd functions
-**/
-
-function resetMarkers(){
- $("#s1:first-child").html("default");
- $("#s2:first-child").html("relaxed light");
- $("#s3:first-child").html("dark");
- $("#s4:first-child").html("relaxed dark");
-}
-
-$(document).ready(function(){
-
- /**
- * Show the style switcher - it's hidden without javascript
- **/
- $("#switcher").show();
-
-
- /**
- * Clear the search box
- **/
- $(".search").focus(function(){
- if(this.value=="Please enter your search"){
- this.value="";
- }
- });
-
- /**
- * Highlight the appropriate style preference
- **/
-
-
- /**
- * Page loads
- **/
-
- // reset markers first
- resetMarkers();
-
- // set markers
- var sty=$.cookie('style');
- switch(sty){
- case "default":
- $("#s1:first-child").html("<strong>default</strong>");
- break;
-
- case "relaxed light":
- $("#s2:first-child").html("<strong>relaxed light</strong>");
- break;
-
- case "dark":
- $("#s3:first-child").html("<strong>dark</strong>");
- break;
-
- case "relaxed dark":
- $("#s4:first-child").html("<strong>relaxed dark</strong>");
- break;
-
- default:
- $("#s1:first-child").html("<strong>default</strong>");
- break;
-
- }
-
- /**
- * Clicks
- **/
-
- $("#s1").click(function(){
- resetMarkers();
- $("#s1:first-child").html("<strong>default</strong>");
- });
-
- $("#s2").click(function(){
- resetMarkers();
- $("#s2:first-child").html("<strong>relaxed light</strong>");
- });
-
- $("#s3").click(function(){
- resetMarkers();
- $("#s3:first-child").html("<strong>dark</strong>");
- });
-
- $("#s4").click(function(){
- resetMarkers();
- $("#s4:first-child").html("<strong>relaxed dark</strong>");
- });
-
- // Intentionally blank due to fake indenting...
-
-});
-
diff --git a/web/cobrands/barnet/javascript/jquery-1.2.6_common.js b/web/cobrands/barnet/javascript/jquery-1.2.6_common.js deleted file mode 100644 index 7b09750cc..000000000 --- a/web/cobrands/barnet/javascript/jquery-1.2.6_common.js +++ /dev/null @@ -1,31 +0,0 @@ -//jQuery 1.2.6 -(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else -return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else -return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else -selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else -return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else -this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else -return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else -jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&©&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else -script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else -for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else -for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else -jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else -ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&¬xml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&¬xml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else -while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else -while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else -for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else -jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else -xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else -jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else -for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else -s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else -e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); - -// Cookies -function createCookie(name,value,days){if(days){var date=new Date();date.setTime(date.getTime()+(days*24*60*60*1000));var expires="; expires="+date.toGMTString();} -else var expires="";document.cookie=name+"="+value+expires+"; path=/";} -function readCookie(name){var nameEQ=name+"=";var ca=document.cookie.split(';');for(var i=0;i<ca.length;i++){var c=ca[i];while(c.charAt(0)==' ')c=c.substring(1,c.length);if(c.indexOf(nameEQ)==0)return c.substring(nameEQ.length,c.length);} -return null;} -function eraseCookie(name){createCookie(name,"",-1);} - diff --git a/web/cobrands/barnet/javascript/jquery-cookie-min.js b/web/cobrands/barnet/javascript/jquery-cookie-min.js deleted file mode 100644 index 37fe78ad6..000000000 --- a/web/cobrands/barnet/javascript/jquery-cookie-min.js +++ /dev/null @@ -1,10 +0,0 @@ -/**
- * Cookie plugin
- *
- * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- *
- */
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
\ No newline at end of file diff --git a/web/cobrands/barnet/javascript/styleswitch.js b/web/cobrands/barnet/javascript/styleswitch.js deleted file mode 100644 index c4afb0b28..000000000 --- a/web/cobrands/barnet/javascript/styleswitch.js +++ /dev/null @@ -1,26 +0,0 @@ -/**
-* Styleswitch stylesheet switcher built on jQuery
-* Under an Attribution, Share Alike License
-* By Kelvin Luck ( http://www.kelvinluck.com/ )
-**/
-
-$(document).ready(function() {
- $('.styleswitch').click(function()
- {
- switchStylestyle(this.getAttribute("rel"));
- return false;
- });
- var c = readCookie('style');
- if (c) switchStylestyle(c);
-});
-
-function switchStylestyle(styleName)
-{
- $('link[@rel*=style][@title]').each(function(i)
- {
- this.disabled = true;
- if (this.getAttribute('title') == styleName) this.disabled = false;
- });
- createCookie('style', styleName, 365);
-}
-
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss new file mode 100644 index 000000000..c0376274e --- /dev/null +++ b/web/cobrands/bromley/_colours.scss @@ -0,0 +1,8 @@ +/* COLOURS */ + +$primary: rgb(76,120,168); +$primary_b: #000000; +$primary_text: #ffffff; + +$contrast1: #00BD08; +$contrast2: #AA8D11; diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss new file mode 100644 index 000000000..4594f832f --- /dev/null +++ b/web/cobrands/bromley/base.scss @@ -0,0 +1,7 @@ +@import "../fixmystreet/_h5bp"; +@import "./_colours"; +@import "../fixmystreet/_mixins"; +@import "compass"; + +@import "../fixmystreet/_base"; + diff --git a/web/cobrands/bromley/config.rb b/web/cobrands/bromley/config.rb new file mode 100644 index 000000000..cab97b18f --- /dev/null +++ b/web/cobrands/bromley/config.rb @@ -0,0 +1,25 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "" +sass_dir = "" +images_dir = "" +javascripts_dir = "" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + +line_comments = false # by Compass.app diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss new file mode 100644 index 000000000..3dc34c6c7 --- /dev/null +++ b/web/cobrands/bromley/layout.scss @@ -0,0 +1,11 @@ +@import "_colours"; +@import "../fixmystreet/_layout"; + +body { + background: #fff; +} + +#front-main { + background: $primary; +} + diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss new file mode 100644 index 000000000..644b015b5 --- /dev/null +++ b/web/cobrands/fixmystreet/_base.scss @@ -0,0 +1,1482 @@ +/* HEADINGS and TYPOGRAPHY */ + +body { + font-family: MuseoSans, Helmet, Freesans, sans-serif; + margin:0; + font-size:1em; + line-height:1.5; + color: #222; + background-color: #fff; +} + + +p { + font-size: 1em; + font-weight: normal; + margin:0 0 1em 0; +} + +small{ + font-family: Helmet, Freesans, sans-serif; + font-style: italic; + font-size: 0.8125em; + line-height: 1.2307em; +} + +h1 { + font-family: 'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; + font-size: 2em; + line-height: 1em; + font-weight: normal; + margin-top: 0.5em; + margin-bottom: 0.5em; +} +#front-main h1 { + margin-top: 0.7em; +} +h1#reports_heading span { + display: none; +} +h1#reports_heading a { + display: block; + font-size: 50%; +} + +h2 { + font-family:'Museo300-display', MuseoSans, Helmet, Freesans, sans-serif; + font-size: 1.5em; /*24px*/ + line-height: 1.3333em; /*32px*/ + font-weight: normal; + margin-top: 1.333333333em; /*32px*/ + margin-bottom: 0.666666666em; /*16px*/ +} + +h3 { + font-size: 1.25em; + line-height: 1.20em; + margin-top: 1.2em; + margin-bottom: 0.8em; + font-weight: normal; +} + +h4 { + font-size: 1em; + font-weight: normal; + margin-bottom: 1em; +} + +// default list styles +ul, ol { + font-size: 1em; + margin-bottom: 2em; + margin-left: 2em; + padding:0; +} + +li{ + margin-bottom: 0.5em; +} + +ul li{ + list-style: square; +} + +ol li { + list-style:decimal; +} + +// lets you have a traditional ol but with nicely styled numbers +// for older browsers it just falls back to the normal ol +ol.big-numbers { + padding: 0; + margin: 0; + counter-reset: li; // reset counter to be 'li' instead of a number + > li { + position: relative; + list-style: none; + padding:0 0 0 2.5em; + margin-bottom:2em; + &:before { + content: counter(li); // set the content to be whatever the 'li' var is + counter-increment: li; // add to the counter var + position: absolute; + left: 0; + top:-0.2em; + color:#ccc; + line-height:1; + font: { + family: Helmet, Freesans, sans-serif; + weight:bold; + size:2.5em; + } + } + } +} + +dl { + margin: 0; + padding: 0; + dt { + font-size: 1em; + line-height: 1.5em; + font-weight: bold; + } + dd { + font-weight: 1em; + line-height: 1.5em; + margin:0 0 1em 0; + } +} + +blockquote { + p:before { + content: '“'; + } + p:after { + content: '”'; + } +} + +pre { + font-family: monospace; +} + +img { + //do this otherwise IE will just not display + //any img without a height defined + height:auto; +} + +select, input, textarea { + font-size: 99%; + max-width: 95%; +} +// To deal with bug from drop-down being wider than holder +select { + width: 100%; +} + +// links +a, +a:visited { + text-decoration:none; + color:#0BA7D1; + &:hover, + &:active { + text-decoration:underline; + color:#0D7CCE; + } +} + +// custom type +.small-print { + @extend small; + margin-bottom: 1.2307em; + color:#666666; +} +.meta{ + color:#555555; + font-style: italic; + margin-bottom: 0px; +} +.meta-2{ + font-family: Helmet, Freesans, sans-serif; + color:#666666; + font-style: italic; + font-size: 0.75em; +} + +h4.static{ + font-family: Helmet, Freesans, sans-serif; + text-transform: uppercase; + font-size: 0.875em; + line-height: 1.71428em; + color:#666; + margin-top: 2em; +} +h4.static-with-rule{ + @extend.static; + background: #f6f6f6; + border-top: 0.25em solid $primary; + margin-bottom:0.25em; + padding: 0.5em 1em; +} + +/* FORMS */ + +// input placeholders, these need to be on separate lines as if the browser +// can't understand a selector it will invalidate the whole line. +::-webkit-input-placeholder { + color: #666666; + font: { + style:italic; + size:0.9375em; + } +} +:-moz-placeholder { + color:#666666; + font: { + style:italic; + size:0.9375em; + } +} +:-ms-placeholder { + color:#666666; + font: { + style:italic; + size:0.9375em; + } +} +//this only gets used when the browser doesn't support @placeholder +.placeholder { + color:#666666; + font: { + style:italic; + size:0.9375em; + } +} + +// wrap anything inside the form in a fieldset to give +// us the right spacing +fieldset { + margin: 1em; +} + +input[type=text], +input[type=password], +input[type=email], +input[type=file], +textarea { + width: 100%; + // adjust so the sides line up + padding: 0.5em; + margin: 0 0 0 -0.5em; +} + +textarea { + border: 0.125em solid #888888; + @include border-radius(0.25em); + display: block; + font-size: 1em; + line-height: 1.5em; + font-family: Helmet, Freesans, sans-serif; + min-height:8em; +} + +input[type=text], +input[type=password], +input[type=email], +input[type=file] { + border: 0.125em solid #888888; + @include border-radius(0.25em); + display: block; + font-size: 1em; + line-height: 1em; +} +input[type=file] { + margin-bottom:1em; +} + +label{ + display: block; + margin-top: 1.25em; + margin-bottom: 0.25em; + font-weight: bold; + &.inline{ + display: inline; + padding: 0 2em 0 1em; + font-weight: normal; + } +} + +// grey background, full width box +.form-box { + margin: 0 -2em 0.25em -2em; + background:#eeeeee; + padding:1em 2em 1em 2em; + max-width:26em; + >input[type=text] { + margin-bottom:1em; + } + .title { + font-size:1.25em; + margin:0.5em 0; + } + h5 { + margin:0; + font: { + size:1.125em; + weight:normal; + } + strong { + font-size:2em; + margin-right:0.25em; + } + } +} +// IE6 doesn't extend the grey box back with the above negative margins, and +// the password box falls off screen for some reason. Just have boring margins, +// it looks okay. +.ie6 .form-box { + margin: 0 0 0.25em 0; +} + +.form-txt-submit-box { + min-height:3em; + input[type=password], + input[type=text], + input[type=email] { + width: 65%; + float:left; + } + input[type=submit] { + float:right; + width:28%; + margin-right:0.25em; + padding-top:0.7em; + padding-bottom:0.6em; + } +} + +.checkbox-group { + margin:1em 0; +} + + +// form errors +div.form-error, +p.form-error { + @include inline-block; + background:#ff0000; + color:#fff; + padding:0 0.5em; + margin:0 0 0 -0.5em; + @include border-radius(0.25em 0.25em 0 0); +} + +input.form-error, +textarea.form-error { + border-color:#ff0000; + @include border-radius(0 0.25em 0.25em 0.25em); +} + +ul.error { + background:#ff0000; + color:#fff; + padding:0 0.5em; + margin:0 0 0 -0.5em; + @include border-radius(0.25em); +} + +// don't display valid error boxes as now the page jump +// won't be until the user submits, which is fine +div.label-valid, +p.label-valid { + display:none !important; + visibility: hidden; +} + + + +/*** LAYOUT ***/ + +// Padding creates page margins on mobile +.container{ + padding: 0 1em 1em; +} + +// Use full width to reverse .container margins +.full-width { + margin: 0 -1em; +} + +// #site-header creates grey bar in mobile +// .nav-wrapper-2 is used on desktop +#site-header{ + border-top: 0.25em solid $primary; + height: 3em; + @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + .container { + min-height:4em; + } +} +#site-logo{ + display: block; + width: 175px; + height: 40px; + top: 0.4em; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat; + text-indent: -999999px; + position: absolute; + z-index:2; +} +.ie6 #site-logo { + background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat; +} +.ie7 #site-logo { + background: url('/cobrands/fixmystreet/images/sprite.png') -3px -3px no-repeat; +} + +// this is a skip to nav for mobile users only +#nav-link { + width: 50px; + height: 48px; + background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat; + display: block; + text-indent: -999999px; + position: absolute; + right:2em; + top:-2px; + &:hover { + top:2px; + } +} + + +#main-nav{ + ul{ + @include list-reset-soft; + li{ + a, span { + display: block; + padding: 0.5em 1em; + background:#f6f6f6; + color:#333; + font-size: 1.25em; + border-bottom: 0.25em solid #333; + } + a:hover, span.hover { + background: #333; + color:#fff; + text-decoration: none; + } + span { + background-color: #ccc; + } + } + &#mysoc-menu{ + li { + a { + background:$primary; + &#mysoc-logo { + background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIkAAAAyCAMAAABf9whNAAAACW9GRnMAAADwAAAAJgAMZizzAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAANlBMVEUAAAAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL///90WH2CAAAAEHRSTlMADx8vP09fb3+Pn6+/z9/v+t8hjgAAAAFiS0dEEeK1PboAAAGqSURBVFjD7ZbNjtwgEAY/oIE2YKj3f9ocPDOZ3eN6FCUKdWsJQ+H+saXNZrPZbDabzf/GovwdIhH8LUzHn/PqI32Jcw1v0fjidQf30EZPqmMURXeT5F5kbYwqSQbeWpAU6xg961pT+mgm+WR4Ke6SzG9JwQRWB6iaTClCzQBLknT0AibZAnCBSx2ALACGQ5JOznsmq1TA82LKIalC6Jwh5seaMGdUWKxiJQpclWVqLNlJsxThUIB6z8Qft3FQgEODrs4qUuj9qoljpAr2euKkmxVIjzrpTBUI90xMGgzJQGrMAEUGrGKQn6c7/HbngT1MMqRO1wdNDA6WpNgW5Ld38s1kuLt7fPbO5Lg7Z76ZaLJoV3WAa6wsxbmiyrMMruyMVxc3SaqvAv+YSQWS1Fs9oAi8jQKmsGB4zwJXgdO9VWnAkaUAHJ81CTAkLYAm5ZbB/QhSmm9d7Ff7Splr5jaI90zMgpQsScHsGmRFUsheH6O1jecR5m5BZlFSzF5NkpJ7lMJ85etDlPWjHdMJ6aMiFdYPdgzw6Q90Yvwo2+fM+3dps9lsNpvNP8gvi7UYry9B6TcAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDAcdbR4AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwbSgMxAAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAASUVORK5CYII='); + background-repeat:no-repeat; + text-indent:-999999px; + } + } + } + } + } +} +.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { + background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat; +} +.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { + background: url('/cobrands/fixmystreet/images/sprite.png') -240px -38px no-repeat; +} + +//defines where the table caption is (login stuff on mob, nav menu on desktop) +.wrapper { + width:100%; + display:table; + caption-side:bottom; +} +// this is the user's logged in details or the login link etc +#user-meta { + p { + position: relative; + background:$primary; + padding:1em 6em 1em 1em; + a { + position: absolute; + right:1em; + @include inline-block; + text-transform:uppercase; + font-size:0.75em; + background:#333; + padding:0.25em 0.75em; + color:#fff; + @include border-radius(0.25em); + } + } +} + + +// #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic +.shadow-wrap { + @extend .full-width; + ul#key-tools{ + @include list-reset-soft; + margin-bottom: 1em; + display: table; + width:100%; + li{ + display: table-cell; + vertical-align: bottom; + text-align: center; + border-right:0.25em solid #fff; + &:last-child { + border-right:none; + } + a { + display: block; + background-color: #f5f5f5; + background-repeat: no-repeat; + color:#333; + padding:4em 2em 1em 2em; + text-transform:uppercase; + font: { + size:0.6875em; + family: Helmet, Freesans, sans-serif; + } + &:hover, &.hover, &.active { + text-decoration:none; + background-color:#333; + color:#fff; + } + &.abuse { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2424px; + } + &.feed { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2563px; + } + &.chevron { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2716px; + } + &.hover, &.active { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position:center -2064px; + } + } + } + } +} + +//because display:table doesn't work we float +.ie6, .ie7 { + .shadow-wrap { + ul#key-tools{ + background:#f5f5f5; + li{ + float:left; + a { + padding-left:1.5em; + padding-right:3em; + } + } + } + } +} +.ie6 .shadow-wrap ul#key-tools li a { + &.abuse { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); + background-position: right 0px; + } + &.feed { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); + background-position: right -58px; + } + &.chevron { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); + background-position: right -116px; + } + &:hover { + background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif'); + } +} + + +//footer blocks +#footer-mobileapps { + @extend .full-width; + padding:1em; + h4 { + margin:0; + } + ul { + @include list-reset-soft; + li { + border-bottom:1px solid #AFAFAF; + &:last-child { + border-bottom:none; + } + a { + display:block; + padding:0.5em 0; + } + } + } +} + +#footer-help { + ul { + @include list-reset-soft; + li { + border-bottom:1px solid #AFAFAF; + &:last-child { + border-bottom:none; + } + h4 { + margin:0.75em 0 0.25em 0; + } + p { + font-size:0.75em; + } + } + } +} + + + +/*BUTTONS*/ + +// Default style set for buttons, inputs and .btn class. Red and green class available. + +button, input[type=submit],.btn{ + @include button-reset; +} + +.green-btn, +button.green-btn, +input.green-btn{ + @include button-reset(#9FDE23, #7FB900, #5B9700, #fff, #9FDE23, #7FB900, #5B9700, #fff); +} + +.red-btn, +button.red-btn, +input.red-btn{ + @include button-reset(#FF0038, #BF002A, #80001C, #fff, #FF0038, #BF002A, #80001C, #fff); +} + +.final-submit, +input.final-submit { + margin:1em 0.5em; + float:right; +} + +.button-right, +.button-left, +a.button-right, +a.button-left { + @include inline-block; + cursor:pointer; + font-size: 1em; + line-height: 1; + margin:0; + border:1px solid #999; + color:#333; + background: #eee; + @include border-radius(4px); + &:hover{ + color:#fff; + background:#777; + text-decoration: none; + border:1px solid #666; + } +} +.button-right, +a.button-right, +:hover.button-right, +a:hover.button-right { + padding:1em 3em 1em 1em; + background-image: url('/cobrands/fixmystreet/images/sprite.png'); + background-repeat:no-repeat; + background-position:right -686px; +} + +.button-left, +a.button-left, +:hover.button-left, +a:hover.button-left { + padding:1em 1em 1em 3em; + background-image: url('/cobrands/fixmystreet/images/sprite.png'); + background-repeat:no-repeat; + background-position:-18px -802px; +} + +.big-green-banner { + position: relative; + z-index:1000; + top:-1.75em; + background: $contrast1; + color: #fff; + padding:1em; + text: { + transform:uppercase; + align:center; + } + font-size:0.875em; + &:before { + content: ""; + left:-0.5em; + top:0; + position: absolute; + width: 0; + height: 0; + border-left: 0.5em solid transparent; + border-bottom: 0.5em solid #4B8304; + } +} + +.banner { + position: relative; + z-index:1100; + p { + position: absolute; + top:-1.95em; + right:0; + @include inline-block; + font-size:0.6875em;//11px + line-height:1em; + padding:0.5em 1em; + margin:0; + color:#1a1a1a; + background: #ccc; + text: { + transform:uppercase; + align:center; + } + &:before { + content: ""; + left:-0.5em; + top:0; + position: absolute; + width: 0; + height: 0; + border-left: 0.5em solid transparent; + border-bottom: 0.5em solid #888; + } + &#fixed { + color:#fff; + background: $contrast1; + &:before { + border-bottom: 0.5em solid #4B8304; + } + } + } +} + +/*OTHER*/ + +.plain-list { + @include list-reset-soft; + li { + margin-bottom:1em; + } +} + +.issue-list{ + margin: 0 0 1em 0; + padding: 0; + border-bottom: 0.25em solid $primary; + li{ + list-style: none; + background: #f6f6f6; + margin: 0.25em 0 0 0; + padding: 0.5em 1em; + display:block; + .update-wrap { + display:table; + width:100%; + .update-text, + .update-img { + display:table-cell; + vertical-align:top; + p { + margin-bottom: 0.5em; + } + } + .update-img { + text-align:right; + img { + margin:-0.5em -1em 0 0.5em; + height:auto; + } + } + } + } +} +//display:table fixes +.ie7, .ie7 { + .issue-list li .update-wrap { + .update-text { + float:left; + width:19em; + } + .update-img { + float:right; + } + } +} + +.issue-list-a { + margin: 0 0 1em 0; + padding: 0; + border-bottom: 0.25em solid $primary; + li { + list-style: none; + margin:0; + padding:0; + a { + margin: 0.25em 0 0 0; + display:table; + background: #f6f6f6; + color:#222222; + width:100%; + &:hover { + text-decoration:none; + color:#222222; + background:#e6e6e6; + } + .text, + .img { + display:table-cell; + vertical-align:top; + } + .img { + text-align:right; + img { + height:auto; + } + } + .text { + padding:0.25em 1em; + h4 { + margin:0; + } + small { + color:#666; + } + } + } + >p { + margin: 0.25em 0 0 0; + padding: 0.5em 1em; + background: #f6f6f6; + } + } +} +.list-a { + @extend .issue-list-a; + a { + padding:0.5em 1em; + font-weight:bold; + } +} +//display:table fixes +.ie6, .ie7 { + .issue-list-a { + overflow:hidden; + li a { + clear:both; + width:auto; + display:block; + overflow:hidden; + .text { + float:left; + width:18em; + } + .img { + width:6.25em; + float:right; + } + } + } +} +.ie6 .issue-list-a li a { + height:5.5em; + .img img { + height:60px; + } +} + +// fancybox gallery images have a magnifying glass in the corner +.update-img { + a { + @include inline-block; + position:relative; + span { + position:absolute; + top:0; + right:0; + display:block; + width:20px; + height:20px; + opacity: 0.5; + background:#fff url(images/sprite.png) -16px -1098px no-repeat; + //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ + font: 0/0 a; + color: transparent; + } + &:hover span { + opacity: 1; + } + } +} +//bit of a hack - as we can't use em's, push the span out to the right +//by how much it would be if the user did not resize the text +.issue-list li .update-wrap .update-img a span { + right:-16px; + top:-8px; +} + +.problem-header { + margin-bottom:1em; +} +.problem-header .update-img { + float: right; + margin-left: 0.5em; + margin-bottom: 0.5em; +} + +// map stuff +#map_box{ + @extend .full-width; + background: #333; + height: 29em; + margin-bottom: 1em; + overflow: hidden; + position: relative; + #map { + width:100%; + height:100%; + } +} + +// OpenLayers fix for navigation being top right +// Left and right so that zoom can be left, pan right. +#fms_pan_zoom { + right: 0.5em !important; + top: 0.5em !important; + left: 0.5em !important; +} +// The left and right of the above causes the navigation to move off-screen left in IE6. +// XXX Need to check IE7 +.ie6 #fms_pan_zoom { + left: auto !important; +} + +// Openlayers map controls (overrides) +#fms_pan_zoom_panup, +#fms_pan_zoom_pandown, +#fms_pan_zoom_panleft, +#fms_pan_zoom_panright, +#fms_pan_zoom_zoomin, +#fms_pan_zoom_zoomout { + width:36px !important; + height:36px !important; + text-indent:-999999px; + opacity:0.85; + background:url('/cobrands/fixmystreet/images/sprite.png') no-repeat; + &:hover { + opacity:1; + } + filter: none !important; // Override OpenLayers PNG handling of the navigation +} + +#fms_pan_zoom_zoomworld { + display:none !important; + visibility:none !important; +} + +#fms_pan_zoom_panup { + background-position:-42px -222px; + right:30px !important; + left: auto !important; + top:0 !important; +} +#fms_pan_zoom_pandown { + background-position:-42px -282px; + right:30px !important; + left: auto !important; + top:72px !important; +} +#fms_pan_zoom_panleft { + background-position:-12px -252px; + width:48px !important; + right:48px !important; + left: auto !important; + top:36px !important; +} +#fms_pan_zoom_panright { + background-position:-60px -252px; + width:48px !important; + right:0 !important; + left: auto !important; + top:36px !important; +} +#fms_pan_zoom_zoomin { + background-position:-152px -223px; + height:44px !important; + left:0 !important; + top:0 !important; +} +#fms_pan_zoom_zoomout { + background-position:-152px -259px; + height:44px !important; + left:0 !important; + top:44px !important; +} + +//hide pins, show old reports etc +#sub_map_links { + position: absolute; + left: 0; + right:0; + bottom: 0; + z-index: 1100; + background:#333; + background:rgba(0, 0, 0, 0.7); + margin:0; + a { + @include inline-block; + font-size:0.6875em; + color:#fff; + padding:0.6em 3em 0.5em 1em; + background-repeat:no-repeat; + &#hide_pins_link { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -3976px; + } + &#all_pins_link { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -4022px; + } + &#map_permalink { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -4070px; + } + &.feed { + background-image:url('/cobrands/fixmystreet/images/sprite.png'); + background-position: right -3936px; + } + &:hover { + background-color:#000; + text-decoration:none; + } + } +} + +.ie6 #sub_map_links a { + &#hide_pins_link { + background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); + background-position: right 1px; + } + &#all_pins_link { + background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); + background-position: right -45px; + } + &#map_permalink { + background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); + background-position: right -93px; + } +} + +#mob_sub_map_links { + position: absolute; + z-index:1100; + bottom:0; + display:table; + margin:0; + width:100%; + background:rgba(0, 0, 0, 0.7); + a { + color:#fff; + width:50%; + padding:0.5em 0; + font-size:1em; + display:table-cell; + text-align:center; + &:hover { + background:#000; + text-decoration:none; + } + } + &.map_complete { + background:none; + display:block; + border-bottom:4px solid #fff; + a#try_again { + display:block; + margin:0 auto 6em auto; + background:rgba(0, 0, 0, 0.8); + @include border-radius(0.5em); + } + a#mob_ok { + position:absolute; + right:1em; + bottom:0; + height:20px; + padding-top:30px; + display:block; + width:4em; + background:#fff url('/cobrands/fixmystreet/images/sprite.png') 12px -4140px no-repeat; + color:#000; + } + } +} + +.mobile-map-banner { + margin:0; + position: absolute; + top:0; + left:0; + right:0; + font-size:0.75em; + background:rgba(0, 0, 0, 0.7); + padding:0.75em 30px; + a { + @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); + font: { + weight:normal; + size:0.875em; + } + line-height:1; + padding:0.5em 0.75em; + position:absolute; + left:0.3em; + top:0.3em; + } +} + +.olControlAttribution { + bottom: 3.25em !important; + right: 0.25em !important; + left: 0.25em !important; + color: #222222; + font-size:0.75em !important; +} +.olControlAttribution img { + vertical-align: bottom; +} +.olControlPermalink { + bottom: 3px !important; + right: 3px; +} + +/* Drag is only present in noscript form. XXX Copy from core. */ +#drag { + input, img { + position: absolute; + border: none; + max-width: none; + } + input { + cursor: crosshair; + background-color: #cccccc; + } + img { + cursor: move; + } + img.pin { + z-index: 100; + background-color: inherit; + } + a img.pin { + cursor: pointer; + cursor: hand; + } +} + +// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar) +a.rap-notes-trigger, +a:hover.rap-notes-trigger { + display:block; + width:90%; + padding-left:5%; + padding-right:5%; +} +.rap-notes { + margin:1em 0; +} + +//report a problem tabs +#problems-nav { + padding:0 1em; + overflow:hidden; + border-bottom:0.25em solid #333; + ul { + @include list-reset-soft; + display:table; + width:100%; + li { + display:table-cell; + border-right:0.25em solid #fff; + &:last-child { + border-right:none; + } + a { + display:block; + background:#e2e2e2; + color:#333; + padding:1em; + text: { + transform:uppercase; + align:center; + } + &:hover { + text-decoration:none; + background:#e6e6e6; + } + &.active { + background:#333; + color:#fff; + } + } + } + } +} + +//display:table fixes +.ie6, .ie7 { + #problems-nav { + clear:both; + margin:0; + padding:0; + ul li { + float:left; + } + } +} + + +table.nicetable { + width:100%; + margin-bottom:2em; + thead { + border-bottom:0.25em solid #ccc; + th { + font-size:0.75em; + } + } + tr { + &.a { + background:#f6f6f6; + } + &:nth-child(even) { + background:#f6f6f6; + } + &.gone { + color: #666666; + background-color: #cccccc; + } + &:hover { + background:#FFF5CC; + cursor:pointer; + } + td { + padding:0.25em; + a { + &:hover { + text-decoration:none; + } + } + } + } + .title { + text-align:left; + } + .data { + width:12%; + } +} + +.promo { + @extend .full-width; + background:$primary; + padding:1em; + margin-bottom:1em; + overflow:hidden; + position: relative; + .close-promo { + position:absolute; + top:0.5em; + right:0.5em; + display:block; + width:16px; + height:16px; + text-indent:-999999px; + background:url(images/sprite.png) -341px -263px no-repeat; + @include border-radius(4px); + &:hover { + background:#222 url(images/sprite.png) -341px -223px no-repeat; + } + } +} + +.alert { + @extend .full-width; + background:#ff0000; + padding:1em; + margin-bottom:1em; + color:#fff; + a, a:hover { + color:$primary; + } +} + +.pagination { + text-align:center; + padding:0.5em 1em; + background:#eee; + position:relative; + .prev { + position:absolute; + left:0.5em; + } + .next { + position:absolute; + right:0.5em; + } + a { + @include inline-block; + background:$primary; + padding-left:0.5em; + padding-right:0.5em; + color:#1a1a1a; + &:hover { + color:#1a1a1a; + text-decoration:none; + background:$primary/1.1; + } + } +} + +// this is a bit of a hack to get some differentation between desk and mobile +.desk-only { + display:none !important; +} + +// hide anything with this class if js is working +.js .hidden-js { + display: none; + visibility: hidden; +} + +// hide anything with this class if js is NOT working +.no-js .hidden-nojs { + display: none !important; + visibility: hidden; +} + + +/* Front page */ +#front-main { + text-align:center; + h2 { + font: { + style:italic; + family: Helmet, Freesans, sans-serif; + size:1.1875em; + } + color:#4d4d4d; + } + #postcodeForm { + @extend .full-width; + padding:1em; + color: $primary_text; + background: $primary; + font-family: Helmet, Freesans, sans-serif; + label { + margin:0; + } + div { + display:table; + width:100%; + background:#fff; + border:1px solid $primary_b; + input#pc { + display:table-cell; + margin:0; + padding:0.25em 2%; + width:82%; + border:none; + background:none; + line-height:1.5em; + } + input#submit { + display:table-cell; + border:none; + padding:0; + margin:0; + width:14%; + height:35px; + background:#000; + color:#fff; + text-transform:uppercase; + @include border-radius(0); + &:hover { + background:#333; + } + } + } + } + a#geolocate_link { + @include inline-block; + vertical-align:top; + background:#1a1a1a; + color:#C8C8C8; + padding:0.5em; + font: { + family: Helmet, Freesans, sans-serif; + size:0.8125em; + } + @include border-radius(0 0 0.25em 0.25em); + &:hover { + text-decoration:none; + background:#2a2a2a; + } + } +} + +#front-howto { + #front_stats { + display:table; + width:100%; + color: $primary_text; + background: $primary; + font-family: Helmet, Freesans, sans-serif; + div { + display:table-cell; + text-align:center; + padding:1em; + line-height:1.25em; + font: { + size:0.8125em; + weight:bold; + } + big { + display:block; + margin-bottom:0.5em; + font-size:1.5385em; + } + } + } +} + +#front-recently { + .issue-list-a { + border-bottom:none; + margin-bottom:0; + } +} + +#alerts { + ul { + margin-bottom: 1em; + } + li { + padding: 0em; + margin-bottom: 0.5em; + } + .a { + background: #f6f6f6; + } + img[width="16"] { + float: right; + } +} + diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet/_colours.scss index 8179f470d..2463cdeeb 100644 --- a/web/cobrands/fixmystreet/_colours.scss +++ b/web/cobrands/fixmystreet/_colours.scss @@ -1,11 +1,8 @@ /* COLOURS */ -$colour_dark: #4e1602; -$colour: #c23704; -$colour_alt: #ffeeaa; - - $primary: #FFD000; +$primary_b: #F3B11E; +$primary_text: #222; $contrast1: #00BD08; -$contrast2: #AA8D11;
\ No newline at end of file +$contrast2: #AA8D11; diff --git a/web/cobrands/fixmystreet/_h5bp.scss b/web/cobrands/fixmystreet/_h5bp.scss index 30ebcbfe1..f4078cca6 100644 --- a/web/cobrands/fixmystreet/_h5bp.scss +++ b/web/cobrands/fixmystreet/_h5bp.scss @@ -256,12 +256,11 @@ td { vertical-align: top; } Inlined to avoid required HTTP connection: h5bp.com/r ========================================================================== */ +/* mySociety removal: bits of * and :after */ @media print { - * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */ + * { box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */ a, a:visited { text-decoration: underline; } - a[href]:after { content: " (" attr(href) ")"; } abbr[title]:after { content: " (" attr(title) ")"; } - .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } /* Don't show links for images, or javascript/internal links */ pre, blockquote { border: 1px solid #999; page-break-inside: avoid; } thead { display: table-header-group; } /* h5bp.com/t */ tr, img { page-break-inside: avoid; } diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss new file mode 100644 index 000000000..6a32ea010 --- /dev/null +++ b/web/cobrands/fixmystreet/_layout.scss @@ -0,0 +1,1060 @@ +@import "compass"; +@import "_mixins"; + +//hacks for desk/mob only stuff +.desk-only { + display:block !important; +} +.mob-only { + display:none !important; +} + +body { + background: #1A1A1A url(/cobrands/fixmystreet/images/tile.jpg) 0 0 repeat; +} + +h1 { + margin-top: 0; +} + +// Page wrapper and header bits follow + +.container{ + margin: 0 auto; + padding: 0em; + width: 60em; + position: relative; + z-index:1; +} + +//z-index stack order gets reset to 0 in ie6/7 if you position anything, +//so to fix things we give it a high value (don't ask me why) +//see: http://brenelz.com/blog/squish-the-internet-explorer-z-index-bug/ +//this affects #site-logo +.ie6, .ie7 { + .container { + z-index:100; + } +} + +.wrapper{ + display: table; + caption-side: top; + width: 100%; + .table-cell { + display:table-cell; + } +} + +//pad the top of the wrapper to allow space for the menu to fit in +//when its positioned absolute below +.ie6, .ie7 { + .wrapper { + padding-top:4em; + } +} + +.nav-wrapper{ + display: table-caption; + .nav-wrapper-2{ + width: 100%; + min-height: 4em; + position: absolute; + border-top:4px solid #1a1a1a; + @include border-image(url(/cobrands/fixmystreet/images/tile-y-border.jpg) 4 0 0 0); + border-left:0; + border-right:0; + z-index:2; + } +} + +//position absolute the menu as ie doesn't like display:table +.ie6, .ie7 { + .nav-wrapper { + position: absolute; + top:0; + left:0; + width:100%; + .nav-wrapper-2 { + // position static as well so we fix lots of the z-index issues + position:static; + } + } +} + +// Resets a lot of the mobile styling. #site-header only used to help position logo on desktop +#site-header { + height: auto; + background: none; + border-top: 0px; + .container { + position: static;//reset position so the nav links become clickable + } +} +#site-logo { + top: 0.9em; + position: absolute; + z-index: 3; +} +.ie6, .ie7 { + #site-header { + height:3em; + .container { + //ie broken z-index bug: the site-logo won't appear if we don't do this + //doesn't seem to render the nav link unclickable like in other browsers + position: relative; + } + } + #site-logo { + position: absolute; + top:-3.25em; + } +} +#nav-link { + left:-999999px; +} +#main-nav{ + margin: 0 auto; + padding: 0em; + width: 60em; + ul{ + list-style: none; + padding: 0px; + margin: 0px; + float:right; + li{ + list-style: none; + display: inline; + margin: 0px; + padding: 0px; + float:left; + a, + span { + display: block; + color:#fff; + background: none; + border-bottom: none; + } + } + &#main-menu{ + li{ + a, span{ + padding: 0.75em; + font-size: 0.9em; + } + a:hover{ + background:#444; + @include background(linear-gradient(#000, #444 10%, #444 95%, #111)); + } + a.report-a-problem-btn { + background:$primary; + padding:0.25em; + margin:0.5em; + color:#333; + @include border-radius(0.25em); + &:hover { + background:$primary/1.1; + } + } + span { + color:$primary; + } + } + } + &#mysoc-menu{ + padding: 0em 0.5em; + margin-left: 0.25em; + background:$primary url(/cobrands/fixmystreet/images/tile-y.jpg); + @include border-radius(0 0 0.375em 0.375em); + li{ + a{ + background:none; + color:#000; + text-transform: uppercase; + font-size: 0.6875em; + padding: 1.3em 0.7em 1em 0.7em; + &#mysoc-logo { + width:84px; + height:16px; + background-position: -20px -5px; + opacity: 0.8; + &:hover { + opacity: 1; + } + } + &:hover{ + color:#fff; + } + } + } + } + } +} +.ie7 #main-nav ul#mysoc-menu li a#mysoc-logo { + background-position: -260px -43px; +} + +// .content Is the white box + +// The narrow single column box +.content{ + width: 27em; + margin-top: 3em; + background: #fff; + padding: 1em; + padding-bottom: 3em; + margin-left: 0.5em; + margin-bottom: -1em; + @include box-shadow(0px 0px 6px 1px #000); +} +.ie6, .ie7, .ie8 { + .content { + // If no box-shadow, just want a boring black border to stand it out from the map. + border: 1px solid black; + //take off margins so we line up properly + margin: 0; + } +} +//weird margining thing for ie8 +.ie8 .content { + margin-top:3em; +} + +// map page - has fixed header and different styling +body.mappage { + .container { + width: auto; + } + .content { + float:left; + } + #main-nav ul#main-menu li a, + #main-nav ul#main-menu li span { + padding: 1.4em 0.75em 1.35em 0.75em; + } + #main-nav ul#main-menu li a.report-a-problem-btn { + padding: 0.5em; + margin:0.9em 0.25em 0.85em 0.25em; + } + .nav-wrapper{ + .nav-wrapper-2{ + position: fixed; + background: #222; + @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); + } + } + #site-logo{ + position: fixed; + } +} +.ie6, .ie7 { + body.mappage { + // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. + .container { + float: left; + width: 27em; + margin-left: 1.4em; + } + .nav-wrapper{ + z-index:1; + .nav-wrapper-2 { + position:static; + } + } + #site-logo { + position: absolute; + } + } +} +.ie6 { + body.mappage { + .container { + margin-left: 0.7em; + } + } +} +//ie8 needs different stuff on .nav-wrapper so we +//have to define all the rest of it again as this resets +//the z-index base yet again :S +.ie8 { + body.mappage { + .nav-wrapper{ + position: relative; + z-index:0; + .nav-wrapper-2 { + position:static; + } + } + #site-logo { + position: absolute; + } + } +} + + + +// full width page +body.fullwidthpage { + .content { + width: 57em; + } + .intro { + width:40em; + } +} +// two thirds width page, also has option for a sidebar which can be sticky or not +body.twothirdswidthpage { + @extend .fullwidthpage; + .content { + width:40em; + position: relative; + aside { + background:#eee; + position:absolute; + left:42em; + top:0; + z-index: -1; + width:13em; + padding:1em; + @include box-shadow(0px 0px 6px 1px #000); + h2 { + margin-top: 0; + } + img { + margin-bottom: 0.25em; + } + } + .sticky-sidebar { + position: absolute; + left:42em; + z-index: -1; + aside { + position: fixed; + top:7em; + left:auto; + } + } + } +} +//as ie6 doesn't like 'fixed' we will make it absolute again +.ie6 body.twothirdswidthpage .content .sticky-sidebar { + position:static; + aside { + position:absolute; + left:42em; + top:0; + } +} + + +// table wrapper - this enables anything to become a +// table with div children as table cells +.tablewrapper { + display:table; + width:100%; + padding:0 0 1em 0; + >div { + display:table-cell; + width:50%; + } + .full-width { + width:auto; + margin:0; + } +} + +//fix table to be a block for ie, float the children +.ie6, .ie7 { + .tablewrapper { + display:block; + div {//ie6 doesn't support '>div', so we'll go with the somewhat risker 'div' + width:48%; + display:block; + float: left; + border:none !important; + } + } +} + +// adds border to the top and goes full width +.bordered { + margin:0 -1em; + padding:0 1em; + width:auto; + border-top:0.25em solid $primary; +} + +//footer blocks +#footer-mobileapps { + border-right:1em solid #fff; + background:none; + padding:0; + @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); + h2 { + color:#222; + margin-top:0; + } + ul { + @include list-reset; + li { + border-bottom:none; + float:left; + margin:0 1em 1em 0; + a { + color:#222; + padding:0; + width: 96px; + height: 32px; + margin:0 auto; + text-indent: -999999px; + background: url(/cobrands/fixmystreet/images/sprite.png) -12px -3610px no-repeat; + opacity: 0.8; + &:hover { + opacity: 1; + } + &.m-app-iphone { + background-position: -12px -3610px; + } + &.m-app-droid { + background-position: -12px -3756px; + } + &.m-app-nokia { + background-position: -12px -3820px; + width:74px; + } + } + } + } +} +.ie6, .ie7 { + #footer-mobileapps { + margin:0 0.5em; + margin-right:2%; + } +} +.ie6 #footer-mobileapps ul li a { + background:url(/cobrands/fixmystreet/images/ie_mobileapps.gif) -1px -1px no-repeat; + &.m-app-droid { + background-position: -1px -148px; + } + &.m-app-nokia { + background-position: -1px -212px; + width:74px; + } +} + +#footer-help { + border-left:1em solid #fff; + ul { + display:table; + li { + display:table-cell; + border-bottom:none; + &:last-child { + border-left:1.25em solid #fff; + } + } + } +} +.ie6, .ie7 { + #footer-help { + margin-left:2%; + ul { + width:100%; + li { + float:left; + width:45% + } + } + } +} + + +// map box (fallback for non js really as most users +// will have fullscreen map) +#map_box{ + position: absolute; + height: 29em; + width: 29em; + right: 1em; + top: 3em; + z-index:1; +} + +// Pull OpenLayers navigation down a bit +#fms_pan_zoom { + top: 4.75em !important; +} + +// push zoom back over to right +#fms_pan_zoom_zoomin { + left:auto !important; + right:30px; + top:130px !important; +} +#fms_pan_zoom_zoomout { + left:auto !important; + right:30px; + top:174px !important; +} + +.olControlAttribution { + bottom:0.5em !important; + left: auto !important; +} + +#sub_map_links { + left:auto; + bottom:auto; + bottom:2em; + #map_links_toggle { + display:block; + cursor: pointer; + position:absolute; + left:-1em; + width:1em; + height:100%; + background:#000 url(/cobrands/fixmystreet/images/sprite.png) right -4119px no-repeat; + @include border-radius(0.25em 0 0 0.25em); + &:hover { + left:-1.5em; + //use border so we don't have to redefine the background-position + border-right:0.5em solid #000; + } + &.closed { + background-position: right -4159px; + } + } +} +.ie6 #sub_map_links #map_links_toggle { + height:1.75em; + background:#000 url('images/ie_sub_map_links_sprite.gif') center -143px no-repeat; + &.closed { + background-position: center -183px; + } +} + +// log in bit, pokes above the .content div +#user-meta{ + display:block; + position: relative; + max-width: 57em; + margin:0 auto; + p { + @include inline-block; + position:absolute; + top:1em; + height:2em; + padding:0.25em 6em 0.5em 0.5em; + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); + a { + top:0.5em; + right:0.5em; + font-size:0.6875em; + padding:0.5em 0.75em; + line-height:1em; + &:hover { + text-decoration:none; + background:#444; + } + } + } +} +.ie6, .ie7 { + #user-meta { + z-index:1; + p { + top:-2em; + } + } +} +.ie6 #user-meta { + width:57em; //ie6 doesn't like max-width +} + + + +// Wraps around #key-tools box - sticks to the bottom of the screen on desktop +.shadow-wrap { + position:fixed; + z-index:10; //this is just to ensure anythign inside .content that has position set goes sites it + bottom: 0; + width: 29em; + overflow: hidden; + padding-top: 3em; + ul#key-tools { + border-top: 0.25em solid $primary; + margin: 0; + @include box-shadow(-0em 0px 1em 1em #fff); + li { + border:none; + a { + font-size: 0.75em; + color:#666; + padding: 0.5em 1.5em 0.5em 0; + text-transform:none; + &.abuse { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -2935px; + } + &.feed { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -3074px; + } + &.chevron { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -3225px; + } + &.hover { + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:right -1876px; + } + } + } + &.singleton { + li { + text-align:right; + a { + padding-right:3em; + } + } + } + } + &.static { + padding:0 0 1em 0; + position: static; + } +} +// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. +.ie6 .shadow-wrap { + padding-top: 0; +} + +// pokes over the RHS with a little triangle +.big-green-banner { + top:auto; + right:-1.25em; + margin-left:-2em; + font-size:1.375em; + padding:1em 3em 1em 1em; + background: $contrast1 url(/cobrands/fixmystreet/images/sprite.png) right -2188px no-repeat; + &:before { + right:0; + left:auto; + top:-0.5em; + position: absolute; + border-top: 0.5em solid transparent; + border-left: 0.5em solid #4B8304; + border-bottom:none; + } +} +.ie6 .big-green-banner { + background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; +} + +.banner { + // state banners + p { + top:-2.25em; + padding:1em; + &:before { + left:-0.75em; + border-left: 0.75em solid transparent; + border-bottom: 0.75em solid #888; + } + &#fixed { + padding-top:5em; + background-image:url(/cobrands/fixmystreet/images/sprite.png); + background-position:-324px -326px; + background-repeat:no-repeat; + &:before { + border-bottom: 0.75em solid #4B8304; + } + } + } +} +.ie6 .banner p { + top:-1.5em; + &#fixed { + background-image:url(/cobrands/fixmystreet/images/ie_fixed.gif); + background-position:center 0.75em; + } +} + + +// for pulling elements fullwidth regardless +// of .contents' padding +.full-width{ + margin: 0 0 0em -1em; + width: 29em; +} + +/*FORMS*/ +input[type=text], +input[type=password], +input[type=email], +textarea{ + width: 25em; +} +.form-box { + max-width:25em; +} + + +/* form errors */ +div.form-error, +p.form-error { + display:block; + width:24.7em; +} + +input.form-error, +textarea.form-error { + @include border-radius(0 0 0.25em 0.25em); +} + + +// Report a problem sidebar notes +#report-a-problem-sidebar { + position:absolute; + z-index:-1;//push behind .content, .container resets z-index for this + left:29.5em; + top:5em; + width:15em; + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); + .sidebar-tips { + background:#eeeeee; + padding:1em; + font-size:0.75em; + } + .sidebar-notes { + background:#333333; + padding:1em; + color:#ffffff; + font-size:0.75em; + } +} +.ie6, .ie7 { + #report-a-problem-sidebar { + left: 29em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly. + } +} + +.no-js .general-sidebar-notes, +.no-js #report-a-problem-sidebar { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } +} + +// More general sidebar notes +.general-sidebar-notes { + position: absolute; + left:29.5em; + width:15em; + z-index: -1; //push behind .content, .container resets z-index for this + @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); + p { + background:#eeeeee; + font-size:0.75em; + padding:0.75em; + margin:0; + &.dark { + background:#333333; + color:#ffffff; + } + } +} + +// Frontpage + +body.frontpage { + .table-cell { + // we do this so we can have full screen width elements + >.container { + width:100%; + } + .content { + margin:14em auto 0 auto; + } + } + .nav-wrapper-2{ + height:6em; + } + #site-header{ + height:9em; + } + #site-logo{ + top:3em; + width: 300px; + height: 60px; + background: url('/cobrands/fixmystreet/images/sprite.png') -2px -108px no-repeat; + } + #user-meta { + z-index:10; + p { + top:-4em; + right:0; + color:#FFD000; + background:none; + @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); + a { + background:#fff; + color:#1a1a1a; + &:hover { + background:#ddd; + } + } + } + } +} +//logo fix +.ie6, .ie7, .ie8 { + body.frontpage { + #site-logo { + position:relative; + width:60em; + margin:0 auto; + } + } +} +.ie6, .ie7 { + body.frontpage { + #site-header { + height:3em; + } + #site-logo { + top:-1em; + } + #user-meta p { + top:-2em; + } + } +} +.ie6 body.frontpage #site-logo { + background:url(/cobrands/fixmystreet/images/ie_front_logo.gif) 0 0 no-repeat; +} +//weird margining thing for ie8 +.ie8 body.frontpage { + #front-main { + top:-12em; + } + .table-cell .content { + margin-top:12em; + } +} + +// big yellow bit full screen width +#front-main { + color: $primary_text; + background: $primary url(/cobrands/fixmystreet/images/tile-y.jpg); + position:absolute; + width:100%; + left:0; + top:-15em; + #front-main-container { + max-width: 57em; + margin:0 auto; + } + h2 { + font-style:normal; + margin:0; + color:#222; + } + #postcodeForm { + background:none; + overflow:hidden; + margin-right:0.5em; + label { + margin:0.5em 0; + } + div { + display:block; + margin:0 auto; + width:20em; + overflow:hidden; + input#pc { + display:block; + float:left; + padding:0.25em 0.5em; + height:1.5em; + width:16em; + } + input#submit { + display:block; + float:right; + width:3em; + height:2.3em; + padding-top:0.2em; + } + } + } + a#geolocate_link { + background:none; + color:#222; + margin:-1em 0 0.5em 0; + &:hover { + text-decoration:underline; + background:none; + } + } +} +.ie6, .ie7 { + #front-main { + top:2em; + } +} + + +#front-howto { + border-right:1em solid #fff; + #front_stats { + background:none; + border-top:0.25em solid $primary; + padding-top:1em; + div { + big { + color:$primary; + font-size:3.2308em; + } + } + } +} +.ie6, .ie7 { + #front_stats { + div { + width:8em; + float:left; + } + } +} + +#front-recently { + border-left:1em solid #fff; +} + +#front-howto h2, +#front-recently h2 { + margin-top:0; +} + + +.ie6, .ie7 { + .tablewrapper { + #front-howto { + margin-right:2%; + } + #front-recently { + margin-left:2%; + } + } +} + + + + +/* MEDIA QUERIES */ +@media only screen and (min-width: 48em) and (max-width: 61em) { + .container { + width: 100%; + } + /*FORMS*/ + input[type=text], + input[type=password], + input[type=email], + textarea{ + width: 95%; + } + + // Remove central positioning of mainmenu and float right. + // Left padding is to ensure no overlap of the site-logo + // Background styling replicates header styling + + #main-nav{ + width: auto; + float:right; + padding-left: 180px; + } + .nav-wrapper { + // width:auto; + .nav-wrapper-2 { + // width:auto; + } + } + + //Main menu drops below logo and my-soc menu + #main-menu{ + margin-top: 3em; + } + //therefore header needs to open up + #site-header { + height:6em; + } + // Pull OpenLayers navigation down a bit more + #fms_pan_zoom { + top: 7em !important; + } + + //fix the left margin on login bit + #user-meta { + p { + left:1em; + } + } + body.frontpage { + #user-meta { + p { + left:auto; + } + } + } + + //Map becomes percentage width + #map_box{ + left: 32em; + width:auto; + } + + //put the RAP notes into the main copy area + // Note: Also used for the non-JS case. + #report-a-problem-sidebar, + .general-sidebar-notes { + position: static; + width: auto; + @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); + .sidebar-tips, + .sidebar-notes { + font-size:1em; + } + } + + //Revert to mobile use of the .full-width class + .full-width{ + width: auto; + margin: 0em -1em 0 -1em; + } + + //make fullpage auto width + body.fullwidthpage .content { + width: auto; + } + + //make twothirdswidthpage nearly as small as main + //.content: just enough to still fit the sidebar in + body.twothirdswidthpage { + .content { + width:30em; + .sticky-sidebar { + left:32em; + top:30em; + aside { + top:9em; + } + } + } + } +} diff --git a/web/cobrands/fixmystreet/_mixins.scss b/web/cobrands/fixmystreet/_mixins.scss index f77152dd6..4c7bc5af8 100644 --- a/web/cobrands/fixmystreet/_mixins.scss +++ b/web/cobrands/fixmystreet/_mixins.scss @@ -3,7 +3,7 @@ cursor:pointer; font:{ size: 0.875em; - family: 'Helvetica', 'Arial', sans-serif; + family: Helmet, Freesans, sans-serif; weight:bold; } text-transform:uppercase; diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index bda29f2cb..21cc16cb4 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -8,1534 +8,5 @@ @import "_colours"; @import "_mixins"; @import "compass"; - - -/* HEADINGS and TYPOGRAPHY */ - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300-webfont.eot'); - src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300-webfont.woff') format('woff'), - url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_300_Italic-webfont.eot'); - src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); - font-weight: normal; - font-style: italic; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500-webfont.eot'); - src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500-webfont.woff') format('woff'), - url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); - font-weight: bold; - font-style: normal; -} - -@font-face { - font-family: 'MuseoSans'; - src: url('fonts/MuseoSans_500_Italic-webfont.eot'); - src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), - url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), - url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); - font-weight: bold; - font-style: italic; -} - -@font-face { - font-family: 'Museo300-display'; - src: url('fonts/Museo300-Regular-webfont.eot'); - src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('fonts/Museo300-Regular-webfont.woff') format('woff'), - url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), - url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); - font-weight: normal; - font-style: normal; -} - - -/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the - * table caption *at all* if the header is set to a font-face :( */ -noindex:-o-prefocus, #site-header { - font-family: sans-serif; -} - - -body { - font-family: 'MuseoSans', 'Helvetica', 'Arial', sans-serif; - margin:0; - font-size:1em; - line-height:1.5; - color:#222; -} - - -p { - font-size: 1em; - font-weight: normal; - margin:0 0 1em 0; -} - -small{ - font-family: 'helvetica', 'arial',sans-serif; - font-style: italic; - font-size: 0.8125em; - line-height: 1.2307em; -} - -h1 { - font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; - font-size: 2em; - line-height: 1em; - font-weight: normal; - margin-top: 0.5em; - margin-bottom: 0.5em; -} -#front-main h1 { - margin-top: 0.7em; -} -h1#reports_heading span { - display: none; -} -h1#reports_heading a { - display: block; - font-size: 50%; -} - -h2 { - font-family:'Museo300-display', 'Helvetica', 'Arial', sans-serif; - font-size: 1.5em; /*24px*/ - line-height: 1.3333em; /*32px*/ - font-weight: normal; - margin-top: 1.333333333em; /*32px*/ - margin-bottom: 0.666666666em; /*16px*/ -} - -h3 { - font-size: 1.25em; - line-height: 1.20em; - margin-top: 1.2em; - margin-bottom: 0.8em; - font-weight: bold -} - -h4 { - font-size: 1em; - font-weight: bold; - margin-bottom: 1em; -} - -// default list styles -ul, ol { - font-size: 1em; - margin-bottom: 2em; - margin-left: 2em; - padding:0; -} - -li{ - margin-bottom: 0.5em; -} - -ul li{ - list-style: square; -} - -ol li { - list-style:decimal; -} - -// lets you have a traditional ol but with nicely styled numbers -// for older browsers it just falls back to the normal ol -ol.big-numbers { - padding: 0; - margin: 0; - counter-reset: li; // reset counter to be 'li' instead of a number - > li { - position: relative; - list-style: none; - padding:0 0 0 2.5em; - margin-bottom:2em; - &:before { - content: counter(li); // set the content to be whatever the 'li' var is - counter-increment: li; // add to the counter var - position: absolute; - left: 0; - top:-0.2em; - color:#eeeeee; - line-height:1; - font: { - family: 'helvetica', 'arial', sans-serif; - weight:bold; - size:2.5em; - } - } - } -} - -dl { - margin: 0; - padding: 0; - dt { - font-size: 1em; - line-height: 1.5em; - font-weight: bold; - } - dd { - font-weight: 1em; - line-height: 1.5em; - margin:0 0 1em 0; - } -} - -blockquote { - p:before { - content: '“'; - } - p:after { - content: '”'; - } -} - -pre { - font-family: monospace; -} - -img { - //do this otherwise IE will just not display - //any img without a height defined - height:auto; -} - -select, input, textarea { - font-size: 99%; - max-width: 95%; -} - - -// links -a, -a:visited { - text-decoration:none; - color:#0BA7D1; - &:hover, - &:active { - text-decoration:underline; - color:#0D7CCE; - } -} - -// custom type -.small-print { - @extend small; - margin-bottom: 1.2307em; - color:#888888; -} -.meta{ - color:#555555; - font-style: italic; - margin-bottom: 0px; -} -.meta-2{ - font-family: 'helvetica', 'arial',sans-serif; - color:#888888; - font-style: italic; - font-size: 0.75em; -} - -h4.static{ - font-family: 'helvetica', 'arial',sans-serif; - text-transform: uppercase; - font-size: 0.875em; - line-height: 1.71428em; - color:#888; - margin-top: 2em; -} -h4.static-with-rule{ - @extend.static; - background: #f6f6f6; - border-top: 0.25em solid $primary; - margin-bottom:0.25em; - padding: 0.5em 1em; -} - -/* FORMS */ - -// input placeholders, these need to be on separate lines as if the browser -// can't understand a selector it will invalidate the whole line. -::-webkit-input-placeholder { - color: #888888; - font: { - style:italic; - size:0.9375em; - } -} -:-moz-placeholder { - color:#888888; - font: { - style:italic; - size:0.9375em; - } -} -:-ms-placeholder { - color:#888888; - font: { - style:italic; - size:0.9375em; - } -} -//this only gets used when the browser doesn't support @placeholder -.placeholder { - color:#888888; - font: { - style:italic; - size:0.9375em; - } -} - -// wrap anything inside the form in a fieldset to give -// us the right spacing -fieldset { - margin: 1em; -} - -input[type=text], -input[type=password], -input[type=email], -input[type=file], -textarea { - width: 100%; - // adjust so the sides line up - padding: 0.5em; - margin: 0 0 0 -0.5em; -} - -textarea { - border: 0.125em solid #888888; - @include border-radius(0.25em); - display: block; - font-size: 1em; - line-height: 1.5em; - font-family: 'helvetica', 'arial', sans-serif; - min-height:8em; -} - -input[type=text], -input[type=password], -input[type=email], -input[type=file] { - border: 0.125em solid #888888; - @include border-radius(0.25em); - display: block; - font-size: 1em; - line-height: 1em; -} -input[type=file] { - margin-bottom:1em; -} - -label{ - display: block; - margin-top: 1.25em; - margin-bottom: 0.25em; - font-weight: bold; - &.inline{ - display: inline; - padding: 0 2em 0 1em; - font-weight: normal; - } -} - -// grey background, full width box -.form-box { - margin: 0 -2em 0.25em -2em; - background:#eeeeee; - padding:1em 2em 1em 2em; - max-width:26em; - >input[type=text] { - margin-bottom:1em; - } - .title { - font-size:1.25em; - margin:0.5em 0; - } - h5 { - margin:0; - font: { - size:1.125em; - weight:normal; - } - strong { - font-size:2em; - margin-right:0.25em; - } - } -} -// IE6 doesn't extend the grey box back with the above negative margins, and -// the password box falls off screen for some reason. Just have boring margins, -// it looks okay. -.ie6 .form-box { - margin: 0 0 0.25em 0; -} - -.form-txt-submit-box { - min-height:3em; - input[type=password], - input[type=text], - input[type=email] { - width: 65%; - float:left; - } - input[type=submit] { - float:right; - width:28%; - margin-right:0.25em; - padding-top:0.7em; - padding-bottom:0.6em; - } -} - -.checkbox-group { - margin:1em 0; -} - - -// form errors -div.form-error, -p.form-error { - @include inline-block; - background:#ff0000; - color:#fff; - padding:0 0.5em; - margin:0 0 0 -0.5em; - @include border-radius(0.25em 0.25em 0 0); -} - -input.form-error, -textarea.form-error { - border-color:#ff0000; - @include border-radius(0 0.25em 0.25em 0.25em); -} - -ul.error { - background:#ff0000; - color:#fff; - padding:0 0.5em; - margin:0 0 0 -0.5em; - @include border-radius(0.25em); -} - -// don't display valid error boxes as now the page jump -// won't be until the user submits, which is fine -div.label-valid, -p.label-valid { - display:none !important; - visibility: hidden; -} - - - -/*** LAYOUT ***/ - -// Padding creates page margins on mobile -.container{ - padding: 0 1em; -} - -// Use full width to reverse .container margins -.full-width { - margin: 0 -1em; -} - -// #site-header creates grey bar in mobile -// .nav-wrapper-2 is used on desktop -#site-header{ - border-top: 0.25em solid $primary; - height: 3em; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); - .container { - min-height:4em; - } -} -#site-logo{ - display: block; - width: 175px; - height: 40px; - top: 0.4em; - background: url('images/sprite.png') -3px -3px no-repeat; - text-indent: -999999px; - position: absolute; - z-index:2; -} -.ie6 #site-logo { - background: url('images/ie_logo.gif') 0 -5px no-repeat; -} -// this is a skip to nav for mobile users only -#nav-link { - width: 50px; - height: 48px; - background: url('images/sprite.png') -5px -916px no-repeat; - display: block; - text-indent: -999999px; - position: absolute; - right:2em; - top:-2px; - &:hover { - top:2px; - } -} - - -#main-nav{ - ul{ - @include list-reset-soft; - li{ - a, span { - display: block; - padding: 0.5em 1em; - background:#f6f6f6; - color:#333; - font-size: 1.25em; - border-bottom: 0.25em solid #333; - } - a:hover, span.hover { - background: #333; - color:#fff; - text-decoration: none; - } - } - &#mysoc-menu{ - li { - a { - background:$primary; - &#mysoc-logo { - background-image:url('images/sprite.png'); - background-repeat:no-repeat; - background-position:-240px -38px; - text-indent:-999999px; - } - } - } - } - } -} -.ie6 #main-nav ul#mysoc-menu li a#mysoc-logo { - background: url('images/ie_mysoc_logo.gif') center no-repeat; -} -//defines where the table caption is (login stuff on mob, nav menu on desktop) -.wrapper { - width:100%; - display:table; - caption-side:bottom; -} -// this is the user's logged in details or the login link etc -#user-meta { - p { - position: relative; - background:$primary; - padding:1em 6em 1em 1em; - a { - position: absolute; - right:1em; - @include inline-block; - text-transform:uppercase; - font-size:0.75em; - background:#333; - padding:0.25em 0.75em; - color:#fff; - @include border-radius(0.25em); - } - } -} - - -// #key-tools is the list that's pulled out an stick to the bottom of the page of desktop, below is mostly just aesthetic -.shadow-wrap { - @extend .full-width; - ul#key-tools{ - @include list-reset-soft; - margin-bottom: 1em; - display: table; - width:100%; - li{ - display: table-cell; - vertical-align: bottom; - text-align: center; - border-right:0.25em solid #fff; - &:last-child { - border-right:none; - } - a { - display: block; - background-color: #f5f5f5; - background-repeat: no-repeat; - color:#333; - padding:4em 2em 1em 2em; - text-transform:uppercase; - font: { - size:0.6875em; - family: 'helvetica', 'arial', sans-serif; - } - &:hover, &.hover, &.active { - text-decoration:none; - background-color:#333; - color:#fff; - } - &.abuse { - background-image:url('images/sprite.png'); - background-position:center -2424px; - } - &.feed { - background-image:url('images/sprite.png'); - background-position:center -2563px; - } - &.chevron { - background-image:url('images/sprite.png'); - background-position:center -2716px; - } - &.hover, &.active { - background-image:url('images/sprite.png'); - background-position:center -2064px; - } - } - } - } -} - -//because display:table doesn't work we float -.ie6, .ie7 { - .shadow-wrap { - ul#key-tools{ - background:#f5f5f5; - li{ - float:left; - a { - padding-left:1.5em; - padding-right:3em; - } - } - } - } -} -.ie6 .shadow-wrap ul#key-tools li a { - &.abuse { - background-image:url('images/ie_key_tools_sprite.gif'); - background-position: right 0px; - } - &.feed { - background-image:url('images/ie_key_tools_sprite.gif'); - background-position: right -58px; - } - &.chevron { - background-image:url('images/ie_key_tools_sprite.gif'); - background-position: right -116px; - } - &:hover { - background-image:url('images/ie_key_tools_sprite_dark.gif'); - } -} - - -//footer blocks -#footer-mobileapps { - @extend .full-width; - padding:1em; - h4 { - margin:0; - } - ul { - @include list-reset-soft; - li { - border-bottom:1px solid #AFAFAF; - &:last-child { - border-bottom:none; - } - a { - display:block; - padding:0.5em 0; - } - } - } -} - -#footer-help { - ul { - @include list-reset-soft; - li { - border-bottom:1px solid #AFAFAF; - &:last-child { - border-bottom:none; - } - h4 { - margin:0.75em 0 0.25em 0; - } - p { - font-size:0.75em; - } - } - } -} - - - -/*BUTTONS*/ - -// Default style set for buttons, inputs and .btn class. Red and green class available. - -button, input[type=submit],.btn{ - @include button-reset; -} - -.green-btn, -button.green-btn, -input.green-btn{ - @include button-reset(#9FDE23, #7FB900, #5B9700, #fff, #9FDE23, #7FB900, #5B9700, #fff); -} - -.red-btn, -button.red-btn, -input.red-btn{ - @include button-reset(#FF0038, #BF002A, #80001C, #fff, #FF0038, #BF002A, #80001C, #fff); -} - -.final-submit, -input.final-submit { - margin:1em 0.5em; - float:right; -} - -.button-right, -.button-left, -a.button-right, -a.button-left { - @include inline-block; - cursor:pointer; - font-size: 1em; - line-height: 1; - margin:0; - border:1px solid #999; - color:#333; - background: #eee; - @include border-radius(4px); - &:hover{ - color:#fff; - background:#777; - text-decoration: none; - border:1px solid #666; - } -} -.button-right, -a.button-right, -:hover.button-right, -a:hover.button-right { - padding:1em 3em 1em 1em; - background-image: url('images/sprite.png'); - background-repeat:no-repeat; - background-position:right -686px; -} - -.button-left, -a.button-left, -:hover.button-left, -a:hover.button-left { - padding:1em 1em 1em 3em; - background-image: url('images/sprite.png'); - background-repeat:no-repeat; - background-position:-18px -802px; -} - -.big-green-banner { - position: relative; - z-index:1000; - top:-1.75em; - background: $contrast1; - color: #fff; - padding:1em; - text: { - transform:uppercase; - align:center; - } - font-size:0.875em; - &:before { - content: ""; - left:-0.5em; - top:0; - position: absolute; - width: 0; - height: 0; - border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #4B8304; - } -} - -.banner { - position: relative; - z-index:1100; - p { - position: absolute; - top:-1.95em; - right:0; - @include inline-block; - font-size:0.6875em;//11px - line-height:1em; - padding:0.5em 1em; - margin:0; - color:#1a1a1a; - background: #ccc; - text: { - transform:uppercase; - align:center; - } - &:before { - content: ""; - left:-0.5em; - top:0; - position: absolute; - width: 0; - height: 0; - border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #888; - } - &#fixed { - color:#fff; - background: $contrast1; - &:before { - border-bottom: 0.5em solid #4B8304; - } - } - } -} - -/*OTHER*/ - -.plain-list { - @include list-reset-soft; - li { - margin-bottom:1em; - } -} - -.issue-list{ - margin: 0 0 1em 0; - padding: 0; - border-bottom: 0.25em solid $primary; - li{ - list-style: none; - background: #f6f6f6; - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - display:block; - .update-wrap { - display:table; - width:100%; - .update-text, - .update-img { - display:table-cell; - vertical-align:top; - p { - margin-bottom: 0.5em; - } - } - .update-img { - text-align:right; - img { - margin:-0.5em -1em 0 0.5em; - height:auto; - } - } - } - } -} -//display:table fixes -.ie7, .ie7 { - .issue-list li .update-wrap { - .update-text { - float:left; - width:19em; - } - .update-img { - float:right; - } - } -} - -.issue-list-a { - margin: 0 0 1em 0; - padding: 0; - border-bottom: 0.25em solid $primary; - li { - list-style: none; - margin:0; - padding:0; - a { - margin: 0.25em 0 0 0; - display:table; - background: #f6f6f6; - color:#222222; - width:100%; - &:hover { - text-decoration:none; - color:#222222; - background:#e6e6e6; - } - .text, - .img { - display:table-cell; - vertical-align:top; - } - .img { - text-align:right; - img { - height:auto; - } - } - .text { - padding:0.25em 1em; - h4 { - margin:0; - } - small { - color:#808080; - } - } - } - >p { - margin: 0.25em 0 0 0; - padding: 0.5em 1em; - background: #f6f6f6; - } - } -} -.list-a { - @extend .issue-list-a; - a { - padding:0.5em 1em; - font-weight:bold; - } -} -//display:table fixes -.ie6, .ie7 { - .issue-list-a { - overflow:hidden; - li a { - clear:both; - width:auto; - display:block; - overflow:hidden; - .text { - float:left; - width:18em; - } - .img { - width:6.25em; - float:right; - } - } - } -} -.ie6 .issue-list-a li a { - height:5.5em; - .img img { - height:60px; - } -} - -// fancybox gallery images have a magnifying glass in the corner -.update-img { - a { - @include inline-block; - position:relative; - span { - position:absolute; - top:0; - right:0; - display:block; - width:20px; - height:20px; - opacity: 0.5; - background:#fff url(images/sprite.png) -16px -1098px no-repeat; - //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ - font: 0/0 a; - color: transparent; - } - &:hover span { - opacity: 1; - } - } -} -//bit of a hack - as we can't use em's, push the span out to the right -//by how much it would be if the user did not resize the text -.issue-list li .update-wrap .update-img a span { - right:-16px; - top:-8px; -} - -.problem-header { - margin-bottom:1em; -} -.problem-header .update-img { - float: right; - margin-left: 0.5em; - margin-bottom: 0.5em; -} - -// map stuff -#map_box{ - @extend .full-width; - background: #333; - height: 29em; - margin-bottom: 1em; - overflow: hidden; - position: relative; - #map { - width:100%; - height:100%; - } -} - -// OpenLayers fix for navigation being top right -// Left and right so that zoom can be left, pan right. -#fms_pan_zoom { - right: 0.5em !important; - top: 0.5em !important; - left: 0.5em !important; -} -// The left and right of the above causes the navigation to move off-screen left in IE6. -// XXX Need to check IE7 -.ie6 #fms_pan_zoom { - left: auto !important; -} - -// Openlayers map controls (overrides) -#fms_pan_zoom_panup, -#fms_pan_zoom_pandown, -#fms_pan_zoom_panleft, -#fms_pan_zoom_panright, -#fms_pan_zoom_zoomin, -#fms_pan_zoom_zoomout { - width:36px !important; - height:36px !important; - text-indent:-999999px; - opacity:0.85; - background:url('images/sprite.png') no-repeat; - &:hover { - opacity:1; - } - filter: none !important; // Override OpenLayers PNG handling of the navigation -} - -#fms_pan_zoom_zoomworld { - display:none !important; - visibility:none !important; -} - -#fms_pan_zoom_panup { - background-position:-42px -222px; - right:30px !important; - left: auto !important; - top:0 !important; -} -#fms_pan_zoom_pandown { - background-position:-42px -282px; - right:30px !important; - left: auto !important; - top:72px !important; -} -#fms_pan_zoom_panleft { - background-position:-12px -252px; - width:48px !important; - right:48px !important; - left: auto !important; - top:36px !important; -} -#fms_pan_zoom_panright { - background-position:-60px -252px; - width:48px !important; - right:0 !important; - left: auto !important; - top:36px !important; -} -#fms_pan_zoom_zoomin { - background-position:-152px -223px; - height:44px !important; - left:0 !important; - top:0 !important; -} -#fms_pan_zoom_zoomout { - background-position:-152px -259px; - height:44px !important; - left:0 !important; - top:44px !important; -} - -//hide pins, show old reports etc -#sub_map_links { - position: absolute; - left: 0; - right:0; - bottom: 0; - z-index: 1100; - background:#333; - background:rgba(0, 0, 0, 0.7); - margin:0; - a { - @include inline-block; - font-size:0.6875em; - color:#fff; - padding:0.6em 3em 0.5em 1em; - background-repeat:no-repeat; - &#hide_pins_link { - background-image:url('images/sprite.png'); - background-position: right -3976px; - } - &#all_pins_link { - background-image:url('images/sprite.png'); - background-position: right -4022px; - } - &#map_permalink { - background-image:url('images/sprite.png'); - background-position: right -4070px; - } - &.feed { - background-image:url('images/sprite.png'); - background-position: right -3936px; - } - &:hover { - background-color:#000; - text-decoration:none; - } - } -} - -.ie6 #sub_map_links a { - &#hide_pins_link { - background-image:url('images/ie_sub_map_links_sprite.gif'); - background-position: right 1px; - } - &#all_pins_link { - background-image:url('images/ie_sub_map_links_sprite.gif'); - background-position: right -45px; - } - &#map_permalink { - background-image:url('images/ie_sub_map_links_sprite.gif'); - background-position: right -93px; - } -} - -#mob_sub_map_links { - position: absolute; - z-index:1100; - bottom:0; - display:table; - margin:0; - width:100%; - background:rgba(0, 0, 0, 0.7); - a { - color:#fff; - width:50%; - padding:0.5em 0; - font-size:1em; - display:table-cell; - text-align:center; - &:hover { - background:#000; - text-decoration:none; - } - } - &.map_complete { - background:none; - display:block; - border-bottom:4px solid #fff; - a#try_again { - display:block; - margin:0 auto 6em auto; - background:rgba(0, 0, 0, 0.8); - @include border-radius(0.5em); - } - a#mob_ok { - position:absolute; - right:1em; - bottom:0; - height:20px; - padding-top:30px; - display:block; - width:4em; - background:#fff url('images/sprite.png') 12px -4140px no-repeat; - color:#000; - } - } -} - -.mobile-map-banner { - margin:0; - position: absolute; - top:0; - left:0; - right:0; - font-size:0.75em; - background:rgba(0, 0, 0, 0.7); - padding:0.75em 30px; - a { - @include button-reset(#333, #1a1a1a, #1a1a1a, #fff, #333, #1a1a1a, #1a1a1a, #fff); - font: { - weight:normal; - size:0.875em; - } - line-height:1; - padding:0.5em 0.75em; - position:absolute; - left:0.3em; - top:0.3em; - } -} - -.olControlAttribution { - bottom: 3.25em !important; - right: 0.25em !important; - left: 0.25em !important; - color: #222222; - font-size:0.75em !important; -} -.olControlAttribution img { - vertical-align: bottom; -} -.olControlPermalink { - bottom: 3px !important; - right: 3px; -} - -/* Drag is only present in noscript form. XXX Copy from core. */ -#drag { - input, img { - position: absolute; - border: none; - max-width: none; - } - input { - cursor: crosshair; - background-color: #cccccc; - } - img { - cursor: move; - } - img.pin { - z-index: 100; - background-color: inherit; - } - a img.pin { - cursor: pointer; - cursor: hand; - } -} - -// only on mobile, this is a sidebar on desk (#report-a-problem-sidebar) -a.rap-notes-trigger, -a:hover.rap-notes-trigger { - display:block; - width:90%; - padding-left:5%; - padding-right:5%; -} -.rap-notes { - margin:1em 0; -} - -//report a problem tabs -#problems-nav { - padding:0 1em; - overflow:hidden; - border-bottom:0.25em solid #333; - ul { - @include list-reset-soft; - display:table; - width:100%; - li { - display:table-cell; - border-right:0.25em solid #fff; - &:last-child { - border-right:none; - } - a { - display:block; - background:#e2e2e2; - color:#333; - padding:1em; - text: { - transform:uppercase; - align:center; - } - &:hover { - text-decoration:none; - background:#e6e6e6; - } - &.active { - background:#333; - color:#fff; - } - } - } - } -} - -//display:table fixes -.ie6, .ie7 { - #problems-nav { - clear:both; - margin:0; - padding:0; - ul li { - float:left; - } - } -} - - -table.nicetable { - width:100%; - margin-bottom:2em; - thead { - border-bottom:0.25em solid #ccc; - th { - font-size:0.75em; - } - } - tr { - &.a { - background:#f6f6f6; - } - &:nth-child(even) { - background:#f6f6f6; - } - &.gone { - color: #666666; - background-color: #cccccc; - } - &:hover { - background:#FFF5CC; - cursor:pointer; - } - td { - padding:0.25em; - a { - &:hover { - text-decoration:none; - } - } - } - } - .title { - text-align:left; - } - .data { - width:12%; - } -} - -.promo { - @extend .full-width; - background:$primary; - padding:1em; - margin-bottom:1em; - overflow:hidden; - position: relative; - .close-promo { - position:absolute; - top:0.5em; - right:0.5em; - display:block; - width:16px; - height:16px; - text-indent:-999999px; - background:url(images/sprite.png) -341px -263px no-repeat; - @include border-radius(4px); - &:hover { - background:#222 url(images/sprite.png) -341px -223px no-repeat; - } - } -} - -.alert { - @extend .full-width; - background:#ff0000; - padding:1em; - margin-bottom:1em; - color:#fff; - a, a:hover { - color:$primary; - } -} - -.pagination { - text-align:center; - padding:0.5em 1em; - background:#eee; - position:relative; - .prev { - position:absolute; - left:0.5em; - } - .next { - position:absolute; - right:0.5em; - } - a { - @include inline-block; - background:$primary; - padding-left:0.5em; - padding-right:0.5em; - color:#1a1a1a; - &:hover { - color:#1a1a1a; - text-decoration:none; - background:$primary/1.1; - } - } -} - -// this is a bit of a hack to get some differentation between desk and mobile -.desk-only { - display:none !important; -} - -// hide anything with this class if js is working -.js .hidden-js { - display: none; - visibility: hidden; -} - -// hide anything with this class if js is NOT working -.no-js .hidden-nojs { - display: none !important; - visibility: hidden; -} - - -/* Front page */ -#front-main { - text-align:center; - h2 { - font: { - style:italic; - family: 'helvetica', 'arial', sans-serif; - size:1.1875em; - } - color:#4d4d4d; - } - #postcodeForm { - @extend .full-width; - padding:1em; - background:$primary; - font-family: 'helvetica', 'arial', sans-serif; - label { - margin:0; - } - div { - display:table; - width:100%; - background:#fff; - border:1px solid #F3B11E; - input#pc { - display:table-cell; - margin:0; - padding:0.25em 2%; - width:82%; - border:none; - background:none; - line-height:1.5em; - } - input#submit { - display:table-cell; - border:none; - padding:0; - margin:0; - width:14%; - height:35px; - background:#000; - color:#fff; - text-transform:uppercase; - @include border-radius(0); - &:hover { - background:#333; - } - } - } - } - a#geolocate_link { - @include inline-block; - vertical-align:top; - background:#1a1a1a; - color:#C8C8C8; - padding:0.5em; - font: { - family: 'helvetica', 'arial', sans-serif; - size:0.8125em; - } - @include border-radius(0 0 0.25em 0.25em); - &:hover { - text-decoration:none; - background:#2a2a2a; - } - } -} - -#front-howto { - #front_stats { - display:table; - width:100%; - background:$primary; - font-family: 'helvetica', 'arial', sans-serif; - div { - display:table-cell; - text-align:center; - padding:1em; - line-height:1.25em; - font: { - size:0.8125em; - weight:bold; - } - big { - display:block; - margin-bottom:0.5em; - font-size:1.5385em; - } - } - } -} - -#front-recently { - .issue-list-a { - border-bottom:none; - margin-bottom:0; - } -} - -#alerts { - ul { - margin-bottom: 1em; - } - li { - padding: 0em; - margin-bottom: 0.5em; - } - .a { - background: #f6f6f6; - } - img[width="16"] { - float: right; - } -} +@import "_base"; diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 0db8334fb..9d5151189 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -503,6 +503,7 @@ $.fn.drawer = function(id, ajax) { $('.container').on('click', '#alert_email_button', function(e){ e.preventDefault(); var form = $('<form/>').attr({ method:'post', action:"/alert/subscribe" }); + form.append($('<input name="alert" value="Subscribe me to an email alert" type="hidden" />')); $('#alerts input[type=text], #alerts input[type=hidden], #alerts input[type=radio]:checked').each(function() { var $v = $(this); $('<input/>').attr({ name:$v.attr('name'), value:$v.val(), type:'hidden' }).appendTo(form); @@ -560,9 +561,11 @@ $.fn.drawer = function(id, ajax) { /* * Fancybox fullscreen images */ - $('a[rel=fancy]').fancybox({ - 'overlayColor': '#000000' - }); + if (typeof $.fancybox == 'function') { + $('a[rel=fancy]').fancybox({ + 'overlayColor': '#000000' + }); + } /* * heightfix the desktop .content div diff --git a/web/cobrands/fixmystreet/images/sprite.png b/web/cobrands/fixmystreet/images/sprite.png Binary files differindex 68de30268..61c27b32a 100644 --- a/web/cobrands/fixmystreet/images/sprite.png +++ b/web/cobrands/fixmystreet/images/sprite.png diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index ff75409ec..ff7080c11 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -1,1066 +1,68 @@ - -@import "compass"; -@import "_colours"; -@import "_mixins"; - -//hacks for desk/mob only stuff -.desk-only { - display:block !important; -} -.mob-only { - display:none !important; -} - -body { - background: #1A1A1A url(images/tile.jpg) 0 0 repeat; -} - -h1 { - margin-top: 0; -} - -// Page wrapper and header bits follow - -.container{ - margin: 0 auto; - padding: 0em; - width: 60em; - position: relative; - z-index:1; -} - -//z-index stack order gets reset to 0 in ie6/7 if you position anything, -//so to fix things we give it a high value (don't ask me why) -//see: http://brenelz.com/blog/squish-the-internet-explorer-z-index-bug/ -//this affects #site-logo -.ie6, .ie7 { - .container { - z-index:100; - } -} - -.wrapper{ - display: table; - caption-side: top; - width: 100%; - .table-cell { - display:table-cell; - } -} - -//pad the top of the wrapper to allow space for the menu to fit in -//when its positioned absolute below -.ie6, .ie7 { - .wrapper { - padding-top:4em; - } -} - -.nav-wrapper{ - display: table-caption; - .nav-wrapper-2{ - width: 100%; - min-height: 4em; - position: absolute; - border-top:4px solid #1a1a1a; - @include border-image(url(images/tile-y-border.jpg) 4 0 0 0); - border-left:0; - border-right:0; - z-index:2; - } -} - -//position absolute the menu as ie doesn't like display:table -.ie6, .ie7 { - .nav-wrapper { - position: absolute; - top:0; - left:0; - width:100%; - .nav-wrapper-2 { - // position static as well so we fix lots of the z-index issues - position:static; - } - } -} - -// Resets a lot of the mobile styling. #site-header only used to help position logo on desktop -#site-header { - height: auto; - background: none; - border-top: 0px; - .container { - position: static;//reset position so the nav links become clickable - } -} -#site-logo { - top: 0.9em; - position: absolute; - z-index: 3; -} -.ie6, .ie7 { - #site-header { - height:3em; - .container { - //ie broken z-index bug: the site-logo won't appear if we don't do this - //doesn't seem to render the nav link unclickable like in other browsers - position: relative; - } - } - #site-logo { - position: absolute; - top:-3.25em; - } -} -#nav-link { - left:-999999px; -} -#main-nav{ - margin: 0 auto; - padding: 0em; - width: 60em; - ul{ - list-style: none; - padding: 0px; - margin: 0px; - float:right; - li{ - list-style: none; - display: inline; - margin: 0px; - padding: 0px; - float:left; - a, - span { - display: block; - color:#fff; - background: none; - border-bottom: none; - } - } - &#main-menu{ - li{ - a, span{ - padding: 0.75em; - font-size: 0.9em; - } - a:hover{ - background:#444; - @include background(linear-gradient(#000, #444 10%, #444 95%, #111)); - } - a.report-a-problem-btn { - background:$primary; - padding:0.25em; - margin:0.5em; - color:#333; - @include border-radius(0.25em); - &:hover { - background:$primary/1.1; - } - } - span { - color:$primary; - } - } - } - &#mysoc-menu{ - padding: 0em 0.5em; - margin-left: 0.25em; - background:$primary url(images/tile-y.jpg); - @include border-radius(0 0 0.375em 0.375em); - li{ - a{ - background:none; - color:#000; - text-transform: uppercase; - font-size: 0.6875em; - padding: 1.3em 0.7em 1em 0.7em; - &#mysoc-logo { - width:84px; - height:16px; - background-position:-260px -43px; - opacity: 0.8; - &:hover { - opacity: 1; - } - } - &:hover{ - color:#fff; - } - } - } - } - } +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_300-webfont.eot'); + src: url('fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_300-webfont.woff') format('woff'), + url('fonts/MuseoSans_300-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_300_Italic-webfont.eot'); + src: url('fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), + url('fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_500-webfont.eot'); + src: url('fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_500-webfont.woff') format('woff'), + url('fonts/MuseoSans_500-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'MuseoSans'; + src: url('fonts/MuseoSans_500_Italic-webfont.eot'); + src: url('fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), + url('fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), + url('fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); + font-weight: bold; + font-style: italic; +} + +@font-face { + font-family: 'Museo300-display'; + src: url('fonts/Museo300-Regular-webfont.eot'); + src: url('fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('fonts/Museo300-Regular-webfont.woff') format('woff'), + url('fonts/Museo300-Regular-webfont.ttf') format('truetype'), + url('fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); + font-weight: normal; + font-style: normal; +} + +/* Opera has a bug (from around 10.5 upwards to current 11.6) with showing the + * table caption *at all* if the header is set to a font-face :( */ +noindex:-o-prefocus, #site-header { + font-family: sans-serif; +} + +h3, h4 { + font-weight: bold; } +@import "_colours"; +@import "_layout"; - - -// .content Is the white box - -// The narrow single column box -.content{ - width: 27em; - margin-top: 3em; - background: #fff; - padding: 1em; - padding-bottom: 3em; - margin-left: 0.5em; - margin-bottom: -1em; - @include box-shadow(0px 0px 6px 1px #000); -} -.ie6, .ie7, .ie8 { - .content { - // If no box-shadow, just want a boring black border to stand it out from the map. - border: 1px solid black; - //take off margins so we line up properly - margin: 0; - } -} -//weird margining thing for ie8 -.ie8 .content { - margin-top:3em; -} - -// map page - has fixed header and different styling -body.mappage { - .content { - float:left; - } - #main-nav ul#main-menu li a, - #main-nav ul#main-menu li span { - padding: 1.4em 0.75em 1.35em 0.75em; - } - #main-nav ul#main-menu li a.report-a-problem-btn { - padding: 0.5em; - margin:0.9em 0.25em 0.85em 0.25em; - } - .nav-wrapper{ - .nav-wrapper-2{ - position: fixed; - background: #222; - @include background(linear-gradient(#000, #222 10%, #222 90%, #000)); - } - } - #site-logo{ - position: fixed; - } -} -.ie6, .ie7 { - body.mappage { - // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. - .container { - float: left; - width: 27em; - margin-left: 1.4em; - } - .nav-wrapper{ - z-index:1; - .nav-wrapper-2 { - position:static; - } - } - #site-logo { - position: absolute; - } - } -} -.ie6 { - body.mappage { - .container { - margin-left: 0.7em; - } - } -} -//ie8 needs different stuff on .nav-wrapper so we -//have to define all the rest of it again as this resets -//the z-index base yet again :S -.ie8 { - body.mappage { - .nav-wrapper{ - position: relative; - z-index:0; - .nav-wrapper-2 { - position:static; - } - } - #site-logo { - position: absolute; - } - } -} - - - -// full width page -body.fullwidthpage { - .content { - width: 57em; - } - .intro { - width:40em; - } -} -// two thirds width page, also has option for a sidebar which can be sticky or not -body.twothirdswidthpage { - @extend .fullwidthpage; - .content { - width:40em; - position: relative; - aside { - background:#eee; - position:absolute; - left:42em; - top:0; - z-index: -1; - width:13em; - padding:1em; - @include box-shadow(0px 0px 6px 1px #000); - h2 { - margin-top: 0; - } - img { - margin-bottom: 0.25em; - } - } - .sticky-sidebar { - position: absolute; - left:42em; - z-index: -1; - aside { - position: fixed; - top:7em; - left:auto; - } - } - } -} -//as ie6 doesn't like 'fixed' we will make it absolute again -.ie6 body.twothirdswidthpage .content .sticky-sidebar { - position:static; - aside { - position:absolute; - left:42em; - top:0; - } -} - - -// table wrapper - this enables anything to become a -// table with div children as table cells -.tablewrapper { - display:table; - width:100%; - padding:0 0 1em 0; - >div { - display:table-cell; - width:50%; - } - .full-width { - width:auto; - margin:0; - } -} - -//fix table to be a block for ie, float the children -.ie6, .ie7 { - .tablewrapper { - display:block; - div {//ie6 doesn't support '>div', so we'll go with the somewhat risker 'div' - width:48%; - display:block; - float: left; - border:none !important; - } - } -} - -// adds border to the top and goes full width -.bordered { - margin:0 -1em; - padding:0 1em; - width:auto; - border-top:0.25em solid $primary; -} - -//footer blocks -#footer-mobileapps { - border-right:1em solid #fff; - background:none; - padding:0; - @include box-shadow(inset rgba(0, 0, 0, 0) 0 0 0); - h2 { - color:#222; - margin-top:0; - } - ul { - @include list-reset; - li { - border-bottom:none; - float:left; - margin:0 1em 1em 0; - a { - color:#222; - padding:0; - width: 96px; - height: 32px; - margin:0 auto; - text-indent: -999999px; - background: url(images/sprite.png) -12px -3610px no-repeat; - opacity: 0.8; - &:hover { - opacity: 1; - } - &.m-app-iphone { - background-position: -12px -3610px; - } - &.m-app-iphone-streetreport { - background-position: -12px -3678px; - height:50px; - } - &.m-app-droid { - background-position: -12px -3756px; - } - &.m-app-nokia { - background-position: -12px -3820px; - width:74px; - } - } - } - } -} -.ie6, .ie7 { - #footer-mobileapps { - margin:0 0.5em; - margin-right:2%; - } -} -.ie6 #footer-mobileapps ul li a { - background:url(images/ie_mobileapps.gif) -1px -1px no-repeat; - &.m-app-iphone-streetreport { - background-position: -1px -69px; - height:50px; - } - &.m-app-droid { - background-position: -1px -148px; - } - &.m-app-nokia { - background-position: -1px -212px; - width:74px; - } -} - -#footer-help { - border-left:1em solid #fff; - ul { - display:table; - li { - display:table-cell; - border-bottom:none; - &:last-child { - border-left:1.25em solid #fff; - } - } - } -} -.ie6, .ie7 { - #footer-help { - margin-left:2%; - ul { - width:100%; - li { - float:left; - width:45% - } - } - } -} - - -// map box (fallback for non js really as most users -// will have fullscreen map) -#map_box{ - position: absolute; - height: 29em; - width: 29em; - right: 1em; - top: 3em; - z-index:1; -} - -// Pull OpenLayers navigation down a bit -#fms_pan_zoom { - top: 4.75em !important; -} - -// push zoom back over to right -#fms_pan_zoom_zoomin { - left:auto !important; - right:30px; - top:130px !important; -} -#fms_pan_zoom_zoomout { - left:auto !important; - right:30px; - top:174px !important; -} - -.olControlAttribution { - bottom:0.5em !important; - left: auto !important; -} - -#sub_map_links { - left:auto; - bottom:auto; - bottom:2em; - #map_links_toggle { - display:block; - cursor: pointer; - position:absolute; - left:-1em; - width:1em; - height:100%; - background:#000 url(images/sprite.png) right -4119px no-repeat; - @include border-radius(0.25em 0 0 0.25em); - &:hover { - left:-1.5em; - //use border so we don't have to redefine the background-position - border-right:0.5em solid #000; - } - &.closed { - background-position: right -4159px; - } - } -} -.ie6 #sub_map_links #map_links_toggle { - height:1.75em; - background:#000 url('images/ie_sub_map_links_sprite.gif') center -143px no-repeat; - &.closed { - background-position: center -183px; - } -} - -// log in bit, pokes above the .content div -#user-meta{ - display:block; - position: relative; - max-width: 57em; - margin:0 auto; - p { - @include inline-block; - position:absolute; - top:1em; - height:2em; - padding:0.25em 6em 0.5em 0.5em; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - a { - top:0.5em; - right:0.5em; - font-size:0.6875em; - padding:0.5em 0.75em; - line-height:1em; - &:hover { - text-decoration:none; - background:#444; - } - } - } -} -.ie6, .ie7 { - #user-meta { - z-index:1; - p { - top:-2em; - } - } -} -.ie6 #user-meta { - width:57em; //ie6 doesn't like max-width -} - - - -// Wraps around #key-tools box - sticks to the bottom of the screen on desktop -.shadow-wrap { - position:fixed; - z-index:10; //this is just to ensure anythign inside .content that has position set goes sites it - bottom: 0; - width: 29em; - overflow: hidden; - padding-top: 3em; - ul#key-tools { - border-top: 0.25em solid $primary; - margin: 0; - @include box-shadow(-0em 0px 1em 1em #fff); - li { - border:none; - a { - font-size: 0.75em; - color:#888888; - padding: 0.5em 1.5em 0.5em 0; - text-transform:none; - &.abuse { - background-image:url(images/sprite.png); - background-position:right -2935px; - } - &.feed { - background-image:url(images/sprite.png); - background-position:right -3074px; - } - &.chevron { - background-image:url(images/sprite.png); - background-position:right -3225px; - } - &.hover { - background-image:url(images/sprite.png); - background-position:right -1876px; - } - } - } - &.singleton { - li { - text-align:right; - a { - padding-right:3em; - } - } - } - } - &.static { - padding:0 0 1em 0; - position: static; - } -} -// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. -.ie6 .shadow-wrap { - padding-top: 0; -} - -// pokes over the RHS with a little triangle -.big-green-banner { - top:auto; - right:-1.25em; - margin-left:-2em; - font-size:1.375em; - padding:1em 3em 1em 1em; - background: $contrast1 url(images/sprite.png) right -2188px no-repeat; - &:before { - right:0; - left:auto; - top:-0.5em; - position: absolute; - border-top: 0.5em solid transparent; - border-left: 0.5em solid #4B8304; - border-bottom:none; - } -} -.ie6 .big-green-banner { - background: $contrast1 url(images/ie_green_chevron.gif) right center no-repeat; -} - -.banner { - // state banners - p { - top:-2.25em; - padding:1em; - &:before { - left:-0.75em; - border-left: 0.75em solid transparent; - border-bottom: 0.75em solid #888; - } - &#fixed { - padding-top:5em; - background-image:url(images/sprite.png); - background-position:-324px -326px; - background-repeat:no-repeat; - &:before { - border-bottom: 0.75em solid #4B8304; - } - } - } -} -.ie6 .banner p { - top:-1.5em; - &#fixed { - background-image:url(images/ie_fixed.gif); - background-position:center 0.75em; - } -} - - -// for pulling elements fullwidth regardless -// of .contents' padding -.full-width{ - margin: 0 0 0em -1em; - width: 29em; -} - -/*FORMS*/ -input[type=text], -input[type=password], -input[type=email], -textarea{ - width: 25em; -} -.form-box { - max-width:25em; -} - - -/* form errors */ -div.form-error, -p.form-error { - display:block; - width:24.7em; -} - -input.form-error, -textarea.form-error { - @include border-radius(0 0 0.25em 0.25em); -} - - -// Report a problem sidebar notes -#report-a-problem-sidebar { - position:absolute; - z-index:-1;//push behind .content, .container resets z-index for this - left:29.5em; - top:5em; - width:15em; - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - .sidebar-tips { - background:#eeeeee; - padding:1em; - font-size:0.75em; - } - .sidebar-notes { - background:#333333; - padding:1em; - color:#ffffff; - font-size:0.75em; - } -} -.ie6, .ie7 { - #report-a-problem-sidebar { - left: 29em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly. - } -} - -.no-js .general-sidebar-notes, -.no-js #report-a-problem-sidebar { - position: static; - width: auto; - @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); - .sidebar-tips, - .sidebar-notes { - font-size:1em; - } -} - -// More general sidebar notes -.general-sidebar-notes { - position: absolute; - left:29.5em; - width:15em; - z-index: -1; //push behind .content, .container resets z-index for this - @include box-shadow(rgba(0, 0, 0, 0.6) 0px 0px 4px 1px); - p { - background:#eeeeee; - font-size:0.75em; - padding:0.75em; - margin:0; - &.dark { - background:#333333; - color:#ffffff; - } - } -} - -// Frontpage - -body.frontpage { - .table-cell { - // we do this so we can have full screen width elements - >.container { - width:100%; - } - .content { - margin:14em auto 0 auto; - } - } - .nav-wrapper-2{ - height:6em; - } - #site-header{ - height:9em; - } - #site-logo{ - top:3em; - width: 300px; - height: 60px; - background-position:-2px -108px; - } - #user-meta { - z-index:10; - p { - top:-4em; - right:0; - color:#FFD000; - background:none; - @include box-shadow(rgba(0, 0, 0, 0) 0 0 0); - a { - background:#fff; - color:#1a1a1a; - &:hover { - background:#ddd; - } - } - } - } -} -//logo fix -.ie6, .ie7, .ie8 { - body.frontpage { - #site-logo { - position:relative; - width:60em; - margin:0 auto; - } - } -} -.ie6, .ie7 { - body.frontpage { - #site-header { - height:3em; - } - #site-logo { - top:-1em; - } - #user-meta p { - top:-2em; - } - } -} -.ie6 body.frontpage #site-logo { - background:url(images/ie_front_logo.gif) 0 0 no-repeat; -} -//weird margining thing for ie8 -.ie8 body.frontpage { - #front-main { - top:-12em; - } - .table-cell .content { - margin-top:12em; - } -} - -// big yellow bit full screen width -#front-main { - background:$primary url(images/tile-y.jpg); - position:absolute; - width:100%; - left:0; - top:-15em; - #front-main-container { - max-width: 57em; - margin:0 auto; - } - h2 { - font-style:normal; - margin:0; - color:#222; - } - #postcodeForm { - background:none; - overflow:hidden; - margin-right:0.5em; - label { - margin:0.5em 0; - } - div { - display:block; - margin:0 auto; - width:20em; - overflow:hidden; - input#pc { - display:block; - float:left; - padding:0.25em 0.5em; - height:1.5em; - width:16em; - } - input#submit { - display:block; - float:right; - width:3em; - height:2.3em; - padding-top:0.2em; - } - } - } - a#geolocate_link { - background:none; - color:#222; - margin:-1em 0 0.5em 0; - &:hover { - text-decoration:underline; - background:none; - } - } -} -.ie6, .ie7 { - #front-main { - top:2em; - } -} - - -#front-howto { - border-right:1em solid #fff; - #front_stats { - background:none; - border-top:0.25em solid $primary; - padding-top:1em; - div { - big { - color:$primary; - font-size:3.2308em; - } - } - } -} -.ie6, .ie7 { - #front_stats { - div { - width:8em; - float:left; - } - } -} - -#front-recently { - border-left:1em solid #fff; -} - -#front-howto h2, -#front-recently h2 { - margin-top:0; -} - - -.ie6, .ie7 { - .tablewrapper { - #front-howto { - margin-right:2%; - } - #front-recently { - margin-left:2%; - } - } -} - - - - -/* MEDIA QUERIES */ -@media only screen and (min-width: 48em) and (max-width: 61em) { - .container { - width: 100%; - } - /*FORMS*/ - input[type=text], - input[type=password], - input[type=email], - textarea{ - width: 95%; - } - - // Remove central positioning of mainmenu and float right. - // Left padding is to ensure no overlap of the site-logo - // Background styling replicates header styling - - #main-nav{ - width: auto; - float:right; - padding-left: 180px; - } - .nav-wrapper { - // width:auto; - .nav-wrapper-2 { - // width:auto; - } - } - - //Main menu drops below logo and my-soc menu - #main-menu{ - margin-top: 3em; - } - //therefore header needs to open up - #site-header { - height:6em; - } - // Pull OpenLayers navigation down a bit more - #fms_pan_zoom { - top: 7em !important; - } - - //fix the left margin on login bit - #user-meta { - p { - left:1em; - } - } - body.frontpage { - #user-meta { - p { - left:auto; - } - } - } - - //Map becomes percentage width - #map_box{ - left: 32em; - width:auto; - } - - //put the RAP notes into the main copy area - // Note: Also used for the non-JS case. - #report-a-problem-sidebar, - .general-sidebar-notes { - position: static; - width: auto; - @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0); - .sidebar-tips, - .sidebar-notes { - font-size:1em; - } - } - - //Revert to mobile use of the .full-width class - .full-width{ - width: auto; - margin: 0em -1em 0 -1em; - } - - //make fullpage auto width - body.fullwidthpage .content { - width: auto; - } - - //make twothirdswidthpage nearly as small as main - //.content: just enough to still fit the sidebar in - body.twothirdswidthpage { - .content { - width:30em; - .sticky-sidebar { - left:32em; - top:30em; - aside { - top:9em; - } - } - } - } -} diff --git a/web/i/pin-green.png b/web/i/pin-green.png Binary files differindex 8b64d5160..47a0a6cc1 100644 --- a/web/i/pin-green.png +++ b/web/i/pin-green.png diff --git a/web/i/pin-red.png b/web/i/pin-red.png Binary files differindex 9b754e42e..298f4d3f6 100644 --- a/web/i/pin-red.png +++ b/web/i/pin-red.png diff --git a/web/i/pin-yellow-big.png b/web/i/pin-yellow-big.png Binary files differindex 59ed29dbd..d1642d644 100644 --- a/web/i/pin-yellow-big.png +++ b/web/i/pin-yellow-big.png diff --git a/web/i/pin-yellow.png b/web/i/pin-yellow.png Binary files differindex f9359b0b3..196cb0f5f 100644 --- a/web/i/pin-yellow.png +++ b/web/i/pin-yellow.png diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 3d2d3259a..d73e2bfc8 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -118,10 +118,10 @@ function fixmystreet_onload() { var markers = fms_markers_list( fixmystreet.pins, true ); fixmystreet.markers.addFeatures( markers ); if (fixmystreet.page == 'around' || fixmystreet.page == 'reports' || fixmystreet.page == 'my') { - var select = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); + fixmystreet.select_feature = new OpenLayers.Control.SelectFeature( fixmystreet.markers ); var selectedFeature; function onPopupClose(evt) { - select.unselect(selectedFeature); + fixmystreet.select_feature.unselect(selectedFeature); OpenLayers.Event.stop(evt); } fixmystreet.markers.events.register( 'featureunselected', fixmystreet.markers, function(evt) { @@ -142,8 +142,8 @@ function fixmystreet_onload() { feature.popup = popup; fixmystreet.map.addPopup(popup); }); - fixmystreet.map.addControl( select ); - select.activate(); + fixmystreet.map.addControl( fixmystreet.select_feature ); + fixmystreet.select_feature.activate(); } else if (fixmystreet.page == 'new') { fixmystreet_activate_drag(); } @@ -164,9 +164,11 @@ function fixmystreet_onload() { for (var i=0; i<showhide.length; i+=2) { if (this.innerHTML == showhide[i]) { fixmystreet.markers.setVisibility(true); + fixmystreet.select_feature.activate(); this.innerHTML = showhide[i+1]; } else if (this.innerHTML == showhide[i+1]) { fixmystreet.markers.setVisibility(false); + fixmystreet.select_feature.deactivate(); this.innerHTML = showhide[i]; } } @@ -213,7 +215,7 @@ $(function(){ displayProjection: new OpenLayers.Projection("EPSG:4326") }); - if ($('html').hasClass('mobile')) { + if ($('html').hasClass('mobile') && fixmystreet.page == 'around') { $('#fms_pan_zoom').css({ top: '2.75em !important' }); } @@ -236,14 +238,15 @@ $(function(){ if (fixmystreet.state_map && fixmystreet.state_map == 'full') { // TODO Work better with window resizing, this is pretty 'set up' only at present - var q = $(window).width() / 4; + var $content = $('.content'), + q = ( $content.offset().left + $content.width() ) / 2; // Need to try and fake the 'centre' being 75% from the left fixmystreet.map.pan(-q, -25, { animate: false }); fixmystreet.map.events.register("movestart", null, function(e){ fixmystreet.map.moveStart = { zoom: this.getZoom(), center: this.getCenter() }; }); fixmystreet.map.events.register("zoomend", null, function(e){ - if ( fixmystreet.map.moveStart && !fixmystreet.map.moveStart.zoom ) { + if ( fixmystreet.map.moveStart && !fixmystreet.map.moveStart.zoom && fixmystreet.map.moveStart.zoom !== 0 ) { return true; // getZoom() on Firefox appears to return null at first? } if ( !fixmystreet.map.moveStart || !this.getCenter().equals(fixmystreet.map.moveStart.center) ) { @@ -433,6 +436,11 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { latitude: $('#fixmystreet\\.latitude').val(), longitude: $('#fixmystreet\\.longitude').val() }, function(data) { + if (data.error) { + // XXX If they then click back and click somewhere in the area, this error will still show. + $('#side-form').html('<h1>Reporting a problem</h1><p>' + data.error + '</p>'); + return; + } $('#councils_text').html(data.councils_text); $('#form_category_row').html(data.category); }); @@ -454,7 +462,12 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { // If we clicked the map somewhere inconvenient var sidebar = $('#report-a-problem-sidebar'); if (sidebar.css('position') == 'absolute') { - var w = sidebar.width(), h = sidebar.height(), o = sidebar.offset(); + var w = sidebar.width(), h = sidebar.height(), + o = sidebar.offset(), + $map_box = $('#map_box'), bo = $map_box.offset(); + // e.xy is relative to top left of map, which might not be top left of page + e.xy.x += bo.left; + e.xy.y += bo.top; if (e.xy.y <= o.top || (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64)) { // top of the page, pin hidden by header; // or underneath where the new sidebar will appear @@ -463,7 +476,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { fixmystreet.map.getProjectionObject() ); var p = fixmystreet.map.getViewPortPxFromLonLat(lonlat); - p.x -= $(window).width() / 3; + p.x -= ( o.left + w ) / 2; lonlat = fixmystreet.map.getLonLatFromViewPortPx(p); fixmystreet.map.panTo(lonlat); } diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 50f159635..54bf95964 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -79,14 +79,14 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { }); /** - * Class: OpenLayers.Layer.OSM.Osmarender + * Class: OpenLayers.Layer.OSM.MapQuestOpen * * Inherits from: * - <OpenLayers.Layer.OSM> */ -OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { +OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, { /** - * Constructor: OpenLayers.Layer.OSM.Osmarender + * Constructor: OpenLayers.Layer.OSM.MapQuestOpen * * Parameters: * name - {String} @@ -94,16 +94,22 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { */ initialize: function(name, options) { var url = [ - "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png" + "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" ]; - options = OpenLayers.Util.extend({ numZoomLevels: 18, buffer: 0 }, options); + options = OpenLayers.Util.extend({ + /* Below line added to OSM's file in order to allow minimum zoom level */ + maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), + numZoomLevels: 19, + buffer: 0 + }, options); var newArguments = [name, url, options]; OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); }, - CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender" + CLASS_NAME: "OpenLayers.Layer.OSM.MapQuestOpen" }); /** |
