diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/general/_frontpage_intro_sentence.rhtml | 3 | ||||
| -rw-r--r-- | app/views/general/blog.rhtml | 7 | ||||
| -rw-r--r-- | app/views/general/frontpage.rhtml | 4 | ||||
| -rw-r--r-- | app/views/help/_why_they_should_reply_by_email.rhtml | 3 | ||||
| -rw-r--r-- | app/views/request/_view_html_prefix.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/show_response.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/set_profile_about_me.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 2 |
8 files changed, 13 insertions, 14 deletions
diff --git a/app/views/general/_frontpage_intro_sentence.rhtml b/app/views/general/_frontpage_intro_sentence.rhtml new file mode 100644 index 000000000..2c3bcaf83 --- /dev/null +++ b/app/views/general/_frontpage_intro_sentence.rhtml @@ -0,0 +1,3 @@ +First, type in the <strong>name of the UK public authority</strong> you'd +<br>like information from. <strong>By law, they have to respond</strong> +(<a href="<%= help_about_url %>">why?</a>). diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml index cbd37240e..c9387c24f 100644 --- a/app/views/general/blog.rhtml +++ b/app/views/general/blog.rhtml @@ -1,8 +1,8 @@ <% @title = "#{site_name} blog and tweets" %> <h1><%=@title %></h1> - <img src="/images/twitter.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/whatdotheyknow">Follow us on twitter</a> - <img src="/images/rss.png" alt="RSS icon" valign="middle"> <a href="http://www.mysociety.org/category/projects/whatdotheyknow/feed/">Subscribe to blog</a> + <img src="/images/twitter.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a> + <img src="/images/rss.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a> <% if !@twitter_user.empty? %> <div id="twitter"> <script src="http://widgets.twimg.com/j/2/widget.js"></script> @@ -52,8 +52,5 @@ new TWTR.Widget({ </p> </div> <% end %> - <p> - <a href="http://www.mysociety.org/category/projects/whatdotheyknow/">All blog posts</a> - </p> </div> diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml index e8e5d8634..abed0294e 100644 --- a/app/views/general/frontpage.rhtml +++ b/app/views/general/frontpage.rhtml @@ -5,9 +5,7 @@ <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %> <p> - <%= _('First, type in the <strong>name of the UK public authority</strong> you\'d - <br>like information from. <strong>By law, they have to respond</strong> - (<a href="%s">why?</a>).') % help_about_url %> + <%= render :partial => 'frontpage_intro_sentence' %> <br> <br> diff --git a/app/views/help/_why_they_should_reply_by_email.rhtml b/app/views/help/_why_they_should_reply_by_email.rhtml new file mode 100644 index 000000000..faaa2b2e2 --- /dev/null +++ b/app/views/help/_why_they_should_reply_by_email.rhtml @@ -0,0 +1,3 @@ +The law, the Ministry of Justice and the Information Commissioner all say that an email is sufficient (<a href="<%= help_page_url %>#full_address">more details</a>). + +At the bottom of this page, write a reply to the authority explaining this to them. diff --git a/app/views/request/_view_html_prefix.rhtml b/app/views/request/_view_html_prefix.rhtml index 6d352ea91..b29830ac7 100644 --- a/app/views/request/_view_html_prefix.rhtml +++ b/app/views/request/_view_html_prefix.rhtml @@ -1,6 +1,6 @@ <div class="view_html_prefix"> <div class="view_html_logo"> - <a href="/"><img src="/images/navimg/logo-trans-small.png" alt="<%= site_name %> logo"></a> + <a href="/"><img src="/images/navimg/logo-trans-small.png" alt="<%= site_name %>"></a> </div> <div class="view_html_download_link"> <%=link_to _("Download original attachment"), @attachment_url %> diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml index 40c3b3d5b..d8647d1ec 100644 --- a/app/views/request/show_response.rhtml +++ b/app/views/request/show_response.rhtml @@ -19,9 +19,7 @@ address</strong>, not just an email, for it to be a valid FOI request') %> </dt> <dd> - <%= _('The law, the Ministry of Justice and the Information Commissioner - all say that an email is sufficient (<a href="%s">more details</a>). - At the bottom of this page, write a reply to the authority explaining this to them.') % [help_privacy_path + '#full_address'] %> + <%= render :partial => 'help/why_they_should_reply_by_email', :locals => {:help_page_url => help_privacy_path } %> </dd> <dt> diff --git a/app/views/user/set_profile_about_me.rhtml b/app/views/user/set_profile_about_me.rhtml index af6433e89..6c1edc254 100644 --- a/app/views/user/set_profile_about_me.rhtml +++ b/app/views/user/set_profile_about_me.rhtml @@ -26,7 +26,7 @@ <%= _(' Include relevant links, such as to a campaign page, your blog or a twitter account. They will be made clickable. e.g.')%> - <a href="http://www.twitter.com/whatdotheyknow">http://www.twitter.com/whatdotheyknow</a> + <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %></a> </p> </div> diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 5e2c29d84..c3a99311a 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -110,7 +110,7 @@ <% if not @is_you %> <p id="user_not_logged_in"> - <%= link_to _('Sign in'), signin_url(:r => request.request_uri) %><%= _('to change password, + <%= link_to _('Sign in'), signin_url(:r => request.request_uri) %> <%= _('to change password, subscriptions and more')%> (<%=h @display_user.name %> <%= _('only')%>) </p> <% end %> |