aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/views/general/_credits.rhtml2
-rw-r--r--app/views/layouts/default.rhtml1
-rw-r--r--app/views/request/_next_actions.rhtml1
-rw-r--r--app/views/request/_sidebar.rhtml23
-rw-r--r--config/environment.rb1
-rw-r--r--public/robots.txt6
-rw-r--r--vendor/gems/fast_gettext-0.5.10/.specification4
-rw-r--r--vendor/gems/gettext-2.1.0/.specification36
-rw-r--r--vendor/gems/json-1.5.1/.specification4
-rw-r--r--vendor/gems/locale-2.0.5/.specification22
-rw-r--r--vendor/gems/rack-1.1.0/.specification2
-rw-r--r--vendor/gems/recaptcha-0.3.1/.specification2
-rw-r--r--vendor/gems/rspec-1.3.1/.specification2
-rw-r--r--vendor/gems/rspec-rails-1.3.3/.specification2
-rw-r--r--vendor/gems/will_paginate-2.3.15/.specification2
15 files changed, 71 insertions, 39 deletions
diff --git a/app/views/general/_credits.rhtml b/app/views/general/_credits.rhtml
index 8c519ce7e..b1a9ce05e 100644
--- a/app/views/general/_credits.rhtml
+++ b/app/views/general/_credits.rhtml
@@ -1 +1 @@
-| <%= _('Powered by <a href="http://www.alaveteli.org/">Alaveteli</a>.') %>
+| <%= _('Powered by <a href="http://www.alaveteli.org/">Alaveteli</a>') %>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index cf969302e..d78ed2444 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -125,6 +125,7 @@
<div id="footer">
<%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %>
+ | <img src="/images/twitter-16.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a>
<%= render :partial => 'general/credits' %>
</div>
<div class="after-footer">&nbsp;</div>
diff --git a/app/views/request/_next_actions.rhtml b/app/views/request/_next_actions.rhtml
new file mode 100644
index 000000000..f318df6e4
--- /dev/null
+++ b/app/views/request/_next_actions.rhtml
@@ -0,0 +1 @@
+<!-- Consider listing websites that users might find useful here (in your theme) -->
diff --git a/app/views/request/_sidebar.rhtml b/app/views/request/_sidebar.rhtml
index 4dce18e76..e562c4f6a 100644
--- a/app/views/request/_sidebar.rhtml
+++ b/app/views/request/_sidebar.rhtml
@@ -3,31 +3,22 @@
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => @info_request.user == @user, :location => 'sidebar' } %>
<h2><%= _("Act on what you've learnt") %></h2>
+
<div class="act_link">
- <%= link_to '<img src="/images/helpmeinvestigate.png" alt="" class="rss">', "http://helpmeinvestigate.com/"%>
- <%= link_to 'Get help investigating', "http://helpmeinvestigate.com/"%>
- </div>
- <div class="act_link">
- <%= link_to '<img src="/images/writetothem.png" alt="" class="rss">', "http://www.writetothem.com"%>
- <%= link_to 'Write to your politician', "http://www.writetothem.com"%>
- </div>
- <div class="act_link">
- <%= link_to '<img src="/images/pledgebank.png" alt="" class="rss">', "http://www.pledgebank.com"%>
- <%= link_to 'Pledge with others', "http://www.pledgebank.com"%>
+ <% tweet_link = "http://twitter.com/share?url=#{h(request.url)}&via=#{h(MySociety::Config.get('TWITTER_USERNAME', ''))}&text='#{h(@info_request.title)}'&related=#{_('alaveteli_foi:The software that runs {{site_name}}', :site_name => h(site_name))}" %>
+ <%= link_to '<img src="/images/twitter-16.png" alt="twitter icon">', tweet_link %>
+ <%= link_to _("Tweet this request"), tweet_link %>
</div>
- <!-- <div class="act_link">
- <%= link_to '<img src="/images/petitions.png" alt="" class="rss">', "http://petitions.number10.gov.uk"%>
- <%= link_to 'Petition the PM', "http://petitions.number10.gov.uk"%>
- </div> -->
<div class="act_link">
<%= link_to '<img src="/images/wordpress.png" alt="" class="rss">', "http://wordpress.com/"%>
- <%= link_to 'Start your own blog', "http://wordpress.com/"%>
+ <%= link_to _("Start your own blog"), "http://wordpress.com/"%>
</div>
+ <%= render :partial => 'request/next_actions' %>
<% view_cache :ttl => 1.day, :tag => ['similar', @info_request.id, I18n.locale] do %>
<% if !@xapian_similar.nil? && @xapian_similar.results.size > 0 %>
- <h2><% _('Similar requests')%></h2>
+ <h2><%= _('Similar requests')%></h2>
<% for result in @xapian_similar.results %>
<%= render :partial => 'request/request_listing_short_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %>
<% end %>
diff --git a/config/environment.rb b/config/environment.rb
index 91da156bb..c363e7fae 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -61,6 +61,7 @@ Rails::Initializer.run do |config|
config.gem "gettext", :version => '>=1.9.3'
config.gem "fast_gettext", :version => '>=0.4.8'
config.gem "rack", :version => '1.1.0'
+ config.gem "rdoc", :version => '2.4.3'
config.gem "recaptcha", :lib => "recaptcha/rails"
config.gem 'rspec', :lib => false, :version => '1.3.1'
config.gem 'rspec-rails', :lib => false, :version => '1.3.3'
diff --git a/public/robots.txt b/public/robots.txt
index 80dfd8ef7..029ae0dbf 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -8,6 +8,10 @@
# Crawl-delay: 1
# http://www.bing.com/community/blogs/webmaster/archive/2009/08/10/crawl-delay-and-the-bing-crawler-msnbot.aspx
+# This file uses the non-standard extension characters * and $, which are supported by Google and Yahoo!
+# http://code.google.com/web/controlcrawlindex/docs/robots_txt.html
+# http://help.yahoo.com/l/us/yahoo/search/webcrawler/slurp-02.html
+
User-agent: *
Disallow: /annotate/
Disallow: /new/
@@ -19,4 +23,4 @@ Disallow: /user/contact/
Disallow: /feed/
Disallow: /profile/
Disallow: /signin
-
+Disallow: /body/*/view_email$
diff --git a/vendor/gems/fast_gettext-0.5.10/.specification b/vendor/gems/fast_gettext-0.5.10/.specification
index 7e1bcf3dc..7e241fff7 100644
--- a/vendor/gems/fast_gettext-0.5.10/.specification
+++ b/vendor/gems/fast_gettext-0.5.10/.specification
@@ -2,7 +2,7 @@
name: fast_gettext
version: !ruby/object:Gem::Version
hash: 31
- prerelease: false
+ prerelease:
segments:
- 0
- 5
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: A simple, fast and threadsafe implementation of GetText
diff --git a/vendor/gems/gettext-2.1.0/.specification b/vendor/gems/gettext-2.1.0/.specification
index 43cf26fff..d318db351 100644
--- a/vendor/gems/gettext-2.1.0/.specification
+++ b/vendor/gems/gettext-2.1.0/.specification
@@ -1,6 +1,12 @@
--- !ruby/object:Gem::Specification
name: gettext
version: !ruby/object:Gem::Version
+ hash: 11
+ prerelease:
+ segments:
+ - 2
+ - 1
+ - 0
version: 2.1.0
platform: ruby
authors:
@@ -14,15 +20,21 @@ default_executable:
dependencies:
- !ruby/object:Gem::Dependency
name: locale
- type: :runtime
- version_requirement:
- version_requirements: !ruby/object:Gem::Requirement
+ prerelease: false
+ requirement: &id001 !ruby/object:Gem::Requirement
+ none: false
requirements:
- - ">="
- !ruby/object:Gem::Version
+ hash: 5
+ segments:
+ - 2
+ - 0
+ - 5
version: 2.0.5
- version:
-description: Ruby-GetText-Package is a GNU GetText-like program for Ruby. The catalog file(po-file) is same format with GNU GetText. So you can use GNU GetText tools for maintaining.
+ type: :runtime
+ version_requirements: *id001
+description: " Ruby-GetText-Package is a GNU GetText-like program for Ruby.\n The catalog file(po-file) is same format with GNU GetText.\n So you can use GNU GetText tools for maintaining.\n"
email: mutomasa at gmail.com
executables:
- rmsgmerge
@@ -791,27 +803,35 @@ files:
- samples/hello.rb
has_rdoc: true
homepage: http://gettext.rubyforge.org/
+licenses: []
+
post_install_message:
rdoc_options: []
require_paths:
- lib
required_ruby_version: !ruby/object:Gem::Requirement
+ none: false
requirements:
- - ">="
- !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 0
version: "0"
- version:
required_rubygems_version: !ruby/object:Gem::Requirement
+ none: false
requirements:
- - ">="
- !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 0
version: "0"
- version:
requirements: []
rubyforge_project: gettext
-rubygems_version: 1.2.0
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: Ruby-GetText-Package is a libary and tools to localize messages.
diff --git a/vendor/gems/json-1.5.1/.specification b/vendor/gems/json-1.5.1/.specification
index 26813246a..323455f68 100644
--- a/vendor/gems/json-1.5.1/.specification
+++ b/vendor/gems/json-1.5.1/.specification
@@ -36,6 +36,7 @@ post_install_message:
rdoc_options: []
require_paths:
+- bin
- lib
required_ruby_version: !ruby/object:Gem::Requirement
requirements:
@@ -56,10 +57,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project: json
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: JSON Implementation for Ruby
test_files: []
-
diff --git a/vendor/gems/locale-2.0.5/.specification b/vendor/gems/locale-2.0.5/.specification
index 7d3263441..0150358f4 100644
--- a/vendor/gems/locale-2.0.5/.specification
+++ b/vendor/gems/locale-2.0.5/.specification
@@ -1,6 +1,12 @@
--- !ruby/object:Gem::Specification
name: locale
version: !ruby/object:Gem::Version
+ hash: 5
+ prerelease:
+ segments:
+ - 2
+ - 0
+ - 5
version: 2.0.5
platform: ruby
authors:
@@ -13,7 +19,7 @@ date: 2009-11-13 00:00:00 +00:00
default_executable:
dependencies: []
-description: Ruby-Locale is the pure ruby library which provides basic APIs for localization.
+description: " Ruby-Locale is the pure ruby library which provides basic APIs for localization.\n"
email: mutomasa at gmail.com
executables: []
@@ -70,27 +76,35 @@ files:
- samples/sample_1.rb
has_rdoc: true
homepage: http://locale.rubyforge.org/
+licenses: []
+
post_install_message:
rdoc_options: []
require_paths:
- lib
required_ruby_version: !ruby/object:Gem::Requirement
+ none: false
requirements:
- - ">="
- !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 0
version: "0"
- version:
required_rubygems_version: !ruby/object:Gem::Requirement
+ none: false
requirements:
- - ">="
- !ruby/object:Gem::Version
+ hash: 3
+ segments:
+ - 0
version: "0"
- version:
requirements: []
rubyforge_project: locale
-rubygems_version: 1.2.0
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: Ruby-Locale is the pure ruby library which provides basic APIs for localization.
diff --git a/vendor/gems/rack-1.1.0/.specification b/vendor/gems/rack-1.1.0/.specification
index 1e78d1e42..b0c27ec96 100644
--- a/vendor/gems/rack-1.1.0/.specification
+++ b/vendor/gems/rack-1.1.0/.specification
@@ -263,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project: rack
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: a modular Ruby webserver interface
diff --git a/vendor/gems/recaptcha-0.3.1/.specification b/vendor/gems/recaptcha-0.3.1/.specification
index b7234754d..d021eabbb 100644
--- a/vendor/gems/recaptcha-0.3.1/.specification
+++ b/vendor/gems/recaptcha-0.3.1/.specification
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: Helpers for the reCAPTCHA API
diff --git a/vendor/gems/rspec-1.3.1/.specification b/vendor/gems/rspec-1.3.1/.specification
index bdc08e236..3022d067d 100644
--- a/vendor/gems/rspec-1.3.1/.specification
+++ b/vendor/gems/rspec-1.3.1/.specification
@@ -566,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project: rspec
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: rspec 1.3.1
diff --git a/vendor/gems/rspec-rails-1.3.3/.specification b/vendor/gems/rspec-rails-1.3.3/.specification
index d6eb1f0b7..f1f280090 100644
--- a/vendor/gems/rspec-rails-1.3.3/.specification
+++ b/vendor/gems/rspec-rails-1.3.3/.specification
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project: rspec
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: rspec-rails 1.3.3
diff --git a/vendor/gems/will_paginate-2.3.15/.specification b/vendor/gems/will_paginate-2.3.15/.specification
index 68e2cfca2..c1f3064e2 100644
--- a/vendor/gems/will_paginate-2.3.15/.specification
+++ b/vendor/gems/will_paginate-2.3.15/.specification
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
requirements: []
rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
signing_key:
specification_version: 3
summary: Pagination for Rails
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:31:21 +0000